krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-16 14:17:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: removing party invitations

Browse Source
This commit is contained in:
Husman
2016-07-18 19:18:17 -07:00
parent 590adb3438
commit a798c4ef08
3 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
test/api/v3/integration/groups/POST-groups_id_removeMember.test.js
View File

@@ -120,11 +120,13 @@ describe('POST /groups/:groupId/removeMember/:memberId', () => {
});
it('can remove other invites', async () => {
expect(partyInvitedUser.invitations.party).to.not.be.empty;
await partyleader.post(`/groups/${party._id}/removeMember/${partyInvitedUser._id}`);
let invitedUserWithoutInvite = await partyInvitedUser.get('/user');
expect(_.findIndex(invitedUserWithoutInvite.invitations.party, {id: party._id})).eql(-1);
expect(invitedUserWithoutInvite.invitations.party).to.be.empty;
});
});
});

4
test/helpers/api-integration/v3/object-generators.js
View File

@@ -128,6 +128,10 @@ export async function createAndPopulateGroup (settings = {}) {
await Bluebird.all(invitationPromises);
await Bluebird.all(invitees.map((invitee) => {
return invitee.sync();
}));
return {
groupLeader,
group,

5
website/server/controllers/api-v3/groups.js
View File

@@ -466,8 +466,8 @@ api.removeGroupMember = {
removeFromArray(member.invitations.guilds, { id: group._id });
}
if (isInvited === 'party') {
user.invitations.party = {};
user.markModified('invitations.party');
member.invitations.party = {};
member.markModified('invitations.party');
}
} else {
throw new NotFound(res.t('groupMemberNotFound'));
@@ -514,6 +514,7 @@ async function _inviteByUUID (uuid, group, inviter, req, res) {
}
userToInvite.invitations.party = {id: group._id, name: group.name, inviter: inviter._id};
return userToInvite.save();
}
let groupLabel = group.type === 'guild' ? 'Guild' : 'Party';