Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-05-06 07:07:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix: rebroadcasting logic should only execute for local tids if the remote cid is not addressed already

Browse Source
This commit is contained in:
Julian Lam
2025-10-16 12:17:52 -04:00
parent 2b2028e446
commit 1d529473b4
2 changed files with 19 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/activitypub/feps.js
View File

@@ -23,7 +23,8 @@ Feps.announce = async function announce(id, activity) {
const tid = await posts.getPostField(localId || id, 'tid'); const tid = await posts.getPostField(localId || id, 'tid');
const cid = await topics.getTopicField(tid, 'cid'); const cid = await topics.getTopicField(tid, 'cid');
const localCid = utils.isNumber(cid) && cid > 0; const localCid = utils.isNumber(cid) && cid > 0;
const shouldAnnounce = localCid || utils.isNumber(tid); const addressed = activitypub.helpers.addressed(cid, activity);
const shouldAnnounce = localCid || (utils.isNumber(tid) && !addressed);
if (!shouldAnnounce) { // inverse conditionals can kiss my ass. if (!shouldAnnounce) { // inverse conditionals can kiss my ass.
return; return;
} }

17
src/activitypub/helpers.js
View File

@@ -526,3 +526,20 @@ Helpers.generateDigest = (set) => {
return result.toString('hex'); return result.toString('hex');
}); });
}; };
Helpers.addressed = (id, activity) => {
// Returns Boolean for if id is found in addressing fields (to, cc, etc.)
if (!id || !activity || typeof activity !== 'object') {
return false;
}
const combined = new Set([
...(activity.to || []),
...(activity.cc || []),
...(activity.bto || []),
...(activity.bcc || []),
...(activity.audience || []),
]);
return combined.has(id);
};