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

refactor(topic-events): fire topic event logging in topics/tools instead, pass uid into payload

Browse Source
This commit is contained in:
Julian Lam
2021-01-04 15:33:14 -05:00
parent ab2e1ecb40
commit 425eca145b
2 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/api/helpers.js
View File

@@ -63,11 +63,6 @@ exports.doTopicAction = async function (action, event, caller, { tids }) {
}; };
async function logTopicAction(action, req, tid, title) { async function logTopicAction(action, req, tid, title) {
// No 'purge' topic event (since topic is now gone)
if (action !== 'purge') {
await topics.events.log(tid, { type: action });
}
// Only log certain actions to system event log // Only log certain actions to system event log
var actionsToLog = ['delete', 'restore', 'purge']; var actionsToLog = ['delete', 'restore', 'purge'];
if (!actionsToLog.includes(action)) { if (!actionsToLog.includes(action)) {

3
src/topics/tools.js
View File

@@ -44,6 +44,7 @@ module.exports = function (Topics) {
} else { } else {
await Topics.restore(data.topicData.tid); await Topics.restore(data.topicData.tid);
} }
await Topics.events.log(tid, { type: isDelete ? 'delete' : 'restore', uid });
data.topicData.deleted = data.isDelete ? 1 : 0; data.topicData.deleted = data.isDelete ? 1 : 0;
@@ -94,6 +95,7 @@ module.exports = function (Topics) {
throw new Error('[[error:no-privileges]]'); throw new Error('[[error:no-privileges]]');
} }
await Topics.setTopicField(tid, 'locked', lock ? 1 : 0); await Topics.setTopicField(tid, 'locked', lock ? 1 : 0);
await Topics.events.log(tid, { type: lock ? 'lock' : 'unlock', uid });
topicData.isLocked = lock; // deprecate in v2.0 topicData.isLocked = lock; // deprecate in v2.0
topicData.locked = lock; topicData.locked = lock;
@@ -152,6 +154,7 @@ module.exports = function (Topics) {
const promises = [ const promises = [
Topics.setTopicField(tid, 'pinned', pin ? 1 : 0), Topics.setTopicField(tid, 'pinned', pin ? 1 : 0),
Topics.events.log(tid, { type: pin ? 'pin' : 'unpin', uid }),
]; ];
if (pin) { if (pin) {
promises.push(db.sortedSetAdd('cid:' + topicData.cid + ':tids:pinned', Date.now(), tid)); promises.push(db.sortedSetAdd('cid:' + topicData.cid + ':tids:pinned', Date.now(), tid));