krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-19 15:48:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

v3: always save user when casting spell

Browse Source
This commit is contained in:
Matteo Pagliazzi
2016-05-15 22:30:04 +02:00
parent 1a14a6f4b7
commit c1c77b68b4
1 changed files with 19 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
website/server/controllers/api-v3/user.js
View File

@@ -351,16 +351,13 @@ api.castSpell = {
if (task.challenge.id) throw new BadRequest(res.t('challengeTasksNoCast')); if (task.challenge.id) throw new BadRequest(res.t('challengeTasksNoCast'));
spell.cast(user, task, req); spell.cast(user, task, req);
if (user.isModified()) {
await Bluebird.all([
user.save(),
task.save(),
]);
} else {
await task.save();
}
res.respond(200, task); let results = await Bluebird.all([
user.save(),
task.save(),
]);
res.respond(200, results[0]);
} else if (targetType === 'self') { } else if (targetType === 'self') {
spell.cast(user, null, req); spell.cast(user, null, req);
await user.save(); await user.save();
@@ -377,15 +374,14 @@ api.castSpell = {
spell.cast(user, tasks, req); spell.cast(user, tasks, req);
let toSave = tasks.filter(t => t.isModified()); let toSave = tasks.filter(t => t.isModified());
let isUserModified = user.isModified(); toSave.unshift(user.save());
if (isUserModified) toSave.unshift(user.save());
let saved = await Bluebird.all(toSave); let saved = await Bluebird.all(toSave);
let response = { let response = {
tasks: isUserModified ? _.rest(saved) : saved, tasks: saved,
user,
}; };
if (isUserModified) response.user = user;
res.respond(200, response); res.respond(200, response);
} else if (targetType === 'party' || targetType === 'user') { } else if (targetType === 'party' || targetType === 'user') {
let party = await Group.getGroup({groupId: 'party', user}); let party = await Group.getGroup({groupId: 'party', user});
@@ -396,7 +392,12 @@ api.castSpell = {
if (!party) { if (!party) {
partyMembers = [user]; // Act as solo party partyMembers = [user]; // Act as solo party
} else { } else {
partyMembers = await User.find({'party._id': party._id}).select(partyMembersFields).exec(); partyMembers = await User.find({
'party._id': party._id,
_id: { $ne: user._id }, // add separately
}).select(partyMembersFields).exec();
partyMembers.unshift(user);
} }
spell.cast(user, partyMembers, req); spell.cast(user, partyMembers, req);
@@ -411,7 +412,9 @@ api.castSpell = {
} }
if (!partyMembers) throw new NotFound(res.t('userWithIDNotFound', {userId: targetId})); if (!partyMembers) throw new NotFound(res.t('userWithIDNotFound', {userId: targetId}));
spell.cast(user, partyMembers, req); spell.cast(user, partyMembers, req);
if (user.isModified()) { if (user.isModified()) {
await Bluebird.all([ await Bluebird.all([
user.save(), user.save(),
@@ -421,6 +424,7 @@ api.castSpell = {
await partyMembers.save(); await partyMembers.save();
} }
} }
res.respond(200, partyMembers); res.respond(200, partyMembers);
if (party && !spell.silent) { if (party && !spell.silent) {