4.152.2

fix(escaping): Armoire and boss messages
fix(merge): missing string
2026-05-14 11:28:57 -05:00 · 2020-08-14 11:18:44 -05:00 · 2020-08-14 11:04:21 -05:00 · 2020-08-13 17:27:51 -05:00 · 2020-08-13 17:12:09 -05:00 · 2020-08-13 17:11:48 -05:00
2018 changed files with 110418 additions and 104278 deletions
@@ -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
@@ -42,3 +42,7 @@ yarn.lock

 # webstorm fake webpack for path intellisense
 webpack.webstorm.config
+
+# mongodb replica set for local dev
+mongodb-*.tgz
+/mongodb-data
@@ -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"
 }
@@ -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.');
+
+  // 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);
+    // kills the process after the replica set is setup
+    if (stringChunk.includes('Started replica set')) {
+      console.log('MongoDB setup correctly.');
+      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 => {
@@ -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 mongooseOptions = !isProd ? {} : {
-    keepAlive: 1,
-    connectTimeoutMS: 30000,
-  };
+  const IS_PROD = nconf.get('NODE_ENV') === 'production';
+  const NODE_DB_URI = nconf.get('NODE_DB_URI');
+
+  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;
@@ -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:run',
+  'test:api:unit',
  'test:api-v3:integration',
  done => done(),
 ));
-
-gulp.task('test:api:unit', gulp.series(
-  'test:prepare:mongo',
-  'test:api:unit:run',
-  done => done(),
-));
@@ -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
+  }
+};
@@ -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
+  }
+};
@@ -1,18 +1,18 @@
 {
  "name": "habitica",
  "description": "A habit tracker app which treats your goals like a Role Playing Game.",
-  "version": "4.148.2",
+  "version": "4.152.2",
  "main": "./website/server/index.js",
  "dependencies": {
-    "@babel/core": "^7.10.3",
-    "@babel/preset-env": "^7.10.3",
+    "@babel/core": "^7.11.1",
+    "@babel/preset-env": "^7.11.0",
    "@babel/register": "^7.10.3",
    "@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.23.0",
+    "apidoc": "^0.24.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,7 +30,7 @@
    "express-basic-auth": "^1.1.5",
    "express-validator": "^5.2.0",
    "glob": "^7.1.6",
-    "got": "^11.3.0",
+    "got": "^11.5.2",
    "gulp": "^4.0.0",
    "gulp-babel": "^8.0.0",
    "gulp-imagemin": "^7.1.0",
@@ -43,32 +43,34 @@
    "js2xmlparser": "^4.0.1",
    "jsonwebtoken": "^8.5.1",
    "jwks-rsa": "^1.8.1",
-    "lodash": "^4.17.15",
+    "lodash": "^4.17.19",
    "merge-stream": "^2.0.0",
    "method-override": "^3.0.0",
    "moment": "^2.27.0",
    "moment-recur": "^1.0.7",
-    "mongoose": "^5.9.20",
+    "mongoose": "^5.9.27",
    "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.3.1",
-    "universal-analytics": "^0.4.17",
+    "superagent": "^6.0.0",
+    "universal-analytics": "^0.4.23",
    "useragent": "^2.1.9",
-    "uuid": "^8.2.0",
+    "uuid": "^8.3.0",
    "validator": "^13.1.1",
    "vinyl-buffer": "^1.0.1",
    "winston": "^3.3.3",
@@ -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,12 +112,15 @@
    "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.1",
    "require-again": "^2.0.0",
+    "run-rs": "^0.6.2",
    "sinon": "^9.0.2",
    "sinon-chai": "^3.5.0",
    "sinon-stub-promise": "^4.0.0"
@@ -31,19 +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}@example.com`;
+  if (!user.auth.local.email) set['auth.local.email'] = `${truncatedEmail}-gdpr@example.com`;
  await User.update(
    { _id: user._id },
    { $set: set },
  );
+  await new Promise(resolve => setTimeout(resolve, 1000));
  const response = await axios.delete(
    `${BASE_URL}/api/v3/user`,
    {
@@ -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({
@@ -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']);
+    });
+  });
+});
@@ -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'],
    });
  });
@@ -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;
@@ -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', () => {
-    req.headers['x-forwarded-for'] = '192.168.1.1';
+  it('throws when the ip is blocked', () => {
+    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);
-  });
 });
@@ -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),
+    });
+  });
+});
@@ -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';

@@ -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]);

@@ -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 () => {
@@ -761,7 +761,7 @@ describe('User Model', () => {
    });
  });

-  context('days missed', () => {
+  describe('daysUserHasMissed', () => {
    // http://forbrains.co.uk/international_tools/earth_timezones
    let user;

@@ -769,24 +769,51 @@ describe('User Model', () => {
      user = new User();
    });

-    it('should not cron early when going back a timezone', () => {
-      const yesterday = moment('2017-12-05T00:00:00.000-06:00'); // 11 pm on 4 Texas
-      const timezoneOffset = moment().zone('-06:00').zone();
-      user.lastCron = yesterday;
-      user.preferences.timezoneOffset = timezoneOffset;
+    it('correctly calculates days missed since lastCron', () => {
+      const now = moment();
+      user.lastCron = moment(now).subtract(5, 'days');

-      const today = moment('2017-12-06T00:00:00.000-06:00'); // 11 pm on 4 Texas
-      const req = {};
-      req.header = () => timezoneOffset + 60;
+      const { daysMissed } = user.daysUserHasMissed(now);

-      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;
@@ -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);
@@ -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 });
@@ -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() });

@@ -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`))
-      .to.eventually.be.rejected.and.to.eql({
-        code: 401,
-        error: 'NotAuthorized',
-        message: t('taskApprovalHasBeenRequested'),
-      });
+    await nonManager.post(`/tasks/${syncedTask._id}/score/up`);

    const updatedGroup = await leader.post(`/groups/${groupToUpdate._id}/remove-manager`, {
      managerId: nonLeader._id,
@@ -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`);

@@ -153,12 +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', [
      {
@@ -180,12 +180,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 = 240;
+    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', [
      {
@@ -207,12 +207,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 = 540;
+    const timezoneOffset = 540;
    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', [
      {
@@ -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;

@@ -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`))
-      .to.eventually.be.rejected.and.to.eql({
-        code: 401,
-        error: 'NotAuthorized',
-        message: t('taskApprovalHasBeenRequested'),
-      });
+    await member.post(`/tasks/${syncedTask._id}/score/up`);

    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(member2SyncedTask.group.broken).to.equal('TASK_DELETED');
+    expect(syncedTask).to.not.exist;
+    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);
@@ -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`))
-      .to.eventually.be.rejected.and.to.eql({
-        code: 401,
-        error: 'NotAuthorized',
-        message: t('taskApprovalHasBeenRequested'),
-      });
-
+    await member.post(`/tasks/${syncedTask._id}/score/up`);
    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`))
-      .to.eventually.be.rejected.and.to.eql({
-        code: 401,
-        error: 'NotAuthorized',
-        message: t('taskApprovalHasBeenRequested'),
-      });
-
+    await member.post(`/tasks/${syncedTask._id}/score/up`);
    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`))
-      .to.eventually.be.rejected.and.to.eql({
-        code: 401,
-        error: 'NotAuthorized',
-        message: t('taskApprovalHasBeenRequested'),
-      });
+    await member.post(`/tasks/${syncedTask._id}/score/up`);

    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`))
-      .to.eventually.be.rejected.and.to.eql({
-        code: 401,
-        error: 'NotAuthorized',
-        message: t('taskApprovalHasBeenRequested'),
-      });
-
+    await member.post(`/tasks/${syncedTask._id}/score/up`);
    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`))
-      .to.eventually.be.rejected.and.to.eql({
-        code: 401,
-        error: 'NotAuthorized',
-        message: t('taskApprovalHasBeenRequested'),
-      });
-
+    await member.post(`/tasks/${syncedTask._id}/score/up`);
    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`))
-      .to.eventually.be.rejected.and.to.eql({
-        code: 401,
-        error: 'NotAuthorized',
-        message: t('taskApprovalHasBeenRequested'),
-      });
-
+    await member.post(`/tasks/${syncedTask._id}/score/up`);
    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`))
-      .to.eventually.be.rejected.and.to.eql({
-        code: 401,
-        error: 'NotAuthorized',
-        message: t('taskApprovalHasBeenRequested'),
-      });
-
+    await member.post(`/tasks/${syncedTask._id}/score/up`);
    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`))
-      .to.eventually.be.rejected.and.to.eql({
-        code: 401,
-        error: 'NotAuthorized',
-        message: t('taskApprovalHasBeenRequested'),
-      });
-
+    await member.post(`/tasks/${syncedTask._id}/score/up`);
    const member2Tasks = await member2.get('/tasks/user');
    const member2SyncedTask = find(member2Tasks, findAssignedTask);
