Remove unused v2 code from /website/common/script (#8034)

* remove apiv2 behavior from ops

* remove apiv2 behavior from fns

website/common/script/ops/addWebhook.js

@@ -14,14 +14,10 @@ module.exports = function addWebhook (user, req = {}) {
 
   user.markModified('preferences.webhooks');
 
-  if (req.v2 === true) {
-    return user.preferences.webhooks;
-  } else {
-    return [
-      refPush(wh, {
-        url: req.body.url,
-        enabled: req.body.enabled,
-      }),
-    ];
-  }
+  return [
+    refPush(wh, {
+      url: req.body.url,
+      enabled: req.body.enabled,
+    }),
+  ];
 };

website/common/script/ops/allocateNow.js

@@ -1,15 +1,11 @@
 import _ from 'lodash';
 import autoAllocate from '../fns/autoAllocate';
 
-module.exports = function allocateNow (user, req = {}) {
+module.exports = function allocateNow (user) {
   _.times(user.stats.points, () => autoAllocate(user));
   user.stats.points = 0;
 
-  if (req.v2 === true) {
-    return _.pick(user, 'stats');
-  } else {
-    return [
-      user.stats,
-    ];
-  }
+  return [
+    user.stats,
+  ];
 };

website/common/script/ops/buyArmoire.js

@@ -105,12 +105,8 @@ module.exports = function buyArmoire (user, req = {}, analytics) {
   let resData = _.pick(user, splitWhitespace('items flags'));
   if (armoireResp) resData.armoire = armoireResp;
 
-  if (req.v2 === true) {
-    return resData;
-  } else {
-    return [
-      resData,
-      message,
-    ];
-  }
+  return [
+    resData,
+    message,
+  ];
 };

website/common/script/ops/buyGear.js

@@ -60,12 +60,8 @@ module.exports = function buyGear (user, req = {}, analytics) {
     });
   }
 
-  if (req.v2 === true) {
-    return _.pick(user, splitWhitespace('items achievements stats flags'));
-  } else {
-    return [
-      _.pick(user, splitWhitespace('items achievements stats flags')),
-      message,
-    ];
-  }
+  return [
+    _.pick(user, splitWhitespace('items achievements stats flags')),
+    message,
+  ];
 };

website/common/script/ops/buyHealthPotion.js

@@ -42,12 +42,8 @@ module.exports = function buyHealthPotion (user, req = {}, analytics) {
     });
   }
 
-  if (req.v2 === true) {
-    return user.stats;
-  } else {
-    return [
-      user.stats,
-      message,
-    ];
-  }
+  return [
+    user.stats,
+    message,
+  ];
 };

website/common/script/ops/buyMysterySet.js

@@ -1,8 +1,6 @@
 import i18n from '../i18n';
 import content from '../content/index';
 import _ from 'lodash';
-import splitWhitespace from '../libs/splitWhitespace';
-import pickDeep from '../libs/pickDeep';
 import {
   BadRequest,
   NotAuthorized,
@@ -45,12 +43,8 @@ module.exports = function buyMysterySet (user, req = {}, analytics) {
   user.purchased.plan.consecutive.trinkets--;
 
 
-  if (req.v2 === true) {
-    return pickDeep(user, splitWhitespace('items purchased.plan.consecutive'));
-  } else {
-    return [
-      { items: user.items, purchasedPlanConsecutive: user.purchased.plan.consecutive },
-      i18n.t('hourglassPurchaseSet', req.language),
-    ];
-  }
+  return [
+    { items: user.items, purchasedPlanConsecutive: user.purchased.plan.consecutive },
+    i18n.t('hourglassPurchaseSet', req.language),
+  ];
 };

website/common/script/ops/buyQuest.js

@@ -38,14 +38,10 @@ module.exports = function buyQuest (user, req = {}, analytics) {
     });
   }
 
-  if (req.v2 === true) {
-    return user.items.quests;
-  } else {
-    return [
-      user.items.quests,
-      i18n.t('messageBought', {
-        itemText: item.text(req.language),
-      }, req.language),
-    ];
-  }
+  return [
+    user.items.quests,
+    i18n.t('messageBought', {
+      itemText: item.text(req.language),
+    }, req.language),
+  ];
 };

website/common/script/ops/buySpecialSpell.js

