4.156.3

fix(tasks and groupd): do not apply default due filter to challenges, fix edge case in group loading
4.156.2
2025-12-16 22:27:26 +01:00 · 2020-09-11 12:56:06 -05:00 · 2020-09-11 19:53:28 +02:00 · 2020-09-10 15:14:14 -05:00 · 2020-09-10 15:14:04 -05:00 · 2020-09-10 15:06:51 -05:00
1189 changed files with 53858 additions and 45327 deletions
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -22,6 +22,7 @@ jobs:
        npm ci
      env:
        CI: true
        NODE_ENV: test
    - run: npm run lint-no-fix
  apidoc:
    runs-on: ubuntu-latest
@@ -42,6 +43,7 @@ jobs:
        npm ci
      env:
        CI: true
        NODE_ENV: test
    - run: npm run apidoc
  sanity:
    runs-on: ubuntu-latest
@@ -62,6 +64,7 @@ jobs:
        npm ci
      env:
        CI: true
        NODE_ENV: test
    - run: npm run test:sanity
  common:
@@ -83,6 +86,7 @@ jobs:
        npm ci
      env:
        CI: true
        NODE_ENV: test
    - run: npm run test:common
  content:
    runs-on: ubuntu-latest
@@ -103,6 +107,7 @@ jobs:
        npm ci
      env:
        CI: true
        NODE_ENV: test
    - run: npm run test:content
  api-unit:
@@ -110,6 +115,7 @@ jobs:
    strategy:
      matrix:
        node-version: [12.x]
        mongodb-version: [4.2]
    steps:
    - uses: actions/checkout@v1
      with:
@@ -118,13 +124,18 @@ jobs:
      uses: actions/setup-node@v1
      with:
        node-version: ${{ matrix.node-version }}
-    - run: sudo docker run --name mongo -d -p 27017:27017 mongo:4.2
+    - name: Start MongoDB ${{ matrix.mongodb-version }} Replica Set
      uses: supercharge/mongodb-github-action@1.3.0
      with:
        mongodb-version: ${{ matrix.mongodb-version }}
        mongodb-replica-set: rs
    - run: cp config.json.example config.json
    - name: npm install
      run: |
        npm ci
      env:
        CI: true
        NODE_ENV: test
    - run: npm run test:api:unit
      env:
        REQUIRES_SERVER=true: true
@@ -133,6 +144,7 @@ jobs:
    strategy:
      matrix:
        node-version: [12.x]
        mongodb-version: [4.2]
    steps:
    - uses: actions/checkout@v1
      with:
@@ -141,13 +153,18 @@ jobs:
      uses: actions/setup-node@v1
      with:
        node-version: ${{ matrix.node-version }}
-    - run: sudo docker run --name mongo -d -p 27017:27017 mongo:4.2
+    - name: Start MongoDB ${{ matrix.mongodb-version }} Replica Set
      uses: supercharge/mongodb-github-action@1.3.0
      with:
        mongodb-version: ${{ matrix.mongodb-version }}
        mongodb-replica-set: rs
    - run: cp config.json.example config.json
    - name: npm install
      run: |
        npm ci
      env:
        CI: true
        NODE_ENV: test
    - run: npm run test:api-v3:integration
      env:
        REQUIRES_SERVER=true: true
@@ -156,6 +173,7 @@ jobs:
    strategy:
      matrix:
        node-version: [12.x]
        mongodb-version: [4.2]
    steps:
    - uses: actions/checkout@v1
      with:
@@ -164,13 +182,18 @@ jobs:
      uses: actions/setup-node@v1
      with:
        node-version: ${{ matrix.node-version }}
-    - run: sudo docker run --name mongo -d -p 27017:27017 mongo:4.2
+    - name: Start MongoDB ${{ matrix.mongodb-version }} Replica Set
      uses: supercharge/mongodb-github-action@1.3.0
      with:
        mongodb-version: ${{ matrix.mongodb-version }}
        mongodb-replica-set: rs
    - run: cp config.json.example config.json
    - name: npm install
      run: |
        npm ci
      env:
        CI: true
        NODE_ENV: test
    - run: npm run test:api-v4:integration
      env:
        REQUIRES_SERVER=true: true
@@ -194,5 +217,6 @@ jobs:
        npm ci
      env:
        CI: true
        NODE_ENV: test
    - run: npm run test:unit
      working-directory: ./website/client
