From 047d5992dc3dc5b99feccb9e709cb089009f0814 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Tue, 17 Sep 2024 10:46:01 -0400 Subject: [PATCH] fix: id on 1b12 announces --- src/activitypub/inbox.js | 2 +- src/api/activitypub.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/activitypub/inbox.js b/src/activitypub/inbox.js index d2c117fd44..0deec6ba70 100644 --- a/src/activitypub/inbox.js +++ b/src/activitypub/inbox.js @@ -50,7 +50,7 @@ async function announce(id, activity) { winston.info(`[activitypub/inbox.announce(1b12)] Announcing ${activity.type} to followers of cid ${cid}`); await Promise.all([activity, activity.object].map(async (object) => { await activitypub.send('cid', cid, followers, { - id: `${id}#activity/announce/${Date.now()}`, + id: `${nconf.get('url')}/post/${encodeURIComponent(id)}#activity/announce/${Date.now()}`, type: 'Announce', to: [`${nconf.get('url')}/category/${cid}/followers`], cc: [actor, activitypub._constants.publicAddress], diff --git a/src/api/activitypub.js b/src/api/activitypub.js index ec628b2a99..3a6a8434c7 100644 --- a/src/api/activitypub.js +++ b/src/api/activitypub.js @@ -179,7 +179,7 @@ activitypubApi.create.note = enabledCheck(async (caller, { pid, post }) => { setTimeout(() => { // Delay sending to avoid potential race condition Promise.all([payload, payload.object].map(async (object) => { await activitypub.send('cid', cid, followers, { - id: `${object.object ? object.object.id : object.id}#activity/announce/${Date.now()}`, + id: `${nconf.get('url')}/post/${encodeURIComponent(object.object ? object.object.id : object.id)}#activity/announce/${Date.now()}`, type: 'Announce', to: [activitypub._constants.publicAddress], cc: [`${nconf.get('url')}/category/${cid}/followers`],