mirror of
https://github.com/NodeBB/NodeBB.git
synced 2025-11-14 17:56:16 +01:00
merged master fixed conflicts
This commit is contained in:
@@ -668,6 +668,12 @@ websockets.init = function(io) {
|
||||
});
|
||||
});
|
||||
|
||||
socket.on('api:notifications.getCount', function(callback) {
|
||||
user.notifications.getUnreadCount(uid, function(err, count) {
|
||||
callback(err ? err.message : null, count);
|
||||
});
|
||||
});
|
||||
|
||||
socket.on('api:categories.getRecentReplies', function(tid) {
|
||||
categories.getRecentReplies(tid, 4, function(replies) {
|
||||
socket.emit('api:categories.getRecentReplies', replies);
|
||||
|
||||
Reference in New Issue
Block a user