@@ -22,14 +22,10 @@ module.exports = function buySpecialSpell (user, req = {}) {
 
   user.items.special[key]++;
 
-  if (req.v2 === true) {
-    return _.pick(user, splitWhitespace('items stats'));
-  } else {
-    return [
-      _.pick(user, splitWhitespace('items stats')),
-      i18n.t('messageBought', {
-        itemText: item.text(req.language),
-      }, req.language),
-    ];
-  }
+  return [
+    _.pick(user, splitWhitespace('items stats')),
+    i18n.t('messageBought', {
+      itemText: item.text(req.language),
+    }, req.language),
+  ];
 };

website/common/script/ops/changeClass.js

@@ -69,11 +69,7 @@ module.exports = function changeClass (user, req = {}, analytics) {
     user.flags.classSelected = false;
   }
 
-  if (req.v2 === true) {
-    return _.pick(user, splitWhitespace('stats flags items preferences'));
-  } else {
-    return [
-      _.pick(user, splitWhitespace('stats flags items preferences')),
-    ];
-  }
+  return [
+    _.pick(user, splitWhitespace('stats flags items preferences')),
+  ];
 };

website/common/script/ops/disableClasses.js

@@ -2,7 +2,7 @@ import splitWhitespace from '../libs/splitWhitespace';
 import { capByLevel } from '../statHelpers';
 import _ from 'lodash';
 
-module.exports = function disableClasses (user, req = {}) {
+module.exports = function disableClasses (user) {
   user.stats.class = 'warrior';
   user.flags.classSelected = true;
   user.preferences.disableClasses = true;
@@ -10,11 +10,7 @@ module.exports = function disableClasses (user, req = {}) {
   user.stats.str = capByLevel(user.stats.lvl);
   user.stats.points = 0;
 
-  if (req.v2 === true) {
-    return _.pick(user, splitWhitespace('stats flags preferences'));
-  } else {
-    return [
-      _.pick(user, splitWhitespace('stats flags preferences')),
-    ];
-  }
+  return [
+    _.pick(user, splitWhitespace('stats flags preferences')),
+  ];
 };

website/common/script/ops/equip.js

@@ -58,11 +58,7 @@ module.exports = function equip (user, req = {}) {
     }
   }
 
-  if (req.v2 === true) {
-    return user.items;
-  } else {
-    let res = [user.items];
-    if (message) res.push(message);
-    return res;
-  }
+  let res = [user.items];
+  if (message) res.push(message);
+  return res;
 };

website/common/script/ops/feed.js

@@ -80,14 +80,8 @@ module.exports = function feed (user, req = {}) {
 
   user.items.food[food.key]--;
 
-  if (req.v2 === true) {
-    return {
-      value: userPets[pet.key],
-    };
-  } else {
-    return [
-      userPets[pet.key],
-      message,
-    ];
-  }
+  return [
+    userPets[pet.key],
+    message,
+  ];
 };

website/common/script/ops/getTag.js

@@ -1,18 +0,0 @@
-import _ from 'lodash';
-import i18n from '../i18n';
-import { NotFound } from '../libs/errors';
-
-// TODO used only in client, move there?
-
-module.exports = function getTag (user, req = {}) {
-  let tid = _.get(req, 'params.id');
-
-  let index = _.findIndex(user.tags, {
-    id: tid,
-  });
-  if (index === -1) {
-    throw new NotFound(i18n.t('messageTagNotFound', req.language));
-  }
-
-  return user.tags[index];
-};

website/common/script/ops/getTags.js

@@ -1,5 +0,0 @@
-// TODO used only in client, move there?
-
-module.exports = function getTags (user) {
-  return user.tags;
-};

website/common/script/ops/hatch.js

@@ -33,12 +33,8 @@ module.exports = function hatch (user, req = {}) {
   user.items.eggs[egg]--;
   user.items.hatchingPotions[hatchingPotion]--;
 
-  if (req.v2 === true) {
-    return user.items;
-  } else {
-    return [
-      user.items,
-      i18n.t('messageHatched', req.language),
-    ];
-  }
+  return [
+    user.items,
+    i18n.t('messageHatched', req.language),
+  ];
 };

website/common/script/ops/hourglassPurchase.js

@@ -5,7 +5,6 @@ import {
   BadRequest,
   NotAuthorized,
 } from '../libs/errors';
-import splitWhitespace from '../libs/splitWhitespace';
 
 module.exports = function purchaseHourglass (user, req = {}, analytics) {
   let key = _.get(req, 'params.key');
@@ -51,12 +50,8 @@ module.exports = function purchaseHourglass (user, req = {}, analytics) {
     });
   }
 
