Node.js based forum software built for the modern web
fix: on notifications page don't show counts if post notifications are not visible
Barış Soner Uşaklı0290c45b3957
diff --git a/src/user/notifications.js b/src/user/notifications.jsindex 4800cc5857..3dc84ed99e 100644--- a/src/user/notifications.js+++ b/src/user/notifications.js@@ -50,12 +50,17 @@ UserNotifications.getAll = async function (uid, filter) {UserNotifications.getAllWithCounts = async function (uid, filter) {const nids = await getAllNids(uid);const keys = nids.map(nid => `notifications:${nid}`);- let notifications = await db.getObjectsFields(keys, ['nid', 'type']);+ let notifications = await db.getObjectsFields(keys, ['nid', 'type', 'pid']);++ const postNotifications = notifications.filter(n => n && n.pid);+ const pids = _.uniq(postNotifications.map(n => String(n.pid)));+ const visiblePids = new Set(await privileges.posts.filter('topics:read', pids, uid));+ notifications = notifications.filter(n => !n.pid || visiblePids.has(String(n.pid)));+const counts = {};notifications.forEach((n) => {if (n && n.type) {- counts[n.type] = counts[n.type] || 0;- counts[n.type] += 1;+ counts[n.type] = (counts[n.type] || 0) + 1;}});if (filter) {