mirror of
https://github.com/HabitRPG/habitica.git
synced 2025-12-17 22:57:21 +01:00
Upgrade lodash to v4 and lint more files (#8495)
* 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:
@@ -397,7 +397,8 @@ export function cron (options = {}) {
|
||||
|
||||
// After all is said and done, progress up user's effect on quest, return those values & reset the user's
|
||||
let progress = user.party.quest.progress;
|
||||
_progress = _.cloneDeep(progress);
|
||||
_progress = _.cloneDeep(progress.toObject()); // clone the old progress object
|
||||
progress.down = -1300;
|
||||
_.merge(progress, {down: 0, up: 0, collectedItems: 0});
|
||||
|
||||
// Send notification for changes in HP and MP
|
||||
@@ -425,9 +426,9 @@ export function cron (options = {}) {
|
||||
// _(user.inbox.messages)
|
||||
// .sortBy('timestamp')
|
||||
// .takeRight(numberOfPMs - maxPMs)
|
||||
// .each(pm => {
|
||||
// .forEach(pm => {
|
||||
// delete user.inbox.messages[pm.id];
|
||||
// }).value();
|
||||
// })
|
||||
//
|
||||
// user.markModified('inbox.messages');
|
||||
// }
|
||||
|
||||
Reference in New Issue
Block a user