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

res.respond: allow for thrid parameter (message), refactor shared ops responses and adapt tests

Browse Source
This commit is contained in:
Matteo Pagliazzi
2016-04-21 00:52:03 +02:00
parent 9e3d8ba4ac
commit 6568fcfd5e
81 changed files with 419 additions and 465 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
common/script/ops/revive.js
View File

@@ -4,7 +4,6 @@ import _ from 'lodash';
import {
NotAuthorized,
} from '../libs/errors';
import splitWhitespace from '../libs/splitWhitespace';
import randomVal from '../fns/randomVal';
module.exports = function revive (user, req = {}, analytics) {
@@ -97,14 +96,12 @@ module.exports = function revive (user, req = {}, analytics) {
});
}
let response = {
data: _.pick(user, splitWhitespace('user.items')),
message,
};
if (req.v2 === true) {
return user;
} else {
return response;
return [
user.items,
message,
];
}
};