-    await expect(member2.post(`/tasks/${member2SyncedTask._id}/score/up`))
-      .to.eventually.be.rejected.and.to.eql({
-        code: 401,
-        error: 'NotAuthorized',
-        message: t('taskApprovalHasBeenRequested'),
-      });
+    await member2.post(`/tasks/${member2SyncedTask._id}/score/up`);

    await user.post(`/tasks/${sharedCompletionTask._id}/approve/${member._id}`);
    await user.post(`/tasks/${sharedCompletionTask._id}/approve/${member2._id}`);
@@ -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`))
-      .to.eventually.be.rejected.and.to.eql({
-        code: 401,
-        error: 'NotAuthorized',
-        message: t('taskApprovalHasBeenRequested'),
-      });
-
+    await member.post(`/tasks/${syncedTask._id}/score/up`);
    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`))
-      .to.eventually.be.rejected.and.to.eql({
-        code: 401,
-        error: 'NotAuthorized',
-        message: t('taskApprovalHasBeenRequested'),
-      });
+    await member.post(`/tasks/${syncedTask._id}/score/up`);

    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`))
-      .to.eventually.be.rejected.and.to.eql({
-        code: 401,
-        error: 'NotAuthorized',
-        message: t('taskApprovalHasBeenRequested'),
-      });
-
+    await member.post(`/tasks/${syncedTask._id}/score/up`);
    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({
@@ -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}`))
-      .to.eventually.be.rejected.and.to.eql({
-        code: 401,
-        error: 'NotAuthorized',
-        message: t('taskApprovalHasBeenRequested'),
-      });
+    const response = await member.post(`/tasks/${syncedTask._id}/score/${direction}`);
+
+    expect(response.data.approvalRequested).to.equal(true);
+    expect(response.message).to.equal(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}`))
-      .to.eventually.be.rejected.and.to.eql({
-        code: 401,
-        error: 'NotAuthorized',
-        message: t('taskApprovalHasBeenRequested'),
-      });
+    await member.post(`/tasks/${syncedTask._id}/score/${direction}`);
    const updatedTask = await member.get(`/tasks/${syncedTask._id}`);
    await user.sync();
    await member2.sync();
@@ -111,12 +105,7 @@ 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`))
-      .to.eventually.be.rejected.and.to.eql({
-        code: 401,
-        error: 'NotAuthorized',
-        message: t('taskApprovalHasBeenRequested'),
-      });
+    await member.post(`/tasks/${syncedTask._id}/score/up`);

    await expect(member.post(`/tasks/${syncedTask._id}/score/up`))
      .to.eventually.be.rejected.and.eql({
@@ -130,12 +119,7 @@ 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`))
-      .to.eventually.be.rejected.and.to.eql({
-        code: 401,
-        error: 'NotAuthorized',
-        message: t('taskApprovalHasBeenRequested'),
-      });
+    await member.post(`/tasks/${syncedTask._id}/score/up`);

    await user.post(`/tasks/${task._id}/approve/${member._id}`);

@@ -71,12 +71,10 @@ describe('PUT /tasks/: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`))
-      .to.eventually.be.rejected.and.to.eql({
-        code: 401,
-        error: 'NotAuthorized',
-        message: t('taskApprovalHasBeenRequested'),
-      });
+    const response = await member2.post(`/tasks/${syncedTask._id}/score/up`);
+
+    expect(response.data.approvalRequested).to.equal(true);
+    expect(response.message).to.equal(t('taskApprovalHasBeenRequested'));
  });

  it('member updates a group task value - not allowed', async () => {
@@ -161,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' },
@@ -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);
+    });
  });
 });
@@ -92,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'),
+      });
    });
  });

@@ -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 webhook = await user.put(`/user/webhook/${webhookToUpdate.id}`, { type, options });
-
-    expect(webhook.options).to.eql({
-      checklistScored: false, // starting value
+    const expected = {
+      checklistScored: true,
      created: true, // starting value
      updated: false,
-      deleted: true,
-      scored: true, // default value
-    });
+      deleted: false, // starting 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 () => {
@@ -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')] });
+    });
  });
 });
@@ -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);
+  });
+});
@@ -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);
+    });
+  });
+});
@@ -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(),
@@ -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;
@@ -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();
+    }
+  });
 });
@@ -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);
      });
@@ -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');
@@ -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';

@@ -0,0 +1,13 @@
+.background {
+    background: teal;
+    display: inline-block;
+}
+
+.content {
+    color: white;
+    background: grey;
+}
+
+.inline-block {
+    display: inline-block;
+}
@@ -5,9 +5,9 @@
  "requires": true,
  "dependencies": {
    "@amplitude/ua-parser-js": {
-      "version": "0.7.20",
-      "resolved": "https://registry.npmjs.org/@amplitude/ua-parser-js/-/ua-parser-js-0.7.20.tgz",
-      "integrity": "sha512-bmW++BLt1Hg+4HCExLXP+0Jhgy2eTsEevqkVc5o4yYbgwdP/gV3gEQXzyVrMVlWWNLgph/tFIkf5PVlSpCELEg=="
+      "version": "0.7.24",
+      "resolved": "https://registry.npmjs.org/@amplitude/ua-parser-js/-/ua-parser-js-0.7.24.tgz",
+      "integrity": "sha512-VbQuJymJ20WEw0HtI2np7EdC3NJGUWi8+Xdbc7uk8WfMIF308T0howpzkQ3JFMN7ejnrcSM/OyNGveeE3TP3TA=="
    },
    "@babel/code-frame": {
      "version": "7.5.5",
@@ -5859,11 +5859,11 @@
      "integrity": "sha1-l6ERlkmyEa0zaR2fn0hqjsn74KM="
    },
    "amplitude-js": {
-      "version": "6.2.0",
-      "resolved": "https://registry.npmjs.org/amplitude-js/-/amplitude-js-6.2.0.tgz",
-      "integrity": "sha512-l+00XubD0ZJHcWUBMzV6JrtXs1JhsqO/qGoDbYLtljtgup/cCclOAuirwQJMtYLRP6vEmstGjZtq1Ew9nWnzug==",
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/amplitude-js/-/amplitude-js-7.1.0.tgz",
+      "integrity": "sha512-X2Jf4piKGhoPcGow1AZAw73s5tzP6OZLiUkLsnus6Mrx7zZwmCsxIuvhzB8VRnNGUE71m1zemSu0gEmf8A4qnw==",
      "requires": {
-        "@amplitude/ua-parser-js": "0.7.20",
+        "@amplitude/ua-parser-js": "0.7.24",
        "blueimp-md5": "^2.10.0",
        "query-string": "5"
      },
@@ -6336,6 +6336,13 @@
        "bn.js": "^4.0.0",
        "inherits": "^2.0.1",
        "minimalistic-assert": "^1.0.0"
+      },
+      "dependencies": {
+        "bn.js": {
+          "version": "4.11.9",
+          "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.9.tgz",
+          "integrity": "sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw=="
+        }
      }
    },
    "assert": {
@@ -7074,9 +7081,9 @@
      "integrity": "sha512-j4nzWIqEFpLSbdhUApHRGDwfXbV8ALhqOn+FY5L6XBdKPAXU9BpGgFSbDsgqogfqPPR9R2WooseWCsfhfEC6uQ=="
    },
    "bn.js": {
-      "version": "4.11.8",
-      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.8.tgz",
-      "integrity": "sha512-ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA=="
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-5.1.2.tgz",
+      "integrity": "sha512-40rZaf3bUNKTVYu9sIeeEGOg7g14Yvnj9kH7b50EiwX0Q7A6umbvfI5tvHaOERH0XigqKkfLkFQxzb4e6CIXnA=="
    },
    "body-parser": {
      "version": "1.19.0",
@@ -7141,14 +7148,14 @@
      "integrity": "sha1-aN/1++YMUes3cl6p4+0xDcwed24="
    },
    "bootstrap": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-4.5.0.tgz",
