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

one more fix

Browse Source
This commit is contained in:
barisusakli
2014-09-09 18:32:09 -04:00
parent 20eb4def1d
commit b7eddda8c8
1 changed files with 15 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -25,7 +25,6 @@ var SocketIO = require('socket.io'),
var io; var io;
var onlineUsers = []; var onlineUsers = [];
var socketIdToUid = {};
process.on('message', onMessage); process.on('message', onMessage);
@@ -38,8 +37,6 @@ function onMessage(msg) {
if (msg.uid && onlineUsers.indexOf(msg.uid) === -1) { if (msg.uid && onlineUsers.indexOf(msg.uid) === -1) {
onlineUsers.push(msg.uid); onlineUsers.push(msg.uid);
} }
socketIdToUid[msg.socketid] = msg.uid;
} else if(msg.action === 'user:disconnect') { } else if(msg.action === 'user:disconnect') {
if (msg.uid && msg.socketCount <= 1) { if (msg.uid && msg.socketCount <= 1) {
var index = onlineUsers.indexOf(msg.uid); var index = onlineUsers.indexOf(msg.uid);
@@ -47,8 +44,6 @@ function onMessage(msg) {
onlineUsers.splice(index, 1); onlineUsers.splice(index, 1);
} }
} }
delete socketIdToUid[msg.socketid];
} }
} }
@@ -252,15 +247,18 @@ Sockets.in = function(room) {
}; };
Sockets.uidInRoom = function(uid, room) { Sockets.uidInRoom = function(uid, room) {
var socketIds = io.sockets.manager.rooms[room]; var userSocketIds = io.sockets.manager.rooms['/uid_' + uid];
if (!Array(socketIds) || !socketIds.length) { if (!Array.isArray(userSocketIds) || !userSocketIds.length) {
return false; return false;
} }
uid = parseInt(uid, 10); var roomSocketIds = io.sockets.manager.rooms['/' + room];
if (!Array.isArray(roomSocketIds) || !roomSocketIds.length) {
return false;
}
for (var i=0; i<socketIds.length; ++i) { for (var i=0; i<userSocketIds.length; ++i) {
if (socketIdToUid[socketIds[i]] === uid) { if (roomSocketIds.indexOf(userSocketIds[i]) !== -1) {
return true; return true;
} }
} }
@@ -408,32 +406,19 @@ Sockets.getUidsInRoom = function(roomName) {
} }
for(var i=0; i<socketids.length; ++i) { for(var i=0; i<socketids.length; ++i) {
var uid = socketIdToUid[socketids[i]]; var socketRooms = Object.keys(io.sockets.manager.roomClients[socketids[i]]);
if (uid && uids.indexOf(uid) === -1) { if (Array.isArray(socketRooms)) {
uids.push(uid); socketRooms.forEach(function(roomName) {
if (roomName.indexOf('/uid_') === 0 ) {
uids.push(roomName.split('_')[1]);
}
});
} }
} }
return uids; return uids;
}; };
Sockets.getAnonCountInRoom = function(roomName) {
var count = 0;
roomName = roomName ? '/' + roomName : '';
var socketids = io.sockets.manager.rooms[roomName];
if (!Array.isArray(socketids)) {
return [];
}
for(var i=0; i<socketids.length; ++i) {
if (socketIdToUid[socketids[i]] === 0) {
++count;
}
}
return count;
};
Sockets.emitTopicPostStats = emitTopicPostStats; Sockets.emitTopicPostStats = emitTopicPostStats;
function emitTopicPostStats(callback) { function emitTopicPostStats(callback) {
db.getObjectFields('global', ['topicCount', 'postCount'], function(err, data) { db.getObjectFields('global', ['topicCount', 'postCount'], function(err, data) {