Node.js based forum software built for the modern web
fix: realtimeUids check in messaging notifications
Barış Soner Uşaklı334ab73de96a
diff --git a/src/api/chats.js b/src/api/chats.jsindex 0c042fe970..ff9e8ca3d6 100644--- a/src/api/chats.js+++ b/src/api/chats.js@@ -269,10 +269,10 @@ chatsAPI.users = async (caller, data) => {throw new Error('[[error:no-privileges]]');}users.forEach((user) => {- const isSelf = parseInt(user.uid, 10) === parseInt(caller.uid, 10);+ const isSelf = String(user.uid) === String(caller.uid);user.canKick = isOwner && !isSelf;user.canToggleOwner = utils.isNumber(user.uid) && (isAdmin || isOwner) && !isSelf;- user.online = parseInt(user.uid, 10) === parseInt(caller.uid, 10) || onlineUids.includes(String(user.uid));+ user.online = isSelf || onlineUids.includes(String(user.uid));});return { users };};diff --git a/src/messaging/notifications.js b/src/messaging/notifications.jsindex 4f437c87ed..8673a32ead 100644--- a/src/messaging/notifications.js+++ b/src/messaging/notifications.js@@ -100,7 +100,7 @@ module.exports = function (Messaging) {uid => utils.isNumber(uid) &&(parseInt((settings && settings[uid]) || roomDefault, 10) === ALLMESSAGES) &&String(fromUid) !== String(uid) &&- !realtimeUids.includes(parseInt(uid, 10))+ !realtimeUids.includes(uid));const hasRead = await Messaging.hasRead(uids, roomId);uidsToNotify.push(...uids.filter((uid, index) => !hasRead[index]));