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

chat notif/unread fix

Browse Source
This commit is contained in:
Barış Soner Uşaklı
2016-01-19 12:02:51 +02:00
parent 056bc2f382
commit 46c3e5c126
2 changed files with 18 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/messaging/notifications.js
View File

@@ -48,7 +48,7 @@ module.exports = function(Messaging) {
delete Messaging.notifyQueue[fromUid + ':' + roomId]; delete Messaging.notifyQueue[fromUid + ':' + roomId];
} }
}); });
}, 1000*60); // wait 60s before sending }, 1000 * 60); // wait 60s before sending
}); });
}; };

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

@@ -29,8 +29,6 @@ SocketModules.chats.get = function(socket, data, callback) {
since: data.since, since: data.since,
isNew: false isNew: false
}, callback); }, callback);
Messaging.markRead(socket.uid, data.roomId);
}; };
SocketModules.chats.getRaw = function(socket, data, callback) { SocketModules.chats.getRaw = function(socket, data, callback) {
@@ -130,19 +128,7 @@ SocketModules.chats.loadRoom = function(socket, data, callback) {
results.roomData.showUserInput = !results.roomData.maximumUsersInChatRoom || results.roomData.maximumUsersInChatRoom > 2; results.roomData.showUserInput = !results.roomData.maximumUsersInChatRoom || results.roomData.maximumUsersInChatRoom > 2;
next(null, results.roomData); next(null, results.roomData);
} }
], function(err, room) { ], callback);
if (!err) {
// Mark notification read
var nids = room.users.filter(function(user) {
return parseInt(user.uid, 10) !== socket.uid;
}).map(function(user) {
return 'chat_' + user.uid + '_' + data.roomId;
});
notifications.markReadMultiple(nids, socket.uid);
}
callback(err, room);
});
}; };
SocketModules.chats.addUserToRoom = function(socket, data, callback) { SocketModules.chats.addUserToRoom = function(socket, data, callback) {
@@ -240,12 +226,27 @@ SocketModules.chats.canMessage = function(socket, roomId, callback) {
}; };
SocketModules.chats.markRead = function(socket, roomId, callback) { SocketModules.chats.markRead = function(socket, roomId, callback) {
Messaging.markRead(socket.uid, roomId, function(err) { async.parallel({
usersInRoom: async.apply(Messaging.getUidsInRoom, roomId, 0, -1),
markRead: async.apply(Messaging.markRead, socket.uid, roomId)
}, function(err, results) {
if (err) { if (err) {
return callback(err); return callback(err);
} }
Messaging.pushUnreadCount(socket.uid); Messaging.pushUnreadCount(socket.uid);
// Mark notification read
var nids = results.usersInRoom.filter(function(uid) {
return parseInt(uid, 10) !== socket.uid;
}).map(function(uid) {
return 'chat_' + uid + '_' + roomId;
});
notifications.markReadMultiple(nids, socket.uid, function() {
user.notifications.pushCount(socket.uid);
});
callback(); callback();
}); });
}; };