Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-02-05 06:09:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

browsing thread changes to use sessions

Browse Source
This commit is contained in:
Baris Soner Usakli
2013-07-15 16:05:06 -04:00
parent ba161c1f6c
commit 61cc0853db
2 changed files with 63 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/user.js
View File

@@ -924,7 +924,6 @@ var utils = require('./../public/src/utils.js'),
});
};
User.active = {
get_record : function(socket) {
RDB.mget(['global:active_user_record', 'global:active_user_record_date'], function(err, data) {

76
src/websockets.js
View File

@@ -82,6 +82,18 @@ var SocketIO = require('socket.io').listen(global.server, { log:false }),
if(index !== -1) {
userSockets[uid].splice(index, 1);
}
for(var roomName in rooms) {
socket.leave(roomName);
if(rooms[roomName][hs.sessionID]) {
delete rooms[roomName][hs.sessionID];
}
updateRoomBrowsingText(roomName);
}
// }
});
@@ -89,20 +101,33 @@ var SocketIO = require('socket.io').listen(global.server, { log:false }),
socket.emit('api:get_all_rooms', io.sockets.manager.rooms);
})
socket.on('event:enter_room', function(data) {
if (data.leave !== null) socket.leave (data.leave);
socket.join(data.enter);
function updateRoomBrowsingText(roomName) {
rooms[data.enter] = rooms[data.enter] || {};
if (uid) {
rooms[data.enter][uid] = true;
if (rooms[data.leave]) {
delete rooms[data.leave][uid];
function getUidsInRoom(room) {
var uids = [];
for(var sessionId in room) {
if(uids.indexOf(room[sessionId]) === -1)
uids.push(room[sessionId]);
}
return uids;
}
var uids = Object.keys(rooms[data.enter] || {});
var anonymousCount = io.sockets.clients(data.enter).length - uids.length;
function getAnonymousCount(roomName) {
var clients = io.sockets.clients(roomName);
var anonCount = 0;
for(var i=0; i<clients.length; ++i) {
var hs = clients[i].handshake;
if(hs && !users[hs.sessionID]) {
++anonCount;
}
}
return anonCount;
}
var uids = getUidsInRoom(rooms[roomName]);
var anonymousCount = getAnonymousCount(roomName);
function userList(users, anonymousCount, userCount) {
var usernames = [];
@@ -120,14 +145,39 @@ var SocketIO = require('socket.io').listen(global.server, { log:false }),
if (uids.length === 0) {
io.sockets.in(data.enter).emit('api:get_users_in_room', userList([], anonymousCount, 0));
io.sockets.in(roomName).emit('api:get_users_in_room', userList([], anonymousCount, 0));
} else {
user.getMultipleUserFields(uids, ['username', 'userslug'], function(users) {
io.sockets.in(data.enter).emit('api:get_users_in_room', userList(users, anonymousCount, users.length));
io.sockets.in(roomName).emit('api:get_users_in_room', userList(users, anonymousCount, users.length));
});
}
}
if (data.enter != 'admin') io.sockets.in('admin').emit('api:get_all_rooms', io.sockets.manager.rooms);
socket.on('event:enter_room', function(data) {
if (data.leave !== null) {
socket.leave(data.leave);
}
socket.join(data.enter);
rooms[data.enter] = rooms[data.enter] || {};
if(data.leave) {
if (uid) {
rooms[data.enter][hs.sessionID] = uid;
if (data.leave && rooms[data.leave] && rooms[data.leave][hs.sessionID]) {
delete rooms[data.leave][hs.sessionID];
}
}
updateRoomBrowsingText(data.leave);
}
updateRoomBrowsingText(data.enter);
if (data.enter != 'admin')
io.sockets.in('admin').emit('api:get_all_rooms', io.sockets.manager.rooms);
});