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

Upgrade lodash to v4 and lint more files (#8495)

Browse Source 
* common: import lodash modules separately

* remove test/content from .eslintignore, fix with eslint --fix content/index

* lint test/content

* lint content/index except for lodash methods

* upgrade server/models

* upgrade server/middlewares and server/libs

* port server/controllers/top-level

* port server/controllers/api-v3

* port views and tests

* client old port lodash and _(, missing _.

* upgrade client-old

* port common/script (root level files only)

* port common/script/fns

* port common/libs

* port common/script/ops

* port common/script/content and common/script/libs/shops.js

* misc fixes

* misc fixes

* misc fixes

* more tests fixes

* fix payments test stubbing, down to 2 failing tests

* remove more instances of lodash wrapping

* fix bug where toObject does not clone object

* fix tests

* upgrade migration or add lodash 4 note

* update shrinkwrap

* fix linting

* upgrade eslint-config-habitrpg

* update shrinkwrap

* recompile shrinkwrap
This commit is contained in:
Matteo Pagliazzi
2017-03-01 17:10:48 +01:00
committed by GitHub
parent ef02e59590
commit 98c019a0b6
150 changed files with 4996 additions and 1533 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
website/common/script/ops/buyArmoire.js
View File

@@ -1,6 +1,8 @@
import content from '../content/index';
import i18n from '../i18n';
import _ from 'lodash';
import filter from 'lodash/filter';
import isEmpty from 'lodash/isEmpty';
import pick from 'lodash/pick';
import count from '../count';
import splitWhitespace from '../libs/splitWhitespace';
import {
@@ -30,10 +32,10 @@ module.exports = function buyArmoire (user, req = {}, analytics) {
let message;
let armoireResult = randomVal.trueRandom();
let eligibleEquipment = _.filter(content.gear.flat, (eligible) => {
let eligibleEquipment = filter(content.gear.flat, (eligible) => {
return eligible.klass === 'armoire' && !user.items.gear.owned[eligible.key];
});
let armoireHasEquipment = !_.isEmpty(eligibleEquipment);
let armoireHasEquipment = !isEmpty(eligibleEquipment);
if (armoireHasEquipment && (armoireResult < YIELD_EQUIPMENT_THRESHOLD || !user.flags.armoireOpened)) {
eligibleEquipment.sort();
@@ -60,7 +62,7 @@ module.exports = function buyArmoire (user, req = {}, analytics) {
dropText: drop.text(req.language),
};
} else if ((armoireHasEquipment && armoireResult < YIELD_FOOD_THRESHOLD) || armoireResult < 0.5) { // eslint-disable-line no-extra-parens
drop = randomVal(_.where(content.food, {
drop = randomVal(filter(content.food, {
canDrop: true,
}));
@@ -107,7 +109,7 @@ module.exports = function buyArmoire (user, req = {}, analytics) {
});
}
let resData = _.pick(user, splitWhitespace('items flags'));
let resData = pick(user, splitWhitespace('items flags'));
if (armoireResp) resData.armoire = armoireResp;
return [