mirrors/barkey
1
0
Fork 0
mirror of https://codeberg.org/yeentown/barkey.git synced 2025-07-07 12:36:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix merge error

Browse source
This commit is contained in:
Hazelnoot 2025-06-01 15:23:57 -04:00
parent d3d201d0cf
commit b1307a050c
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
packages/backend/src/core/activitypub/ApInboxService.ts
View file

@ -122,13 +122,14 @@ export class ApInboxService {
act.id = undefined; act.id = undefined;
} }
const id = getNullableApId(act) ?? `${getNullableApId(activity)}#${i}`;
try { try {
const id = getNullableApId(act) ?? `${getNullableApId(activity)}#${i}`;
const result = await this.performOneActivity(actor, act, resolver); const result = await this.performOneActivity(actor, act, resolver);
results.push([id, result]); results.push([id, result]);
} catch (err) { } catch (err) {
if (err instanceof Error || typeof err === 'string') { 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 { } else {
throw err; throw err;
} }