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

Merge branch 'develop' into negue-WIP-Push-notifications

Browse source
This commit is contained in:
Blade Barringer 2015-05-13 19:11:57 -05:00
commit 3cbd5fd9ff
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -149,14 +149,20 @@ api.get = function(req, res, next) {
//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 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 (group.privacy === 'private' || gid === 'party') {
//If the user is not in the group query, remove a user and add the current user //If the user is not in the group query, remove a user and add the current user
if (!userInGroup) { group.members.pop().push(user); } if (!userInGroup) {
group.members.splice(0,1);
group.members.push(user);
}
res.json(group); 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 } 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 //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]} }); var q2 = Group.findOne({ _id: group._id, privacy:'public', members: {$in:[user._id]} });
q2.exec(function(err, group2){ q2.exec(function(err, group2){
if (err) return next(err); if (err) return next(err);
if (group2 && !userInGroup) { group.members.pop().push(user); } if (group2 && !userInGroup) {
group.members.splice(0,1);
group.members.push(user);
}
res.json(group); res.json(group);
}); });
} }