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

cleanup

Browse Source
This commit is contained in:
barisusakli
2014-09-12 18:31:04 -04:00
parent e56b18822b
commit ddb02978c8
1 changed files with 47 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

95
src/controllers/users.js
View File

@@ -3,48 +3,45 @@
var usersController = {}; var usersController = {};
var async = require('async'), var async = require('async'),
user = require('./../user'), user = require('../user'),
db = require('./../database'); db = require('../database');
usersController.getOnlineUsers = function(req, res, next) { usersController.getOnlineUsers = function(req, res, next) {
var websockets = require('../socket.io'); var websockets = require('../socket.io');
var uid = req.user ? req.user.uid : 0;
user.getUsersFromSet('users:online', 0, 49, function (err, users) { async.parallel({
if(err) { users: function(next) {
user.getUsersFromSet('users:online', 0, 49, next);
},
count: function(next) {
db.sortedSetCard('users:online', next);
},
isAdministrator: function(next) {
user.isAdministrator(uid, next);
}
}, function(err, results) {
if (err) {
return next(err); return next(err);
} }
var uid = req.user ? req.user.uid : 0; if (!results.isAdministrator) {
results.users = results.users.filter(function(user) {
user.isAdministrator(uid, function (err, isAdministrator) { return user && user.status !== 'offline';
if(err) {
return next(err);
}
if (!isAdministrator) {
users = users.filter(function(user) {
return user.status !== 'offline';
});
}
var anonymousUserCount = websockets.getOnlineAnonCount();
db.sortedSetCard('users:online', function(err, count) {
if (err) {
return next(err);
}
var userData = {
search_display: 'none',
loadmore_display: count > 50 ? 'block' : 'hide',
users: users,
anonymousUserCount: anonymousUserCount,
show_anon: anonymousUserCount?'':'hide'
};
res.render('users', userData);
}); });
}); }
var anonymousUserCount = websockets.getOnlineAnonCount();
var userData = {
search_display: 'none',
loadmore_display: results.count > 50 ? 'block' : 'hide',
users: results.users,
anonymousUserCount: anonymousUserCount,
show_anon: anonymousUserCount ? '' : 'hide'
};
res.render('users', userData);
}); });
}; };
@@ -61,27 +58,29 @@ usersController.getUsersSortedByJoinDate = function(req, res, next) {
}; };
function getUsers(set, res, next) { function getUsers(set, res, next) {
user.getUsersFromSet(set, 0, 49, function (err, data) { async.parallel({
users: function(next) {
user.getUsersFromSet(set, 0, 49, next);
},
count: function(next) {
db.sortedSetCard(set, next);
}
}, function(err, results) {
if (err) { if (err) {
return next(err); return next(err);
} }
data = data.filter(function(user) { results.users = results.users.filter(function(user) {
return user && parseInt(user.uid, 10); return user && parseInt(user.uid, 10);
}); });
db.sortedSetCard(set, function(err, count) {
if (err) {
return next(err);
}
var userData = { var userData = {
search_display: 'none', search_display: 'none',
loadmore_display: count > 50 ? 'block' : 'hide', loadmore_display: results.count > 50 ? 'block' : 'hide',
users: data, users: results.users,
show_anon: 'hide' show_anon: 'hide'
}; };
res.render('users', userData); res.render('users', userData);
});
}); });
} }