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

Removed group query from route

Browse Source
This commit is contained in:
Keith Holliday
2016-03-22 16:10:17 -05:00
parent a8e4455124
commit da08b6c814
2 changed files with 4 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
website/src/controllers/api-v3/groups.js
+4 -6
View File
@@ -329,17 +329,15 @@ api.rejectGroupInvite = {
let validationErrors = req.validationErrors();
if (validationErrors) throw validationErrors;
let group = await Group.getGroup({user, groupId: req.params.groupId, optionalMembership: true}); // Do not fetch chat and work even if the user is not yet a member of the group
if (!group) throw new NotFound(res.t('groupNotFound'));
let groupId = req.params.groupId;
let isUserInvited = false;
if (group.type === 'party' && group._id === user.invitations.party.id) {
if (groupId === user.invitations.party.id) {
user.invitations.party = {};
user.markModified('invitations.party');
isUserInvited = true;
} else if (group.type === 'guild') {
let hasInvitation = removeFromArray(user.invitations.guilds, { id: group._id });
} else {
let hasInvitation = removeFromArray(user.invitations.guilds, { id: groupId });
if (hasInvitation) {
isUserInvited = true;