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

closes #1446

Browse Source
This commit is contained in:
barisusakli
2014-04-27 17:32:24 -04:00
parent fa8cdce748
commit 53021d31b0
1 changed files with 42 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
src/controllers/users.js
View File

@@ -9,7 +9,7 @@ var async = require('async'),
usersController.getOnlineUsers = function(req, res, next) {
var websockets = require('../socket.io');
user.getUsersFromSet('users:online', 0, 49, function (err, data) {
user.getUsersFromSet('users:online', 0, 49, function (err, users) {
if(err) {
return next(err);
}
@@ -26,34 +26,44 @@ usersController.getOnlineUsers = function(req, res, next) {
}
if (!isAdministrator) {
data = data.filter(function(item) {
users = users.filter(function(item) {
return item.status !== 'offline';
});
}
function iterator(userData, next) {
var online = websockets.isUserOnline(userData.uid);
if(!online) {
db.sortedSetRemove('users:online', userData.uid);
return next(null);
function updateUserOnlineStatus(user, next) {
var online = websockets.isUserOnline(user.uid);
if (!online) {
db.sortedSetRemove('users:online', user.uid);
return next();
}
onlineUsers.push(userData);
next(null);
onlineUsers.push(user);
next();
}
var anonymousUserCount = websockets.getOnlineAnonCount();
async.each(data, iterator, function(err) {
var userData = {
search_display: 'none',
loadmore_display: 'block',
users: onlineUsers,
anonymousUserCount: anonymousUserCount,
show_anon: anonymousUserCount?'':'hide'
};
async.each(users, updateUserOnlineStatus, function(err) {
if (err) {
return next(err);
}
res.render('users', userData);
db.sortedSetCard('users:online', function(err, count) {
if (err) {
return next(err);
}
var userData = {
search_display: 'none',
loadmore_display: count > 50 ? 'block' : 'hide',
users: onlineUsers,
anonymousUserCount: anonymousUserCount,
show_anon: anonymousUserCount?'':'hide'
};
res.render('users', userData);
});
});
});
});
@@ -76,14 +86,21 @@ function getUsers(set, res, next) {
if (err) {
return next(err);
}
var userData = {
search_display: 'none',
loadmore_display: 'block',
users: data,
show_anon: 'hide'
};
res.render('users', userData);
db.sortedSetCard(set, function(err, count) {
if (err) {
return next(err);
}
var userData = {
search_display: 'none',
loadmore_display: count > 50 ? 'block' : 'hide',
users: data,
show_anon: 'hide'
};
res.render('users', userData);
});
});
}