Optimize AP fetch

2 files changed, 8 insertions, 1 deletions

diff --git a/server/lib/activitypub/process/process-announce.ts b/server/lib/activitypub/process/process-announce.ts
index ec23c705e..2619d9754 100644
--- a/server/lib/activitypub/process/process-announce.ts
+++ b/server/lib/activitypub/process/process-announce.ts
@@ -8,12 +8,16 @@ import { Notifier } from '../../notifier'
 import { logger } from '../../../helpers/logger'
 import { APProcessorOptions } from '../../../types/activitypub-processor.model'
 import { MActorSignature, MVideoAccountLightBlacklistAllFiles } from '../../../types/models'
+import { getAPId } from '@server/helpers/activitypub'
 
 async function processAnnounceActivity (options: APProcessorOptions<ActivityAnnounce>) {
   const { activity, byActor: actorAnnouncer } = options
   // Only notify if it is not from a fetcher job
   const notify = options.fromFetch !== true
 
+  // Announces on accounts are not supported
+  if (actorAnnouncer.type !== 'Application' && actorAnnouncer.type !== 'Group') return
+
   return retryTransactionWrapper(processVideoShare, actorAnnouncer, activity, notify)
 }
 
@@ -26,7 +30,7 @@ export {
 // ---------------------------------------------------------------------------
 
 async function processVideoShare (actorAnnouncer: MActorSignature, activity: ActivityAnnounce, notify: boolean) {
-  const objectUri = typeof activity.object === 'string' ? activity.object : activity.object.id
+  const objectUri = getAPId(activity.object)
 
   let video: MVideoAccountLightBlacklistAllFiles
   let videoCreated: boolean
diff --git a/server/lib/activitypub/process/process-create.ts b/server/lib/activitypub/process/process-create.ts
index 70e048d6e..93f1d1c59 100644
--- a/server/lib/activitypub/process/process-create.ts
+++ b/server/lib/activitypub/process/process-create.ts
@@ -28,6 +28,9 @@ async function processCreateActivity (options: APProcessorOptions<ActivityCreate
   }
 
   if (activityType === 'Note') {
+    // Comments will be fetched from videos
+    if (options.fromFetch) return
+
     return retryTransactionWrapper(processCreateVideoComment, activity, byActor, notify)
   }