-      "integrity": "sha512-Z93QoXvodoVslA+PWNdk23Hze4RBYIkpb5h8I2HY2Tu2h7A0LpAgLcyrhrSUyo2/Oxm2l1fRZPs1e5hnxnliXA=="
+      "version": "4.5.2",
+      "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-4.5.2.tgz",
+      "integrity": "sha512-vlGn0bcySYl/iV+BGA544JkkZP5LB3jsmkeKLFQakCOwCM3AOk7VkldBz4jrzSe+Z0Ezn99NVXa1o45cQY4R6A=="
    },
    "bootstrap-vue": {
-      "version": "2.15.0",
-      "resolved": "https://registry.npmjs.org/bootstrap-vue/-/bootstrap-vue-2.15.0.tgz",
-      "integrity": "sha512-ncxWkDG0mKFVot314wWKJELi+ESO7k6ngV//qvJFs9iVzlFI8Hx3rBVbpcPW2vrJ+0vitH8N2SOwn4fdQ3frMQ==",
+      "version": "2.16.0",
+      "resolved": "https://registry.npmjs.org/bootstrap-vue/-/bootstrap-vue-2.16.0.tgz",
+      "integrity": "sha512-gLETwPmeRHCe5WHmhGxzb5PtTEuKqQPGl0TFvZ2Odbkg/7UuIHdqIexrJRerpnomP4ZzDQ+qYGL91Ls9lcQsJQ==",
      "requires": {
        "@nuxt/opencollective": "^0.3.0",
        "bootstrap": ">=4.5.0 <5.0.0",
@@ -7355,20 +7362,46 @@
      "requires": {
        "bn.js": "^4.1.0",
        "randombytes": "^2.0.1"
+      },
+      "dependencies": {
+        "bn.js": {
+          "version": "4.11.9",
+          "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.9.tgz",
+          "integrity": "sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw=="
+        }
      }
    },
    "browserify-sign": {
-      "version": "4.0.4",
-      "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.0.4.tgz",
-      "integrity": "sha1-qk62jl17ZYuqa/alfmMMvXqT0pg=",
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.2.0.tgz",
+      "integrity": "sha512-hEZC1KEeYuoHRqhGhTy6gWrpJA3ZDjFWv0DE61643ZnOXAKJb3u7yWcrU0mMc9SwAqK1n7myPGndkp0dFG7NFA==",
      "requires": {
-        "bn.js": "^4.1.1",
-        "browserify-rsa": "^4.0.0",
-        "create-hash": "^1.1.0",
-        "create-hmac": "^1.1.2",
-        "elliptic": "^6.0.0",
-        "inherits": "^2.0.1",
-        "parse-asn1": "^5.0.0"
+        "bn.js": "^5.1.1",
+        "browserify-rsa": "^4.0.1",
+        "create-hash": "^1.2.0",
+        "create-hmac": "^1.1.7",
+        "elliptic": "^6.5.2",
+        "inherits": "^2.0.4",
+        "parse-asn1": "^5.1.5",
+        "readable-stream": "^3.6.0",
+        "safe-buffer": "^5.2.0"
+      },
+      "dependencies": {
+        "readable-stream": {
+          "version": "3.6.0",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
+          "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
+          "requires": {
+            "inherits": "^2.0.3",
+            "string_decoder": "^1.1.1",
+            "util-deprecate": "^1.0.1"
+          }
+        },
+        "safe-buffer": {
+          "version": "5.2.1",
+          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+          "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ=="
+        }
      }
    },
    "browserify-zlib": {
@@ -8239,9 +8272,9 @@
      "integrity": "sha512-e54B99q/OUoH64zYYRf3HBP5z24G38h5D3qXu23JGRoigpX5Ss4r9ZnDk3g0Z8uQC2x2lPaJ+UlWBc1ZWBWdLg=="
    },
    "consola": {
-      "version": "2.12.1",
-      "resolved": "https://registry.npmjs.org/consola/-/consola-2.12.1.tgz",
-      "integrity": "sha512-aEkkju9ZcEa9y2MhzNhfmTUws/CEZZ0LKu0FxftSU3HygPfVMMIMSYyYct+xBN6XNRhsaDZjw2HAv3m2ammXSA=="
+      "version": "2.14.0",
+      "resolved": "https://registry.npmjs.org/consola/-/consola-2.14.0.tgz",
+      "integrity": "sha512-A2j1x4u8d6SIVikhZROfpFJxQZie+cZOfQMyI/tu2+hWXe8iAv7R6FW6s6x04/7zBCst94lPddztot/d6GJiuQ=="
    },
    "console-browserify": {
      "version": "1.2.0",
@@ -8490,6 +8523,13 @@
      "requires": {
        "bn.js": "^4.1.0",
        "elliptic": "^6.0.0"
+      },
+      "dependencies": {
+        "bn.js": {
+          "version": "4.11.9",
+          "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.9.tgz",
+          "integrity": "sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw=="
+        }
      }
    },
    "create-hash": {
@@ -9110,6 +9150,13 @@
        "bn.js": "^4.1.0",
        "miller-rabin": "^4.0.0",
        "randombytes": "^2.0.0"
+      },
+      "dependencies": {
+        "bn.js": {
+          "version": "4.11.9",
+          "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.9.tgz",
+          "integrity": "sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw=="
+        }
      }
    },
    "dir-glob": {
@@ -9371,9 +9418,9 @@
      }
    },
    "elliptic": {
-      "version": "6.5.2",
-      "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.2.tgz",
-      "integrity": "sha512-f4x70okzZbIQl/NSRLkI/+tteV/9WqL98zx+SQ69KbXxmVrmjwsNUPn/gYJJ0sHvEak24cZgHIPegRePAtA/xw==",
+      "version": "6.5.3",
+      "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.3.tgz",
+      "integrity": "sha512-IMqzv5wNQf+E6aHeIqATs0tOLeOTwj1QKbRcS3jBbYkl5oLAserA8yJTT7/VyHUYG91PRmPyeQDObKLPpeS4dw==",
      "requires": {
        "bn.js": "^4.4.0",
        "brorand": "^1.0.1",
@@ -9382,6 +9429,13 @@
        "inherits": "^2.0.1",
        "minimalistic-assert": "^1.0.0",
        "minimalistic-crypto-utils": "^1.0.0"
+      },
+      "dependencies": {
+        "bn.js": {
+          "version": "4.11.9",
+          "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.9.tgz",
+          "integrity": "sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw=="
+        }
      }
    },
    "emoji-regex": {
@@ -9426,9 +9480,9 @@
      }
    },
    "enhanced-resolve": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-4.1.1.tgz",
-      "integrity": "sha512-98p2zE+rL7/g/DzMHMTF4zZlCgeVdJ7yr6xzEpJRYwFYrGi9ANdn5DnJURg6RpBkyk60XYDnWIv51VfIhfNGuA==",
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-4.3.0.tgz",
+      "integrity": "sha512-3e87LvavsdxyoCfGusJnrZ5G8SLPOFeHSNpZI/ATL9a5leXo2k0w6MKnbqhdBad9qTobSfB20Ld7UmgoNbAZkQ==",
      "requires": {
        "graceful-fs": "^4.1.2",
        "memory-fs": "^0.5.0",
@@ -10021,9 +10075,9 @@
      "integrity": "sha512-qerSRB0p+UDEssxTtm6EDKcE7W4OaoisfIMl4CngyEhjpYglocpNg6UEqCvemdGhosAsg4sO2dXJOdyBifPGCg=="
    },
    "events": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/events/-/events-3.1.0.tgz",
-      "integrity": "sha512-Rv+u8MLHNOdMjTAFeT3nCjHn2aGlx435FP/sDHNaRhDEMwyI/aB22Kj2qIN8R0cw3z28psEQLYwxVKLsKrMgWg=="
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/events/-/events-3.2.0.tgz",
+      "integrity": "sha512-/46HWwbfCX2xTawVfkKLGxMifJYQBWMwY1mjywRtb4c9x8l5NP3KoJtnIOiL1hfdRkIuYhETxQlo62IF8tcnlg=="
    },
    "eventsource": {
      "version": "1.0.7",
@@ -11647,12 +11701,30 @@
      }
    },
    "hash-base": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.0.4.tgz",