-  if (req.v2 === true) {
-    return _.pick(user, splitWhitespace('items purchased.plan.consecutive'));
-  } else {
-    return [
-      { items: user.items, purchasedPlanConsecutive: user.purchased.plan.consecutive },
-      i18n.t('hourglassPurchase', req.language),
-    ];
-  }
+  return [
+    { items: user.items, purchasedPlanConsecutive: user.purchased.plan.consecutive },
+    i18n.t('hourglassPurchase', req.language),
+  ];
 };

website/common/script/ops/index.js

@@ -1,4 +1,3 @@
-import update from './update';
 import sleep from './sleep';
 import revive from './revive';
 import reset from './reset';
@@ -11,8 +10,6 @@ import deleteTask from './deleteTask';
 import addTask from './addTask';
 import addTag from './addTag';
 import sortTag from './sortTag';
-import getTags from './getTags';
-import getTag from './getTag';
 import updateTag from './updateTag';
 import deleteTag from './deleteTag';
 import addWebhook from './addWebhook';
@@ -47,7 +44,6 @@ import scoreTask from './scoreTask';
 import markPmsRead from './markPMSRead';
 
 module.exports = {
-  update,
   sleep,
   revive,
   reset,
@@ -60,8 +56,6 @@ module.exports = {
   addTask,
   addTag,
   sortTag,
-  getTags,
-  getTag,
   updateTag,
   deleteTag,
   addWebhook,

website/common/script/ops/markPMSRead.js

@@ -1,14 +1,10 @@
 import i18n from '../i18n';
 
-module.exports = function markPmsRead (user, req = {}) {
+module.exports = function markPmsRead (user) {
   user.inbox.newMessages = 0;
 
-  if (req.v2 === true) {
-    return user;
-  } else {
-    return [
-      user.inbox.newMessages,
-      i18n.t('pmsMarkedRead'),
-    ];
-  }
+  return [
+    user.inbox.newMessages,
+    i18n.t('pmsMarkedRead'),
+  ];
 };

website/common/script/ops/openMysteryItem.js

@@ -28,12 +28,8 @@ module.exports = function openMysteryItem (user, req = {}, analytics) {
     });
   }
 
-  if (req.v2 === true) {
-    return user.items.gear.owned;
-  } else {
-    return [
-      item,
-      i18n.t('mysteryItemOpened', req.language),
-    ];
-  }
+  return [
+    item,
+    i18n.t('mysteryItemOpened', req.language),
+  ];
 };

website/common/script/ops/purchase.js

@@ -119,11 +119,7 @@ module.exports = function purchase (user, req = {}, analytics) {
     });
   }
 
-  if (req.v2 === true) {
-    return _.pick(user, splitWhitespace('items balance'));
-  } else {
-    return [
-      _.pick(user, splitWhitespace('items balance')),
-    ];
-  }
+  return [
+    _.pick(user, splitWhitespace('items balance')),
+  ];
 };

website/common/script/ops/readCard.js

@@ -1,4 +1,3 @@
-import splitWhitespace from '../libs/splitWhitespace';
 import _ from 'lodash';
 import i18n from '../i18n';
 import {
@@ -21,12 +20,8 @@ module.exports = function readCard (user, req = {}) {
   user.items.special[`${cardType}Received`].shift();
   user.flags.cardReceived = false;
 
-  if (req.v2 === true) {
-    return _.pick(user, splitWhitespace('items.special flags.cardReceived'));
-  } else {
-    return [
-      { specialItems: user.items.special, cardReceived: user.flags.cardReceived },
-      i18n.t('readCard', {cardType}, req.language),
-    ];
-  }
+  return [
+    { specialItems: user.items.special, cardReceived: user.flags.cardReceived },
+    i18n.t('readCard', {cardType}, req.language),
+  ];
 };

website/common/script/ops/rebirth.js

@@ -97,12 +97,8 @@ module.exports = function rebirth (user, tasks = [], req = {}, analytics) {
 
   user.stats.buffs = {};
 
-  if (req.v2 === true) {
-    return user;
-  } else {
-    return [
-      {user, tasks},
-      i18n.t('rebirthComplete'),
-    ];
-  }
+  return [
+    {user, tasks},
+    i18n.t('rebirthComplete'),
+  ];
 };

website/common/script/ops/releaseBoth.js

@@ -58,12 +58,8 @@ module.exports = function releaseBoth (user, req = {}, analytics) {
     user.achievements.triadBingoCount++;
   }
 
-  if (req.v2 === true) {
-    return user;
-  } else {
-    return [
-      _.pick(user, splitWhitespace('achievements items balance')),
-      i18n.t('mountsAndPetsReleased'),
-    ];
-  }
+  return [
+    _.pick(user, splitWhitespace('achievements items balance')),
+    i18n.t('mountsAndPetsReleased'),
+  ];
 };

