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

cleanup search, removed socketuser.loadSearchPage, use regular route

Browse Source
This commit is contained in:
barisusakli
2016-01-16 10:19:53 +02:00
parent 1a6f9dc3f4
commit ee9d0ac2da
3 changed files with 52 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
public/src/client/users.js
View File

@@ -118,7 +118,7 @@ define('forum/users', ['translator'], function(translator) {
page: page,
searchBy: 'username',
sortBy: $('.search select').val() || getSortBy(),
onlineOnly: $('.search .online-only').is(':checked')
onlineOnly: $('.search .online-only').is(':checked') || (getActiveSection() === 'online')
}, function(err, data) {
if (err) {
return app.alertError(err.message);
@@ -142,15 +142,9 @@ define('forum/users', ['translator'], function(translator) {
}
function loadPage(page) {
socket.emit('user.loadSearchPage', {
page: page,
sortBy: getSortBy(),
onlineOnly: $('.search .online-only').is(':checked')
}, function(err, data) {
if (err) {
return app.alertError(err.message);
}
var section = getActiveSection();
section = section !== 'users' ? section : '';
$.get('/api/users/' + section + '?page=' + page, function(data) {
renderSearchResults(data);
});
}

91
src/controllers/users.js
View File

@@ -1,29 +1,22 @@
"use strict";
var async = require('async');
var user = require('../user');
var meta = require('../meta');
var pagination = require('../pagination');
var plugins = require('../plugins');
var db = require('../database');
var helpers = require('./helpers');
var usersController = {};
var async = require('async'),
validator = require('validator'),
user = require('../user'),
meta = require('../meta'),
categories = require('../categories'),
topics = require('../topics'),
pagination = require('../pagination'),
plugins = require('../plugins'),
db = require('../database'),
helpers = require('./helpers');
usersController.getOnlineUsers = function(req, res, next) {
var websockets = require('../socket.io');
async.parallel({
users: function(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);
userData: function(next) {
usersController.getUsers('users:online', req.uid, req.query.page, next);
},
isAdministrator: function(next) {
user.isAdministrator(req.uid, next);
@@ -34,50 +27,54 @@ usersController.getOnlineUsers = function(req, res, next) {
}
if (!results.isAdministrator) {
results.users = results.users.filter(function(user) {
results.userData.users = results.userData.users.filter(function(user) {
return user && user.status !== 'offline';
});
}
var userData = {
'route_users:online': true,
loadmore_display: results.count > 50 ? 'block' : 'hide',
users: results.users,
anonymousUserCount: websockets.getOnlineAnonCount(),
title: '[[pages:users/online]]',
breadcrumbs: helpers.buildBreadcrumbs([{text: '[[global:users]]', url: '/users'}, {text: '[[global:online]]'}])
};
results.userData.anonymousUserCount = require('../socket.io').getOnlineAnonCount();
render(req, res, userData, next);
render(req, res, results.userData, next);
});
};
usersController.getUsersSortedByPosts = function(req, res, next) {
usersController.getUsers('users:postcount', 0, 49, req, res, next);
usersController.renderUsersPage('users:postcount', req, res, next);
};
usersController.getUsersSortedByReputation = function(req, res, next) {
if (parseInt(meta.config['reputation:disabled'], 10) === 1) {
return next();
}
usersController.getUsers('users:reputation', 0, 49, req, res, next);
usersController.renderUsersPage('users:reputation', req, res, next);
};
usersController.getUsersSortedByJoinDate = function(req, res, next) {
usersController.getUsers('users:joindate', 0, 49, req, res, next);
usersController.renderUsersPage('users:joindate', req, res, next);
};
usersController.getUsers = function(set, start, stop, req, res, next) {
usersController.renderUsersPage = function(set, req, res, next) {
usersController.getUsers(set, req.uid, req.query.page, function(err, userData) {
if (err) {
return next(err);
}
render(req, res, userData, next);
});
};
usersController.getUsers = function(set, uid, page, callback) {
var setToTitles = {
'users:postcount': '[[pages:users/sort-posts]]',
'users:reputation': '[[pages:users/sort-reputation]]',
'users:joindate': '[[pages:users/latest]]'
'users:joindate': '[[pages:users/latest]]',
'users:online': '[[pages:users/online]]'
};
var setToCrumbs = {
'users:postcount': '[[users:top_posters]]',
'users:reputation': '[[users:most_reputation]]',
'users:joindate': '[[global:users]]'
'users:joindate': '[[global:users]]',
'usesr:online': '[[global:online]]'
};
var breadcrumbs = [{text: setToCrumbs[set]}];
@@ -86,21 +83,26 @@ usersController.getUsers = function(set, start, stop, req, res, next) {
breadcrumbs.unshift({text: '[[global:users]]', url: '/users'});
}
usersController.getUsersAndCount(set, req.uid, start, stop, function(err, data) {
page = parseInt(page, 10) || 1;
var resultsPerPage = parseInt(meta.config.userSearchResultsPerPage, 10) || 20;
var start = Math.max(0, page - 1) * resultsPerPage;
var stop = start + resultsPerPage - 1;
usersController.getUsersAndCount(set, uid, start, stop, function(err, data) {
if (err) {
return next(err);
return callback(err);
}
var pageCount = Math.ceil(data.count / (parseInt(meta.config.userSearchResultsPerPage, 10) || 20));
var pageCount = Math.ceil(data.count / resultsPerPage);
var userData = {
loadmore_display: data.count > (stop - start + 1) ? 'block' : 'hide',
users: data.users,
pagination: pagination.create(1, pageCount),
pagination: pagination.create(page, pageCount),
title: setToTitles[set] || '[[pages:users/latest]]',
breadcrumbs: helpers.buildBreadcrumbs(breadcrumbs)
};
userData['route_' + set] = true;
render(req, res, userData, next);
callback(null, userData);
});
};
@@ -110,7 +112,12 @@ usersController.getUsersAndCount = function(set, uid, start, stop, callback) {
user.getUsersFromSet(set, uid, start, stop, next);
},
count: function(next) {
db.getObjectField('global', 'userCount', next);
if (set === 'users:online') {
var now = Date.now();
db.sortedSetCount('users:online', now - 300000, now, next);
} else {
db.getObjectField('global', 'userCount', next);
}
}
}, function(err, results) {
if (err) {
@@ -149,6 +156,4 @@ function render(req, res, data, next) {
});
}
module.exports = usersController;

48
src/socket.io/user/search.js
View File

@@ -1,8 +1,5 @@
'use strict';
var async = require('async');
var db = require('../../database');
var user = require('../../user');
var meta = require('../../meta');
var pagination = require('../../pagination');
@@ -33,49 +30,4 @@ module.exports = function(SocketUser) {
});
};
SocketUser.loadSearchPage = function(socket, data, callback) {
function done(err, result) {
if (err) {
return callback(err);
}
var pageCount = Math.ceil(result.count / resultsPerPage);
var userData = {
matchCount: result.users.length,
timing: (process.elapsedTimeSince(startTime) / 1000).toFixed(2),
users: result.users,
pagination: pagination.create(data.page, pageCount),
pageCount: pageCount
};
userData['route_users:' + data.sortBy] = true;
callback(null, userData);
}
if (!data || !data.page) {
return callback(new Error('[[error:invalid-data]]'));
}
var startTime = process.hrtime();
var controllers = require('../../controllers/users');
var pagination = require('../../pagination');
var resultsPerPage = parseInt(meta.config.userSearchResultsPerPage, 10) || 20;
var start = Math.max(0, data.page - 1) * resultsPerPage;
var stop = start + resultsPerPage - 1;
if (data.onlineOnly) {
async.parallel({
users: function(next) {
user.getUsersFromSet('users:online', socket.uid, 0, 49, next);
},
count: function(next) {
var now = Date.now();
db.sortedSetCount('users:online', now - 300000, now, next);
}
}, done);
} else {
controllers.getUsersAndCount('users:' + data.sortBy, socket.uid, start, stop, done);
}
};
};