From b1307a050ce8ba132fa4dd0c32201af473d60dae Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Sun, 1 Jun 2025 15:23:57 -0400
Subject: [PATCH] fix merge error

---
 packages/backend/src/core/activitypub/ApInboxService.ts | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/backend/src/core/activitypub/ApInboxService.ts b/packages/backend/src/core/activitypub/ApInboxService.ts
index f240ddb819..b384ec58c5 100644
--- a/packages/backend/src/core/activitypub/ApInboxService.ts
+++ b/packages/backend/src/core/activitypub/ApInboxService.ts
@@ -122,13 +122,14 @@ export class ApInboxService {
 					act.id = undefined;
 				}
 
+				const id = getNullableApId(act) ?? `${getNullableApId(activity)}#${i}`;
+
 				try {
-					const id = getNullableApId(act) ?? `${getNullableApId(activity)}#${i}`;
 					const result = await this.performOneActivity(actor, act, resolver);
 					results.push([id, result]);
 				} catch (err) {
 					if (err instanceof Error || typeof err === 'string') {
-						this.logger.error(`Unhandled error in activity ${getNullableApId(item || 'undefined')}:`, err);
+						this.logger.error(`Unhandled error in activity ${id}:`, err);
 					} else {
 						throw err;
 					}