From a351cb5f4e1133b654e6f8e24063fd43b963509e Mon Sep 17 00:00:00 2001 From: Matteo Pagliazzi Date: Tue, 8 Mar 2016 17:49:18 +0100 Subject: [PATCH] change references to imported libs --- common/script/ops/addTag.js | 2 +- common/script/ops/addTask.js | 2 +- common/script/ops/addWebhook.js | 2 +- common/script/ops/buy.js | 2 +- common/script/ops/changeClass.js | 2 +- common/script/ops/disableClasses.js | 2 +- common/script/ops/purchase.js | 2 +- common/script/ops/rebirth.js | 6 +++--- common/script/ops/sortTask.js | 2 +- 9 files changed, 11 insertions(+), 11 deletions(-) diff --git a/common/script/ops/addTag.js b/common/script/ops/addTag.js index 88125ca600..a020a5fbaf 100644 --- a/common/script/ops/addTag.js +++ b/common/script/ops/addTag.js @@ -6,7 +6,7 @@ module.exports = function(user, req, cb) { } user.tags.push({ name: req.body.name, - id: req.body.id || api.uuid() + id: req.body.id || uuid() }); return typeof cb === "function" ? cb(null, user.tags) : void 0; }; diff --git a/common/script/ops/addTask.js b/common/script/ops/addTask.js index 51136a0fcc..a2d1895e1e 100644 --- a/common/script/ops/addTask.js +++ b/common/script/ops/addTask.js @@ -3,7 +3,7 @@ import i18n from '../i18n'; module.exports = function(user, req, cb) { var task; - task = api.taskDefaults(req.body); + task = taskDefaults(req.body); if (user.tasks[task.id] != null) { return typeof cb === "function" ? cb({ code: 409, diff --git a/common/script/ops/addWebhook.js b/common/script/ops/addWebhook.js index 61429449a4..99eaf49bba 100644 --- a/common/script/ops/addWebhook.js +++ b/common/script/ops/addWebhook.js @@ -3,7 +3,7 @@ import refPush from '../libs/refPush'; module.exports = function(user, req, cb) { var wh; wh = user.preferences.webhooks; - api.refPush(wh, { + refPush(wh, { url: req.body.url, enabled: req.body.enabled || true, id: req.body.id diff --git a/common/script/ops/buy.js b/common/script/ops/buy.js index d80c64169c..1686316264 100644 --- a/common/script/ops/buy.js +++ b/common/script/ops/buy.js @@ -46,7 +46,7 @@ module.exports = function(user, req, cb, analytics) { image: '', dropText: drop.text(req.language) }, req.language); - if (api.count.remainingGearInSet(user.items.gear.owned, 'armoire') === 0) { + if (count.remainingGearInSet(user.items.gear.owned, 'armoire') === 0) { user.flags.armoireEmpty = true; } armoireResp = { diff --git a/common/script/ops/changeClass.js b/common/script/ops/changeClass.js index 3fb591a31b..98fd8fd58d 100644 --- a/common/script/ops/changeClass.js +++ b/common/script/ops/changeClass.js @@ -51,7 +51,7 @@ module.exports = function(user, req, cb, analytics) { con: 0, per: 0, int: 0, - points: api.capByLevel(user.stats.lvl) + points: capByLevel(user.stats.lvl) }); user.flags.classSelected = false; } diff --git a/common/script/ops/disableClasses.js b/common/script/ops/disableClasses.js index 0b8dc9261e..89636ed52d 100644 --- a/common/script/ops/disableClasses.js +++ b/common/script/ops/disableClasses.js @@ -7,7 +7,7 @@ module.exports = function(user, req, cb) { user.flags.classSelected = true; user.preferences.disableClasses = true; user.preferences.autoAllocate = true; - user.stats.str = api.capByLevel(user.stats.lvl); + user.stats.str = capByLevel(user.stats.lvl); user.stats.points = 0; return typeof cb === "function" ? cb(null, _.pick(user, splitWhitespace('stats flags preferences'))) : void 0; }; diff --git a/common/script/ops/purchase.js b/common/script/ops/purchase.js index 525eddab86..d4d0f78816 100644 --- a/common/script/ops/purchase.js +++ b/common/script/ops/purchase.js @@ -8,7 +8,7 @@ module.exports = function(user, req, cb, analytics) { var analyticsData, convCap, convRate, item, key, price, ref, ref1, ref2, ref3, type; ref = req.params, type = ref.type, key = ref.key; if (type === 'gems' && key === 'gem') { - ref1 = api.planGemLimits, convRate = ref1.convRate, convCap = ref1.convCap; + ref1 = planGemLimits, convRate = ref1.convRate, convCap = ref1.convCap; convCap += user.purchased.plan.consecutive.gemCapExtra; if (!((ref2 = user.purchased) != null ? (ref3 = ref2.plan) != null ? ref3.customerId : void 0 : void 0)) { return typeof cb === "function" ? cb({ diff --git a/common/script/ops/rebirth.js b/common/script/ops/rebirth.js index 3971a82e61..1ddb75aba1 100644 --- a/common/script/ops/rebirth.js +++ b/common/script/ops/rebirth.js @@ -6,7 +6,7 @@ import { MAX_LEVEL } from '../constants'; module.exports = function(user, req, cb, analytics) { var analyticsData, flags, gear, lvl, stats; - if (user.balance < 2 && user.stats.lvl < api.maxLevel) { + if (user.balance < 2 && user.stats.lvl < MAX_LEVEL) { return typeof cb === "function" ? cb({ code: 401, message: i18n.t('notEnoughGems', req.language) @@ -16,7 +16,7 @@ module.exports = function(user, req, cb, analytics) { uuid: user._id, category: 'behavior' }; - if (user.stats.lvl < api.maxLevel) { + if (user.stats.lvl < MAX_LEVEL) { user.balance -= 2; analyticsData.acquireMethod = 'Gems'; analyticsData.gemCost = 8; @@ -27,7 +27,7 @@ module.exports = function(user, req, cb, analytics) { if (analytics != null) { analytics.track('Rebirth', analyticsData); } - lvl = api.capByLevel(user.stats.lvl); + lvl = capByLevel(user.stats.lvl); _.each(user.tasks, function(task) { if (task.type !== 'reward') { task.value = 0; diff --git a/common/script/ops/sortTask.js b/common/script/ops/sortTask.js index 73b60ebb06..b903b692dc 100644 --- a/common/script/ops/sortTask.js +++ b/common/script/ops/sortTask.js @@ -17,7 +17,7 @@ module.exports = function(user, req, cb) { } tasks = user[task.type + "s"]; if (task.type === 'todo' && tasks[from] !== task) { - preenedTasks = api.preenTodos(tasks); + preenedTasks = preenTodos(tasks); if (to !== -1) { to = tasks.indexOf(preenedTasks[to]); }