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

Merge branch 'api-v3' into api-v3-unlock-fix

Browse Source
This commit is contained in:
Matteo Pagliazzi
2016-04-22 12:33:39 +02:00
parent dea693f799 1fe2220aa1
commit 6ba1afe479
141 changed files with 4016 additions and 3189 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
common/script/ops/unlock.js
View File

@@ -64,7 +64,7 @@ module.exports = function unlock (user, req = {}, analytics) {
_.set(user, `purchased.${pathPart}`, true);
});
} else {
if (alreadyOwns) {
if (alreadyOwns) { // eslint-disable-line no-lonely-if
let split = path.split('.');
let value = split.pop();
let key = split.join('.');
@@ -97,14 +97,14 @@ module.exports = function unlock (user, req = {}, analytics) {
}
}
let response = {
data: _.pick(user, splitWhitespace('purchased preferences items')),
};
let response = [
_.pick(user, splitWhitespace('purchased preferences items')),
];
if (!alreadyOwns) response.message = i18n.t('unlocked', req.language);
if (!alreadyOwns) response.push(i18n.t('unlocked', req.language));
if (req.v2 === true) {
return response.data;
return response[0];
} else {
return response;
}