Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-02-27 17:11:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: move Announce(Delete) out of topics.move and into topics API method

Browse Source
This commit is contained in:
Julian Lam
2025-10-15 15:02:23 -04:00
parent 3fa74d4cec
commit fadac6165e
2 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/api/topics.js
View File

@@ -320,7 +320,16 @@ topicsAPI.move = async (caller, { tid, cid }) => {
socketHelpers.emitToUids('event:topic_moved', topicData, notifyUids); socketHelpers.emitToUids('event:topic_moved', topicData, notifyUids);
if (!topicData.deleted) { if (!topicData.deleted) {
socketHelpers.sendNotificationToTopicOwner(tid, caller.uid, 'move', 'notifications:moved-your-topic'); socketHelpers.sendNotificationToTopicOwner(tid, caller.uid, 'move', 'notifications:moved-your-topic');
activitypubApi.announce.note(caller, { tid });
// AP: Announce(Delete(Object))
if (cid === -1) {
await activitypubApi.announce.delete({ uid: caller.uid }, { tid });
// tbd: activitypubApi.undo.announce?
} else {
// tbd: some kind of plain object announce by the category...
activitypubApi.announce.note(caller, { tid }); // user announce, remove when discrete announces are a thing
// tbd: api.activitypub.announce.move
}
} }
await events.log({ await events.log({

8
src/topics/tools.js
View File

@@ -7,7 +7,6 @@ const topics = require('.');
const categories = require('../categories'); const categories = require('../categories');
const user = require('../user'); const user = require('../user');
const plugins = require('../plugins'); const plugins = require('../plugins');
const api = require('../api');
const privileges = require('../privileges'); const privileges = require('../privileges');
const utils = require('../utils'); const utils = require('../utils');
@@ -278,13 +277,6 @@ module.exports = function (Topics) {
const oldCid = topicData.cid; const oldCid = topicData.cid;
await categories.moveRecentReplies(tid, oldCid, cid); await categories.moveRecentReplies(tid, oldCid, cid);
// AP: Announce(Delete(Object))
if (cid === -1) {
await api.activitypub.announce.delete({ uid: data.uid }, { tid });
} else {
// tbd: api.activitypub.announce.move
}
await Promise.all([ await Promise.all([
Topics.setTopicFields(tid, { Topics.setTopicFields(tid, {
cid: cid, cid: cid,