Node.js based forum software built for the modern web
fix(activitypub): skip re-broadcast for relayed activities and guard tid check
Julian Lamf18eebedf4f2
diff --git a/src/activitypub/feps.js b/src/activitypub/feps.jsindex 1af33cbb96..d25713c90a 100644--- a/src/activitypub/feps.js+++ b/src/activitypub/feps.js@@ -24,7 +24,7 @@ Feps.announce = async function announce(id, activity) {const cid = await topics.getTopicField(tid, 'cid');const localCid = utils.isNumber(cid) && cid > 0;const addressed = activitypub.helpers.addressed(cid, activity);- const shouldAnnounce = localCid || (utils.isNumber(tid) && !addressed);+ const shouldAnnounce = localCid || (tid && utils.isNumber(tid) && !addressed);if (!shouldAnnounce) { // inverse conditionals can kiss my ass.return;}diff --git a/src/activitypub/inbox.js b/src/activitypub/inbox.jsindex ffe6a5fd57..18c5fe2c0f 100644--- a/src/activitypub/inbox.js+++ b/src/activitypub/inbox.js@@ -701,8 +701,8 @@ inbox.announce = async (req) => {}}- // Broadcast to relay followers if we have a pid- if (pid) {+ // Broadcast to relay followers if we have a pid (skip if relayed — relay already distributes)+ if (pid && !fromRelay) {await activitypub.feps.announce(pid, object);}};