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

fix: notif pruning

Browse Source
This commit is contained in:
Barış Soner Uşaklı
2021-02-28 12:54:06 -05:00
parent ca8176312f
commit 2737f6531b
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/notifications.js
View File

@@ -38,6 +38,8 @@ Notifications.privilegedTypes = [
'notificationType_new-user-flag', 'notificationType_new-user-flag',
]; ];
const notificationPruneCutoff = 2592000000; // one month
Notifications.getAllNotificationTypes = async function () { Notifications.getAllNotificationTypes = async function () {
const results = await plugins.hooks.fire('filter:user.notificationTypes', { const results = await plugins.hooks.fire('filter:user.notificationTypes', {
types: Notifications.baseTypes.slice(), types: Notifications.baseTypes.slice(),
@@ -159,13 +161,12 @@ async function pushToUids(uids, notification) {
if (!uids.length) { if (!uids.length) {
return; return;
} }
const oneWeekAgo = Date.now() - 604800000; const cutoff = Date.now() - notificationPruneCutoff;
const unreadKeys = uids.map(uid => `uid:${uid}:notifications:unread`); const unreadKeys = uids.map(uid => `uid:${uid}:notifications:unread`);
const readKeys = uids.map(uid => `uid:${uid}:notifications:read`); const readKeys = uids.map(uid => `uid:${uid}:notifications:read`);
await db.sortedSetsAdd(unreadKeys, notification.datetime, notification.nid); await db.sortedSetsAdd(unreadKeys, notification.datetime, notification.nid);
await db.sortedSetsRemove(readKeys, notification.nid); await db.sortedSetsRemove(readKeys, notification.nid);
await db.sortedSetsRemoveRangeByScore(unreadKeys, '-inf', oneWeekAgo); await db.sortedSetsRemoveRangeByScore(unreadKeys.concat(readKeys), '-inf', cutoff);
await db.sortedSetsRemoveRangeByScore(readKeys, '-inf', oneWeekAgo);
const websockets = require('./socket.io'); const websockets = require('./socket.io');
if (websockets.server) { if (websockets.server) {
uids.forEach((uid) => { uids.forEach((uid) => {
@@ -318,8 +319,7 @@ Notifications.markAllRead = async function (uid) {
}; };
Notifications.prune = async function () { Notifications.prune = async function () {
const month = 2592000000; const cutoffTime = Date.now() - notificationPruneCutoff;
const cutoffTime = Date.now() - month;
const nids = await db.getSortedSetRangeByScore('notifications', 0, 500, '-inf', cutoffTime); const nids = await db.getSortedSetRangeByScore('notifications', 0, 500, '-inf', cutoffTime);
if (!nids.length) { if (!nids.length) {
return; return;