Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-05-06 08:37:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

group member search change

Browse Source
This commit is contained in:
Barış Soner Uşaklı
2017-07-28 00:55:02 -04:00
parent f6890cd971
commit 7a405da60f
4 changed files with 31 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/groups/search.js
View File

@@ -63,29 +63,6 @@ module.exports = function (Groups) {
};
Groups.searchMembers = function (data, callback) {
function findUids(query, searchBy, callback) {
query = query.toLowerCase();
async.waterfall([
function (next) {
Groups.getMembers(data.groupName, 0, -1, next);
},
function (members, next) {
user.getUsersFields(members, ['uid'].concat([searchBy]), next);
},
function (users, next) {
var uids = [];
for (var i = 0; i < users.length; i += 1) {
var field = users[i][searchBy];
if (field.toLowerCase().startsWith(query)) {
uids.push(users[i].uid);
}
}
next(null, uids);
},
], callback);
}
if (!data.query) {
Groups.getOwnersAndMembers(data.groupName, data.uid, 0, 19, function (err, users) {
callback(err, { users: users });
@@ -93,10 +70,10 @@ module.exports = function (Groups) {
return;
}
data.findUids = findUids;
var results;
async.waterfall([
function (next) {
data.paginate = false;
user.search(data, next);
},
function (_results, next) {
@@ -104,6 +81,16 @@ module.exports = function (Groups) {
var uids = results.users.map(function (user) {
return user && user.uid;
});
Groups.isMembers(uids, data.groupName, next);
},
function (isMembers, next) {
results.users = results.users.filter(function (user, index) {
return isMembers[index];
});
var uids = results.users.map(function (user) {
return user && user.uid;
});
Groups.ownership.isOwners(uids, data.groupName, next);
},
function (isOwners, next) {