--- a/.gitignore
+++ b/.gitignore
@@ -38,7 +38,12 @@ yarn.lock
 .elasticbeanstalk/*
 !.elasticbeanstalk/*.cfg.yml
 !.elasticbeanstalk/*.global.yml
 /.vscode
 # webstorm fake webpack for path intellisense
 webpack.webstorm.config
 # mongodb replica set for local dev
 mongodb-*.tgz
 /mongodb-data
--- a/apidoc.json
+++ b/apidoc.json
@@ -2,6 +2,10 @@
  "name": "Habitica V3 API Documentation",
  "title": "Habitica",
  "url": "https://habitica.com",
  "header": {
    "title": "Introduction",
    "filename": "apidoc/header.md"
  },
  "template": {
    "withCompare": false
  }
--- a/apidoc/header.md
+++ b/apidoc/header.md
@@ -0,0 +1,5 @@
 # Introduction
 This webpage includes the documentation for version 3 of the [Habitica](https://habitica.com) API.
 If you're developing a 3rd party tool that uses the Habitica API you should read the [Guidance for Comrades](https://habitica.fandom.com/wiki/Guidance_for_Comrades) and in particular the section called [Rules for Third-Party Tools](https://habitica.fandom.com/wiki/Guidance_for_Comrades#Rules_for_Third-Party_Tools) which includes suggestions on how to best use the API and the rules to follow when interacting with it. 
--- a/config.json.example
+++ b/config.json.example
@@ -32,7 +32,8 @@
  "LOGGLY_SUBDOMAIN": "example-subdomain",
  "LOGGLY_TOKEN": "example-token",
  "MAINTENANCE_MODE": "false",
-  "NODE_DB_URI": "mongodb://localhost:27017/habitrpg",
+  "NODE_DB_URI": "mongodb://localhost:27017/habitica-dev?replicaSet=rs",
  "TEST_DB_URI": "mongodb://localhost:27017/habitica-test?replicaSet=rs",
  "MONGODB_POOL_SIZE": "10",
  "NODE_ENV": "development",
  "PATH": "bin:node_modules/.bin:/usr/local/bin:/usr/bin:/bin",
@@ -70,7 +71,6 @@
  "SLACK_URL": "https://hooks.slack.com/services/some-url",
  "STRIPE_API_KEY": "aaaabbbbccccddddeeeeffff00001111",
  "STRIPE_PUB_KEY": "22223333444455556666777788889999",
  "TEST_DB_URI": "mongodb://localhost:27017/habitrpg_test",
  "TRANSIFEX_SLACK_CHANNEL": "transifex",
  "WEB_CONCURRENCY": 1,
  "SKIP_SSL_CHECK_KEY": "key",
@@ -80,5 +80,9 @@
  "APPLE_AUTH_CLIENT_ID": "",
  "APPLE_AUTH_KEY_ID": "",
  "BLOCKED_IPS": "",
-  "LOG_AMPLITUDE_EVENTS": "false"
+  "LOG_AMPLITUDE_EVENTS": "false",
  "RATE_LIMITER_ENABLED": "false",
  "REDIS_HOST": "aaabbbcccdddeeefff",
  "REDIS_PORT": "1234",
  "REDIS_PASSWORD": "12345678"
 }
--- a/gulp/gulp-build.js
+++ b/gulp/gulp-build.js
@@ -1,5 +1,12 @@
 /* eslint-disable no-console */
 import gulp from 'gulp';
 import path from 'path';
 import babel from 'gulp-babel';
 import os from 'os';
 import fs from 'fs';
 import spawn from 'cross-spawn'; // eslint-disable-line import/no-extraneous-dependencies
 import clean from 'rimraf';
 gulp.task('build:babel:server', () => gulp.src('website/server/**/*.js')
  .pipe(babel())
@@ -24,10 +31,67 @@ gulp.task('build:prod', gulp.series(
  done => done(),
 ));
 // Due to this issue https://github.com/vkarpov15/run-rs/issues/45
 // When used on windows `run-rs` must first be run without the `--keep` option
 // in order to be setup correctly, afterwards it can be used.
 const MONGO_PATH = path.join(__dirname, '/../mongodb-data/');
 gulp.task('build:prepare-mongo', async () => {
  if (fs.existsSync(MONGO_PATH)) {
    // console.log('MongoDB data folder exists, skipping setup.');
    return;
  }
  if (os.platform() !== 'win32') {
    // console.log('Not on Windows, skipping MongoDB setup.');
    return;
  }
  console.log('MongoDB data folder is missing, setting up.'); // eslint-disable-line no-console
  // use run-rs without --keep, kill it as soon as the replica set starts
  const runRsProcess = spawn('run-rs', ['-v', '4.2.8', '-l', 'ubuntu1804', '--dbpath', 'mongodb-data', '--number', '1', '--quiet']);
  for await (const chunk of runRsProcess.stdout) {
    const stringChunk = chunk.toString();
    console.log(stringChunk); // eslint-disable-line no-console
    // kills the process after the replica set is setup
    if (stringChunk.includes('Started replica set')) {
      console.log('MongoDB setup correctly.'); // eslint-disable-line no-console
      runRsProcess.kill();
    }
  }
  let error = '';
  for await (const chunk of runRsProcess.stderr) {
    const stringChunk = chunk.toString();
    error += stringChunk;
  }
  const exitCode = await new Promise(resolve => {
    runRsProcess.on('close', resolve);
  });
  if (exitCode || error.length > 0) {
    // remove any leftover files
    clean.sync(MONGO_PATH);
    throw new Error(`Error running run-rs: ${error}`);
  }
 });
 gulp.task('build:dev', gulp.series(
  'build:prepare-mongo',
  done => done(),
 ));
 const buildArgs = [];
 if (process.env.NODE_ENV === 'production') { // eslint-disable-line no-process-env
  buildArgs.push('build:prod');
 } else if (process.env.NODE_ENV !== 'test') { // eslint-disable-line no-process-env
  buildArgs.push('build:dev');
 }
 gulp.task('build', gulp.series(buildArgs, done => {
--- a/gulp/gulp-console.js
+++ b/gulp/gulp-console.js
@@ -3,6 +3,10 @@ import nconf from 'nconf';
 import repl from 'repl';
 import gulp from 'gulp';
 import logger from '../website/server/libs/logger';
 import {
  getDevelopmentConnectionUrl,
  getDefaultConnectionOptions,
 } from '../website/server/libs/mongodb';
 // Add additional properties to the repl's context
 const improveRepl = context => {
@@ -26,13 +30,14 @@ const improveRepl = context => {
  context.Group = require('../website/server/models/group').model; // eslint-disable-line global-require
  context.User = require('../website/server/models/user').model; // eslint-disable-line global-require
-  const isProd = nconf.get('NODE_ENV') === 'production';
+  const IS_PROD = nconf.get('NODE_ENV') === 'production';
-  const mongooseOptions = !isProd ? {} : {
+  const NODE_DB_URI = nconf.get('NODE_DB_URI');
-    keepAlive: 1,
+
-    connectTimeoutMS: 30000,
+  const mongooseOptions = getDefaultConnectionOptions();
-  };
+  const connectionUrl = IS_PROD ? NODE_DB_URI : getDevelopmentConnectionUrl(NODE_DB_URI);
  mongoose.connect(
-    nconf.get('NODE_DB_URI'),
+    connectionUrl,
    mongooseOptions,
    err => {
      if (err) throw err;
--- a/gulp/gulp-tests.js
+++ b/gulp/gulp-tests.js
@@ -6,6 +6,10 @@ import nconf from 'nconf';
 import {
  pipe,
 } from './taskHelper';
 import {
  getDevelopmentConnectionUrl,
  getDefaultConnectionOptions,
 } from '../website/server/libs/mongodb';
 // TODO rewrite
@@ -44,7 +48,10 @@ gulp.task('test:nodemon', gulp.series(done => {
 }, 'nodemon'));
 gulp.task('test:prepare:mongo', cb => {
-  mongoose.connect(TEST_DB_URI, err => {
+  const mongooseOptions = getDefaultConnectionOptions();
  const connectionUrl = getDevelopmentConnectionUrl(TEST_DB_URI);
  mongoose.connect(connectionUrl, mongooseOptions, err => {
    if (err) return cb(`Unable to connect to mongo database. Are you sure it's running? \n\n${err}`);
    return mongoose.connection.dropDatabase(err2 => {
      if (err2) return cb(err2);
@@ -176,7 +183,7 @@ gulp.task('test:api:unit:run', done => {
 gulp.task('test:api:unit:watch', () => gulp.watch(['website/server/libs/*', 'test/api/unit/**/*', 'website/server/controllers/**/*'], gulp.series('test:api:unit:run', done => done())));
-gulp.task('test:api-v3:integration', done => {
+gulp.task('test:api-v3:integration', gulp.series('test:prepare:mongo', done => {
  const runner = exec(
    testBin('istanbul cover --dir coverage/api-v3-integration --report lcovonly node_modules/mocha/bin/_mocha -- test/api/v3/integration --recursive --require ./test/helpers/start-server'),
    { maxBuffer: 500 * 1024 },
@@ -189,7 +196,7 @@ gulp.task('test:api-v3:integration', done => {
  );
  pipe(runner);
-});
+}));
 gulp.task('test:api-v3:integration:watch', () => gulp.watch([
  'website/server/controllers/api-v3/**/*', 'common/script/ops/*', 'website/server/libs/*.js',
@@ -206,7 +213,7 @@ gulp.task('test:api-v3:integration:separate-server', done => {
  pipe(runner);
 });
-gulp.task('test:api-v4:integration', done => {
+gulp.task('test:api-v4:integration', gulp.series('test:prepare:mongo', done => {
  const runner = exec(
    testBin('istanbul cover --dir coverage/api-v4-integration --report lcovonly node_modules/mocha/bin/_mocha -- test/api/v4 --recursive --require ./test/helpers/start-server'),
    { maxBuffer: 500 * 1024 },
@@ -219,7 +226,7 @@ gulp.task('test:api-v4:integration', done => {
  );
  pipe(runner);
-});
+}));
 gulp.task('test:api-v4:integration:separate-server', done => {
  const runner = exec(
@@ -231,11 +238,16 @@ gulp.task('test:api-v4:integration:separate-server', done => {
  pipe(runner);
 });
 gulp.task('test:api:unit', gulp.series(
  'test:prepare:mongo',
  'test:api:unit:run',
  done => done(),
 ));
 gulp.task('test', gulp.series(
  'test:sanity',
  'test:content',
  'test:common',
  'test:prepare:mongo',
  'test:api:unit:run',
  'test:api-v3:integration',
  'test:api-v4:integration',
@@ -243,14 +255,7 @@ gulp.task('test', gulp.series(
 ));
 gulp.task('test:api-v3', gulp.series(
-  'test:prepare:mongo',
+  'test:api:unit',
  'test:api:unit:run',
  'test:api-v3:integration',
  done => done(),
 ));
 gulp.task('test:api:unit', gulp.series(
  'test:prepare:mongo',
  'test:api:unit:run',
  done => done(),
 ));
--- a/gulp/gulp-transifex-test.js
+++ b/gulp/gulp-transifex-test.js
@@ -12,7 +12,6 @@ const SLACK_CONFIG = {
 const LOCALES = './website/common/locales/';
 const ENGLISH_LOCALE = `${LOCALES}en/`;
 function getArrayOfLanguages () {
  const languages = fs.readdirSync(LOCALES);
  languages.shift(); // Remove README.md from array of languages
--- a/migrations/archive/2020/20200721_summer_splash_orcas.js
+++ b/migrations/archive/2020/20200721_summer_splash_orcas.js
@@ -0,0 +1,59 @@
 /* eslint-disable no-console */
 const MIGRATION_NAME = '20200721_summer_splash_orcas';
 import { model as User } from '../../../website/server/models/user';
 const progressCount = 1000;
 let count = 0;
 async function updateUser (user) {
  count++;
  let set;
  if (user && user.items && user.items.pets && typeof user.items.pets['Orca-Base'] !== 'undefined') {
    set = { migration: MIGRATION_NAME };
  } else if (user && user.items && user.items.mounts && typeof user.items.mounts['Orca-Base'] !== 'undefined') {
    set = { migration: MIGRATION_NAME, 'items.pets.Orca-Base': 5 };
  } else {
    set = { migration: MIGRATION_NAME, 'items.mounts.Orca-Base': true };
  }
  if (count % progressCount === 0) console.warn(`${count} ${user._id}`);
  return await User.update({ _id: user._id }, { $set: set }).exec();
 }
 export default async function processUsers () {
  let query = {
    migration: {$ne: MIGRATION_NAME},
    'auth.timestamps.loggedin': {$gt: new Date('2020-06-21')},
  };
  const fields = {
    _id: 1,
    items: 1,
  };
  while (true) { // eslint-disable-line no-constant-condition
    const users = await User // eslint-disable-line no-await-in-loop
      .find(query)
      .limit(250)
      .sort({_id: 1})
      .select(fields)
      .lean()
      .exec();
    if (users.length === 0) {
      console.warn('All appropriate users found and modified.');
      console.warn(`\n${count} users processed\n`);
      break;
    } else {
      query._id = {
        $gt: users[users.length - 1],
      };
    }
    await Promise.all(users.map(updateUser)); // eslint-disable-line no-await-in-loop
  }
 };
--- a/migrations/archive/2020/20200731_naming_day.js
+++ b/migrations/archive/2020/20200731_naming_day.js
@@ -0,0 +1,87 @@
 /* eslint-disable no-console */
 const MIGRATION_NAME = '20200731_naming_day';
 import { v4 as uuid } from 'uuid';
 import { model as User } from '../../../website/server/models/user';
 const progressCount = 1000;
 let count = 0;
 async function updateUser (user) {
  count++;
  let set;
  let push;
  const inc = {
    'items.food.Cake_Base': 1,
    'items.food.Cake_CottonCandyBlue': 1,
    'items.food.Cake_CottonCandyPink': 1,
    'items.food.Cake_Desert': 1,
    'items.food.Cake_Golden': 1,
    'items.food.Cake_Red': 1,
    'items.food.Cake_Shade': 1,
    'items.food.Cake_Skeleton': 1,
    'items.food.Cake_White': 1,
    'items.food.Cake_Zombie': 1,
    'achievements.habiticaDays': 1,
  };
  if (user && user.items && user.items.gear && user.items.gear.owned && typeof user.items.gear.owned.back_special_namingDay2020 !== 'undefined') {
    set = { migration: MIGRATION_NAME };
  } else if (user && user.items && user.items.gear && user.items.gear.owned && typeof user.items.gear.owned.body_special_namingDay2018 !== 'undefined') {
    set = { migration: MIGRATION_NAME, 'items.gear.owned.back_special_namingDay2020': false };
    push = { pinnedItems: { type: 'marketGear', path: 'gear.flat.back_special_namingDay2020', _id: uuid() }};
  } else if (user && user.items && user.items.gear && user.items.gear.owned && typeof user.items.gear.owned.head_special_namingDay2017 !== 'undefined') {
    set = { migration: MIGRATION_NAME, 'items.gear.owned.body_special_namingDay2018': false };
    push = { pinnedItems: { type: 'marketGear', path: 'gear.flat.body_special_namingDay2018', _id: uuid() }};
  } else if (user && user.items && user.items.pets && typeof user.items.pets['Gryphon-RoyalPurple'] !== 'undefined') {
    set = { migration: MIGRATION_NAME, 'items.gear.owned.head_special_namingDay2017': false };
    push = { pinnedItems: { type: 'marketGear', path: 'gear.flat.head_special_namingDay2017', _id: uuid() }};
  } else if (user && user.items && user.items.mounts && typeof user.items.mounts['Gryphon-RoyalPurple'] !== 'undefined') {
    set = { migration: MIGRATION_NAME, 'items.pets.Gryphon-RoyalPurple': 5 };
  } else {
    set = { migration: MIGRATION_NAME, 'items.mounts.Gryphon-RoyalPurple': true };
  }
  if (count % progressCount === 0) console.warn(`${count} ${user._id}`);
  if (push) {
    return await User.update({ _id: user._id }, { $set: set, $inc: inc, $push: push }).exec();
  } else {
    return await User.update({ _id: user._id }, { $set: set, $inc: inc }).exec();
  }
 }
 export default async function processUsers () {
  let query = {
    migration: { $ne: MIGRATION_NAME },
    'auth.timestamps.loggedin': { $gt: new Date('2020-07-01') },
  };
  const fields = {
    _id: 1,
    items: 1,
  };
  while (true) { // eslint-disable-line no-constant-condition
    const users = await User // eslint-disable-line no-await-in-loop
      .find(query)
      .limit(250)
      .sort({_id: 1})
      .select(fields)
      .lean()
      .exec();
    if (users.length === 0) {
      console.warn('All appropriate users found and modified.');
      console.warn(`\n${count} users processed\n`);
      break;
    } else {
      query._id = {
        $gt: users[users.length - 1]._id,
      };
    }
    await Promise.all(users.map(updateUser)); // eslint-disable-line no-await-in-loop
  }
 };
--- a/migrations/archive/2020/20200818_pet_color_achievements.js
+++ b/migrations/archive/2020/20200818_pet_color_achievements.js
@@ -1,5 +1,5 @@
 /* eslint-disable no-console */
-const MIGRATION_NAME = '20200218_pet_color_achievements';
+const MIGRATION_NAME = '20200818_pet_color_achievements';
 import { model as User } from '../../../website/server/models/user';
 const progressCount = 1000;
@@ -14,31 +14,31 @@ async function updateUser (user) {
  if (user && user.items && user.items.pets) {
    const pets = user.items.pets;
-    if (pets['Wolf-CottonCandyPink'] > 0
+    if (pets['Wolf-Golden'] > 0
-      && pets['TigerCub-CottonCandyPink'] > 0
+      && pets['TigerCub-Golden'] > 0
-      && pets['PandaCub-CottonCandyPink'] > 0
+      && pets['PandaCub-Golden'] > 0
-      && pets['LionCub-CottonCandyPink'] > 0
+      && pets['LionCub-Golden'] > 0
-      && pets['Fox-CottonCandyPink'] > 0
+      && pets['Fox-Golden'] > 0
-      && pets['FlyingPig-CottonCandyPink'] > 0
+      && pets['FlyingPig-Golden'] > 0
-      && pets['Dragon-CottonCandyPink'] > 0
+      && pets['Dragon-Golden'] > 0
-      && pets['Cactus-CottonCandyPink'] > 0
+      && pets['Cactus-Golden'] > 0
-      && pets['BearCub-CottonCandyPink'] > 0) {
+      && pets['BearCub-Golden'] > 0) {
-        set['achievements.tickledPink'] = true;
+        set['achievements.goodAsGold'] = true;
      }
  }
  if (user && user.items && user.items.mounts) {
    const mounts = user.items.mounts;
-    if (mounts['Wolf-CottonCandyPink']
+    if (mounts['Wolf-Golden']
-      && mounts['TigerCub-CottonCandyPink']
+      && mounts['TigerCub-Golden']
-      && mounts['PandaCub-CottonCandyPink']
+      && mounts['PandaCub-Golden']
-      && mounts['LionCub-CottonCandyPink']
+      && mounts['LionCub-Golden']
-      && mounts['Fox-CottonCandyPink']
+      && mounts['Fox-Golden']
-      && mounts['FlyingPig-CottonCandyPink']
+      && mounts['FlyingPig-Golden']
-      && mounts['Dragon-CottonCandyPink']
+      && mounts['Dragon-Golden']
-      && mounts['Cactus-CottonCandyPink']
+      && mounts['Cactus-Golden']
-      && mounts['BearCub-CottonCandyPink'] ) {
+      && mounts['BearCub-Golden'] ) {
-        set['achievements.rosyOutlook'] = true;
+        set['achievements.allThatGlitters'] = true;
      }
  }
@@ -50,7 +50,7 @@ async function updateUser (user) {
 module.exports = async function processUsers () {
  let query = {
    migration: { $ne: MIGRATION_NAME },
-    'auth.timestamps.loggedin': { $gt: new Date('2020-02-01') },
+    'auth.timestamps.loggedin': { $gt: new Date('2020-08-01') },
  };
  const fields = {
--- a/migrations/command-line/duplicatedTasksFindAndRemove.js
+++ b/migrations/command-line/duplicatedTasksFindAndRemove.js
@@ -32,13 +32,11 @@
 *
 */
 // CONFIGURATION:
 // - Change the uuid below to be the user's uuid.
 // - Change ALL instances of "todos" to "habits"/"dailys"/"rewards" as
 //   needed. Do not miss any of them!
 const uuid = '30fb2640-7121-4968-ace5-f385e60ea6c5';
 db.users.aggregate([
--- a/migrations/groups/migrate-chat.js
+++ b/migrations/groups/migrate-chat.js
@@ -2,7 +2,6 @@
 // @authorName = 'TheHollidayInn'; // in case script author needs to know when their ...
 // @authorUuid = ''; // ... own data is done
 /*
 * This migration moves chat off of groups and into their own model
 */
@@ -38,7 +37,6 @@ async function moveGroupChatToModel (skip = 0) {
    return chatpromises;
  });
  const reducedPromises = promises.reduce((acc, curr) => {
    acc = acc.concat(curr); // eslint-disable-line no-param-reassign
    return acc;
--- a/migrations/restock_armoire_for_users_that_need_it.js
+++ b/migrations/restock_armoire_for_users_that_need_it.js
@@ -25,7 +25,6 @@ const monk = require('monk'); // eslint-disable-line import/no-extraneous-depend
 const dbUsers = monk(connectionString).get('users', { castIds: false });
 function processUsers (lastId) {
  // specify a query to limit the affected users (empty for all users):
  const query = {
@@ -86,7 +85,6 @@ function updateUser (user) {
  const set = { migration: migrationName, 'flags.armoireEmpty': false };
  if (user.flags.armoireEmpty) {
    // this user believes their armoire has no more items in it
    if (
--- a/migrations/restore-profile-data.js
+++ b/migrations/restore-profile-data.js
@@ -121,5 +121,4 @@ function exiting (code, msg) {
  process.exit(code);
 }
 processUsers();
--- a/migrations/users/remove-social-users-extra-data.js
+++ b/migrations/users/remove-social-users-extra-data.js
@@ -9,7 +9,6 @@ const authorUuid = 'ed4c688c-6652-4a92-9d03-a5a79844174a'; // ... own data is do
 */
 const connectionString = 'mongodb://localhost:27017/habitrpg?auto_reconnect=true'; // FOR TEST DATABASE
 const dbUsers = monk(connectionString).get('users', { castIds: false });
 function processUsers (lastId) {
--- a/migrations/users/tag-challenge-field-string2bool.js
+++ b/migrations/users/tag-challenge-field-string2bool.js
@@ -0,0 +1,73 @@
 import { model as User } from '../../website/server/models/user';
 const MIGRATION_NAME = 'tag-challenge-field-string2bool';
 const progressCount = 1000;
 let count = 0;
 export default async function processUsers () {
  const query = {
    migration: { $ne: MIGRATION_NAME },
    tags: {
      $elemMatch: {
        challenge: {
          $exists: true,
          $type: 'string',
        },
      },
    },
  };
  while (true) { // eslint-disable-line no-constant-condition
    // eslint-disable-next-line no-await-in-loop
    const users = await User.find(query)
      .sort({ _id: 1 })
      .limit(250)
      .select({ _id: 1, tags: 1 })
      .lean()
      .exec();
    if (users.length === 0) {
      console.warn('All appropriate users found and modified.');
      console.warn(`\n${count} users processed\n`);
      break;
    } else {
      query._id = {
        $gt: users[users.length - 1],
      };
    }
    await Promise.all(users.map(updateUser)); // eslint-disable-line no-await-in-loop
  }
 }
 async function updateUser (user) {
  count += 1;
  if (count % progressCount === 0) console.warn(`${count} ${user._id}`);
  let requiresUpdate = false;
  if (user && user.tags) {
    user.tags.forEach(tag => {
      if (tag && typeof tag.challenge === 'string') {
        requiresUpdate = true;
        if (tag.challenge === 'true') {
          tag.challenge = true;
        } else if (tag.challenge === 'false') {
          tag.challenge = false;
        } else {
          tag.challenge = null;
        }
      }
    });
  }
  if (requiresUpdate) {
    const set = {
      migration: MIGRATION_NAME,
      tags: user.tags,
    };
    return User.update({ _id: user._id }, { $set: set }).exec();
  }
  return null;
 }
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@@ -1,18 +1,18 @@
 {
  "name": "habitica",
  "description": "A habit tracker app which treats your goals like a Role Playing Game.",
-  "version": "4.146.7",
+  "version": "4.156.3",
  "main": "./website/server/index.js",
  "dependencies": {
-    "@babel/core": "^7.10.3",
+    "@babel/core": "^7.11.6",
-    "@babel/preset-env": "^7.10.3",
+    "@babel/preset-env": "^7.11.5",
-    "@babel/register": "^7.10.3",
+    "@babel/register": "^7.11.5",
    "@google-cloud/trace-agent": "^5.1.0",
    "@slack/client": "^4.12.0",
    "accepts": "^1.3.5",
    "amazon-payments": "^0.2.8",
    "amplitude": "^3.5.0",
-    "apidoc": "^0.17.5",
+    "apidoc": "^0.25.0",
    "apn": "^2.2.0",
    "apple-auth": "^1.0.6",
    "bcrypt": "^5.0.0",
@@ -20,7 +20,7 @@
    "compression": "^1.7.4",
    "cookie-session": "^1.4.0",
    "coupon-code": "^0.4.5",
-    "csv-stringify": "^5.5.0",
+    "csv-stringify": "^5.5.1",
    "cwait": "^1.1.1",
    "domain-middleware": "~0.1.0",
    "eslint": "^6.8.0",
@@ -30,49 +30,51 @@
    "express-basic-auth": "^1.1.5",
    "express-validator": "^5.2.0",
    "glob": "^7.1.6",
-    "got": "^11.3.0",
+    "got": "^11.6.0",
    "gulp": "^4.0.0",
    "gulp-babel": "^8.0.0",
    "gulp-imagemin": "^7.1.0",
    "gulp-nodemon": "^2.5.0",
    "gulp.spritesmith": "^6.9.0",
-    "habitica-markdown": "^2.0.2",
+    "habitica-markdown": "^3.0.0",
-    "helmet": "^3.23.1",
+    "helmet": "^3.23.3",
-    "image-size": "^0.8.3",
+    "image-size": "^0.9.1",
    "in-app-purchase": "^1.11.3",
    "js2xmlparser": "^4.0.1",
    "jsonwebtoken": "^8.5.1",
-    "jwks-rsa": "^1.8.1",
+    "jwks-rsa": "^1.9.0",
-    "lodash": "^4.17.15",
+    "lodash": "^4.17.20",
    "merge-stream": "^2.0.0",
    "method-override": "^3.0.0",
    "moment": "^2.27.0",
    "moment-recur": "^1.0.7",
-    "mongoose": "^5.9.19",
+    "mongoose": "^5.10.3",
    "morgan": "^1.10.0",
    "nconf": "^0.10.0",
-    "node-gcm": "^1.0.2",
+    "node-gcm": "^1.0.3",
    "on-headers": "^1.0.2",
    "passport": "^0.4.1",
    "passport-facebook": "^3.0.0",
    "passport-google-oauth2": "^0.2.0",
    "passport-google-oauth20": "1.0.0",
    "paypal-ipn": "3.0.0",
    "paypal-rest-sdk": "^1.8.1",
    "pp-ipn": "^1.1.0",
    "ps-tree": "^1.0.0",
-    "regenerator-runtime": "^0.13.5",
+    "rate-limiter-flexible": "^2.1.10",
    "redis": "^3.0.2",
    "regenerator-runtime": "^0.13.7",
    "remove-markdown": "^0.3.0",
    "rimraf": "^3.0.2",
    "short-uuid": "^3.0.0",
    "stripe": "^7.15.0",
-    "superagent": "^5.2.2",
+    "superagent": "^6.1.0",
-    "universal-analytics": "^0.4.17",
+    "universal-analytics": "^0.4.23",
    "useragent": "^2.1.9",
-    "uuid": "^8.1.0",
+    "uuid": "^8.3.0",
    "validator": "^13.1.1",
    "vinyl-buffer": "^1.0.1",
-    "winston": "^3.3.0",
+    "winston": "^3.3.3",
-    "winston-loggly-bulk": "^3.1.0",
+    "winston-loggly-bulk": "^3.1.1",
    "xml2js": "^0.4.23"
  },
  "private": true,
@@ -102,6 +104,7 @@
    "client:unit": "cd website/client && npm run test:unit",
    "start": "gulp nodemon",
    "debug": "gulp nodemon --inspect",
    "mongo:dev": "run-rs -v 4.2.8 -l ubuntu1804 --keep --dbpath mongodb-data --number 1 --quiet",
    "postinstall": "gulp build && cd website/client && npm install",
    "apidoc": "gulp apidoc"
  },
@@ -109,13 +112,16 @@
    "axios": "^0.19.2",
    "chai": "^4.1.2",
    "chai-as-promised": "^7.1.1",
    "chai-moment": "^0.1.0",
    "chalk": "^4.1.0",
    "cross-spawn": "^7.0.3",
    "expect.js": "^0.3.1",
    "istanbul": "^1.1.0-alpha.1",
    "mocha": "^5.1.1",
-    "monk": "^7.3.0",
+    "monk": "^7.3.2",
    "require-again": "^2.0.0",
-    "sinon": "^9.0.2",
+    "run-rs": "^0.6.2",
    "sinon": "^9.0.3",
    "sinon-chai": "^3.5.0",
    "sinon-stub-promise": "^4.0.0"
  },
--- a/scripts/gdpr-delete-users.js
+++ b/scripts/gdpr-delete-users.js
@@ -31,20 +31,22 @@ async function deleteAmplitudeData (userId, email) {
      console.log(`${userId} (${email}) Amplitude response: ${response.status} ${response.statusText}`);
    }
  }
  await new Promise(resolve => setTimeout(resolve, 1000));
 }
 async function deleteHabiticaData (user, email) {
  const truncatedEmail = email.slice(0, email.indexOf('@'));
  const set = {
    'auth.blocked': false,
    'auth.local.hashed_password': '$2a$10$QDnNh1j1yMPnTXDEOV38xOePEWFd4X8DSYwAM8XTmqmacG5X0DKjW',
    'auth.local.passwordHashMethod': 'bcrypt',
  };
  if (!user.auth.local.email) set['auth.local.email'] = `${truncatedEmail}-gdpr@example.com`;
  await User.update(
    { _id: user._id },
-    {
+    { $set: set },
      $set: {
        'auth.local.email': user.auth.local.email ? email : `${truncatedEmail}@example.com`,
        'auth.local.hashed_password': '$2a$10$QDnNh1j1yMPnTXDEOV38xOePEWFd4X8DSYwAM8XTmqmacG5X0DKjW',
        'auth.local.passwordHashMethod': 'bcrypt',
      },
    },
  );
  await new Promise(resolve => setTimeout(resolve, 1000));
  const response = await axios.delete(
    `${BASE_URL}/api/v3/user`,
    {
@@ -78,6 +80,7 @@ async function processEmailAddress (email) {
  const socialUsers = await User.find(
    {
      'auth.local.email': { $not: emailRegex },
      $or: [
        { 'auth.facebook.emails.value': email },
        { 'auth.google.emails.value': email },
--- a/test/api/unit/libs/baseModel.test.js
+++ b/test/api/unit/libs/baseModel.test.js
@@ -56,7 +56,6 @@ describe('Base model plugin', () => {
    expect(sanitized).not.to.have.property('usuallySettable');
  });
  it('can make fields private', () => {
    schema.plugin(baseModel, {
      private: ['amPrivate'],
--- a/test/api/unit/libs/cron.test.js
+++ b/test/api/unit/libs/cron.test.js
@@ -42,13 +42,13 @@ describe('cron', () => {
  });
  it('updates user.preferences.timezoneOffsetAtLastCron', () => {
-    const timezoneOffsetFromUserPrefs = 1;
+    const timezoneUtcOffsetFromUserPrefs = -1;
    cron({
-      user, tasksByType, daysMissed, analytics, timezoneOffsetFromUserPrefs,
+      user, tasksByType, daysMissed, analytics, timezoneUtcOffsetFromUserPrefs,
    });
-    expect(user.preferences.timezoneOffsetAtLastCron).to.equal(timezoneOffsetFromUserPrefs);
+    expect(user.preferences.timezoneOffsetAtLastCron).to.equal(1);
  });
  it('resets user.items.lastDrop.count', () => {
@@ -240,7 +240,7 @@ describe('cron', () => {
      user1.purchased.plan.consecutive.gemCapExtra = 0;
      it('does not increment consecutive benefits after the first month', () => {
-        clock = sinon.useFakeTimers(moment().zone(0).startOf('month').add(1, 'months')
+        clock = sinon.useFakeTimers(moment().utcOffset(0).startOf('month').add(1, 'months')
          .add(2, 'days')
          .toDate());
        // Add 1 month to simulate what happens a month after the subscription was created.
@@ -256,7 +256,7 @@ describe('cron', () => {
      });
      it('does not increment consecutive benefits after the second month', () => {
-        clock = sinon.useFakeTimers(moment().zone(0).startOf('month').add(2, 'months')
+        clock = sinon.useFakeTimers(moment().utcOffset(0).startOf('month').add(2, 'months')
          .add(2, 'days')
          .toDate());
        // Add 1 month to simulate what happens a month after the subscription was created.
@@ -272,7 +272,7 @@ describe('cron', () => {
      });
      it('increments consecutive benefits after the third month', () => {
-        clock = sinon.useFakeTimers(moment().zone(0).startOf('month').add(3, 'months')
+        clock = sinon.useFakeTimers(moment().utcOffset(0).startOf('month').add(3, 'months')
          .add(2, 'days')
          .toDate());
        // Add 1 month to simulate what happens a month after the subscription was created.
@@ -288,7 +288,7 @@ describe('cron', () => {
      });
      it('does not increment consecutive benefits after the fourth month', () => {
-        clock = sinon.useFakeTimers(moment().zone(0).startOf('month').add(4, 'months')
+        clock = sinon.useFakeTimers(moment().utcOffset(0).startOf('month').add(4, 'months')
          .add(2, 'days')
          .toDate());
        // Add 1 month to simulate what happens a month after the subscription was created.
@@ -304,7 +304,7 @@ describe('cron', () => {
      });
      it('increments consecutive benefits correctly if user has been absent with continuous subscription', () => {
-        clock = sinon.useFakeTimers(moment().zone(0).startOf('month').add(10, 'months')
+        clock = sinon.useFakeTimers(moment().utcOffset(0).startOf('month').add(10, 'months')
          .add(2, 'days')
          .toDate());
        cron({
@@ -339,7 +339,7 @@ describe('cron', () => {
      user3.purchased.plan.consecutive.gemCapExtra = 5;
      it('does not increment consecutive benefits in the first month of the first paid period that they already have benefits for', () => {
-        clock = sinon.useFakeTimers(moment().zone(0).startOf('month').add(1, 'months')
+        clock = sinon.useFakeTimers(moment().utcOffset(0).startOf('month').add(1, 'months')
          .add(2, 'days')
          .toDate());
        cron({
@@ -352,7 +352,7 @@ describe('cron', () => {
      });
      it('does not increment consecutive benefits in the middle of the period that they already have benefits for', () => {
-        clock = sinon.useFakeTimers(moment().zone(0).startOf('month').add(2, 'months')
+        clock = sinon.useFakeTimers(moment().utcOffset(0).startOf('month').add(2, 'months')
          .add(2, 'days')
          .toDate());
        cron({
@@ -365,7 +365,7 @@ describe('cron', () => {
      });
      it('does not increment consecutive benefits in the final month of the period that they already have benefits for', () => {
-        clock = sinon.useFakeTimers(moment().zone(0).startOf('month').add(3, 'months')
+        clock = sinon.useFakeTimers(moment().utcOffset(0).startOf('month').add(3, 'months')
          .add(2, 'days')
          .toDate());
        cron({
@@ -378,7 +378,7 @@ describe('cron', () => {
      });
      it('increments consecutive benefits the month after the second paid period has started', () => {
-        clock = sinon.useFakeTimers(moment().zone(0).startOf('month').add(4, 'months')
+        clock = sinon.useFakeTimers(moment().utcOffset(0).startOf('month').add(4, 'months')
          .add(2, 'days')
          .toDate());
        cron({
@@ -391,7 +391,7 @@ describe('cron', () => {
      });
      it('does not increment consecutive benefits in the second month of the second period that they already have benefits for', () => {
-        clock = sinon.useFakeTimers(moment().zone(0).startOf('month').add(5, 'months')
+        clock = sinon.useFakeTimers(moment().utcOffset(0).startOf('month').add(5, 'months')
          .add(2, 'days')
          .toDate());
        cron({
@@ -404,7 +404,7 @@ describe('cron', () => {
      });
      it('does not increment consecutive benefits in the final month of the second period that they already have benefits for', () => {
-        clock = sinon.useFakeTimers(moment().zone(0).startOf('month').add(6, 'months')
+        clock = sinon.useFakeTimers(moment().utcOffset(0).startOf('month').add(6, 'months')
          .add(2, 'days')
          .toDate());
        cron({
@@ -417,7 +417,7 @@ describe('cron', () => {
      });
      it('increments consecutive benefits the month after the third paid period has started', () => {
-        clock = sinon.useFakeTimers(moment().zone(0).startOf('month').add(7, 'months')
+        clock = sinon.useFakeTimers(moment().utcOffset(0).startOf('month').add(7, 'months')
          .add(2, 'days')
          .toDate());
        cron({
@@ -430,7 +430,7 @@ describe('cron', () => {
      });
      it('increments consecutive benefits correctly if user has been absent with continuous subscription', () => {
-        clock = sinon.useFakeTimers(moment().zone(0).startOf('month').add(10, 'months')
+        clock = sinon.useFakeTimers(moment().utcOffset(0).startOf('month').add(10, 'months')
          .add(2, 'days')
          .toDate());
        cron({
@@ -465,7 +465,7 @@ describe('cron', () => {
      user6.purchased.plan.consecutive.gemCapExtra = 10;
      it('does not increment consecutive benefits in the first month of the first paid period that they already have benefits for', () => {
-        clock = sinon.useFakeTimers(moment().zone(0).startOf('month').add(1, 'months')
+        clock = sinon.useFakeTimers(moment().utcOffset(0).startOf('month').add(1, 'months')
          .add(2, 'days')
          .toDate());
        cron({
@@ -478,7 +478,7 @@ describe('cron', () => {
      });
      it('does not increment consecutive benefits in the final month of the period that they already have benefits for', () => {
-        clock = sinon.useFakeTimers(moment().zone(0).startOf('month').add(6, 'months')
+        clock = sinon.useFakeTimers(moment().utcOffset(0).startOf('month').add(6, 'months')
          .add(2, 'days')
          .toDate());
        cron({
@@ -491,7 +491,7 @@ describe('cron', () => {
      });
      it('increments consecutive benefits the month after the second paid period has started', () => {
-        clock = sinon.useFakeTimers(moment().zone(0).startOf('month').add(7, 'months')
+        clock = sinon.useFakeTimers(moment().utcOffset(0).startOf('month').add(7, 'months')
          .add(2, 'days')
          .toDate());
        cron({
@@ -504,7 +504,7 @@ describe('cron', () => {
      });
      it('increments consecutive benefits the month after the third paid period has started', () => {
-        clock = sinon.useFakeTimers(moment().zone(0).startOf('month').add(13, 'months')
+        clock = sinon.useFakeTimers(moment().utcOffset(0).startOf('month').add(13, 'months')
          .add(2, 'days')
          .toDate());
        cron({
@@ -517,7 +517,7 @@ describe('cron', () => {
      });
      it('increments consecutive benefits correctly if user has been absent with continuous subscription', () => {
-        clock = sinon.useFakeTimers(moment().zone(0).startOf('month').add(19, 'months')
+        clock = sinon.useFakeTimers(moment().utcOffset(0).startOf('month').add(19, 'months')
          .add(2, 'days')
          .toDate());
        cron({
@@ -552,7 +552,7 @@ describe('cron', () => {
      user12.purchased.plan.consecutive.gemCapExtra = 20;
      it('does not increment consecutive benefits in the first month of the first paid period that they already have benefits for', () => {
-        clock = sinon.useFakeTimers(moment().zone(0).startOf('month').add(1, 'months')
+        clock = sinon.useFakeTimers(moment().utcOffset(0).startOf('month').add(1, 'months')
          .add(2, 'days')
          .toDate());
        cron({
@@ -565,7 +565,7 @@ describe('cron', () => {
      });
      it('does not increment consecutive benefits in the final month of the period that they already have benefits for', () => {
-        clock = sinon.useFakeTimers(moment().zone(0).startOf('month').add(12, 'months')
+        clock = sinon.useFakeTimers(moment().utcOffset(0).startOf('month').add(12, 'months')
          .add(2, 'days')
          .toDate());
        cron({
@@ -578,7 +578,7 @@ describe('cron', () => {
      });
      it('increments consecutive benefits the month after the second paid period has started', () => {
-        clock = sinon.useFakeTimers(moment().zone(0).startOf('month').add(13, 'months')
+        clock = sinon.useFakeTimers(moment().utcOffset(0).startOf('month').add(13, 'months')
          .add(2, 'days')
          .toDate());
        cron({
@@ -591,7 +591,7 @@ describe('cron', () => {
      });
      it('increments consecutive benefits the month after the third paid period has started', () => {
-        clock = sinon.useFakeTimers(moment().zone(0).startOf('month').add(25, 'months')
+        clock = sinon.useFakeTimers(moment().utcOffset(0).startOf('month').add(25, 'months')
          .add(2, 'days')
          .toDate());
        cron({
@@ -604,7 +604,7 @@ describe('cron', () => {
      });
      it('increments consecutive benefits correctly if user has been absent with continuous subscription', () => {
-        clock = sinon.useFakeTimers(moment().zone(0).startOf('month').add(37, 'months')
+        clock = sinon.useFakeTimers(moment().utcOffset(0).startOf('month').add(37, 'months')
          .add(2, 'days')
          .toDate());
        cron({
@@ -641,7 +641,7 @@ describe('cron', () => {
      user3g.purchased.plan.consecutive.gemCapExtra = 5;
      it('does not increment consecutive benefits in the first month of the gift subscription', () => {
-        clock = sinon.useFakeTimers(moment().zone(0).startOf('month').add(1, 'months')
+        clock = sinon.useFakeTimers(moment().utcOffset(0).startOf('month').add(1, 'months')
          .add(2, 'days')
          .toDate());
        cron({
@@ -654,7 +654,7 @@ describe('cron', () => {
      });
      it('does not increment consecutive benefits in the second month of the gift subscription', () => {
-        clock = sinon.useFakeTimers(moment().zone(0).startOf('month').add(2, 'months')
+        clock = sinon.useFakeTimers(moment().utcOffset(0).startOf('month').add(2, 'months')
          .add(2, 'days')
          .toDate());
        cron({
@@ -667,7 +667,7 @@ describe('cron', () => {
      });
      it('does not increment consecutive benefits in the third month of the gift subscription', () => {
-        clock = sinon.useFakeTimers(moment().zone(0).startOf('month').add(3, 'months')
+        clock = sinon.useFakeTimers(moment().utcOffset(0).startOf('month').add(3, 'months')
          .add(2, 'days')
          .toDate());
        cron({
@@ -680,7 +680,7 @@ describe('cron', () => {
      });
      it('does not increment consecutive benefits in the month after the gift subscription has ended', () => {
-        clock = sinon.useFakeTimers(moment().zone(0).startOf('month').add(4, 'months')
+        clock = sinon.useFakeTimers(moment().utcOffset(0).startOf('month').add(4, 'months')
          .add(2, 'days')
          .toDate());
        cron({
@@ -717,7 +717,7 @@ describe('cron', () => {
      user6x.purchased.plan.consecutive.gemCapExtra = 15;
      it('increments consecutive benefits in the first month since the fix for #4819 goes live', () => {
-        clock = sinon.useFakeTimers(moment().zone(0).startOf('month').add(1, 'months')
+        clock = sinon.useFakeTimers(moment().utcOffset(0).startOf('month').add(1, 'months')
          .add(2, 'days')
          .toDate());
        cron({
@@ -730,7 +730,7 @@ describe('cron', () => {
      });
      it('does not increment consecutive benefits in the second month after the fix goes live', () => {
-        clock = sinon.useFakeTimers(moment().zone(0).startOf('month').add(2, 'months')
+        clock = sinon.useFakeTimers(moment().utcOffset(0).startOf('month').add(2, 'months')
          .add(2, 'days')
          .toDate());
        cron({
@@ -743,7 +743,7 @@ describe('cron', () => {
      });
      it('does not increment consecutive benefits in the third month after the fix goes live', () => {
-        clock = sinon.useFakeTimers(moment().zone(0).startOf('month').add(3, 'months')
+        clock = sinon.useFakeTimers(moment().utcOffset(0).startOf('month').add(3, 'months')
          .add(2, 'days')
          .toDate());
        cron({
@@ -756,7 +756,7 @@ describe('cron', () => {
      });
      it('increments consecutive benefits in the seventh month after the fix goes live', () => {
-        clock = sinon.useFakeTimers(moment().zone(0).startOf('month').add(7, 'months')
+        clock = sinon.useFakeTimers(moment().utcOffset(0).startOf('month').add(7, 'months')
          .add(2, 'days')
          .toDate());
        cron({
--- a/test/api/unit/libs/mongodb.js
+++ b/test/api/unit/libs/mongodb.js
@@ -0,0 +1,50 @@
 import os from 'os';
 import nconf from 'nconf';
 import requireAgain from 'require-again';
 const pathToMongoLib = '../../../../website/server/libs/mongodb';
 describe('mongodb', () => {
  afterEach(() => {
    sandbox.restore();
  });
  describe('getDevelopmentConnectionUrl', () => {
    it('returns the original connection url if not on windows', () => {
      sandbox.stub(os, 'platform').returns('linux');
      const mongoLibOverride = requireAgain(pathToMongoLib);
      const originalString = 'mongodb://localhost:3030';
      const string = mongoLibOverride.getDevelopmentConnectionUrl(originalString);
      expect(string).to.equal(originalString);
    });
    it('replaces localhost with hostname on windows', () => {
      sandbox.stub(os, 'platform').returns('win32');
      sandbox.stub(os, 'hostname').returns('hostname');
      const mongoLibOverride = requireAgain(pathToMongoLib);
      const originalString = 'mongodb://localhost:3030';
      const string = mongoLibOverride.getDevelopmentConnectionUrl(originalString);
      expect(string).to.equal('mongodb://hostname:3030');
    });
  });
  describe('getDefaultConnectionOptions', () => {
    it('returns development config when IS_PROD is false', () => {
      sandbox.stub(nconf, 'get').withArgs('IS_PROD').returns(false);
      const mongoLibOverride = requireAgain(pathToMongoLib);
      const options = mongoLibOverride.getDefaultConnectionOptions();
      expect(options).to.have.all.keys(['useNewUrlParser', 'useUnifiedTopology']);
    });
    it('returns production config when IS_PROD is true', () => {
      sandbox.stub(nconf, 'get').withArgs('IS_PROD').returns(true);
      const mongoLibOverride = requireAgain(pathToMongoLib);
      const options = mongoLibOverride.getDefaultConnectionOptions();
      expect(options).to.have.all.keys(['useNewUrlParser', 'useUnifiedTopology', 'keepAlive', 'keepAliveInitialDelay']);
    });
  });
 });
--- a/test/api/unit/libs/payments/amazon/upgrade-groupplan.test.js
+++ b/test/api/unit/libs/payments/amazon/upgrade-groupplan.test.js
@@ -7,7 +7,6 @@ import amzLib from '../../../../../../website/server/libs/payments/amazon';
 import payments from '../../../../../../website/server/libs/payments/payments';
 import common from '../../../../../../website/common';
 describe('#upgradeGroupPlan', () => {
  let spy; let data; let user; let group; let
    uuidString;
@@ -32,11 +31,14 @@ describe('#upgradeGroupPlan', () => {
    group = generateGroup({
      name: 'test group',
      type: 'guild',
-      privacy: 'public',
+      privacy: 'private',
      leader: user._id,
    });
    await group.save();
    user.guilds.push(group._id);
    await user.save();
    spy = sinon.stub(amzLib, 'authorizeOnBillingAgreement');
    spy.resolves([]);
--- a/test/api/unit/libs/payments/group-plans/group-payments-cancel.test.js
+++ b/test/api/unit/libs/payments/group-plans/group-payments-cancel.test.js
@@ -21,11 +21,14 @@ describe('Canceling a subscription for group', () => {
    group = generateGroup({
      name: 'test group',
      type: 'guild',
-      privacy: 'public',
+      privacy: 'private',
      leader: user._id,
    });
    await group.save();
    user.guilds.push(group._id);
    await user.save();
    data = {
      user,
      sub: {
@@ -141,6 +144,8 @@ describe('Canceling a subscription for group', () => {
  it('prevents non group leader from managing subscription', async () => {
    const groupMember = new User();
    groupMember.guilds.push(group._id);
    await groupMember.save();
    data.user = groupMember;
    data.groupId = group._id;
@@ -162,7 +167,9 @@ describe('Canceling a subscription for group', () => {
    let updatedGroup = await Group.findById(group._id).exec();
    const newLeader = new User();
    newLeader.profile.name = 'newLeader';
    updatedGroup.leader = newLeader._id;
    await newLeader.save();
    await updatedGroup.save();
    await api.cancelSubscription(data);
@@ -185,8 +192,6 @@ describe('Canceling a subscription for group', () => {
        'user-agent': '',
      },
    };
    user.guilds.push(group._id);
    await user.save();
    expect(group.purchased.plan.planId).to.not.exist;
    data.groupId = group._id;
    await api.createSubscription(data);
@@ -211,10 +216,15 @@ describe('Canceling a subscription for group', () => {
    await api.createSubscription(data);
    await api.cancelSubscription(data);
-    expect(sender.sendTxn).to.be.have.callCount(4);
+    expect(sender.sendTxn).to.be.have.callCount(6);
-    expect(sender.sendTxn.thirdCall.args[0]._id).to.equal(recipient._id);
+    const recipientCall = sender.sendTxn.getCalls().find(call => {
-    expect(sender.sendTxn.thirdCall.args[1]).to.equal('group-member-cancel');
+      const isRecipient = call.args[0]._id === recipient._id;
-    expect(sender.sendTxn.thirdCall.args[2]).to.eql([
+      const isGroupMemberCancel = call.args[1] === 'group-member-cancel';
      return isRecipient && isGroupMemberCancel;
    });
    expect(recipientCall.args[0]._id).to.equal(recipient._id);
    expect(recipientCall.args[1]).to.equal('group-member-cancel');
    expect(recipientCall.args[2]).to.eql([
      { name: 'LEADER', content: user.profile.name },
      { name: 'GROUP_NAME', content: group.name },
    ]);
@@ -246,8 +256,6 @@ describe('Canceling a subscription for group', () => {
    recipient.guilds.push(group._id);
    await recipient.save();
    user.guilds.push(group._id);
    await user.save();
    data.groupId = group._id;
    await api.createSubscription(data);
@@ -259,11 +267,13 @@ describe('Canceling a subscription for group', () => {
    const group2 = generateGroup({
      name: 'test group2',
      type: 'guild',
-      privacy: 'public',
+      privacy: 'private',
      leader: user._id,
    });
    data.groupId = group2._id;
    await group2.save();
    user.guilds.push(group2._id);
    await user.save();
    recipient.guilds.push(group2._id);
    await recipient.save();
@@ -285,8 +295,6 @@ describe('Canceling a subscription for group', () => {
  });
  it('does cancel a leader subscription with two cancelled group plans', async () => {
    user.guilds.push(group._id);
    await user.save();
    data.groupId = group._id;
    await api.createSubscription(data);
@@ -298,7 +306,7 @@ describe('Canceling a subscription for group', () => {
    const group2 = generateGroup({
      name: 'test group2',
      type: 'guild',
-      privacy: 'public',
+      privacy: 'private',
      leader: user._id,
    });
    user.guilds.push(group2._id);
--- a/test/api/unit/libs/payments/group-plans/group-payments-create.test.js
+++ b/test/api/unit/libs/payments/group-plans/group-payments-create.test.js
@@ -12,6 +12,7 @@ import { model as Group } from '../../../../../../website/server/models/group';
 import {
  generateGroup,
 } from '../../../../../helpers/api-unit.helper';
 import i18n from '../../../../../../website/common/script/i18n';
 describe('Purchasing a group plan for group', () => {
  const EMAIL_TEMPLATE_SUBSCRIPTION_TYPE_GOOGLE = 'Google_subscription';
@@ -33,11 +34,14 @@ describe('Purchasing a group plan for group', () => {
    group = generateGroup({
      name: groupName,
      type: 'guild',
-      privacy: 'public',
+      privacy: 'private',
      leader: user._id,
    });
    await group.save();
    user.guilds.push(group._id);
    await user.save();
    data = {
      user,
      sub: {
@@ -112,6 +116,30 @@ describe('Purchasing a group plan for group', () => {
    expect(updatedGroup.purchased.plan.dateCreated).to.exist;
  });
  it('does not create a group plan for a public guild', async () => {
    const publicGroup = generateGroup({
      name: groupName,
      type: 'guild',
      privacy: 'public',
      leader: user._id,
    });
    await publicGroup.save();
    expect(publicGroup.purchased.plan.planId).to.not.exist;
    data.groupId = publicGroup._id;
    await expect(api.createSubscription(data))
      .to.eventually.be.rejected.and.to.eql({
        httpCode: 401,
        name: 'NotAuthorized',
        message: i18n.t('onlyPrivateGuildsCanUpgrade'),
      });
    const updatedGroup = await Group.findById(publicGroup._id).exec();
    expect(updatedGroup.purchased.plan.planId).to.not.exist;
  });
  it('sends an email', async () => {
    expect(group.purchased.plan.planId).to.not.exist;
    data.groupId = group._id;
@@ -148,8 +176,6 @@ describe('Purchasing a group plan for group', () => {
  });
  it('grants all members of a group a subscription', async () => {
    user.guilds.push(group._id);
    await user.save();
    expect(group.purchased.plan.planId).to.not.exist;
    data.groupId = group._id;
@@ -179,17 +205,28 @@ describe('Purchasing a group plan for group', () => {
    await api.createSubscription(data);
-    expect(sender.sendTxn).to.be.calledTwice;
+    expect(sender.sendTxn).to.be.calledThrice;
-    expect(sender.sendTxn.firstCall.args[0]._id).to.equal(recipient._id);
+    const recipientCall = sender.sendTxn.getCalls().find(call => {
-    expect(sender.sendTxn.firstCall.args[1]).to.equal('group-member-join');
+      const isRecipient = call.args[0]._id === recipient._id;
-    expect(sender.sendTxn.firstCall.args[2]).to.eql([
+      const isJoin = call.args[1] === 'group-member-join';
      return isRecipient && isJoin;
    });
    expect(recipientCall.args[0]._id).to.equal(recipient._id);
    expect(recipientCall.args[1]).to.equal('group-member-join');
    expect(recipientCall.args[2]).to.eql([
      { name: 'LEADER', content: user.profile.name },
      { name: 'GROUP_NAME', content: group.name },
      { name: 'PREVIOUS_SUBSCRIPTION_TYPE', content: EMAIL_TEMPLATE_SUBSCRIPTION_TYPE_NONE },
    ]);
    // confirm that the other email sent is appropriate:
-    expect(sender.sendTxn.secondCall.args[0]._id).to.equal(group.leader);
+    const leaderCall = sender.sendTxn.getCalls().find(call => {
-    expect(sender.sendTxn.secondCall.args[1]).to.equal('group-subscription-begins');
+      const isLeader = call.args[0]._id === group.leader;
      const isSubscriptionBegin = call.args[1] === 'group-subscription-begins';
      return isLeader && isSubscriptionBegin;
    });
    expect(leaderCall.args[0]._id).to.equal(group.leader);
    expect(leaderCall.args[1]).to.equal('group-subscription-begins');
  });
  it('sends one email to subscribed member of group, stating subscription is cancelled (Stripe)', async () => {
@@ -205,17 +242,28 @@ describe('Purchasing a group plan for group', () => {
    await api.createSubscription(data);
-    expect(sender.sendTxn).to.be.calledTwice;
+    expect(sender.sendTxn).to.be.calledThrice;
-    expect(sender.sendTxn.firstCall.args[0]._id).to.equal(recipient._id);
+    const recipientCall = sender.sendTxn.getCalls().find(call => {
-    expect(sender.sendTxn.firstCall.args[1]).to.equal('group-member-join');
+      const isRecipient = call.args[0]._id === recipient._id;
-    expect(sender.sendTxn.firstCall.args[2]).to.eql([
+      const isJoin = call.args[1] === 'group-member-join';
      return isRecipient && isJoin;
    });
    expect(recipientCall.args[0]._id).to.equal(recipient._id);
    expect(recipientCall.args[1]).to.equal('group-member-join');
    expect(recipientCall.args[2]).to.eql([
      { name: 'LEADER', content: user.profile.name },
      { name: 'GROUP_NAME', content: group.name },
      { name: 'PREVIOUS_SUBSCRIPTION_TYPE', content: EMAIL_TEMPLATE_SUBSCRIPTION_TYPE_NORMAL },
    ]);
    // confirm that the other email sent is not a cancel-subscription email:
-    expect(sender.sendTxn.secondCall.args[0]._id).to.equal(group.leader);
+    const leaderCall = sender.sendTxn.getCalls().find(call => {
-    expect(sender.sendTxn.secondCall.args[1]).to.equal('group-subscription-begins');
+      const isLeader = call.args[0]._id === group.leader;
      const isSubscriptionBegin = call.args[1] === 'group-subscription-begins';
      return isLeader && isSubscriptionBegin;
    });
    expect(leaderCall.args[0]._id).to.equal(group.leader);
    expect(leaderCall.args[1]).to.equal('group-subscription-begins');
  });
  it('sends one email to subscribed member of group, stating subscription is cancelled (Amazon)', async () => {
@@ -238,17 +286,28 @@ describe('Purchasing a group plan for group', () => {
    await api.createSubscription(data);
-    expect(sender.sendTxn).to.be.calledTwice;
+    expect(sender.sendTxn).to.be.calledThrice;
-    expect(sender.sendTxn.firstCall.args[0]._id).to.equal(recipient._id);
+    const recipientCall = sender.sendTxn.getCalls().find(call => {
-    expect(sender.sendTxn.firstCall.args[1]).to.equal('group-member-join');
+      const isRecipient = call.args[0]._id === recipient._id;
-    expect(sender.sendTxn.firstCall.args[2]).to.eql([
+      const isJoin = call.args[1] === 'group-member-join';
      return isRecipient && isJoin;
    });
    expect(recipientCall.args[0]._id).to.equal(recipient._id);
    expect(recipientCall.args[1]).to.equal('group-member-join');
    expect(recipientCall.args[2]).to.eql([
      { name: 'LEADER', content: user.profile.name },
      { name: 'GROUP_NAME', content: group.name },
      { name: 'PREVIOUS_SUBSCRIPTION_TYPE', content: EMAIL_TEMPLATE_SUBSCRIPTION_TYPE_NORMAL },
    ]);
    // confirm that the other email sent is not a cancel-subscription email:
-    expect(sender.sendTxn.secondCall.args[0]._id).to.equal(group.leader);
+    const leaderCall = sender.sendTxn.getCalls().find(call => {
-    expect(sender.sendTxn.secondCall.args[1]).to.equal('group-subscription-begins');
+      const isLeader = call.args[0]._id === group.leader;
      const isSubscriptionBegin = call.args[1] === 'group-subscription-begins';
      return isLeader && isSubscriptionBegin;
    });
    expect(leaderCall.args[0]._id).to.equal(group.leader);
    expect(leaderCall.args[1]).to.equal('group-subscription-begins');
    amzLib.getBillingAgreementDetails.restore();
  });
@@ -275,17 +334,28 @@ describe('Purchasing a group plan for group', () => {
    await api.createSubscription(data);
-    expect(sender.sendTxn).to.be.calledTwice;
+    expect(sender.sendTxn).to.be.calledThrice;
-    expect(sender.sendTxn.firstCall.args[0]._id).to.equal(recipient._id);
+    const recipientCall = sender.sendTxn.getCalls().find(call => {
-    expect(sender.sendTxn.firstCall.args[1]).to.equal('group-member-join');
+      const isRecipient = call.args[0]._id === recipient._id;
-    expect(sender.sendTxn.firstCall.args[2]).to.eql([
+      const isJoin = call.args[1] === 'group-member-join';
      return isRecipient && isJoin;
    });
    expect(recipientCall.args[0]._id).to.equal(recipient._id);
    expect(recipientCall.args[1]).to.equal('group-member-join');
    expect(recipientCall.args[2]).to.eql([
      { name: 'LEADER', content: user.profile.name },
      { name: 'GROUP_NAME', content: group.name },
      { name: 'PREVIOUS_SUBSCRIPTION_TYPE', content: EMAIL_TEMPLATE_SUBSCRIPTION_TYPE_NORMAL },
    ]);
    // confirm that the other email sent is not a cancel-subscription email:
-    expect(sender.sendTxn.secondCall.args[0]._id).to.equal(group.leader);
+    const leaderCall = sender.sendTxn.getCalls().find(call => {
-    expect(sender.sendTxn.secondCall.args[1]).to.equal('group-subscription-begins');
+      const isLeader = call.args[0]._id === group.leader;
      const isSubscriptionBegin = call.args[1] === 'group-subscription-begins';
      return isLeader && isSubscriptionBegin;
    });
    expect(leaderCall.args[0]._id).to.equal(group.leader);
    expect(leaderCall.args[1]).to.equal('group-subscription-begins');
    paypalPayments.paypalBillingAgreementGet.restore();
    paypalPayments.paypalBillingAgreementCancel.restore();
@@ -302,8 +372,6 @@ describe('Purchasing a group plan for group', () => {
    recipient.guilds.push(group._id);
    await recipient.save();
    user.guilds.push(group._id);
    await user.save();
    data.groupId = group._id;
    await api.createSubscription(data);
@@ -356,8 +424,6 @@ describe('Purchasing a group plan for group', () => {
    recipient.guilds.push(group._id);
    await recipient.save();
    user.guilds.push(group._id);
    await user.save();
    data.groupId = group._id;
    await api.createSubscription(data);
@@ -419,8 +485,6 @@ describe('Purchasing a group plan for group', () => {
    data.gift = undefined;
    user.guilds.push(group._id);
    await user.save();
    data.groupId = group._id;
    await api.createSubscription(data);
@@ -455,8 +519,6 @@ describe('Purchasing a group plan for group', () => {
    data.gift = undefined;
    user.guilds.push(group._id);
    await user.save();
    data.groupId = group._id;
    await api.createSubscription(data);
@@ -483,8 +545,6 @@ describe('Purchasing a group plan for group', () => {
    recipient.guilds.push(group._id);
    await recipient.save();
    user.guilds.push(group._id);
    await user.save();
    data.groupId = group._id;
    await api.createSubscription(data);
@@ -511,8 +571,6 @@ describe('Purchasing a group plan for group', () => {
    await recipient.save();
    user.guilds.push(group._id);
    await user.save();
    data.groupId = group._id;
    await api.createSubscription(data);
@@ -541,8 +599,6 @@ describe('Purchasing a group plan for group', () => {
    await recipient.save();
    user.guilds.push(group._id);
    await user.save();
    data.groupId = group._id;
    await api.createSubscription(data);
@@ -566,8 +622,6 @@ describe('Purchasing a group plan for group', () => {
    recipient.guilds.push(group._id);
    await recipient.save();
    user.guilds.push(group._id);
    await user.save();
    data.groupId = group._id;
    await recipient.cancelSubscription();
@@ -589,8 +643,6 @@ describe('Purchasing a group plan for group', () => {
    recipient.guilds.push(group._id);
    await recipient.save();
    user.guilds.push(group._id);
    await user.save();
    data.groupId = group._id;
    await recipient.cancelSubscription();
@@ -611,8 +663,6 @@ describe('Purchasing a group plan for group', () => {
    recipient.guilds.push(group._id);
    await recipient.save();
    user.guilds.push(group._id);
    await user.save();
    data.groupId = group._id;
    await api.createSubscription(data);
@@ -632,8 +682,6 @@ describe('Purchasing a group plan for group', () => {
    recipient.guilds.push(group._id);
    await recipient.save();
    user.guilds.push(group._id);
    await user.save();
    data.groupId = group._id;
    await api.createSubscription(data);
@@ -653,8 +701,6 @@ describe('Purchasing a group plan for group', () => {
    recipient.guilds.push(group._id);
    await recipient.save();
    user.guilds.push(group._id);
    await user.save();
    data.groupId = group._id;
    await api.createSubscription(data);
@@ -688,8 +734,6 @@ describe('Purchasing a group plan for group', () => {
    recipient.guilds.push(group._id);
    await recipient.save();
    user.guilds.push(group._id);
    await user.save();
    data.groupId = group._id;
    await api.createSubscription(data);
@@ -713,8 +757,6 @@ describe('Purchasing a group plan for group', () => {
    recipient.guilds.push(group._id);
    await recipient.save();
    user.guilds.push(group._id);
    await user.save();
    data.groupId = group._id;
    await api.createSubscription(data);
@@ -726,13 +768,15 @@ describe('Purchasing a group plan for group', () => {
    const group2 = generateGroup({
      name: 'test group2',
      type: 'guild',
-      privacy: 'public',
+      privacy: 'private',
      leader: user._id,
    });
    data.groupId = group2._id;
    await group2.save();
    recipient.guilds.push(group2._id);
    await recipient.save();
    user.guilds.push(group2._id);
    await user.save();
    await api.createSubscription(data);
@@ -757,8 +801,6 @@ describe('Purchasing a group plan for group', () => {
    recipient.guilds.push(group._id);
    await recipient.save();
    user.guilds.push(group._id);
    await user.save();
    data.groupId = group._id;
    await api.createSubscription(data);
@@ -770,17 +812,22 @@ describe('Purchasing a group plan for group', () => {
    const group2 = generateGroup({
      name: 'test group2',
      type: 'guild',
-      privacy: 'public',
+      privacy: 'private',
      leader: user._id,
    });
    data.groupId = group2._id;
    await group2.save();
    recipient.guilds.push(group2._id);
    await recipient.save();
    user.guilds.push(group2._id);
    await user.save();
    await api.createSubscription(data);
    const updatedGroup = await Group.findById(group._id).exec();
    updatedGroup.memberCount = 2;
    await updatedGroup.save();
    await updatedGroup.leave(recipient);
    updatedUser = await User.findById(recipient._id).exec();
@@ -806,8 +853,6 @@ describe('Purchasing a group plan for group', () => {
    recipient.guilds.push(group._id);
    await recipient.save();
    user.guilds.push(group._id);
    await user.save();
    data.groupId = group._id;
    await api.createSubscription(data);
@@ -835,8 +880,6 @@ describe('Purchasing a group plan for group', () => {
    recipient.guilds.push(group._id);
    await recipient.save();
    user.guilds.push(group._id);
    await user.save();
    data.groupId = group._id;
    await api.createSubscription(data);
@@ -864,8 +907,6 @@ describe('Purchasing a group plan for group', () => {
    recipient.guilds.push(group._id);
    await recipient.save();
    user.guilds.push(group._id);
    await user.save();
    data.groupId = group._id;
    await api.createSubscription(data);
@@ -894,8 +935,6 @@ describe('Purchasing a group plan for group', () => {
    recipient.guilds.push(group._id);
    await recipient.save();
    user.guilds.push(group._id);
    await user.save();
    data.groupId = group._id;
    await api.createSubscription(data);
--- a/test/api/unit/libs/payments/stripe/upgrade-group-plan.test.js
+++ b/test/api/unit/libs/payments/stripe/upgrade-group-plan.test.js
@@ -33,11 +33,14 @@ describe('Stripe - Upgrade Group Plan', () => {
    group = generateGroup({
      name: 'test group',
      type: 'guild',
-      privacy: 'public',
+      privacy: 'private',
      leader: user._id,
    });
    await group.save();
    user.guilds.push(group._id);
    await user.save();
    spy = sinon.stub(stripe.subscriptions, 'update');
    spy.resolves([]);
    data.groupId = group._id;
--- a/test/api/unit/libs/preening.test.js
+++ b/test/api/unit/libs/preening.test.js
@@ -9,7 +9,7 @@ describe('preenHistory', () => {
  beforeEach(() => {
    // Replace system clocks so we can get predictable results
    clock = sinon.useFakeTimers({
-      now: Number(moment('2013-10-20').zone(0).startOf('day').toDate()),
+      now: Number(moment('2013-10-20').utcOffset(0).startOf('day').toDate()),
      toFake: ['Date'],
    });
  });
--- a/test/api/unit/libs/setupNconf.test.js
+++ b/test/api/unit/libs/setupNconf.test.js
@@ -1,4 +1,3 @@
 import path from 'path';
 import nconf from 'nconf';
 import setupNconf from '../../../../website/server/libs/setupNconf';
--- a/test/api/unit/middlewares/cors.test.js
+++ b/test/api/unit/middlewares/cors.test.js
@@ -21,7 +21,8 @@ describe('cors middleware', () => {
    expect(res.set).to.have.been.calledWith({
      'Access-Control-Allow-Origin': '*',
      'Access-Control-Allow-Methods': 'OPTIONS,GET,POST,PUT,HEAD,DELETE',
-      'Access-Control-Allow-Headers': 'Content-Type,Accept,Content-Encoding,X-Requested-With,x-api-user,x-api-key,x-client',
+      'Access-Control-Allow-Headers': 'Authorization,Content-Type,Accept,Content-Encoding,X-Requested-With,x-api-user,x-api-key,x-client',
      'Access-Control-Expose-Headers': 'X-RateLimit-Limit,X-RateLimit-Remaining,X-RateLimit-Reset,Retry-After',
    });
    expect(res.sendStatus).to.not.have.been.called;
    expect(next).to.have.been.calledOnce;
@@ -33,7 +34,8 @@ describe('cors middleware', () => {
    expect(res.set).to.have.been.calledWith({
      'Access-Control-Allow-Origin': '*',
      'Access-Control-Allow-Methods': 'OPTIONS,GET,POST,PUT,HEAD,DELETE',
-      'Access-Control-Allow-Headers': 'Content-Type,Accept,Content-Encoding,X-Requested-With,x-api-user,x-api-key,x-client',
+      'Access-Control-Allow-Headers': 'Authorization,Content-Type,Accept,Content-Encoding,X-Requested-With,x-api-user,x-api-key,x-client',
      'Access-Control-Expose-Headers': 'X-RateLimit-Limit,X-RateLimit-Remaining,X-RateLimit-Reset,Retry-After',
    });
    expect(res.sendStatus).to.have.been.calledWith(200);
    expect(next).to.not.have.been.called;
--- a/test/api/unit/middlewares/ipBlocker.test.js
+++ b/test/api/unit/middlewares/ipBlocker.test.js
@@ -57,7 +57,7 @@ describe('ipBlocker middleware', () => {
  });
  it('does not throw when the ip does not match', () => {
-    req.headers['x-forwarded-for'] = '192.168.1.1';
+    req.ip = '192.168.1.1';
    sandbox.stub(nconf, 'get').withArgs('BLOCKED_IPS').returns('192.168.1.2');
    const attachIpBlocker = requireAgain(pathToIpBlocker).default;
    attachIpBlocker(req, res, next);
@@ -65,30 +65,12 @@ describe('ipBlocker middleware', () => {
    checkErrorNotThrown(next);
  });
-  it('throws when a matching ip exist in x-forwarded-for', () => {
+  it('throws when the ip is blocked', () => {
-    req.headers['x-forwarded-for'] = '192.168.1.1';
+    req.ip = '192.168.1.1';
    sandbox.stub(nconf, 'get').withArgs('BLOCKED_IPS').returns('192.168.1.1');
    const attachIpBlocker = requireAgain(pathToIpBlocker).default;
    attachIpBlocker(req, res, next);
    checkErrorThrown(next);
  });
  it('trims ips in x-forwarded-for', () => {
    req.headers['x-forwarded-for'] = '192.168.1.1';
    sandbox.stub(nconf, 'get').withArgs('BLOCKED_IPS').returns(',  192.168.1.1 ,   192.168.1.4, ');
    const attachIpBlocker = requireAgain(pathToIpBlocker).default;
    attachIpBlocker(req, res, next);
    checkErrorThrown(next);
  });
  it('works when multiple ips are passed in x-forwarded-for', () => {
    req.headers['x-forwarded-for'] = '192.168.1.4';
    sandbox.stub(nconf, 'get').withArgs('BLOCKED_IPS').returns('192.168.1.1, 192.168.1.4, 192.168.1.3');
    const attachIpBlocker = requireAgain(pathToIpBlocker).default;
    attachIpBlocker(req, res, next);
    checkErrorThrown(next);
  });
 });
--- a/test/api/unit/middlewares/rateLimiter.test.js
+++ b/test/api/unit/middlewares/rateLimiter.test.js
@@ -0,0 +1,141 @@
 import nconf from 'nconf';
 import { RateLimiterMemory } from 'rate-limiter-flexible';
 import requireAgain from 'require-again';
 import {
  generateRes,
  generateReq,
  generateNext,
 } from '../../../helpers/api-unit.helper';
 import { TooManyRequests } from '../../../../website/server/libs/errors';
 import apiError from '../../../../website/server/libs/apiError';
 import logger from '../../../../website/server/libs/logger';
 describe('rateLimiter middleware', () => {
  const pathToRateLimiter = '../../../../website/server/middlewares/rateLimiter';
  let res; let req; let next; let nconfGetStub;
  beforeEach(() => {
    nconfGetStub = sandbox.stub(nconf, 'get');
    nconfGetStub.withArgs('NODE_ENV').returns('test');
    nconfGetStub.withArgs('IS_TEST').returns(true);
    res = generateRes();
    req = generateReq();
    next = generateNext();
  });
  afterEach(() => {
    sandbox.restore();
  });
  it('is disabled when the env var is not defined', () => {
    nconfGetStub.withArgs('RATE_LIMITER_ENABLED').returns(undefined);
    const attachRateLimiter = requireAgain(pathToRateLimiter).default;
    attachRateLimiter(req, res, next);
    expect(next).to.have.been.calledOnce;
    const calledWith = next.getCall(0).args;
    expect(typeof calledWith[0] === 'undefined').to.equal(true);
    expect(res.set).to.not.have.been.called;
  });
  it('is disabled when the env var is an not "true"', () => {
    nconfGetStub.withArgs('RATE_LIMITER_ENABLED').returns('false');
    const attachRateLimiter = requireAgain(pathToRateLimiter).default;
    attachRateLimiter(req, res, next);
    expect(next).to.have.been.calledOnce;
    const calledWith = next.getCall(0).args;
    expect(typeof calledWith[0] === 'undefined').to.equal(true);
    expect(res.set).to.not.have.been.called;
  });
  it('does not throw when there are available points', async () => {
    nconfGetStub.withArgs('RATE_LIMITER_ENABLED').returns('true');
    const attachRateLimiter = requireAgain(pathToRateLimiter).default;
    await attachRateLimiter(req, res, next);
    expect(next).to.have.been.calledOnce;
    const calledWith = next.getCall(0).args;
    expect(typeof calledWith[0] === 'undefined').to.equal(true);
    expect(res.set).to.have.been.calledOnce;
    expect(res.set).to.have.been.calledWithMatch({
      'X-RateLimit-Limit': 30,
      'X-RateLimit-Remaining': 29,
      'X-RateLimit-Reset': sinon.match(Date),
    });
  });
  it('does not throw when an unknown error is thrown by the rate limiter', async () => {
    nconfGetStub.withArgs('RATE_LIMITER_ENABLED').returns('true');
    sandbox.stub(logger, 'error');
    sandbox.stub(RateLimiterMemory.prototype, 'consume')
      .returns(Promise.reject(new Error('Unknown error.')));
    const attachRateLimiter = requireAgain(pathToRateLimiter).default;
    await attachRateLimiter(req, res, next);
    expect(next).to.have.been.calledOnce;
    const calledWith = next.getCall(0).args;
    expect(typeof calledWith[0] === 'undefined').to.equal(true);
    expect(res.set).to.not.have.been.called;
    expect(logger.error).to.be.calledOnce;
    expect(logger.error).to.have.been.calledWithMatch(Error, 'Rate Limiter Error');
  });
  it('throws when there are no available points remaining', async () => {
    nconfGetStub.withArgs('RATE_LIMITER_ENABLED').returns('true');
    const attachRateLimiter = requireAgain(pathToRateLimiter).default;
    // call for 31 times
    for (let i = 0; i < 31; i += 1) {
      await attachRateLimiter(req, res, next); // eslint-disable-line no-await-in-loop
    }
    expect(next).to.have.been.callCount(31);
    const calledWith = next.getCall(30).args;
    expect(calledWith[0].message).to.equal(apiError('clientRateLimited'));
    expect(calledWith[0] instanceof TooManyRequests).to.equal(true);
    expect(res.set).to.have.been.callCount(31);
    expect(res.set).to.have.been.calledWithMatch({
      'Retry-After': sinon.match(Number),
      'X-RateLimit-Limit': 30,
      'X-RateLimit-Remaining': 0,
      'X-RateLimit-Reset': sinon.match(Date),
    });
  });
  it('uses the user id if supplied or the ip address', async () => {
    nconfGetStub.withArgs('RATE_LIMITER_ENABLED').returns('true');
    const attachRateLimiter = requireAgain(pathToRateLimiter).default;
    req.ip = 1;
    await attachRateLimiter(req, res, next);
    req.headers['x-api-user'] = 'user-1';
    await attachRateLimiter(req, res, next);
    await attachRateLimiter(req, res, next);
    // user id an ip are counted as separate sources
    expect(res.set).to.have.been.calledWithMatch({
      'X-RateLimit-Limit': 30,
      'X-RateLimit-Remaining': 28, // 2 calls with user id
      'X-RateLimit-Reset': sinon.match(Date),
    });
    req.headers['x-api-user'] = undefined;
    await attachRateLimiter(req, res, next);
    await attachRateLimiter(req, res, next);
    expect(res.set).to.have.been.calledWithMatch({
      'X-RateLimit-Limit': 30,
      'X-RateLimit-Remaining': 27, // 3 calls with only ip
      'X-RateLimit-Reset': sinon.match(Date),
    });
  });
 });
--- a/test/api/unit/middlewares/redirects.js
+++ b/test/api/unit/middlewares/redirects.js
@@ -22,7 +22,7 @@ describe('redirects middleware', () => {
      const nconfStub = sandbox.stub(nconf, 'get');
      nconfStub.withArgs('BASE_URL').returns('https://habitica.com');
      nconfStub.withArgs('IS_PROD').returns(true);
-      req.header = sandbox.stub().withArgs('x-forwarded-proto').returns('http');
+      req.protocol = 'http';
      req.originalUrl = '/static/front';
      const attachRedirects = requireAgain(pathToRedirectsMiddleware);
@@ -37,7 +37,7 @@ describe('redirects middleware', () => {
      const nconfStub = sandbox.stub(nconf, 'get');
      nconfStub.withArgs('BASE_URL').returns('https://habitica.com');
      nconfStub.withArgs('IS_PROD').returns(true);
-      req.header = sandbox.stub().withArgs('x-forwarded-proto').returns('https');
+      req.protocol = 'https';
      req.originalUrl = '/static/front';
      const attachRedirects = requireAgain(pathToRedirectsMiddleware);
@@ -51,7 +51,7 @@ describe('redirects middleware', () => {
      const nconfStub = sandbox.stub(nconf, 'get');
      nconfStub.withArgs('BASE_URL').returns('https://habitica.com');
      nconfStub.withArgs('IS_PROD').returns(false);
-      req.header = sandbox.stub().withArgs('x-forwarded-proto').returns('http');
+      req.protocol = 'http';
      req.originalUrl = '/static/front';
      const attachRedirects = requireAgain(pathToRedirectsMiddleware);
@@ -65,7 +65,7 @@ describe('redirects middleware', () => {
      const nconfStub = sandbox.stub(nconf, 'get');
      nconfStub.withArgs('BASE_URL').returns('http://habitica.com');
      nconfStub.withArgs('IS_PROD').returns(true);
-      req.header = sandbox.stub().withArgs('x-forwarded-proto').returns('http');
+      req.protocol = 'http';
      req.originalUrl = '/static/front';
      const attachRedirects = requireAgain(pathToRedirectsMiddleware);
@@ -81,7 +81,7 @@ describe('redirects middleware', () => {
      nconfStub.withArgs('IS_PROD').returns(true);
      nconfStub.withArgs('SKIP_SSL_CHECK_KEY').returns('test-key');
-      req.header = sandbox.stub().withArgs('x-forwarded-proto').returns('http');
+      req.protocol = 'http';
      req.originalUrl = '/static/front';
      req.query.skipSSLCheck = 'test-key';
@@ -97,7 +97,7 @@ describe('redirects middleware', () => {
      nconfStub.withArgs('IS_PROD').returns(true);
      nconfStub.withArgs('SKIP_SSL_CHECK_KEY').returns('test-key');
-      req.header = sandbox.stub().withArgs('x-forwarded-proto').returns('http');
+      req.protocol = 'http';
      req.originalUrl = '/static/front?skipSSLCheck=INVALID';
      req.query.skipSSLCheck = 'INVALID';
@@ -114,7 +114,7 @@ describe('redirects middleware', () => {
      nconfStub.withArgs('IS_PROD').returns(true);
      nconfStub.withArgs('SKIP_SSL_CHECK_KEY').returns(null);
-      req.header = sandbox.stub().withArgs('x-forwarded-proto').returns('http');
+      req.protocol = 'http';
      req.originalUrl = '/static/front';
      req.query.skipSSLCheck = 'INVALID';
--- a/test/api/unit/middlewares/response.js
+++ b/test/api/unit/middlewares/response.js
@@ -16,7 +16,6 @@ describe('response middleware', () => {
    next = generateNext();
  });
  it('attaches respond method to res', () => {
    responseMiddleware(req, res, next);
--- a/test/api/unit/models/challenge.test.js
+++ b/test/api/unit/models/challenge.test.js
@@ -35,6 +35,33 @@ describe('Challenge Model', () => {
      notes: 'test notes',
    },
  };
  const tasks2ToTest = {
    habit: {
      text: 'test habit 2',
      type: 'habit',
      up: false,
      down: true,
      notes: 'test notes',
    },
    todo: {
      text: 'test todo 2',
      type: 'todo',
      notes: 'test notes',
    },
    daily: {
      text: 'test daily 2',
      type: 'daily',
      frequency: 'daily',
      everyX: 5,
      startDate: new Date(),
      notes: 'test notes',
    },
    reward: {
      text: 'test reward 2',
      type: 'reward',
      notes: 'test notes',
    },
  };
  beforeEach(async () => {
    guild = new Group({
@@ -146,6 +173,60 @@ describe('Challenge Model', () => {
        expect(syncedTask.attribute).to.eql('str');
      });
      it('should add challenge tag back to user upon syncing challenge tasks to a user with challenge tag removed', async () => {
        await challenge.addTasks([task]);
        const newMember = new User({
          guilds: [guild._id],
        });
        await newMember.save();
        await challenge.syncTasksToUser(newMember);
        let updatedNewMember = await User.findById(newMember._id).exec();
        const updatedNewMemberId = updatedNewMember._id;
        updatedNewMember.tags = [];
        await updatedNewMember.save();
        const taskValue2 = tasks2ToTest[taskType];
        const task2 = new Tasks[`${taskType}`](Tasks.Task.sanitize(taskValue2));
        task2.challenge.id = challenge._id;
        await challenge.addTasks([task2]);
        await challenge.syncTasksToUser(updatedNewMember);
        updatedNewMember = await User.findById(updatedNewMemberId).exec();
        expect(updatedNewMember.tags.length).to.equal(1);
        expect(updatedNewMember.tags[0].id).to.equal(challenge._id);
        expect(updatedNewMember.tags[0].name).to.equal(challenge.shortName);
      });
      it('should not add a duplicate challenge tag to user upon syncing challenge tasks to a user with existing challenge tag', async () => {
        await challenge.addTasks([task]);
        const newMember = new User({
          guilds: [guild._id],
        });
        await newMember.save();
        await challenge.syncTasksToUser(newMember);
        let updatedNewMember = await User.findById(newMember._id).exec();
        const updatedNewMemberId = updatedNewMember._id;
        const taskValue2 = tasks2ToTest[taskType];
        const task2 = new Tasks[`${taskType}`](Tasks.Task.sanitize(taskValue2));
        task2.challenge.id = challenge._id;
        await challenge.addTasks([task2]);
        await challenge.syncTasksToUser(updatedNewMember);
        updatedNewMember = await User.findById(updatedNewMemberId);
        expect(updatedNewMember.tags.length).to.equal(8);
        expect(updatedNewMember.tags[7].id).to.equal(challenge._id);
        expect(updatedNewMember.tags[7].name).to.equal(challenge.shortName);
        expect(updatedNewMember.tags.filter(tag => tag.id === challenge._id).length).to.equal(1);
      });
      it('syncs challenge tasks to a user with the existing task', async () => {
        await challenge.addTasks([task]);
--- a/test/api/unit/models/group.test.js
+++ b/test/api/unit/models/group.test.js
@@ -769,7 +769,6 @@ describe('Group Model', () => {
        expect(res.t).to.not.be.called;
      });
      it('does not throw an error if only user ids are passed in', async () => {
        await Group.validateInvitations({ uuids: ['user-id', 'user-id2'] }, res);
        expect(res.t).to.not.be.called;
--- a/test/api/unit/models/group_tasks.test.js
+++ b/test/api/unit/models/group_tasks.test.js
@@ -235,15 +235,16 @@ describe('Group Task Methods', () => {
        });
      });
-      it('removes an assigned task and unlinks assignees', async () => {
+      it('removes assigned tasks when master task is deleted', async () => {
        await guild.syncTask(task, leader);
        await guild.removeTask(task);
        const updatedLeader = await User.findOne({ _id: leader._id });
-        const updatedLeadersTasks = await Tasks.Task.find({ _id: { $in: updatedLeader.tasksOrder[`${taskType}s`] } });
+        const updatedLeadersTasks = await Tasks.Task.find({ userId: leader._id, type: taskType });
        const syncedTask = find(updatedLeadersTasks, findLinkedTask);
-        expect(syncedTask.group.broken).to.equal('TASK_DELETED');
+        expect(updatedLeader.tasksOrder[`${taskType}s`]).to.not.include(task._id);
        expect(syncedTask).to.not.exist;
      });
      it('unlinks and deletes group tasks for a user when remove-all is specified', async () => {
--- a/test/api/unit/models/task.test.js
+++ b/test/api/unit/models/task.test.js
@@ -3,7 +3,6 @@ import { model as Challenge } from '../../../../website/server/models/challenge'
 import { model as Group } from '../../../../website/server/models/group';
 import { model as User } from '../../../../website/server/models/user';
 import * as Tasks from '../../../../website/server/models/task';
 import { InternalServerError } from '../../../../website/server/libs/errors';
 import { generateHistory } from '../../../helpers/api-unit.helper';
 describe('Task Model', () => {
@@ -99,7 +98,8 @@ describe('Task Model', () => {
          throw new Error('No exception when Id is None');
        } catch (err) {
          expect(err).to.exist;
-          expect(err).to.eql(new InternalServerError('Task identifier is a required argument'));
+          expect(err).to.be.an.instanceOf(Error);
          expect(err.message).to.eql('Task identifier is a required argument');
        }
      });
@@ -109,7 +109,8 @@ describe('Task Model', () => {
          throw new Error('No exception when user_id is undefined');
        } catch (err) {
          expect(err).to.exist;
-          expect(err).to.eql(new InternalServerError('User identifier is a required argument'));
+          expect(err).to.be.an.instanceOf(Error);
          expect(err.message).to.eql('User identifier is a required argument');
        }
      });
@@ -153,6 +154,132 @@ describe('Task Model', () => {
      });
    });
    describe('findMultipleByIdOrAlias', () => {
      let taskWithAlias;
      let secondTask;
      let user;
      beforeEach(async () => {
        user = new User();
        await user.save();
        taskWithAlias = new Tasks.todo({ // eslint-disable-line new-cap
          text: 'some text',
          alias: 'short-name',
          userId: user.id,
        });
        await taskWithAlias.save();
        secondTask = new Tasks.habit({ // eslint-disable-line new-cap
          text: 'second task',
          alias: 'second-short-name',
          userId: user.id,
        });
        await secondTask.save();
        sandbox.spy(Tasks.Task, 'find');
      });
      it('throws an error if task identifiers is not passed in', async () => {
        try {
          await Tasks.Task.findMultipleByIdOrAlias(null, user._id);
          throw new Error('No exception when Id is None');
        } catch (err) {
          expect(err).to.exist;
          expect(err).to.be.an.instanceOf(Error);
          expect(err.message).to.eql('Task identifiers is a required array argument');
        }
      });
      it('throws an error if task identifiers is not an array', async () => {
        try {
          await Tasks.Task.findMultipleByIdOrAlias('string', user._id);
          throw new Error('No exception when Id is None');
        } catch (err) {
          expect(err).to.exist;
          expect(err).to.be.an.instanceOf(Error);
          expect(err.message).to.eql('Task identifiers is a required array argument');
        }
      });
      it('throws an error if user identifier is not passed in', async () => {
        try {
          await Tasks.Task.findMultipleByIdOrAlias([taskWithAlias._id]);
          throw new Error('No exception when user_id is undefined');
        } catch (err) {
          expect(err).to.exist;
          expect(err).to.be.an.instanceOf(Error);
          expect(err.message).to.eql('User identifier is a required argument');
        }
      });
      it('returns task by id', async () => {
        const foundTasks = await Tasks.Task.findMultipleByIdOrAlias([taskWithAlias._id], user._id);
        expect(foundTasks[0].text).to.eql(taskWithAlias.text);
      });
      it('returns task by alias', async () => {
        const foundTasks = await Tasks.Task.findMultipleByIdOrAlias(
          [taskWithAlias.alias], user._id,
        );
        expect(foundTasks[0].text).to.eql(taskWithAlias.text);
      });
      it('returns multiple tasks', async () => {
        const foundTasks = await Tasks.Task.findMultipleByIdOrAlias(
          [taskWithAlias.alias, secondTask._id], user._id,
        );
        expect(foundTasks.length).to.eql(2);
        expect(foundTasks[0]._id).to.eql(taskWithAlias._id);
        expect(foundTasks[1]._id).to.eql(secondTask._id);
      });
      it('returns a task only once if searched by both id and alias', async () => {
        const foundTasks = await Tasks.Task.findMultipleByIdOrAlias(
          [taskWithAlias.alias, taskWithAlias._id], user._id,
        );
        expect(foundTasks.length).to.eql(1);
        expect(foundTasks[0].text).to.eql(taskWithAlias.text);
      });
      it('scopes alias lookup to user', async () => {
        await Tasks.Task.findMultipleByIdOrAlias([taskWithAlias.alias], user._id);
        expect(Tasks.Task.find).to.be.calledOnce;
        expect(Tasks.Task.find).to.be.calledWithMatch({
          $or: [
            { _id: { $in: [] } },
            { alias: { $in: [taskWithAlias.alias] } },
          ],
          userId: user._id,
        });
      });
      it('returns empty array if tasks cannot be found', async () => {
        const foundTasks = await Tasks.Task.findMultipleByIdOrAlias(['not-found'], user._id);
        expect(foundTasks).to.eql([]);
      });
      it('accepts additional query parameters', async () => {
        await Tasks.Task.findMultipleByIdOrAlias([taskWithAlias.alias], user._id, { foo: 'bar' });
        expect(Tasks.Task.find).to.be.calledOnce;
        expect(Tasks.Task.find).to.be.calledWithMatch({
          $or: [
            { _id: { $in: [] } },
            { alias: { $in: [taskWithAlias.alias] } },
          ],
          userId: user._id,
          foo: 'bar',
        });
      });
    });
    describe('sanitizeUserChallengeTask ', () => {
    });
--- a/test/api/unit/models/user.test.js
+++ b/test/api/unit/models/user.test.js
@@ -432,7 +432,6 @@ describe('User Model', () => {
      user = new User();
    });
    it('returns false if user does not have customer id', () => {
      expect(user.isSubscribed()).to.be.undefined;
    });
@@ -558,7 +557,6 @@ describe('User Model', () => {
    });
  });
  context('hasCancelled', () => {
    let user;
    beforeEach(() => {
@@ -763,7 +761,7 @@ describe('User Model', () => {
    });
  });
-  context('days missed', () => {
+  describe('daysUserHasMissed', () => {
    // http://forbrains.co.uk/international_tools/earth_timezones
    let user;
@@ -771,24 +769,51 @@ describe('User Model', () => {
      user = new User();
    });
-    it('should not cron early when going back a timezone', () => {
+    it('correctly calculates days missed since lastCron', () => {
-      const yesterday = moment('2017-12-05T00:00:00.000-06:00'); // 11 pm on 4 Texas
+      const now = moment();
-      const timezoneOffset = moment().zone('-06:00').zone();
+      user.lastCron = moment(now).subtract(5, 'days');
      user.lastCron = yesterday;
      user.preferences.timezoneOffset = timezoneOffset;
-      const today = moment('2017-12-06T00:00:00.000-06:00'); // 11 pm on 4 Texas
+      const { daysMissed } = user.daysUserHasMissed(now);
      const req = {};
      req.header = () => timezoneOffset + 60;
-      const { daysMissed } = user.daysUserHasMissed(today, req);
+      expect(daysMissed).to.eql(5);
    });
    it('uses timezone from preferences to calculate days missed', () => {
      const now = moment('2017-07-08 01:00:00Z');
      user.lastCron = moment('2017-07-04 13:00:00Z');
      user.preferences.timezoneOffset = 120;
      const { daysMissed } = user.daysUserHasMissed(now);
      expect(daysMissed).to.eql(3);
    });
    it('uses timezone at last cron to calculate days missed', () => {
      const now = moment('2017-09-08 13:00:00Z');
      user.lastCron = moment('2017-09-06 01:00:00+02:00');
      user.preferences.timezoneOffset = 0;
      user.preferences.timezoneOffsetAtLastCron = -120;
      const { daysMissed } = user.daysUserHasMissed(now);
      expect(daysMissed).to.eql(2);
    });
    it('respects new timezone that drags time into same day', () => {
      user.lastCron = moment('2017-12-05T00:00:00.000-06:00');
      user.preferences.timezoneOffset = 360;
      const today = moment('2017-12-06T00:00:00.000-06:00');
      const requestWithMinus7Timezone = { header: () => 420 };
      const { daysMissed } = user.daysUserHasMissed(today, requestWithMinus7Timezone);
      expect(user.preferences.timezoneOffset).to.eql(420);
      expect(daysMissed).to.eql(0);
    });
    it('should not cron early when going back a timezone with a custom day start', () => {
      const yesterday = moment('2017-12-05T02:00:00.000-08:00');
-      const timezoneOffset = moment().zone('-08:00').zone();
+      const timezoneOffset = 480;
      user.lastCron = yesterday;
      user.preferences.timezoneOffset = timezoneOffset;
      user.preferences.dayStart = 2;
--- a/test/api/unit/models/webhook.test.js
+++ b/test/api/unit/models/webhook.test.js
@@ -299,7 +299,6 @@ describe('Webhook Model', () => {
        });
      });
      context('type is globalActivity', () => {
        let config;
--- a/test/api/v3/integration/challenges/GET-challenges_challengeId_members.test.js
+++ b/test/api/v3/integration/challenges/GET-challenges_challengeId_members.test.js
@@ -117,7 +117,7 @@ describe('GET /challenges/:challengeId/members', () => {
    expect(res[0].profile).to.have.all.keys(['name']);
  });
-  it('returns only first 30 members if req.query.includeAllMembers is not true', async () => {
+  it('returns only first 30 members if req.query.includeAllMembers is not true and req.query.limit is undefined', async () => {
    const group = await generateGroup(user, { type: 'party', name: generateUUID() });
    const challenge = await generateChallenge(user, group);
    await user.post(`/challenges/${challenge._id}/join`);
@@ -136,7 +136,7 @@ describe('GET /challenges/:challengeId/members', () => {
    });
  });
-  it('returns only first 30 members if req.query.includeAllMembers is not defined', async () => {
+  it('returns only first 30 members if req.query.includeAllMembers is not defined and req.query.limit is undefined', async () => {
    const group = await generateGroup(user, { type: 'party', name: generateUUID() });
    const challenge = await generateChallenge(user, group);
    await user.post(`/challenges/${challenge._id}/join`);
@@ -155,6 +155,68 @@ describe('GET /challenges/:challengeId/members', () => {
    });
  });
  it('returns an error if req.query.limit is over 60', async () => {
    const group = await generateGroup(user, { type: 'party', privacy: 'private' });
    const challenge = await generateChallenge(user, group);
    const anotherUser = await generateUser();
    await expect(anotherUser.get(`/challenges/${challenge._id}/members?limit=61`)).to.eventually.be.rejected.and.eql({
      code: 400,
      error: 'BadRequest',
      message: t('invalidReqParams'),
    });
  });
  it('returns an error if req.query.limit is under 1', async () => {
    const group = await generateGroup(user, { type: 'party', privacy: 'private' });
    const challenge = await generateChallenge(user, group);
    const anotherUser = await generateUser();
    await expect(anotherUser.get(`/challenges/${challenge._id}/members?limit=-13`)).to.eventually.be.rejected.and.eql({
      code: 400,
      error: 'BadRequest',
      message: t('invalidReqParams'),
    });
  });
  it('returns an error if req.query.limit is not an integer', async () => {
    const group = await generateGroup(user, { type: 'party', privacy: 'private' });
    const challenge = await generateChallenge(user, group);
    const anotherUser = await generateUser();
    await expect(anotherUser.get(`/challenges/${challenge._id}/members?limit=true`)).to.eventually.be.rejected.and.eql({
      code: 400,
      error: 'BadRequest',
      message: t('invalidReqParams'),
    });
  });
  it('returns up to 60 members when req.query.limit is specified', async () => {
    const group = await generateGroup(user, { type: 'party', name: generateUUID() });
    const challenge = await generateChallenge(user, group);
    await user.post(`/challenges/${challenge._id}/join`);
    const usersToGenerate = [];
    for (let i = 0; i < 62; i += 1) {
      usersToGenerate.push(generateUser({ challenges: [challenge._id] }));
    }
    await Promise.all(usersToGenerate);
    let res = await user.get(`/challenges/${challenge._id}/members?limit=57`);
    expect(res.length).to.equal(57);
    res.forEach(member => {
      expect(member).to.have.all.keys(['_id', 'auth', 'flags', 'id', 'profile']);
      expect(member.profile).to.have.all.keys(['name']);
    });
    res = await user.get(`/challenges/${challenge._id}/members?limit=60&lastId=${res[res.length - 1]._id}`);
    expect(res.length).to.equal(6);
    res.forEach(member => {
      expect(member).to.have.all.keys(['_id', 'auth', 'flags', 'id', 'profile']);
      expect(member.profile).to.have.all.keys(['name']);
    });
  }).timeout(30000);
  it('returns all members if req.query.includeAllMembers is true', async () => {
    const group = await generateGroup(user, { type: 'party', name: generateUUID() });
    const challenge = await generateChallenge(user, group);
--- a/test/api/v3/integration/challenges/GET-challenges_user.test.js
+++ b/test/api/v3/integration/challenges/GET-challenges_user.test.js
@@ -6,8 +6,8 @@ import {
 describe('GET challenges/user', () => {
  context('no official challenges', () => {
-    let user; let member; let nonMember; let challenge; let challenge2; let
+    let user; let member; let nonMember; let challenge; let challenge2;
-      publicGuild;
+    let publicGuild; let userData; let groupData;
    before(async () => {
      const { group, groupLeader, members } = await createAndPopulateGroup({
@@ -19,225 +19,197 @@ describe('GET challenges/user', () => {
        members: 1,
      });
      user = groupLeader;
      publicGuild = group;
      groupData = {
        _id: publicGuild._id,
        categories: [],
        id: publicGuild._id,
        type: publicGuild.type,
        privacy: publicGuild.privacy,
        name: publicGuild.name,
        summary: publicGuild.name,
        leader: publicGuild.leader._id,
      };
      user = groupLeader;
      userData = {
        _id: publicGuild.leader._id,
        id: publicGuild.leader._id,
        profile: { name: user.profile.name },
        auth: {
          local: {
            username: user.auth.local.username,
          },
        },
        flags: {
          verifiedUsername: true,
        },
      };
      member = members[0]; // eslint-disable-line prefer-destructuring
      nonMember = await generateUser();
      challenge = await generateChallenge(user, group);
      await user.post(`/challenges/${challenge._id}/join`);
      challenge2 = await generateChallenge(user, group);
      await user.post(`/challenges/${challenge2._id}/join`);
    });
    it('should return challenges user has joined', async () => {
      await nonMember.post(`/challenges/${challenge._id}/join`);
    });
    context('all challenges', () => {
      it('should return challenges user has joined', async () => {
        const challenges = await nonMember.get('/challenges/user');
-      const challenges = await nonMember.get('/challenges/user');
+        const foundChallenge = _.find(challenges, { _id: challenge._id });
        expect(foundChallenge).to.exist;
        expect(foundChallenge.leader).to.eql(userData);
        expect(foundChallenge.group).to.eql(groupData);
      });
-      const foundChallenge = _.find(challenges, { _id: challenge._id });
+      it('should not return challenges a non-member has not joined', async () => {
-      expect(foundChallenge).to.exist;
+        const challenges = await nonMember.get('/challenges/user');
-      expect(foundChallenge.leader).to.eql({
+
-        _id: publicGuild.leader._id,
+        const foundChallenge2 = _.find(challenges, { _id: challenge2._id });
-        id: publicGuild.leader._id,
+        expect(foundChallenge2).to.not.exist;
-        profile: { name: user.profile.name },
+      });
-        auth: {
+
-          local: {
+      it('should return challenges user has created', async () => {
-            username: user.auth.local.username,
+        const challenges = await user.get('/challenges/user');
        const foundChallenge1 = _.find(challenges, { _id: challenge._id });
        expect(foundChallenge1).to.exist;
        expect(foundChallenge1.leader).to.eql(userData);
        expect(foundChallenge1.group).to.eql(groupData);
        const foundChallenge2 = _.find(challenges, { _id: challenge2._id });
        expect(foundChallenge2).to.exist;
        expect(foundChallenge2.leader).to.eql(userData);
        expect(foundChallenge2.group).to.eql(groupData);
      });
      it('should return challenges in user\'s group', async () => {
        const challenges = await member.get('/challenges/user');
        const foundChallenge1 = _.find(challenges, { _id: challenge._id });
        expect(foundChallenge1).to.exist;
        expect(foundChallenge1.leader).to.eql(userData);
        expect(foundChallenge1.group).to.eql(groupData);
        const foundChallenge2 = _.find(challenges, { _id: challenge2._id });
        expect(foundChallenge2).to.exist;
        expect(foundChallenge2.leader).to.eql(userData);
        expect(foundChallenge2.group).to.eql(groupData);
      });
      it('should return newest challenges first', async () => {
        let challenges = await user.get('/challenges/user');
        let foundChallengeIndex = _.findIndex(challenges, { _id: challenge2._id });
        expect(foundChallengeIndex).to.eql(0);
        const newChallenge = await generateChallenge(user, publicGuild);
        await user.post(`/challenges/${newChallenge._id}/join`);
        challenges = await user.get('/challenges/user');
        foundChallengeIndex = _.findIndex(challenges, { _id: newChallenge._id });
        expect(foundChallengeIndex).to.eql(0);
      });
      it('should not return challenges user doesn\'t have access to', async () => {
        const { group, groupLeader } = await createAndPopulateGroup({
          groupDetails: {
            name: 'TestPrivateGuild',
            summary: 'summary for TestPrivateGuild',
            type: 'guild',
            privacy: 'private',
          },
-        },
+        });
        flags: {
          verifiedUsername: true,
        },
      });
      expect(foundChallenge.group).to.eql({
        _id: publicGuild._id,
        categories: [],
        id: publicGuild._id,
        type: publicGuild.type,
        privacy: publicGuild.privacy,
        name: publicGuild.name,
        summary: publicGuild.name,
        leader: publicGuild.leader._id,
      });
    });
-    it('should return challenges user has created', async () => {
+        const privateChallenge = await generateChallenge(groupLeader, group);
-      const challenges = await user.get('/challenges/user');
+        await groupLeader.post(`/challenges/${privateChallenge._id}/join`);
-      const foundChallenge1 = _.find(challenges, { _id: challenge._id });
+        const challenges = await nonMember.get('/challenges/user');
-      expect(foundChallenge1).to.exist;
+
-      expect(foundChallenge1.leader).to.eql({
+        const foundChallenge = _.find(challenges, { _id: privateChallenge._id });
-        _id: publicGuild.leader._id,
+        expect(foundChallenge).to.not.exist;
-        id: publicGuild.leader._id,
+      });
-        profile: { name: user.profile.name },
+
-        auth: {
+      it('should not return challenges user doesn\'t have access to, even with query parameters', async () => {
-          local: {
+        const { group, groupLeader } = await createAndPopulateGroup({
-            username: user.auth.local.username,
+          groupDetails: {
            name: 'TestPrivateGuild',
            summary: 'summary for TestPrivateGuild',
            type: 'guild',
            privacy: 'private',
          },
-        },
+        });
-        flags: {
+
-          verifiedUsername: true,
+        const privateChallenge = await generateChallenge(groupLeader, group, {
-        },
+          categories: [{
-      });
+            name: 'academics',
-      expect(foundChallenge1.group).to.eql({
+            slug: 'academics',
-        _id: publicGuild._id,
+          }],
-        categories: [],
+        });
-        id: publicGuild._id,
+        await groupLeader.post(`/challenges/${privateChallenge._id}/join`);
-        type: publicGuild.type,
+
-        privacy: publicGuild.privacy,
+        const challenges = await nonMember.get('/challenges/user?categories=academics&owned=not_owned');
-        name: publicGuild.name,
+
-        summary: publicGuild.name,
+        const foundChallenge = _.find(challenges, { _id: privateChallenge._id });
-        leader: publicGuild.leader._id,
+        expect(foundChallenge).to.not.exist;
      });
      const foundChallenge2 = _.find(challenges, { _id: challenge2._id });
      expect(foundChallenge2).to.exist;
      expect(foundChallenge2.leader).to.eql({
        _id: publicGuild.leader._id,
        id: publicGuild.leader._id,
        profile: { name: user.profile.name },
        auth: {
          local: {
            username: user.auth.local.username,
          },
        },
        flags: {
          verifiedUsername: true,
        },
      });
      expect(foundChallenge2.group).to.eql({
        _id: publicGuild._id,
        categories: [],
        id: publicGuild._id,
        type: publicGuild.type,
        privacy: publicGuild.privacy,
        name: publicGuild.name,
        summary: publicGuild.name,
        leader: publicGuild.leader._id,
      });
    });
-    it('should return challenges in user\'s group', async () => {
+    context('my challenges', () => {
-      const challenges = await member.get('/challenges/user');
+      it('should return challenges user has joined', async () => {
        const challenges = await nonMember.get(`/challenges/user?member=${true}`);
-      const foundChallenge1 = _.find(challenges, { _id: challenge._id });
+        const foundChallenge = _.find(challenges, { _id: challenge._id });
-      expect(foundChallenge1).to.exist;
+        expect(foundChallenge).to.exist;
-      expect(foundChallenge1.leader).to.eql({
+        expect(foundChallenge.leader).to.eql(userData);
-        _id: publicGuild.leader._id,
+        expect(foundChallenge.group).to.eql(groupData);
        id: publicGuild.leader._id,
        profile: { name: user.profile.name },
        auth: {
          local: {
            username: user.auth.local.username,
          },
        },
        flags: {
          verifiedUsername: true,
        },
      });
      expect(foundChallenge1.group).to.eql({
        _id: publicGuild._id,
        categories: [],
        id: publicGuild._id,
        type: publicGuild.type,
        privacy: publicGuild.privacy,
        name: publicGuild.name,
        summary: publicGuild.name,
        leader: publicGuild.leader._id,
      });
      const foundChallenge2 = _.find(challenges, { _id: challenge2._id });
      expect(foundChallenge2).to.exist;
      expect(foundChallenge2.leader).to.eql({
        _id: publicGuild.leader._id,
        id: publicGuild.leader._id,
        profile: { name: user.profile.name },
        auth: {
          local: {
            username: user.auth.local.username,
          },
        },
        flags: {
          verifiedUsername: true,
        },
      });
      expect(foundChallenge2.group).to.eql({
        _id: publicGuild._id,
        categories: [],
        id: publicGuild._id,
        type: publicGuild.type,
        privacy: publicGuild.privacy,
        name: publicGuild.name,
        summary: publicGuild.name,
        leader: publicGuild.leader._id,
      });
    });
    it('should not return challenges in user groups if we send member true param', async () => {
      const challenges = await member.get(`/challenges/user?member=${true}`);
      const foundChallenge1 = _.find(challenges, { _id: challenge._id });
      expect(foundChallenge1).to.not.exist;
      const foundChallenge2 = _.find(challenges, { _id: challenge2._id });
      expect(foundChallenge2).to.not.exist;
    });
    it('should return newest challenges first', async () => {
      let challenges = await user.get('/challenges/user');
      let foundChallengeIndex = _.findIndex(challenges, { _id: challenge2._id });
      expect(foundChallengeIndex).to.eql(0);
      const newChallenge = await generateChallenge(user, publicGuild);
      await user.post(`/challenges/${newChallenge._id}/join`);
      challenges = await user.get('/challenges/user');
      foundChallengeIndex = _.findIndex(challenges, { _id: newChallenge._id });
      expect(foundChallengeIndex).to.eql(0);
    });
    it('should not return challenges user doesn\'t have access to', async () => {
      const { group, groupLeader } = await createAndPopulateGroup({
        groupDetails: {
          name: 'TestPrivateGuild',
          summary: 'summary for TestPrivateGuild',
          type: 'guild',
          privacy: 'private',
        },
      });
-      const privateChallenge = await generateChallenge(groupLeader, group);
+      it('should return challenges user has created', async () => {
-      await groupLeader.post(`/challenges/${privateChallenge._id}/join`);
+        const challenges = await user.get(`/challenges/user?member=${true}`);
-      const challenges = await nonMember.get('/challenges/user');
+        const foundChallenge1 = _.find(challenges, { _id: challenge._id });
-
+        expect(foundChallenge1).to.exist;
-      const foundChallenge = _.find(challenges, { _id: privateChallenge._id });
+        expect(foundChallenge1.leader).to.eql(userData);
-      expect(foundChallenge).to.not.exist;
+        expect(foundChallenge1.group).to.eql(groupData);
-    });
+        const foundChallenge2 = _.find(challenges, { _id: challenge2._id });
-
+        expect(foundChallenge2).to.exist;
-    it('should not return challenges user doesn\'t have access to, even with query parameters', async () => {
+        expect(foundChallenge2.leader).to.eql(userData);
-      const { group, groupLeader } = await createAndPopulateGroup({
+        expect(foundChallenge2.group).to.eql(groupData);
        groupDetails: {
          name: 'TestPrivateGuild',
          summary: 'summary for TestPrivateGuild',
          type: 'guild',
          privacy: 'private',
        },
      });
-      const privateChallenge = await generateChallenge(groupLeader, group, {
+      it('should return challenges user has created if filter by owned', async () => {
-        categories: [{
+        const challenges = await user.get(`/challenges/user?member=${true}&owned=owned`);
-          name: 'academics',
+
-          slug: 'academics',
+        const foundChallenge1 = _.find(challenges, { _id: challenge._id });
-        }],
+        expect(foundChallenge1).to.exist;
        expect(foundChallenge1.leader).to.eql(userData);
        expect(foundChallenge1.group).to.eql(groupData);
        const foundChallenge2 = _.find(challenges, { _id: challenge2._id });
        expect(foundChallenge2).to.exist;
        expect(foundChallenge2.leader).to.eql(userData);
        expect(foundChallenge2.group).to.eql(groupData);
      });
      await groupLeader.post(`/challenges/${privateChallenge._id}/join`);
-      const challenges = await nonMember.get('/challenges/user?categories=academics&owned=not_owned');
+      it('should not return challenges user has created if filter by not owned', async () => {
        const challenges = await user.get(`/challenges/user?owned=not_owned&member=${true}`);
-      const foundChallenge = _.find(challenges, { _id: privateChallenge._id });
+        const foundChallenge1 = _.find(challenges, { _id: challenge._id });
-      expect(foundChallenge).to.not.exist;
+        expect(foundChallenge1).to.not.exist;
        const foundChallenge2 = _.find(challenges, { _id: challenge2._id });
        expect(foundChallenge2).to.not.exist;
      });
      it('should not return challenges in user groups', async () => {
        const challenges = await member.get(`/challenges/user?member=${true}`);
        const foundChallenge1 = _.find(challenges, { _id: challenge._id });
        expect(foundChallenge1).to.not.exist;
        const foundChallenge2 = _.find(challenges, { _id: challenge2._id });
        expect(foundChallenge2).to.not.exist;
      });
    });
  });
--- a/test/api/v3/integration/challenges/POST-challenges_challengeId_winner_winnerId.test.js
+++ b/test/api/v3/integration/challenges/POST-challenges_challengeId_winner_winnerId.test.js
@@ -159,7 +159,7 @@ describe('POST /challenges/:challengeId/winner/:winnerId', () => {
      expect(testTask.challenge.broken).to.eql('CHALLENGE_CLOSED');
      expect(testTask.challenge.winner).to.eql(winningUser.profile.name);
-      expect(challengeTag.challenge).to.eql('false');
+      expect(challengeTag.challenge).to.eql(false);
    });
  });
 });
--- a/test/api/v3/integration/groups/GET-groups.test.js
+++ b/test/api/v3/integration/groups/GET-groups.test.js
@@ -12,7 +12,7 @@ import apiError from '../../../../../website/server/libs/apiError';
 describe('GET /groups', () => {
  let user;
  let userInGuild;
-  const NUMBER_OF_PUBLIC_GUILDS = 3; // 2 + the tavern
+  const NUMBER_OF_PUBLIC_GUILDS = 2;
  const NUMBER_OF_PUBLIC_GUILDS_USER_IS_LEADER = 2;
  const NUMBER_OF_PUBLIC_GUILDS_USER_IS_MEMBER = 1;
  const NUMBER_OF_USERS_PRIVATE_GUILDS = 1;
@@ -236,11 +236,22 @@ describe('GET /groups', () => {
      await expect(user.get('/groups?type=publicGuilds&paginate=true&page=1'))
        .to.eventually.have.a.lengthOf(GUILD_PER_PAGE);
      const page2 = await expect(user.get('/groups?type=publicGuilds&paginate=true&page=2'))
-        .to.eventually.have.a.lengthOf(1 + 4); // 1 created now, 4 by other tests
+        // 1 created now, 4 by other tests, -1 for no more tavern.
-      expect(page2[4].name).to.equal('guild with less members');
+        .to.eventually.have.a.lengthOf(1 + 4 - 1);
      expect(page2[3].name).to.equal('guild with less members');
    }).timeout(10000);
  });
  it('makes sure that the tavern doesn\'t show up when guilds is passed as a query', async () => {
    const guilds = await user.get('/groups?type=guilds');
    expect(guilds.find(g => g.id === TAVERN_ID)).to.be.undefined;
  });
  it('makes sure that the tavern doesn\'t show up when publicGuilds is passed as a query', async () => {
    const guilds = await user.get('/groups?type=publicGuilds');
    expect(guilds.find(g => g.id === TAVERN_ID)).to.be.undefined;
  });
  it('returns all the user\'s guilds when guilds passed in as query', async () => {
    await expect(user.get('/groups?type=guilds'))
      .to.eventually.have.a
@@ -254,7 +265,7 @@ describe('GET /groups', () => {
  it('returns a list of groups user has access to', async () => {
    await expect(user.get('/groups?type=privateGuilds,publicGuilds,party,tavern'))
-      .to.eventually.have.lengthOf(NUMBER_OF_GROUPS_USER_CAN_VIEW);
+      .to.eventually.have.lengthOf(NUMBER_OF_GROUPS_USER_CAN_VIEW - 1); // -1 for no Tavern.
  });
  it('returns a list of groups user has access to', async () => {
--- a/test/api/v3/integration/groups/GET-groups_groupId_invites.test.js
+++ b/test/api/v3/integration/groups/GET-groups_groupId_invites.test.js
@@ -70,7 +70,7 @@ describe('GET /groups/:groupId/invites', () => {
    expect(res[0].profile).to.have.all.keys(['name']);
  });
-  it('returns only first 30 invites', async () => {
+  it('returns only first 30 invites by default (req.query.limit not specified)', async () => {
    const leader = await generateUser({ balance: 4 });
    const group = await generateGroup(leader, { type: 'guild', privacy: 'public', name: generateUUID() });
@@ -89,6 +89,65 @@ describe('GET /groups/:groupId/invites', () => {
    });
  }).timeout(10000);
  it('returns an error if req.query.limit is over 60', async () => {
    const leader = await generateUser({ balance: 4 });
    const group = await generateGroup(leader, { type: 'guild', privacy: 'public', name: generateUUID() });
    await expect(leader.get(`/groups/${group._id}/invites?limit=61`)).to.eventually.be.rejected.and.eql({
      code: 400,
      error: 'BadRequest',
      message: t('invalidReqParams'),
    });
  });
  it('returns an error if req.query.limit is under 1', async () => {
    const leader = await generateUser({ balance: 4 });
    const group = await generateGroup(leader, { type: 'guild', privacy: 'public', name: generateUUID() });
    await expect(leader.get(`/groups/${group._id}/invites?limit=-1`)).to.eventually.be.rejected.and.eql({
      code: 400,
      error: 'BadRequest',
      message: t('invalidReqParams'),
    });
  });
  it('returns an error if req.query.limit is not an integer', async () => {
    const leader = await generateUser({ balance: 4 });
    const group = await generateGroup(leader, { type: 'guild', privacy: 'public', name: generateUUID() });
    await expect(leader.get(`/groups/${group._id}/invites?limit=1.3`)).to.eventually.be.rejected.and.eql({
      code: 400,
      error: 'BadRequest',
      message: t('invalidReqParams'),
    });
  });
  it('returns up to 60 invites when req.query.limit is specified', async () => {
    const leader = await generateUser({ balance: 4 });
    const group = await generateGroup(leader, { type: 'guild', privacy: 'public', name: generateUUID() });
    const invitesToGenerate = [];
    for (let i = 0; i < 31; i += 1) {
      invitesToGenerate.push(generateUser());
    }
    const generatedInvites = await Promise.all(invitesToGenerate);
    await leader.post(`/groups/${group._id}/invite`, { uuids: generatedInvites.map(invite => invite._id) });
    let res = await leader.get(`/groups/${group._id}/invites?limit=14`);
    expect(res.length).to.equal(14);
    res.forEach(member => {
      expect(member).to.have.all.keys(['_id', 'auth', 'flags', 'id', 'profile']);
      expect(member.profile).to.have.all.keys(['name']);
    });
    res = await leader.get(`/groups/${group._id}/invites?limit=31`);
    expect(res.length).to.equal(31);
    res.forEach(member => {
      expect(member).to.have.all.keys(['_id', 'auth', 'flags', 'id', 'profile']);
      expect(member.profile).to.have.all.keys(['name']);
    });
  }).timeout(30000);
  it('supports using req.query.lastId to get more invites', async function test () {
    this.timeout(30000); // @TODO: times out after 8 seconds
    const leader = await generateUser({ balance: 4 });
--- a/test/api/v3/integration/groups/GET-groups_groupId_members.test.js
+++ b/test/api/v3/integration/groups/GET-groups_groupId_members.test.js
@@ -116,7 +116,7 @@ describe('GET /groups/:groupId/members', () => {
    expect(memberRes.inbox.messages).to.not.exist;
  });
-  it('returns only first 30 members', async () => {
+  it('returns only first 30 members by default (req.query.limit not specified)', async () => {
    const group = await generateGroup(user, { type: 'party', name: generateUUID() });
    const usersToGenerate = [];
@@ -133,6 +133,60 @@ describe('GET /groups/:groupId/members', () => {
    });
  });
  it('returns an error if req.query.limit is over 60', async () => {
    await generateGroup(user, { type: 'party', name: generateUUID() });
    await expect(user.get('/groups/party/members?limit=61')).to.eventually.be.rejected.and.eql({
      code: 400,
      error: 'BadRequest',
      message: t('invalidReqParams'),
    });
  });
  it('returns an error if req.query.limit is under 1', async () => {
    await generateGroup(user, { type: 'party', name: generateUUID() });
    await expect(user.get('/groups/party/members?limit=0')).to.eventually.be.rejected.and.eql({
      code: 400,
      error: 'BadRequest',
      message: t('invalidReqParams'),
    });
  });
  it('returns an error if req.query.limit is not an integer', async () => {
    await generateGroup(user, { type: 'party', name: generateUUID() });
    await expect(user.get('/groups/party/members?limit=1.1')).to.eventually.be.rejected.and.eql({
      code: 400,
      error: 'BadRequest',
      message: t('invalidReqParams'),
    });
  });
  it('returns up to 60 members when req.query.limit is specified', async () => {
    const group = await generateGroup(user, { type: 'party', name: generateUUID() });
    const usersToGenerate = [];
    for (let i = 0; i < 62; i += 1) {
      usersToGenerate.push(generateUser({ party: { _id: group._id } }));
    }
    await Promise.all(usersToGenerate);
    let res = await user.get('/groups/party/members?limit=60');
    expect(res.length).to.equal(60);
    res.forEach(member => {
      expect(member).to.have.all.keys(['_id', 'auth', 'flags', 'id', 'profile']);
      expect(member.profile).to.have.all.keys(['name']);
    });
    res = await user.get(`/groups/party/members?limit=60&lastId=${res[res.length - 1]._id}`);
    expect(res.length).to.equal(3);
    res.forEach(member => {
      expect(member).to.have.all.keys(['_id', 'auth', 'flags', 'id', 'profile']);
      expect(member.profile).to.have.all.keys(['name']);
    });
  }).timeout(30000);
  it('returns only first 30 members even when ?includeAllMembers=true', async () => {
    const group = await generateGroup(user, { type: 'party', name: generateUUID() });
--- a/test/api/v3/integration/groups/POST-group_remove_manager.test.js
+++ b/test/api/v3/integration/groups/POST-group_remove_manager.test.js
@@ -75,12 +75,7 @@ describe('POST /group/:groupId/remove-manager', () => {
    await nonLeader.post(`/tasks/${task._id}/assign/${nonManager._id}`);
    const memberTasks = await nonManager.get('/tasks/user');
    const syncedTask = find(memberTasks, findAssignedTask);
-    await expect(nonManager.post(`/tasks/${syncedTask._id}/score/up`))
+    await nonManager.post(`/tasks/${syncedTask._id}/score/up`);
      .to.eventually.be.rejected.and.to.eql({
        code: 401,
        error: 'NotAuthorized',
        message: t('taskApprovalHasBeenRequested'),
      });
    const updatedGroup = await leader.post(`/groups/${groupToUpdate._id}/remove-manager`, {
      managerId: nonLeader._id,
--- a/test/api/v3/integration/groups/POST-groups_groupId_join.test.js
+++ b/test/api/v3/integration/groups/POST-groups_groupId_join.test.js
@@ -203,6 +203,16 @@ describe('POST /group/:groupId/join', () => {
        await expect(invitedUser.get('/user')).to.eventually.have.nested.property('party._id', party._id);
      });
      it('Issue #12291: accepting a redundant party invite will let the user stay in the party', async () => {
        await invitedUser.update({
          'party._id': party._id,
        });
        await expect(invitedUser.get('/user')).to.eventually.have.nested.property('party._id', party._id);
        await invitedUser.post(`/groups/${party._id}/join`);
        await expect(invitedUser.get('/user')).to.eventually.have.nested.property('party._id', party._id);
      });
      it('notifies inviting user that their invitation was accepted', async () => {
        await invitedUser.post(`/groups/${party._id}/join`);
--- a/test/api/v3/integration/groups/POST-groups_groupId_leave.test.js
+++ b/test/api/v3/integration/groups/POST-groups_groupId_leave.test.js
@@ -274,6 +274,7 @@ describe('POST /groups/:groupId/leave', () => {
  each(typesOfGroups, (groupDetails, groupType) => {
    context(`Leaving a group plan when the group is a ${groupType}`, () => {
      if (groupDetails.privacy === 'public') return; // public guilds cannot be group plans
      let groupWithPlan;
      let leader;
      let member;
@@ -341,6 +342,7 @@ describe('POST /groups/:groupId/leave', () => {
  each(typesOfGroups, (groupDetails, groupType) => {
    context(`Leaving a group with extraMonths left plan when the group is a ${groupType}`, () => {
      if (groupDetails.privacy === 'public') return; // public guilds cannot be group plans
      const extraMonths = 12;
      let groupWithPlan;
      let member;
--- a/test/api/v3/integration/payments/stripe/POST-payments_stripe_checkout.test.js
+++ b/test/api/v3/integration/payments/stripe/POST-payments_stripe_checkout.test.js
@@ -32,7 +32,7 @@ describe('payments - stripe - #checkout', () => {
      stripePayments.checkout.restore();
    });
-    it('cancels a user subscription', async () => {
+    it('creates a user subscription', async () => {
      user = await generateUser({
        'profile.name': 'sender',
        'purchased.plan.customerId': 'customer-id',
@@ -48,7 +48,7 @@ describe('payments - stripe - #checkout', () => {
      expect(stripeCheckoutSubscriptionStub.args[0][0].groupId).to.eql(undefined);
    });
-    it('cancels a group subscription', async () => {
+    it('creates a group subscription', async () => {
      user = await generateUser({
        'profile.name': 'sender',
        'purchased.plan.customerId': 'customer-id',
--- a/test/api/v3/integration/tasks/GET-tasks_id.test.js
+++ b/test/api/v3/integration/tasks/GET-tasks_id.test.js
@@ -2,6 +2,8 @@ import { v4 as generateUUID } from 'uuid';
 import {
  generateUser,
  translate as t,
  createAndPopulateGroup,
  generateChallenge,
 } from '../../../../helpers/api-integration/v3';
 describe('GET /tasks/:id', () => {
@@ -11,55 +13,158 @@ describe('GET /tasks/:id', () => {
    user = await generateUser();
  });
-  context('task can be accessed', async () => {
+  context('general', () => {
-    let task;
+    context('task cannot be accessed', () => {
      it('cannot get a non-existent task', async () => {
        const dummyId = generateUUID();
-    beforeEach(async () => {
+        await expect(user.get(`/tasks/${dummyId}`)).to.eventually.be.rejected.and.eql({
-      task = await user.post('/tasks/user', {
+          code: 404,
-        text: 'test habit',
+          error: 'NotFound',
-        type: 'habit',
+          message: t('taskNotFound'),
-        alias: 'alias',
+        });
      });
    });
    it('gets specified task', async () => {
      const getTask = await user.get(`/tasks/${task._id}`);
      expect(getTask).to.eql(task);
    });
    it('can use alias to retrieve task', async () => {
      const getTask = await user.get(`/tasks/${task.alias}`);
      expect(getTask).to.eql(task);
    });
    // TODO after challenges are implemented
    it('can get active challenge task that user does not own'); // Yes?
  });
-  context('task cannot be accessed', () => {
+  context('user', () => {
-    it('cannot get a non-existent task', async () => {
+    context('task can be accessed', async () => {
-      const dummyId = generateUUID();
+      let task;
-      await expect(user.get(`/tasks/${dummyId}`)).to.eventually.be.rejected.and.eql({
+      beforeEach(async () => {
-        code: 404,
+        task = await user.post('/tasks/user', {
-        error: 'NotFound',
+          text: 'test habit',
-        message: t('taskNotFound'),
+          type: 'habit',
          alias: 'alias',
        });
      });
      it('gets specified task', async () => {
        const getTask = await user.get(`/tasks/${task._id}`);
        expect(getTask).to.eql(task);
      });
      it('can use alias to retrieve task', async () => {
        const getTask = await user.get(`/tasks/${task.alias}`);
        expect(getTask).to.eql(task);
      });
    });
-    it('cannot get a task owned by someone else', async () => {
+    context('task cannot be accessed', () => {
-      const anotherUser = await generateUser();
+      it('cannot get a task owned by someone else', async () => {
-      const task = await user.post('/tasks/user', {
+        const anotherUser = await generateUser();
        const task = await user.post('/tasks/user', {
          text: 'test habit',
          type: 'habit',
        });
        await expect(anotherUser.get(`/tasks/${task._id}`)).to.eventually.be.rejected.and.eql({
          code: 404,
          error: 'NotFound',
          message: t('taskNotFound'),
        });
      });
    });
  });
  context('challenge', () => {
    let challenge; let task; let leader; let member;
    before(async () => {
      const populatedGroup = await createAndPopulateGroup({
        members: 1,
      });
      const guild = populatedGroup.group;
      leader = populatedGroup.groupLeader;
      member = populatedGroup.members[0]; // eslint-disable-line prefer-destructuring
      challenge = await generateChallenge(leader, guild);
      await leader.post(`/challenges/${challenge._id}/join`);
      task = await leader.post(`/tasks/challenge/${challenge._id}`, {
        text: 'test habit',
        type: 'habit',
      });
    });
-      await expect(anotherUser.get(`/tasks/${task._id}`)).to.eventually.be.rejected.and.eql({
+    context('task can be accessed', async () => {
-        code: 404,
+      it('can get challenge task if member of that challenge', async () => {
-        error: 'NotFound',
+        await member.post(`/challenges/${challenge._id}/join`);
-        message: t('taskNotFound'),
+
        const getTask = await member.get(`/tasks/${task._id}`);
        expect(getTask).to.eql(task);
      });
      it('can get challenge task if leader of that challenge', async () => {
        const getTask = await leader.get(`/tasks/${task._id}`);
        expect(getTask).to.eql(task);
      });
      it('can get challenge task if admin', async () => {
        const admin = await generateUser({
          'contributor.admin': true,
        });
        const getTask = await admin.get(`/tasks/${task._id}`);
        expect(getTask).to.eql(task);
      });
    });
    context('task cannot be accessed', () => {
      it('cannot get a task in a challenge i am not part of', async () => {
        await expect(user.get(`/tasks/${task._id}`)).to.eventually.be.rejected.and.eql({
          code: 404,
          error: 'NotFound',
          message: t('taskNotFound'),
        });
      });
    });
  });
  context('group', () => {
    let group; let task; let members; let leader;
    before(async () => {
      const groupData = await createAndPopulateGroup({
        groupDetails: {
          name: 'Test Guild',
          type: 'guild',
        },
        members: 1,
      });
      group = groupData.group;
      members = groupData.members;
      leader = groupData.groupLeader;
      task = await leader.post(`/tasks/group/${group._id}`, {
        text: 'test habit',
        type: 'habit',
      });
    });
    context('task can be accessed', async () => {
      it('can get group task if leader of that group', async () => {
        const getTask = await leader.get(`/tasks/${task._id}`);
        expect(getTask).to.eql(task);
      });
      it('can get group task if member of that group', async () => {
        const getTask = await members[0].get(`/tasks/${task._id}`);
        expect(getTask).to.eql(task);
      });
    });
    context('task cannot be accessed', () => {
      it('cannot get a task in a group i am not part of', async () => {
        await expect(user.get(`/tasks/${task._id}`)).to.eventually.be.rejected.and.eql({
          code: 404,
          error: 'NotFound',
          message: t('taskNotFound'),
        });
      });
    });
  });
--- a/test/api/v3/integration/tasks/GET-tasks_user.test.js
+++ b/test/api/v3/integration/tasks/GET-tasks_user.test.js
@@ -153,40 +153,12 @@ describe('GET /tasks/user', () => {
  });
  xit('returns dailies with isDue for the date specified and will add CDS offset if time is not supplied and assumes timezones', async () => {
-    const timezone = 420;
+    const timezoneOffset = 420;
    await user.update({
      'preferences.dayStart': 0,
-      'preferences.timezoneOffset': timezone,
+      'preferences.timezoneOffset': timezoneOffset,
    });
-    const startDate = moment().zone(timezone).subtract('4', 'days').startOf('day')
+    const startDate = moment().utcOffset(-timezoneOffset).subtract('4', 'days').startOf('day')
      .toISOString();
    await user.post('/tasks/user', [
      {
        text: 'test daily',
        type: 'daily',
        startDate,
        frequency: 'daily',
        everyX: 2,
      },
    ]);
    const today = moment().format('YYYY-MM-DD');
    const dailys = await user.get(`/tasks/user?type=dailys&dueDate=${today}`);
    expect(dailys[0].isDue).to.be.true;
    const yesterday = moment().subtract('1', 'days').format('YYYY-MM-DD');
    const dailys2 = await user.get(`/tasks/user?type=dailys&dueDate=${yesterday}`);
    expect(dailys2[0].isDue).to.be.false;
  });
  xit('returns dailies with isDue for the date specified and will add CDS offset if time is not supplied and assumes timezones', async () => {
    const timezone = 240;
    await user.update({
      'preferences.dayStart': 0,
      'preferences.timezoneOffset': timezone,
    });
    const startDate = moment().zone(timezone).subtract('4', 'days').startOf('day')
      .toISOString();
    await user.post('/tasks/user', [
      {
@@ -208,12 +180,39 @@ describe('GET /tasks/user', () => {
  });
  xit('returns dailies with isDue for the date specified and will add CDS offset if time is not supplied and assumes timezones', async () => {
-    const timezone = 540;
+    const timezoneOffset = 240;
    await user.update({
      'preferences.dayStart': 0,
-      'preferences.timezoneOffset': timezone,
+      'preferences.timezoneOffset': timezoneOffset,
    });
-    const startDate = moment().zone(timezone).subtract('4', 'days').startOf('day')
+    const startDate = moment().utcOffset(-timezoneOffset).subtract('4', 'days').startOf('day')
      .toISOString();
    await user.post('/tasks/user', [
      {
        text: 'test daily',
        type: 'daily',
        startDate,
        frequency: 'daily',
        everyX: 2,
      },
    ]);
    const today = moment().format('YYYY-MM-DD');
    const dailys = await user.get(`/tasks/user?type=dailys&dueDate=${today}`);
    expect(dailys[0].isDue).to.be.true;
    const yesterday = moment().subtract('1', 'days').format('YYYY-MM-DD');
    const dailys2 = await user.get(`/tasks/user?type=dailys&dueDate=${yesterday}`);
    expect(dailys2[0].isDue).to.be.false;
  });
  xit('returns dailies with isDue for the date specified and will add CDS offset if time is not supplied and assumes timezones', async () => {
    const timezoneOffset = 540;
    await user.update({
      'preferences.dayStart': 0,
      'preferences.timezoneOffset': timezoneOffset,
    });
    const startDate = moment().utcOffset(-timezoneOffset).subtract('4', 'days').startOf('day')
      .toISOString();
    await user.post('/tasks/user', [
      {
--- a/test/api/v3/integration/tasks/POST-tasks_id_score_direction.test.js
+++ b/test/api/v3/integration/tasks/POST-tasks_id_score_direction.test.js
@@ -1,4 +1,5 @@
 import { v4 as generateUUID } from 'uuid';
 import apiError from '../../../../../website/server/libs/apiError';
 import {
  generateUser,
  sleep,
@@ -44,7 +45,7 @@ describe('POST /tasks/:id/score/:direction', () => {
      await expect(user.post(`/tasks/${generateUUID()}/score/tt`)).to.eventually.be.rejected.and.eql({
        code: 400,
        error: 'BadRequest',
-        message: t('invalidReqParams'),
+        message: apiError('directionUpDown'),
      });
    });
@@ -261,6 +262,7 @@ describe('POST /tasks/:id/score/:direction', () => {
      const task = await user.get(`/tasks/${daily._id}`);
      expect(task.completed).to.equal(true);
      expect(task.value).to.be.greaterThan(daily.value);
    });
    it('uncompletes daily when direction is down', async () => {
--- a/test/api/v3/integration/tasks/POST-tasks_user.test.js
+++ b/test/api/v3/integration/tasks/POST-tasks_user.test.js
@@ -687,7 +687,6 @@ describe('POST /tasks/user', () => {
      });
    });
    it('can create checklists', async () => {
      const task = await user.post('/tasks/user', {
        text: 'test daily',
--- a/test/api/v3/integration/tasks/PUT-tasks_id.test.js
+++ b/test/api/v3/integration/tasks/PUT-tasks_id.test.js
@@ -499,6 +499,45 @@ describe('PUT /tasks/:id', () => {
    });
  });
  context('monthly dailys', () => {
    let monthly;
    beforeEach(async () => {
      const date1 = moment.utc('2020-07-01').toDate();
      monthly = await user.post('/tasks/user', {
        text: 'test monthly',
        type: 'daily',
        frequency: 'monthly',
        startDate: date1,
        daysOfMonth: [date1.getDate()],
      });
    });
    it('updates days of month when start date updated', async () => {
      const date2 = moment.utc('2020-07-01').toDate();
      const savedMonthly = await user.put(`/tasks/${monthly._id}`, {
        startDate: date2,
      });
      expect(savedMonthly.daysOfMonth).to.deep.equal([moment(date2).date()]);
    });
    it('updates next due when start date updated', async () => {
      const date2 = moment.utc('2022-07-01').toDate();
      const savedMonthly = await user.put(`/tasks/${monthly._id}`, {
        startDate: date2,
      });
      expect(savedMonthly.nextDue.length).to.eql(6);
      expect(moment(savedMonthly.nextDue[0]).toDate()).to.eql(moment.utc('2022-08-01').toDate());
      expect(moment(savedMonthly.nextDue[1]).toDate()).to.eql(moment.utc('2022-09-01').toDate());
      expect(moment(savedMonthly.nextDue[2]).toDate()).to.eql(moment.utc('2022-10-01').toDate());
      expect(moment(savedMonthly.nextDue[3]).toDate()).to.eql(moment.utc('2022-11-01').toDate());
      expect(moment(savedMonthly.nextDue[4]).toDate()).to.eql(moment.utc('2022-12-01').toDate());
      expect(moment(savedMonthly.nextDue[5]).toDate()).to.eql(moment.utc('2023-01-01').toDate());
    });
  });
  context('rewards', () => {
    let reward;
--- a/test/api/v3/integration/tasks/groups/DELETE-group_tasks_id.test.js
+++ b/test/api/v3/integration/tasks/groups/DELETE-group_tasks_id.test.js
@@ -73,12 +73,7 @@ describe('Groups DELETE /tasks/:id', () => {
    });
    const memberTasks = await member.get('/tasks/user');
    const syncedTask = find(memberTasks, findAssignedTask);
-    await expect(member.post(`/tasks/${syncedTask._id}/score/up`))
+    await member.post(`/tasks/${syncedTask._id}/score/up`);
      .to.eventually.be.rejected.and.to.eql({
        code: 401,
        error: 'NotAuthorized',
        message: t('taskApprovalHasBeenRequested'),
      });
    await user.sync();
    await member2.sync();
@@ -96,16 +91,16 @@ describe('Groups DELETE /tasks/:id', () => {
    expect(member2.notifications.length).to.equal(1);
  });
-  it('unlinks assigned user', async () => {
+  it('deletes task from assigned user', async () => {
    await user.del(`/tasks/${task._id}`);
    const memberTasks = await member.get('/tasks/user');
    const syncedTask = find(memberTasks, findAssignedTask);
-    expect(syncedTask.group.broken).to.equal('TASK_DELETED');
+    expect(syncedTask).to.not.exist;
  });
-  it('unlinks all assigned users', async () => {
+  it('deletes task from all assigned users', async () => {
    await user.del(`/tasks/${task._id}`);
    const memberTasks = await member.get('/tasks/user');
@@ -114,8 +109,8 @@ describe('Groups DELETE /tasks/:id', () => {
    const member2Tasks = await member2.get('/tasks/user');
    const member2SyncedTask = find(member2Tasks, findAssignedTask);
-    expect(syncedTask.group.broken).to.equal('TASK_DELETED');
+    expect(syncedTask).to.not.exist;
-    expect(member2SyncedTask.group.broken).to.equal('TASK_DELETED');
+    expect(member2SyncedTask).to.not.exist;
  });
  it('prevents a user from deleting a task they are assigned to', async () => {
@@ -130,22 +125,6 @@ describe('Groups DELETE /tasks/:id', () => {
      });
  });
  it('allows a user to delete a broken task', async () => {
    const memberTasks = await member.get('/tasks/user');
    const syncedTask = find(memberTasks, findAssignedTask);
    await user.del(`/tasks/${task._id}`);
    await member.del(`/tasks/${syncedTask._id}`);
    await expect(member.get(`/tasks/${syncedTask._id}`))
      .to.eventually.be.rejected.and.eql({
        code: 404,
        error: 'NotFound',
        message: 'Task not found.',
      });
  });
  it('allows a user to delete a task after leaving a group', async () => {
    const memberTasks = await member.get('/tasks/user');
    const syncedTask = find(memberTasks, findAssignedTask);
--- a/test/api/v3/integration/tasks/groups/POST-group_tasks_id_approve_userId.test.js
+++ b/test/api/v3/integration/tasks/groups/POST-group_tasks_id_approve_userId.test.js
@@ -58,22 +58,14 @@ describe('POST /tasks/:id/approve/:userId', () => {
    let memberTasks = await member.get('/tasks/user');
    let syncedTask = find(memberTasks, findAssignedTask);
-    await expect(member.post(`/tasks/${syncedTask._id}/score/up`))
+    await member.post(`/tasks/${syncedTask._id}/score/up`);
      .to.eventually.be.rejected.and.to.eql({
        code: 401,
        error: 'NotAuthorized',
        message: t('taskApprovalHasBeenRequested'),
      });
    await user.post(`/tasks/${task._id}/approve/${member._id}`);
    await member.sync();
-    expect(member.notifications.length).to.equal(3);
+    expect(member.notifications.length).to.equal(2);
    expect(member.notifications[1].type).to.equal('GROUP_TASK_APPROVED');
    expect(member.notifications[1].data.message).to.equal(t('yourTaskHasBeenApproved', { taskText: task.text }));
    expect(member.notifications[2].type).to.equal('SCORED_TASK');
    expect(member.notifications[2].data.message).to.equal(t('yourTaskHasBeenApproved', { taskText: task.text }));
    memberTasks = await member.get('/tasks/user');
    syncedTask = find(memberTasks, findAssignedTask);
@@ -93,21 +85,13 @@ describe('POST /tasks/:id/approve/:userId', () => {
    let memberTasks = await member.get('/tasks/user');
    let syncedTask = find(memberTasks, findAssignedTask);
-    await expect(member.post(`/tasks/${syncedTask._id}/score/up`))
+    await member.post(`/tasks/${syncedTask._id}/score/up`);
      .to.eventually.be.rejected.and.to.eql({
        code: 401,
        error: 'NotAuthorized',
        message: t('taskApprovalHasBeenRequested'),
      });
    await member2.post(`/tasks/${task._id}/approve/${member._id}`);
    await member.sync();
-    expect(member.notifications.length).to.equal(3);
+    expect(member.notifications.length).to.equal(2);
    expect(member.notifications[1].type).to.equal('GROUP_TASK_APPROVED');
    expect(member.notifications[1].data.message).to.equal(t('yourTaskHasBeenApproved', { taskText: task.text }));
    expect(member.notifications[2].type).to.equal('SCORED_TASK');
    expect(member.notifications[2].data.message).to.equal(t('yourTaskHasBeenApproved', { taskText: task.text }));
    memberTasks = await member.get('/tasks/user');
    syncedTask = find(memberTasks, findAssignedTask);
@@ -125,12 +109,7 @@ describe('POST /tasks/:id/approve/:userId', () => {
    await member2.post(`/tasks/${task._id}/assign/${member._id}`);
    const memberTasks = await member.get('/tasks/user');
    const syncedTask = find(memberTasks, findAssignedTask);
-    await expect(member.post(`/tasks/${syncedTask._id}/score/up`))
+    await member.post(`/tasks/${syncedTask._id}/score/up`);
      .to.eventually.be.rejected.and.to.eql({
        code: 401,
        error: 'NotAuthorized',
        message: t('taskApprovalHasBeenRequested'),
      });
    await user.sync();
    await member2.sync();
@@ -157,14 +136,9 @@ describe('POST /tasks/:id/approve/:userId', () => {
    const memberTasks = await member.get('/tasks/user');
    const syncedTask = find(memberTasks, findAssignedTask);
-    await expect(member.post(`/tasks/${syncedTask._id}/score/up`))
+    await member.post(`/tasks/${syncedTask._id}/score/up`);
      .to.eventually.be.rejected.and.to.eql({
        code: 401,
        error: 'NotAuthorized',
        message: t('taskApprovalHasBeenRequested'),
      });
    await member2.post(`/tasks/${task._id}/approve/${member._id}`);
    await expect(user.post(`/tasks/${task._id}/approve/${member._id}`))
      .to.eventually.be.rejected.and.to.eql({
        code: 401,
@@ -197,13 +171,7 @@ describe('POST /tasks/:id/approve/:userId', () => {
    const memberTasks = await member.get('/tasks/user');
    const syncedTask = find(memberTasks, findAssignedTask);
-    await expect(member.post(`/tasks/${syncedTask._id}/score/up`))
+    await member.post(`/tasks/${syncedTask._id}/score/up`);
      .to.eventually.be.rejected.and.to.eql({
        code: 401,
        error: 'NotAuthorized',
        message: t('taskApprovalHasBeenRequested'),
      });
    await user.post(`/tasks/${sharedCompletionTask._id}/approve/${member._id}`);
    const groupTasks = await user.get(`/tasks/group/${guild._id}?type=completedTodos`);
@@ -226,13 +194,7 @@ describe('POST /tasks/:id/approve/:userId', () => {
    const memberTasks = await member.get('/tasks/user');
    const syncedTask = find(memberTasks, findAssignedTask);
-    await expect(member.post(`/tasks/${syncedTask._id}/score/up`))
+    await member.post(`/tasks/${syncedTask._id}/score/up`);
      .to.eventually.be.rejected.and.to.eql({
        code: 401,
        error: 'NotAuthorized',
        message: t('taskApprovalHasBeenRequested'),
      });
    await user.post(`/tasks/${sharedCompletionTask._id}/approve/${member._id}`);
    const member2Tasks = await member2.get('/tasks/user');
@@ -258,13 +220,7 @@ describe('POST /tasks/:id/approve/:userId', () => {
    const memberTasks = await member.get('/tasks/user');
    const syncedTask = find(memberTasks, findAssignedTask);
-    await expect(member.post(`/tasks/${syncedTask._id}/score/up`))
+    await member.post(`/tasks/${syncedTask._id}/score/up`);
      .to.eventually.be.rejected.and.to.eql({
        code: 401,
        error: 'NotAuthorized',
        message: t('taskApprovalHasBeenRequested'),
      });
    await user.post(`/tasks/${sharedCompletionTask._id}/approve/${member._id}`);
    const groupTasks = await user.get(`/tasks/group/${guild._id}`);
@@ -287,21 +243,10 @@ describe('POST /tasks/:id/approve/:userId', () => {
    const memberTasks = await member.get('/tasks/user');
    const syncedTask = find(memberTasks, findAssignedTask);
-    await expect(member.post(`/tasks/${syncedTask._id}/score/up`))
+    await member.post(`/tasks/${syncedTask._id}/score/up`);
      .to.eventually.be.rejected.and.to.eql({
        code: 401,
        error: 'NotAuthorized',
        message: t('taskApprovalHasBeenRequested'),
      });
    const member2Tasks = await member2.get('/tasks/user');
    const member2SyncedTask = find(member2Tasks, findAssignedTask);
-    await expect(member2.post(`/tasks/${member2SyncedTask._id}/score/up`))
+    await member2.post(`/tasks/${member2SyncedTask._id}/score/up`);
      .to.eventually.be.rejected.and.to.eql({
        code: 401,
        error: 'NotAuthorized',
        message: t('taskApprovalHasBeenRequested'),
      });
    await user.post(`/tasks/${sharedCompletionTask._id}/approve/${member._id}`);
    await user.post(`/tasks/${sharedCompletionTask._id}/approve/${member2._id}`);
--- a/test/api/v3/integration/tasks/groups/POST-group_tasks_id_needs-work_userId.test.js
+++ b/test/api/v3/integration/tasks/groups/POST-group_tasks_id_needs-work_userId.test.js
@@ -61,13 +61,7 @@ describe('POST /tasks/:id/needs-work/:userId', () => {
    let syncedTask = find(memberTasks, findAssignedTask);
    // score task to require approval
-    await expect(member.post(`/tasks/${syncedTask._id}/score/up`))
+    await member.post(`/tasks/${syncedTask._id}/score/up`);
      .to.eventually.be.rejected.and.to.eql({
        code: 401,
        error: 'NotAuthorized',
        message: t('taskApprovalHasBeenRequested'),
      });
    await user.post(`/tasks/${task._id}/needs-work/${member._id}`);
    [memberTasks] = await Promise.all([member.get('/tasks/user'), member.sync()]);
@@ -114,12 +108,7 @@ describe('POST /tasks/:id/needs-work/:userId', () => {
    let syncedTask = find(memberTasks, findAssignedTask);
    // score task to require approval
-    await expect(member.post(`/tasks/${syncedTask._id}/score/up`))
+    await member.post(`/tasks/${syncedTask._id}/score/up`);
      .to.eventually.be.rejected.and.to.eql({
        code: 401,
        error: 'NotAuthorized',
        message: t('taskApprovalHasBeenRequested'),
      });
    const initialNotifications = member.notifications.length;
@@ -172,13 +161,7 @@ describe('POST /tasks/:id/needs-work/:userId', () => {
    const memberTasks = await member.get('/tasks/user');
    const syncedTask = find(memberTasks, findAssignedTask);
-    await expect(member.post(`/tasks/${syncedTask._id}/score/up`))
+    await member.post(`/tasks/${syncedTask._id}/score/up`);
      .to.eventually.be.rejected.and.to.eql({
        code: 401,
        error: 'NotAuthorized',
        message: t('taskApprovalHasBeenRequested'),
      });
    await member2.post(`/tasks/${task._id}/approve/${member._id}`);
    await expect(user.post(`/tasks/${task._id}/needs-work/${member._id}`))
      .to.eventually.be.rejected.and.to.eql({
--- a/test/api/v3/integration/tasks/groups/POST-group_tasks_id_score_direction.test.js
+++ b/test/api/v3/integration/tasks/groups/POST-group_tasks_id_score_direction.test.js
@@ -44,12 +44,11 @@ describe('POST /tasks/:id/score/:direction', () => {
    const syncedTask = find(memberTasks, findAssignedTask);
    const direction = 'up';
-    await expect(member.post(`/tasks/${syncedTask._id}/score/${direction}`))
+    const response = await member.post(`/tasks/${syncedTask._id}/score/${direction}`);
-      .to.eventually.be.rejected.and.to.eql({
+
-        code: 401,
+    expect(response.data.requiresApproval).to.equal(true);
-        error: 'NotAuthorized',
+    expect(response.message).to.equal(t('taskApprovalHasBeenRequested'));
-        message: t('taskApprovalHasBeenRequested'),
+
      });
    const updatedTask = await member.get(`/tasks/${syncedTask._id}`);
    await user.sync();
@@ -76,12 +75,7 @@ describe('POST /tasks/:id/score/:direction', () => {
    const syncedTask = find(memberTasks, findAssignedTask);
    const direction = 'up';
-    await expect(member.post(`/tasks/${syncedTask._id}/score/${direction}`))
+    await member.post(`/tasks/${syncedTask._id}/score/${direction}`);
      .to.eventually.be.rejected.and.to.eql({
        code: 401,
        error: 'NotAuthorized',
        message: t('taskApprovalHasBeenRequested'),
      });
    const updatedTask = await member.get(`/tasks/${syncedTask._id}`);
    await user.sync();
    await member2.sync();
@@ -111,31 +105,18 @@ describe('POST /tasks/:id/score/:direction', () => {
    const memberTasks = await member.get('/tasks/user');
    const syncedTask = find(memberTasks, findAssignedTask);
-    await expect(member.post(`/tasks/${syncedTask._id}/score/up`))
+    await member.post(`/tasks/${syncedTask._id}/score/up`);
      .to.eventually.be.rejected.and.to.eql({
        code: 401,
        error: 'NotAuthorized',
        message: t('taskApprovalHasBeenRequested'),
      });
-    await expect(member.post(`/tasks/${syncedTask._id}/score/up`))
+    const response = await member.post(`/tasks/${syncedTask._id}/score/up`);
-      .to.eventually.be.rejected.and.eql({
+    expect(response.data.requiresApproval).to.equal(true);
-        code: 401,
+    expect(response.message).to.equal(t('taskRequiresApproval'));
        error: 'NotAuthorized',
        message: t('taskRequiresApproval'),
      });
  });
  it('allows a user to score an approved task', async () => {
    const memberTasks = await member.get('/tasks/user');
    const syncedTask = find(memberTasks, findAssignedTask);
-    await expect(member.post(`/tasks/${syncedTask._id}/score/up`))
+    await member.post(`/tasks/${syncedTask._id}/score/up`);
      .to.eventually.be.rejected.and.to.eql({
        code: 401,
        error: 'NotAuthorized',
        message: t('taskApprovalHasBeenRequested'),
      });
    await user.post(`/tasks/${task._id}/approve/${member._id}`);
--- a/test/api/v3/integration/tasks/groups/PUT-group_task_id.test.js
+++ b/test/api/v3/integration/tasks/groups/PUT-group_task_id.test.js
@@ -4,8 +4,12 @@ import {
 } from '../../../../../helpers/api-integration/v3';
 describe('PUT /tasks/:id', () => {
-  let user; let guild; let member; let member2; let
+  let user;
-    task;
+  let guild;
  let member;
  let member2;
  let habit;
  let todo;
  function findAssignedTask (memberTask) {
    return memberTask.group.id === guild._id;
@@ -25,7 +29,7 @@ describe('PUT /tasks/:id', () => {
    member = members[0]; // eslint-disable-line prefer-destructuring
    member2 = members[1]; // eslint-disable-line prefer-destructuring
-    task = await user.post(`/tasks/group/${guild._id}`, {
+    habit = await user.post(`/tasks/group/${guild._id}`, {
      text: 'test habit',
      type: 'habit',
      up: false,
@@ -33,12 +37,18 @@ describe('PUT /tasks/:id', () => {
      notes: 1976,
    });
-    await user.post(`/tasks/${task._id}/assign/${member._id}`);
+    todo = await user.post(`/tasks/group/${guild._id}`, {
-    await user.post(`/tasks/${task._id}/assign/${member2._id}`);
+      text: 'test todo',
      type: 'todo',
      notes: 1976,
    });
    await user.post(`/tasks/${habit._id}/assign/${member._id}`);
    await user.post(`/tasks/${habit._id}/assign/${member2._id}`);
  });
  it('updates a group task', async () => {
-    const savedHabit = await user.put(`/tasks/${task._id}`, {
+    const savedHabit = await user.put(`/tasks/${habit._id}`, {
      notes: 'some new notes',
    });
@@ -51,27 +61,55 @@ describe('PUT /tasks/:id', () => {
      managerId: member._id,
    });
-    // change the todo
+    // change the habit
-    task = await member.put(`/tasks/${task._id}`, {
+    habit = await member.put(`/tasks/${habit._id}`, {
      text: 'new text!',
      requiresApproval: true,
    });
    const memberTasks = await member2.get('/tasks/user');
-    const syncedTask = find(memberTasks, memberTask => memberTask.group.taskId === task._id);
+    const syncedTask = find(memberTasks, memberTask => memberTask.group.taskId === habit._id);
    // score up to trigger approval
-    await expect(member2.post(`/tasks/${syncedTask._id}/score/up`))
+    const response = await member2.post(`/tasks/${syncedTask._id}/score/up`);
-      .to.eventually.be.rejected.and.to.eql({
+
-        code: 401,
+    expect(response.data.requiresApproval).to.equal(true);
-        error: 'NotAuthorized',
+    expect(response.message).to.equal(t('taskApprovalHasBeenRequested'));
-        message: t('taskApprovalHasBeenRequested'),
+  });
-      });
+
  it('member updates a group task value - not allowed', async () => {
    // change the todo
    await expect(member.put(`/tasks/${habit._id}`, {
      text: 'new text!',
    })).to.eventually.be.rejected.and.to.eql({
      code: 401,
      error: 'NotAuthorized',
      message: t('onlyGroupLeaderCanEditTasks'),
    });
  });
  it('member updates the collapseChecklist property - change is allowed', async () => {
    // change the todo
    await member.put(`/tasks/${todo._id}`, {
      collapseChecklist: true,
    });
  });
  it('member updates the collapseChecklist and another property - change not allowed', async () => {
    // change the todo
    await expect(member.put(`/tasks/${todo._id}`, {
      collapseChecklist: true,
      title: 'test',
    })).to.eventually.be.rejected.and.to.eql({
      code: 401,
      error: 'NotAuthorized',
      message: t('onlyGroupLeaderCanEditTasks'),
    });
  });
  it('updates a group task with checklist', async () => {
    // add a new todo
-    task = await user.post(`/tasks/group/${guild._id}`, {
+    habit = await user.post(`/tasks/group/${guild._id}`, {
      text: 'todo',
      type: 'todo',
      checklist: [
@@ -81,13 +119,13 @@ describe('PUT /tasks/:id', () => {
      ],
    });
-    await user.post(`/tasks/${task._id}/assign/${member._id}`);
+    await user.post(`/tasks/${habit._id}/assign/${member._id}`);
    // change the checklist text
-    task = await user.put(`/tasks/${task._id}`, {
+    habit = await user.put(`/tasks/${habit._id}`, {
      checklist: [
        {
-          id: task.checklist[0].id,
+          id: habit.checklist[0].id,
          text: 'checklist 1 - edit',
        },
        {
@@ -96,18 +134,17 @@ describe('PUT /tasks/:id', () => {
      ],
    });
-    expect(task.checklist.length).to.eql(2);
+    expect(habit.checklist.length).to.eql(2);
  });
  it('updates the linked tasks', async () => {
-    await user.put(`/tasks/${task._id}`, {
+    await user.put(`/tasks/${habit._id}`, {
      text: 'some new text',
      up: false,
      down: false,
      notes: 'some new notes',
    });
    const memberTasks = await member.get('/tasks/user');
    const syncedTask = find(memberTasks, findAssignedTask);
@@ -117,7 +154,7 @@ describe('PUT /tasks/:id', () => {
  });
  it('updates the linked tasks for all assigned users', async () => {
-    await user.put(`/tasks/${task._id}`, {
+    await user.put(`/tasks/${habit._id}`, {
      text: 'some new text',
      up: false,
      down: false,
@@ -144,14 +181,13 @@ describe('PUT /tasks/:id', () => {
      managerId: member2._id,
    });
-    await member2.put(`/tasks/${task._id}`, {
+    await member2.put(`/tasks/${habit._id}`, {
      text: 'some new text',
      up: false,
      down: false,
      notes: 'some new notes',
    });
    const memberTasks = await member.get('/tasks/user');
    const syncedTask = find(memberTasks, findAssignedTask);
--- a/test/api/v3/integration/user/POST-user_class_cast_spellId.test.js
+++ b/test/api/v3/integration/user/POST-user_class_cast_spellId.test.js
@@ -1,4 +1,3 @@
 import { v4 as generateUUID } from 'uuid';
 import { find } from 'lodash';
 import {
@@ -162,6 +161,23 @@ describe('POST /user/class/cast/:spellId', () => {
      });
  });
  it('Issue #12361: returns an error if stealth has already been cast', async () => {
    await user.update({
      'stats.class': 'rogue',
      'stats.lvl': 15,
      'stats.mp': 400,
      'stats.buffs.stealth': 1,
    });
    await user.sync();
    await expect(user.post('/user/class/cast/stealth'))
      .to.eventually.be.rejected.and.eql({
        code: 400,
        error: 'BadRequest',
        message: t('spellAlreadyCast'),
      });
    expect(user.stats.mp).to.equal(400);
  });
  it('returns an error if targeted party member doesn\'t exist', async () => {
    const { groupLeader } = await createAndPopulateGroup({
      groupDetails: { type: 'party', privacy: 'private' },
@@ -325,7 +341,6 @@ describe('POST /user/class/cast/:spellId', () => {
    expect(result.user.stats.mp).to.equal(10);
  });
  // TODO find a way to have sinon working in integration tests
  // it doesn't work when tests are running separately from server
  it('passes correct target to spell when targetType === \'tasks\'');
--- a/test/api/v3/integration/user/POST-user_feed_pet_food.test.js
+++ b/test/api/v3/integration/user/POST-user_feed_pet_food.test.js
@@ -41,6 +41,29 @@ describe('POST /user/feed/:pet/:food', () => {
    expect(user.items.pets['Wolf-Base']).to.equal(7);
  });
  it('bulk feeding pet with non-preferred food', async () => {
    await user.update({
      'items.pets.Wolf-Base': 5,
      'items.food.Milk': 3,
    });
    const food = content.food.Milk;
    const pet = content.petInfo['Wolf-Base'];
    const res = await user.post('/user/feed/Wolf-Base/Milk?amount=2');
    await user.sync();
    expect(res).to.eql({
      data: user.items.pets['Wolf-Base'],
      message: t('messageDontEnjoyFood', {
        egg: pet.text(),
        foodText: food.textThe(),
      }),
    });
    expect(user.items.food.Milk).to.eql(1);
    expect(user.items.pets['Wolf-Base']).to.equal(9);
  });
  context('sending user activity webhooks', () => {
    before(async () => {
      await server.start();
@@ -77,5 +100,33 @@ describe('POST /user/feed/:pet/:food', () => {
      expect(body.pet).to.eql('Wolf-Base');
      expect(body.message).to.eql(res.message);
    });
    it('sends user activity webhook (mount raised after full bulk feeding)', async () => {
      const uuid = generateUUID();
      await user.post('/user/webhook', {
        url: `http://localhost:${server.port}/webhooks/${uuid}`,
        type: 'userActivity',
        enabled: true,
        options: {
          mountRaised: true,
        },
      });
      await user.update({
        'items.pets.Wolf-Base': 47,
        'items.food.Milk': 3,
      });
      const res = await user.post('/user/feed/Wolf-Base/Milk?amount=2');
      await sleep();
      const body = server.getWebhookData(uuid);
      expect(user.achievements.allYourBase).to.not.equal(true);
      expect(body.type).to.eql('mountRaised');
      expect(body.pet).to.eql('Wolf-Base');
      expect(body.message).to.eql(res.message);
    });
  });
 });
--- a/test/api/v3/integration/user/PUT-user.test.js
+++ b/test/api/v3/integration/user/PUT-user.test.js
@@ -4,7 +4,6 @@ import {
  translate as t,
 } from '../../../../helpers/api-integration/v3';
 describe('PUT /user', () => {
  let user;
@@ -53,7 +52,6 @@ describe('PUT /user', () => {
      expect(user.tags.length).to.be.eql(userTags.length + 1);
    });
    it('validates profile.name', async () => {
      await expect(user.put('/user', {
        'profile.name': ' ', // string should be trimmed
@@ -94,6 +92,14 @@ describe('PUT /user', () => {
        error: 'BadRequest',
        message: t('displaynameIssueSlur'),
      });
      await expect(user.put('/user', {
        'profile.name': 'namecontainsnewline\n',
      })).to.eventually.be.rejected.and.eql({
        code: 400,
        error: 'BadRequest',
        message: t('displaynameIssueNewline'),
      });
    });
  });
--- a/test/api/v3/integration/user/auth/POST-login-local.test.js
+++ b/test/api/v3/integration/user/auth/POST-login-local.test.js
@@ -10,7 +10,6 @@ import {
  sha1Encrypt as sha1EncryptPassword,
 } from '../../../../../../website/server/libs/password';
 describe('POST /user/auth/local/login', () => {
  let api;
  let user;
--- a/test/api/v3/integration/user/auth/PUT-user_update_email.test.js
+++ b/test/api/v3/integration/user/auth/PUT-user_update_email.test.js
@@ -9,7 +9,6 @@ import {
  sha1Encrypt as sha1EncryptPassword,
 } from '../../../../../../website/server/libs/password';
 const ENDPOINT = '/user/auth/update-email';
 describe('PUT /user/auth/update-email', () => {
--- a/test/api/v3/integration/webhook/PUT-user_update_webhook.test.js
+++ b/test/api/v3/integration/webhook/PUT-user_update_webhook.test.js
@@ -127,19 +127,26 @@ describe('PUT /user/webhook/:id', () => {
  it('can update taskActivity options', async () => {
    const type = 'taskActivity';
    const options = {
      checklistScored: true,
      updated: false,
-      deleted: true,
+      scored: false,
    };
-
+    const expected = {
-    const webhook = await user.put(`/user/webhook/${webhookToUpdate.id}`, { type, options });
+      checklistScored: true,
    expect(webhook.options).to.eql({
      checklistScored: false, // starting value
      created: true, // starting value
      updated: false,
-      deleted: true,
+      deleted: false, // starting value
-      scored: true, // default value
+      scored: false,
-    });
+    };
    const returnedWebhook = await user.put(`/user/webhook/${webhookToUpdate.id}`, { type, options });
    await user.sync();
    const savedWebhook = user.webhooks.find(hook => webhookToUpdate.id === hook.id);
    expect(returnedWebhook.options).to.eql(expected);
    expect(savedWebhook.options).to.eql(expected);
  });
  it('errors if taskActivity option is not a boolean', async () => {
--- a/test/api/v4/tasks/POST-tasks-bulk-score.test.js
+++ b/test/api/v4/tasks/POST-tasks-bulk-score.test.js
@@ -0,0 +1,583 @@
 import { v4 as generateUUID } from 'uuid';
 import {
  generateUser,
  sleep,
  translate as t,
  server,
 } from '../../../helpers/api-integration/v4';
 describe('POST /tasks/bulk-score', () => {
  let user;
  beforeEach(async () => {
    user = await generateUser({
      'stats.gp': 100,
    });
  });
  context('all', () => {
    it('can use id to identify the task', async () => {
      const todo = await user.post('/tasks/user', {
        text: 'test todo',
        type: 'todo',
        alias: 'alias',
      });
      const res = await user.post('/tasks/bulk-score', [{ id: todo.id, direction: 'up' }]);
      expect(res).to.be.ok;
      expect(res.tasks.length).to.equal(1);
      expect(res.tasks[0].id).to.equal(todo._id);
      expect(res.tasks[0].delta).to.be.greaterThan(0);
    });
    it('can use a alias in place of the id', async () => {
      const todo = await user.post('/tasks/user', {
        text: 'test todo',
        type: 'todo',
        alias: 'alias',
      });
      const res = await user.post('/tasks/bulk-score', [{ id: todo.alias, direction: 'up' }]);
      expect(res).to.be.ok;
      expect(res.tasks.length).to.equal(1);
      expect(res.tasks[0].id).to.equal(todo._id);
      expect(res.tasks[0].delta).to.be.greaterThan(0);
    });
    it('sends task scored webhooks', async () => {
      const uuid = generateUUID();
      await server.start();
      await user.post('/user/webhook', {
        url: `http://localhost:${server.port}/webhooks/${uuid}`,
        type: 'taskActivity',
        enabled: true,
        options: {
          created: false,
          scored: true,
        },
      });
      const task = await user.post('/tasks/user', {
        text: 'test habit',
        type: 'habit',
      });
      await user.post('/tasks/bulk-score', [{ id: task.id, direction: 'up' }]);
      await sleep();
      await server.close();
      const body = server.getWebhookData(uuid);
      expect(body.user).to.have.all.keys('_id', '_tmp', 'stats');
      expect(body.user.stats).to.have.all.keys('hp', 'mp', 'exp', 'gp', 'lvl', 'class', 'points', 'str', 'con', 'int', 'per', 'buffs', 'training', 'maxHealth', 'maxMP', 'toNextLevel');
      expect(body.task.id).to.eql(task.id);
      expect(body.direction).to.eql('up');
      expect(body.delta).to.be.greaterThan(0);
    });
    context('sending user activity webhooks', () => {
      before(async () => {
        await server.start();
      });
      after(async () => {
        await server.close();
      });
      it('sends user activity webhook when the user levels up', async () => {
        const uuid = generateUUID();
        await user.post('/user/webhook', {
          url: `http://localhost:${server.port}/webhooks/${uuid}`,
          type: 'userActivity',
          enabled: true,
          options: {
            leveledUp: true,
          },
        });
        const initialLvl = user.stats.lvl;
        await user.update({
          'stats.exp': 3000,
        });
        const task = await user.post('/tasks/user', {
          text: 'test habit',
          type: 'habit',
        });
        await user.post('/tasks/bulk-score', [{ id: task.id, direction: 'up' }]);
        await user.sync();
        await sleep();
        const body = server.getWebhookData(uuid);
        expect(body.type).to.eql('leveledUp');
        expect(body.initialLvl).to.eql(initialLvl);
        expect(body.finalLvl).to.eql(user.stats.lvl);
      });
    });
    it('fails the entire op if one task scoring fails', async () => {
      const todo = await user.post('/tasks/user', {
        text: 'test todo',
        type: 'todo',
      });
      const habit = await user.post('/tasks/user', {
        text: 'test habit',
        type: 'habit',
      });
      await expect(user.post('/tasks/bulk-score', [
        { id: todo.id, direction: 'down' },
        { id: habit.id, direction: 'down' },
      ])).to.eventually.be.rejected.and.eql({
        code: 401,
        error: 'NotAuthorized',
        message: t('sessionOutdated'),
      });
      const updatedHabit = await user.get(`/tasks/${habit._id}`);
      expect(updatedHabit.history.length).to.equal(0);
      expect(updatedHabit.value).to.equal(0);
      const updatedTodo = await user.get(`/tasks/${todo._id}`);
      expect(updatedTodo.value).to.equal(0);
    });
    it('sends _tmp for each task', async () => {
      const habit1 = await user.post('/tasks/user', {
        text: 'test habit 1',
        type: 'habit',
      });
      const habit2 = await user.post('/tasks/user', {
        text: 'test habit 2',
        type: 'habit',
      });
      await user.update({
        'party.quest.key': 'gryphon',
      });
      const res = await user.post('/tasks/bulk-score', [
        { id: habit1._id, direction: 'up' },
        { id: habit2._id, direction: 'up' },
      ]);
      await user.sync();
      expect(res.tasks[0]._tmp.quest.progressDelta).to.be.greaterThan(0);
      expect(res.tasks[1]._tmp.quest.progressDelta).to.be.greaterThan(0);
      expect(user.party.quest.progress.up).to
        .eql(res.tasks[0]._tmp.quest.progressDelta + res.tasks[1]._tmp.quest.progressDelta);
    });
  });
  context('todos', () => {
    let todo;
    beforeEach(async () => {
      todo = await user.post('/tasks/user', {
        text: 'test todo',
        type: 'todo',
      });
    });
    it('completes todo when direction is up', async () => {
      await user.post('/tasks/bulk-score', [{ id: todo.id, direction: 'up' }]);
      const task = await user.get(`/tasks/${todo._id}`);
      expect(task.completed).to.equal(true);
      expect(task.dateCompleted).to.be.a('string'); // date gets converted to a string as json doesn't have a Date type
    });
    it('moves completed todos out of user.tasksOrder.todos', async () => {
      const getUser = await user.get('/user');
      expect(getUser.tasksOrder.todos.indexOf(todo._id)).to.not.equal(-1);
      await user.post('/tasks/bulk-score', [{ id: todo.id, direction: 'up' }]);
      const updatedTask = await user.get(`/tasks/${todo._id}`);
      expect(updatedTask.completed).to.equal(true);
      const updatedUser = await user.get('/user');
      expect(updatedUser.tasksOrder.todos.indexOf(todo._id)).to.equal(-1);
    });
    it('moves un-completed todos back into user.tasksOrder.todos', async () => {
      const getUser = await user.get('/user');
      expect(getUser.tasksOrder.todos.indexOf(todo._id)).to.not.equal(-1);
      await user.post('/tasks/bulk-score', [{ id: todo.id, direction: 'up' }]);
      await user.post('/tasks/bulk-score', [{ id: todo.id, direction: 'down' }]);
      const updatedTask = await user.get(`/tasks/${todo._id}`);
      expect(updatedTask.completed).to.equal(false);
      const updatedUser = await user.get('/user');
      const l = updatedUser.tasksOrder.todos.length;
      expect(updatedUser.tasksOrder.todos.indexOf(todo._id)).not.to.equal(-1);
      // Check that it was pushed at the bottom
      expect(updatedUser.tasksOrder.todos.indexOf(todo._id)).to.equal(l - 1);
    });
    it('uncompletes todo when direction is down', async () => {
      await user.post('/tasks/bulk-score', [{ id: todo.id, direction: 'up' }, { id: todo.id, direction: 'down' }]);
      const updatedTask = await user.get(`/tasks/${todo._id}`);
      expect(updatedTask.completed).to.equal(false);
      expect(updatedTask.dateCompleted).to.be.a('undefined');
    });
    it('doesn\'t let a todo be uncompleted twice', async () => {
      await expect(user.post('/tasks/bulk-score', [{ id: todo.id, direction: 'down' }])).to.eventually.be.rejected.and.eql({
        code: 401,
        error: 'NotAuthorized',
        message: t('sessionOutdated'),
      });
    });
    context('user stats when direction is up', () => {
      let updatedUser; let res;
      beforeEach(async () => {
        res = await user.post('/tasks/bulk-score', [{ id: todo.id, direction: 'up' }]);
        updatedUser = await user.get('/user');
      });
      it('increases user\'s mp', () => {
        expect(updatedUser.stats.mp).to.be.greaterThan(user.stats.mp);
        expect(res.mp).to.equal(updatedUser.stats.mp);
      });
      it('increases user\'s exp', () => {
        expect(updatedUser.stats.exp).to.be.greaterThan(user.stats.exp);
        expect(res.exp).to.equal(updatedUser.stats.exp);
      });
      it('increases user\'s gold', () => {
        expect(updatedUser.stats.gp).to.be.greaterThan(user.stats.gp);
        expect(res.gp).to.equal(updatedUser.stats.gp);
      });
    });
    context('user stats when direction is down', () => {
      let updatedUser; let initialUser; let res;
      beforeEach(async () => {
        await user.post('/tasks/bulk-score', [{ id: todo.id, direction: 'up' }]);
        initialUser = await user.get('/user');
        res = await user.post('/tasks/bulk-score', [{ id: todo.id, direction: 'down' }]);
        updatedUser = await user.get('/user');
      });
      it('decreases user\'s mp', () => {
        expect(updatedUser.stats.mp).to.be.lessThan(initialUser.stats.mp);
      });
      it('decreases user\'s exp', () => {
        expect(updatedUser.stats.exp).to.be.lessThan(initialUser.stats.exp);
        expect(res.exp).to.equal(updatedUser.stats.exp);
      });
      it('decreases user\'s gold', () => {
        expect(updatedUser.stats.gp).to.be.lessThan(initialUser.stats.gp);
        expect(res.gp).to.equal(updatedUser.stats.gp);
      });
    });
  });
  context('dailys', () => {
    let daily;
    beforeEach(async () => {
      daily = await user.post('/tasks/user', {
        text: 'test daily',
        type: 'daily',
      });
    });
    it('completes daily when direction is up', async () => {
      await user.post('/tasks/bulk-score', [{ id: daily.id, direction: 'up' }]);
      const task = await user.get(`/tasks/${daily._id}`);
      expect(task.completed).to.equal(true);
    });
    it('uncompletes daily when direction is down', async () => {
      await user.post('/tasks/bulk-score', [{ id: daily.id, direction: 'up' }, { id: daily.id, direction: 'down' }]);
      const task = await user.get(`/tasks/${daily._id}`);
      expect(task.completed).to.equal(false);
    });
    it('computes isDue', async () => {
      await user.post('/tasks/bulk-score', [{ id: daily.id, direction: 'up' }]);
      const task = await user.get(`/tasks/${daily._id}`);
      expect(task.isDue).to.equal(true);
    });
    it('computes nextDue', async () => {
      await user.post('/tasks/bulk-score', [{ id: daily.id, direction: 'up' }]);
      const task = await user.get(`/tasks/${daily._id}`);
      expect(task.nextDue.length).to.eql(6);
    });
    context('user stats when direction is up', () => {
      let updatedUser; let res;
      beforeEach(async () => {
        res = await user.post('/tasks/bulk-score', [{ id: daily.id, direction: 'up' }]);
        updatedUser = await user.get('/user');
      });
      it('increases user\'s mp', () => {
        expect(updatedUser.stats.mp).to.be.greaterThan(user.stats.mp);
        expect(res.mp).to.equal(updatedUser.stats.mp);
      });
      it('increases user\'s exp', () => {
        expect(updatedUser.stats.exp).to.be.greaterThan(user.stats.exp);
        expect(res.exp).to.equal(updatedUser.stats.exp);
      });
      it('increases user\'s gold', () => {
        expect(updatedUser.stats.gp).to.be.greaterThan(user.stats.gp);
        expect(res.gp).to.equal(updatedUser.stats.gp);
      });
    });
    context('user stats when direction is down', () => {
      let updatedUser; let initialUser; let res;
      beforeEach(async () => {
        await user.post('/tasks/bulk-score', [{ id: daily.id, direction: 'up' }]);
        initialUser = await user.get('/user');
        res = await user.post('/tasks/bulk-score', [{ id: daily.id, direction: 'down' }]);
        updatedUser = await user.get('/user');
      });
      it('decreases user\'s mp', () => {
        expect(updatedUser.stats.mp).to.be.lessThan(initialUser.stats.mp);
        expect(res.mp).to.equal(updatedUser.stats.mp);
      });
      it('decreases user\'s exp', () => {
        expect(updatedUser.stats.exp).to.be.lessThan(initialUser.stats.exp);
        expect(res.exp).to.equal(updatedUser.stats.exp);
      });
      it('decreases user\'s gold', () => {
        expect(updatedUser.stats.gp).to.be.lessThan(initialUser.stats.gp);
        expect(res.gp).to.equal(updatedUser.stats.gp);
      });
    });
  });
  context('habits', () => {
    let habit; let minusHabit; let plusHabit; let
      neitherHabit; // eslint-disable-line no-unused-vars
    beforeEach(async () => {
      habit = await user.post('/tasks/user', {
        text: 'test habit',
        type: 'habit',
      });
      minusHabit = await user.post('/tasks/user', {
        text: 'test min habit',
        type: 'habit',
        up: false,
      });
      plusHabit = await user.post('/tasks/user', {
        text: 'test plus habit',
        type: 'habit',
        down: false,
      });
      neitherHabit = await user.post('/tasks/user', {
        text: 'test neither habit',
        type: 'habit',
        up: false,
        down: false,
      });
    });
    it('increases user\'s mp when direction is up', async () => {
      const res = await user.post('/tasks/bulk-score', [{ id: habit.id, direction: 'up' }, {
        id: plusHabit.id,
        direction: 'up',
      }]);
      const updatedUser = await user.get('/user');
      expect(updatedUser.stats.mp).to.be.greaterThan(user.stats.mp);
      expect(res.mp).to.equal(updatedUser.stats.mp);
    });
    it('decreases user\'s mp when direction is down', async () => {
      const res = await user.post('/tasks/bulk-score', [{
        id: habit.id,
        direction: 'down',
      }, {
        id: minusHabit.id,
        direction: 'down',
      }]);
      const updatedUser = await user.get('/user');
      expect(updatedUser.stats.mp).to.be.lessThan(user.stats.mp);
      expect(res.mp).to.equal(updatedUser.stats.mp);
    });
    it('increases user\'s exp when direction is up', async () => {
      const res = await user.post('/tasks/bulk-score', [{
        id: habit.id,
        direction: 'up',
      }, {
        id: plusHabit.id,
        direction: 'up',
      }]);
      const updatedUser = await user.get('/user');
      expect(updatedUser.stats.exp).to.be.greaterThan(user.stats.exp);
      expect(res.exp).to.equal(updatedUser.stats.exp);
    });
    it('increases user\'s gold when direction is up', async () => {
      const res = await user.post('/tasks/bulk-score', [{
        id: habit.id,
        direction: 'up',
      }, {
        id: plusHabit.id,
        direction: 'up',
      }]);
      const updatedUser = await user.get('/user');
      expect(updatedUser.stats.gp).to.be.greaterThan(user.stats.gp);
      expect(res.gp).to.equal(updatedUser.stats.gp);
    });
    it('records only one history entry per day', async () => {
      const initialHistoryLength = habit.history.length;
      await user.post('/tasks/bulk-score', [{
        id: habit.id,
        direction: 'up',
      }, {
        id: habit.id,
        direction: 'up',
      }, {
        id: habit.id,
        direction: 'down',
      }, {
        id: habit.id,
        direction: 'up',
      }]);
      const updatedTask = await user.get(`/tasks/${habit._id}`);
      expect(updatedTask.history.length).to.eql(initialHistoryLength + 1);
      const lastHistoryEntry = updatedTask.history[updatedTask.history.length - 1];
      expect(lastHistoryEntry.scoredUp).to.equal(3);
      expect(lastHistoryEntry.scoredDown).to.equal(1);
    });
  });
  context('mixed', () => {
    let habit; let daily; let todo;
    beforeEach(async () => {
      habit = await user.post('/tasks/user', {
        text: 'test habit',
        type: 'habit',
      });
      daily = await user.post('/tasks/user', {
        text: 'test habit',
        type: 'habit',
      });
      todo = await user.post('/tasks/user', {
        text: 'test habit',
        type: 'habit',
      });
    });
    it('scores habits, dailies, todos', async () => {
      const res = await user.post('/tasks/bulk-score', [
        { id: habit.id, direction: 'down' },
        { id: daily.id, direction: 'up' },
        { id: todo.id, direction: 'up' },
      ]);
      expect(res.tasks[0].id).to.eql(habit.id);
      expect(res.tasks[0].delta).to.be.below(0);
      expect(res.tasks[0]._tmp).to.exist;
      expect(res.tasks[1].id).to.eql(daily.id);
      expect(res.tasks[1].delta).to.be.greaterThan(0);
      expect(res.tasks[1]._tmp).to.exist;
      expect(res.tasks[2].id).to.eql(todo.id);
      expect(res.tasks[2].delta).to.be.greaterThan(0);
      expect(res.tasks[2]._tmp).to.exist;
      const updatedHabit = await user.get(`/tasks/${habit._id}`);
      const updatedDaily = await user.get(`/tasks/${daily._id}`);
      const updatedTodo = await user.get(`/tasks/${todo._id}`);
      expect(habit.value).to.be.greaterThan(updatedHabit.value);
      expect(updatedHabit.counterDown).to.equal(1);
      expect(updatedDaily.value).to.be.greaterThan(daily.value);
      expect(updatedTodo.value).to.be.greaterThan(todo.value);
    });
  });
  context('reward', () => {
    it('correctly handles rewards', async () => {
      const reward = await user.post('/tasks/user', {
        text: 'test reward',
        type: 'reward',
        value: 5,
      });
      const res = await user.post('/tasks/bulk-score', [{ id: reward.id, direction: 'up' }]);
      const updatedUser = await user.get('/user');
      // purchases reward
      expect(user.stats.gp).to.equal(updatedUser.stats.gp + 5);
      expect(res.gp).to.equal(updatedUser.stats.gp);
      // does not change user\'s mp
      expect(user.stats.mp).to.equal(updatedUser.stats.mp);
      expect(res.mp).to.equal(updatedUser.stats.mp);
      // does not change user\'s exp
      expect(user.stats.exp).to.equal(updatedUser.stats.exp);
      expect(res.exp).to.equal(updatedUser.stats.exp);
    });
    it('fails if the user does not have enough gold', async () => {
      const reward = await user.post('/tasks/user', {
        text: 'test reward',
        type: 'reward',
        value: 500,
      });
      await expect(user.post('/tasks/bulk-score', [{ id: reward.id, direction: 'up' }])).to.eventually.be.rejected.and.eql({
        code: 401,
        error: 'NotAuthorized',
        message: t('messageNotEnoughGold'),
      });
      const updatedUser = await user.get('/user');
      // does not purchase reward
      expect(user.stats.gp).to.equal(updatedUser.stats.gp);
    });
  });
 });
--- a/test/api/v4/user/POST-user_class_cast_spellId.test.js
+++ b/test/api/v4/user/POST-user_class_cast_spellId.test.js
@@ -1,4 +1,3 @@
 import { v4 as generateUUID } from 'uuid';
 import { find } from 'lodash';
 import {
@@ -310,7 +309,6 @@ describe('POST /user/class/cast/:spellId', () => {
    expect(result.user.stats.mp).to.equal(10);
  });
  // TODO find a way to have sinon working in integration tests
  // it doesn't work when tests are running separately from server
  it('passes correct target to spell when targetType === \'tasks\'');
--- a/test/api/v4/user/POST-user_reset.test.js
+++ b/test/api/v4/user/POST-user_reset.test.js
@@ -130,7 +130,6 @@ describe('POST /user/reset', () => {
      },
    });
    await hero.post('/user/reset');
    const heroRes = await admin.get(`/hall/heroes/${hero.auth.local.username}`);
--- a/test/api/v4/user/PUT-user.test.js
+++ b/test/api/v4/user/PUT-user.test.js
@@ -4,7 +4,6 @@ import {
  translate as t,
 } from '../../../helpers/api-integration/v4';
 describe('PUT /user', () => {
  let user;
@@ -53,7 +52,6 @@ describe('PUT /user', () => {
      expect(user.tags.length).to.be.eql(userTags.length + 1);
    });
    it('profile.name cannot be an empty string or null', async () => {
      await expect(user.put('/user', {
        'profile.name': ' ', // string should be trimmed
--- a/test/api/v4/user/auth/POST-user_verify_display_name.test.js
+++ b/test/api/v4/user/auth/POST-user_verify_display_name.test.js
@@ -53,5 +53,11 @@ describe('POST /user/auth/verify-display-name', async () => {
        displayName: 'this is a very long display name over 30 characters',
      })).to.eventually.eql({ isUsable: false, issues: [t('displaynameIssueLength')] });
    });
    it('errors if display name contains a newline', async () => {
      await expect(user.post(ENDPOINT, {
        displayName: 'namecontainsnewline\n',
      })).to.eventually.eql({ isUsable: false, issues: [t('displaynameIssueNewline')] });
    });
  });
 });
--- a/test/common/fns/getUtcOffset.test.js
+++ b/test/common/fns/getUtcOffset.test.js
@@ -0,0 +1,25 @@
 import getUtcOffset from '../../../website/common/script/fns/getUtcOffset';
 describe('getUtcOffset', () => {
  let user;
  beforeEach(() => {
    user = { preferences: {} };
  });
  it('returns 0 when user.timezoneOffset is not set', () => {
    expect(getUtcOffset(user)).to.equal(0);
  });
  it('returns 0 when user.timezoneOffset is zero', () => {
    user.preferences.timezoneOffset = 0;
    expect(getUtcOffset(user)).to.equal(0);
  });
  it('returns the opposite of user.timezoneOffset', () => {
    user.preferences.timezoneOffset = -10;
    expect(getUtcOffset(user)).to.eql(10);
  });
 });
--- a/test/common/libs/cron.test.js
+++ b/test/common/libs/cron.test.js
@@ -0,0 +1,184 @@
 import moment from 'moment';
 import { startOfDay, daysSince } from '../../../website/common/script/cron';
 function localMoment (timeString, utcOffset) {
  return moment(timeString).utcOffset(utcOffset, true);
 }
 describe('cron utility functions', () => {
  describe('startOfDay', () => {
    it('is zero when no daystart configured', () => {
      const options = { now: moment('2020-02-02 09:30:00Z'), timezoneOffset: 0 };
      const result = startOfDay(options);
      expect(result).to.be.sameMoment('2020-02-02 00:00:00Z');
    });
    it('is zero when negative daystart configured', () => {
      const options = {
        now: moment('2020-02-02 09:30:00Z'),
        timezoneOffset: 0,
        daystart: -5,
      };
      const result = startOfDay(options);
      expect(result).to.be.sameMoment('2020-02-02 00:00:00Z');
    });
    it('is zero when daystart over 24 is configured', () => {
      const options = {
        now: moment('2020-02-02 09:30:00Z'),
        timezoneOffset: 0,
        daystart: 25,
      };
      const result = startOfDay(options);
      expect(result).to.be.sameMoment('2020-02-02 00:00:00Z');
    });
    it('is equal to daystart o\'clock when daystart configured', () => {
      const options = {
        now: moment('2020-02-02 09:30:00Z'),
        timezoneOffset: 0,
        dayStart: 5,
      };
      const result = startOfDay(options);
      expect(result).to.be.sameMoment('2020-02-02 05:00:00Z');
    });
    it('is previous day daystart o\'clock when daystart is after current time', () => {
      const options = {
        now: moment('2020-02-02 04:30:00Z'),
        timezoneOffset: 0,
        dayStart: 5,
      };
      const result = startOfDay(options);
      expect(result).to.be.sameMoment('2020-02-01 05:00:00Z');
    });
    it('is daystart o\'clock when daystart is after current time due to timezone', () => {
      const options = {
        now: moment('2020-02-02 04:30:00Z'),
        timezoneOffset: -120,
        dayStart: 5,
      };
      const result = startOfDay(options);
      expect(result).to.be.sameMoment('2020-02-02 05:00:00+02:00');
    });
    it('returns in default timezone if no timezone defined', () => {
      const utcOffset = moment().utcOffset();
      const now = localMoment('2020-02-02 04:30:00', utcOffset).utc();
      const result = startOfDay({ now });
      expect(result).to.be.sameMoment(localMoment('2020-02-02', utcOffset));
    });
    it('returns in default timezone if timezone lower than -12:00', () => {
      const utcOffset = moment().utcOffset();
      const options = {
        now: localMoment('2020-02-02 17:30:00', utcOffset).utc(),
        timezoneOffset: 721,
      };
      const result = startOfDay(options);
      expect(result).to.be.sameMoment(localMoment('2020-02-02', utcOffset));
    });
    it('returns in default timezone if timezone higher than +14:00', () => {
      const utcOffset = moment().utcOffset();
      const options = {
        now: localMoment('2020-02-02 07:32:25.376', utcOffset).utc(),
        timezoneOffset: -841,
      };
      const result = startOfDay(options);
      expect(result).to.be.sameMoment(localMoment('2020-02-02', utcOffset));
    });
    it('returns in overridden timezone if override present', () => {
      const options = {
        now: moment('2020-02-02 13:30:27Z'),
        timezoneOffset: 0,
        timezoneUtcOffsetOverride: -240,
      };
      const result = startOfDay(options);
      expect(result).to.be.sameMoment('2020-02-02 00:00:00-04:00');
    });
    it('returns start of yesterday if timezone difference carries it over datelines', () => {
      const offset = 300;
      const options = {
        now: moment('2020-02-02 04:30:00Z'),
        timezoneOffset: offset,
      };
      const result = startOfDay(options);
      expect(result).to.be.sameMoment(localMoment('2020-02-01', -offset));
    });
  });
  describe('daysSince', () => {
    it('correctly calculates days between two dates', () => {
      const now = moment();
      const dayBeforeYesterday = moment(now).subtract({ days: 2 });
      expect(daysSince(dayBeforeYesterday, { now })).to.equal(2);
    });
    it('is one lower if current time is before dayStart', () => {
      const oneWeekAgoAtOnePm = moment().hour(13).subtract({ days: 7 });
      const thisMorningThreeAm = moment().hour(3);
      const options = {
        now: thisMorningThreeAm,
        dayStart: 6,
      };
      const result = daysSince(oneWeekAgoAtOnePm, options);
      expect(result).to.equal(6);
    });
    it('is one higher if reference time is before dayStart and current time after dayStart', () => {
      const oneWeekAgoAtEightAm = moment().hour(8).subtract({ days: 7 });
      const todayAtFivePm = moment().hour(17);
      const options = {
        now: todayAtFivePm,
        dayStart: 11,
      };
      const result = daysSince(oneWeekAgoAtEightAm, options);
      expect(result).to.equal(8);
    });
    // Variations in timezone configuration options are already covered by startOfDay tests.
    it('uses now in user timezone as configured in options', () => {
      const timezoneOffset = 120;
      const options = {
        now: moment('1989-11-09 02:53:00+01:00'),
        timezoneOffset,
      };
      const result = daysSince(localMoment('1989-11-08', -timezoneOffset), options);
      expect(result).to.equal(0);
    });
  });
 });
--- a/test/common/libs/getDebuffPotionItems.test.js
+++ b/test/common/libs/getDebuffPotionItems.test.js
@@ -1,4 +1,3 @@
 import {
  generateUser,
 } from '../../helpers/common.helper';
@@ -36,7 +35,6 @@ describe('getDebuffPotionItems', () => {
    user.stats.buffs.snowball = true;
    user.stats.buffs.shinySeed = true;
    const result = getDebuffPotionItems(user);
    expect(result).to.be.an('array').that.deep.include.members([
--- a/test/common/libs/setDebuffPotionItems.test.js
+++ b/test/common/libs/setDebuffPotionItems.test.js
@@ -1,4 +1,3 @@
 import {
  generateUser,
 } from '../../helpers/common.helper';
@@ -27,7 +26,6 @@ describe('setDebuffPotionItems', () => {
    const firstSetResult = [...setDebuffPotionItems(user).pinnedItems];
    const secondSetResult = [...setDebuffPotionItems(user).pinnedItems];
    expect(firstSetResult).to.be.deep.equal(secondSetResult);
  });
--- a/test/common/libs/shops.js
+++ b/test/common/libs/shops.js
@@ -90,7 +90,6 @@ describe('shops', () => {
        },
      });
      const shopWizardItems = shared.shops.getMarketGearCategories(userWithItems).find(x => x.identifier === 'wizard').items.filter(x => x.klass === 'wizard' && (x.owned === false || x.owned === undefined));
      expect(shopWizardItems.length).to.eql(0);
    });
@@ -122,7 +121,6 @@ describe('shops', () => {
        },
      });
      const shopWizardItems = shared.shops.getMarketGearCategories(userWithItems).find(x => x.identifier === 'wizard').items.filter(x => x.klass === 'wizard' && (x.owned === false || x.owned === undefined));
      expect(shopWizardItems.find(item => item.key === 'weapon_wizard_5').locked).to.eql(false);
      expect(shopWizardItems.find(item => item.key === 'weapon_wizard_6').locked).to.eql(true);
--- a/test/common/libs/taskDefaults.test.js
+++ b/test/common/libs/taskDefaults.test.js
@@ -1,6 +1,7 @@
 import moment from 'moment';
 import taskDefaults from '../../../website/common/script/libs/taskDefaults';
 import getUtcOffset from '../../../website/common/script/fns/getUtcOffset';
 import { generateUser } from '../../helpers/common.helper';
 describe('taskDefaults', () => {
@@ -72,7 +73,7 @@ describe('taskDefaults', () => {
    expect(task.startDate).to.eql(
      moment()
-        .zone(user.preferences.timezoneOffset, 'hour')
+        .utcOffset(getUtcOffset(user))
        .startOf('day')
        .subtract(1, 'day')
        .toDate(),
--- a/test/common/ops/buy/buyGem.js
+++ b/test/common/ops/buy/buyGem.js
@@ -75,7 +75,6 @@ describe('shared.ops.buyGem', () => {
      expect(user.stats.gp).to.equal(goldPoints - planGemLimits.convRate * 2);
    });
    context('Failure conditions', () => {
      it('returns an error when key is not provided', done => {
        try {
--- a/test/common/ops/buy/buyQuestGold.js
+++ b/test/common/ops/buy/buyQuestGold.js
@@ -141,7 +141,6 @@ describe('shared.ops.buyQuest', () => {
    }
  });
  it('does not buy Gem-premium Quests', done => {
    user.stats.gp = 9999;
    try {
--- a/test/common/ops/buy/purchase.js
+++ b/test/common/ops/buy/purchase.js
@@ -43,7 +43,6 @@ describe('shared.ops.purchase', () => {
      }
    });
    it('returns error when unknown type is provided', done => {
      try {
        purchase(user, { params: { type: 'randomType', key: 'gem' } });
@@ -96,7 +95,6 @@ describe('shared.ops.purchase', () => {
      }
    });
    it('returns error when item is not found', done => {
      const params = { key: 'notExisting', type: 'food' };
--- a/test/common/ops/feed.js
+++ b/test/common/ops/feed.js
@@ -113,6 +113,30 @@ describe('shared.ops.feed', () => {
        done();
      }
    });
    it('does not allow bulk-feeding query amount above food owned', done => {
      user.items.pets['Wolf-Base'] = 5;
      user.items.food.Meat = 6;
      try {
        feed(user, { params: { pet: 'Wolf-Base', food: 'Meat' }, query: { amount: 8 } });
      } catch (err) {
        expect(err).to.be.an.instanceof(NotAuthorized);
        expect(err.message).to.equal(i18n.t('notEnoughFood'));
        done();
      }
    });
    it('does not allow bulk-over-feeding pet', done => {
      user.items.pets['Wolf-Base'] = 45;
      user.items.food.Meat = 3;
      try {
        feed(user, { params: { pet: 'Wolf-Base', food: 'Meat' }, query: { amount: 2 } });
      } catch (err) {
        expect(err).to.be.an.instanceof(NotAuthorized);
        expect(err.message).to.equal(i18n.t('tooMuchFood'));
        done();
      }
    });
  });
  context('successful feeding', () => {
@@ -188,6 +212,61 @@ describe('shared.ops.feed', () => {
      expect(user.items.pets['Wolf-Base']).to.equal(7);
    });
    it('evolves the pet into a mount when feeding user.items.pets[pet] >= 50 preferred food (bulk)', () => {
      user.items.pets['Wolf-Base'] = 5;
      user.items.food.Meat = 10;
      user.items.currentPet = 'Wolf-Base';
      const pet = content.petInfo['Wolf-Base'];
      const [data, message] = feed(user, { params: { pet: 'Wolf-Base', food: 'Meat' }, query: { amount: 9 } });
      expect(data).to.eql(user.items.pets['Wolf-Base']);
      expect(message).to.eql(i18n.t('messageEvolve', {
        egg: pet.text(),
      }));
      expect(user.items.food.Meat).to.equal(1);
      expect(user.items.pets['Wolf-Base']).to.equal(-1);
      expect(user.items.mounts['Wolf-Base']).to.equal(true);
      expect(user.items.currentPet).to.equal('');
    });
    it('evolves the pet into a mount when feeding user.items.pets[pet] >= 50 wrong food (bulk)', () => {
      user.items.pets['Wolf-Base'] = 5;
      user.items.food.Milk = 25;
      user.items.currentPet = 'Wolf-Base';
      const pet = content.petInfo['Wolf-Base'];
      const [data, message] = feed(user, { params: { pet: 'Wolf-Base', food: 'Milk' }, query: { amount: 23 } });
      expect(data).to.eql(user.items.pets['Wolf-Base']);
      expect(message).to.eql(i18n.t('messageEvolve', {
        egg: pet.text(),
      }));
      expect(user.items.food.Milk).to.equal(2);
      expect(user.items.pets['Wolf-Base']).to.equal(-1);
      expect(user.items.mounts['Wolf-Base']).to.equal(true);
      expect(user.items.currentPet).to.equal('');
    });
    it('does not like the food (bulk low food) ', () => {
      user.items.pets['Wolf-Base'] = 5;
      user.items.food.Milk = 5;
      const food = content.food.Milk;
      const pet = content.petInfo['Wolf-Base'];
      const [data, message] = feed(user, { params: { pet: 'Wolf-Base', food: 'Milk' }, query: { amount: 5 } });
      expect(data).to.eql(user.items.pets['Wolf-Base']);
      expect(message).to.eql(i18n.t('messageDontEnjoyFood', {
        egg: pet.text(),
        foodText: food.textThe(),
      }));
      expect(user.items.food.Milk).to.equal(0);
      expect(user.items.pets['Wolf-Base']).to.equal(15);
    });
    it('awards All Your Base achievement', () => {
      user.items.pets['Wolf-Spooky'] = 5;
      user.items.food.Milk = 2;
--- a/test/common/ops/reset.js
+++ b/test/common/ops/reset.js
@@ -29,7 +29,6 @@ describe('shared.ops.reset', () => {
    tasksToRemove = [habit, todo, daily, reward];
  });
  it('resets a user', () => {
    const [, message] = reset(user);
--- a/test/common/ops/spells.js
+++ b/test/common/ops/spells.js
@@ -4,6 +4,7 @@ import {
 import spells from '../../../website/common/script/content/spells';
 import {
  NotAuthorized,
  BadRequest,
 } from '../../../website/common/script/libs/errors';
 import i18n from '../../../website/common/script/i18n';
@@ -25,7 +26,7 @@ describe('shared.ops.spells', () => {
    const spell = spells.healer.heal;
    try {
-      spell.cast(user);
+      spell.cast(user, null, { language: 'en' });
    } catch (err) {
      expect(err).to.be.an.instanceof(NotAuthorized);
      expect(err.message).to.equal(i18n.t('messageHealthAlreadyMax'));
@@ -35,4 +36,22 @@ describe('shared.ops.spells', () => {
      done();
    }
  });
  it('Issue #12361: returns an error if chilling frost has already been cast', done => {
    user.stats.class = 'wizard';
    user.stats.lvl = 15;
    user.stats.mp = 400;
    user.stats.buffs.streaks = true;
    const spell = spells.wizard.frost;
    try {
      spell.cast(user, null, { language: 'en' });
    } catch (err) {
      expect(err).to.be.an.instanceof(BadRequest);
      expect(err.message).to.equal(i18n.t('spellAlreadyCast'));
      expect(user.stats.mp).to.eql(400);
      done();
    }
  });
 });
--- a/test/common/shouldDo.test.js
+++ b/test/common/shouldDo.test.js
@@ -5,6 +5,8 @@ import 'moment-recur';
 describe('shouldDo', () => {
  let day; let
    dailyTask;
  // Options is a mapping of user.preferences, therefor `timezoneOffset` still holds old zone
  // values instead of utcOffset values.
  let options = {};
  let nextDue = [];
@@ -80,17 +82,17 @@ describe('shouldDo', () => {
      it('returns true if the user\'s current time is after start date and Custom Day Start', () => {
        options.dayStart = 4;
-        day = moment().zone(options.timezoneOffset).startOf('day').add(6, 'hours')
+        day = moment().utcOffset(-options.timezoneOffset).startOf('day').add(6, 'hours')
          .toDate();
-        dailyTask.startDate = moment().zone(options.timezoneOffset).startOf('day').toDate();
+        dailyTask.startDate = moment().utcOffset(-options.timezoneOffset).startOf('day').toDate();
        expect(shouldDo(day, dailyTask, options)).to.equal(true);
      });
      it('returns false if the user\'s current time is before Custom Day Start', () => {
        options.dayStart = 8;
-        day = moment().zone(options.timezoneOffset).startOf('day').add(2, 'hours')
+        day = moment().utcOffset(-options.timezoneOffset).startOf('day').add(2, 'hours')
          .toDate();
-        dailyTask.startDate = moment().zone(options.timezoneOffset).startOf('day').toDate();
+        dailyTask.startDate = moment().utcOffset(-options.timezoneOffset).startOf('day').toDate();
        expect(shouldDo(day, dailyTask, options)).to.equal(false);
      });
    });
@@ -112,14 +114,14 @@ describe('shouldDo', () => {
      it('returns true if the user\'s current time is after Custom Day Start', () => {
        options.dayStart = 4;
-        day = moment().zone(options.timezoneOffset).startOf('day').add(6, 'hours')
+        day = moment().utcOffset(-options.timezoneOffset).startOf('day').add(6, 'hours')
          .toDate();
        expect(shouldDo(day, dailyTask, options)).to.equal(true);
      });
      it('returns false if the user\'s current time is before Custom Day Start', () => {
        options.dayStart = 8;
-        day = moment().zone(options.timezoneOffset).startOf('day').add(2, 'hours')
+        day = moment().utcOffset(-options.timezoneOffset).startOf('day').add(2, 'hours')
          .toDate();
        expect(shouldDo(day, dailyTask, options)).to.equal(false);
      });
@@ -377,7 +379,6 @@ describe('shouldDo', () => {
        m: false,
      };
      [0, 1, 2, 3, 4, 5, 6].forEach(weekday => {
        day = moment().add(1, 'weeks').day(weekday).toDate();
--- a/test/helpers/api-integration/external-server.js
+++ b/test/helpers/api-integration/external-server.js
@@ -1,9 +1,10 @@
 import express from 'express';
 import { v4 as uuid } from 'uuid';
 import bodyParser from 'body-parser';
 import http from 'http';
 const app = express();
-const server = require('http').createServer(app);
+const server = http.createServer(app);
 const PORT = process.env.TEST_WEBHOOK_APP_PORT || 3099; // eslint-disable-line no-process-env
--- a/test/helpers/common.helper.js
+++ b/test/helpers/common.helper.js
@@ -10,7 +10,6 @@ import {
 export { translate } from './translate';
 export function generateUser (options = {}) {
  const user = new User(options).toObject();
--- a/test/helpers/globals.helper.js
+++ b/test/helpers/globals.helper.js
@@ -8,8 +8,9 @@
 //------------------------------
 global._ = require('lodash');
 global.chai = require('chai');
 chai.use(require('sinon-chai'));
 chai.use(require('chai-as-promised'));
 chai.use(require('chai-moment'));
 chai.use(require('sinon-chai'));
 global.expect = chai.expect;
 global.sinon = require('sinon');
--- a/test/helpers/translate.js
+++ b/test/helpers/translate.js
@@ -1,6 +1,7 @@
 import i18n from '../../website/common/script/i18n';
 import { translations } from '../../website/server/libs/i18n';
-i18n.translations = require('../../website/server/libs/i18n').translations;
+i18n.translations = translations;
 const STRING_ERROR_MSG = 'Error processing the string. Please see Help > Report a Bug.';
 const STRING_DOES_NOT_EXIST_MSG = /^String '.*' not found.$/;
--- a/test/sanity/no-duplicate-translation-keys.js
+++ b/test/sanity/no-duplicate-translation-keys.js
@@ -1,5 +1,4 @@
-
+import { sync as glob } from 'glob';
 const glob = require('glob').sync;
 describe('Locales files', () => {
  it('do not contain duplicates of any keys', () => {
--- a/test/sanity/use-proper-babel-path.js
+++ b/test/sanity/use-proper-babel-path.js
@@ -1,6 +1,5 @@
-
+import { sync as glob } from 'glob';
-const glob = require('glob').sync;
+import { readFileSync as readFile } from 'fs';
 const readFile = require('fs').readFileSync;
 const IMPORT_REGEX = /(import|require).*common\/script/;
--- a/website/client/config/storybook/config.js
+++ b/website/client/config/storybook/config.js
@@ -1,5 +1,6 @@
 /* eslint-disable import/no-extraneous-dependencies */
 import { configure } from '@storybook/vue';
 import './margin.css';
 import '../../src/assets/scss/index.scss';
 import '../../src/assets/css/sprites.css';
@@ -35,7 +36,7 @@ import BootstrapVue from 'bootstrap-vue';
 import StoreModule from '@/libs/store';
 // couldn't inject the languages easily,
-// so just a "$t()"  string to show that this will be translated
+// so just a "$t()" string to show that this will be translated
 Vue.prototype.$t = function translateString (...args) {
  return `$t(${JSON.stringify(args)})`;
 };
--- a/website/client/config/storybook/margin.css
+++ b/website/client/config/storybook/margin.css
@@ -0,0 +1,13 @@
 .background {
    background: teal;
    display: inline-block;
 }
 .content {
    color: white;
    background: grey;
 }
 .inline-block {
    display: inline-block;
 }
--- a/website/client/package-lock.json
+++ b/website/client/package-lock.json
--- a/website/client/package.json
+++ b/website/client/package.json
@@ -16,50 +16,50 @@
    "@storybook/addon-actions": "^5.3.19",
    "@storybook/addon-knobs": "^5.3.19",
    "@storybook/addon-links": "^5.3.19",
-    "@storybook/addon-notes": "^5.3.19",
+    "@storybook/addon-notes": "^5.3.21",
    "@storybook/vue": "^5.3.19",
-    "@vue/cli-plugin-babel": "^4.4.4",
+    "@vue/cli-plugin-babel": "^4.5.4",
-    "@vue/cli-plugin-eslint": "^4.4.4",
+    "@vue/cli-plugin-eslint": "^4.5.4",
-    "@vue/cli-plugin-router": "^4.4.4",
+    "@vue/cli-plugin-router": "^4.5.4",
-    "@vue/cli-plugin-unit-mocha": "^4.4.4",
+    "@vue/cli-plugin-unit-mocha": "^4.5.4",
-    "@vue/cli-service": "^4.4.4",
+    "@vue/cli-service": "^4.5.4",
    "@vue/test-utils": "1.0.0-beta.29",
-    "amplitude-js": "^6.2.0",
+    "amplitude-js": "^7.1.1",
    "axios": "^0.19.2",
    "axios-progress-bar": "^1.2.0",
    "babel-eslint": "^10.1.0",
-    "bootstrap": "^4.5.0",
+    "bootstrap": "^4.5.2",
-    "bootstrap-vue": "^2.15.0",
+    "bootstrap-vue": "^2.16.0",
    "chai": "^4.1.2",
    "core-js": "^3.6.5",
    "eslint": "^6.8.0",
    "eslint-config-habitrpg": "^6.2.0",
    "eslint-plugin-mocha": "^5.3.0",
    "eslint-plugin-vue": "^6.2.2",
-    "habitica-markdown": "^2.0.2",
+    "habitica-markdown": "^3.0.0",
    "hellojs": "^1.18.4",
    "inspectpack": "^4.5.2",
    "intro.js": "^2.9.3",
    "jquery": "^3.5.1",
-    "lodash": "^4.17.15",
+    "lodash": "^4.17.20",
    "moment": "^2.27.0",
    "nconf": "^0.10.0",
-    "sass": "^1.26.8",
+    "sass": "^1.26.10",
    "sass-loader": "^8.0.2",
    "smartbanner.js": "^1.16.0",
    "svg-inline-loader": "^0.8.2",
    "svg-url-loader": "^6.0.0",
    "svgo": "^1.3.2",
    "svgo-loader": "^2.2.1",
-    "uuid": "^8.1.0",
+    "uuid": "^8.3.0",
    "validator": "^13.1.1",
-    "vue": "^2.6.11",
+    "vue": "^2.6.12",
    "vue-cli-plugin-storybook": "^0.6.1",
    "vue-mugen-scroll": "^0.2.6",
-    "vue-router": "^3.3.4",
+    "vue-router": "^3.4.3",
-    "vue-template-compiler": "^2.6.11",
+    "vue-template-compiler": "^2.6.12",
-    "vuedraggable": "^2.23.2",
+    "vuedraggable": "^2.24.1",
-    "vuejs-datepicker": "git://github.com/habitrpg/vuejs-datepicker.git#5d237615463a84a23dd6f3f77c6ab577d68593ec",
+    "vuejs-datepicker": "git://github.com/habitrpg/vuejs-datepicker.git#153d339e4dbebb73733658aeda1d5b7fcc55b0a0",
-    "webpack": "^4.43.0"
+    "webpack": "^4.44.1"
  }
 }
--- a/website/client/src/app.vue
+++ b/website/client/src/app.vue
@@ -119,7 +119,6 @@
    #melior {
      margin: 0 auto;
      width: 70.9px;
      margin-bottom: 1em;
    }
    .row {
@@ -218,11 +217,6 @@
    opacity: 0.48;
  }
  /* @TODO: The modal-open class is not being removed. Let's try this for now */
  .modal {
    overflow-y: scroll !important;
  }
  .modal-backdrop {
    opacity: .9 !important;
    background-color: $purple-100 !important;
@@ -297,7 +291,7 @@ export default {
    };
  },
  computed: {
-    ...mapState(['isUserLoggedIn', 'browserTimezoneOffset', 'isUserLoaded', 'notificationsRemoved']),
+    ...mapState(['isUserLoggedIn', 'browserTimezoneUtcOffset', 'isUserLoaded', 'notificationsRemoved']),
    ...mapState({ user: 'user.data' }),
    isStaticPage () {
      return this.$route.meta.requiresLogin === false;
@@ -369,7 +363,6 @@ export default {
      const isApiCall = url.indexOf('api/v4') !== -1;
      const userV = response.data && response.data.userV;
      const isCron = url.indexOf('/api/v4/cron') === 0 && method === 'post';
      if (this.isUserLoaded && isApiCall && userV) {
        const oldUserV = this.user._v;
@@ -381,9 +374,14 @@ export default {
        // exclude chat seen requests because with real time chat they would be too many
        const isChatSeen = url.indexOf('/chat/seen') !== -1 && method === 'post';
        // exclude POST /api/v4/cron because the user is synced automatically after cron runs
        const isCron = url.indexOf('/api/v4/cron') === 0 && method === 'post';
        // exclude skills casting as they already return the synced user
        const isCast = url.indexOf('/api/v4/user/class/cast') !== -1 && method === 'post';
        // Something has changed on the user object that was not tracked here, sync the user
-        if (userV - oldUserV > 1 && !isCron && !isChatSeen && !isUserSync && !isTasksSync) {
+        if (
          userV - oldUserV > 1 && !isCron && !isChatSeen && !isUserSync && !isTasksSync && !isCast
        ) {
          Promise.all([
            this.$store.dispatch('user:fetch', { forceLoad: true }),
            this.$store.dispatch('tasks:fetchUserTasks', { forceLoad: true }),
@@ -489,9 +487,10 @@ export default {
        this.hideLoadingScreen();
        // Adjust the timezone offset
-        if (this.user.preferences.timezoneOffset !== this.browserTimezoneOffset) {
+        const browserTimezoneOffset = -this.browserTimezoneUtcOffset;
        if (this.user.preferences.timezoneOffset !== browserTimezoneOffset) {
          this.$store.dispatch('user:set', {
-            'preferences.timezoneOffset': this.browserTimezoneOffset,
+            'preferences.timezoneOffset': browserTimezoneOffset,
          });
        }
@@ -513,13 +512,9 @@ export default {
    } else {
      this.hideLoadingScreen();
    }
    this.initializeModalStack();
  },
  beforeDestroy () {
    this.$root.$off('playSound');
    this.$root.$off('bv::modal::hidden');
    this.$root.$off('bv::show::modal');
    this.$root.$off('buyModal::showItem');
    this.$root.$off('selectMembersModal::showItem');
  },
@@ -549,112 +544,6 @@ export default {
      this.$store.dispatch('auth:logout', { redirectToLogin: true });
      return true;
    },
    initializeModalStack () {
      // Manage modals
      this.$root.$on('bv::show::modal', (modalId, data = {}) => {
        if (data.fromRoot) return;
        const { modalStack } = this.$store.state;
        this.trackGemPurchase(modalId, data);
        // Add new modal to the stack
        const prev = modalStack[modalStack.length - 1];
        const prevId = prev ? prev.modalId : undefined;
        modalStack.push({ modalId, prev: prevId });
      });
      this.$root.$on('bv::modal::hidden', bvEvent => {
        let modalId = bvEvent.target && bvEvent.target.id;
        // sometimes the target isn't passed to the hidden event, fallback is the vueTarget
        if (!modalId) {
          modalId = bvEvent.vueTarget && bvEvent.vueTarget.id;
        }
        if (!modalId) {
          return;
        }
        const { modalStack } = this.$store.state;
        const modalOnTop = modalStack[modalStack.length - 1];
        // Check for invalid modal. Event systems can send multiples
        if (!this.validStack(modalStack)) return;
        // If we are moving forward
        if (modalOnTop && modalOnTop.prev === modalId) return;
        // Remove modal from stack
        this.$store.state.modalStack.pop();
        // Get previous modal
        const modalBefore = modalOnTop ? modalOnTop.prev : undefined;
        if (modalBefore) this.$root.$emit('bv::show::modal', modalBefore, { fromRoot: true });
      });
      // Dismiss modal aggressively. Pass a modal ID to remove a modal instance from the stack
      // (both the stack entry itself and its "prev" reference) so we don't reopen it
      this.$root.$on('habitica::dismiss-modal', oldModal => {
        if (!oldModal) return;
        this.$root.$emit('bv::hide::modal', oldModal);
        let removeIndex = this.$store.state.modalStack
          .map(modal => modal.modalId)
          .indexOf(oldModal);
        if (removeIndex >= 0) {
          this.$store.state.modalStack.splice(removeIndex, 1);
        }
        removeIndex = this.$store.state.modalStack
          .map(modal => modal.prev)
          .indexOf(oldModal);
        if (removeIndex >= 0) {
          delete this.$store.state.modalStack[removeIndex].prev;
        }
      });
    },
    validStack (modalStack) {
      const modalsThatCanShowTwice = ['profile'];
      const modalCount = {};
      const prevAndCurrent = 2;
      for (const current of modalStack) {
        if (!modalCount[current.modalId]) modalCount[current.modalId] = 0;
        modalCount[current.modalId] += 1;
        if (
          modalCount[current.modalId] > prevAndCurrent
          && modalsThatCanShowTwice.indexOf(current.modalId) === -1
        ) {
          this.$store.state.modalStack = [];
          return false;
        }
        if (!current.prev) continue; // eslint-disable-line
        if (!modalCount[current.prev]) modalCount[current.prev] = 0;
        modalCount[current.prev] += 1;
        if (
          modalCount[current.prev] > prevAndCurrent
          && modalsThatCanShowTwice.indexOf(current.prev) === -1
        ) {
          this.$store.state.modalStack = [];
          return false;
        }
      }
      return true;
    },
    trackGemPurchase (modalId, data) {
      // Track opening of gems modal unless it's been already tracked
      // For example the gems button in the menu already tracks the event by itself
      if (modalId === 'buy-gems' && data.alreadyTracked !== true) {
        Analytics.track({
          hitType: 'event',
          eventCategory: 'button',
          eventAction: 'click',
          eventLabel: 'Gems > Wallet',
        });
      }
    },
    itemSelected (item) {
      this.selectedItemToBuy = item;
    },
--- a/website/client/src/assets/css/sprites.css
+++ b/website/client/src/assets/css/sprites.css
@@ -4,16 +4,27 @@
  height: 219px;
 }
-.Pet_HatchingPotion_Dessert {
+.quest_windup {
-  background: url("~@/assets/images/animated/Pet_HatchingPotion_Dessert.gif") no-repeat;
+  background: url("~@/assets/images/animated/quest_windup.gif") no-repeat;
  width: 219px;
  height: 219px;
 }
 .Pet_HatchingPotion_Dessert, .Pet_HatchingPotion_Veggie, .Pet_HatchingPotion_Windup {
  width: 68px;
  height: 68px;
 }
 .Pet_HatchingPotion_Dessert {
  background: url("~@/assets/images/animated/Pet_HatchingPotion_Dessert.gif") no-repeat;
 }
 .Pet_HatchingPotion_Veggie {
  background: url("~@/assets/images/animated/Pet_HatchingPotion_Veggie.gif") no-repeat;
-  width: 68px;
+}
-  height: 68px;
+
 .Pet_HatchingPotion_Windup {
  background: url("~@/assets/images/animated/Pet_HatchingPotion_Windup.gif") no-repeat;
 }
 .Gems {
--- a/website/client/src/assets/css/sprites/spritesmith-largeSprites-0.css
+++ b/website/client/src/assets/css/sprites/spritesmith-largeSprites-0.css
@@ -1,72 +1,78 @@
-.promo_armoire_backgrounds_202006 {
+.promo_armoire_backgrounds_202007 {
  background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: 0px -573px;
+  background-position: -376px 0px;
  width: 423px;
  height: 147px;
 }
-.promo_mystery_202006 {
+.promo_armoire_backgrounds_202008 {
  background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: -445px -211px;
+  background-position: -376px -148px;
  width: 423px;
  height: 147px;
 }
 .promo_armoire_backgrounds_202009 {
  background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
  background-position: 0px -383px;
  width: 423px;
  height: 147px;
 }
 .promo_golden_achievements {
  background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
  background-position: -295px -531px;
  width: 246px;
  height: 112px;
 }
 .promo_mystery_202008 {
  background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
  background-position: 0px -531px;
  width: 294px;
  height: 156px;
 }
 .promo_mystery_202009 {
  background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
  background-position: -424px -383px;
  width: 282px;
  height: 147px;
 }
 .promo_sand_sculpture_potions {
  background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
  background-position: -424px -573px;
  width: 423px;
  height: 147px;
 }
 .promo_splashy_skins {
  background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
  background-position: 0px -386px;
  width: 375px;
  height: 186px;
 }
 .customize-option.promo_splashy_skins {
  background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
  background-position: -25px -401px;
  width: 60px;
  height: 60px;
 }
 .promo_summer_splash_2019 {
  background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
  background-position: 0px -199px;
  width: 408px;
  height: 186px;
 }
 .promo_summer_splash_2020 {
  background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
  background-position: 0px 0px;
  width: 444px;
  height: 198px;
 }
 .promo_take_this {
  background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: -927px -389px;
+  background-position: -800px -537px;
  width: 96px;
  height: 69px;
 }
 .promo_time_travelers {
  background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
  background-position: 0px 0px;
  width: 375px;
  height: 186px;
 }
 .scene_CernyPie {
  background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
  background-position: 0px -688px;
  width: 141px;
  height: 167px;
 }
 .scene_achievement {
  background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: -445px 0px;
+  background-position: -800px 0px;
-  width: 339px;
+  width: 210px;
  height: 210px;
 }
-.scene_hiking {
+.scene_public_space {
  background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: -785px 0px;
+  background-position: 0px -187px;
-  width: 258px;
+  width: 345px;
-  height: 258px;
+  height: 195px;
 }
-.scene_nakonana {
+.scene_reading {
  background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: -785px -389px;
+  background-position: -800px -392px;
-  width: 141px;
+  width: 171px;
-  height: 169px;
+  height: 144px;
 }
-.scene_strength {
+.scene_rewards {
  background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: -785px -259px;
+  background-position: -800px -211px;
-  width: 192px;
+  width: 207px;
-  height: 129px;
+  height: 180px;
 }
--- a/website/client/src/assets/css/sprites/spritesmith-main-0.css
+++ b/website/client/src/assets/css/sprites/spritesmith-main-0.css
--- a/website/client/src/assets/css/sprites/spritesmith-main-1.css
+++ b/website/client/src/assets/css/sprites/spritesmith-main-1.css
--- a/Show More
+++ b/Show More