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

dont mark chat notifications read if you are not in the room

Browse Source
This commit is contained in:
barisusakli
2016-11-25 20:50:45 +03:00
parent c33d3e874a
commit aa69481a0c
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/socket.io/modules.js
View File

@@ -245,7 +245,7 @@ SocketModules.chats.markRead = function (socket, roomId, callback) {
return callback(new Error('[[error:invalid-data]]')); return callback(new Error('[[error:invalid-data]]'));
} }
async.parallel({ async.parallel({
usersInRoom: async.apply(Messaging.getUidsInRoom, roomId, 0, -1), uidsInRoom: async.apply(Messaging.getUidsInRoom, roomId, 0, -1),
markRead: async.apply(Messaging.markRead, socket.uid, roomId) markRead: async.apply(Messaging.markRead, socket.uid, roomId)
}, function (err, results) { }, function (err, results) {
if (err) { if (err) {
@@ -253,9 +253,14 @@ SocketModules.chats.markRead = function (socket, roomId, callback) {
} }
Messaging.pushUnreadCount(socket.uid); Messaging.pushUnreadCount(socket.uid);
server.in('uid_' + socket.uid).emit('event:chats.markedAsRead', {roomId: roomId});
if (results.uidsInRoom.indexOf(socket.uid.toString()) === -1) {
return callback();
}
// Mark notification read // Mark notification read
var nids = results.usersInRoom.filter(function (uid) { var nids = results.uidsInRoom.filter(function (uid) {
return parseInt(uid, 10) !== socket.uid; return parseInt(uid, 10) !== socket.uid;
}).map(function (uid) { }).map(function (uid) {
return 'chat_' + uid + '_' + roomId; return 'chat_' + uid + '_' + roomId;
@@ -265,7 +270,6 @@ SocketModules.chats.markRead = function (socket, roomId, callback) {
user.notifications.pushCount(socket.uid); user.notifications.pushCount(socket.uid);
}); });
server.in('uid_' + socket.uid).emit('event:chats.markedAsRead', {roomId: roomId});
callback(); callback();
}); });
}; };