Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-10-26 16:46:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: only 1b12 announce topic fork if OP is local, fix race condition in tests

Browse Source
This commit is contained in:
Julian Lam
2025-03-11 15:32:10 -04:00
parent 291af926a6
commit 945617cbcf
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/topics/fork.js
View File

@@ -8,6 +8,7 @@ const privileges = require('../privileges');
const plugins = require('../plugins'); const plugins = require('../plugins');
const meta = require('../meta'); const meta = require('../meta');
const activitypub = require('../activitypub'); const activitypub = require('../activitypub');
const utils = require('../utils');
module.exports = function (Topics) { module.exports = function (Topics) {
Topics.createTopicFromPosts = async function (uid, title, pids, fromTid, cid) { Topics.createTopicFromPosts = async function (uid, title, pids, fromTid, cid) {
@@ -90,8 +91,11 @@ module.exports = function (Topics) {
Topics.events.log(fromTid, { type: 'fork', uid, href: `/topic/${tid}` }), Topics.events.log(fromTid, { type: 'fork', uid, href: `/topic/${tid}` }),
]); ]);
const { activity } = await activitypub.mocks.activities.create(pids[0], uid); // ideally we should federate a "move" activity instead, then can capture remote posts too. tbd
await activitypub.feps.announce(pids[0], activity); if (utils.isNumber(pids[0])) {
const { activity } = await activitypub.mocks.activities.create(pids[0], uid);
await activitypub.feps.announce(pids[0], activity);
}
plugins.hooks.fire('action:topic.fork', { tid, fromTid, uid }); plugins.hooks.fire('action:topic.fork', { tid, fromTid, uid });

6
test/activitypub/feps.js
View File

@@ -80,10 +80,8 @@ describe('FEPs', () => {
content: utils.generateUUID(), content: utils.generateUUID(),
}); });
const { tid } = topicData; const { tid } = topicData;
const [{ pid: reply1Pid }, { pid: reply2Pid }] = await Promise.all([ const { pid: reply1Pid } = await topics.reply({ uid, tid, content: utils.generateUUID() });
topics.reply({ uid, tid, content: utils.generateUUID() }), const { pid: reply2Pid } = await topics.reply({ uid, tid, content: utils.generateUUID() });
topics.reply({ uid, tid, content: utils.generateUUID() }),
]);
await topics.createTopicFromPosts( await topics.createTopicFromPosts(
adminUid, utils.generateUUID(), [reply1Pid, reply2Pid], tid, cid adminUid, utils.generateUUID(), [reply1Pid, reply2Pid], tid, cid
); );