-      "integrity": "sha1-X8hoaEfs1zSZQDMZprCj8/auSRg=",
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.1.0.tgz",
+      "integrity": "sha512-1nmYp/rhMDiE7AYkDw+lLwlAzz0AntGIe51F3RfFfEqyQ3feY2eI/NcwC6umIQVOASPMsWJLJScWKSSvzL9IVA==",
      "requires": {
-        "inherits": "^2.0.1",
-        "safe-buffer": "^5.0.1"
+        "inherits": "^2.0.4",
+        "readable-stream": "^3.6.0",
+        "safe-buffer": "^5.2.0"
+      },
+      "dependencies": {
+        "readable-stream": {
+          "version": "3.6.0",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
+          "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
+          "requires": {
+            "inherits": "^2.0.3",
+            "string_decoder": "^1.1.1",
+            "util-deprecate": "^1.0.1"
+          }
+        },
+        "safe-buffer": {
+          "version": "5.2.1",
+          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+          "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ=="
+        }
      }
    },
    "hash-sum": {
@@ -13253,9 +13325,9 @@
      }
    },
    "lodash": {
-      "version": "4.17.15",
-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz",
-      "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A=="
+      "version": "4.17.19",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.19.tgz",
+      "integrity": "sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ=="
    },
    "lodash.debounce": {
      "version": "4.0.8",
@@ -13556,6 +13628,13 @@
      "requires": {
        "bn.js": "^4.0.0",
        "brorand": "^1.0.1"
+      },
+      "dependencies": {
+        "bn.js": {
+          "version": "4.11.9",
+          "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.9.tgz",
+          "integrity": "sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw=="
+        }
      }
    },
    "mime": {
@@ -14998,9 +15077,9 @@
      "integrity": "sha1-uULm1L3mUwBe9rcTYd74cn0GReA="
    },
    "pbkdf2": {
-      "version": "3.0.17",
-      "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.17.tgz",
-      "integrity": "sha512-U/il5MsrZp7mGg3mSQfn742na2T+1/vHDCG5/iTI3X9MKUuYUZVLQhyRsg06mCgDBTd57TxzgZt7P+fYfjRLtA==",
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.1.1.tgz",
+      "integrity": "sha512-4Ejy1OPxi9f2tt1rRV7Go7zmfDQ+ZectEQz3VGUQhgq62HtIRPDyG/JtnwIxs6x3uNMwo2V7q1fMvKjb+Tnpqg==",
      "requires": {
        "create-hash": "^1.1.2",
        "create-hmac": "^1.1.4",
@@ -16060,6 +16139,13 @@
        "parse-asn1": "^5.0.0",
        "randombytes": "^2.0.1",
        "safe-buffer": "^5.1.2"
+      },
+      "dependencies": {
+        "bn.js": {
+          "version": "4.11.9",
+          "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.9.tgz",
+          "integrity": "sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw=="
+        }
      }
    },
    "pump": {
@@ -17161,9 +17247,9 @@
      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
    },
    "sass": {
-      "version": "1.26.9",
-      "resolved": "https://registry.npmjs.org/sass/-/sass-1.26.9.tgz",
-      "integrity": "sha512-t8AkRVi+xvba4yZiLWkJdgJHBFCB3Dh4johniQkPy9ywkgFHNasXFEFP+RG/F6LhQ+aoE4aX+IorIWQjS0esVw==",
+      "version": "1.26.10",
+      "resolved": "https://registry.npmjs.org/sass/-/sass-1.26.10.tgz",
+      "integrity": "sha512-bzN0uvmzfsTvjz0qwccN1sPm2HxxpNI/Xa+7PlUEMS+nQvbyuEK7Y0qFqxlPHhiNHb1Ze8WQJtU31olMObkAMw==",
      "requires": {
        "chokidar": ">=2.0.0 <4.0.0"
      }
@@ -19630,9 +19716,9 @@
      "integrity": "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM="
    },
    "uuid": {
-      "version": "8.2.0",
-      "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.2.0.tgz",
-      "integrity": "sha512-CYpGiFTUrmI6OBMkAdjSDM0k5h8SkkiTP4WAjQgDgNB1S3Ou9VBEvr6q0Kv2H1mMk7IWfxYGpMH5sd5AvcIV2Q=="
+      "version": "8.3.0",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.0.tgz",
+      "integrity": "sha512-fX6Z5o4m6XsXBdli9g7DtWgAx+osMsRRZFKma1mIUsLCz6vRvv+pz5VNbyu9UEDzpMWulZfvpgb/cmDXVulYFQ=="
    },
    "v8-compile-cache": {
      "version": "2.1.0",
@@ -19756,9 +19842,9 @@
      }
    },
    "vue-router": {
-      "version": "3.3.4",
-      "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-3.3.4.tgz",
-      "integrity": "sha512-SdKRBeoXUjaZ9R/8AyxsdTqkOfMcI5tWxPZOUX5Ie1BTL5rPSZ0O++pbiZCeYeythiZIdLEfkDiQPKIaWk5hDg=="
+      "version": "3.4.2",
+      "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-3.4.2.tgz",
+      "integrity": "sha512-n3Ok70hW0EpcJF4lcWIwSHAQbFTnIOLl/fhO8+oTs4jHNtBNsovcVvPZeTOyKEd8C3xF1Crft2ASuOiVT5K1mw=="
    },
    "vue-style-loader": {
      "version": "4.1.2",
@@ -19791,16 +19877,16 @@
      "integrity": "sha512-4gDntzrifFnCEvyoO8PqyJDmguXgVPxKiIxrBKjIowvL9l+N66196+72XVYR8BBf1Uv1Fgt3bGevJ+sEmxfZzw=="
    },
    "vuedraggable": {
-      "version": "2.23.2",
-      "resolved": "https://registry.npmjs.org/vuedraggable/-/vuedraggable-2.23.2.tgz",
-      "integrity": "sha512-PgHCjUpxEAEZJq36ys49HfQmXglattf/7ofOzUrW2/rRdG7tu6fK84ir14t1jYv4kdXewTEa2ieKEAhhEMdwkQ==",
+      "version": "2.24.0",
+      "resolved": "https://registry.npmjs.org/vuedraggable/-/vuedraggable-2.24.0.tgz",
+      "integrity": "sha512-IlslPpc+iZ2zPNSJbydFZIDrE+don5u+Nc/bjT2YaF+Azidc+wxxJKfKT0NwE68AKk0syb0YbZneAcnynqREZQ==",
      "requires": {
        "sortablejs": "^1.10.1"
      }
    },
    "vuejs-datepicker": {
-      "version": "git://github.com/habitrpg/vuejs-datepicker.git#5d237615463a84a23dd6f3f77c6ab577d68593ec",
-      "from": "git://github.com/habitrpg/vuejs-datepicker.git#5d237615463a84a23dd6f3f77c6ab577d68593ec"
+      "version": "git://github.com/habitrpg/vuejs-datepicker.git#153d339e4dbebb73733658aeda1d5b7fcc55b0a0",
+      "from": "git://github.com/habitrpg/vuejs-datepicker.git#153d339e4dbebb73733658aeda1d5b7fcc55b0a0"
    },
    "w3c-hr-time": {
      "version": "1.0.2",
@@ -19829,13 +19915,123 @@
      }
    },
    "watchpack": {
-      "version": "1.6.1",
-      "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-1.6.1.tgz",
-      "integrity": "sha512-+IF9hfUFOrYOOaKyfaI7h7dquUIOgyEMoQMLA7OP5FxegKA2+XdXThAZ9TU2kucfhDH7rfMHs1oPYziVGWRnZA==",
+      "version": "1.7.4",
+      "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-1.7.4.tgz",
+      "integrity": "sha512-aWAgTW4MoSJzZPAicljkO1hsi1oKj/RRq/OJQh2PKI2UKL04c2Bs+MBOB+BBABHTXJpf9mCwHN7ANCvYsvY2sg==",
      "requires": {
-        "chokidar": "^2.1.8",
+        "chokidar": "^3.4.1",
        "graceful-fs": "^4.1.2",
-        "neo-async": "^2.5.0"
+        "neo-async": "^2.5.0",
+        "watchpack-chokidar2": "^2.0.0"
+      },
+      "dependencies": {
+        "anymatch": {
+          "version": "3.1.1",
+          "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.1.tgz",
+          "integrity": "sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg==",
+          "optional": true,
+          "requires": {
+            "normalize-path": "^3.0.0",
+            "picomatch": "^2.0.4"
+          }
+        },
+        "binary-extensions": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.1.0.tgz",
+          "integrity": "sha512-1Yj8h9Q+QDF5FzhMs/c9+6UntbD5MkRfRwac8DoEm9ZfUBZ7tZ55YcGVAzEe4bXsdQHEk+s9S5wsOKVdZrw0tQ==",
+          "optional": true
+        },
+        "braces": {
+          "version": "3.0.2",
+          "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
+          "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
+          "optional": true,
+          "requires": {
+            "fill-range": "^7.0.1"
+          }
+        },
+        "chokidar": {
+          "version": "3.4.1",
+          "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.4.1.tgz",
+          "integrity": "sha512-TQTJyr2stihpC4Sya9hs2Xh+O2wf+igjL36Y75xx2WdHuiICcn/XJza46Jwt0eT5hVpQOzo3FpY3cj3RVYLX0g==",
+          "optional": true,
+          "requires": {
+            "anymatch": "~3.1.1",
+            "braces": "~3.0.2",
+            "fsevents": "~2.1.2",
+            "glob-parent": "~5.1.0",
+            "is-binary-path": "~2.1.0",
+            "is-glob": "~4.0.1",
+            "normalize-path": "~3.0.0",
+            "readdirp": "~3.4.0"
+          }
+        },
+        "fill-range": {
+          "version": "7.0.1",
+          "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
+          "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
+          "optional": true,
+          "requires": {
+            "to-regex-range": "^5.0.1"
+          }
+        },
+        "fsevents": {
+          "version": "2.1.3",
+          "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.1.3.tgz",
+          "integrity": "sha512-Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ==",
+          "optional": true
+        },
+        "glob-parent": {
+          "version": "5.1.1",
+          "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.1.tgz",
+          "integrity": "sha512-FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ==",
+          "optional": true,
+          "requires": {
+            "is-glob": "^4.0.1"
+          }
+        },
+        "is-binary-path": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
+          "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
+          "optional": true,
+          "requires": {
+            "binary-extensions": "^2.0.0"
+          }
+        },
+        "is-number": {
+          "version": "7.0.0",
+          "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
+          "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
+          "optional": true
+        },
+        "readdirp": {
+          "version": "3.4.0",
+          "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.4.0.tgz",
+          "integrity": "sha512-0xe001vZBnJEK+uKcj8qOhyAKPzIT+gStxWr3LCB0DwcXR5NZJ3IaC+yGnHCYzB/S7ov3m3EEbZI2zeNvX+hGQ==",
+          "optional": true,
+          "requires": {
+            "picomatch": "^2.2.1"
+          }
+        },
+        "to-regex-range": {
+          "version": "5.0.1",
+          "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
+          "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
+          "optional": true,
+          "requires": {
+            "is-number": "^7.0.0"
+          }
+        }
+      }
+    },
+    "watchpack-chokidar2": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/watchpack-chokidar2/-/watchpack-chokidar2-2.0.0.tgz",
+      "integrity": "sha512-9TyfOyN/zLUbA288wZ8IsMZ+6cbzvsNyEzSBp6e/zkifi6xxbl8SmQ/CxQq32k8NNqrdVEVUVSEf56L4rQ/ZxA==",
+      "optional": true,
+      "requires": {
+        "chokidar": "^2.1.8"
      }
    },
    "wbuf": {
@@ -19860,9 +20056,9 @@
      "integrity": "sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg=="
    },
    "webpack": {
-      "version": "4.43.0",
-      "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.43.0.tgz",
-      "integrity": "sha512-GW1LjnPipFW2Y78OOab8NJlCflB7EFskMih2AHdvjbpKMeDJqEgSx24cXXXiPS65+WSwVyxtDsJH6jGX2czy+g==",
+      "version": "4.44.1",
+      "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.44.1.tgz",
+      "integrity": "sha512-4UOGAohv/VGUNQJstzEywwNxqX417FnjZgZJpJQegddzPmTvph37eBIRbRTfdySXzVtJXLJfbMN3mMYhM6GdmQ==",
      "requires": {
        "@webassemblyjs/ast": "1.9.0",
        "@webassemblyjs/helper-module-context": "1.9.0",
@@ -19872,7 +20068,7 @@
        "ajv": "^6.10.2",
        "ajv-keywords": "^3.4.1",
        "chrome-trace-event": "^1.0.2",
-        "enhanced-resolve": "^4.1.0",
+        "enhanced-resolve": "^4.3.0",
        "eslint-scope": "^4.0.3",
        "json-parse-better-errors": "^1.0.2",
        "loader-runner": "^2.4.0",
@@ -19885,7 +20081,7 @@
        "schema-utils": "^1.0.0",
        "tapable": "^1.1.3",
        "terser-webpack-plugin": "^1.4.3",
-        "watchpack": "^1.6.1",
+        "watchpack": "^1.7.4",
        "webpack-sources": "^1.4.1"
      },
      "dependencies": {
@@ -19902,21 +20098,29 @@
            "minimist": "^1.2.5"
          }
        },
