res.respond: allow for thrid parameter (message), refactor shared ops responses and adapt tests

common/script/ops/addPushDevice.js

@@ -1,6 +1,5 @@
 import _ from 'lodash';
 import i18n from '../i18n';
-import splitWhitespace from '../libs/splitWhitespace';
 import {
   BadRequest,
   NotAuthorized,
@@ -35,10 +34,8 @@ module.exports = function addPushDevice (user, req = {}) {
 
   pushDevices.push(item);
 
-  let response = {
+  return [
-    data: _.pick(user, splitWhitespace('pushDevices')),
+    user.pushDevices,
-    message: i18n.t('pushDeviceAdded', req.language),
+    i18n.t('pushDeviceAdded', req.language),
-  };
+  ];
-
-  return response;
 };

common/script/ops/addWebhook.js

@@ -7,8 +7,7 @@ import {
 import _ from 'lodash';
 
 module.exports = function addWebhook (user, req = {}) {
-  let wh;
+  let wh = user.preferences.webhooks;
-  wh = user.preferences.webhooks;
 
   if (!validator.isURL(_.get(req, 'body.url'))) throw new BadRequest(i18n.t('invalidUrl', req.language));
   if (!validator.isBoolean(_.get(req, 'body.enabled'))) throw new BadRequest(i18n.t('invalidEnabled', req.language));
@@ -18,9 +17,11 @@ module.exports = function addWebhook (user, req = {}) {
   if (req.v2 === true) {
     return user.preferences.webhooks;
   } else {
-    return refPush(wh, {
+    return [
-      url: req.body.url,
+      refPush(wh, {
-      enabled: req.body.enabled,
+        url: req.body.url,
-    });
+        enabled: req.body.enabled,
+      }),
+    ];
   }
 };

common/script/ops/allocate.js

@@ -1,5 +1,4 @@
 import _ from 'lodash';
-import splitWhitespace from '../libs/splitWhitespace';
 import {
   ATTRIBUTES,
 } from '../constants';
@@ -26,5 +25,7 @@ module.exports = function allocate (user, req = {}) {
     throw new NotAuthorized(i18n.t('notEnoughAttrPoints', req.language));
   }
 
-  return _.pick(user, splitWhitespace('stats'));
+  return [
+    user.stats,
+  ];
 };

common/script/ops/allocateNow.js

@@ -8,8 +8,8 @@ module.exports = function allocateNow (user, req = {}) {
   if (req.v2 === true) {
     return _.pick(user, 'stats');
   } else {
-    return {
+    return [
-      data: _.pick(user, 'stats'),
+      user.stats,
-    };
+    ];
   }
 };

common/script/ops/blockUser.js

@@ -15,5 +15,7 @@ module.exports = function blockUser (user, req = {}) {
   }
 
   user.markModified('inbox.blocks');
-  return user.inbox.blocks;
+  return [
+    user.inbox.blocks,
+  ];
 };

common/script/ops/buyArmoire.js

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

common/script/ops/buyGear.js

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

common/script/ops/buyMysterySet.js

@@ -47,9 +47,9 @@ module.exports = function buyMysterySet (user, req = {}, analytics) {
   if (req.v2 === true) {
     return pickDeep(user, splitWhitespace('items purchased.plan.consecutive'));
   } else {
-    return {
+    return [
-      data: pickDeep(user, splitWhitespace('items purchased.plan.consecutive')),
+      { items: user.items, purchasedPlanConsecutive: user.purchased.plan.consecutive },
-      message: i18n.t('hourglassPurchaseSet', req.language),
+      i18n.t('hourglassPurchaseSet', req.language),
-    };
+    ];
   }
 };

common/script/ops/buyPotion.js

@@ -1,7 +1,5 @@
 import content from '../content/index';
 import i18n from '../i18n';
-import _ from 'lodash';
-import splitWhitespace from '../libs/splitWhitespace';
 import {
   NotAuthorized,
 } from '../libs/errors';
@@ -39,14 +37,12 @@ module.exports = function buyPotion (user, req = {}, analytics) {
     });
   }
 
-  let res = {
-    data: _.pick(user, splitWhitespace('stats')),
-    message,
-  };
-
   if (req.v2 === true) {
-    return res.data;
+    return user.stats;
   } else {
-    return res;
+    return [
+      user.stats,
+      message,
+    ];
   }
 };

common/script/ops/buyQuest.js

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

common/script/ops/buySpecialSpell.js

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

common/script/ops/changeClass.js

@@ -71,8 +71,8 @@ module.exports = function changeClass (user, req = {}, analytics) {
   if (req.v2 === true) {
     return _.pick(user, splitWhitespace('stats flags items preferences'));
   } else {
-    return {
+    return [
-      data: _.pick(user, splitWhitespace('stats flags items preferences')),
+      _.pick(user, splitWhitespace('stats flags items preferences')),
-    };
+    ];
   }
 };

common/script/ops/clearPMs.js

@@ -1,5 +1,7 @@
 module.exports = function clearPMs (user) {
   user.inbox.messages = {};
   user.markModified('inbox.messages');
-  return user.inbox.messages;
+  return [
+    user.inbox.messages,
+  ];
 };

common/script/ops/deletePM.js

@@ -3,5 +3,7 @@ import _ from 'lodash';
 module.exports = function deletePM (user, req = {}) {
   delete user.inbox.messages[_.get(req, 'params.id')];
   user.markModified(`inbox.messages.${req.params.id}`);
-  return user.inbox.messages;
+  return [
+    user.inbox.messages,
+  ];
 };

common/script/ops/deleteWebhook.js

@@ -4,5 +4,7 @@ module.exports = function deleteWebhook (user, req) {
   delete user.preferences.webhooks[_.get(req, 'params.id')];
   user.markModified('preferences.webhooks');
 
-  return user.preferences.webhooks;
+  return [
+    user.preferences.webhooks,
+  ];
 };

common/script/ops/disableClasses.js

@@ -13,8 +13,8 @@ module.exports = function disableClasses (user, req = {}) {
   if (req.v2 === true) {
     return _.pick(user, splitWhitespace('stats flags preferences'));
   } else {
-    return {
+    return [
-      data: _.pick(user, splitWhitespace('stats flags preferences')),
+      _.pick(user, splitWhitespace('stats flags preferences')),
-    };
+    ];
   }
 };

common/script/ops/equip.js

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

common/script/ops/feed.js

@@ -94,9 +94,9 @@ module.exports = function feed (user, req = {}) {
       value: userPets[pet],
     };
   } else {
-    return {
+    return [
-      data: userPets[pet],
+      userPets[pet],
       message,
-    };
+    ];
   }
 };

common/script/ops/hatch.js

@@ -36,9 +36,9 @@ module.exports = function hatch (user, req = {}) {
   if (req.v2 === true) {
     return user.items;
   } else {
-    return {
+    return [
-      message: i18n.t('messageHatched', req.language),
+      user.items,
-      data: user.items,
+      i18n.t('messageHatched', req.language),
-    };
+    ];
   }
 };

common/script/ops/hourglassPurchase.js

@@ -1,12 +1,11 @@
 import content from '../content/index';
 import i18n from '../i18n';
 import _ from 'lodash';
-import splitWhitespace from '../libs/splitWhitespace';
-import pickDeep from '../libs/pickDeep';
 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,14 +50,12 @@ module.exports = function purchaseHourglass (user, req = {}, analytics) {
     });
   }
 
-  let res = {
-    data: pickDeep(user, splitWhitespace('items purchased.plan.consecutive')),
-    message: i18n.t('hourglassPurchase', req.language),
-  };
-
   if (req.v2 === true) {
-    return res.data;
+    return _.pick(user, splitWhitespace('items purchased.plan.consecutive'));
   } else {
-    return res;
+    return [
+      { items: user.items, purchasedPlanConsecutive: user.purchased.plan.consecutive },
+      i18n.t('hourglassPurchase', req.language),
+    ];
   }
 };

common/script/ops/openMysteryItem.js

@@ -36,9 +36,9 @@ module.exports = function openMysteryItem (user, req = {}, analytics) {
   if (req.v2 === true) {
     return user.items.gear.owned;
   } else {
-    return {
+    return [
-      message: i18n.t('mysteryItemOpened', req.language),
+      user.items.gear.owned,
-      data: user.items.gear.owned,
+      i18n.t('mysteryItemOpened', req.language),
-    };
+    ];
   }
 };

common/script/ops/purchase.js

@@ -54,12 +54,10 @@ module.exports = function purchase (user, req = {}, analytics) {
       });
     }
 
-    let response = {
+    return [
-      data: _.pick(user, splitWhitespace('stats balance')),
+      _.pick(user, splitWhitespace('stats balance')),
-      message: i18n.t('plusOneGem'),
+      i18n.t('plusOneGem'),
-    };
+    ];
-
-    return response;
   }
 
   let acceptedTypes = ['eggs', 'hatchingPotions', 'food', 'quests', 'gear'];
@@ -119,14 +117,12 @@ module.exports = function purchase (user, req = {}, analytics) {
     });
   }
 
-  let response = {
-    data: _.pick(user, splitWhitespace('items balance')),
-    message: i18n.t('purchased', {type, key}),
-  };
-
   if (req.v2 === true) {
-    return response.data;
+    return _.pick(user, splitWhitespace('items balance'));
   } else {
-    return response;
+    return [
+      _.pick(user, splitWhitespace('items balance')),
+      i18n.t('purchased', {type, key}),
+    ];
   }
 };

