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

removed users:online set

Browse Source 
using websockets.getConnectedClients directly
This commit is contained in:
barisusakli
2014-10-13 22:25:34 -04:00
parent 129a438ebe
commit 40fe40deac
3 changed files with 30 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/controllers/users.js
View File

@@ -15,7 +15,7 @@ usersController.getOnlineUsers = function(req, res, next) {
user.getUsersFromSet('users:online', 0, 49, next);
},
count: function(next) {
db.sortedSetCard('users:online', next);
next(null, websockets.getConnectedClients().length);
},
isAdministrator: function(next) {
user.isAdministrator(uid, next);

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

@@ -98,8 +98,6 @@ Sockets.init = function(server) {
Sockets.server = io;
db.delete('users:online');
fs.readdir(__dirname, function(err, files) {
files.splice(files.indexOf('index.js'), 1);
@@ -140,30 +138,30 @@ Sockets.init = function(server) {
if (uid) {
socket.join('uid_' + uid);
socket.join('online_users');
db.sortedSetAdd('users:online', Date.now(), uid, function(err) {
async.parallel({
user: function(next) {
user.getUserFields(uid, ['username', 'userslug', 'picture', 'status'], next);
},
isAdmin: function(next) {
user.isAdministrator(uid, next);
}
}, function(err, userData) {
if (err || !userData.user) {
return;
}
socket.emit('event:connect', {
status: 1,
username: userData.user.username,
userslug: userData.user.userslug,
picture: userData.user.picture,
isAdmin: userData.isAdmin,
uid: uid
});
socket.broadcast.emit('event:user_status_change', {uid:uid, status: userData.user.status});
async.parallel({
user: function(next) {
user.getUserFields(uid, ['username', 'userslug', 'picture', 'status'], next);
},
isAdmin: function(next) {
user.isAdministrator(uid, next);
}
}, function(err, userData) {
if (err || !userData.user) {
return;
}
socket.emit('event:connect', {
status: 1,
username: userData.user.username,
userslug: userData.user.userslug,
picture: userData.user.picture,
isAdmin: userData.isAdmin,
uid: uid
});
socket.broadcast.emit('event:user_status_change', {uid:uid, status: userData.user.status});
});
} else {
socket.join('online_guests');
socket.emit('event:connect', {
@@ -179,12 +177,7 @@ Sockets.init = function(server) {
socket.on('disconnect', function() {
var socketCount = Sockets.getUserSocketCount(uid);
if (uid && socketCount <= 1) {
db.sortedSetRemove('users:online', uid, function(err) {
if (err) {
return winston.error(err.message);
}
socket.broadcast.emit('event:user_status_change', {uid: uid, status: 'offline'});
});
socket.broadcast.emit('event:user_status_change', {uid: uid, status: 'offline'});
}
onUserDisconnect(uid, socket.id, socketCount);

9
src/user.js
View File

@@ -230,7 +230,12 @@ var async = require('async'),
User.getUsersFromSet = function(set, start, stop, callback) {
async.waterfall([
function(next) {
db.getSortedSetRevRange(set, start, stop, next);
if (set === 'users:online') {
var uids = require('./socket.io').getConnectedClients();
next(null, uids.slice(start, stop + 1));
} else {
db.getSortedSetRevRange(set, start, stop, next);
}
},
function(uids, next) {
User.getUsers(uids, next);
@@ -247,7 +252,7 @@ var async = require('async'),
User.isAdministrator(uids, next);
},
isOnline: function(next) {
db.isSortedSetMembers('users:online', uids, next);
require('./socket.io').isUsersOnline(uids, next);
}
}, function(err, results) {
if (err) {