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

closes #809

Browse Source
This commit is contained in:
Baris Soner Usakli
2014-01-19 14:27:07 -05:00
parent 54c05f9027
commit 16a42619b5
2 changed files with 21 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
public/src/forum/topic.js
View File

@@ -537,7 +537,8 @@ define(['composer'], function(composer) {
socket.on('get_users_in_room', function(data) { socket.on('get_users_in_room', function(data) {
if(data) {
if(data && data.room.indexOf('topic') !== -1) {
var activeEl = $('.thread_active_users'); var activeEl = $('.thread_active_users');
function createUserIcon(uid, picture, userslug, username) { function createUserIcon(uid, picture, userslug, username) {

31
src/socket.io/index.js
View File

@@ -94,7 +94,11 @@ Sockets.init = function() {
}); });
} }
io.sockets.in('global').emit('user.isOnline', isUserOnline(uid)); socket.broadcast.emit('user.isOnline', null, {
online: isUserOnline(uid),
uid: uid,
timestamp: Date.now()
});
}); });
}); });
@@ -114,7 +118,11 @@ Sockets.init = function() {
} }
} }
io.sockets.in('global').emit('user.isOnline', isUserOnline(uid)); socket.broadcast.emit('user.isOnline', null, {
online: isUserOnline(uid),
uid: uid,
timestamp: Date.now()
});
emitOnlineUserCount(); emitOnlineUserCount();
@@ -190,7 +198,6 @@ Sockets.emitUserCount = function() {
}); });
}; };
// Use sessionData.server.sockets.in() instead of this method.
Sockets.in = function(room) { Sockets.in = function(room) {
return io.sockets.in(room); return io.sockets.in(room);
}; };
@@ -239,15 +246,15 @@ function updateRoomBrowsingText(roomName) {
var uids = getUidsInRoom(Sockets.rooms[roomName]), var uids = getUidsInRoom(Sockets.rooms[roomName]),
anonymousCount = getAnonymousCount(roomName); anonymousCount = getAnonymousCount(roomName);
if (uids.length === 0) { user.getMultipleUserFields(uids, ['uid', 'username', 'userslug', 'picture'], function(err, users) {
io.sockets.in(roomName).emit('get_users_in_room', { users: [], anonymousCount: anonymousCount }); if(!err) {
} else { io.sockets.in(roomName).emit('get_users_in_room', {
user.getMultipleUserFields(uids, ['uid', 'username', 'userslug', 'picture'], function(err, users) { users: users,
if(!err) { anonymousCount: anonymousCount,
io.sockets.in(roomName).emit('get_users_in_room', { users: users, anonymousCount: anonymousCount }); room: roomName
} });
}); }
} });
} }
Sockets.emitTopicPostStats = emitTopicPostStats; Sockets.emitTopicPostStats = emitTopicPostStats;