+        "serialize-javascript": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-3.1.0.tgz",
+          "integrity": "sha512-JIJT1DGiWmIKhzRsG91aS6Ze4sFUrYbltlkg2onR5OrnNM02Kl/hnY/T4FN2omvyeBbQmMJv+K4cPOpGzOTFBg==",
+          "requires": {
+            "randombytes": "^2.1.0"
+          }
+        },
        "source-map": {
          "version": "0.6.1",
          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
        },
        "terser-webpack-plugin": {
-          "version": "1.4.3",
-          "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-1.4.3.tgz",
-          "integrity": "sha512-QMxecFz/gHQwteWwSo5nTc6UaICqN1bMedC5sMtUc7y3Ha3Q8y6ZO0iCR8pq4RJC8Hjf0FEPEHZqcMB/+DFCrA==",
+          "version": "1.4.4",
+          "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-1.4.4.tgz",
+          "integrity": "sha512-U4mACBHIegmfoEe5fdongHESNJWqsGU+W0S/9+BmYGVQDw1+c2Ow05TpMhxjPK1sRb7cuYq1BPl1e5YHJMTCqA==",
          "requires": {
            "cacache": "^12.0.2",
            "find-cache-dir": "^2.1.0",
            "is-wsl": "^1.1.0",
            "schema-utils": "^1.0.0",
-            "serialize-javascript": "^2.1.2",
+            "serialize-javascript": "^3.1.0",
            "source-map": "^0.6.1",
            "terser": "^4.1.2",
            "webpack-sources": "^1.4.0",
@@ -24,12 +24,12 @@
    "@vue/cli-plugin-unit-mocha": "^4.4.6",
    "@vue/cli-service": "^4.4.6",
    "@vue/test-utils": "1.0.0-beta.29",
-    "amplitude-js": "^6.2.0",
+    "amplitude-js": "^7.1.0",
    "axios": "^0.19.2",
    "axios-progress-bar": "^1.2.0",
    "babel-eslint": "^10.1.0",
-    "bootstrap": "^4.5.0",
-    "bootstrap-vue": "^2.15.0",
+    "bootstrap": "^4.5.2",
+    "bootstrap-vue": "^2.16.0",
    "chai": "^4.1.2",
    "core-js": "^3.6.5",
    "eslint": "^6.8.0",
@@ -41,25 +41,25 @@
    "inspectpack": "^4.5.2",
    "intro.js": "^2.9.3",
    "jquery": "^3.5.1",
-    "lodash": "^4.17.15",
+    "lodash": "^4.17.19",
    "moment": "^2.27.0",
    "nconf": "^0.10.0",
-    "sass": "^1.26.9",
+    "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.2.0",
+    "uuid": "^8.3.0",
    "validator": "^13.1.1",
    "vue": "^2.6.11",
    "vue-cli-plugin-storybook": "^0.6.1",
    "vue-mugen-scroll": "^0.2.6",
-    "vue-router": "^3.3.4",
+    "vue-router": "^3.4.2",
    "vue-template-compiler": "^2.6.11",
-    "vuedraggable": "^2.23.2",
-    "vuejs-datepicker": "git://github.com/habitrpg/vuejs-datepicker.git#5d237615463a84a23dd6f3f77c6ab577d68593ec",
-    "webpack": "^4.43.0"
+    "vuedraggable": "^2.24.0",
+    "vuejs-datepicker": "git://github.com/habitrpg/vuejs-datepicker.git#153d339e4dbebb73733658aeda1d5b7fcc55b0a0",
+    "webpack": "^4.44.1"
  }
 }
@@ -218,11 +218,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 +292,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 +364,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 +375,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 +488,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 +513,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 +545,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;
    },
@@ -1,90 +1,42 @@
-.promo_aquatic_amigos_bundle {
-  background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: 0px -883px;
-  width: 423px;
-  height: 147px;
-}
 .promo_armoire_backgrounds_202007 {
  background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: 0px -735px;
+  background-position: -376px 0px;
  width: 423px;
  height: 147px;
 }
