|
@@ -5,8 +5,9 @@ import { ActorModel } from '../../../models/activitypub/actor'
|
|
|
import { VideoShareModel } from '../../../models/video/video-share'
|
|
|
import { forwardVideoRelatedActivity } from '../send/utils'
|
|
|
import { getOrCreateVideoAndAccountAndChannel } from '../videos'
|
|
|
-import { VideoPrivacy } from '../../../../shared/models/videos'
|
|
|
import { Notifier } from '../../notifier'
|
|
|
+import { VideoModel } from '../../../models/video/video'
|
|
|
+import { logger } from '../../../helpers/logger'
|
|
|
|
|
|
async function processAnnounceActivity (activity: ActivityAnnounce, actorAnnouncer: ActorModel) {
|
|
|
return retryTransactionWrapper(processVideoShare, actorAnnouncer, activity)
|
|
@@ -23,7 +24,17 @@ export {
|
|
|
async function processVideoShare (actorAnnouncer: ActorModel, activity: ActivityAnnounce) {
|
|
|
const objectUri = typeof activity.object === 'string' ? activity.object : activity.object.id
|
|
|
|
|
|
- const { video, created: videoCreated } = await getOrCreateVideoAndAccountAndChannel({ videoObject: objectUri })
|
|
|
+ let video: VideoModel
|
|
|
+ let videoCreated: boolean
|
|
|
+
|
|
|
+ try {
|
|
|
+ const result = await getOrCreateVideoAndAccountAndChannel({ videoObject: objectUri })
|
|
|
+ video = result.video
|
|
|
+ videoCreated = result.created
|
|
|
+ } catch (err) {
|
|
|
+ logger.debug('Cannot process share of %s. Maybe this is not a video object, so just skipping.', objectUri, { err })
|
|
|
+ return
|
|
|
+ }
|
|
|
|
|
|
await sequelizeTypescript.transaction(async t => {
|
|
|
// Add share entry
|