From 42239e119d7b4222429b92b1c6d22c210b87a8d5 Mon Sep 17 00:00:00 2001 From: pichalite Date: Thu, 18 Feb 2016 22:30:42 +0000 Subject: [PATCH 1/2] search banned users only on /users/banned route --- public/src/client/users.js | 3 ++- src/socket.io/user/search.js | 1 + src/user/search.js | 10 +++++++++- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/public/src/client/users.js b/public/src/client/users.js index d1a80279d9..4091390068 100644 --- a/public/src/client/users.js +++ b/public/src/client/users.js @@ -107,7 +107,8 @@ define('forum/users', ['translator'], function(translator) { page: page, searchBy: 'username', sortBy: $('.search select').val() || getSortBy(), - onlineOnly: $('.search .online-only').is(':checked') || (getActiveSection() === 'online') + onlineOnly: $('.search .online-only').is(':checked') || (getActiveSection() === 'online'), + bannedOnly: getActiveSection() === 'banned' }, function(err, data) { if (err) { return app.alertError(err.message); diff --git a/src/socket.io/user/search.js b/src/socket.io/user/search.js index 7cf4c0beac..ecef1127c2 100644 --- a/src/socket.io/user/search.js +++ b/src/socket.io/user/search.js @@ -19,6 +19,7 @@ module.exports = function(SocketUser) { searchBy: data.searchBy, sortBy: data.sortBy, onlineOnly: data.onlineOnly, + bannedOnly: data.bannedOnly, uid: socket.uid }, function(err, result) { if (err) { diff --git a/src/user/search.js b/src/user/search.js index 2d239163d1..db44e6eba6 100644 --- a/src/user/search.js +++ b/src/user/search.js @@ -84,7 +84,7 @@ module.exports = function(User) { function filterAndSortUids(uids, data, callback) { var sortBy = data.sortBy || 'joindate'; - var fields = ['uid', 'status', 'lastonline', sortBy]; + var fields = ['uid', 'status', 'lastonline', 'banned', sortBy]; User.getUsersFields(uids, fields, function(err, userData) { if (err) { @@ -96,6 +96,14 @@ module.exports = function(User) { return user && user.status !== 'offline' && (Date.now() - parseInt(user.lastonline, 10) < 300000); }); } + + console.log(userData); + + if(data.bannedOnly) { + userData = userData.filter(function(user) { + return user && user.banned; + }); + } sortUsers(userData, sortBy); From bd8b32b406c150faab65e90e431f2ba16787e2da Mon Sep 17 00:00:00 2001 From: pichalite Date: Thu, 18 Feb 2016 22:34:34 +0000 Subject: [PATCH 2/2] search banned users only on /users/banned route --- src/user/search.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/user/search.js b/src/user/search.js index db44e6eba6..b2a1e83a80 100644 --- a/src/user/search.js +++ b/src/user/search.js @@ -97,8 +97,6 @@ module.exports = function(User) { }); } - console.log(userData); - if(data.bannedOnly) { userData = userData.filter(function(user) { return user && user.banned;