More robust federation

In particular when fetching pleroma outbox

server/lib/activitypub/process/process-announce.ts

@@ -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

server/lib/activitypub/process/process-create.ts

@@ -14,6 +14,7 @@ import { processDislikeActivity } from './process-dislike'
 import { processFlagActivity } from './process-flag'
 import { PlaylistObject } from '../../../../shared/models/activitypub/objects/playlist-object'
 import { createOrUpdateVideoPlaylist } from '../playlist'
+import { VideoModel } from '../../../models/video/video'
 
 async function processCreateActivity (activity: ActivityCreate, byActor: ActorModel) {
   const activityObject = activity.object
@@ -91,7 +92,17 @@ async function processCreateVideoComment (activity: ActivityCreate, byActor: Act
 
   if (!byAccount) throw new Error('Cannot create video comment with the non account actor ' + byActor.url)
 
-  const { video } = await resolveThread(commentObject.inReplyTo)
+  let video: VideoModel
+  try {
+    const resolveThreadResult = await resolveThread(commentObject.inReplyTo)
+    video = resolveThreadResult.video
+  } catch (err) {
+    logger.debug(
+      'Cannot process video comment because we could not resolve thread %s. Maybe it was not a video thread, so skip it.',
+      commentObject.inReplyTo,
+      { err }
+    )
+  }
 
   const { comment, created } = await addVideoComment(video, commentObject.id)