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

fix: suppress chat message notifications for users who are known to be in the chat room (uid is present in the corresponding socket.io room)

Browse Source
This commit is contained in:
Julian Lam
2023-10-25 12:02:28 -04:00
parent 5d7c10f128
commit 18c27d1ad3
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/messaging/notifications.js
View File

@@ -84,7 +84,7 @@ module.exports = function (Messaging) {
Messaging.getRoomData(roomId), Messaging.getRoomData(roomId),
]); ]);
const roomDefault = roomData.notificationSetting; const roomDefault = roomData.notificationSetting;
const uidsToNotify = []; let 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(
@@ -99,6 +99,10 @@ 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_${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);