From 1a8f591251e694f85634996971976d603b7da9c7 Mon Sep 17 00:00:00 2001 From: Matteo Pagliazzi Date: Tue, 7 Mar 2017 14:16:14 +0100 Subject: [PATCH] mongoose: upgrade to 4.8.6 and remove un-necessary _.clone calls now that toObject clones correctly --- npm-shrinkwrap.json | 6 +++--- package.json | 2 +- website/server/libs/cron.js | 2 +- website/server/libs/payments.js | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index da7eb9042d..9e212544c0 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -8617,9 +8617,9 @@ "resolved": "https://registry.npmjs.org/mongodb-core/-/mongodb-core-2.1.8.tgz" }, "mongoose": { - "version": "4.8.5", - "from": "mongoose@>=4.7.1 <5.0.0", - "resolved": "https://registry.npmjs.org/mongoose/-/mongoose-4.8.5.tgz", + "version": "4.8.6", + "from": "mongoose@4.8.6", + "resolved": "https://registry.npmjs.org/mongoose/-/mongoose-4.8.6.tgz", "dependencies": { "async": { "version": "2.1.4", diff --git a/package.json b/package.json index 115ca58364..5b09d497ff 100644 --- a/package.json +++ b/package.json @@ -76,7 +76,7 @@ "method-override": "^2.3.5", "moment": "^2.13.0", "moment-recur": "^1.0.5", - "mongoose": "^4.7.1", + "mongoose": "^4.8.6", "mongoose-id-autoinc": "~2013.7.14-4", "morgan": "^1.7.0", "nconf": "~0.8.2", diff --git a/website/server/libs/cron.js b/website/server/libs/cron.js index 9f6474b630..36f3d3f2e1 100644 --- a/website/server/libs/cron.js +++ b/website/server/libs/cron.js @@ -398,7 +398,7 @@ 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.toObject()); // clone the old progress object + _progress = progress.toObject(); // clone the old progress object progress.down = -1300; _.merge(progress, {down: 0, up: 0, collectedItems: 0}); diff --git a/website/server/libs/payments.js b/website/server/libs/payments.js index 26bc40c011..79202da114 100644 --- a/website/server/libs/payments.js +++ b/website/server/libs/payments.js @@ -114,7 +114,7 @@ api.addSubToGroupUser = async function addSubToGroupUser (member, group) { if (member.hasNotCancelled()) await member.cancelSubscription(); let today = new Date(); - plan = _.clone(member.purchased.plan.toObject()); + plan = member.purchased.plan.toObject(); let extraMonths = Number(plan.extraMonths); if (plan.dateTerminated) extraMonths += _dateDiff(today, plan.dateTerminated); @@ -172,7 +172,7 @@ api.cancelGroupUsersSubscription = async function cancelGroupUsersSubscription ( api.cancelGroupSubscriptionForUser = async function cancelGroupSubscriptionForUser (user, group) { if (user.purchased.plan.customerId !== this.constants.GROUP_PLAN_CUSTOMER_ID) return; - let userGroups = _.clone(user.guilds.toObject()); + let userGroups = user.guilds.toObject(); userGroups.push('party'); let index = userGroups.indexOf(group._id);