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

Merge branch 'release' into develop

Browse Source
This commit is contained in:
Sabe Jones
2017-11-20 19:21:17 +00:00
parent 1e69f42d0f 791c19b5f1
commit 4618fd8954
43 changed files with 398 additions and 304 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -755,13 +755,20 @@ api.leaveGroup = {
}
await group.leave(user, req.query.keep, req.body.keepChallenges);
if (group.hasNotCancelled()) await group.updateGroupPlan(true);
if (group.hasNotCancelled()) await group.updateGroupPlan(true);
_removeMessagesFromMember(user, group._id);
await user.save();
if (group.type !== 'party') {
let guildIndex = user.guilds.indexOf(group._id);
user.guilds.splice(guildIndex, 1);
}
let isMemberOfGroupPlan = await user.isMemberOfGroupPlan();
if (!isMemberOfGroupPlan) {
await payments.cancelGroupSubscriptionForUser(user, group);
}
res.respond(200, {});
},
};