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

added req.uid user id for logged in users, 0 for guests

Browse Source
This commit is contained in:
barisusakli
2015-04-01 00:23:57 -04:00
parent 878e548296
commit 2fd4bcde3f
17 changed files with 93 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/controllers/users.js
View File

@@ -11,18 +11,17 @@ var async = require('async'),
usersController.getOnlineUsers = function(req, res, next) {
var websockets = require('../socket.io');
var uid = req.user ? req.user.uid : 0;
async.parallel({
users: function(next) {
user.getUsersFromSet('users:online', uid, 0, 49, next);
user.getUsersFromSet('users:online', req.uid, 0, 49, next);
},
count: function(next) {
var now = Date.now();
db.sortedSetCount('users:online', now - 300000, now, next);
},
isAdministrator: function(next) {
user.isAdministrator(uid, next);
user.isAdministrator(req.uid, next);
}
}, function(err, results) {
if (err) {
@@ -62,9 +61,7 @@ usersController.getUsersSortedByJoinDate = function(req, res, next) {
};
usersController.getUsers = function(set, count, req, res, next) {
var uid = req.user ? req.user.uid : 0;
getUsersAndCount(set, uid, count, function(err, data) {
getUsersAndCount(set, req.uid, count, function(err, data) {
if (err) {
return next(err);
}
@@ -102,10 +99,9 @@ function getUsersAndCount(set, uid, count, callback) {
}
usersController.getUsersForSearch = function(req, res, next) {
var resultsPerPage = parseInt(meta.config.userSearchResultsPerPage, 10) || 20,
uid = req.user ? req.user.uid : 0;
var resultsPerPage = parseInt(meta.config.userSearchResultsPerPage, 10) || 20;
getUsersAndCount('users:joindate', uid, resultsPerPage, function(err, data) {
getUsersAndCount('users:joindate', req.uid, resultsPerPage, function(err, data) {
if (err) {
return next(err);
}