Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-10-30 18:46:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

make one socket call to load unread counts

Browse Source
This commit is contained in:
barisusakli
2015-10-20 19:19:50 -04:00
parent 8630196a2d
commit 5e5cafafd0
5 changed files with 27 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
public/src/client/footer.js
View File

@@ -7,21 +7,13 @@ define('forum/footer', ['notifications', 'chat', 'components', 'translator'], fu
Chat.prepareDOM(); Chat.prepareDOM();
translator.prepareDOM(); translator.prepareDOM();
function updateUnreadTopicCount(err, count) { function updateUnreadTopicCount(count) {
if (err) {
return console.warn('Error updating unread count', err);
}
$('#unread-count i') $('#unread-count i')
.toggleClass('unread-count', count > 0) .toggleClass('unread-count', count > 0)
.attr('data-content', count > 20 ? '20+' : count); .attr('data-content', count > 20 ? '20+' : count);
} }
function updateUnreadChatCount(err, count) { function updateUnreadChatCount(count) {
if (err) {
return console.warn('Error updating unread count', err);
}
components.get('chat/icon') components.get('chat/icon')
.toggleClass('unread-count', count > 0) .toggleClass('unread-count', count > 0)
.attr('data-content', count > 20 ? '20+' : count); .attr('data-content', count > 20 ? '20+' : count);
@@ -62,11 +54,20 @@ define('forum/footer', ['notifications', 'chat', 'components', 'translator'], fu
socket.on('event:new_post', onNewPost); socket.on('event:new_post', onNewPost);
} }
socket.on('event:unread.updateCount', updateUnreadTopicCount); if (app.user.uid) {
socket.emit('user.getUnreadCount', updateUnreadTopicCount); socket.emit('user.getUnreadCounts', function(err, data) {
if (err) {
return app.alert(err.message);
}
updateUnreadTopicCount(data.unreadTopicCount);
updateUnreadChatCount(data.unreadChatCount);
Notifications.updateNotifCount(data.unreadNotificationCount);
});
}
socket.on('event:unread.updateCount', updateUnreadTopicCount);
socket.on('event:unread.updateChatCount', updateUnreadChatCount); socket.on('event:unread.updateChatCount', updateUnreadChatCount);
socket.emit('user.getUnreadChatCount', updateUnreadChatCount);
initUnreadTopics(); initUnreadTopics();
}); });

8
public/src/modules/notifications.js
View File

@@ -64,14 +64,6 @@ define('notifications', ['sounds', 'translator', 'components'], function(sound,
Notifications.updateNotifCount(count); Notifications.updateNotifCount(count);
} }
socket.emit('notifications.getCount', function(err, count) {
if (!err) {
Notifications.updateNotifCount(count);
} else {
Notifications.updateNotifCount(0);
}
});
socket.on('event:new_notification', function(notifData) { socket.on('event:new_notification', function(notifData) {
app.alert({ app.alert({
alert_id: 'new_notif', alert_id: 'new_notif',

2
src/messaging.js
View File

@@ -314,7 +314,7 @@ var db = require('./database'),
if (err) { if (err) {
return; return;
} }
sockets.in('uid_' + uid).emit('event:unread.updateChatCount', null, unreadCount); sockets.in('uid_' + uid).emit('event:unread.updateChatCount', unreadCount);
}); });
}; };

11
src/socket.io/user.js
View File

@@ -207,6 +207,17 @@ SocketUser.getUnreadChatCount = function(socket, data, callback) {
messaging.getUnreadCount(socket.uid, callback); messaging.getUnreadCount(socket.uid, callback);
}; };
SocketUser.getUnreadCounts = function(socket, data, callback) {
if (!socket.uid) {
return callback(null, {});
}
async.parallel({
unreadTopicCount: async.apply(topics.getTotalUnread, socket.uid),
unreadChatCount: async.apply(messaging.getUnreadCount, socket.uid),
unreadNotificationCount: async.apply(user.notifications.getUnreadCount, socket.uid)
}, callback);
};
SocketUser.loadMore = function(socket, data, callback) { SocketUser.loadMore = function(socket, data, callback) {
if (!data || !data.set || parseInt(data.after, 10) < 0) { if (!data || !data.set || parseInt(data.after, 10) < 0) {
return callback(new Error('[[error:invalid-data]]')); return callback(new Error('[[error:invalid-data]]'));

2
src/topics/unread.js
View File

@@ -142,7 +142,7 @@ module.exports = function(Topics) {
if (err) { if (err) {
return callback(err); return callback(err);
} }
require('../socket.io').in('uid_' + uid).emit('event:unread.updateCount', null, count); require('../socket.io').in('uid_' + uid).emit('event:unread.updateCount', count);
callback(); callback();
}); });
}; };