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

Ensured user is saved after validation checks (#9569)

Browse Source
This commit is contained in:
Keith Holliday
2017-11-23 20:46:02 -06:00
committed by GitHub
parent e628c5dc3b
commit 9ef7c45241
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
website/server/controllers/api-v3/quests.js
View File

@@ -177,9 +177,6 @@ api.acceptQuest = {
let validationErrors = req.validationErrors(); let validationErrors = req.validationErrors();
if (validationErrors) throw validationErrors; if (validationErrors) throw validationErrors;
user.party.quest.RSVPNeeded = false;
await user.save();
let group = await Group.getGroup({user, groupId: req.params.groupId, fields: 'type quest chat'}); let group = await Group.getGroup({user, groupId: req.params.groupId, fields: 'type quest chat'});
if (!group) throw new NotFound(res.t('groupNotFound')); if (!group) throw new NotFound(res.t('groupNotFound'));
@@ -188,6 +185,9 @@ api.acceptQuest = {
if (group.quest.active) throw new NotAuthorized(res.t('questAlreadyUnderway')); if (group.quest.active) throw new NotAuthorized(res.t('questAlreadyUnderway'));
if (group.quest.members[user._id]) throw new BadRequest(res.t('questAlreadyAccepted')); if (group.quest.members[user._id]) throw new BadRequest(res.t('questAlreadyAccepted'));
user.party.quest.RSVPNeeded = false;
await user.save();
group.markModified('quest'); group.markModified('quest');
group.quest.members[user._id] = true; group.quest.members[user._id] = true;
@@ -236,10 +236,6 @@ api.rejectQuest = {
let validationErrors = req.validationErrors(); let validationErrors = req.validationErrors();
if (validationErrors) throw validationErrors; if (validationErrors) throw validationErrors;
user.party.quest = Group.cleanQuestProgress();
user.markModified('party.quest');
await user.save();
let group = await Group.getGroup({user, groupId: req.params.groupId, fields: 'type quest chat'}); let group = await Group.getGroup({user, groupId: req.params.groupId, fields: 'type quest chat'});
if (!group) throw new NotFound(res.t('groupNotFound')); if (!group) throw new NotFound(res.t('groupNotFound'));
if (group.type !== 'party') throw new NotAuthorized(res.t('guildQuestsNotSupported')); if (group.type !== 'party') throw new NotAuthorized(res.t('guildQuestsNotSupported'));
@@ -248,6 +244,10 @@ api.rejectQuest = {
if (group.quest.members[user._id]) throw new BadRequest(res.t('questAlreadyAccepted')); if (group.quest.members[user._id]) throw new BadRequest(res.t('questAlreadyAccepted'));
if (group.quest.members[user._id] === false) throw new BadRequest(res.t('questAlreadyRejected')); if (group.quest.members[user._id] === false) throw new BadRequest(res.t('questAlreadyRejected'));
user.party.quest = Group.cleanQuestProgress();
user.markModified('party.quest');
await user.save();
group.quest.members[user._id] = false; group.quest.members[user._id] = false;
group.markModified('quest.members'); group.markModified('quest.members');