From c157865ed0224d873749d20e576edfac943ca9da Mon Sep 17 00:00:00 2001
From: Fabien O'Carroll <fabien@allou.is>
Date: Mon, 6 Jan 2025 11:34:04 +0700
Subject: [PATCH] Handle authorized fetch for announced objects

Some ActivityPub implementions, threads.net as one example, require
the use of authorized fetch to read objects, even if they are public.

When we use the `getObject` method of the Activity class the request
is made without authorized fetch, which causes the handler to error.

Our lookupObject helper handles the authorized fetch component, which
fixes the error.
---
 src/dispatchers.ts | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/dispatchers.ts b/src/dispatchers.ts
index 6eecbea5..4807b17c 100644
--- a/src/dispatchers.ts
+++ b/src/dispatchers.ts
@@ -302,18 +302,6 @@ export async function handleAnnounce(
 ) {
     ctx.data.logger.info('Handling Announce');
 
-    // Check what was announced - If it's an Activity rather than an Object
-    // (which can occur if the announcer is a Group - See
-    // https://codeberg.org/fediverse/fep/src/branch/main/fep/1b12/fep-1b12.md),
-    // we need to forward the announce on to an appropriate handler
-    // This routing is something that should be handled by Fedify, but has
-    // not yet been implemented - Tracked here: https://github.com/dahlia/fedify/issues/193
-    const announced = await announce.getObject();
-
-    if (announced instanceof Create) {
-        return handleAnnoucedCreate(ctx, announce);
-    }
-
     // Validate announce
     if (!announce.id) {
         ctx.data.logger.info('Invalid Announce - no id');
@@ -325,6 +313,18 @@ export async function handleAnnounce(
         return;
     }
 
+    // Check what was announced - If it's an Activity rather than an Object
+    // (which can occur if the announcer is a Group - See
+    // https://codeberg.org/fediverse/fep/src/branch/main/fep/1b12/fep-1b12.md),
+    // we need to forward the announce on to an appropriate handler
+    // This routing is something that should be handled by Fedify, but has
+    // not yet been implemented - Tracked here: https://github.com/dahlia/fedify/issues/193
+    const announced = await lookupObject(ctx, announce.objectId);
+
+    if (announced instanceof Create) {
+        return handleAnnoucedCreate(ctx, announce);
+    }
+
     // Validate sender
     const sender = await announce.getActor(ctx);