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: #8078, dont mark notifications read without a mergeId

Browse Source
This commit is contained in:
Baris Usakli
2019-12-05 15:44:22 -05:00
parent 7af1c873a3
commit a8df6d6298
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/notifications.js
View File

@@ -94,14 +94,18 @@ Notifications.filterExists = async function (nids) {
}; };
Notifications.findRelated = async function (mergeIds, set) { Notifications.findRelated = async function (mergeIds, set) {
mergeIds = mergeIds.filter(Boolean);
if (!mergeIds.length) {
return [];
}
// A related notification is one in a zset that has the same mergeId // A related notification is one in a zset that has the same mergeId
const nids = await db.getSortedSetRevRange(set, 0, -1); const nids = await db.getSortedSetRevRange(set, 0, -1);
const keys = nids.map(nid => 'notifications:' + nid); const keys = nids.map(nid => 'notifications:' + nid);
let sets = await db.getObjectsFields(keys, ['mergeId']); const notificationData = await db.getObjectsFields(keys, ['mergeId']);
sets = sets.map(set => String(set.mergeId)); const notificationMergeIds = notificationData.map(notifObj => String(notifObj.mergeId));
const mergeSet = new Set(mergeIds.map(id => String(id))); const mergeSet = new Set(mergeIds.map(id => String(id)));
return nids.filter((nid, idx) => mergeSet.has(sets[idx])); return nids.filter((nid, idx) => mergeSet.has(notificationMergeIds[idx]));
}; };
Notifications.create = async function (data) { Notifications.create = async function (data) {