Node.js based forum software built for the modern web
feat: federate out undo(announce) when moving topics
Julian Lam832477f8199f
diff --git a/src/activitypub/out.js b/src/activitypub/out.jsindex a0f553dab9..3ebadcce98 100644--- a/src/activitypub/out.js+++ b/src/activitypub/out.js@@ -307,7 +307,6 @@ Out.announce.topic = enabledCheck(async (tid) => {to,cc,object: pid,- target: `${nconf.get('url')}/category/${cid}`,});});@@ -524,4 +523,53 @@ Out.undo.flag = enabledCheck(async (uid, flag) => {},});await db.sortedSetRemove(`flag:${flag.flagId}:remote`, uid);+});++Out.undo.announce = enabledCheck(async (type, id, tid) => {+ if (!utils.isNumber(id) || !['uid', 'cid'].includes(type)) {+ throw new Error('[[error:invalid-data]]');+ }++ const exists = await Promise.all([+ topics.exists(tid),+ type === 'uid' ? user.exists(id) : categories.exists(id),+ ]);+ if (!exists.every(Boolean)) {+ throw new Error('[[error:invalid-data]]');+ }++ const baseUrl = `${nconf.get('url')}/${type === 'uid' ? 'uid' : 'category'}/${id}`;+ const { uid, mainPid: pid } = await topics.getTopicFields(tid, ['uid', 'mainPid']);+ const allowed = await privileges.topics.can('topics:read', tid, activitypub._constants.uid);+ if (!allowed) {+ activitypub.helpers.log(`[activitypub/api] Not federating announce of pid ${pid} to the fediverse due to privileges.`);+ return;+ }++ const { to, cc, targets } = await activitypub.buildRecipients({+ id: pid,+ to: [activitypub._constants.publicAddress],+ cc: [`${baseUrl}/followers`, uid],+ }, {+ uid: type === 'uid' && id,+ cid: type === 'cid' && id,+ });+++ // Just undo the announce.+ await activitypub.send(type, id, Array.from(targets), {+ id: `${nconf.get('url')}/post/${encodeURIComponent(pid)}#activity/undo:announce/${Date.now()}`,+ type: 'Undo',+ actor: baseUrl,+ to,+ cc,+ object: {+ id: `${nconf.get('url')}/post/${encodeURIComponent(pid)}#activity/announce/${Date.now()}`, // wrong timestamp btw+ type: 'Announce',+ actor: baseUrl,+ to,+ cc,+ object: pid,+ },+ });});\ No newline at end of filediff --git a/src/api/topics.js b/src/api/topics.jsindex 8f769e4b32..91e0882db4 100644--- a/src/api/topics.js+++ b/src/api/topics.js@@ -330,6 +330,7 @@ topicsAPI.move = async (caller, { tid, cid }) => {activitypub.out.move.context(caller.uid, tid);activitypub.out.announce.topic(tid);}+ activitypub.out.undo.announce('cid', topicData.cid, tid);}await events.log({