-.promo_mystery_202007 {
+.promo_armoire_backgrounds_202008 {
  background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: -848px -735px;
-  width: 282px;
-  height: 147px;
-}
-.promo_sand_sculpture_potions {
-  background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: -424px -735px;
+  background-position: 0px -187px;
  width: 423px;
  height: 147px;
 }
-.promo_seafoam {
+.promo_mystery_202008 {
  background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: -340px -524px;
-  width: 425px;
-  height: 148px;
-}
-.promo_splashy_skins {
-  background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: -409px -337px;
-  width: 375px;
-  height: 186px;
-}
-.customize-option.promo_splashy_skins {
-  background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: -434px -352px;
-  width: 60px;
-  height: 60px;
-}
-.promo_summer_splash_2019 {
-  background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: 0px -337px;
-  width: 408px;
-  height: 186px;
-}
-.promo_summer_splash_2020 {
-  background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: -445px 0px;
-  width: 444px;
-  height: 198px;
+  background-position: 0px -335px;
+  width: 294px;
+  height: 156px;
 }
 .promo_take_this {
  background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: -1032px -389px;
+  background-position: -596px -187px;
  width: 96px;
  height: 69px;
 }
-.scene_achievement {
-  background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: 0px -524px;
-  width: 339px;
-  height: 210px;
-}
-.scene_hat_guild {
+.promo_time_travelers {
  background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
  background-position: 0px 0px;
-  width: 444px;
-  height: 336px;
+  width: 375px;
+  height: 186px;
 }
-.scene_hiking {
+.scene_reading {
  background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: -890px 0px;
-  width: 258px;
-  height: 258px;
+  background-position: -424px -187px;
+  width: 171px;
+  height: 144px;
 }
-.scene_nakonana {
+.scene_rewards {
  background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: -890px -389px;
-  width: 141px;
-  height: 169px;
-}
-.scene_strength {
-  background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: -890px -259px;
-  width: 192px;
-  height: 129px;
+  background-position: 0px -492px;
+  width: 207px;
+  height: 180px;
 }
@@ -1,396 +1,576 @@
+.Pet_Currency_Gem2x {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
+  background-position: -1931px -1025px;
+  width: 30px;
+  height: 26px;
+}
+.PixelPaw-Gold {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
+  background-position: -1929px -711px;
+  width: 51px;
+  height: 51px;
+}
+.PixelPaw {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
+  background-position: -1913px -854px;
+  width: 51px;
+  height: 51px;
+}
+.PixelPaw002 {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
+  background-position: -1905px -923px;
+  width: 51px;
+  height: 51px;
+}
+.pet_key {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
+  background-position: -1929px -642px;
+  width: 68px;
+  height: 68px;
+}
+.rebirth_orb {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
+  background-position: -1935px -763px;
+  width: 68px;
+  height: 68px;
+}
+.seafoam_star {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
+  background-position: -1844px -763px;
+  width: 90px;
+  height: 90px;
+}
+.shop_armoire {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
+  background-position: -1844px -854px;
+  width: 68px;
+  height: 68px;
+}
+.zzz {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
+  background-position: -1963px -551px;
+  width: 40px;
+  height: 40px;
+}
+.zzz_light {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
+  background-position: -1963px -510px;
+  width: 40px;
+  height: 40px;
+}
+.notif_inventory_present_01 {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
+  background-position: -1963px -592px;
+  width: 28px;
+  height: 28px;
+}
+.notif_inventory_present_02 {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
+  background-position: -1981px -711px;
+  width: 28px;
+  height: 28px;
+}
+.notif_inventory_present_03 {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
+  background-position: -1965px -854px;
+  width: 28px;
+  height: 28px;
+}
+.notif_inventory_present_04 {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
+  background-position: -1957px -923px;
+  width: 28px;
+  height: 28px;
+}
+.notif_inventory_present_05 {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
+  background-position: -1844px -996px;
+  width: 28px;
+  height: 28px;
+}
+.notif_inventory_present_06 {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
+  background-position: -1873px -996px;
+  width: 28px;
+  height: 28px;
+}
+.notif_inventory_present_07 {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
+  background-position: -1902px -996px;
+  width: 28px;
+  height: 28px;
+}
+.notif_inventory_present_08 {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
+  background-position: -1931px -996px;
+  width: 28px;
+  height: 28px;
+}
+.notif_inventory_present_09 {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
+  background-position: -1960px -996px;
+  width: 28px;
+  height: 28px;
+}
+.notif_inventory_present_10 {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
+  background-position: -1844px -1025px;
+  width: 28px;
+  height: 28px;
+}
+.notif_inventory_present_11 {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
+  background-position: -1873px -1025px;
+  width: 28px;
+  height: 28px;
+}
+.notif_inventory_present_12 {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
+  background-position: -1902px -1025px;
+  width: 28px;
+  height: 28px;
+}
+.notif_inventory_special_birthday {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
+  background-position: -1989px -996px;
+  width: 20px;
+  height: 24px;
+}
+.notif_inventory_special_congrats {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
+  background-position: -1981px -740px;
+  width: 20px;
+  height: 22px;
+}
+.notif_inventory_special_getwell {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
+  background-position: -1965px -883px;
+  width: 20px;
+  height: 22px;
+}
+.notif_inventory_special_goodluck {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
+  background-position: -1986px -923px;
+  width: 20px;
+  height: 26px;
+}
+.notif_inventory_special_greeting {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
+  background-position: -1986px -883px;
+  width: 20px;
+  height: 22px;
+}
+.notif_inventory_special_nye {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
+  background-position: -1962px -1025px;
+  width: 24px;
+  height: 26px;
+}
+.notif_inventory_special_thankyou {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
+  background-position: -1987px -1025px;
+  width: 20px;
+  height: 24px;
+}
+.notif_inventory_special_valentine {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
+  background-position: -1844px -1054px;
+  width: 20px;
+  height: 24px;
+}
+.npc_bailey {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
+  background-position: -1844px -923px;
+  width: 60px;
+  height: 72px;
+}
+.npc_justin {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
+  background-position: -1844px -642px;
+  width: 84px;
+  height: 120px;
+}
+.npc_matt {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
+  background-position: -191px -1535px;
+  width: 195px;
+  height: 138px;
+}
+.background_dysheartener {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
+  background-position: 0px 0px;
+  width: 306px;
+  height: 202px;
+}
 .banner_flair_dysheartener {
  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -1757px -856px;
+  background-position: -1935px -832px;
  width: 69px;
  height: 18px;
 }
 .phobia_dysheartener {
  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: 0px -1510px;
+  background-position: -1627px -1278px;
  width: 201px;
  height: 195px;
 }
 .quest_alligator {
  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -1540px -1079px;
+  background-position: -1627px -862px;
  width: 201px;
  height: 213px;
 }
 .quest_amber {
  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -1100px -660px;
+  background-position: -307px 0px;
  width: 219px;
  height: 219px;
 }
 .quest_armadillo {
  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -880px -672px;
+  background-position: -527px 0px;
  width: 219px;
  height: 219px;
 }
 .quest_atom1 {
  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -657px -1332px;
+  background-position: -885px -1315px;
  width: 250px;
  height: 150px;
 }
 .quest_atom2 {
  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -1159px -1332px;
+  background-position: -1387px -1315px;
  width: 207px;
  height: 138px;
 }
 .quest_atom3 {
  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -413px -1510px;
+  background-position: -967px -660px;
  width: 216px;
  height: 180px;
 }
 .quest_axolotl {
  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -440px -232px;
+  background-position: 0px -435px;
  width: 219px;
  height: 219px;
 }
 .quest_badger {
  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -660px 0px;
+  background-position: -220px -435px;
  width: 219px;
  height: 219px;
 }
 .quest_basilist {
  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -844px -1510px;
+  background-position: 0px -1719px;
  width: 189px;
  height: 141px;
 }
 .quest_beetle {
  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -1102px -1112px;
+  background-position: -1627px -1076px;
  width: 204px;
  height: 201px;
 }
 .quest_bronze {
  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -220px -452px;
+  background-position: -440px -435px;
  width: 219px;
  height: 219px;
 }
 .quest_bunny {
  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -202px -1510px;
+  background-position: -1187px -880px;
  width: 210px;
  height: 186px;
 }
 .quest_butterfly {
  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -660px -452px;
+  background-position: -747px 0px;
  width: 219px;
  height: 219px;
 }
 .quest_cheetah {
  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -880px 0px;
+  background-position: -747px -220px;
  width: 219px;
  height: 219px;
 }
 .quest_cow {
  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -1757px 0px;
+  background-position: -307px -220px;
  width: 174px;
  height: 213px;
 }
 .quest_dilatory {
  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -880px -440px;
+  background-position: -220px -655px;
  width: 219px;
  height: 219px;
 }
 .quest_dilatoryDistress1 {
  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -1540px -868px;
+  background-position: -1627px -651px;
  width: 210px;
  height: 210px;
 }
 .quest_dilatoryDistress2 {
  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -1757px -573px;
+  background-position: -1844px -208px;
  width: 150px;
  height: 150px;
 }
 .quest_dilatoryDistress3 {
  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -440px -672px;
+  background-position: -440px -655px;
  width: 219px;
  height: 219px;
 }
 .quest_dilatory_derby {
  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -880px -220px;
+  background-position: 0px -655px;
  width: 219px;
  height: 219px;
 }
 .quest_dolphin {
  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -660px -672px;
+  background-position: -660px -655px;
  width: 219px;
  height: 219px;
 }
 .quest_dustbunnies {
  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -220px 0px;
+  background-position: -967px 0px;
  width: 219px;
  height: 219px;
 }
 .quest_egg {
  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -1757px -214px;
+  background-position: -1844px 0px;
  width: 165px;
  height: 207px;
 }
 .quest_evilsanta {
  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -1757px -724px;
+  background-position: -1844px -510px;
  width: 118px;
  height: 131px;
 }
 .quest_evilsanta2 {
  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -1100px -440px;
+  background-position: -967px -220px;
  width: 219px;
  height: 219px;
 }
 .quest_falcon {
  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -1320px 0px;
+  background-position: -967px -440px;
  width: 219px;
  height: 219px;
 }
 .quest_ferret {
  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: 0px -892px;
+  background-position: 0px -875px;
  width: 219px;
  height: 219px;
 }
 .quest_fluorite {
  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -220px -892px;
+  background-position: -220px -875px;
  width: 219px;
  height: 219px;
 }
 .quest_frog {
  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -880px -1112px;
+  background-position: -440px -1315px;
  width: 221px;
  height: 213px;
 }
 .quest_ghost_stag {
  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -660px -892px;
+  background-position: -440px -875px;
  width: 219px;
  height: 219px;
 }
 .quest_goldenknight1 {
  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -880px -892px;
+  background-position: -660px -875px;
  width: 219px;
  height: 219px;
 }
 .quest_goldenknight2 {
  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -908px -1332px;
+  background-position: -1136px -1315px;
  width: 250px;
  height: 150px;
 }
 .quest_goldenknight3 {
  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: 0px 0px;
+  background-position: 0px -203px;
  width: 219px;
  height: 231px;
 }
 .quest_gryphon {
  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -440px -1332px;
+  background-position: -747px -440px;
  width: 216px;
  height: 177px;
 }
 .quest_guineapig {
  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -1320px -440px;
+  background-position: -880px -875px;
  width: 219px;
  height: 219px;
 }
 .quest_harpy {
  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -1320px -660px;
+  background-position: -1187px 0px;
  width: 219px;
  height: 219px;
 }
 .quest_hedgehog {
  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -1307px -1112px;
+  background-position: -1407px -1100px;
  width: 219px;
  height: 186px;
 }
 .quest_hippo {
  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: 0px -1112px;
+  background-position: -1187px -220px;
  width: 219px;
  height: 219px;
 }
 .quest_horse {
  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -220px -1112px;
+  background-position: -1187px -440px;
  width: 219px;
  height: 219px;
 }
 .quest_kangaroo {
  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -440px -1112px;
+  background-position: -1187px -660px;
  width: 219px;
  height: 219px;
 }
 .quest_kraken {
  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -223px -1332px;
+  background-position: -527px -220px;
  width: 216px;
  height: 177px;
 }
 .quest_lostMasterclasser1 {
  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -1320px -880px;
+  background-position: 0px -1095px;
  width: 219px;
  height: 219px;
 }
 .quest_lostMasterclasser2 {
  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -440px -892px;
+  background-position: -220px -1095px;
  width: 219px;
  height: 219px;
 }
 .quest_lostMasterclasser3 {
  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -1100px -220px;
+  background-position: -440px -1095px;
  width: 219px;
  height: 219px;
 }
 .quest_mayhemMistiflying1 {
  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -1757px -422px;
+  background-position: -1844px -359px;
  width: 150px;
  height: 150px;
 }
 .quest_mayhemMistiflying2 {
  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: 0px -452px;
+  background-position: -660px -1095px;
  width: 219px;
  height: 219px;
 }
 .quest_mayhemMistiflying3 {
  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: 0px -232px;
+  background-position: -880px -1095px;
  width: 219px;
  height: 219px;
 }
 .quest_monkey {
  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -440px 0px;
+  background-position: -1100px -1095px;
  width: 219px;
  height: 219px;
 }
 .quest_moon1 {
  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -1540px -651px;
+  background-position: -1627px 0px;
  width: 216px;
  height: 216px;
 }
 .quest_moon2 {
  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -660px -1112px;
+  background-position: -1407px 0px;
  width: 219px;
  height: 219px;
 }
 .quest_moon3 {
  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -1320px -220px;
+  background-position: -1407px -220px;
  width: 219px;
  height: 219px;
 }
 .quest_moonstone1 {
  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -1100px -892px;
+  background-position: -1407px -440px;
  width: 219px;
  height: 219px;
 }
 .quest_moonstone2 {
  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -440px -452px;
+  background-position: -1407px -660px;
  width: 219px;
  height: 219px;
 }
 .quest_moonstone3 {
  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -220px -232px;
+  background-position: -1407px -880px;
  width: 219px;
  height: 219px;
 }
 .quest_nudibranch {
  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -1540px -434px;
+  background-position: -1627px -217px;
  width: 216px;
  height: 216px;
 }
 .quest_octopus {
  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: 0px -1332px;
+  background-position: -662px -1315px;
  width: 222px;
  height: 177px;
 }
 .quest_owl {
  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: 0px -672px;
+  background-position: 0px -1315px;
  width: 219px;
  height: 219px;
 }
 .quest_peacock {
  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -1540px 0px;
+  background-position: -1627px -434px;
  width: 216px;
  height: 216px;
 }
 .quest_penguin {
  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: 0px -1706px;
+  background-position: 0px -1535px;
  width: 190px;
  height: 183px;
 }
 .quest_pterodactyl {
  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -1100px 0px;
+  background-position: -220px -1315px;
  width: 219px;
  height: 219px;
 }
-.quest_rat {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -220px -672px;
-  width: 219px;
-  height: 219px;
-}
-.quest_robot {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -660px -220px;
-  width: 219px;
-  height: 219px;
-}
-.quest_rock {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -1540px -217px;
-  width: 216px;
-  height: 216px;
-}
-.quest_rooster {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -630px -1510px;
-  width: 213px;
-  height: 174px;
-}
@@ -1,510 +1,624 @@
-.Pet-Wolf-Dessert {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
-  background-position: -82px 0px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Wolf-Ember {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
-  background-position: -164px -500px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Wolf-Fairy {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
-  background-position: -164px 0px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Wolf-Floral {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
-  background-position: 0px -100px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Wolf-Fluorite {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
-  background-position: -82px -100px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Wolf-Frost {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
-  background-position: -164px -100px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Wolf-Ghost {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
-  background-position: -246px 0px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Wolf-Glass {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
-  background-position: -246px -100px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Wolf-Glow {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
-  background-position: 0px -200px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Wolf-Golden {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
-  background-position: -82px -200px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Wolf-Holly {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
-  background-position: -164px -200px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Wolf-IcySnow {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
-  background-position: -246px -200px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Wolf-Peppermint {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
-  background-position: -328px 0px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Wolf-Rainbow {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
-  background-position: -328px -100px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Wolf-Red {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
-  background-position: -328px -200px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Wolf-RoseQuartz {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
-  background-position: 0px -300px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Wolf-RoyalPurple {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
-  background-position: -82px -300px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Wolf-Ruby {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
-  background-position: -164px -300px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Wolf-SandSculpture {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
-  background-position: -246px -300px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Wolf-Shade {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
-  background-position: -328px -300px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Wolf-Shadow {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
-  background-position: -410px 0px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Wolf-Shimmer {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
-  background-position: -410px -100px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Wolf-Silver {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
-  background-position: -410px -200px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Wolf-Skeleton {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
-  background-position: -410px -300px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Wolf-Spooky {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
-  background-position: -492px 0px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Wolf-StarryNight {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
-  background-position: -492px -100px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Wolf-Sunshine {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
-  background-position: -492px -200px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Wolf-Thunderstorm {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
-  background-position: -492px -300px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Wolf-Veggie {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
-  background-position: 0px -400px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Wolf-Veteran {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
-  background-position: -82px -400px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Wolf-Watery {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
-  background-position: -164px -400px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Wolf-White {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
-  background-position: -246px -400px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Wolf-Zombie {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
-  background-position: -328px -400px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Yarn-Base {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
-  background-position: -410px -400px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Yarn-CottonCandyBlue {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
-  background-position: -492px -400px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Yarn-CottonCandyPink {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
-  background-position: -574px 0px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Yarn-Desert {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
-  background-position: -574px -100px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Yarn-Golden {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
-  background-position: -574px -200px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Yarn-Red {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
-  background-position: -574px -300px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Yarn-Shade {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
-  background-position: -574px -400px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Yarn-Skeleton {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
-  background-position: 0px -500px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Yarn-White {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
-  background-position: -82px -500px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Yarn-Zombie {
+.Pet-Whale-CottonCandyPink {
  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
  background-position: 0px 0px;
  width: 81px;
  height: 99px;
 }
+.Pet-Whale-Desert {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
+  background-position: -82px 0px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Whale-Golden {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
+  background-position: -164px 0px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Whale-Red {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
+  background-position: 0px -100px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Whale-Shade {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
+  background-position: -82px -100px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Whale-Skeleton {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
+  background-position: -164px -100px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Whale-White {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
+  background-position: -246px 0px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Whale-Zombie {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
+  background-position: -246px -100px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Amber {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
+  background-position: 0px -200px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Aquatic {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
+  background-position: -82px -200px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Aurora {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
+  background-position: -164px -200px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Base {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
+  background-position: -246px -200px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-BirchBark {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
+  background-position: -328px 0px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Bronze {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
+  background-position: -328px -100px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Celestial {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
+  background-position: -328px -200px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-CottonCandyBlue {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
+  background-position: 0px -300px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-CottonCandyPink {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
+  background-position: -82px -300px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Cupid {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
+  background-position: -164px -300px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Desert {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
+  background-position: -246px -300px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Dessert {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
+  background-position: -328px -300px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Ember {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
+  background-position: -410px 0px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Fairy {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
+  background-position: -410px -100px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Floral {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
+  background-position: -410px -200px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Fluorite {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
+  background-position: -410px -300px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Frost {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
+  background-position: -492px 0px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Ghost {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
+  background-position: -492px -100px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Glass {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
+  background-position: -492px -200px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Glow {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
+  background-position: -492px -300px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Golden {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
+  background-position: 0px -400px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Holly {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
+  background-position: -82px -400px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-IcySnow {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
+  background-position: -164px -400px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Peppermint {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
+  background-position: -246px -400px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Rainbow {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
+  background-position: -328px -400px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Red {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
+  background-position: -410px -400px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-RoseQuartz {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
+  background-position: -492px -400px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-RoyalPurple {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
+  background-position: -574px 0px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Ruby {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
+  background-position: -574px -100px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-SandSculpture {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
+  background-position: -574px -200px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Shade {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
+  background-position: -574px -300px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Shadow {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
+  background-position: -574px -400px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Shimmer {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
+  background-position: 0px -500px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Silver {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
+  background-position: -82px -500px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Skeleton {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
+  background-position: -164px -500px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Spooky {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
+  background-position: -246px -500px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-StarryNight {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
+  background-position: -328px -500px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Sunshine {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
+  background-position: -410px -500px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Thunderstorm {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
+  background-position: -492px -500px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Veggie {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
+  background-position: -574px -500px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Veteran {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
+  background-position: -656px 0px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Watery {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
+  background-position: -656px -100px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-White {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
+  background-position: -656px -200px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Zombie {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
+  background-position: -656px -300px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Yarn-Base {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
+  background-position: -656px -400px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Yarn-CottonCandyBlue {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
+  background-position: -656px -500px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Yarn-CottonCandyPink {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
+  background-position: 0px -600px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Yarn-Desert {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
+  background-position: -82px -600px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Yarn-Golden {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
+  background-position: -164px -600px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Yarn-Red {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
+  background-position: -246px -600px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Yarn-Shade {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
+  background-position: -328px -600px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Yarn-Skeleton {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
+  background-position: -410px -600px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Yarn-White {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
+  background-position: -492px -600px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Yarn-Zombie {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
+  background-position: -574px -600px;
+  width: 81px;
+  height: 99px;
+}
 .Pet_HatchingPotion_Amber {
  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
-  background-position: -315px -500px;
+  background-position: -656px -600px;
  width: 68px;
  height: 68px;
 }
 .Pet_HatchingPotion_Aquatic {
  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
-  background-position: -552px -600px;
+  background-position: -738px 0px;
  width: 68px;
  height: 68px;
 }
 .Pet_HatchingPotion_Aurora {
  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
-  background-position: -384px -500px;
+  background-position: -738px -69px;
  width: 68px;
  height: 68px;
 }
 .Pet_HatchingPotion_Base {
  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
-  background-position: -453px -500px;
+  background-position: -738px -138px;
  width: 68px;
  height: 68px;
 }
 .Pet_HatchingPotion_BirchBark {
  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
-  background-position: -522px -500px;
+  background-position: -738px -207px;
  width: 68px;
  height: 68px;
 }
 .Pet_HatchingPotion_Bronze {
  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
-  background-position: -656px 0px;
+  background-position: -738px -276px;
  width: 68px;
  height: 68px;
 }
 .Pet_HatchingPotion_Celestial {
  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
-  background-position: -656px -69px;
+  background-position: -738px -345px;
  width: 68px;
  height: 68px;
 }
 .Pet_HatchingPotion_CottonCandyBlue {
  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
-  background-position: -656px -138px;
+  background-position: -738px -414px;
  width: 68px;
  height: 68px;
 }
 .Pet_HatchingPotion_CottonCandyPink {
  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
-  background-position: -656px -207px;
+  background-position: -738px -483px;
  width: 68px;
  height: 68px;
 }
 .Pet_HatchingPotion_Cupid {
  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
-  background-position: -656px -276px;
+  background-position: -738px -552px;
  width: 68px;
  height: 68px;
 }
 .Pet_HatchingPotion_Desert {
  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
-  background-position: -656px -345px;
+  background-position: -738px -621px;
  width: 68px;
  height: 68px;
 }
 .Pet_HatchingPotion_Ember {
  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
-  background-position: -656px -414px;
+  background-position: 0px -700px;
  width: 68px;
  height: 68px;
 }
 .Pet_HatchingPotion_Fairy {
  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
-  background-position: -656px -483px;
+  background-position: -69px -700px;
  width: 68px;
  height: 68px;
 }
 .Pet_HatchingPotion_Floral {
  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
-  background-position: 0px -600px;
+  background-position: -138px -700px;
  width: 68px;
  height: 68px;
 }
 .Pet_HatchingPotion_Fluorite {
  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
-  background-position: -69px -600px;
+  background-position: -207px -700px;
  width: 68px;
  height: 68px;
 }
 .Pet_HatchingPotion_Frost {
  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
-  background-position: -138px -600px;
+  background-position: -276px -700px;
  width: 68px;
  height: 68px;
 }
 .Pet_HatchingPotion_Ghost {
  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
-  background-position: -207px -600px;
+  background-position: -345px -700px;
  width: 68px;
  height: 68px;
 }
 .Pet_HatchingPotion_Glass {
  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
-  background-position: -276px -600px;
+  background-position: -414px -700px;
  width: 68px;
  height: 68px;
 }
 .Pet_HatchingPotion_Glow {
  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
-  background-position: -345px -600px;
+  background-position: -483px -700px;
  width: 68px;
  height: 68px;
 }
 .Pet_HatchingPotion_Golden {
  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
-  background-position: -414px -600px;
+  background-position: -552px -700px;
  width: 68px;
  height: 68px;
 }
 .Pet_HatchingPotion_Holly {
  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
-  background-position: -483px -600px;
+  background-position: -621px -700px;
  width: 68px;
  height: 68px;
 }
 .Pet_HatchingPotion_IcySnow {
  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
-  background-position: -246px -500px;
+  background-position: -690px -700px;
  width: 68px;
  height: 68px;
 }
 .Pet_HatchingPotion_Peppermint {
  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
-  background-position: -621px -600px;
+  background-position: -807px 0px;
  width: 68px;
  height: 68px;
 }
 .Pet_HatchingPotion_Purple {
  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
-  background-position: -725px 0px;
+  background-position: -807px -69px;
  width: 68px;
  height: 68px;
 }
 .Pet_HatchingPotion_Rainbow {
  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
-  background-position: -725px -69px;
+  background-position: -807px -138px;
  width: 68px;
  height: 68px;
 }
 .Pet_HatchingPotion_Red {
  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
-  background-position: -725px -138px;
+  background-position: -807px -207px;
  width: 68px;
  height: 68px;
 }
 .Pet_HatchingPotion_RoseQuartz {
  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
-  background-position: -725px -207px;
+  background-position: -807px -276px;
  width: 68px;
  height: 68px;
 }
 .Pet_HatchingPotion_RoyalPurple {
  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
-  background-position: -725px -276px;
+  background-position: -807px -345px;
  width: 68px;
  height: 68px;
 }
 .Pet_HatchingPotion_Ruby {
  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
-  background-position: -725px -345px;
+  background-position: -807px -414px;
  width: 68px;
  height: 68px;
 }
 .Pet_HatchingPotion_SandSculpture {
  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
-  background-position: -725px -414px;
+  background-position: -807px -483px;
  width: 68px;
  height: 68px;
 }
 .Pet_HatchingPotion_Shade {
  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
-  background-position: -725px -483px;
+  background-position: -807px -552px;
  width: 68px;
  height: 68px;
 }
 .Pet_HatchingPotion_Shadow {
  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
-  background-position: -725px -552px;
+  background-position: -807px -621px;
  width: 68px;
  height: 68px;
 }
 .Pet_HatchingPotion_Shimmer {
  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
-  background-position: 0px -669px;
+  background-position: -807px -690px;
  width: 68px;
  height: 68px;
 }
 .Pet_HatchingPotion_Silver {
  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
-  background-position: -69px -669px;
+  background-position: 0px -769px;
  width: 68px;
  height: 68px;
 }
 .Pet_HatchingPotion_Skeleton {
  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
-  background-position: -138px -669px;
+  background-position: -69px -769px;
  width: 68px;
  height: 68px;
 }
 .Pet_HatchingPotion_Spooky {
  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
-  background-position: -207px -669px;
+  background-position: -138px -769px;
  width: 68px;
  height: 68px;
 }
 .Pet_HatchingPotion_StarryNight {
  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
-  background-position: -276px -669px;
+  background-position: -207px -769px;
  width: 68px;
  height: 68px;
 }
 .Pet_HatchingPotion_Sunshine {
  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
-  background-position: -345px -669px;
+  background-position: -276px -769px;
  width: 68px;
  height: 68px;
 }
 .Pet_HatchingPotion_Thunderstorm {
  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
-  background-position: -414px -669px;
+  background-position: -345px -769px;
  width: 68px;
  height: 68px;
 }
 .Pet_HatchingPotion_Watery {
  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
-  background-position: -483px -669px;
+  background-position: -414px -769px;
  width: 68px;
  height: 68px;
 }
 .Pet_HatchingPotion_White {
  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
-  background-position: -552px -669px;
+  background-position: -483px -769px;
  width: 68px;
  height: 68px;
 }
 .Pet_HatchingPotion_Zombie {
  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
-  background-position: -621px -669px;
+  background-position: -552px -769px;
  width: 68px;
  height: 68px;
 }
--- a/Show More
+++ b/Show More