common/script/ops/readCard.js

@@ -24,9 +24,9 @@ module.exports = function readCard (user, req = {}) {
   if (req.v2 === true) {
     return _.pick(user, splitWhitespace('items.special flags.cardReceived'));
   } else {
-    return {
+    return [
-      message: i18n.t('readCard', {cardType}, req.language),
+      { specialItems: user.items.special, cardReceived: user.flags.cardReceived },
-      data: _.pick(user, splitWhitespace('items.special flags.cardReceived')),
+      i18n.t('readCard', {cardType}, req.language),
-    };
+    ];
   }
 };

common/script/ops/rebirth.js

@@ -98,14 +98,12 @@ module.exports = function rebirth (user, tasks = [], req = {}, analytics) {
 
   user.stats.buffs = {};
 
-  let response = {
-    data: user,
-    message: i18n.t('rebirthComplete'),
-  };
-
   if (req.v2 === true) {
     return user;
   } else {
-    return response;
+    return [
+      user,
+      i18n.t('rebirthComplete'),
+    ];
   }
 };

common/script/ops/releaseBoth.js

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

common/script/ops/releaseMounts.js

@@ -3,8 +3,6 @@ import i18n from '../i18n';
 import {
   NotAuthorized,
 } from '../libs/errors';
-import splitWhitespace from '../libs/splitWhitespace';
-import _ from 'lodash';
 
 module.exports = function releaseMounts (user, req = {}, analytics) {
   let mount;
@@ -34,14 +32,12 @@ module.exports = function releaseMounts (user, req = {}, analytics) {
     });
   }
 
-  let response = {
-    data: _.pick(user, splitWhitespace('mounts')),
-    message: i18n.t('mountsReleased'),
-  };
-
   if (req.v2 === true) {
     return user;
   } else {
-    return response;
+    return [
+      user.items.mounts,
+      i18n.t('mountsReleased'),
+    ];
   }
 };

common/script/ops/releasePets.js

@@ -3,8 +3,6 @@ import i18n from '../i18n';
 import {
   NotAuthorized,
 } from '../libs/errors';
-import splitWhitespace from '../libs/splitWhitespace';
-import _ from 'lodash';
 
 module.exports = function releasePets (user, req = {}, analytics) {
   if (user.balance < 1) {
@@ -32,14 +30,12 @@ module.exports = function releasePets (user, req = {}, analytics) {
     });
   }
 
-  let response = {
-    data: _.pick(user, splitWhitespace('user.items.pets')),
-    message: i18n.t('petsReleased'),
-  };
-
   if (req.v2 === true) {
     return user;
   } else {
-    return response;
+    return [
+      user.items.pets,
+      i18n.t('petsReleased'),
+    ];
   }
 };

common/script/ops/reroll.js

@@ -27,14 +27,12 @@ module.exports = function reroll (user, tasks = [], req = {}, analytics) {
     });
   }
 
-  let response = {
-    data: {user, tasks},
-    message: i18n.t('rerollComplete'),
-  };
-
   if (req.v2 === true) {
     return user;
   } else {
-    return response;
+    return [
+      {user, tasks},
+      i18n.t('rerollComplete'),
+    ];
   }
 };

common/script/ops/reset.js

@@ -19,14 +19,12 @@ module.exports = function reset (user, tasks = [], req = {}) {
 
   resetGear(user);
 
-  let response = {
-    data: {user, tasksToRemove},
-    message: i18n.t('resetComplete'),
-  };
-
   if (req.v2 === true) {
     return user;
   } else {
-    return response;
+    return [
+      {user, tasksToRemove},
+      i18n.t('resetComplete'),
+    ];
   }
 };

common/script/ops/revive.js

@@ -4,7 +4,6 @@ import _ from 'lodash';
 import {
   NotAuthorized,
 } from '../libs/errors';
-import splitWhitespace from '../libs/splitWhitespace';
 import randomVal from '../fns/randomVal';
 
 module.exports = function revive (user, req = {}, analytics) {
@@ -97,14 +96,12 @@ module.exports = function revive (user, req = {}, analytics) {
     });
   }
 
-  let response = {
-    data: _.pick(user, splitWhitespace('user.items')),
-    message,
-  };
-
   if (req.v2 === true) {
     return user;
   } else {
-    return response;
+    return [
+      user.items,
+      message,
+    ];
   }
 };

common/script/ops/scoreTask.js

@@ -257,5 +257,5 @@ module.exports = function scoreTask (options = {}, req = {}) {
   }
 
   updateStats(user, stats, req);
-  return delta;
+  return [delta];
 };

common/script/ops/sell.js

@@ -33,14 +33,12 @@ module.exports = function sell (user, req = {}) {
   user.items[type][key]--;
   user.stats.gp += content[type][key].value;
 
-  let response = {
-    data: _.pick(user, splitWhitespace('stats items')),
-    message: i18n.t('sold', {type, key}),
-  };
-
   if (req.v2 === true) {
-    return response.data;
+    return _.pick(user, splitWhitespace('stats items'));
   } else {
-    return response;
+    return [
+      _.pick(user, splitWhitespace('stats items')),
+      i18n.t('sold', {type, key}),
+    ];
   }
 };

common/script/ops/sleep.js

@@ -4,10 +4,6 @@ module.exports = function sleep (user, req = {}) {
   if (req.v2 === true) {
     return {};
   } else {
-    return {
+    return [user.preferences.sleep];
-      preferences: {
-        sleep: user.preferences.sleep,
-      },
-    };
   }
 };

common/script/ops/unlock.js

@@ -75,14 +75,12 @@ module.exports = function unlock (user, req = {}, analytics) {
     });
   }
 
-  let response = {
-    data: _.pick(user, splitWhitespace('purchased preferences items')),
-    message: i18n.t('unlocked'),
-  };
-
   if (req.v2 === true) {
-    return response.data;
+    return _.pick(user, splitWhitespace('purchased preferences items'));
   } else {
-    return response;
+    return [
+      _.pick(user, splitWhitespace('purchased preferences items')),
+      i18n.t('unlocked'),
+    ];
   }
 };

common/script/ops/updateTask.js

@@ -22,5 +22,5 @@ module.exports = function updateTask (task, req = {}) {
 
   _.merge(task, _.omit(req.body, ['_id', 'id', 'type']));
 
-  return task;
+  return [task];
 };

common/script/ops/updateWebhook.js

@@ -15,6 +15,6 @@ module.exports = function updateWebhook (user, req) {
   if (req.v2 === true) {
     return user.preferences.webhooks;
   } else {
-    return user.preferences.webhooks[req.params.id];
+    return [user.preferences.webhooks[req.params.id]];
   }
 };

test/api/v3/integration/user/POST-user_allocate.test.js

@@ -36,6 +36,6 @@ describe('POST /user/allocate', () => {
     await user.sync();
     expect(user.stats.con).to.equal(1);
     expect(user.stats.points).to.equal(0);
-    expect(res.stats.con).to.equal(1);
+    expect(res.con).to.equal(1);
   });
 });

test/api/v3/integration/user/POST-user_allocate_now.test.js

@@ -18,11 +18,7 @@ describe('POST /user/allocate-now', () => {
     let res = await user.post('/user/allocate-now');
     await user.sync();
 
-    expect(res).to.eql({
+    expect(res).to.eql(user.stats);
-      data: {
-        stats: user.stats,
-      },
-    });
     expect(user.stats.points).to.equal(0);
     expect(user.stats.con).to.equal(9);
     expect(user.stats.int).to.equal(8);

test/api/v3/integration/user/POST-user_buy.test.js

@@ -36,9 +36,7 @@ describe('POST /user/buy/:key', () => {
     await user.sync();
 
     expect(user.stats.hp).to.equal(50);
-    expect(res.data).to.eql({
+    expect(res.data).to.eql(user.stats);
-      stats: user.stats,
-    });
     expect(res.message).to.equal(t('messageBought', {itemText: potion.text()}));
   });
 

test/api/v3/integration/user/POST-user_buy_mystery_set.test.js

@@ -31,11 +31,7 @@ describe('POST /user/buy-mystery-set/:key', () => {
 
     expect(res.data).to.eql({
       items: JSON.parse(JSON.stringify(user.items)), // otherwise dates can't be compared
-      purchased: {
+      purchasedPlanConsecutive: user.purchased.plan.consecutive,
-        plan: {
-          consecutive: user.purchased.plan.consecutive,
-        },
-      },
     });
     expect(res.message).to.equal(t('hourglassPurchaseSet'));
   });

test/api/v3/integration/user/POST-user_buy_potion.test.js

@@ -36,9 +36,7 @@ describe('POST /user/buy-potion', () => {
     await user.sync();
 
     expect(user.stats.hp).to.equal(50);
-    expect(res.data).to.eql({
+    expect(res.data).to.eql(user.stats);
-      stats: user.stats,
-    });
     expect(res.message).to.equal(t('messageBought', {itemText: potion.text()}));
   });
 });

test/api/v3/integration/user/POST-user_change-class.test.js

@@ -18,13 +18,13 @@ describe('POST /user/change-class', () => {
     let res = await user.post('/user/change-class?class=rogue');
     await user.sync();
 
-    expect(res).to.eql({
+    expect(res).to.eql(JSON.parse(
-      data: JSON.parse(JSON.stringify({
+      JSON.stringify({
         preferences: user.preferences,
         stats: user.stats,
         flags: user.flags,
         items: user.items,
-      })),
+      })
-    });
+    ));
   });
 });

