mirror of
https://github.com/NodeBB/NodeBB.git
synced 2025-12-19 06:50:21 +01:00
fix: call api.topics method on topic move during note assertion, have category announce new topic on note assertion
This commit is contained in:
@@ -15,6 +15,7 @@ const notifications = require('../notifications');
|
|||||||
const user = require('../user');
|
const user = require('../user');
|
||||||
const topics = require('../topics');
|
const topics = require('../topics');
|
||||||
const posts = require('../posts');
|
const posts = require('../posts');
|
||||||
|
const api = require('../api');
|
||||||
const utils = require('../utils');
|
const utils = require('../utils');
|
||||||
|
|
||||||
const activitypub = module.parent.exports;
|
const activitypub = module.parent.exports;
|
||||||
@@ -106,7 +107,7 @@ Notes.assert = async (uid, input, options = { skipChecks: false }) => {
|
|||||||
|
|
||||||
if (options.cid && cid === -1) {
|
if (options.cid && cid === -1) {
|
||||||
// Move topic if currently uncategorized
|
// Move topic if currently uncategorized
|
||||||
await topics.tools.move(tid, { cid: options.cid, uid: 'system' });
|
await api.topics.move({ uid: 'system' }, { tid, cid: options.cid });
|
||||||
}
|
}
|
||||||
|
|
||||||
const exists = await posts.exists(chain.map(p => p.pid));
|
const exists = await posts.exists(chain.map(p => p.pid));
|
||||||
@@ -261,6 +262,12 @@ Notes.assert = async (uid, input, options = { skipChecks: false }) => {
|
|||||||
}
|
}
|
||||||
|
|
||||||
await Notes.syncUserInboxes(tid, uid);
|
await Notes.syncUserInboxes(tid, uid);
|
||||||
|
|
||||||
|
if (!hasTid && options.cid) {
|
||||||
|
// New topic, have category announce it
|
||||||
|
api.activitypub.announce.category({}, { tid });
|
||||||
|
}
|
||||||
|
|
||||||
return { tid, count };
|
return { tid, count };
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
winston.warn(`[activitypub/notes.assert] Could not assert ${id} (${e.message}).`);
|
winston.warn(`[activitypub/notes.assert] Could not assert ${id} (${e.message}).`);
|
||||||
|
|||||||
Reference in New Issue
Block a user