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

22
common/script/ops/purchase.js
View File

@@ -54,12 +54,10 @@ module.exports = function purchase (user, req = {}, analytics) {
});
}
let response = {
data: _.pick(user, splitWhitespace('stats balance')),
message: i18n.t('plusOneGem'),
};
return response;
return [
_.pick(user, splitWhitespace('stats balance')),
i18n.t('plusOneGem'),
];
}
let acceptedTypes = ['eggs', 'hatchingPotions', 'food', 'quests', 'gear'];
@@ -119,14 +117,12 @@ module.exports = function purchase (user, req = {}, analytics) {
});
}
let response = {
data: _.pick(user, splitWhitespace('items balance')),
message: i18n.t('purchased', {type, key}),
};
if (req.v2 === true) {
return response.data;
return _.pick(user, splitWhitespace('items balance'));
} else {
return response;
return [
_.pick(user, splitWhitespace('items balance')),
i18n.t('purchased', {type, key}),
];
}
};