Merge branch 'api-v3-ops-release-both' of https://github.com/TheHollidayInn/habitrpg into TheHollidayInn-api-v3-ops-release-both

common/script/index.js

@@ -119,6 +119,7 @@ import purchaseHourglass from './ops/hourglassPurchase';
 import readCard from './ops/readCard';
 import openMysteryItem from './ops/openMysteryItem';
 import releasePets from './ops/releasePets';
+import releaseBoth from './ops/releaseBoth';
 
 api.ops = {
   scoreTask,
@@ -139,6 +140,7 @@ api.ops = {
   readCard,
   openMysteryItem,
   releasePets,
+  releaseBoth,
 };
 
 import handleTwoHanded from './fns/handleTwoHanded';

common/script/ops/releaseBoth.js

@@ -1,50 +1,65 @@
 import content from '../content/index';
 import i18n from '../i18n';
+import {
+  NotAuthorized,
+} from '../libs/errors';
+import splitWhitespace from '../libs/splitWhitespace';
+
+module.exports = function releaseBoth (user, req = {}, analytics) {
+  let animal;
 
-module.exports = function(user, req, cb, analytics) {
-  var analyticsData, animal, giveTriadBingo;
   if (user.balance < 1.5 && !user.achievements.triadBingo) {
-    return typeof cb === "function" ? cb({
-      code: 401,
-      message: i18n.t('notEnoughGems', req.language)
-    }) : void 0;
-  } else {
-    giveTriadBingo = true;
-    if (!user.achievements.triadBingo) {
-      analyticsData = {
+    throw new NotAuthorized(i18n.t('notEnoughGems', req.language));
+  }
+
+  let giveTriadBingo = true;
+
+  if (!user.achievements.triadBingo) {
+    if (analytics) {
+      analytics.track('release pets & mounts', {
         uuid: user._id,
         acquireMethod: 'Gems',
         gemCost: 6,
         category: 'behavior'
-      };
-      if (typeof analytics !== "undefined" && analytics !== null) {
-        analytics.track('release pets & mounts', analyticsData);
-      }
-      user.balance -= 1.5;
-    }
-    user.items.currentMount = "";
-    user.items.currentPet = "";
-    for (animal in content.pets) {
-      if (user.items.pets[animal] === -1) {
-        giveTriadBingo = false;
-      }
-      user.items.pets[animal] = 0;
-      user.items.mounts[animal] = null;
-    }
-    if (!user.achievements.beastMasterCount) {
-      user.achievements.beastMasterCount = 0;
-    }
-    user.achievements.beastMasterCount++;
-    if (!user.achievements.mountMasterCount) {
-      user.achievements.mountMasterCount = 0;
-    }
-    user.achievements.mountMasterCount++;
-    if (giveTriadBingo) {
-      if (!user.achievements.triadBingoCount) {
-        user.achievements.triadBingoCount = 0;
-      }
-      user.achievements.triadBingoCount++;
+      });
     }
+
+    user.balance -= 1.5;
   }
-  return typeof cb === "function" ? cb(null, user) : void 0;
+
+  user.items.currentMount = "";
+  user.items.currentPet = "";
+
+  for (animal in content.pets) {
+    if (user.items.pets[animal] === -1) {
+      giveTriadBingo = false;
+    }
+
+    user.items.pets[animal] = 0;
+    user.items.mounts[animal] = null;
+  }
+
+  if (!user.achievements.beastMasterCount) {
+    user.achievements.beastMasterCount = 0;
+  }
+  user.achievements.beastMasterCount++;
+
+  if (!user.achievements.mountMasterCount) {
+    user.achievements.mountMasterCount = 0;
+  }
+  user.achievements.mountMasterCount++;
+
+  if (giveTriadBingo) {
+    if (!user.achievements.triadBingoCount) {
+      user.achievements.triadBingoCount = 0;
+    }
+    user.achievements.triadBingoCount++;
+  }
+
+  let response = {
+    data: _.pick(user, splitWhitespace('achievements')),
+    message: i18n.t('mountsAndPetsReleased'),
+  };
+
+  return response;
 };