test/api/v3/integration/user/POST-user_disable-classes.test.js

@@ -15,12 +15,12 @@ describe('POST /user/disable-classes', () => {
     let res = await user.post('/user/disable-classes');
     await user.sync();
 
-    expect(res).to.eql({
+    expect(res).to.eql(JSON.parse(
-      data: JSON.parse(JSON.stringify({
+      JSON.stringify({
         preferences: user.preferences,
         stats: user.stats,
         flags: user.flags,
-      })),
+      })
-    });
+    ));
   });
 });

test/api/v3/integration/user/POST-user_equip_type_key.test.js

@@ -35,8 +35,6 @@ describe('POST /user/equip/:type/:key', () => {
     let res = await user.post('/user/equip/equipped/weapon_warrior_2');
     await user.sync();
 
-    expect(res).to.eql({
+    expect(res).to.eql(JSON.parse(JSON.stringify(user.items)));
-      data: JSON.parse(JSON.stringify(user.items)),
-    });
   });
 });

test/api/v3/integration/user/POST-user_sleep.test.js

@@ -13,16 +13,12 @@ describe('POST /user/sleep', () => {
 
   it('toggles sleep status', async () => {
     let res = await user.post('/user/sleep');
-    expect(res).to.eql({
+    expect(res).to.eql(true);
-      preferences: {sleep: true},
-    });
     await user.sync();
     expect(user.preferences.sleep).to.be.true;
 
     let res2 = await user.post('/user/sleep');
-    expect(res2).to.eql({
+    expect(res2).to.eql(false);
-      preferences: {sleep: false},
-    });
     await user.sync();
     expect(user.preferences.sleep).to.be.false;
   });

test/api/v3/integration/user/auth/POST-user_reset_password.test.js

@@ -16,7 +16,7 @@ describe('POST /user/reset-password', async () => {
     let response = await user.post(endpoint, {
       email: user.auth.local.email,
     });
-    expect(response).to.eql({ message: t('passwordReset') });
+    expect(response).to.eql({ data: {}, message: t('passwordReset') });
     await user.sync();
     expect(user.auth.local.hashed_password).to.not.eql(previousPassword);
   });
@@ -25,7 +25,7 @@ describe('POST /user/reset-password', async () => {
     let response = await user.post(endpoint, {
       email: 'nonExistent@email.com',
     });
-    expect(response).to.eql({ message: t('passwordReset') });
+    expect(response).to.eql({ data: {}, message: t('passwordReset') });
   });
 
   it('errors if email is not provided', async () => {
@@ -36,4 +36,3 @@ describe('POST /user/reset-password', async () => {
     });
   });
 });
-

test/api/v3/unit/middlewares/response.js

@@ -35,6 +35,21 @@ describe('response middleware', () => {
     });
   });
 
