Kai/habitica
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Ensured tavern is not returned twice and removed leader population

Browse Source
This commit is contained in:
Keith Holliday
2016-01-19 08:13:24 -06:00
parent c5947ca9c4
commit be55176954
2 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
website/src/controllers/api-v3/groups.js
+5 -3
View File
@@ -86,14 +86,14 @@ api.getGroups = {
// TODO validate types are acceptable? probably not necessary
let types = req.query.type.split(',');
let groupFields = 'name description memberCount balance leader';
let groupFields = 'name description memberCount balance';
let sort = '-memberCount';
let queries = [];
types.forEach(type => {
switch (type) {
case 'party':
queries.push(Group.getGroup({user, groupId: 'party', fields: groupFields, populateLeader: true}));
queries.push(Group.getGroup({user, groupId: 'party', fields: groupFields}));
break;
case 'privateGuilds':
queries.push(Group.find({
@@ -109,7 +109,9 @@ api.getGroups = {
}).select(groupFields).sort(sort).exec()); // TODO use lean?
break;
case 'tavern':
queries.push(Group.getGroup({user, groupId: 'habitrpg', fields: groupFields, populateLeader: true}));
if (types.indexOf('publicGuilds') === -1) {
queries.push(Group.getGroup({user, groupId: 'habitrpg', fields: groupFields}));
}
break;
}
});