no upgrade script yet
This commit is contained in:
barisusakli
2015-05-19 23:04:28 -04:00
parent 56e5f505a0
commit aa577f4adc
11 changed files with 202 additions and 151 deletions

View File

@@ -48,26 +48,26 @@ usersController.getOnlineUsers = function(req, res, next) {
};
usersController.getUsersSortedByPosts = function(req, res, next) {
usersController.getUsers('users:postcount', 50, req, res, next);
usersController.getUsers('users:postcount', 0, 49, req, res, next);
};
usersController.getUsersSortedByReputation = function(req, res, next) {
usersController.getUsers('users:reputation', 50, req, res, next);
usersController.getUsers('users:reputation', 0, 49, req, res, next);
};
usersController.getUsersSortedByJoinDate = function(req, res, next) {
usersController.getUsers('users:joindate', 50, req, res, next);
usersController.getUsers('users:joindate', 0, 49, req, res, next);
};
usersController.getUsers = function(set, count, req, res, next) {
getUsersAndCount(set, req.uid, count, function(err, data) {
usersController.getUsers = function(set, start, stop, req, res, next) {
usersController.getUsersAndCount(set, req.uid, start, stop, function(err, data) {
if (err) {
return next(err);
}
var pageCount = Math.ceil(data.count / (parseInt(meta.config.userSearchResultsPerPage, 10) || 20));
var userData = {
search_display: 'hidden',
loadmore_display: data.count > count ? 'block' : 'hide',
loadmore_display: data.count > (stop - start + 1) ? 'block' : 'hide',
users: data.users,
pagination: pagination.create(1, pageCount)
};
@@ -76,13 +76,13 @@ usersController.getUsers = function(set, count, req, res, next) {
});
};
function getUsersAndCount(set, uid, count, callback) {
usersController.getUsersAndCount = function(set, uid, start, stop, callback) {
async.parallel({
users: function(next) {
user.getUsersFromSet(set, uid, 0, count - 1, next);
user.getUsersFromSet(set, uid, start, stop, next);
},
count: function(next) {
db.getObjectField('global', 'userCount', next);
db.sortedSetCard(set, next);
}
}, function(err, results) {
if (err) {
@@ -94,7 +94,7 @@ function getUsersAndCount(set, uid, count, callback) {
callback(null, results);
});
}
};
usersController.getUsersForSearch = function(req, res, next) {
if (!req.uid) {
@@ -102,7 +102,7 @@ usersController.getUsersForSearch = function(req, res, next) {
}
var resultsPerPage = parseInt(meta.config.userSearchResultsPerPage, 10) || 20;
getUsersAndCount('users:joindate', req.uid, resultsPerPage, function(err, data) {
usersController.getUsersAndCount('users:joindate', req.uid, 0, resultsPerPage - 1, function(err, data) {
if (err) {
return next(err);
}