diff options
| author | Hazelnoot <acomputerdog@gmail.com> | 2025-06-01 15:23:57 -0400 |
|---|---|---|
| committer | Hazelnoot <acomputerdog@gmail.com> | 2025-06-06 22:20:17 -0400 |
| commit | b1307a050ce8ba132fa4dd0c32201af473d60dae (patch) | |
| tree | fd4765851bbad13f8389845badd9eaedd2ae9ea5 | |
| parent | reduce log spam from ApiCallService (diff) | |
| download | sharkey-b1307a050ce8ba132fa4dd0c32201af473d60dae.tar.gz sharkey-b1307a050ce8ba132fa4dd0c32201af473d60dae.tar.bz2 sharkey-b1307a050ce8ba132fa4dd0c32201af473d60dae.zip | |
fix merge error
| -rw-r--r-- | packages/backend/src/core/activitypub/ApInboxService.ts | 5 |
1 files 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; } |