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

refactor: move async call to parallel

Browse Source
This commit is contained in:
Barış Soner Uşaklı
2023-10-25 13:25:55 -04:00
parent 6a696c43a3
commit dabc282dde
1 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/messaging/notifications.js
View File

@@ -76,20 +76,22 @@ module.exports = function (Messaging) {
} }
}; };
async function sendNotification(fromUid, roomId, isPublic, messageObj) { async function sendNotification(fromUid, roomId, messageObj) {
fromUid = parseInt(fromUid, 10); fromUid = parseInt(fromUid, 10);
const [settings, roomData] = await Promise.all([ const [settings, roomData, realtimeUids] = await Promise.all([
db.getObject(`chat:room:${roomId}:notification:settings`), db.getObject(`chat:room:${roomId}:notification:settings`),
Messaging.getRoomData(roomId), Messaging.getRoomData(roomId),
io.getUidsInRoom(`chat_room_${roomId}`),
]); ]);
const roomDefault = roomData.notificationSetting; const roomDefault = roomData.notificationSetting;
let uidsToNotify = []; const uidsToNotify = [];
const { ALLMESSAGES } = Messaging.notificationSettings; const { ALLMESSAGES } = Messaging.notificationSettings;
await batch.processSortedSet(`chat:room:${roomId}:uids:online`, async (uids) => { await batch.processSortedSet(`chat:room:${roomId}:uids:online`, async (uids) => {
uids = uids.filter( uids = uids.filter(
uid => (parseInt((settings && settings[uid]) || roomDefault, 10) === ALLMESSAGES) && uid => (parseInt((settings && settings[uid]) || roomDefault, 10) === ALLMESSAGES) &&
fromUid !== parseInt(uid, 10) fromUid !== parseInt(uid, 10) &&
!realtimeUids.includes(parseInt(uid, 10))
); );
const hasRead = await Messaging.hasRead(uids, roomId); const hasRead = await Messaging.hasRead(uids, roomId);
uidsToNotify.push(...uids.filter((uid, index) => !hasRead[index])); uidsToNotify.push(...uids.filter((uid, index) => !hasRead[index]));
@@ -99,10 +101,6 @@ module.exports = function (Messaging) {
interval: 100, interval: 100,
}); });
// Suppress notifications for users who are literally present in the room
const realtimeUids = await io.getUidsInRoom(`chat_room_${isPublic ? 'public_' : ''}${roomId}`);
uidsToNotify = uidsToNotify.filter(uid => !realtimeUids.includes(parseInt(uid, 10)));
if (uidsToNotify.length) { if (uidsToNotify.length) {
const { displayname } = messageObj.fromUser; const { displayname } = messageObj.fromUser;
const isGroupChat = await Messaging.isGroupChat(roomId); const isGroupChat = await Messaging.isGroupChat(roomId);