Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-03-06 12:31:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

test: fix tests since nid format changed

Browse Source
This commit is contained in:
Barış Soner Uşaklı
2023-07-25 11:11:31 -04:00
parent 17783440e4
commit e41042eeea
2 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/flags.js
View File

@@ -680,6 +680,11 @@ Flags.update = async function (flagId, uid, changeset) {
return allowed;
};
async function rescindNotifications(match) {
const nids = await db.getSortedSetScan({ key: 'notifications', match: `${match}*` });
return notifications.rescind(nids);
}
// Retrieve existing flag data to compare for history-saving/reference purposes
const tasks = [];
for (const prop of Object.keys(changeset)) {
@@ -692,10 +697,10 @@ Flags.update = async function (flagId, uid, changeset) {
tasks.push(db.sortedSetAdd(`flags:byState:${changeset[prop]}`, now, flagId));
tasks.push(db.sortedSetRemove(`flags:byState:${current[prop]}`, flagId));
if (changeset[prop] === 'resolved' && meta.config['flags:actionOnResolve'] === 'rescind') {
tasks.push(notifications.rescind(`flag:${current.type}:${current.targetId}`));
tasks.push(rescindNotifications(`flag:${current.type}:${current.targetId}`));
}
if (changeset[prop] === 'rejected' && meta.config['flags:actionOnReject'] === 'rescind') {
tasks.push(notifications.rescind(`flag:${current.type}:${current.targetId}`));
tasks.push(rescindNotifications(`flag:${current.type}:${current.targetId}`));
}
}
} else if (prop === 'assignee') {