sudoxreboot/habitica
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica.git synced 2026-08-05 03:52:14 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Added user to group.member if they are a member of the group and not included in the query

Browse source
This commit is contained in:
TheHollidayInn 2015-04-24 16:04:05 -05:00
parent 65a0ecdd6a
commit 5fe6121495
1 changed files with 28 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
website/src/controllers/groups.js
View file

@ -34,16 +34,11 @@ var guildPopulate = {path: 'members', select: nameFields, options: {limit:15} };
* @param additionalFields: if we want to populate some additional field not fetched normally
* pass it as a string, parties only
*/
var populateQuery = function(type, q, additionalFields, user){
if (type == 'party') {
var populateQuery = function(type, q, additionalFields){
if (type == 'party')
q.populate('members', partyFields + (additionalFields ? (' ' + additionalFields) : ''));
} else {
if ( user ) {
//Use Conditional Semantics to always include the user
guildPopulate.match = {"$or" : [{"_id" : {"$gt" : 1}}, {"_id" : user._id}]};
}
else
q.populate(guildPopulate);
}
q.populate('invites', nameFields);
q.populate({
path: 'challenges',
@ -138,11 +133,32 @@ api.get = function(req, res, next) {
{_id:gid, privacy:'public'},
{_id:gid, privacy:'private', members: {$in:[user._id]}} // if the group is private, only return if they have access
]});
populateQuery(gid, q, null, user);
populateQuery(gid, q);
q.exec(function(err, group){
if (err) return next(err);
if (!group && gid!=='party') return res.json(404,{err: "Group not found or you don't have access."});
if (!group && group != null && gid!=='party') return res.json(404,{err: "Group not found or you don't have access."});
//Since we have a limit on how many members are populate to the group, we want to make sure the user is always in the group
var userInGroup = _.find(group.members, function(member){ return member._id == user._id; });
//If the group is private or the group is a party, then the user must be a member of the group based on access restrictions above
if (group.privacy === 'private' && gid !== 'party') {
//If the user is not in the group query, add them
if (userInGroup === undefined) { group.members.push(user); }
res.json(group);
} else if ( group.privacy === "public" ) { //The group is public, we must do an extra check to see if the user is already in the group query
//We must see how to check if a user is a member of a public group, so we requery
var q2 = Group.findOne({ _id: group._id, privacy:'public', members: {$in:[user._id]} });
q2.exec(function(err, group2){
if (err) return next(err);
if (group2 !== null) {
if (userInGroup === undefined) { group.members.push(user); }
}
res.json(group);
});
}
gid = null;
});
};