website/common/script/ops/releaseMounts.js

@@ -33,12 +33,8 @@ module.exports = function releaseMounts (user, req = {}, analytics) {
     });
   }
 
-  if (req.v2 === true) {
-    return user;
-  } else {
-    return [
-      user.items.mounts,
-      i18n.t('mountsReleased'),
-    ];
-  }
+  return [
+    user.items.mounts,
+    i18n.t('mountsReleased'),
+  ];
 };

website/common/script/ops/releasePets.js

@@ -31,12 +31,8 @@ module.exports = function releasePets (user, req = {}, analytics) {
     });
   }
 
-  if (req.v2 === true) {
-    return user;
-  } else {
-    return [
-      user.items.pets,
-      i18n.t('petsReleased'),
-    ];
-  }
+  return [
+    user.items.pets,
+    i18n.t('petsReleased'),
+  ];
 };

website/common/script/ops/reroll.js

@@ -30,12 +30,8 @@ module.exports = function reroll (user, tasks = [], req = {}, analytics) {
     });
   }
 
-  if (req.v2 === true) {
-    return user;
-  } else {
-    return [
-      {user, tasks},
-      i18n.t('fortifyComplete'),
-    ];
-  }
+  return [
+    {user, tasks},
+    i18n.t('fortifyComplete'),
+  ];
 };

website/common/script/ops/reset.js

@@ -1,7 +1,7 @@
 import resetGear from '../fns/resetGear';
 import i18n from '../i18n';
 
-module.exports = function reset (user, tasks = [], req = {}) {
+module.exports = function reset (user, tasks = []) {
   user.stats.hp = 50;
   user.stats.lvl = 1;
   user.stats.gp = 0;
@@ -20,12 +20,8 @@ module.exports = function reset (user, tasks = [], req = {}) {
 
   user.preferences.automaticAllocation = false;
 
-  if (req.v2 === true) {
-    return user;
-  } else {
-    return [
-      {user, tasksToRemove},
-      i18n.t('resetComplete'),
-    ];
-  }
+  return [
+    {user, tasksToRemove},
+    i18n.t('resetComplete'),
+  ];
 };

website/common/script/ops/revive.js

@@ -97,12 +97,8 @@ module.exports = function revive (user, req = {}, analytics) {
     });
   }
 
-  if (req.v2 === true) {
-    return user;
-  } else {
-    return [
-      user.items,
-      message,
-    ];
-  }
+  return [
+    user.items,
+    message,
+  ];
 };

website/common/script/ops/sell.js

@@ -33,11 +33,7 @@ module.exports = function sell (user, req = {}) {
   user.items[type][key]--;
   user.stats.gp += content[type][key].value;
 
-  if (req.v2 === true) {
-    return _.pick(user, splitWhitespace('stats items'));
-  } else {
-    return [
-      _.pick(user, splitWhitespace('stats items')),
-    ];
-  }
+  return [
+    _.pick(user, splitWhitespace('stats items')),
+  ];
 };

website/common/script/ops/sleep.js

@@ -1,9 +1,5 @@
-module.exports = function sleep (user, req = {}) {
+module.exports = function sleep (user) {
   user.preferences.sleep = !user.preferences.sleep;
 
-  if (req.v2 === true) {
-    return {};
-  } else {
-    return [user.preferences.sleep];
-  }
+  return [user.preferences.sleep];
 };

website/common/script/ops/unlock.js

@@ -111,9 +111,5 @@ module.exports = function unlock (user, req = {}, analytics) {
 
   if (!alreadyOwns) response.push(i18n.t('unlocked', req.language));
 
-  if (req.v2 === true) {
-    return response[0];
-  } else {
-    return response;
-  }
+  return response;
 };

website/common/script/ops/update.js

@@ -1,11 +0,0 @@
-import _ from 'lodash';
-
-// TODO used only in client, move there?
-
-module.exports = function updateUser (user, req = {}) {
-  _.each(req.body, (val, key) => {
-    _.set(user, key, val);
-  });
-
-  return user;
-};

website/common/script/ops/updateWebhook.js

@@ -12,9 +12,5 @@ module.exports = function updateWebhook (user, req) {
   user.preferences.webhooks[req.params.id].url = req.body.url;
   user.preferences.webhooks[req.params.id].enabled = req.body.enabled;
 
-  if (req.v2 === true) {
-    return user.preferences.webhooks;
-  } else {
-    return [user.preferences.webhooks[req.params.id]];
-  }
+  return [user.preferences.webhooks[req.params.id]];
 };