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

feat: closes #11812, add unread public rooms into digest

Browse Source
This commit is contained in:
Barış Soner Uşaklı
2023-07-18 13:12:06 -04:00
parent 00be053e94
commit eb0fcd3235
3 changed files with 35 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/user/digest.js
View File

@@ -8,6 +8,7 @@ const batch = require('../batch');
const meta = require('../meta');
const user = require('./index');
const topics = require('../topics');
const messaging = require('../messaging');
const plugins = require('../plugins');
const emailer = require('../emailer');
const utils = require('../utils');
@@ -94,13 +95,16 @@ Digest.send = async function (data) {
return;
}
await Promise.all(userData.map(async (userObj) => {
const [notifications, topics] = await Promise.all([
const [publicRooms, notifications, topics] = await Promise.all([
getUnreadPublicRooms(userObj.uid),
user.notifications.getUnreadInterval(userObj.uid, data.interval),
getTermTopics(data.interval, userObj.uid),
]);
const unreadNotifs = notifications.filter(Boolean);
// If there are no notifications and no new topics, don't bother sending a digest
if (!unreadNotifs.length && !topics.top.length && !topics.popular.length && !topics.recent.length) {
// If there are no notifications and no new topics and no unread chats, don't bother sending a digest
if (!unreadNotifs.length &&
!topics.top.length && !topics.popular.length && !topics.recent.length &&
!publicRooms.length) {
return;
}
@@ -120,6 +124,7 @@ Digest.send = async function (data) {
username: userObj.username,
userslug: userObj.userslug,
notifications: unreadNotifs,
publicRooms: publicRooms,
recent: topics.recent,
topTopics: topics.top,
popularTopics: topics.popular,
@@ -212,3 +217,8 @@ async function getTermTopics(term, uid) {
});
return { top, popular, recent };
}
async function getUnreadPublicRooms(uid) {
const publicRooms = await messaging.getPublicRooms(uid, uid);
return publicRooms.filter(r => r && r.unread);
}