X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Flib%2Factivitypub%2Ffetch.ts;h=a8eefff80a916e472f7772d260f9144f31b14f84;hb=5cf135001124cd19183336dbfcae1cd432217b00;hp=b1b370a1af99df4b1bb0ec3211108bb0f0a2923d;hpb=94a5ff8a4a75d75bb9df542a39ce8769e7a7e6a4;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server/lib/activitypub/fetch.ts b/server/lib/activitypub/fetch.ts
index b1b370a1a..a8eefff80 100644
--- a/server/lib/activitypub/fetch.ts
+++ b/server/lib/activitypub/fetch.ts
@@ -1,7 +1,16 @@
+import { logger } from '../../helpers/logger'
+import { getServerActor } from '../../helpers/utils'
 import { ActorModel } from '../../models/activitypub/actor'
 import { JobQueue } from '../job-queue'
 
 async function addFetchOutboxJob (actor: ActorModel) {
+  // Don't fetch ourselves
+  const serverActor = await getServerActor()
+  if (serverActor.id === actor.id) {
+    logger.error('Cannot fetch our own outbox!')
+    return undefined
+  }
+
   const payload = {
     uris: [ actor.outboxUrl ]
   }