+  it('can be passed a third parameter to be used as optional message', () => {
+    responseMiddleware(req, res, next);
+    res.respond(200, {field: 1}, 'hello');
+
+    expect(res.status).to.be.calledOnce;
+    expect(res.json).to.be.calledOnce;
+
+    expect(res.status).to.be.calledWith(200);
+    expect(res.json).to.be.calledWith({
+      success: true,
+      data: {field: 1},
+      message: 'hello',
+    });
+  });
+
   it('treats status >= 400 as failures', () => {
     responseMiddleware(req, res, next);
     res.respond(403, {field: 1});

test/api/v3/unit/models/challenge.test.js

@@ -110,7 +110,7 @@ describe('Challenge Model', () => {
         };
 
         Tasks.Task.sanitize(req.body);
-        _.assign(task, common.ops.updateTask(task.toObject(), req));
+        _.assign(task, common.ops.updateTask(task.toObject(), req)[0]);
 
         await challenge.updateTask(task);
 

test/common/ops/addPushDevice.js

@@ -39,9 +39,9 @@ describe('shared.ops.addPushDevice', () => {
   });
 
   it('adds a push device', () => {
-    let response = addPushDevice(user, {body: {regId, type}});
+    let [, message] = addPushDevice(user, {body: {regId, type}});
 
-    expect(response.message).to.equal(i18n.t('pushDeviceAdded'));
+    expect(message).to.equal(i18n.t('pushDeviceAdded'));
     expect(user.pushDevices[0].type).to.equal(type);
     expect(user.pushDevices[0].regId).to.equal(regId);
   });

test/common/ops/allocateNow.js

@@ -18,17 +18,13 @@ describe('shared.ops.allocateNow', () => {
     user.stats.str = 9;
     user.preferences.allocationMode = 'flat';
 
-    let res = allocateNow(user);
+    let [data] = allocateNow(user);
 
     expect(user.stats.points).to.equal(0);
     expect(user.stats.con).to.equal(9);
     expect(user.stats.int).to.equal(8);
     expect(user.stats.per).to.equal(9);
     expect(user.stats.str).to.equal(9);
-    expect(res).to.eql({
+    expect(data).to.eql(user.stats);
-      data: {
-        stats: user.stats,
-      },
-    });
   });
 });

test/common/ops/blockUser.test.js

@@ -26,10 +26,10 @@ describe('shared.ops.blockUser', () => {
   });
 
   it('blocks user', () => {
-    let result = blockUser(user, { params: { uuid: blockedUser._id } });
+    let [result] = blockUser(user, { params: { uuid: blockedUser._id } });
     expect(user.inbox.blocks).to.eql([blockedUser._id]);
     expect(result).to.eql([blockedUser._id]);
-    result = blockUser(user, { params: { uuid: blockedUser2._id } });
+    [result] = blockUser(user, { params: { uuid: blockedUser2._id } });
     expect(user.inbox.blocks).to.eql([blockedUser._id, blockedUser2._id]);
     expect(result).to.eql([blockedUser._id, blockedUser2._id]);
   });
@@ -37,7 +37,7 @@ describe('shared.ops.blockUser', () => {
   it('blocks, then unblocks user', () => {
     blockUser(user, { params: { uuid: blockedUser._id } });
     expect(user.inbox.blocks).to.eql([blockedUser._id]);
-    let result = blockUser(user, { params: { uuid: blockedUser._id } });
+    let [result] = blockUser(user, { params: { uuid: blockedUser._id } });
     expect(user.inbox.blocks).to.eql([]);
     expect(result).to.eql([]);
   });

test/common/ops/buySpecialSpell.js

@@ -60,7 +60,7 @@ describe('shared.ops.buySpecialSpell', () => {
     user.stats.gp = 11;
     let item = content.special.thankyou;
 
-    let res = buySpecialSpell(user, {
+    let [data, message] = buySpecialSpell(user, {
       params: {
         key: 'thankyou',
       },
@@ -68,11 +68,11 @@ describe('shared.ops.buySpecialSpell', () => {
 
     expect(user.stats.gp).to.equal(1);
     expect(user.items.special.thankyou).to.equal(1);
-    expect(res.data).to.eql({
+    expect(data).to.eql({
       items: user.items,
       stats: user.stats,
     });
-    expect(res.message).to.equal(i18n.t('messageBought', {
+    expect(message).to.equal(i18n.t('messageBought', {
       itemText: item.text(),
     }));
   });

test/common/ops/changeClass.js

@@ -46,14 +46,12 @@ describe('shared.ops.changeClass', () => {
       user.stats.class = 'healer';
       user.items.gear.owned.armor_rogue_1 = true; // eslint-disable-line camelcase
 
-      let res = changeClass(user, {query: {class: 'rogue'}});
+      let [data] = changeClass(user, {query: {class: 'rogue'}});
-      expect(res).to.eql({
+      expect(data).to.eql({
-        data: {
+        preferences: user.preferences,
-          preferences: user.preferences,
+        stats: user.stats,
-          stats: user.stats,
+        flags: user.flags,
-          flags: user.flags,
+        items: user.items,
-          items: user.items,
-        },
       });
 
       expect(user.stats.class).to.equal('rogue');
@@ -80,14 +78,12 @@ describe('shared.ops.changeClass', () => {
       user.stats.int = 4;
       user.flags.classSelected = true;
 
-      let res = changeClass(user);
+      let [data] = changeClass(user);
-      expect(res).to.eql({
+      expect(data).to.eql({
-        data: {
+        preferences: user.preferences,
-          preferences: user.preferences,
+        stats: user.stats,
-          stats: user.stats,
+        flags: user.flags,
-          flags: user.flags,
+        items: user.items,
-          items: user.items,
-        },
       });
 
       expect(user.preferences.disableClasses).to.be.false;
@@ -122,14 +118,12 @@ describe('shared.ops.changeClass', () => {
         user.stats.int = 4;
         user.flags.classSelected = true;
 
-        let res = changeClass(user);
+        let [data] = changeClass(user);
-        expect(res).to.eql({
+        expect(data).to.eql({
-          data: {
+          preferences: user.preferences,
-            preferences: user.preferences,
+          stats: user.stats,
-            stats: user.stats,
+          flags: user.flags,
-            flags: user.flags,
+          items: user.items,
-            items: user.items,
-          },
         });
 
         expect(user.balance).to.equal(0.25);

test/common/ops/clearPMs.test.js

@@ -13,7 +13,7 @@ describe('shared.ops.clearPMs', () => {
 
   it('clears messages', () => {
     expect(user.inbox.messages).to.not.eql({});
-    let result = clearPMs(user);
+    let [result] = clearPMs(user);
     expect(user.inbox.messages).to.eql({});
     expect(result).to.eql({});
   });

test/common/ops/deletePM.test.js

@@ -3,7 +3,7 @@ import {
   generateUser,
 } from '../../helpers/common.helper';
 
-describe('shared.ops.clearPMs', () => {
+describe('shared.ops.deletePM', () => {
   let user;
 
   beforeEach(() => {
@@ -13,7 +13,7 @@ describe('shared.ops.clearPMs', () => {
 
   it('delete message', () => {
     expect(user.inbox.messages).to.not.eql({ second: 'message' });
-    let response = deletePM(user, { params: { id: 'first' } });
+    let [response] = deletePM(user, { params: { id: 'first' } });
     expect(user.inbox.messages).to.eql({ second: 'message' });
     expect(response).to.eql({ second: 'message' });
   });

test/common/ops/deleteWebhook.test.js

@@ -14,8 +14,8 @@ describe('shared.ops.deleteWebhook', () => {
 
   it('succeeds', () => {
     user.preferences.webhooks = { 'some-id': {}, 'another-id': {} };
-    let res = deleteWebhook(user, req);
+    let [data] = deleteWebhook(user, req);
     expect(user.preferences.webhooks).to.eql({'another-id': {}});
-    expect(res).to.equal(user.preferences.webhooks);
+    expect(data).to.equal(user.preferences.webhooks);
   });
 });

test/common/ops/disableClasses.js

@@ -18,13 +18,11 @@ describe('shared.ops.disableClasses', () => {
     user.preferences.autoAllocate = false;
     user.stats.points = 2;
 
-    let res = disableClasses(user);
+    let [data] = disableClasses(user);
-    expect(res).to.eql({
+    expect(data).to.eql({
-      data: {
+      preferences: user.preferences,
-        preferences: user.preferences,
+      stats: user.stats,
-        stats: user.stats,
+      flags: user.flags,
-        flags: user.flags,
-      },
     });
 
     expect(user.stats.class).to.equal('warrior');

test/common/ops/equip.js

@@ -37,20 +37,20 @@ describe('shared.ops.equip', () => {
       equip(user, {params: {key: 'weapon_warrior_1'}});
 
       // one-handed to one-handed
-      let res = equip(user, {params: {key: 'weapon_warrior_2'}});
+      let [, message] = equip(user, {params: {key: 'weapon_warrior_2'}});
-      expect(res.message).to.not.exists;
+      expect(message).to.not.exists;
 
       // one-handed to two-handed
-      res = equip(user, {params: {key: 'weapon_wizard_1'}});
+      [, message] = equip(user, {params: {key: 'weapon_wizard_1'}});
-      expect(res.message).to.not.exists;
+      expect(message).to.not.exists;
 
       // two-handed to two-handed
-      res = equip(user, {params: {key: 'weapon_wizard_2'}});
+      [, message] = equip(user, {params: {key: 'weapon_wizard_2'}});
-      expect(res.message).to.not.exists;
+      expect(message).to.not.exists;
 
       // two-handed to one-handed
-      res = equip(user, {params: {key: 'weapon_warrior_2'}});
+      [, message] = equip(user, {params: {key: 'weapon_warrior_2'}});
-      expect(res.message).to.not.exists;
+      expect(message).to.not.exists;
     });
 
     it('should send messages if equipping a two-hander causes the off-hander to be unequipped', () => {
@@ -58,10 +58,11 @@ describe('shared.ops.equip', () => {
       equip(user, {params: {key: 'shield_warrior_1'}});
 
       // equipping two-hander
-      let res = equip(user, {params: {key: 'weapon_wizard_1'}});
+      let [data, message] = equip(user, {params: {key: 'weapon_wizard_1'}});
       let weapon = content.gear.flat.weapon_wizard_1;
       let item = content.gear.flat.shield_warrior_1;
 
+      let res = {data, message};
       expect(res).to.eql({
         message: i18n.t('messageTwoHandedEquip', {twoHandedText: weapon.text(), offHandedText: item.text()}),
         data: user.items,
@@ -74,8 +75,9 @@ describe('shared.ops.equip', () => {
       let weapon = content.gear.flat.weapon_wizard_1;
       let shield = content.gear.flat.shield_warrior_1;
 
-      let res = equip(user, {params: {key: 'shield_warrior_1'}});
+      let [data, message] = equip(user, {params: {key: 'shield_warrior_1'}});
 
+      let res = {data, message};
       expect(res).to.eql({
         message: i18n.t('messageTwoHandedUnequip', {twoHandedText: weapon.text(), offHandedText: shield.text()}),
         data: user.items,

test/common/ops/feed.js

@@ -105,16 +105,14 @@ describe('shared.ops.feed', () => {
       let potionText = content.hatchingPotions[potion] ? content.hatchingPotions[potion].text() : potion;
       let eggText = content.eggs[egg] ? content.eggs[egg].text() : egg;
 
-      let res = feed(user, {params: {pet: 'Wolf-Base', food: 'Saddle'}});
+      let [data, message] = feed(user, {params: {pet: 'Wolf-Base', food: 'Saddle'}});
-      expect(res).to.eql({
+      expect(data).to.eql(user.items.pets['Wolf-Base']);
-        data: user.items.pets['Wolf-Base'],
+      expect(message).to.eql(i18n.t('messageEvolve', {
-        message: i18n.t('messageEvolve', {
+        egg: i18n.t('petName', {
-          egg: i18n.t('petName', {
+          potion: potionText,
-            potion: potionText,
+          egg: eggText,
-            egg: eggText,
-          }),
         }),
-      });
+      }));
 
       expect(user.items.food.Saddle).to.equal(1);
       expect(user.items.pets['Wolf-Base']).to.equal(-1);
@@ -131,17 +129,15 @@ describe('shared.ops.feed', () => {
       let potionText = content.hatchingPotions[potion] ? content.hatchingPotions[potion].text() : potion;
       let eggText = content.eggs[egg] ? content.eggs[egg].text() : egg;
 
-      let res = feed(user, {params: {pet: 'Wolf-Base', food: 'Meat'}});
+      let [data, message] = feed(user, {params: {pet: 'Wolf-Base', food: 'Meat'}});
-      expect(res).to.eql({
+      expect(data).to.eql(user.items.pets['Wolf-Base']);
-        data: user.items.pets['Wolf-Base'],
+      expect(message).to.eql(i18n.t('messageLikesFood', {
-        message: i18n.t('messageLikesFood', {
+        egg: i18n.t('petName', {
-          egg: i18n.t('petName', {
+          potion: potionText,
-            potion: potionText,
+          egg: eggText,
-            egg: eggText,
-          }),
-          foodText: food.text(),
         }),
-      });
+        foodText: food.text(),
+      }));
 
       expect(user.items.food.Meat).to.equal(1);
       expect(user.items.pets['Wolf-Base']).to.equal(10);
@@ -156,17 +152,15 @@ describe('shared.ops.feed', () => {
       let potionText = content.hatchingPotions[potion] ? content.hatchingPotions[potion].text() : potion;
       let eggText = content.eggs[egg] ? content.eggs[egg].text() : egg;
 
-      let res = feed(user, {params: {pet: 'Wolf-Spooky', food: 'Milk'}});
+      let [data, message] = feed(user, {params: {pet: 'Wolf-Spooky', food: 'Milk'}});
-      expect(res).to.eql({
+      expect(data).to.eql(user.items.pets['Wolf-Spooky']);
-        data: user.items.pets['Wolf-Spooky'],
+      expect(message).to.eql(i18n.t('messageLikesFood', {
-        message: i18n.t('messageLikesFood', {
+        egg: i18n.t('petName', {
-          egg: i18n.t('petName', {
+          potion: potionText,
-            potion: potionText,
+          egg: eggText,
-            egg: eggText,
-          }),
-          foodText: food.text(),
         }),
-      });
+        foodText: food.text(),
+      }));
 
       expect(user.items.food.Milk).to.equal(1);
       expect(user.items.pets['Wolf-Spooky']).to.equal(10);
@@ -181,17 +175,15 @@ describe('shared.ops.feed', () => {
       let potionText = content.hatchingPotions[potion] ? content.hatchingPotions[potion].text() : potion;
       let eggText = content.eggs[egg] ? content.eggs[egg].text() : egg;
 
-      let res = feed(user, {params: {pet: 'Wolf-Base', food: 'Milk'}});
+      let [data, message] = feed(user, {params: {pet: 'Wolf-Base', food: 'Milk'}});
-      expect(res).to.eql({
+      expect(data).to.eql(user.items.pets['Wolf-Base']);
-        data: user.items.pets['Wolf-Base'],
+      expect(message).to.eql(i18n.t('messageDontEnjoyFood', {
-        message: i18n.t('messageDontEnjoyFood', {
+        egg: i18n.t('petName', {
-          egg: i18n.t('petName', {
+          potion: potionText,
-            potion: potionText,
+          egg: eggText,
-            egg: eggText,
-          }),
-          foodText: food.text(),
         }),
-      });
+        foodText: food.text(),
+      }));
 
       expect(user.items.food.Milk).to.equal(1);
       expect(user.items.pets['Wolf-Base']).to.equal(7);
@@ -206,16 +198,14 @@ describe('shared.ops.feed', () => {
       let potionText = content.hatchingPotions[potion] ? content.hatchingPotions[potion].text() : potion;
       let eggText = content.eggs[egg] ? content.eggs[egg].text() : egg;
 
-      let res = feed(user, {params: {pet: 'Wolf-Base', food: 'Milk'}});
+      let [data, message] = feed(user, {params: {pet: 'Wolf-Base', food: 'Milk'}});
-      expect(res).to.eql({
+      expect(data).to.eql(user.items.pets['Wolf-Base']);
-        data: user.items.pets['Wolf-Base'],
+      expect(message).to.eql(i18n.t('messageEvolve', {
-        message: i18n.t('messageEvolve', {
+        egg: i18n.t('petName', {
-          egg: i18n.t('petName', {
+          potion: potionText,
-            potion: potionText,
+          egg: eggText,
-            egg: eggText,
-          }),
         }),
-      });
+      }));
 
       expect(user.items.food.Milk).to.equal(1);
       expect(user.items.pets['Wolf-Base']).to.equal(-1);

test/common/ops/hatch.js

@@ -99,9 +99,9 @@ describe('shared.ops.hatch', () => {
         user.items.eggs = {Wolf: 1};
         user.items.hatchingPotions = {Base: 1};
         user.items.pets = {};
-        let res = hatch(user, {params: {egg: 'Wolf', hatchingPotion: 'Base'}});
+        let [data, message] = hatch(user, {params: {egg: 'Wolf', hatchingPotion: 'Base'}});
-        expect(res.message).to.equal(i18n.t('messageHatched'));
+        expect(message).to.equal(i18n.t('messageHatched'));
-        expect(res.data).to.eql(user.items);
+        expect(data).to.eql(user.items);
         expect(user.items.pets).to.eql({'Wolf-Base': 5});
         expect(user.items.eggs).to.eql({Wolf: 0});
         expect(user.items.hatchingPotions).to.eql({Base: 0});
@@ -111,9 +111,9 @@ describe('shared.ops.hatch', () => {
         user.items.eggs = {Cheetah: 1};
         user.items.hatchingPotions = {Base: 1};
         user.items.pets = {};
-        let res = hatch(user, {params: {egg: 'Cheetah', hatchingPotion: 'Base'}});
+        let [data, message] = hatch(user, {params: {egg: 'Cheetah', hatchingPotion: 'Base'}});
-        expect(res.message).to.equal(i18n.t('messageHatched'));
+        expect(message).to.equal(i18n.t('messageHatched'));
-        expect(res.data).to.eql(user.items);
+        expect(data).to.eql(user.items);
         expect(user.items.pets).to.eql({'Cheetah-Base': 5});
         expect(user.items.eggs).to.eql({Cheetah: 0});
         expect(user.items.hatchingPotions).to.eql({Base: 0});
@@ -123,9 +123,9 @@ describe('shared.ops.hatch', () => {
         user.items.eggs = {Wolf: 1};
         user.items.hatchingPotions = {Spooky: 1};
         user.items.pets = {};
-        let res = hatch(user, {params: {egg: 'Wolf', hatchingPotion: 'Spooky'}});
+        let [data, message] = hatch(user, {params: {egg: 'Wolf', hatchingPotion: 'Spooky'}});
-        expect(res.message).to.equal(i18n.t('messageHatched'));
+        expect(message).to.equal(i18n.t('messageHatched'));
-        expect(res.data).to.eql(user.items);
+        expect(data).to.eql(user.items);
         expect(user.items.pets).to.eql({'Wolf-Spooky': 5});
         expect(user.items.eggs).to.eql({Wolf: 0});
         expect(user.items.hatchingPotions).to.eql({Spooky: 0});
@@ -135,9 +135,9 @@ describe('shared.ops.hatch', () => {
         user.items.eggs = {Wolf: 1};
         user.items.hatchingPotions = {Base: 1};
         user.items.pets = {'Wolf-Base': -1};
-        let res = hatch(user, {params: {egg: 'Wolf', hatchingPotion: 'Base'}});
+        let [data, message] = hatch(user, {params: {egg: 'Wolf', hatchingPotion: 'Base'}});
-        expect(res.message).to.eql(i18n.t('messageHatched'));
+        expect(message).to.eql(i18n.t('messageHatched'));
-        expect(res.data).to.eql(user.items);
+        expect(data).to.eql(user.items);
         expect(user.items.pets).to.eql({'Wolf-Base': 5});
         expect(user.items.eggs).to.eql({Wolf: 0});
         expect(user.items.hatchingPotions).to.eql({Base: 0});

test/common/ops/hourglassPurchase.js

@@ -126,9 +126,9 @@ describe('user.ops.hourglassPurchase', () => {
     it('buys a pet', () => {
       user.purchased.plan.consecutive.trinkets = 2;
 
-      let response = hourglassPurchase(user, {params: {type: 'pets', key: 'MantisShrimp-Base'}});
+      let [, message] = hourglassPurchase(user, {params: {type: 'pets', key: 'MantisShrimp-Base'}});
 
-      expect(response.message).to.eql(i18n.t('hourglassPurchase'));
+      expect(message).to.eql(i18n.t('hourglassPurchase'));
       expect(user.purchased.plan.consecutive.trinkets).to.eql(1);
       expect(user.items.pets).to.eql({'MantisShrimp-Base': 5});
     });
@@ -136,8 +136,8 @@ describe('user.ops.hourglassPurchase', () => {
     it('buys a mount', () => {
       user.purchased.plan.consecutive.trinkets = 2;
 
-      let response = hourglassPurchase(user, {params: {type: 'mounts', key: 'MantisShrimp-Base'}});
+      let [, message] = hourglassPurchase(user, {params: {type: 'mounts', key: 'MantisShrimp-Base'}});
-      expect(response.message).to.eql(i18n.t('hourglassPurchase'));
+      expect(message).to.eql(i18n.t('hourglassPurchase'));
       expect(user.purchased.plan.consecutive.trinkets).to.eql(1);
       expect(user.items.mounts).to.eql({'MantisShrimp-Base': true});
     });

test/common/ops/openMysteryItem.js

@@ -29,10 +29,10 @@ describe('shared.ops.openMysteryItem', () => {
 
     user.purchased.plan.mysteryItems = [mysteryItemKey];
 
-    let response = openMysteryItem(user);
+    let [data, message] = openMysteryItem(user);
 
     expect(user.items.gear.owned[mysteryItemKey]).to.be.true;
-    expect(response.message).to.equal(i18n.t('mysteryItemOpened'));
+    expect(message).to.equal(i18n.t('mysteryItemOpened'));
-    expect(response.data).to.equal(user.items.gear.owned);
+    expect(data).to.equal(user.items.gear.owned);
   });
 });

test/common/ops/purchase.js

@@ -10,7 +10,7 @@ import {
   generateUser,
 } from '../../helpers/common.helper';
 
-describe('shared.ops.feed', () => {
+describe('shared.ops.purchase', () => {
   let user;
   let goldPoints = 40;
   let gemsBought = 40;
@@ -128,7 +128,7 @@ describe('shared.ops.feed', () => {
     });
   });
 
-  context('successful feeding', () => {
+  context('successful purchase', () => {
     let userGemAmount = 10;
 
     before(() => {
@@ -138,9 +138,9 @@ describe('shared.ops.feed', () => {
     });
 
     it('purchases gems', () => {
-      let purchaseResponse = purchase(user, {params: {type: 'gems', key: 'gem'}});
+      let [, message] = purchase(user, {params: {type: 'gems', key: 'gem'}});
 
-      expect(purchaseResponse.message).to.equal(i18n.t('plusOneGem'));
+      expect(message).to.equal(i18n.t('plusOneGem'));
       expect(user.balance).to.equal(userGemAmount + 0.25);
       expect(user.purchased.plan.gemsBought).to.equal(1);
       expect(user.stats.gp).to.equal(goldPoints - planGemLimits.convRate);
@@ -150,9 +150,9 @@ describe('shared.ops.feed', () => {
       let type = 'eggs';
       let key = 'Wolf';
 
-      let purchaseResponse = purchase(user, {params: {type, key}});
+      let [, message] = purchase(user, {params: {type, key}});
 
-      expect(purchaseResponse.message).to.equal(i18n.t('purchased', {type, key}));
+      expect(message).to.equal(i18n.t('purchased', {type, key}));
       expect(user.items[type][key]).to.equal(1);
     });
 
@@ -160,9 +160,9 @@ describe('shared.ops.feed', () => {
       let type = 'hatchingPotions';
       let key = 'Base';
 
-      let purchaseResponse = purchase(user, {params: {type, key}});
+      let [, message] = purchase(user, {params: {type, key}});
 
-      expect(purchaseResponse.message).to.equal(i18n.t('purchased', {type, key}));
+      expect(message).to.equal(i18n.t('purchased', {type, key}));
       expect(user.items[type][key]).to.equal(1);
     });
 
@@ -170,9 +170,9 @@ describe('shared.ops.feed', () => {
       let type = 'food';
       let key = 'Meat';
 
-      let purchaseResponse = purchase(user, {params: {type, key}});
+      let [, message] = purchase(user, {params: {type, key}});
 
-      expect(purchaseResponse.message).to.equal(i18n.t('purchased', {type, key}));
+      expect(message).to.equal(i18n.t('purchased', {type, key}));
       expect(user.items[type][key]).to.equal(1);
     });
 
@@ -180,9 +180,9 @@ describe('shared.ops.feed', () => {
       let type = 'quests';
       let key = 'gryphon';
 
-      let purchaseResponse = purchase(user, {params: {type, key}});
+      let [, message] = purchase(user, {params: {type, key}});
 
-      expect(purchaseResponse.message).to.equal(i18n.t('purchased', {type, key}));
+      expect(message).to.equal(i18n.t('purchased', {type, key}));
       expect(user.items[type][key]).to.equal(1);
     });
 
@@ -190,9 +190,9 @@ describe('shared.ops.feed', () => {
       let type = 'gear';
       let key = 'headAccessory_special_tigerEars';
 
-      let purchaseResponse = purchase(user, {params: {type, key}});
+      let [, message] = purchase(user, {params: {type, key}});
 
-      expect(purchaseResponse.message).to.equal(i18n.t('purchased', {type, key}));
+      expect(message).to.equal(i18n.t('purchased', {type, key}));
       expect(user.items.gear.owned[key]).to.be.true;
     });
   });

test/common/ops/readCard.js

@@ -39,9 +39,9 @@ describe('shared.ops.readCard', () => {
   });
 
   it('reads a card', () => {
-    let response = readCard(user, {params: {cardType: 'greeting'}});
+    let [, message] = readCard(user, {params: {cardType: 'greeting'}});
 
-    expect(response.message).to.equal(i18n.t('readCard', {cardType}));
+    expect(message).to.equal(i18n.t('readCard', {cardType}));
     expect(user.items.special[`${cardType}Received`]).to.be.empty;
     expect(user.flags.cardReceived).to.be.false;
   });

test/common/ops/rebirth.js

@@ -35,18 +35,18 @@ describe('shared.ops.rebirth', () => {
   });
 
   it('rebirths a user with enough gems', () => {
-    let response = rebirth(user);
+    let [, message] = rebirth(user);
 
-    expect(response.message).to.equal(i18n.t('rebirthComplete'));
+    expect(message).to.equal(i18n.t('rebirthComplete'));
   });
 
   it('rebirths a user with not enough gems but max level', () => {
     user.balance = 0;
     user.stats.lvl = MAX_LEVEL;
 
-    let response = rebirth(user);
+    let [, message] = rebirth(user);
 
-    expect(response.message).to.equal(i18n.t('rebirthComplete'));
+    expect(message).to.equal(i18n.t('rebirthComplete'));
   });
 
   it('resets user\'s taks values except for rewards to 0', () => {

test/common/ops/releaseBoth.js

@@ -33,9 +33,9 @@ describe('shared.ops.releaseBoth', () => {
   });
 
   it('grants triad bingo with gems', () => {
-    let response = releaseBoth(user);
+    let [, message] = releaseBoth(user);
 
-    expect(response.message).to.equal(i18n.t('mountsAndPetsReleased'));
+    expect(message).to.equal(i18n.t('mountsAndPetsReleased'));
     expect(user.achievements.triadBingoCount).to.equal(1);
   });
 
@@ -44,24 +44,24 @@ describe('shared.ops.releaseBoth', () => {
     user.achievements.triadBingo = 1;
     user.achievements.triadBingoCount = 1;
 
-    let response = releaseBoth(user);
+    let [, message] = releaseBoth(user);
 
-    expect(response.message).to.equal(i18n.t('mountsAndPetsReleased'));
+    expect(message).to.equal(i18n.t('mountsAndPetsReleased'));
     expect(user.achievements.triadBingoCount).to.equal(2);
   });
 
   it('releases pets', () => {
-    let response = releaseBoth(user);
+    let [, message] = releaseBoth(user);
 
-    expect(response.message).to.equal(i18n.t('mountsAndPetsReleased'));
+    expect(message).to.equal(i18n.t('mountsAndPetsReleased'));
     expect(user.items.pets[animal]).to.be.empty;
     expect(user.items.mounts[animal]).to.equal(null);
   });
 
   it('releases mounts', () => {
-    let response = releaseBoth(user);
+    let [, message] = releaseBoth(user);
 
-    expect(response.message).to.equal(i18n.t('mountsAndPetsReleased'));
+    expect(message).to.equal(i18n.t('mountsAndPetsReleased'));
     expect(user.items.mounts[animal]).to.equal(null);
   });
 

test/common/ops/releaseMounts.js

@@ -31,9 +31,9 @@ describe('shared.ops.releaseMounts', () => {
   });
 
   it('releases mounts', () => {
-    let response = releaseMounts(user);
+    let [, message] = releaseMounts(user);
 
-    expect(response.message).to.equal(i18n.t('mountsReleased'));
+    expect(message).to.equal(i18n.t('mountsReleased'));
     expect(user.items.mounts[animal]).to.equal(null);
   });
 

test/common/ops/releasePets.js

@@ -31,9 +31,9 @@ describe('shared.ops.releasePets', () => {
   });
 
   it('releases pets', () => {
-    let response = releasePets(user);
+    let [, message] = releasePets(user);
 
-    expect(response.message).to.equal(i18n.t('petsReleased'));
+    expect(message).to.equal(i18n.t('petsReleased'));
     expect(user.items.pets[animal]).to.equal(0);
   });
 

test/common/ops/reroll.js

@@ -32,9 +32,9 @@ describe('shared.ops.reroll', () => {
   });
 
   it('rerolls a user with enough gems', () => {
-    let response = reroll(user);
+    let [, message] = reroll(user);
 
-    expect(response.message).to.equal(i18n.t('rerollComplete'));
+    expect(message).to.equal(i18n.t('rerollComplete'));
   });
 
   it('reduces a user\'s balance', () => {

test/common/ops/reset.js

@@ -31,9 +31,9 @@ describe('shared.ops.reset', () => {
 
 
   it('resets a user', () => {
-    let response = reset(user);
+    let [, message] = reset(user);
 
-    expect(response.message).to.equal(i18n.t('resetComplete'));
+    expect(message).to.equal(i18n.t('resetComplete'));
   });
 
   it('resets user\'s health', () => {

test/common/ops/revive.js

@@ -57,9 +57,9 @@ describe('shared.ops.revive', () => {
     let weaponKey = 'weapon_warrior_0';
     user.items.gear.owned[weaponKey] = true;
 
-    let reviveRequest = revive(user);
+    let [, message] = revive(user);
 
-    expect(reviveRequest.message).to.equal(i18n.t('messageLostItem', { itemText: content.gear.flat[weaponKey].text()}));
+    expect(message).to.equal(i18n.t('messageLostItem', { itemText: content.gear.flat[weaponKey].text()}));
     expect(user.items.gear.owned[weaponKey]).to.be.false;
   });
 
@@ -70,9 +70,9 @@ describe('shared.ops.revive', () => {
     user.items.gear.owned[weaponKey] = true;
     user.items.gear.equipped[itemToLose.type] = itemToLose.key;
 
-    let reviveRequest = revive(user);
+    let [, message] = revive(user);
 
-    expect(reviveRequest.message).to.equal(i18n.t('messageLostItem', { itemText: itemToLose.text()}));
+    expect(message).to.equal(i18n.t('messageLostItem', { itemText: itemToLose.text()}));
     expect(user.items.gear.equipped[itemToLose.type]).to.equal(`${itemToLose.type}_base_0`);
   });
 
@@ -83,9 +83,9 @@ describe('shared.ops.revive', () => {
     user.items.gear.owned[weaponKey] = true;
     user.items.gear.costume[itemToLose.type] = itemToLose.key;
 
-    let reviveRequest = revive(user);
+    let [, message] = revive(user);
 
-    expect(reviveRequest.message).to.equal(i18n.t('messageLostItem', { itemText: itemToLose.text()}));
+    expect(message).to.equal(i18n.t('messageLostItem', { itemText: itemToLose.text()}));
     expect(user.items.gear.costume[itemToLose.type]).to.equal(`${itemToLose.type}_base_0`);
   });
 });

test/common/ops/sell.js

@@ -66,16 +66,16 @@ describe('shared.ops.sell', () => {
   });
 
   it('reduces item count from user', () => {
-    let response = sell(user, {params: { type, key } });
+    let [, message] = sell(user, {params: { type, key } });
 
-    expect(response.message).to.equal(i18n.t('sold', {type, key}));
+    expect(message).to.equal(i18n.t('sold', {type, key}));
     expect(user.items[type][key]).to.equal(0);
   });
 
   it('increases user\'s gold', () => {
-    let response = sell(user, {params: { type, key } });
+    let [, message] = sell(user, {params: { type, key } });
 
-    expect(response.message).to.equal(i18n.t('sold', {type, key}));
+    expect(message).to.equal(i18n.t('sold', {type, key}));
     expect(user.stats.gp).to.equal(content[type][key].value);
   });
 });

test/common/ops/sleep.js

@@ -7,12 +7,12 @@ describe('shared.ops.sleep', () => {
   it('toggles user.preferences.sleep', () => {
     let user = generateUser();
 
-    let res = sleep(user);
+    let [res] = sleep(user);
-    expect(res).to.eql({preferences: {sleep: true}});
+    expect(res).to.eql(true);
     expect(user.preferences.sleep).to.equal(true);
 
-    let res2 = sleep(user);
+    let [res2] = sleep(user);
-    expect(res2).to.eql({preferences: {sleep: false}});
+    expect(res2).to.eql(false);
     expect(user.preferences.sleep).to.equal(false);
   });
 });

test/common/ops/unlock.js

@@ -55,30 +55,30 @@ describe('shared.ops.unlock', () => {
   });
 
   it('unlocks a full set', () => {
-    let response = unlock(user, {query: {path: unlockPath}});
+    let [, message] = unlock(user, {query: {path: unlockPath}});
 
-    expect(response.message).to.equal(i18n.t('unlocked'));
+    expect(message).to.equal(i18n.t('unlocked'));
     expect(user.purchased.shirt.convict).to.be.true;
   });
 
   it('unlocks a full set of gear', () => {
-    let response = unlock(user, {query: {path: unlockGearSetPath}});
+    let [, message] = unlock(user, {query: {path: unlockGearSetPath}});
 
-    expect(response.message).to.equal(i18n.t('unlocked'));
+    expect(message).to.equal(i18n.t('unlocked'));
     expect(user.items.gear.owned.headAccessory_special_wolfEars).to.be.true;
   });
 
   it('unlocks a an item', () => {
-    let response = unlock(user, {query: {path: backgroundUnlockPath}});
+    let [, message] = unlock(user, {query: {path: backgroundUnlockPath}});
 
-    expect(response.message).to.equal(i18n.t('unlocked'));
+    expect(message).to.equal(i18n.t('unlocked'));
     expect(user.purchased.background.giant_florals).to.be.true;
   });
 
   it('reduces a user\'s balance', () => {
-    let response = unlock(user, {query: {path: unlockPath}});
+    let [, message] = unlock(user, {query: {path: unlockPath}});
 
-    expect(response.message).to.equal(i18n.t('unlocked'));
+    expect(message).to.equal(i18n.t('unlocked'));
     expect(user.balance).to.equal(usersStartingGems - unlockCost);
   });
 });

test/common/ops/updateTask.js

@@ -19,7 +19,7 @@ describe('shared.ops.updateTask', () => {
       }],
     });
 
-    let res = updateTask(habit, {
+    let [res] = updateTask(habit, {
       body: {
         text: 'updated',
         id: '123',

test/helpers/api-integration/requester.js

@@ -92,7 +92,14 @@ function _parseRes (res) {
   if (apiVersion === 'v2') {
     return res.body;
   } else if (apiVersion === 'v3') {
-    return res.body.data;
+    if (res.body.message) {
+      return {
+        data: res.body.data,
+        message: res.body.message,
+      };
+    } else {
+      return res.body.data;
+    }
   }
 }
 

website/src/controllers/api-v2/user.js

@@ -124,7 +124,7 @@ api.score = function(req, res, next) {
       task.completed = direction === 'up';
     }
 
-    var delta = shared.ops.scoreTask({
+    var [delta] = shared.ops.scoreTask({
       user,
       task,
       direction,
@@ -835,7 +835,7 @@ api.updateTask = function(req, res, next) {
     if(!task) return res.status(404).json({err: 'Task not found.'})
 
     try {
-      _.assign(task, shared.ops.updateTask(task.toObject(), req));
+      _.assign(task, shared.ops.updateTask(task.toObject(), req)[0]);
       task.save(function(err, task){
         if(err) return next(err);
 
@@ -892,6 +892,9 @@ _.each(shared.ops, function(op,k){
       try {
         req.v2 = true; // Used to indicate to the shared code that the old response data should be returned
         opResponse = shared.ops[k](res.locals.user, req, analytics);
+        if (Array.isArray(opResponse) && opResponse.length < 3) {
+          opResponse = opResponse[0];
+        }
       } catch (err) {
         if (!err.code) return next(err);
         if (err.code >= 400) return res.status(err.code).json({err:err.message});

website/src/controllers/api-v3/auth.js

@@ -420,7 +420,7 @@ api.resetPassword = {
       });
       await user.save();
     }
-    res.respond(200, { message: res.t('passwordReset') });
+    res.respond(200, {}, res.t('passwordReset'));
   },
 };
 

website/src/controllers/api-v3/tasks.js

@@ -304,7 +304,8 @@ api.updateTask = {
 
     // we have to convert task to an object because otherwise things don't get merged correctly. Bad for performances?
     // TODO regarding comment above, make sure other models with nested fields are using this trick too
-    _.assign(task, Tasks.Task.sanitize(common.ops.updateTask(task.toObject(), req)));
+    let [updatedTaskObj] = common.ops.updateTask(task.toObject(), req);
+    _.assign(task, Tasks.Task.sanitize(updatedTaskObj));
     // console.log(task.modifiedPaths(), task.toObject().repeat === tep)
     // repeat is always among modifiedPaths because mongoose changes the other of the keys when using .toObject()
     // see https://github.com/Automattic/mongoose/issues/2749
@@ -376,7 +377,7 @@ api.scoreTask = {
 
     let wasCompleted = task.completed;
 
-    let delta = common.ops.scoreTask({task, user, direction}, req);
+    let [delta] = common.ops.scoreTask({task, user, direction}, req);
     // Drop system (don't run on the client, as it would only be discarded since ops are sent to the API, not the results)
     if (direction === 'up') user.fns.randomDrop({task, delta}, req);
 

website/src/controllers/api-v3/user.js

@@ -432,7 +432,7 @@ api.sleep = {
     let user = res.locals.user;
     let sleepRes = common.ops.sleep(user);
     await user.save();
-    res.respond(200, sleepRes);
+    res.respond(200, ...sleepRes);
   },
 };
 
@@ -452,7 +452,7 @@ api.allocate = {
     let user = res.locals.user;
     let allocateRes = common.ops.allocate(user, req);
     await user.save();
-    res.respond(200, allocateRes);
+    res.respond(200, ...allocateRes);
   },
 };
 
@@ -472,7 +472,7 @@ api.allocateNow = {
     let user = res.locals.user;
     let allocateNowRes = common.ops.allocateNow(user, req);
     await user.save();
-    res.respond(200, allocateNowRes);
+    res.respond(200, ...allocateNowRes);
   },
 };
 
@@ -495,7 +495,7 @@ api.buy = {
     let user = res.locals.user;
     let buyRes = common.ops.buy(user, req, res.analytics);
     await user.save();
-    res.respond(200, buyRes);
+    res.respond(200, ...buyRes);
   },
 };
 
@@ -516,9 +516,9 @@ api.buyGear = {
   url: '/user/buy-gear/:key',
   async handler (req, res) {
     let user = res.locals.user;
-    let buyRes = common.ops.buyGear(user, req, res.analytics);
+    let buyGearRes = common.ops.buyGear(user, req, res.analytics);
     await user.save();
-    res.respond(200, buyRes);
+    res.respond(200, ...buyGearRes);
   },
 };
 
@@ -542,7 +542,7 @@ api.buyArmoire = {
     let user = res.locals.user;
     let buyArmoireResponse = common.ops.buyArmoire(user, req, res.analytics);
     await user.save();
-    res.respond(200, buyArmoireResponse);
+    res.respond(200, ...buyArmoireResponse);
   },
 };
 
@@ -565,7 +565,7 @@ api.buyPotion = {
     let user = res.locals.user;
     let buyPotionResponse = common.ops.buyPotion(user, req, res.analytics);
     await user.save();
-    res.respond(200, buyPotionResponse);
+    res.respond(200, ...buyPotionResponse);
   },
 };
 
@@ -588,7 +588,7 @@ api.buyMysterySet = {
     let user = res.locals.user;
     let buyMysterySetRes = common.ops.buyMysterySet(user, req, res.analytics);
     await user.save();
-    res.respond(200, buyMysterySetRes);
+    res.respond(200, ...buyMysterySetRes);
   },
 };
 
@@ -611,7 +611,7 @@ api.buyQuest = {
     let user = res.locals.user;
     let buyQuestRes = common.ops.buyQuest(user, req, res.analytics);
     await user.save();
-    res.respond(200, buyQuestRes);
+    res.respond(200, ...buyQuestRes);
   },
 };
 
@@ -634,7 +634,7 @@ api.buySpecialSpell = {
     let user = res.locals.user;
     let buySpecialSpellRes = common.ops.buySpecialSpell(user, req);
     await user.save();
-    res.respond(200, buySpecialSpellRes);
+    res.respond(200, ...buySpecialSpellRes);
   },
 };
 
@@ -658,7 +658,7 @@ api.hatch = {
     let user = res.locals.user;
     let hatchRes = common.ops.hatch(user, req);
     await user.save();
-    res.respond(200, hatchRes);
+    res.respond(200, ...hatchRes);
   },
 };
 
@@ -682,7 +682,7 @@ api.equip = {
     let user = res.locals.user;
     let equipRes = common.ops.equip(user, req);
     await user.save();
-    res.respond(200, equipRes);
+    res.respond(200, ...equipRes);
   },
 };
 
@@ -706,7 +706,7 @@ api.feed = {
     let user = res.locals.user;
     let feedRes = common.ops.feed(user, req);
     await user.save();
-    res.respond(200, feedRes);
+    res.respond(200, ...feedRes);
   },
 };
 
@@ -728,7 +728,7 @@ api.changeClass = {
     let user = res.locals.user;
     let changeClassRes = common.ops.changeClass(user, req, res.analytics);
     await user.save();
-    res.respond(200, changeClassRes);
+    res.respond(200, ...changeClassRes);
   },
 };
 
@@ -748,7 +748,7 @@ api.disableClasses = {
     let user = res.locals.user;
     let disableClassesRes = common.ops.disableClasses(user, req);
     await user.save();
-    res.respond(200, disableClassesRes);
+    res.respond(200, ...disableClassesRes);
   },
 };
 
@@ -769,9 +769,9 @@ api.purchase = {
   url: '/user/purchase/:type/:key',
   async handler (req, res) {
     let user = res.locals.user;
-    let purchaseResponse = common.ops.purchase(user, req, res.analytics);
+    let purchaseRes = common.ops.purchase(user, req, res.analytics);
     await user.save();
-    res.respond(200, purchaseResponse);
+    res.respond(200, ...purchaseRes);
   },
 };
 
@@ -792,9 +792,9 @@ api.userPurchaseHourglass = {
   url: '/user/purchase-hourglass/:type/:key',
   async handler (req, res) {
     let user = res.locals.user;
-    let purchaseHourglassResponse = common.ops.purchaseHourglass(user, req, res.analytics);
+    let purchaseHourglassRes = common.ops.purchaseHourglass(user, req, res.analytics);
     await user.save();
-    res.respond(200, purchaseHourglassResponse);
+    res.respond(200, ...purchaseHourglassRes);
   },
 };
 
@@ -814,9 +814,9 @@ api.readCard = {
   url: '/user/read-card/:cardType',
   async handler (req, res) {
     let user = res.locals.user;
-    let readCardResponse = common.ops.readCard(user, req);
+    let readCardRes = common.ops.readCard(user, req);
     await user.save();
-    res.respond(200, readCardResponse);
+    res.respond(200, ...readCardRes);
   },
 };
 
@@ -834,9 +834,9 @@ api.userOpenMysteryItem = {
   url: '/user/open-mystery-item',
   async handler (req, res) {
     let user = res.locals.user;
-    let openMysteryItemResponse = common.ops.openMysteryItem(user, req, res.analytics);
+    let openMysteryItemRes = common.ops.openMysteryItem(user, req, res.analytics);
     await user.save();
-    res.respond(200, openMysteryItemResponse);
+    res.respond(200, ...openMysteryItemRes);
   },
 };
 
@@ -853,9 +853,9 @@ api.addWebhook = {
   url: '/user/webhook',
   async handler (req, res) {
     let user = res.locals.user;
-    let result = common.ops.addWebhook(user, req);
+    let addWebhookRes = common.ops.addWebhook(user, req);
     await user.save();
-    res.respond(200, result);
+    res.respond(200, ...addWebhookRes);
   },
 };
 
@@ -872,9 +872,9 @@ api.updateWebhook = {
   url: '/user/webhook/:id',
   async handler (req, res) {
     let user = res.locals.user;
-    let result = common.ops.updateWebhook(user, req);
+    let updateWebhookRes = common.ops.updateWebhook(user, req);
     await user.save();
-    res.respond(200, result);
+    res.respond(200, ...updateWebhookRes);
   },
 };
 
@@ -891,9 +891,9 @@ api.deleteWebhook = {
   url: '/user/webhook/:id',
   async handler (req, res) {
     let user = res.locals.user;
-    common.ops.deleteWebhook(user, req);
+    let deleteWebhookRes = common.ops.deleteWebhook(user, req);
     await user.save();
-    res.respond(200, {});
+    res.respond(200, ...deleteWebhookRes);
   },
 };
 
@@ -911,9 +911,9 @@ api.userReleasePets = {
   url: '/user/release-pets',
   async handler (req, res) {
     let user = res.locals.user;
-    let releasePetsResponse = common.ops.releasePets(user, req, res.analytics);
+    let releasePetsRes = common.ops.releasePets(user, req, res.analytics);
     await user.save();
-    res.respond(200, releasePetsResponse);
+    res.respond(200, ...releasePetsRes);
   },
 };
 
@@ -931,9 +931,9 @@ api.userReleaseBoth = {
   url: '/user/release-both',
   async handler (req, res) {
     let user = res.locals.user;
-    let releaseBothResponse = common.ops.releaseBoth(user, req, res.analytics);
+    let releaseBothRes = common.ops.releaseBoth(user, req, res.analytics);
     await user.save();
-    res.respond(200, releaseBothResponse);
+    res.respond(200, ...releaseBothRes);
   },
 };
 
@@ -951,9 +951,9 @@ api.userReleaseMounts = {
   url: '/user/release-mounts',
   async handler (req, res) {
     let user = res.locals.user;
-    let releaseMountsResponse = common.ops.releaseMounts(user, req, res.analytics);
+    let releaseMountsRes = common.ops.releaseMounts(user, req, res.analytics);
     await user.save();
-    res.respond(200, releaseMountsResponse);
+    res.respond(200, ...releaseMountsRes);
   },
 };
 
@@ -971,9 +971,9 @@ api.userSell = {
   url: '/user/sell/:type/:key',
   async handler (req, res) {
     let user = res.locals.user;
-    let sellResponse = common.ops.sell(user, req);
+    let sellRes = common.ops.sell(user, req);
     await user.save();
-    res.respond(200, sellResponse);
+    res.respond(200, ...sellRes);
   },
 };
 
@@ -991,9 +991,9 @@ api.userUnlock = {
   url: '/user/unlock',
   async handler (req, res) {
     let user = res.locals.user;
-    let unlockResponse = common.ops.unlock(user, req);
+    let unlockRes = common.ops.unlock(user, req);
     await user.save();
-    res.respond(200, unlockResponse);
+    res.respond(200, ...unlockRes);
   },
 };
 
@@ -1011,9 +1011,9 @@ api.userRevive = {
   url: '/user/revive',
   async handler (req, res) {
     let user = res.locals.user;
-    let reviveResponse = common.ops.revive(user, req, res.analytics);
+    let reviveRes = common.ops.revive(user, req, res.analytics);
     await user.save();
-    res.respond(200, reviveResponse);
+    res.respond(200, ...reviveRes);
   },
 };
 
@@ -1036,13 +1036,13 @@ api.userRebirth = {
       type: {$in: ['daily', 'habit', 'todo']},
     };
     let tasks = await Tasks.Task.find(query).exec();
-    let rebirthResponse = common.ops.rebirth(user, tasks, req, res.analytics);
+    let rebirthRes = common.ops.rebirth(user, tasks, req, res.analytics);
 
     await user.save();
 
     await Q.all(tasks.map(task => task.save()));
 
-    res.respond(200, rebirthResponse);
+    res.respond(200, ...rebirthRes);
   },
 };
 
@@ -1059,9 +1059,9 @@ api.blockUser = {
   url: '/user/block/:uuid',
   async handler (req, res) {
     let user = res.locals.user;
-    let blocks = common.ops.blockUser(user, req);
+    let blockUserRes = common.ops.blockUser(user, req);
     await user.save();
-    res.respond(200, blocks);
+    res.respond(200, ...blockUserRes);
   },
 };
 
@@ -1078,9 +1078,9 @@ api.deleteMessage = {
   url: '/user/messages/:id',
   async handler (req, res) {
     let user = res.locals.user;
-    let messages = common.ops.deletePM(user, req);
+    let deletePMRes = common.ops.deletePM(user, req);
     await user.save();
-    res.respond(200, messages);
+    res.respond(200, ...deletePMRes);
   },
 };
 
@@ -1097,9 +1097,9 @@ api.clearMessages = {
   url: '/user/messages',
   async handler (req, res) {
     let user = res.locals.user;
-    let PMs = common.ops.clearPMs(user, req);
+    let clearPMsRes = common.ops.clearPMs(user, req);
     await user.save();
-    res.respond(200, PMs);
+    res.respond(200, ...clearPMsRes);
   },
 };
 
@@ -1122,14 +1122,14 @@ api.userReroll = {
       type: {$in: ['daily', 'habit', 'todo']},
     };
     let tasks = await Tasks.Task.find(query).exec();
-    let rerollResponse = common.ops.reroll(user, tasks, req, res.analytics);
+    let rerollRes = common.ops.reroll(user, tasks, req, res.analytics);
 
     let promises = tasks.map(task => task.save());
     promises.push(user.save());
 
     await Q.all(promises);
 
-    res.respond(200, rerollResponse);
+    res.respond(200, ...rerollRes);
   },
 };
 
@@ -1148,10 +1148,10 @@ api.userAddPushDevice = {
   async handler (req, res) {
     let user = res.locals.user;
 
-    let addPushDeviceResponse = common.ops.addPushDevice(user, req);
+    let addPushDeviceRes = common.ops.addPushDevice(user, req);
     await user.save();
 
-    res.respond(200, addPushDeviceResponse);
+    res.respond(200, ...addPushDeviceRes);
   },
 };
 
@@ -1172,11 +1172,11 @@ api.userReset = {
 
     let tasks = await Tasks.Task.find({userId: user._id}).select('_id type challenge').exec();
 
-    let resetResponse = common.ops.reset(user, tasks);
+    let resetRes = common.ops.reset(user, tasks);
 
-    await Q.all([Tasks.Task.remove({_id: {$in: resetResponse.data.tasksToRemove}, userId: user._id}), user.save()]);
+    await Q.all([Tasks.Task.remove({_id: {$in: resetRes[0].tasksToRemove}, userId: user._id}), user.save()]);
 
-    res.respond(200, resetResponse);
+    res.respond(200, ...resetRes);
   },
 };
 

website/src/middlewares/api-v3/response.js

@@ -1,10 +1,14 @@
 module.exports = function responseHandler (req, res, next) {
   // Only used for successful responses
-  res.respond = function respond (status = 200, data = {}) {
+  res.respond = function respond (status = 200, data = {}, message) {
-    res.status(status).json({
+    let response = {
       success: status < 400,
       data,
-    });
+    };
+
+    if (message) response.message = message;
+
+    res.status(status).json(response);
   };
 
   next();