krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-15 05:37:22 +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

10
website/common/script/ops/revive.js
View File

@@ -1,6 +1,8 @@
import content from '../content/index';
import i18n from '../i18n';
import _ from 'lodash';
import merge from 'lodash/merge';
import reduce from 'lodash/reduce';
import each from 'lodash/each';
import {
NotAuthorized,
} from '../libs/errors';
@@ -12,7 +14,7 @@ module.exports = function revive (user, req = {}, analytics) {
throw new NotAuthorized(i18n.t('cannotRevive', req.language));
}
_.merge(user.stats, {
merge(user.stats, {
hp: 50,
exp: 0,
gp: 0,
@@ -22,7 +24,7 @@ module.exports = function revive (user, req = {}, analytics) {
user.stats.lvl--;
}
let lostStat = randomVal(_.reduce(['str', 'con', 'per', 'int'], function findRandomStat (m, k) {
let lostStat = randomVal(reduce(['str', 'con', 'per', 'int'], function findRandomStat (m, k) {
if (user.stats[k]) {
m[k] = k;
}
@@ -47,7 +49,7 @@ module.exports = function revive (user, req = {}, analytics) {
let losableItems = {};
let userClass = user.stats.class;
_.each(gearOwned, function findLosableItems (value, key) {
each(gearOwned, function findLosableItems (value, key) {
let itm;
if (value) {
itm = content.gear.flat[key];