Disable Amplitude on client for dev environment

.eslintrc.js

@@ -5,16 +5,6 @@ module.exports = {
     'habitrpg/lib/node',
   ],
   rules: {
-    'prefer-regex-literals': 'warn',
     'import/no-extraneous-dependencies': 'off',
-    'require-await': 'error',
   },
-  overrides: [
-    {
-      files: ['migrations/**', 'gulp/**'], // Or *.test.js
-      rules: {
-        'require-await': 'off',
-      },
-    },
-  ],
 };

.github/dependabot.yml

@@ -0,0 +1,150 @@
+version: 2
+updates:
+- package-ecosystem: npm
+  directory: "/"
+  schedule:
+    interval: weekly
+    time: "06:00"
+    timezone: Europe/Rome
+  open-pull-requests-limit: 99
+  ignore:
+  - dependency-name: express-validator
+    versions:
+    - 6.10.0
+    - 6.10.1
+    - 6.9.2
+  - dependency-name: "@babel/core"
+    versions:
+    - 7.12.13
+    - 7.12.16
+    - 7.12.17
+    - 7.13.1
+    - 7.13.10
+    - 7.13.13
+    - 7.13.14
+    - 7.13.15
+    - 7.13.8
+  - dependency-name: redis
+    versions:
+    - 3.1.0
+  - dependency-name: stripe
+    versions:
+    - 8.134.0
+    - 8.135.0
+    - 8.137.0
+    - 8.138.0
+    - 8.140.0
+    - 8.142.0
+  - dependency-name: "@babel/register"
+    versions:
+    - 7.12.13
+    - 7.13.14
+    - 7.13.8
+  - dependency-name: mongoose
+    versions:
+    - 5.11.14
+    - 5.11.15
+    - 5.11.16
+    - 5.11.17
+    - 5.11.18
+    - 5.11.19
+    - 5.12.0
+    - 5.12.1
+    - 5.12.2
+    - 5.12.3
+  - dependency-name: jwks-rsa
+    versions:
+    - 1.12.3
+    - 2.0.1
+    - 2.0.2
+  - dependency-name: "@babel/preset-env"
+    versions:
+    - 7.12.13
+    - 7.12.16
+    - 7.12.17
+    - 7.13.10
+    - 7.13.12
+    - 7.13.8
+    - 7.13.9
+  - dependency-name: image-size
+    versions:
+    - 0.9.4
+    - 0.9.5
+    - 0.9.7
+  - dependency-name: winston-loggly-bulk
+    versions:
+    - 3.2.0
+  - dependency-name: chai
+    versions:
+    - 4.3.0
+    - 4.3.3
+  - dependency-name: mocha
+    versions:
+    - 8.2.1
+    - 8.3.0
+    - 8.3.1
+  - dependency-name: "@google-cloud/trace-agent"
+    versions:
+    - 5.1.2
+  - dependency-name: monk
+    versions:
+    - 7.3.3
+- package-ecosystem: npm
+  directory: "/website/client"
+  schedule:
+    interval: weekly
+    time: "06:00"
+    timezone: Europe/Rome
+  open-pull-requests-limit: 99
+  ignore:
+  - dependency-name: eslint-plugin-vue
+    versions:
+    - 7.5.0
+    - 7.6.0
+    - 7.7.0
+    - 7.8.0
+    - 7.9.0
+  - dependency-name: core-js
+    versions:
+    - 3.10.0
+    - 3.10.1
+    - 3.9.0
+    - 3.9.1
+  - dependency-name: bootstrap
+    versions:
+    - 4.6.0
+  - dependency-name: y18n
+    versions:
+    - 4.0.1
+  - dependency-name: hellojs
+    versions:
+    - 1.18.8
+    - 1.19.2
+  - dependency-name: chai
+    versions:
+    - 4.3.0
+    - 4.3.3
+  - dependency-name: amplitude-js
+    versions:
+    - 7.4.2
+    - 7.4.3
+    - 7.4.4
+  - dependency-name: pug
+    versions:
+    - 3.0.2
+  - dependency-name: sass
+    versions:
+    - 1.32.6
+    - 1.32.7
+    - 1.32.8
+  - dependency-name: "@vue/test-utils"
+    versions:
+    - 1.1.2
+    - 1.1.3
+  - dependency-name: intro.js
+    versions:
+    - 3.2.1
+    - 3.3.1
+  - dependency-name: sass-loader
+    versions:
+    - 10.1.1

.github/workflows/test.yml

@@ -1,13 +1,6 @@
 name: Test
 
-on:
-  push:
-    branches-ignore:
-    - 'phillip/**'
-    - 'sabrecat/**'
-    - 'kalista/**'
-    - 'natalie/**'
-  pull_request:
+on: [push, pull_request]
 
 permissions:
   contents: read
@@ -17,21 +10,19 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        node-version: [21.x]
+        node-version: [14.x]
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v1
       with:
         fetch-depth: 1
     - name: Use Node.js ${{ matrix.node-version }}
-      uses: actions/setup-node@v4
+      uses: actions/setup-node@v1
       with:
         node-version: ${{ matrix.node-version }}
-    - run: sudo apt update
-    - run: sudo apt -y install libkrb5-dev
     - run: cp config.json.example config.json
     - name: npm install
       run: |
-        npm i
+        npm ci
       env:
         CI: true
         NODE_ENV: test
@@ -40,21 +31,19 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        node-version: [21.x]
+        node-version: [14.x]
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v1
       with:
         fetch-depth: 1
     - name: Use Node.js ${{ matrix.node-version }}
-      uses: actions/setup-node@v4
+      uses: actions/setup-node@v1
       with:
         node-version: ${{ matrix.node-version }}
-    - run: sudo apt update
-    - run: sudo apt -y install libkrb5-dev
     - run: cp config.json.example config.json
     - name: npm install
       run: |
-        npm i
+        npm ci
       env:
         CI: true
         NODE_ENV: test
@@ -63,21 +52,19 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        node-version: [21.x]
+        node-version: [14.x]
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v1
       with:
         fetch-depth: 1
     - name: Use Node.js ${{ matrix.node-version }}
-      uses: actions/setup-node@v4
+      uses: actions/setup-node@v1
       with:
         node-version: ${{ matrix.node-version }}
-    - run: sudo apt update
-    - run: sudo apt -y install libkrb5-dev
     - run: cp config.json.example config.json
     - name: npm install
       run: |
-        npm i
+        npm ci
       env:
         CI: true
         NODE_ENV: test
@@ -87,21 +74,19 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        node-version: [21.x]
+        node-version: [14.x]
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v1
       with:
         fetch-depth: 1
     - name: Use Node.js ${{ matrix.node-version }}
-      uses: actions/setup-node@v4
+      uses: actions/setup-node@v1
       with:
         node-version: ${{ matrix.node-version }}
-    - run: sudo apt update
-    - run: sudo apt -y install libkrb5-dev
     - run: cp config.json.example config.json
     - name: npm install
       run: |
-        npm i
+        npm ci
       env:
         CI: true
         NODE_ENV: test
@@ -110,21 +95,19 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        node-version: [21.x]
+        node-version: [14.x]
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v1
       with:
         fetch-depth: 1
     - name: Use Node.js ${{ matrix.node-version }}
-      uses: actions/setup-node@v4
+      uses: actions/setup-node@v1
       with:
         node-version: ${{ matrix.node-version }}
-    - run: sudo apt update
-    - run: sudo apt -y install libkrb5-dev
     - run: cp config.json.example config.json
     - name: npm install
       run: |
-        npm i
+        npm ci
       env:
         CI: true
         NODE_ENV: test
@@ -134,14 +117,14 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        node-version: [21.x]
+        node-version: [14.x]
         mongodb-version: [4.2]
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v1
       with:
         fetch-depth: 1
     - name: Use Node.js ${{ matrix.node-version }}
-      uses: actions/setup-node@v4
+      uses: actions/setup-node@v1
       with:
         node-version: ${{ matrix.node-version }}
     - name: Start MongoDB ${{ matrix.mongodb-version }} Replica Set
@@ -149,12 +132,10 @@ jobs:
       with:
         mongodb-version: ${{ matrix.mongodb-version }}
         mongodb-replica-set: rs
-    - run: sudo apt update
-    - run: sudo apt -y install libkrb5-dev
     - run: cp config.json.example config.json
     - name: npm install
       run: |
-        npm i
+        npm ci
       env:
         CI: true
         NODE_ENV: test
@@ -165,14 +146,14 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        node-version: [21.x]
+        node-version: [14.x]
         mongodb-version: [4.2]
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v1
       with:
         fetch-depth: 1
     - name: Use Node.js ${{ matrix.node-version }}
-      uses: actions/setup-node@v4
+      uses: actions/setup-node@v1
       with:
         node-version: ${{ matrix.node-version }}
     - name: Start MongoDB ${{ matrix.mongodb-version }} Replica Set
@@ -180,12 +161,10 @@ jobs:
       with:
         mongodb-version: ${{ matrix.mongodb-version }}
         mongodb-replica-set: rs
-    - run: sudo apt update
-    - run: sudo apt -y install libkrb5-dev
     - run: cp config.json.example config.json
     - name: npm install
       run: |
-        npm i
+        npm ci
       env:
         CI: true
         NODE_ENV: test
@@ -196,14 +175,14 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        node-version: [21.x]
+        node-version: [14.x]
         mongodb-version: [4.2]
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v1
       with:
         fetch-depth: 1
     - name: Use Node.js ${{ matrix.node-version }}
-      uses: actions/setup-node@v4
+      uses: actions/setup-node@v1
       with:
         node-version: ${{ matrix.node-version }}
     - name: Start MongoDB ${{ matrix.mongodb-version }} Replica Set
@@ -211,12 +190,10 @@ jobs:
       with:
         mongodb-version: ${{ matrix.mongodb-version }}
         mongodb-replica-set: rs
-    - run: sudo apt update
-    - run: sudo apt -y install libkrb5-dev
     - run: cp config.json.example config.json
     - name: npm install
       run: |
-        npm i
+        npm ci
       env:
         CI: true
         NODE_ENV: test
@@ -228,21 +205,19 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        node-version: [21.x]
+        node-version: [14.x]
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v1
       with:
         fetch-depth: 1
     - name: Use Node.js ${{ matrix.node-version }}
-      uses: actions/setup-node@v4
+      uses: actions/setup-node@v1
       with:
         node-version: ${{ matrix.node-version }}
-    - run: sudo apt update
-    - run: sudo apt -y install libkrb5-dev
     - run: cp config.json.example config.json
     - name: npm install
       run: |
-        npm i
+        npm ci
       env:
         CI: true
         NODE_ENV: test
@@ -253,17 +228,15 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        node-version: [21.x]
+        node-version: [14.x]
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v1
       with:
         fetch-depth: 1
     - name: Use Node.js ${{ matrix.node-version }}
-      uses: actions/setup-node@v4
+      uses: actions/setup-node@v1
       with:
         node-version: ${{ matrix.node-version }}
-    - run: sudo apt update
-    - run: sudo apt -y install libkrb5-dev
     - run: cp config.json.example config.json
     - name: npm install
       run: |

.gitignore

@@ -8,7 +8,7 @@ i18n_cache
 apidoc/html
 *.swp
 .idea*
-config*.json
+config.json
 npm-debug.log*
 lib
 newrelic_agent.log
@@ -40,12 +40,10 @@ yarn.lock
 !.elasticbeanstalk/*.global.yml
 
 /.vscode
-habitica.code-workspace
 
 # webstorm fake webpack for path intellisense
 webpack.webstorm.config
 
 # mongodb replica set for local dev
 mongodb-*.tgz
-/mongodb-data*
-/.nyc_output
+/mongodb-data

.heroku/report_deploy.sh

@@ -1,25 +0,0 @@
-#!/bin/bash
-
-DEVELOPER="someone"
-if git rev-parse --git-dir > /dev/null 2>&1; then
-    DEVELOPERS=$(git log -5 --pretty=format:'%an')
-    IFS=$'\n'
-    DEVELOPER=""
-    for dev in $DEVELOPERS
-    do
-        if [ "$DEVELOPER" == "someone" ]; then
-            if [[ ${dev} != *"[bot]"* ]]; then
-                DEVELOPER=$dev
-                continue
-            fi
-            continue
-        fi
-    done
-fi
-
-PARTS=$(cut -d"." -f1 <<< $BASE_URL)
-SERVER_NAME=$(cut -d"/" -f3 <<< ${PARTS[0]})
-
-SERVER_NAME=":$SERVER_EMOJI: $SERVER_NAME"
-
-wget $SLACK_DEPLOY_URL --post-data="{\"server_name\": \"$SERVER_NAME\", \"developer\": \"$DEVELOPER\", \"base_url\": \"$BASE_URL\"}" -O /dev/null

.nvmrc

@@ -1 +1 @@
-20
+14

Dockerfile

@@ -0,0 +1,30 @@
+FROM node:14
+
+ENV ADMIN_EMAIL admin@habitica.com
+ENV EMAILS_COMMUNITY_MANAGER_EMAIL admin@habitica.com
+ENV AMAZON_PAYMENTS_CLIENT_ID amzn1.application-oa2-client.68ed9e6904ef438fbc1bf86bf494056e
+ENV AMAZON_PAYMENTS_SELLER_ID AMQ3SB4SG5E91
+ENV AMPLITUDE_KEY e8d4c24b3d6ef3ee73eeba715023dd43
+ENV BASE_URL https://habitica.com
+ENV FACEBOOK_KEY 128307497299777
+ENV GA_ID UA-33510635-1
+ENV GOOGLE_CLIENT_ID 1035232791481-32vtplgnjnd1aufv3mcu1lthf31795fq.apps.googleusercontent.com
+ENV LOGGLY_CLIENT_TOKEN ab5663bf-241f-4d14-8783-7d80db77089a
+ENV NODE_ENV production
+ENV STRIPE_PUB_KEY pk_85fQ0yMECHNfHTSsZoxZXlPSwSNfA
+ENV APPLE_AUTH_CLIENT_ID 9Q9SMRMCNN.com.habitrpg.ios.Habitica
+
+# Install global packages
+RUN npm install -g gulp-cli mocha
+
+# Clone Habitica repo and install dependencies
+RUN mkdir -p /usr/src/habitrpg
+WORKDIR /usr/src/habitrpg
+RUN git clone --branch release --depth 1 https://github.com/HabitRPG/habitica.git /usr/src/habitrpg
+RUN git config --global url."https://".insteadOf git://
+RUN npm set unsafe-perm true
+RUN npm install
+
+# Start Habitica
+EXPOSE 80 8080 36612
+CMD ["node", "./website/transpiled-babel/index.js"]

Dockerfile-Dev

@@ -1,15 +1,14 @@
-FROM node:20
+FROM node:14
 
 # Install global packages
 RUN npm install -g gulp-cli mocha
 
-# Copy package.json and package-lock.json into image
+# Copy package.json and package-lock.json into image, then install
+# dependencies.
 WORKDIR /usr/src/habitica
 COPY ["package.json", "package-lock.json", "./"]
+RUN npm install
+
 # Copy the remaining source files in.
 COPY . /usr/src/habitica
-# Install dependencies
-RUN npm install
 RUN npm run postinstall
-RUN npm run client:build
-RUN gulp build:prod

README.md

@@ -1,20 +1,14 @@
-Habitica ![Build Status](https://github.com/HabitRPG/habitica/workflows/Test/badge.svg)
+Habitica ![Build Status](https://github.com/HabitRPG/habitica/workflows/Test/badge.svg) [![Code Climate](https://codeclimate.com/github/HabitRPG/habitrpg.svg)](https://codeclimate.com/github/HabitRPG/habitrpg) [![Bountysource](https://api.bountysource.com/badge/tracker?tracker_id=68393)](https://www.bountysource.com/trackers/68393-habitrpg?utm_source=68393&utm_medium=shield&utm_campaign=TRACKER_BADGE)
 ===============
 
-[Habitica](https://habitica.com) is an open-source habit-building program that treats your life like a role-playing game. Level up as you succeed, lose HP as you fail, and earn Gold to buy weapons and armor!
+[Habitica](https://habitica.com) is an open source habit building program which treats your life like a Role Playing Game. Level up as you succeed, lose HP as you fail, earn money to buy weapons and armor.
 
-**Want to contribute code to Habitica?** We're always looking for assistance on any issues in our repo with the "Help Wanted" label. The wiki pages below and the additional linked pages will tell you how to start contributing code and where you can seek further help or ask questions:
+**We need more programmers!** Your assistance will be greatly appreciated. The wiki pages below and the additional pages they link to will tell you how to get started on contributing code and where you can go to seek further help or ask questions:
 * [Guidance for Blacksmiths](https://habitica.fandom.com/wiki/Guidance_for_Blacksmiths) - an introduction to the technologies used and how the software is organized.
-* [Setting up Habitica Locally](https://github.com/HabitRPG/habitica/wiki/Setting-Up-Habitica-for-Local-Development) - how to set up a local install of Habitica for development and testing.
-
-**Interested in contributing to Habitica’s mobile apps?** Visit the links below for our mobile repositories.
-* **Android:** https://github.com/HabitRPG/habitica-android
-* **iOS:** https://github.com/HabitRPG/habitica-ios
+* [Setting up Habitica Locally](https://habitica.fandom.com/wiki/Setting_up_Habitica_Locally) - how to set up a local install of Habitica for development and testing on various platforms.
 
 Habitica's code is licensed as described at https://github.com/HabitRPG/habitica/blob/develop/LICENSE
 
-**Found a bug?** Please report it to [admin email](mailto:admin@habitica.com) rather than create an issue (an admin will advise you if a new issue is necessary; usually it is not).
+**Found a bug?** Please report it to [admin email](mailto:admin@habitica.com) rather than creating an issue (an admin will advise you if a new issue is necessary; usually it is not).
 
-**Creating a third-party tool?** Please review our [API Usage Guidelines](https://github.com/HabitRPG/habitica/wiki/API-Usage-Guidelines) to ensure that your tool is compliant and maintains the best experience for Habitica players.
-
-**Have any questions about Habitica or contributing?** See the links in the [Habitica](https://habitica.com) website's Help menu. There’s FAQ’s, guides, and the option to reach out to us with any further questions!
+**Have any questions about Habitica or its community?** See the links in the [habitica.com](https://habitica.com) website's Help menu or drop in to [Guilds > Tavern Chat](https://habitica.com/groups/tavern) to ask questions or chat socially!

apidoc/header.md

@@ -2,4 +2,4 @@
 
 This webpage includes the documentation for version 3 of the [Habitica](https://habitica.com) API.
 
-If you're developing a 3rd party tool that uses the Habitica API, read the [API Usage Guidelines](https://github.com/HabitRPG/habitica/wiki/API-Usage-Guidelines), which describe how to be a responsible user of our server resources!
+If you're developing a 3rd party tool that uses the Habitica API you should read the [Guidance for Comrades](https://habitica.fandom.com/wiki/Guidance_for_Comrades) and in particular the section called [Rules for Third-Party Tools](https://habitica.fandom.com/wiki/Guidance_for_Comrades#Rules_for_Third-Party_Tools) which includes suggestions on how to best use the API and the rules to follow when interacting with it.

config.json.example

@@ -32,12 +32,10 @@
   "LOGGLY_CLIENT_TOKEN": "token",
   "LOGGLY_SUBDOMAIN": "example-subdomain",
   "LOGGLY_TOKEN": "example-token",
-  "LOG_REQUESTS_EXCESSIVE_MODE": "false",
   "MAINTENANCE_MODE": "false",
   "NODE_DB_URI": "mongodb://localhost:27017/habitica-dev?replicaSet=rs",
   "TEST_DB_URI": "mongodb://localhost:27017/habitica-test?replicaSet=rs",
   "MONGODB_POOL_SIZE": "10",
-  "MONGODB_SOCKET_TIMEOUT": "20000",
   "NODE_ENV": "development",
   "PATH": "bin:node_modules/.bin:/usr/local/bin:/usr/bin:/bin",
   "PAYPAL_BILLING_PLANS_basic_12mo": "basic_12mo",
@@ -86,13 +84,8 @@
   "BLOCKED_IPS": "",
   "LOG_AMPLITUDE_EVENTS": "false",
   "RATE_LIMITER_ENABLED": "false",
-  "LIVELINESS_PROBE_KEY": "",
   "REDIS_HOST": "aaabbbcccdddeeefff",
   "REDIS_PORT": "1234",
   "REDIS_PASSWORD": "12345678",
-  "TRUSTED_DOMAINS": "localhost,https://habitica.com",
-  "TIME_TRAVEL_ENABLED": "false",
-  "DEBUG_ENABLED": "false",
-  "CONTENT_SWITCHOVER_TIME_OFFSET": 8,
-  "SLOW_REQUEST_THRESHOLD": 1000
+  "TRUSTED_DOMAINS": "localhost,habitica.com"
 }

docker-compose.dev.yml

@@ -22,8 +22,7 @@ services:
       dockerfile: ./Dockerfile-Dev
     command: ["npm", "start"]
     depends_on:
-      mongo:
-        condition: service_healthy
+      - mongo
     environment:
       - NODE_DB_URI=mongodb://mongo/habitrpg
     networks:
@@ -34,16 +33,7 @@ services:
       - .:/usr/src/habitica
       - /usr/src/habitica/node_modules
   mongo:
-    image: mongo:5.0.23
-    restart: unless-stopped
-    command: ["--replSet", "rs", "--bind_ip_all", "--port", "27017"]
-    healthcheck:
-      test: echo "try { rs.status() } catch (err) { rs.initiate() }" | mongosh --port 27017 --quiet
-      interval: 10s
-      timeout: 30s
-      start_period: 0s
-      start_interval: 1s
-      retries: 30
+    image: mongo:3.6
     networks:
       - habitica
     ports:

gulp/gulp-sprites.js

@@ -42,50 +42,10 @@ function cssVarMap (sprite) {
   }
 }
 
-function filterFile (file) {
-  if (file.relative.indexOf('Mount_Icon_') !== -1) {
-    return false;
-  }
-  if (file.path.indexOf('shop/') !== -1) {
-    return false;
-  }
-  if (file.path.indexOf('stable/eggs') !== -1) {
-    return false;
-  }
-  if (file.path.indexOf('stable/food') !== -1) {
-    return false;
-  }
-  if (file.path.indexOf('stable/potions') !== -1) {
-    return false;
-  }
-  if (file.relative.indexOf('shop_') === 0) {
-    return false;
-  }
-  if (file.relative.indexOf('icon_background') === 0) {
-    return false;
-  }
-  if (file.relative.indexOf('notif_') === 0) {
-    return false;
-  }
-  if (file.relative.indexOf('quest_') === 0) {
-    return false;
-  }
-  if (file.relative.indexOf('inventory_quest_') === 0) {
-    return false;
-  }
-  return true;
-}
-
-async function createSpritesStream (name, src) {
+function createSpritesStream (name, src) {
   const stream = mergeStream();
-  // need to import this way bc of weird dependency things
-  // eslint-disable-next-line global-require
-  const filter = require('gulp-filter');
-
-  const f = filter(filterFile);
 
   const spriteData = gulp.src(src)
-    .pipe(f)
     .pipe(spritesmith({
       imgName: `spritesmith-${name}.png`,
       cssName: `spritesmith-${name}.css`,
@@ -103,7 +63,7 @@ async function createSpritesStream (name, src) {
   return stream;
 }
 
-gulp.task('sprites:main', async () => {
+gulp.task('sprites:main', () => {
   const mainSrc = sync('habitica-images/**/*.png');
   return createSpritesStream('main', mainSrc);
 });

gulp/gulp-tests.js

@@ -44,8 +44,8 @@ function runInChildProcess (command, options = {}, envVariables = '') {
   return done => pipe(exec(testBin(command, envVariables), options, done));
 }
 
-function integrationTestCommand (testDir) {
-  return `nyc --silent --no-clean mocha ${testDir} --recursive --require ./test/helpers/start-server`;
+function integrationTestCommand (testDir, coverageDir) {
+  return `istanbul cover --dir coverage/${coverageDir} --report lcovonly node_modules/mocha/bin/_mocha -- ${testDir} --recursive --require ./test/helpers/start-server`;
 }
 
 /* Test task definitions */
@@ -148,7 +148,7 @@ gulp.task('test:content:safe', gulp.series('test:prepare:build', cb => {
 
 gulp.task(
   'test:api:unit:run',
-  runInChildProcess(integrationTestCommand('test/api/unit')),
+  runInChildProcess(integrationTestCommand('test/api/unit', 'coverage/api-unit')),
 );
 
 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())));
@@ -156,7 +156,7 @@ gulp.task('test:api:unit:watch', () => gulp.watch(['website/server/libs/*', 'tes
 gulp.task('test:api-v3:integration', gulp.series(
   'test:prepare:mongo',
   runInChildProcess(
-    integrationTestCommand('test/api/v3/integration'),
+    integrationTestCommand('test/api/v3/integration', 'coverage/api-v3-integration'),
     LIMIT_MAX_BUFFER_OPTIONS,
   ),
 ));
@@ -175,7 +175,7 @@ gulp.task('test:api-v3:integration:separate-server', runInChildProcess(
 gulp.task('test:api-v4:integration', gulp.series(
   'test:prepare:mongo',
   runInChildProcess(
-    integrationTestCommand('test/api/v4'),
+    integrationTestCommand('test/api/v4', 'api-v4-integration'),
     LIMIT_MAX_BUFFER_OPTIONS,
   ),
 ));

migrations/archive/2021/20210129_habit_birthday.js

@@ -61,7 +61,7 @@ async function updateUser (user) {
 
 export default async function processUsers () {
   let query = {
-    migration: {$ne: MIGRATION_NAME},
+    // migration: {$ne: MIGRATION_NAME},
     'auth.timestamps.loggedin': {$gt: new Date('2021-01-01')},
   };
 

migrations/archive/2021/20210824_pet_group_achievements.js

@@ -105,7 +105,7 @@ async function updateUser (user) {
 
 export default async function processUsers () {
   let query = {
-    migration: { $ne: MIGRATION_NAME },
+    // migration: { $ne: MIGRATION_NAME },
     'auth.timestamps.loggedin': { $gt: new Date('2021-08-01') },
   };
 

migrations/archive/2022/20220201_pet_group_achievements.js

@@ -145,7 +145,7 @@ async function updateUser (user) {
 
 export default async function processUsers () {
   let query = {
-    migration: { $ne: MIGRATION_NAME },
+    // migration: { $ne: MIGRATION_NAME },
     'auth.timestamps.loggedin': { $gt: new Date('2021-08-01') },
   };
 

migrations/archive/2022/20220309_pet_group_achievements.js

@@ -105,7 +105,7 @@ async function updateUser (user) {
 
 export default async function processUsers () {
   let query = {
-    migration: { $ne: MIGRATION_NAME },
+    // migration: { $ne: MIGRATION_NAME },
     'auth.timestamps.loggedin': { $gt: new Date('2021-08-01') },
   };
 

migrations/archive/2022/20220524_pet_group_achievements.js

@@ -95,7 +95,7 @@ async function updateUser (user) {
 
 export default async function processUsers () {
   let query = {
-    migration: { $ne: MIGRATION_NAME },
+    // migration: { $ne: MIGRATION_NAME },
     'auth.timestamps.loggedin': { $gt: new Date('2022-01-01') },
   };
 

migrations/archive/2022/20221031_pet_set_group_achievements.js

@@ -86,7 +86,7 @@ async function updateUser (user) {
 
 export default async function processUsers () {
   let query = {
-    migration: { $ne: MIGRATION_NAME },
+    // migration: { $ne: MIGRATION_NAME },
     'auth.timestamps.loggedin': { $gt: new Date('2022-01-01') },
   };
 

migrations/archive/2022/20221213_pet_group_achievements.js

@@ -63,7 +63,7 @@ async function updateUser (user) {
       && pets['Wolf-Shade']
       && pets['Wolf-Skeleton']
       && pets['Wolf-White']
-      && pets['Wolf-Zombie']) {
+      && pets['Wolf-Zombie'] {
         set['achievements.polarPro'] = true;
       }
   }
@@ -75,7 +75,7 @@ async function updateUser (user) {
 
 export default async function processUsers () {
   let query = {
-    migration: { $ne: MIGRATION_NAME },
+    // migration: { $ne: MIGRATION_NAME },
     'auth.timestamps.loggedin': { $gt: new Date('2022-11-01') },
   };
 

migrations/archive/2023/20230522_pet_group_achievements.js

@@ -125,7 +125,7 @@ async function updateUser (user) {
 
 export default async function processUsers () {
   let query = {
-    migration: { $ne: MIGRATION_NAME },
+    // migration: { $ne: MIGRATION_NAME },
     'auth.timestamps.loggedin': { $gt: new Date('2023-04-15') },
   };
 

migrations/archive/2023/20230731_naming_day.js

@@ -1,12 +1,14 @@
 /* eslint-disable no-console */
-import { model as User } from '../../website/server/models/user';
+const MIGRATION_NAME = '20230731_naming_day';
+import { v4 as uuid } from 'uuid';
+
+import { model as User } from '../../../website/server/models/user';
 
-const MIGRATION_NAME = '20240731_naming_day';
 const progressCount = 1000;
 let count = 0;
 
 async function updateUser (user) {
-  count += 1;
+  count++;
 
   let set;
   let push;
@@ -113,16 +115,16 @@ async function updateUser (user) {
   if (count % progressCount === 0) console.warn(`${count} ${user._id}`);
 
   if (push) {
-    return user.updateOne({ $set: set, $inc: inc, $push: push }).exec();
+    return await user.updateOne({ $set: set, $inc: inc, $push: push }).exec();
+  } else {
+    return await user.updateOne({ $set: set, $inc: inc }).exec();
   }
-
-  return user.updateOne({ $set: set, $inc: inc }).exec();
 }
 
 export default async function processUsers () {
-  const query = {
+  let query = {
     migration: { $ne: MIGRATION_NAME },
-    'auth.timestamps.loggedin': { $gt: new Date('2024-07-01') },
+    'auth.timestamps.loggedin': { $gt: new Date('2023-07-01') },
   };
 
   const fields = {
@@ -134,7 +136,7 @@ export default async function processUsers () {
     const users = await User // eslint-disable-line no-await-in-loop
       .find(query)
       .limit(250)
-      .sort({ _id: 1 })
+      .sort({_id: 1})
       .select(fields)
       .exec();
 
@@ -150,4 +152,4 @@ export default async function processUsers () {
 
     await Promise.all(users.map(updateUser)); // eslint-disable-line no-await-in-loop
   }
-}
+};

migrations/archive/2023/20230808_veteran_pet_ladder.js

@@ -110,7 +110,7 @@ async function updateUser (user) {
 export default async function processUsers () {
   let query = {
     migration: {$ne: MIGRATION_NAME},
-    'auth.timestamps.loggedin': { $gt: new Date('2023-07-08') },
+    // 'auth.timestamps.loggedin': { $gt: new Date('2023-07-08') },
   };
 
   const fields = {

migrations/archive/2024/20240318_pet_group_achievements.js

@@ -1,89 +0,0 @@
-/* eslint-disable no-console */
-const MIGRATION_NAME = '202403_pet_group_achievements';
-import { model as User } from '../../../website/server/models/user';
-
-const progressCount = 1000;
-let count = 0;
-
-async function updateUser (user) {
-  count++;
-
-  let set = {
-    migration: MIGRATION_NAME,
-  };
-
-  if (user && user.items && user.items.pets) {
-    const pets = user.items.pets;
-    if (pets['GuineaPig-Zombie'] > 0
-      && pets['GuineaPig-Skeleton'] > 0
-      && pets['GuineaPig-Base'] > 0
-      && pets['GuineaPig-Desert'] > 0
-      && pets['GuineaPig-Red'] > 0
-      && pets['GuineaPig-Shade'] > 0
-      && pets['GuineaPig-White']> 0
-      && pets['GuineaPig-Golden'] > 0
-      && pets['GuineaPig-CottonCandyBlue'] > 0
-      && pets['GuineaPig-CottonCandyPink'] > 0
-      && pets['Squirrel-Zombie'] > 0
-      && pets['Squirrel-Skeleton'] > 0
-      && pets['Squirrel-Base'] > 0
-      && pets['Squirrel-Desert'] > 0
-      && pets['Squirrel-Red'] > 0
-      && pets['Squirrel-Shade'] > 0
-      && pets['Squirrel-White'] > 0
-      && pets['Squirrel-Golden'] > 0
-      && pets['Squirrel-CottonCandyBlue'] > 0
-      && pets['Squirrel-CottonCandyPink'] > 0
-      && pets['Rat-Zombie'] > 0
-      && pets['Rat-Skeleton'] > 0
-      && pets['Rat-Base'] > 0
-      && pets['Rat-Desert'] > 0
-      && pets['Rat-Red'] > 0
-      && pets['Rat-Shade'] > 0
-      && pets['Rat-White'] > 0
-      && pets['Rat-Golden'] > 0
-      && pets['Rat-CottonCandyBlue'] > 0
-      && pets['Rat-CottonCandyPink'] > 0 ) {
-        set['achievements.rodentRuler'] = true;
-      
-    }
-  }
-
-  if (count % progressCount === 0) console.warn(`${count} ${user._id}`);
-
-  return await User.updateOne({ _id: user._id }, { $set: set }).exec();
-}
-
-export default async function processUsers () {
-  let query = {
-    migration: { $ne: MIGRATION_NAME },
-    'auth.timestamps.loggedin': { $gt: new Date('2024-02-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
-  }
-};

migrations/archive/2024/20240516_pet_group_achievements.js

@@ -1,99 +0,0 @@
-/* eslint-disable no-console */
-const MIGRATION_NAME = '202405_pet_group_achievements';
-import { model as User } from '../../../website/server/models/user';
-
-const progressCount = 1000;
-let count = 0;
-
-async function updateUser (user) {
-  count++;
-
-  let set = {
-    migration: MIGRATION_NAME,
-  };
-
-  if (user && user.items && user.items.pets) {
-    const pets = user.items.pets;
-    if (pets['LionCub-Zombie'] > 0
-      && pets['LionCub-Skeleton'] > 0
-      && pets['LionCub-Base'] > 0
-      && pets['LionCub-Desert'] > 0
-      && pets['LionCub-Red'] > 0
-      && pets['LionCub-Shade'] > 0
-      && pets['LionCub-White']> 0
-      && pets['LionCub-Golden'] > 0
-      && pets['LionCub-CottonCandyBlue'] > 0
-      && pets['LionCub-CottonCandyPink'] > 0
-      && pets['TigerCub-Zombie'] > 0
-      && pets['TigerCub-Skeleton'] > 0
-      && pets['TigerCub-Base'] > 0
-      && pets['TigerCub-Desert'] > 0
-      && pets['TigerCub-Red'] > 0
-      && pets['TigerCub-Shade'] > 0
-      && pets['TigerCub-White'] > 0
-      && pets['TigerCub-Golden'] > 0
-      && pets['TigerCub-CottonCandyBlue'] > 0
-      && pets['TigerCub-CottonCandyPink'] > 0
-      && pets['Sabretooth-Zombie'] > 0
-      && pets['Sabretooth-Skeleton'] > 0
-      && pets['Sabretooth-Base'] > 0
-      && pets['Sabretooth-Desert'] > 0
-      && pets['Sabretooth-Red'] > 0
-      && pets['Sabretooth-Shade'] > 0
-      && pets['Sabretooth-White'] > 0
-      && pets['Sabretooth-Golden'] > 0
-      && pets['Sabretooth-CottonCandyBlue'] > 0
-      && pets['Sabretooth-CottonCandyPink'] > 0 
-      && pets['Cheetah-Zombie'] > 0
-      && pets['Cheetah-Skeleton'] > 0
-      && pets['Cheetah-Base'] > 0
-      && pets['Cheetah-Desert'] > 0
-      && pets['Cheetah-Red'] > 0
-      && pets['Cheetah-Shade'] > 0
-      && pets['Cheetah-White'] > 0
-      && pets['Cheetah-Golden'] > 0
-      && pets['Cheetah-CottonCandyBlue'] > 0
-      && pets['Cheetah-CottonCandyPink'] > 0 ) {
-        set['achievements.cats'] = true;
-      
-    }
-  }
-
-  if (count % progressCount === 0) console.warn(`${count} ${user._id}`);
-
-  return await User.updateOne({ _id: user._id }, { $set: set }).exec();
-}
-
-export default async function processUsers () {
-  let query = {
-    migration: { $ne: MIGRATION_NAME },
-    'auth.timestamps.loggedin': { $gt: new Date('2024-03-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
-  }
-};

migrations/archive/2024/20240621_veteran_pets.js

@@ -1,149 +0,0 @@
-/* eslint-disable no-console */
-const MIGRATION_NAME = '20240621_veteran_pet_ladder';
-import { model as User } from '../../../website/server/models/user';
-
-const progressCount = 1000;
-let count = 0;
-
-async function updateUser (user) {
-  count++;
-
-  const set = {};
-  let push = { notifications: { $each: [] }};
-
-  set.migration = MIGRATION_NAME;
-  if (user.items.pets['Dragon-Veteran']) {
-    set['items.pets.Cactus-Veteran'] = 5;
-    push.notifications.$each.push({
-      type: 'ITEM_RECEIVED',
-      data: {
-        icon: 'icon_pet_veteran_cactus',
-        title: 'You’ve received a Veteran Pet!',
-        text: 'To commemorate being here for a new era of Habitica, we’ve awarded you a Veteran Cactus and 24 Gems!',
-        destination: '/inventory/stable',
-      },
-      seen: false,
-    });
-  } else if (user.items.pets['Fox-Veteran']) {
-    set['items.pets.Dragon-Veteran'] = 5;
-    push.notifications.$each.push({
-      type: 'ITEM_RECEIVED',
-      data: {
-        icon: 'icon_pet_veteran_dragon',
-        title: 'You’ve received a Veteran Pet!',
-        text: 'To commemorate being here for a new era of Habitica, we’ve awarded you a Veteran Dragon and 24 Gems!',
-        destination: '/inventory/stable',
-      },
-      seen: false,
-    });
-  } else if (user.items.pets['Bear-Veteran']) {
-    set['items.pets.Fox-Veteran'] = 5;
-    push.notifications.$each.push({
-      type: 'ITEM_RECEIVED',
-      data: {
-        icon: 'icon_pet_veteran_fox',
-        title: 'You’ve received a Veteran Pet!',
-        text: 'To commemorate being here for a new era of Habitica, we’ve awarded you a Veteran Fox and 24 Gems!',
-        destination: '/inventory/stable',
-      },
-      seen: false,
-    });
-  } else if (user.items.pets['Lion-Veteran']) {
-    set['items.pets.Bear-Veteran'] = 5;
-    push.notifications.$each.push({
-      type: 'ITEM_RECEIVED',
-      data: {
-        icon: 'icon_pet_veteran_bear',
-        title: 'You’ve received a Veteran Pet!',
-        text: 'To commemorate being here for a new era of Habitica, we’ve awarded you a Veteran Bear and 24 Gems!',
-        destination: '/inventory/stable',
-      },
-      seen: false,
-    });
-  } else if (user.items.pets['Tiger-Veteran']) {
-    set['items.pets.Lion-Veteran'] = 5;
-    push.notifications.$each.push({
-      type: 'ITEM_RECEIVED',
-      data: {
-        icon: 'icon_pet_veteran_lion',
-        title: 'You’ve received a Veteran Pet!',
-        text: 'To commemorate being here for a new era of Habitica, we’ve awarded you a Veteran Lion and 24 Gems!',
-        destination: '/inventory/stable',
-      },
-      seen: false,
-    });
-  } else if (user.items.pets['Wolf-Veteran']) {
-    set['items.pets.Tiger-Veteran'] = 5;
-    push.notifications.$each.push({
-      type: 'ITEM_RECEIVED',
-      data: {
-        icon: 'icon_pet_veteran_tiger',
-        title: 'You’ve received a Veteran Pet!',
-        text: 'To commemorate being here for a new era of Habitica, we’ve awarded you a Veteran Tiger and 24 Gems!',
-        destination: '/inventory/stable',
-      },
-      seen: false,
-    });
-  } else {
-    set['items.pets.Wolf-Veteran'] = 5;
-    push.notifications.$each.push({
-      type: 'ITEM_RECEIVED',
-      data: {
-        icon: 'icon_pet_veteran_wolf',
-        title: 'You’ve received a Veteran Pet!',
-        text: 'To commemorate being here for a new era of Habitica, we’ve awarded you a Veteran Wolf and 24 Gems!',
-        destination: '/inventory/stable',
-      },
-      seen: false,
-    });
-  }
-
-  if (count % progressCount === 0) console.warn(`${count} ${user._id}`);
-
-  await user.updateBalance(
-    6,
-    'admin_update_balance',
-    '',
-    'Veteran Ladder award',
-  );
-
-  return await User.updateOne(
-    { _id: user._id },
-    { $set: set, $push: push, $inc: { balance: 6 } },
-  ).exec();
-}
-
-export default async function processUsers () {
-  let query = {
-    migration: {$ne: MIGRATION_NAME},
-    'auth.timestamps.loggedin': { $gt: new Date('2024-05-21') },
-  };
-
-  const fields = {
-    _id: 1,
-    items: 1,
-    migration: 1,
-    contributor: 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)
-      .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
-  }
-};

migrations/archive/2024/20240806_purge_invite_accepted.js

@@ -1,47 +0,0 @@
-/* eslint-disable no-console */
-import { model as User } from '../../../website/server/models/user';
-
-const MIGRATION_NAME = '2024_purge_invite_accepted';
-const progressCount = 1000;
-let count = 0;
-
-async function updateUsers (userIds) {
-  count += userIds.length;
-  if (count % progressCount === 0) console.warn(`${count} ${userIds[0]}`);
-
-  return await User.updateMany(
-    { _id: { $in: userIds } },
-    { $pull: { notifications: { type: 'GROUP_INVITE_ACCEPTED' } } },
-  ).exec();
-}
-
-export default async function processUsers () {
-  let query = {
-    migration: { $ne: MIGRATION_NAME },
-    'notifications.type': 'GROUP_INVITE_ACCEPTED',
-    'auth.timestamps.loggedin': { $gt: new Date('2024-06-25') },
-  };
-
-  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({ _id: 1 })
-      .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],
-      };
-    }
-
-    const userIds = users.map(user => user._id);
-
-    await updateUsers(userIds); // eslint-disable-line no-await-in-loop
-  }
-};

migrations/archive/2024/20241119_gem_caps_hourglasses.js

@@ -1,115 +0,0 @@
-/* eslint-disable no-console */
-const MIGRATION_NAME = '20241119_gem_caps_hourglasses';
-import { model as User } from '../../../website/server/models/user';
-
-const progressCount = 1000;
-let count = 0;
-
-async function updateUser (user) {
-  count += 1;
-  if (count % progressCount === 0) console.warn(`${count} ${user._id}`);
-
-  const { consecutive, customerId, dateTerminated, planId } = user.purchased.plan;
-  const isRecurring = customerId !== 'Gift' && !dateTerminated;
-  const updateOp = {
-    $set: {
-      migration: MIGRATION_NAME,
-      'purchased.plan.consecutive.gemCapExtra': Math.max(2 * Math.ceil((consecutive.gemCapExtra + 1) / 2, 26)),
-    },
-    $inc: {},
-  };
-
-  let hourglassBonus = 0;
-
-  if (isRecurring) {
-    await user.updateBalance(
-      5,
-      'admin_update_balance',
-      '',
-      'Subscription Reward Migration',
-    );
-    updateOp.$inc.balance = 5;
-    switch (planId) {
-      case 'basic':
-      case 'basic_earned':
-      case 'group_plan_auto':
-        hourglassBonus = 2;
-        break;
-      case 'basic_3mo':
-      case 'basic_6mo':
-      case 'google_6mo':
-        hourglassBonus = 4;
-        break;
-      case 'basic_12mo':
-        hourglassBonus = 12;
-        updateOp.$set['purchased.plan.hourglassPromoReceived'] = new Date();
-        break;
-      default:
-        hourglassBonus = 0;
-    }
-
-    if (hourglassBonus) {
-      updateOp.$inc['purchased.plan.consecutive.trinkets'] = hourglassBonus;
-      await user.updateHourglasses(
-        hourglassBonus,
-        'admin_update_balance',
-        '',
-        'Subscription Reward Migration',
-      );
-    }
-    updateOp.$push = {
-      notifications: {
-        type: 'ITEM_RECEIVED',
-        data: {
-          icon: 'notif_subscriber_reward',
-          title: 'Thanks for being a subscriber!',
-          text: 'Enjoy these extra Mystic Hourglasses and Gems to celebrate our new benefits.',
-        },
-        seen: false,
-      },
-    };
-  }
-
-  return await User.updateOne(
-    { _id: user._id },
-    updateOp,
-  ).exec();
-}
-
-export default async function processUsers () {
-  let query = {
-    migration: { $ne: MIGRATION_NAME },
-    'purchased.plan.customerId': { $exists: true },
-    $or: [
-      { 'purchased.plan.dateTerminated': { $exists: false } },
-      { 'purchased.plan.dateTerminated': null },
-      { 'purchased.plan.dateTerminated': { $gt: new Date() } },
-    ],
-  };
-
-  const fields = {
-    _id: 1,
-    purchased: 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)
-      .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
-  }
-};

migrations/archive/takeThis.js

@@ -0,0 +1,118 @@
+let migrationName = '20180904_takeThis.js'; // Update per month
+let authorName = 'Sabe'; // in case script author needs to know when their ...
+let authorUuid = '7f14ed62-5408-4e1b-be83-ada62d504931'; // ... own data is done
+
+/*
+ * Award Take This ladder items to participants in this month's challenge
+ */
+
+import monk from 'monk';
+import nconf from 'nconf';
+const CONNECTION_STRING = nconf.get('MIGRATION_CONNECT_STRING'); // FOR TEST DATABASE
+let dbUsers = monk(CONNECTION_STRING).get('users', { castIds: false });
+
+function processUsers (lastId) {
+  // specify a query to limit the affected users (empty for all users):
+  let query = {
+    migration: {$ne: migrationName},
+    challenges: {$in: ['1044ec0c-4a85-48c5-9f36-d51c0c62c7d3']}, // Update per month
+  };
+
+  if (lastId) {
+    query._id = {
+      $gt: lastId,
+    };
+  }
+
+  dbUsers.find(query, {
+    sort: {_id: 1},
+    limit: 250,
+    fields: [
+      'items.gear.owned',
+    ], // specify fields we are interested in to limit retrieved data (empty if we're not reading data):
+  })
+    .then(updateUsers)
+    .catch((err) => {
+      console.log(err);
+      return exiting(1, `ERROR! ${  err}`);
+    });
+}
+
+let progressCount = 1000;
+let count = 0;
+
+function updateUsers (users) {
+  if (!users || users.length === 0) {
+    console.warn('All appropriate users found and modified.');
+    displayData();
+    return;
+  }
+
+  let userPromises = users.map(updateUser);
+  let lastUser = users[users.length - 1];
+
+  return Promise.all(userPromises)
+    .then(() => {
+      processUsers(lastUser._id);
+    });
+}
+
+function updateUser (user) {
+  count++;
+
+  let set = {};
+  let push;
+
+  if (typeof user.items.gear.owned.back_special_takeThis !== 'undefined') {
+    set = {migration: migrationName};
+  } else if (typeof user.items.gear.owned.body_special_takeThis !== 'undefined') {
+    set = {migration: migrationName, 'items.gear.owned.back_special_takeThis': false};
+    push = {pinnedItems: {type: 'marketGear', path: 'gear.flat.back_special_takeThis', _id: monk.id()}};
+  } else if (typeof user.items.gear.owned.head_special_takeThis !== 'undefined') {
+    set = {migration: migrationName, 'items.gear.owned.body_special_takeThis': false};
+    push = {pinnedItems: {type: 'marketGear', path: 'gear.flat.body_special_takeThis', _id: monk.id()}};
+  } else if (typeof user.items.gear.owned.armor_special_takeThis !== 'undefined') {
+    set = {migration: migrationName, 'items.gear.owned.head_special_takeThis': false};
+    push = {pinnedItems: {type: 'marketGear', path: 'gear.flat.head_special_takeThis', _id: monk.id()}};
+  } else if (typeof user.items.gear.owned.weapon_special_takeThis !== 'undefined') {
+    set = {migration: migrationName, 'items.gear.owned.armor_special_takeThis': false};
+    push = {pinnedItems: {type: 'marketGear', path: 'gear.flat.armor_special_takeThis', _id: monk.id()}};
+  } else if (typeof user.items.gear.owned.shield_special_takeThis !== 'undefined') {
+    set = {migration: migrationName, 'items.gear.owned.weapon_special_takeThis': false};
+    push = {pinnedItems: {type: 'marketGear', path: 'gear.flat.weapon_special_takeThis', _id: monk.id()}};
+  } else {
+    set = {migration: migrationName, 'items.gear.owned.shield_special_takeThis': false};
+    push = {pinnedItems: {type: 'marketGear', path: 'gear.flat.shield_special_takeThis', _id: monk.id()}};
+  }
+
+  if (push) {
+    dbUsers.update({_id: user._id}, {$set: set, $push: push});
+  } else {
+    dbUsers.update({_id: user._id}, {$set: set});
+  }
+
+  if (count % progressCount === 0) console.warn(`${count  } ${  user._id}`);
+  if (user._id === authorUuid) console.warn(`${authorName  } processed`);
+}
+
+function displayData () {
+  console.warn(`\n${  count  } users processed\n`);
+  return exiting(0);
+}
+
+function exiting (code, msg) {
+  code = code || 0; // 0 = success
+  if (code && !msg) {
+    msg = 'ERROR!';
+  }
+  if (msg) {
+    if (code) {
+      console.error(msg);
+    } else      {
+      console.log(msg);
+    }
+  }
+  process.exit(code);
+}
+
+module.exports = processUsers;

migrations/csvexport.py

@@ -0,0 +1,10 @@
+import csv
+
+with open(r"/home/slappybag/Documents/SurveyScrape.csv") as f:
+     reader = csv.reader(f, delimiter=',', quotechar='"')
+     column = []
+     for row in reader:
+        if row:
+            column.append(row[4])
+
+print column

migrations/users/bulk-email.js

@@ -26,7 +26,7 @@ async function updateUser (user) {
     [{ name: 'BASE_URL', content: BASE_URL }], // Add variables from template
   );
 
-  return User.updateOne({ _id: user._id }, { $set: { migration: MIGRATION_NAME } }).exec();
+  return User.update({ _id: user._id }, { $set: { migration: MIGRATION_NAME } }).exec();
 }
 
 export default async function processUsers () {

migrations/users/full-gear.js

@@ -27,13 +27,13 @@ async function updateUser (user) {
 
   if (count % progressCount === 0) console.warn(`${count} ${user._id}`);
 
-  return User.updateOne({ _id: user._id }, { $set: set }).exec();
+  return User.update({ _id: user._id }, { $set: set }).exec();
 }
 
 export default async function processUsers () {
   const query = {
     migration: { $ne: MIGRATION_NAME },
-    'auth.local.username': 'ExampleHabitican',
+    'auth.local.lowerCaseUsername': 'olson1',
   };
 
   const fields = {

migrations/users/full-stable.js

@@ -51,13 +51,13 @@ async function updateUser (user) {
 
   if (count % progressCount === 0) console.warn(`${count} ${user._id}`);
 
-  return User.updateOne({ _id: user._id }, { $set: set }).exec();
+  return User.update({ _id: user._id }, { $set: set }).exec();
 }
 
 export default async function processUsers () {
   const query = {
     migration: { $ne: MIGRATION_NAME },
-    'auth.local.username': 'ExampleHabitican',
+    'auth.local.username': 'SabreTest',
   };
 
   const fields = {

migrations/users/habitoween.js

@@ -1,175 +0,0 @@
-/*
- * Award Habitoween ladder items to participants in this month's Habitoween festivities
- */
-/* eslint-disable no-console */
-import { model as User } from '../../website/server/models/user';
-
-const MIGRATION_NAME = '20241030_habitoween_ladder'; // Update when running in future years
-
-const progressCount = 1000;
-let count = 0;
-
-async function updateUser (user) {
-  count += 1;
-
-  const set = { migration: MIGRATION_NAME };
-  const inc = {
-    'items.food.Candy_Skeleton': 1,
-    'items.food.Candy_Base': 1,
-    'items.food.Candy_CottonCandyBlue': 1,
-    'items.food.Candy_CottonCandyPink': 1,
-    'items.food.Candy_Shade': 1,
-    'items.food.Candy_White': 1,
-    'items.food.Candy_Golden': 1,
-    'items.food.Candy_Zombie': 1,
-    'items.food.Candy_Desert': 1,
-    'items.food.Candy_Red': 1,
-  };
-  const push = { notifications: { $each: [] } };
-
-  if (user && user.items && user.items.mounts && user.items.mounts['JackOLantern-RoyalPurple']) {
-    push.notifications.$each.push({
-      type: 'ITEM_RECEIVED',
-      data: {
-        icon: 'notif_habitoween_candy',
-        title: 'Happy Habitoween!',
-        text: 'For this spooky celebration, you\'ve received an assortment of candy for your Pets!',
-        destination: '/inventory/stable',
-      },
-      seen: false,
-    });
-  } else if (user && user.items && user.items.pets && user.items.pets['JackOLantern-RoyalPurple']) {
-    set['items.mounts.JackOLantern-RoyalPurple'] = true;
-    push.notifications.$each.push({
-      type: 'ITEM_RECEIVED',
-      data: {
-        icon: 'notif_habitoween_purple_mount',
-        title: 'Happy Habitoween!',
-        text: 'For this spooky celebration, you\'ve received a Royal Purple Jack-O-Lantern Mount and an assortment of candy for your Pets!',
-        destination: '/inventory/stable',
-      },
-      seen: false,
-    });
-  } else if (user && user.items && user.items.mounts && user.items.mounts['JackOLantern-Glow']) {
-    set['items.pets.JackOLantern-RoyalPurple'] = 5;
-    push.notifications.$each.push({
-      type: 'ITEM_RECEIVED',
-      data: {
-        icon: 'notif_habitoween_purple_pet',
-        title: 'Happy Habitoween!',
-        text: 'For this spooky celebration, you\'ve received a Royal Purple Jack-O-Lantern Pet and an assortment of candy for your Pets!',
-        destination: '/inventory/stable',
-      },
-      seen: false,
-    });
-  } else if (user && user.items && user.items.pets && user.items.pets['JackOLantern-Glow']) {
-    set['items.mounts.JackOLantern-Glow'] = true;
-    push.notifications.$each.push({
-      type: 'ITEM_RECEIVED',
-      data: {
-        icon: 'notif_habitoween_glow_mount',
-        title: 'Happy Habitoween!',
-        text: 'For this spooky celebration, you\'ve received a Glow-in-the-Dark Jack-O-Lantern Mount and an assortment of candy for your Pets!',
-        destination: '/inventory/stable',
-      },
-      seen: false,
-    });
-  } else if (user && user.items && user.items.mounts && user.items.mounts['JackOLantern-Ghost']) {
-    set['items.pets.JackOLantern-Glow'] = 5;
-    push.notifications.$each.push({
-      type: 'ITEM_RECEIVED',
-      data: {
-        icon: 'notif_habitoween_glow_pet',
-        title: 'Happy Habitoween!',
-        text: 'For this spooky celebration, you\'ve received a Glow-in-the-Dark Jack-O-Lantern Pet and an assortment of candy for your Pets!',
-        destination: '/inventory/stable',
-      },
-      seen: false,
-    });
-  } else if (user && user.items && user.items.pets && user.items.pets['JackOLantern-Ghost']) {
-    set['items.mounts.JackOLantern-Ghost'] = true;
-    push.notifications.$each.push({
-      type: 'ITEM_RECEIVED',
-      data: {
-        icon: 'notif_habitoween_ghost_mount',
-        title: 'Happy Habitoween!',
-        text: 'For this spooky celebration, you\'ve received a Ghost Jack-O-Lantern Mount and an assortment of candy for your Pets!',
-        destination: '/inventory/stable',
-      },
-      seen: false,
-    });
-  } else if (user && user.items && user.items.mounts && user.items.mounts['JackOLantern-Base']) {
-    set['items.pets.JackOLantern-Ghost'] = 5;
-    push.notifications.$each.push({
-      type: 'ITEM_RECEIVED',
-      data: {
-        icon: 'notif_habitoween_ghost_pet',
-        title: 'Happy Habitoween!',
-        text: 'For this spooky celebration, you\'ve received a Ghost Jack-O-Lantern Pet and an assortment of candy for your Pets!',
-        destination: '/inventory/stable',
-      },
-      seen: false,
-    });
-  } else if (user && user.items && user.items.pets && user.items.pets['JackOLantern-Base']) {
-    set['items.mounts.JackOLantern-Base'] = true;
-    push.notifications.$each.push({
-      type: 'ITEM_RECEIVED',
-      data: {
-        icon: 'notif_habitoween_base_mount',
-        title: 'Happy Habitoween!',
-        text: 'For this spooky celebration, you\'ve received a Jack-O-Lantern Mount and an assortment of candy for your Pets!',
-        destination: '/inventory/stable',
-      },
-      seen: false,
-    });
-  } else {
-    set['items.pets.JackOLantern-Base'] = 5;
-    push.notifications.$each.push({
-      type: 'ITEM_RECEIVED',
-      data: {
-        icon: 'notif_habitoween_base_pet',
-        title: 'Happy Habitoween!',
-        text: 'For this spooky celebration, you\'ve received a Jack-O-Lantern Pet and an assortment of candy for your Pets!',
-        destination: '/inventory/stable',
-      },
-      seen: false,
-    });
-  }
-
-  if (count % progressCount === 0) console.warn(`${count} ${user._id}`);
-  return User.updateOne({ _id: user._id }, { $inc: inc, $push: push, $set: set }).exec();
-}
-
-export default async function processUsers () {
-  const query = {
-    migration: { $ne: MIGRATION_NAME },
-    'auth.timestamps.loggedin': { $gt: new Date('2024-10-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],
-      };
-    }
-
-    await Promise.all(users.map(updateUser)); // eslint-disable-line no-await-in-loop
-  }
-}

migrations/users/harvest_feast.js

@@ -1,167 +0,0 @@
-/* eslint-disable no-console */
-import { model as User } from '../../website/server/models/user';
-
-const MIGRATION_NAME = '20241120_harvest_feast';
-const progressCount = 1000;
-let count = 0;
-
-async function updateUser (user) {
-  count += 1;
-
-  const updateOp = {
-    $set: { migration: MIGRATION_NAME },
-  };
-
-  if (typeof user.items.gear.owned.head_special_turkeyHelmGilded !== 'undefined') {
-    updateOp.$inc = {
-      'items.food.Pie_Base': 1,
-      'items.food.Pie_CottonCandyBlue': 1,
-      'items.food.Pie_CottonCandyPink': 1,
-      'items.food.Pie_Desert': 1,
-      'items.food.Pie_Golden': 1,
-      'items.food.Pie_Red': 1,
-      'items.food.Pie_Shade': 1,
-      'items.food.Pie_Skeleton': 1,
-      'items.food.Pie_Zombie': 1,
-      'items.food.Pie_White': 1,
-    };
-    updateOp.$push = {
-      notifications: {
-        type: 'ITEM_RECEIVED',
-        data: {
-          icon: 'notif_harvestfeast_pie',
-          title: 'Happy Harvest Feast!',
-          text: 'Gobble gobble, you\'ve received an assortment of pie for your Pets!',
-          destination: '/inventory/stable',
-        },
-        seen: false,
-      },
-    };
-  } else if (typeof user.items.gear.owned.armor_special_turkeyArmorBase !== 'undefined') {
-    updateOp.$set['items.gear.owned.head_special_turkeyHelmGilded'] = true;
-    updateOp.$set['items.gear.owned.armor_special_turkeyArmorGilded'] = true;
-    updateOp.$set['items.gear.owned.back_special_turkeyTailGilded'] = true;
-    updateOp.$push = {
-      notifications: {
-        type: 'ITEM_RECEIVED',
-        data: {
-          icon: 'notif_harvestfeast_gilded_set',
-          title: 'Happy Harvest Feast!',
-          text: 'Gobble gobble, you\'ve received the Gilded Turkey Armor, Helm, and Tail!',
-          destination: '/inventory/equipment',
-        },
-        seen: false,
-      },
-    };
-  } else if (user.items && user.items.mounts && user.items.mounts['Turkey-Gilded']) {
-    updateOp.$set['items.gear.owned.head_special_turkeyHelmBase'] = true;
-    updateOp.$set['items.gear.owned.armor_special_turkeyArmorBase'] = true;
-    updateOp.$set['items.gear.owned.back_special_turkeyTailBase'] = true;
-    updateOp.$push = {
-      notifications: {
-        type: 'ITEM_RECEIVED',
-        data: {
-          icon: 'notif_harvestfeast_base_set',
-          title: 'Happy Harvest Feast!',
-          text: 'Gobble gobble, you\'ve received the Turkey Armor, Helm, and Tail!',
-          destination: '/inventory/equipment',
-        },
-        seen: false,
-      },
-    };
-  } else if (user.items && user.items.pets && user.items.pets['Turkey-Gilded']) {
-    updateOp.$set['items.mounts.Turkey-Gilded'] = true;
-    updateOp.$push = {
-      notifications: {
-        type: 'ITEM_RECEIVED',
-        data: {
-          icon: 'notif_harvestfeast_gilded_mount',
-          title: 'Happy Harvest Feast!',
-          text: 'Gobble gobble, you\'ve received the Gilded Turkey Mount!',
-          destination: '/inventory/stable',
-        },
-        seen: false,
-      },
-    };
-  } else if (user.items && user.items.mounts && user.items.mounts['Turkey-Base']) {
-    updateOp.$set['items.pets.Turkey-Gilded'] = 5;
-    updateOp.$push = {
-      notifications: {
-        type: 'ITEM_RECEIVED',
-        data: {
-          icon: 'notif_harvestfeast_gilded_pet',
-          title: 'Happy Harvest Feast!',
-          text: 'Gobble gobble, you\'ve received the Gilded Turkey Pet!',
-          destination: '/inventory/stable',
-        },
-        seen: false,
-      },
-    };
-  } else if (user.items && user.items.pets && user.items.pets['Turkey-Base']) {
-    updateOp.$set['items.mounts.Turkey-Base'] = true;
-    updateOp.$push = {
-      notifications: {
-        type: 'ITEM_RECEIVED',
-        data: {
-          icon: 'notif_harvestfeast_base_mount',
-          title: 'Happy Harvest Feast!',
-          text: 'Gobble gobble, you\'ve received the Turkey Mount!',
-          destination: '/inventory/stable',
-        },
-        seen: false,
-      },
-    };
-  } else {
-    updateOp.$set['items.pets.Turkey-Base'] = 5;
-    updateOp.$push = {
-      notifications: {
-        type: 'ITEM_RECEIVED',
-        data: {
-          icon: 'notif_harvestfeast_base_pet',
-          title: 'Happy Harvest Feast!',
-          text: 'Gobble gobble, you\'ve received the Turkey Pet!',
-          destination: '/inventory/stable',
-        },
-        seen: false,
-      },
-    };
-  }
-
-  if (count % progressCount === 0) console.warn(`${count} ${user._id}`);
-
-  return User.updateOne({ _id: user._id }, updateOp).exec();
-}
-
-export default async function processUsers () {
-  const query = {
-    migration: { $ne: MIGRATION_NAME },
-    'auth.timestamps.loggedin': { $gt: new Date('2024-10-20') },
-  };
-
-  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
-  }
-}

migrations/users/nye.js

@@ -1,125 +0,0 @@
-/* eslint-disable no-console */
-import { model as User } from '../../website/server/models/user';
-
-const MIGRATION_NAME = '20231228_nye';
-const progressCount = 1000;
-let count = 0;
-
-async function updateUser (user) {
-  count += 1;
-
-  const updateOp = {
-    $set: { migration: MIGRATION_NAME },
-    $push: { },
-  };
-  const data = {
-    title: 'Happy New Year!',
-    destination: '/inventory/equipment',
-  };
-
-  if (typeof user.items.gear.owned.head_special_nye2023 !== 'undefined') {
-    updateOp.$inc = {
-      'items.food.Candy_Skeleton': 1,
-      'items.food.Candy_Base': 1,
-      'items.food.Candy_CottonCandyBlue': 1,
-      'items.food.Candy_CottonCandyPink': 1,
-      'items.food.Candy_Shade': 1,
-      'items.food.Candy_White': 1,
-      'items.food.Candy_Golden': 1,
-      'items.food.Candy_Zombie': 1,
-      'items.food.Candy_Desert': 1,
-      'items.food.Candy_Red': 1,
-    };
-    data.icon = 'notif_candy_nye';
-    data.text = 'You’ve received an assortment of candy to celebrate with your Pets!';
-    data.destination = '/inventory/stable';
-  } else if (typeof user.items.gear.owned.head_special_nye2022 !== 'undefined') {
-    updateOp.$set['items.gear.owned.head_special_nye2023'] = true;
-    data.icon = 'notif_2023hat_nye';
-    data.text = 'Take on your resolutions with style in this Ludicrous Party Hat!';
-  } else if (typeof user.items.gear.owned.head_special_nye2021 !== 'undefined') {
-    updateOp.$set['items.gear.owned.head_special_nye2022'] = true;
-    data.icon = 'notif_2022hat_nye';
-    data.text = 'Take on your resolutions with style in this Fabulous Party Hat!';
-  } else if (typeof user.items.gear.owned.head_special_nye2020 !== 'undefined') {
-    updateOp.$set['items.gear.owned.head_special_nye2021'] = true;
-    data.icon = 'notif_2021hat_nye';
-    data.text = 'Take on your resolutions with style in this Preposterous Party Hat!';
-  } else if (typeof user.items.gear.owned.head_special_nye2019 !== 'undefined') {
-    updateOp.$set['items.gear.owned.head_special_nye2020'] = true;
-    data.icon = 'notif_2020hat_nye';
-    data.text = 'Take on your resolutions with style in this Extravagant Party Hat!';
-  } else if (typeof user.items.gear.owned.head_special_nye2018 !== 'undefined') {
-    updateOp.$set['items.gear.owned.head_special_nye2019'] = true;
-    data.icon = 'notif_2019hat_nye';
-    data.text = 'Take on your resolutions with style in this Outrageous Party Hat!';
-  } else if (typeof user.items.gear.owned.head_special_nye2017 !== 'undefined') {
-    updateOp.$set['items.gear.owned.head_special_nye2018'] = true;
-    data.icon = 'notif_2018hat_nye';
-    data.text = 'Take on your resolutions with style in this Outlandish Party Hat!';
-  } else if (typeof user.items.gear.owned.head_special_nye2016 !== 'undefined') {
-    updateOp.$set['items.gear.owned.head_special_nye2017'] = true;
-    data.icon = 'notif_2017hat_nye';
-    data.text = 'Take on your resolutions with style in this Fanciful Party Hat!';
-  } else if (typeof user.items.gear.owned.head_special_nye2015 !== 'undefined') {
-    updateOp.$set['items.gear.owned.head_special_nye2016'] = true;
-    data.icon = 'notif_2016hat_nye';
-    data.text = 'Take on your resolutions with style in this Whimsical Party Hat!';
-  } else if (typeof user.items.gear.owned.head_special_nye2014 !== 'undefined') {
-    updateOp.$set['items.gear.owned.head_special_nye2015'] = true;
-    data.icon = 'notif_2015hat_nye';
-    data.text = 'Take on your resolutions with style in this Ridiculous Party Hat!';
-  } else if (typeof user.items.gear.owned.head_special_nye !== 'undefined') {
-    updateOp.$set['items.gear.owned.head_special_nye2014'] = true;
-    data.icon = 'notif_2014hat_nye';
-    data.text = 'Take on your resolutions with style in this Silly Party Hat!';
-  } else {
-    updateOp.$set['items.gear.owned.head_special_nye'] = true;
-    data.icon = 'notif_2013hat_nye';
-    data.text = 'Take on your resolutions with style in this Absurd Party Hat!';
-  }
-
-  updateOp.$push.notifications = {
-    type: 'ITEM_RECEIVED',
-    data,
-    seen: false,
-  };
-
-  if (count % progressCount === 0) console.warn(`${count} ${user._id}`);
-
-  return User.updateOne({ _id: user._id }, updateOp).exec();
-}
-
-export default async function processUsers () {
-  const query = {
-    'auth.timestamps.loggedin': { $gt: new Date('2023-12-01') },
-    migration: { $ne: MIGRATION_NAME },
-  };
-
-  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
-  }
-}

migrations/users/pi-day.js

@@ -3,7 +3,7 @@ import { v4 as uuid } from 'uuid';
 
 import { model as User } from '../../website/server/models/user';
 
-const MIGRATION_NAME = '20240314_pi_day';
+const MIGRATION_NAME = '20230314_pi_day';
 
 const progressCount = 1000;
 let count = 0;

package.json

@@ -1,7 +1,7 @@
 {
   "name": "habitica",
   "description": "A habit tracker app which treats your goals like a Role Playing Game.",
-  "version": "5.36.1",
+  "version": "5.16.1",
   "main": "./website/server/index.js",
   "dependencies": {
     "@babel/core": "^7.22.10",
@@ -15,9 +15,8 @@
     "amplitude": "^6.0.0",
     "apidoc": "^0.54.0",
     "apple-auth": "^1.0.9",
-    "babel-preset-env": "^1.7.0",
     "bcrypt": "^5.1.1",
-    "body-parser": "^1.20.3",
+    "body-parser": "^1.20.2",
     "bootstrap": "^4.6.2",
     "compression": "^1.7.4",
     "cookie-session": "^2.0.0",
@@ -28,15 +27,13 @@
     "eslint": "^8.55.0",
     "eslint-config-habitrpg": "^6.2.3",
     "eslint-plugin-mocha": "^5.0.0",
-    "express": "^4.21.1",
+    "express": "^4.18.2",
     "express-basic-auth": "^1.2.1",
     "express-validator": "^5.2.0",
-    "firebase-admin": "^12.1.1",
     "glob": "^8.1.0",
     "got": "^11.8.6",
     "gulp": "^4.0.0",
     "gulp-babel": "^8.0.0",
-    "gulp-filter": "^7.0.0",
     "gulp-imagemin": "^7.1.0",
     "gulp-nodemon": "^2.5.0",
     "gulp.spritesmith": "^6.13.0",
@@ -51,7 +48,7 @@
     "method-override": "^3.0.0",
     "moment": "^2.29.4",
     "moment-recur": "^1.0.7",
-    "mongoose": "^8.9.5",
+    "mongoose": "^7.6.3",
     "morgan": "^1.10.0",
     "nconf": "^0.12.1",
     "node-gcm": "^1.0.5",
@@ -69,22 +66,20 @@
     "remove-markdown": "^0.5.0",
     "rimraf": "^3.0.2",
     "short-uuid": "^4.2.2",
-    "sinon": "^15.2.0",
     "stripe": "^12.18.0",
     "superagent": "^8.1.2",
     "universal-analytics": "^0.5.3",
     "useragent": "^2.1.9",
     "uuid": "^9.0.0",
     "validator": "^13.11.0",
-    "webpack-bundle-analyzer": "^4.10.2",
     "winston": "^3.10.0",
     "winston-loggly-bulk": "^3.3.0",
     "xml2js": "^0.6.2"
   },
   "private": true,
   "engines": {
-    "node": "20",
-    "npm": "^10"
+    "node": "^14",
+    "npm": "^6"
   },
   "scripts": {
     "lint": "eslint --ext .js --fix . && cd website/client && npm run lint",
@@ -97,37 +92,37 @@
     "test:api-v3:integration:separate-server": "NODE_ENV=test gulp test:api-v3:integration:separate-server",
     "test:api-v4:integration": "gulp test:api-v4:integration",
     "test:api-v4:integration:separate-server": "NODE_ENV=test gulp test:api-v4:integration:separate-server",
-    "test:sanity": "nyc --silent --no-clean mocha test/sanity --recursive",
-    "test:common": "nyc --silent --no-clean mocha test/common --recursive",
-    "test:content": "nyc --silent --no-clean mocha test/content --recursive",
+    "test:sanity": "istanbul cover --dir coverage/sanity --report lcovonly node_modules/mocha/bin/_mocha -- test/sanity --recursive",
+    "test:common": "istanbul cover --dir coverage/common --report lcovonly node_modules/mocha/bin/_mocha -- test/common --recursive",
+    "test:content": "istanbul cover --dir coverage/content --report lcovonly node_modules/mocha/bin/_mocha -- test/content --recursive",
     "test:nodemon": "gulp test:nodemon",
-    "coverage": "nyc report --reporter=html --report-dir coverage/results; open coverage/results/index.html",
+    "coverage": "COVERAGE=true mocha --require register-handlers.js --reporter html-cov > coverage.html; open coverage.html",
     "sprites": "gulp sprites:compile",
     "client:dev": "cd website/client && npm run serve",
     "client:build": "cd website/client && npm run build",
     "client:unit": "cd website/client && npm run test:unit",
     "start": "gulp nodemon",
-    "start:simple": "node ./website/server/index.js",
     "debug": "gulp nodemon --inspect",
     "mongo:dev": "run-rs -v 5.0.23 -l ubuntu1804 --keep --dbpath mongodb-data --number 1 --quiet",
-    "mongo:test": "run-rs -v 5.0.23 -l ubuntu1804 --keep --dbpath mongodb-data-testing --number 1 --quiet",
     "postinstall": "git config --global url.\"https://\".insteadOf git:// && gulp build && cd website/client && npm install",
-    "apidoc": "gulp apidoc",
-    "heroku-postbuild": ".heroku/report_deploy.sh"
+    "apidoc": "gulp apidoc"
   },
   "devDependencies": {
-    "axios": "^1.7.4",
+    "axios": "^1.4.0",
     "chai": "^4.3.7",
     "chai-as-promised": "^7.1.1",
     "chai-moment": "^0.1.0",
     "chalk": "^5.3.0",
-    "cross-spawn": "^7.0.5",
+    "cross-spawn": "^7.0.3",
+    "expect.js": "^0.3.1",
+    "istanbul": "^1.1.0-alpha.1",
     "mocha": "^5.1.1",
     "monk": "^7.3.4",
-    "nyc": "^15.1.0",
     "require-again": "^2.0.0",
     "run-rs": "^0.7.7",
+    "sinon": "^15.2.0",
     "sinon-chai": "^3.7.0",
     "sinon-stub-promise": "^4.0.0"
-  }
+  },
+  "optionalDependencies": {}
 }

test/api/unit/libs/apiError.js

@@ -1,4 +1,4 @@
-import { apiError } from '../../../../website/server/libs/apiError';
+import apiError from '../../../../website/server/libs/apiError';
 
 describe('API Messages', () => {
   const message = 'Only public guilds support pagination.';

test/api/unit/libs/bug-report.test.js

@@ -44,6 +44,7 @@ describe('bug-report', () => {
         USER_HOURGLASSES: 0,
         USER_ID: userId,
         USER_LEVEL: 1,
+        USER_OFFSET_MONTHS: 0,
         USER_PAYMENT_PLATFORM: undefined,
         USER_SUBSCRIPTION: undefined,
         USER_TIMEZONE_OFFSET: 0,

test/api/unit/libs/content.test.js

@@ -1,9 +1,5 @@
-import fs from 'fs';
 import * as contentLib from '../../../../website/server/libs/content';
 import content from '../../../../website/common/script/content';
-import {
-  generateRes,
-} from '../../../helpers/api-unit.helper';
 
 describe('contentLib', () => {
   describe('CONTENT_CACHE_PATH', () => {
@@ -17,90 +13,5 @@ describe('contentLib', () => {
       contentLib.getLocalizedContentResponse();
       expect(typeof content.backgrounds.backgrounds062014.beach.text).to.equal('function');
     });
-
-    it('removes keys from the content data', () => {
-      const response = contentLib.localizeContentData(content, 'en', { backgroundsFlat: true, dropHatchingPotions: true });
-      expect(response.backgroundsFlat).to.not.exist;
-      expect(response.backgrounds).to.exist;
-      expect(response.dropHatchingPotions).to.not.exist;
-      expect(response.hatchingPotions).to.exist;
-    });
-
-    it('removes nested keys from the content data', () => {
-      const response = contentLib.localizeContentData(content, 'en', { gear: { tree: true } });
-      expect(response.gear.tree).to.not.exist;
-      expect(response.gear.flat).to.exist;
-    });
-  });
-
-  it('generates a hash for a filter', () => {
-    const hash = contentLib.hashForFilter('backgroundsFlat,gear.flat');
-    expect(hash).to.equal('-1791877526');
-  });
-
-  it('serves content', () => {
-    const resSpy = generateRes();
-    contentLib.serveContent(resSpy, 'en', '', false);
-    expect(resSpy.send).to.have.been.calledOnce;
-  });
-
-  it('serves filtered content', () => {
-    const resSpy = generateRes();
-    contentLib.serveContent(resSpy, 'en', 'backgroundsFlat,gear.flat', false);
-    expect(resSpy.send).to.have.been.calledOnce;
-  });
-
-  describe('caches content', async () => {
-    let resSpy;
-    beforeEach(() => {
-      resSpy = generateRes();
-      if (fs.existsSync(contentLib.CONTENT_CACHE_PATH)) {
-        fs.rmSync(contentLib.CONTENT_CACHE_PATH, { recursive: true });
-      }
-      fs.mkdirSync(contentLib.CONTENT_CACHE_PATH);
-    });
-
-    it('does not cache requests in development mode', async () => {
-      contentLib.serveContent(resSpy, 'en', '', false);
-      expect(fs.existsSync(`${contentLib.CONTENT_CACHE_PATH}en.json`)).to.be.false;
-    });
-
-    it('caches unfiltered requests', async () => {
-      expect(fs.existsSync(`${contentLib.CONTENT_CACHE_PATH}en.json`)).to.be.false;
-      contentLib.serveContent(resSpy, 'en', '', true);
-      expect(fs.existsSync(`${contentLib.CONTENT_CACHE_PATH}en.json`)).to.be.true;
-    });
-
-    it('serves cached requests', async () => {
-      fs.writeFileSync(
-        `${contentLib.CONTENT_CACHE_PATH}en.json`,
-        '{"success": true, "data": {"all": {}}}',
-        'utf8',
-      );
-      contentLib.serveContent(resSpy, 'en', '', true);
-      expect(resSpy.sendFile).to.have.been.calledOnce;
-      expect(resSpy.sendFile).to.have.been.calledWith(`${contentLib.CONTENT_CACHE_PATH}en.json`);
-    });
-
-    it('caches filtered requests', async () => {
-      const filter = 'backgroundsFlat,gear.flat';
-      const hash = contentLib.hashForFilter(filter);
-      expect(fs.existsSync(`${contentLib.CONTENT_CACHE_PATH}en${hash}.json`)).to.be.false;
-      contentLib.serveContent(resSpy, 'en', filter, true);
-      expect(fs.existsSync(`${contentLib.CONTENT_CACHE_PATH}en${hash}.json`)).to.be.true;
-    });
-
-    it('serves filtered cached requests', async () => {
-      const filter = 'backgroundsFlat,gear.flat';
-      const hash = contentLib.hashForFilter(filter);
-      fs.writeFileSync(
-        `${contentLib.CONTENT_CACHE_PATH}en${hash}.json`,
-        '{"success": true, "data": {}}',
-        'utf8',
-      );
-      contentLib.serveContent(resSpy, 'en', filter, true);
-      expect(resSpy.sendFile).to.have.been.calledOnce;
-      expect(resSpy.sendFile).to.have.been.calledWith(`${contentLib.CONTENT_CACHE_PATH}en${hash}.json`);
-    });
   });
 });

test/api/unit/libs/email.test.js

@@ -171,23 +171,23 @@ describe('emails', () => {
       expect(got.post).not.to.be.called;
     });
 
-    it('throws error when mail target is only a string', async () => {
+    it('throws error when mail target is only a string', () => {
       const emailType = 'an email type';
       const mailingInfo = 'my email';
 
-      await expect(sendTxn(mailingInfo, emailType)).to.be.rejectedWith('Argument Error mailingInfoArray: does not contain email or _id');
+      expect(sendTxn(mailingInfo, emailType)).to.throw;
     });
 
-    it('throws error when mail target has no _id or email', async () => {
+    it('throws error when mail target has no _id or email', () => {
       const emailType = 'an email type';
       const mailingInfo = {
 
       };
 
-      await expect(sendTxn(mailingInfo, emailType)).to.be.rejectedWith('Argument Error mailingInfoArray: does not contain email or _id');
+      expect(sendTxn(mailingInfo, emailType)).to.throw;
     });
 
-    it('throws error when variables not an array', async () => {
+    it('throws error when variables not an array', () => {
       const emailType = 'an email type';
       const mailingInfo = {
         name: 'my name',
@@ -195,10 +195,9 @@ describe('emails', () => {
       };
       const variables = {};
 
-      await expect(sendTxn(mailingInfo, emailType, variables)).to.be.rejectedWith('Argument Error variables: is not an array');
+      expect(sendTxn(mailingInfo, emailType, variables)).to.throw;
     });
-
-    it('throws error when variables array not contain name/content', async () => {
+    it('throws error when variables array not contain name/content', () => {
       const emailType = 'an email type';
       const mailingInfo = {
         name: 'my name',
@@ -210,9 +209,8 @@ describe('emails', () => {
         },
       ];
 
-      await expect(sendTxn(mailingInfo, emailType, variables)).to.be.rejectedWith('Argument Error variables: does not contain name or content');
+      expect(sendTxn(mailingInfo, emailType, variables)).to.throw;
     });
-
     it('throws no error when variables array contain name but no content', () => {
       const emailType = 'an email type';
       const mailingInfo = {

test/api/unit/libs/items/utils.test.js

@@ -117,7 +117,7 @@ describe('Items Utils', () => {
     it('converts values for owned gear to true/false', () => {
       expect(castItemVal('items.gear.owned.shield_warrior_0', 'true')).to.equal(true);
       expect(castItemVal('items.gear.owned.invalid', 'false')).to.equal(false);
-      expect(castItemVal('items.gear.owned.invalid', 'null')).to.equal(undefined);
+      expect(castItemVal('items.gear.owned.invalid', 'null')).to.equal(false);
       expect(castItemVal('items.gear.owned.invalid', 'truthy')).to.equal(true);
       expect(castItemVal('items.gear.owned.invalid', 0)).to.equal(false);
     });

test/api/unit/libs/mongodb.js

@@ -1,4 +1,5 @@
 import os from 'os';
+import nconf from 'nconf';
 import requireAgain from 'require-again';
 
 const pathToMongoLib = '../../../../website/server/libs/mongodb';
@@ -28,4 +29,22 @@ describe('mongodb', () => {
       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']);
+    });
+  });
 });

test/api/unit/libs/payments/amazon/checkout.test.js

@@ -2,7 +2,7 @@ import { model as User } from '../../../../../../website/server/models/user';
 import amzLib from '../../../../../../website/server/libs/payments/amazon';
 import payments from '../../../../../../website/server/libs/payments/payments';
 import common from '../../../../../../website/common';
-import { apiError } from '../../../../../../website/server/libs/apiError';
+import apiError from '../../../../../../website/server/libs/apiError';
 import * as gems from '../../../../../../website/server/libs/payments/gems';
 
 const { i18n } = common;

test/api/unit/libs/payments/group-plans/group-payments-create.test.js

@@ -715,7 +715,7 @@ describe('Purchasing a group plan for group', () => {
     const mysteryItem = { title: 'item' };
     const mysteryItems = [mysteryItem];
     const consecutive = {
-      trinkets: 4,
+      trinkets: 3,
       gemCapExtra: 20,
       offset: 1,
       count: 13,

test/api/unit/libs/payments/payments.test.js

@@ -12,7 +12,6 @@ import {
 } from '../../../../helpers/api-unit.helper';
 import * as worldState from '../../../../../website/server/libs/worldState';
 import { TransactionModel } from '../../../../../website/server/models/transaction';
-import { REPEATING_EVENTS } from '../../../../../website/common/script/content/constants/events';
 
 describe('payments/index', () => {
   let user;
@@ -66,6 +65,7 @@ describe('payments/index', () => {
       mysteryItems: [],
       consecutive: {
         trinkets: 0,
+        offset: 0,
         gemCapExtra: 0,
       },
     };
@@ -108,8 +108,14 @@ describe('payments/index', () => {
       });
 
       it('add a transaction entry to the recipient', async () => {
+        recipient.purchased.plan = plan;
+
+        expect(recipient.purchased.plan.extraMonths).to.eql(0);
+
         await api.createSubscription(data);
 
+        expect(recipient.purchased.plan.extraMonths).to.eql(3);
+
         const transactions = await TransactionModel
           .find({ userId: recipient._id })
           .sort({ createdAt: -1 })
@@ -171,45 +177,6 @@ describe('payments/index', () => {
         expect(recipient.purchased.plan.dateUpdated).to.exist;
       });
 
-      it('does not reset gemCapExtra if they already had one', async () => {
-        recipient.purchased.plan.consecutive.gemCapExtra = 10;
-
-        await api.createSubscription(data);
-
-        expect(recipient.purchased.plan.consecutive.gemCapExtra).to.eql(10);
-      });
-
-      it('sets gemCapExtra to 0 if they receive a 3 month sub', async () => {
-        data.gift.subscription.key = 'basic_3mo';
-        data.gift.subscription.months = 3;
-
-        await api.createSubscription(data);
-
-        expect(recipient.purchased.plan.consecutive.gemCapExtra).to.eql(0);
-      });
-
-      it('sets gemCapExtra to max if they receive a 12 month sub', async () => {
-        recipient.purchased.plan.consecutive.gemCapExtra = 10;
-
-        data.gift.subscription.key = 'basic_12mo';
-        data.gift.subscription.months = 12;
-
-        await api.createSubscription(data);
-
-        expect(recipient.purchased.plan.consecutive.gemCapExtra).to.eql(26);
-      });
-
-      it('gives user 1 hourglass if they have no active subscription', async () => {
-        await api.createSubscription(data);
-        expect(recipient.purchased.plan.consecutive.trinkets).to.eql(1);
-      });
-
-      it('does not give any hourglasses if they have an active subscription', async () => {
-        recipient.purchased.plan = plan;
-        await api.createSubscription(data);
-        expect(recipient.purchased.plan.consecutive.trinkets).to.eql(plan.consecutive.trinkets);
-      });
-
       it('sets plan.dateUpdated if it did exist but the user has cancelled', async () => {
         recipient.purchased.plan.dateUpdated = moment().subtract(1, 'days').toDate();
         recipient.purchased.plan.dateTerminated = moment().subtract(1, 'days').toDate();
@@ -268,6 +235,116 @@ describe('payments/index', () => {
         expect(recipient.purchased.plan.customerId).to.eql('customer-id');
       });
 
+      it('sets plan.perkMonthCount to 1 if user is not subscribed', async () => {
+        recipient.purchased.plan = plan;
+        recipient.purchased.plan.perkMonthCount = 1;
+        recipient.purchased.plan.customerId = undefined;
+        data.sub.key = 'basic_earned';
+        data.gift.subscription.key = 'basic_earned';
+        data.gift.subscription.months = 1;
+
+        expect(recipient.purchased.plan.perkMonthCount).to.eql(1);
+        await api.createSubscription(data);
+
+        expect(recipient.purchased.plan.perkMonthCount).to.eql(1);
+      });
+
+      it('sets plan.perkMonthCount to 1 if field is not initialized', async () => {
+        recipient.purchased.plan = plan;
+        recipient.purchased.plan.perkMonthCount = -1;
+        recipient.purchased.plan.customerId = undefined;
+        data.sub.key = 'basic_earned';
+        data.gift.subscription.key = 'basic_earned';
+        data.gift.subscription.months = 1;
+
+        expect(recipient.purchased.plan.perkMonthCount).to.eql(-1);
+        await api.createSubscription(data);
+
+        expect(recipient.purchased.plan.perkMonthCount).to.eql(1);
+      });
+
+      it('sets plan.perkMonthCount to 1 if user had previous count but lapsed subscription', async () => {
+        recipient.purchased.plan = plan;
+        recipient.purchased.plan.perkMonthCount = 2;
+        recipient.purchased.plan.customerId = undefined;
+        data.sub.key = 'basic_earned';
+        data.gift.subscription.key = 'basic_earned';
+        data.gift.subscription.months = 1;
+
+        expect(recipient.purchased.plan.perkMonthCount).to.eql(2);
+        await api.createSubscription(data);
+
+        expect(recipient.purchased.plan.perkMonthCount).to.eql(1);
+      });
+
+      it('adds to plan.perkMonthCount if user is already subscribed', async () => {
+        recipient.purchased.plan = plan;
+        recipient.purchased.plan.perkMonthCount = 1;
+        data.sub.key = 'basic_earned';
+        data.gift.subscription.key = 'basic_earned';
+        data.gift.subscription.months = 1;
+
+        expect(recipient.purchased.plan.perkMonthCount).to.eql(1);
+        await api.createSubscription(data);
+
+        expect(recipient.purchased.plan.perkMonthCount).to.eql(2);
+      });
+
+      it('awards perks if plan.perkMonthCount reaches 3 with existing subscription', async () => {
+        recipient.purchased.plan = plan;
+        recipient.purchased.plan.perkMonthCount = 2;
+        data.sub.key = 'basic_earned';
+        data.gift.subscription.key = 'basic_earned';
+        data.gift.subscription.months = 1;
+
+        expect(recipient.purchased.plan.perkMonthCount).to.eql(2);
+        expect(recipient.purchased.plan.consecutive.trinkets).to.eql(0);
+        expect(recipient.purchased.plan.consecutive.gemCapExtra).to.eql(0);
+        await api.createSubscription(data);
+
+        expect(recipient.purchased.plan.perkMonthCount).to.eql(0);
+        expect(recipient.purchased.plan.consecutive.trinkets).to.eql(1);
+        expect(recipient.purchased.plan.consecutive.gemCapExtra).to.eql(5);
+      });
+
+      it('awards perks if plan.perkMonthCount reaches 3 without existing subscription', async () => {
+        recipient.purchased.plan.perkMonthCount = 0;
+        expect(recipient.purchased.plan.perkMonthCount).to.eql(0);
+        expect(recipient.purchased.plan.consecutive.trinkets).to.eql(0);
+        expect(recipient.purchased.plan.consecutive.gemCapExtra).to.eql(0);
+        await api.createSubscription(data);
+
+        expect(recipient.purchased.plan.perkMonthCount).to.eql(0);
+        expect(recipient.purchased.plan.consecutive.trinkets).to.eql(1);
+        expect(recipient.purchased.plan.consecutive.gemCapExtra).to.eql(5);
+      });
+
+      it('awards perks if plan.perkMonthCount reaches 3 without initialized field', async () => {
+        expect(recipient.purchased.plan.perkMonthCount).to.eql(-1);
+        expect(recipient.purchased.plan.consecutive.trinkets).to.eql(0);
+        expect(recipient.purchased.plan.consecutive.gemCapExtra).to.eql(0);
+        await api.createSubscription(data);
+
+        expect(recipient.purchased.plan.perkMonthCount).to.eql(0);
+        expect(recipient.purchased.plan.consecutive.trinkets).to.eql(1);
+        expect(recipient.purchased.plan.consecutive.gemCapExtra).to.eql(5);
+      });
+
+      it('awards perks if plan.perkMonthCount goes over 3', async () => {
+        recipient.purchased.plan = plan;
+        recipient.purchased.plan.perkMonthCount = 2;
+        data.sub.key = 'basic_earned';
+
+        expect(recipient.purchased.plan.perkMonthCount).to.eql(2);
+        expect(recipient.purchased.plan.consecutive.trinkets).to.eql(0);
+        expect(recipient.purchased.plan.consecutive.gemCapExtra).to.eql(0);
+        await api.createSubscription(data);
+
+        expect(recipient.purchased.plan.perkMonthCount).to.eql(2);
+        expect(recipient.purchased.plan.consecutive.trinkets).to.eql(1);
+        expect(recipient.purchased.plan.consecutive.gemCapExtra).to.eql(5);
+      });
+
       it('sets plan.customerId to "Gift" if it does not already exist', async () => {
         expect(recipient.purchased.plan.customerId).to.not.exist;
 
@@ -344,8 +421,8 @@ describe('payments/index', () => {
       context('Active Promotion', () => {
         beforeEach(() => {
           sinon.stub(worldState, 'getCurrentEventList').returns([{
-            ...REPEATING_EVENTS.giftOneGetOne,
-            event: 'g1g1',
+            ...common.content.events.winter2021Promo,
+            event: 'winter2021',
           }]);
         });
 
@@ -361,30 +438,22 @@ describe('payments/index', () => {
           expect(user.purchased.plan.dateTerminated).to.exist;
           expect(user.purchased.plan.dateUpdated).to.exist;
           expect(user.purchased.plan.dateCreated).to.exist;
-          expect(user.purchased.plan.consecutive.trinkets).to.eql(1);
-          expect(user.purchased.plan.consecutive.gemCapExtra).to.eql(0);
 
           expect(recipient.items.pets['Jackalope-RoyalPurple']).to.eql(5);
           expect(recipient.purchased.plan.customerId).to.eql('Gift');
           expect(recipient.purchased.plan.dateTerminated).to.exist;
           expect(recipient.purchased.plan.dateUpdated).to.exist;
           expect(recipient.purchased.plan.dateCreated).to.exist;
-          expect(recipient.purchased.plan.consecutive.trinkets).to.eql(1);
-          expect(recipient.purchased.plan.consecutive.gemCapExtra).to.eql(0);
         });
 
         it('adds extraMonths to existing subscription for purchaser and creates a gift subscription for recipient without sub', async () => {
           user.purchased.plan = plan;
 
           expect(user.purchased.plan.extraMonths).to.eql(0);
-          expect(user.purchased.plan.consecutive.trinkets).to.eql(0);
-          expect(user.purchased.plan.consecutive.gemCapExtra).to.eql(0);
 
           await api.createSubscription(data);
 
           expect(user.purchased.plan.extraMonths).to.eql(3);
-          expect(user.purchased.plan.consecutive.trinkets).to.eql(0);
-          expect(user.purchased.plan.consecutive.gemCapExtra).to.eql(0);
 
           expect(recipient.items.pets['Jackalope-RoyalPurple']).to.eql(5);
           expect(recipient.purchased.plan.customerId).to.eql('Gift');
@@ -397,12 +466,10 @@ describe('payments/index', () => {
           recipient.purchased.plan = plan;
 
           expect(recipient.purchased.plan.extraMonths).to.eql(0);
-          expect(recipient.purchased.plan.consecutive.trinkets).to.eql(0);
 
           await api.createSubscription(data);
 
           expect(recipient.purchased.plan.extraMonths).to.eql(3);
-          expect(recipient.purchased.plan.consecutive.trinkets).to.eql(0);
 
           expect(user.items.pets['Jackalope-RoyalPurple']).to.eql(5);
           expect(user.purchased.plan.customerId).to.eql('Gift');
@@ -417,15 +484,11 @@ describe('payments/index', () => {
 
           expect(user.purchased.plan.extraMonths).to.eql(0);
           expect(recipient.purchased.plan.extraMonths).to.eql(0);
-          expect(user.purchased.plan.consecutive.trinkets).to.eql(0);
-          expect(recipient.purchased.plan.consecutive.trinkets).to.eql(0);
 
           await api.createSubscription(data);
 
           expect(user.purchased.plan.extraMonths).to.eql(3);
           expect(recipient.purchased.plan.extraMonths).to.eql(3);
-          expect(user.purchased.plan.consecutive.trinkets).to.eql(0);
-          expect(recipient.purchased.plan.consecutive.trinkets).to.eql(0);
         });
 
         it('sends a private message about the promotion', async () => {
@@ -448,6 +511,7 @@ describe('payments/index', () => {
         expect(user.purchased.plan.customerId).to.eql('customer-id');
         expect(user.purchased.plan.dateUpdated).to.exist;
         expect(user.purchased.plan.gemsBought).to.eql(0);
+        expect(user.purchased.plan.perkMonthCount).to.eql(0);
         expect(user.purchased.plan.paymentMethod).to.eql('Payment Method');
         expect(user.purchased.plan.extraMonths).to.eql(0);
         expect(user.purchased.plan.dateTerminated).to.eql(null);
@@ -485,6 +549,33 @@ describe('payments/index', () => {
         expect(user.purchased.plan.dateCurrentTypeCreated).to.not.eql(initialDate);
       });
 
+      it('keeps plan.perkMonthCount when changing subscription type', async () => {
+        await api.createSubscription(data);
+        user.purchased.plan.perkMonthCount = 2;
+        await api.createSubscription(data);
+        expect(user.purchased.plan.perkMonthCount).to.eql(2);
+      });
+
+      it('sets plan.perkMonthCount to zero when creating new monthly subscription', async () => {
+        user.purchased.plan.perkMonthCount = 2;
+        await api.createSubscription(data);
+        expect(user.purchased.plan.perkMonthCount).to.eql(0);
+      });
+
+      it('sets plan.perkMonthCount to zero when creating new 3 month subscription', async () => {
+        user.purchased.plan.perkMonthCount = 2;
+        await api.createSubscription(data);
+        expect(user.purchased.plan.perkMonthCount).to.eql(0);
+      });
+
+      it('updates plan.consecutive.offset when changing subscription type', async () => {
+        await api.createSubscription(data);
+        expect(user.purchased.plan.consecutive.offset).to.eql(3);
+        data.sub.key = 'basic_6mo';
+        await api.createSubscription(data);
+        expect(user.purchased.plan.consecutive.offset).to.eql(6);
+      });
+
       it('awards the Royal Purple Jackalope pet', async () => {
         await api.createSubscription(data);
 
@@ -603,7 +694,6 @@ describe('payments/index', () => {
           expect(user.purchased.plan.dateCreated).to.eql(created);
           expect(user.purchased.plan.dateUpdated).to.not.eql(updated);
           expect(user.purchased.plan.customerId).to.eql('customer-id');
-          expect(user.purchased.plan.consecutive.gemCapExtra).to.eql(26);
         });
       });
 
@@ -651,20 +741,55 @@ describe('payments/index', () => {
     });
 
     context('Block subscription perks', () => {
-      it('adds 26 to plan.consecutive.gemCapExtra for 12 month block', async () => {
-        data.sub.key = 'basic_12mo';
+      it('adds block months to plan.consecutive.offset', async () => {
         await api.createSubscription(data);
 
-        expect(user.purchased.plan.consecutive.gemCapExtra).to.eql(26);
+        expect(user.purchased.plan.consecutive.offset).to.eql(3);
       });
 
-      it('does not raise plan.consecutive.gemCapExtra higher than 26', async () => {
+      it('does not add to plans.consecutive.offset if 1 month subscription', async () => {
+        data.sub.key = 'basic_earned';
+        await api.createSubscription(data);
+
+        expect(user.purchased.plan.consecutive.offset).to.eql(0);
+      });
+
+      it('resets plans.consecutive.offset if 1 month subscription', async () => {
+        user.purchased.plan.consecutive.offset = 1;
+        await user.save();
+        data.sub.key = 'basic_earned';
+        await api.createSubscription(data);
+
+        expect(user.purchased.plan.consecutive.offset).to.eql(0);
+      });
+
+      it('adds 5 to plan.consecutive.gemCapExtra for 3 month block', async () => {
+        await api.createSubscription(data);
+
+        expect(user.purchased.plan.consecutive.gemCapExtra).to.eql(5);
+      });
+
+      it('adds 10 to plan.consecutive.gemCapExtra for 6 month block', async () => {
+        data.sub.key = 'basic_6mo';
+        await api.createSubscription(data);
+
+        expect(user.purchased.plan.consecutive.gemCapExtra).to.eql(10);
+      });
+
+      it('adds 20 to plan.consecutive.gemCapExtra for 12 month block', async () => {
+        data.sub.key = 'basic_12mo';
+        await api.createSubscription(data);
+
+        expect(user.purchased.plan.consecutive.gemCapExtra).to.eql(20);
+      });
+
+      it('does not raise plan.consecutive.gemCapExtra higher than 25', async () => {
         data.sub.key = 'basic_12mo';
 
         await api.createSubscription(data);
         await api.createSubscription(data);
 
-        expect(user.purchased.plan.consecutive.gemCapExtra).to.eql(26);
+        expect(user.purchased.plan.consecutive.gemCapExtra).to.eql(25);
       });
 
       it('adds a plan.consecutive.trinkets for 3 month block', async () => {
@@ -673,29 +798,20 @@ describe('payments/index', () => {
         expect(user.purchased.plan.consecutive.trinkets).to.eql(1);
       });
 
-      it('adds 1 plan.consecutive.trinkets for 6 month block', async () => {
+      it('adds 2 plan.consecutive.trinkets for 6 month block', async () => {
         data.sub.key = 'basic_6mo';
 
         await api.createSubscription(data);
 
-        expect(user.purchased.plan.consecutive.trinkets).to.eql(1);
+        expect(user.purchased.plan.consecutive.trinkets).to.eql(2);
       });
 
-      it('adds 1 plan.consecutive.trinkets for 12 month block if they had promo', async () => {
-        user.purchased.plan.hourglassPromoReceived = new Date();
+      it('adds 4 plan.consecutive.trinkets for 12 month block', async () => {
         data.sub.key = 'basic_12mo';
 
         await api.createSubscription(data);
 
-        expect(user.purchased.plan.consecutive.trinkets).to.eql(1);
-      });
-
-      it('adds 12 plan.consecutive.trinkets for 12 month block', async () => {
-        data.sub.key = 'basic_12mo';
-
-        await api.createSubscription(data);
-
-        expect(user.purchased.plan.consecutive.trinkets).to.eql(13);
+        expect(user.purchased.plan.consecutive.trinkets).to.eql(4);
       });
 
       context('Upgrades subscription', () => {
@@ -703,38 +819,70 @@ describe('payments/index', () => {
           beforeEach(async () => {
             data.updatedFrom = { logic: 'payDifference' };
           });
-          it('Adds 26 to plan.consecutive.gemCapExtra when upgrading from basic_3mo to basic_12mo', async () => {
+          it('Adds 10 to plan.consecutive.gemCapExtra from basic_earned to basic_6mo', async () => {
+            data.sub.key = 'basic_earned';
+            expect(user.purchased.plan.planId).to.not.exist;
+
+            await api.createSubscription(data);
+
+            expect(user.purchased.plan.planId).to.eql('basic_earned');
+            expect(user.purchased.plan.consecutive.gemCapExtra).to.eql(0);
+
+            data.sub.key = 'basic_6mo';
+            data.updatedFrom.key = 'basic_earned';
+            await api.createSubscription(data);
+            expect(user.purchased.plan.planId).to.eql('basic_6mo');
+            expect(user.purchased.plan.consecutive.gemCapExtra).to.eql(10);
+          });
+
+          it('Adds 15 to plan.consecutive.gemCapExtra when upgrading from basic_3mo to basic_12mo', async () => {
             expect(user.purchased.plan.planId).to.not.exist;
 
             await api.createSubscription(data);
 
             expect(user.purchased.plan.planId).to.eql('basic_3mo');
-            expect(user.purchased.plan.consecutive.gemCapExtra).to.eql(0);
+            expect(user.purchased.plan.consecutive.gemCapExtra).to.eql(5);
 
             data.sub.key = 'basic_12mo';
             data.updatedFrom.key = 'basic_3mo';
             await api.createSubscription(data);
             expect(user.purchased.plan.planId).to.eql('basic_12mo');
-            expect(user.purchased.plan.consecutive.gemCapExtra).to.eql(26);
+            expect(user.purchased.plan.consecutive.gemCapExtra).to.eql(20);
           });
 
-          it('Adds 12 to plan.consecutive.trinkets when upgrading from basic_6mo to basic_12mo', async () => {
+          it('Adds 2 to plan.consecutive.trinkets from basic_earned to basic_6mo', async () => {
+            data.sub.key = 'basic_earned';
+            expect(user.purchased.plan.planId).to.not.exist;
+
+            await api.createSubscription(data);
+
+            expect(user.purchased.plan.planId).to.eql('basic_earned');
+            expect(user.purchased.plan.consecutive.trinkets).to.eql(0);
+
+            data.sub.key = 'basic_6mo';
+            data.updatedFrom.key = 'basic_earned';
+            await api.createSubscription(data);
+            expect(user.purchased.plan.planId).to.eql('basic_6mo');
+            expect(user.purchased.plan.consecutive.trinkets).to.eql(2);
+          });
+
+          it('Adds 2 to plan.consecutive.trinkets when upgrading from basic_6mo to basic_12mo', async () => {
             data.sub.key = 'basic_6mo';
             expect(user.purchased.plan.planId).to.not.exist;
 
             await api.createSubscription(data);
 
             expect(user.purchased.plan.planId).to.eql('basic_6mo');
-            expect(user.purchased.plan.consecutive.trinkets).to.eql(1);
+            expect(user.purchased.plan.consecutive.trinkets).to.eql(2);
 
             data.sub.key = 'basic_12mo';
             data.updatedFrom.key = 'basic_6mo';
             await api.createSubscription(data);
             expect(user.purchased.plan.planId).to.eql('basic_12mo');
-            expect(user.purchased.plan.consecutive.trinkets).to.eql(13);
+            expect(user.purchased.plan.consecutive.trinkets).to.eql(4);
           });
 
-          it('Adds 12 to plan.consecutive.trinkets when upgrading from basic_3mo to basic_12mo', async () => {
+          it('Adds 3 to plan.consecutive.trinkets when upgrading from basic_3mo to basic_12mo', async () => {
             expect(user.purchased.plan.planId).to.not.exist;
 
             await api.createSubscription(data);
@@ -746,7 +894,7 @@ describe('payments/index', () => {
             data.updatedFrom.key = 'basic_3mo';
             await api.createSubscription(data);
             expect(user.purchased.plan.planId).to.eql('basic_12mo');
-            expect(user.purchased.plan.consecutive.trinkets).to.eql(13);
+            expect(user.purchased.plan.consecutive.trinkets).to.eql(4);
           });
         });
 
@@ -754,39 +902,70 @@ describe('payments/index', () => {
           beforeEach(async () => {
             data.updatedFrom = { logic: 'payFull' };
           });
+          it('Adds 10 to plan.consecutive.gemCapExtra from basic_earned to basic_6mo', async () => {
+            data.sub.key = 'basic_earned';
+            expect(user.purchased.plan.planId).to.not.exist;
 
-          it('Adds 26 to plan.consecutive.gemCapExtra when upgrading from basic_3mo to basic_12mo', async () => {
+            await api.createSubscription(data);
+
+            expect(user.purchased.plan.planId).to.eql('basic_earned');
+            expect(user.purchased.plan.consecutive.gemCapExtra).to.eql(0);
+
+            data.sub.key = 'basic_6mo';
+            data.updatedFrom.key = 'basic_earned';
+            await api.createSubscription(data);
+            expect(user.purchased.plan.planId).to.eql('basic_6mo');
+            expect(user.purchased.plan.consecutive.gemCapExtra).to.eql(10);
+          });
+
+          it('Adds 20 to plan.consecutive.gemCapExtra when upgrading from basic_3mo to basic_12mo', async () => {
             expect(user.purchased.plan.planId).to.not.exist;
 
             await api.createSubscription(data);
 
             expect(user.purchased.plan.planId).to.eql('basic_3mo');
-            expect(user.purchased.plan.consecutive.gemCapExtra).to.eql(0);
+            expect(user.purchased.plan.consecutive.gemCapExtra).to.eql(5);
 
             data.sub.key = 'basic_12mo';
             data.updatedFrom.key = 'basic_3mo';
             await api.createSubscription(data);
             expect(user.purchased.plan.planId).to.eql('basic_12mo');
-            expect(user.purchased.plan.consecutive.gemCapExtra).to.eql(26);
+            expect(user.purchased.plan.consecutive.gemCapExtra).to.eql(25);
           });
 
-          it('Adds 12 to plan.consecutive.trinkets when upgrading from basic_6mo to basic_12mo', async () => {
+          it('Adds 2 to plan.consecutive.trinkets from basic_earned to basic_6mo', async () => {
+            data.sub.key = 'basic_earned';
+            expect(user.purchased.plan.planId).to.not.exist;
+
+            await api.createSubscription(data);
+
+            expect(user.purchased.plan.planId).to.eql('basic_earned');
+            expect(user.purchased.plan.consecutive.trinkets).to.eql(0);
+
+            data.sub.key = 'basic_6mo';
+            data.updatedFrom.key = 'basic_earned';
+            await api.createSubscription(data);
+            expect(user.purchased.plan.planId).to.eql('basic_6mo');
+            expect(user.purchased.plan.consecutive.trinkets).to.eql(2);
+          });
+
+          it('Adds 4 to plan.consecutive.trinkets when upgrading from basic_6mo to basic_12mo', async () => {
             data.sub.key = 'basic_6mo';
             expect(user.purchased.plan.planId).to.not.exist;
 
             await api.createSubscription(data);
 
             expect(user.purchased.plan.planId).to.eql('basic_6mo');
-            expect(user.purchased.plan.consecutive.trinkets).to.eql(1);
+            expect(user.purchased.plan.consecutive.trinkets).to.eql(2);
 
             data.sub.key = 'basic_12mo';
             data.updatedFrom.key = 'basic_6mo';
             await api.createSubscription(data);
             expect(user.purchased.plan.planId).to.eql('basic_12mo');
-            expect(user.purchased.plan.consecutive.trinkets).to.eql(13);
+            expect(user.purchased.plan.consecutive.trinkets).to.eql(6);
           });
 
-          it('Adds 12 to plan.consecutive.trinkets when upgrading from basic_3mo to basic_12mo', async () => {
+          it('Adds 4 to plan.consecutive.trinkets when upgrading from basic_3mo to basic_12mo', async () => {
             expect(user.purchased.plan.planId).to.not.exist;
 
             await api.createSubscription(data);
@@ -798,7 +977,7 @@ describe('payments/index', () => {
             data.updatedFrom.key = 'basic_3mo';
             await api.createSubscription(data);
             expect(user.purchased.plan.planId).to.eql('basic_12mo');
-            expect(user.purchased.plan.consecutive.trinkets).to.eql(13);
+            expect(user.purchased.plan.consecutive.trinkets).to.eql(5);
           });
         });
 
@@ -809,13 +988,30 @@ describe('payments/index', () => {
             data.updatedFrom = { logic: 'refundAndRepay' };
           });
           context('Upgrades within first half of subscription', () => {
-            it('Adds 26 to plan.consecutive.gemCapExtra when upgrading from basic_3mo to basic_12mo', async () => {
+            it('Adds 10 to plan.consecutive.gemCapExtra from basic_earned to basic_6mo', async () => {
+              data.sub.key = 'basic_earned';
+              expect(user.purchased.plan.planId).to.not.exist;
+              await api.createSubscription(data);
+
+              expect(user.purchased.plan.planId).to.eql('basic_earned');
+              expect(user.purchased.plan.consecutive.gemCapExtra).to.eql(0);
+
+              data.sub.key = 'basic_6mo';
+              data.updatedFrom.key = 'basic_earned';
+              clock.restore();
+              clock = sinon.useFakeTimers(new Date('2022-01-10'));
+              await api.createSubscription(data);
+              expect(user.purchased.plan.planId).to.eql('basic_6mo');
+              expect(user.purchased.plan.consecutive.gemCapExtra).to.eql(10);
+            });
+
+            it('Adds 15 to plan.consecutive.gemCapExtra when upgrading from basic_3mo to basic_12mo', async () => {
               expect(user.purchased.plan.planId).to.not.exist;
 
               await api.createSubscription(data);
 
               expect(user.purchased.plan.planId).to.eql('basic_3mo');
-              expect(user.purchased.plan.consecutive.gemCapExtra).to.eql(0);
+              expect(user.purchased.plan.consecutive.gemCapExtra).to.eql(5);
 
               data.sub.key = 'basic_12mo';
               data.updatedFrom.key = 'basic_3mo';
@@ -823,10 +1019,28 @@ describe('payments/index', () => {
               clock = sinon.useFakeTimers(new Date('2022-02-05'));
               await api.createSubscription(data);
               expect(user.purchased.plan.planId).to.eql('basic_12mo');
-              expect(user.purchased.plan.consecutive.gemCapExtra).to.eql(26);
+              expect(user.purchased.plan.consecutive.gemCapExtra).to.eql(20);
             });
 
-            it('Adds 12 to plan.consecutive.trinkets when upgrading from basic_3mo to basic_12mo', async () => {
+            it('Adds 2 to plan.consecutive.trinkets from basic_earned to basic_6mo', async () => {
+              data.sub.key = 'basic_earned';
+              expect(user.purchased.plan.planId).to.not.exist;
+
+              await api.createSubscription(data);
+
+              expect(user.purchased.plan.planId).to.eql('basic_earned');
+              expect(user.purchased.plan.consecutive.trinkets).to.eql(0);
+
+              data.sub.key = 'basic_6mo';
+              data.updatedFrom.key = 'basic_earned';
+              clock.restore();
+              clock = sinon.useFakeTimers(new Date('2022-01-08'));
+              await api.createSubscription(data);
+              expect(user.purchased.plan.planId).to.eql('basic_6mo');
+              expect(user.purchased.plan.consecutive.trinkets).to.eql(2);
+            });
+
+            it('Adds 3 to plan.consecutive.trinkets when upgrading from basic_3mo to basic_12mo', async () => {
               expect(user.purchased.plan.planId).to.not.exist;
 
               await api.createSubscription(data);
@@ -840,17 +1054,17 @@ describe('payments/index', () => {
               clock = sinon.useFakeTimers(new Date('2022-01-31'));
               await api.createSubscription(data);
               expect(user.purchased.plan.planId).to.eql('basic_12mo');
-              expect(user.purchased.plan.consecutive.trinkets).to.eql(13);
+              expect(user.purchased.plan.consecutive.trinkets).to.eql(4);
             });
 
-            it('Adds 12 to plan.consecutive.trinkets when upgrading from basic_6mo to basic_12mo', async () => {
+            it('Adds 2 to plan.consecutive.trinkets when upgrading from basic_6mo to basic_12mo', async () => {
               data.sub.key = 'basic_6mo';
               expect(user.purchased.plan.planId).to.not.exist;
 
               await api.createSubscription(data);
 
               expect(user.purchased.plan.planId).to.eql('basic_6mo');
-              expect(user.purchased.plan.consecutive.trinkets).to.eql(1);
+              expect(user.purchased.plan.consecutive.trinkets).to.eql(2);
 
               data.sub.key = 'basic_12mo';
               data.updatedFrom.key = 'basic_6mo';
@@ -858,17 +1072,35 @@ describe('payments/index', () => {
               clock = sinon.useFakeTimers(new Date('2022-01-28'));
               await api.createSubscription(data);
               expect(user.purchased.plan.planId).to.eql('basic_12mo');
-              expect(user.purchased.plan.consecutive.trinkets).to.eql(13);
+              expect(user.purchased.plan.consecutive.trinkets).to.eql(4);
             });
 
-            it('2 plan.consecutive.trinkets when upgrading from basic_6mo to basic_12mo after initial cycle', async () => {
+            it('Adds 2 to plan.consecutive.trinkets from basic_earned to basic_6mo after initial cycle', async () => {
+              data.sub.key = 'basic_earned';
+              expect(user.purchased.plan.planId).to.not.exist;
+
+              await api.createSubscription(data);
+
+              expect(user.purchased.plan.planId).to.eql('basic_earned');
+              expect(user.purchased.plan.consecutive.trinkets).to.eql(0);
+
+              data.sub.key = 'basic_6mo';
+              data.updatedFrom.key = 'basic_earned';
+              clock.restore();
+              clock = sinon.useFakeTimers(new Date('2024-01-08'));
+              await api.createSubscription(data);
+              expect(user.purchased.plan.planId).to.eql('basic_6mo');
+              expect(user.purchased.plan.consecutive.trinkets).to.eql(2);
+            });
+
+            it('Adds 2 to plan.consecutive.trinkets when upgrading from basic_6mo to basic_12mo after initial cycle', async () => {
               data.sub.key = 'basic_6mo';
               expect(user.purchased.plan.planId).to.not.exist;
 
               await api.createSubscription(data);
 
               expect(user.purchased.plan.planId).to.eql('basic_6mo');
-              expect(user.purchased.plan.consecutive.trinkets).to.eql(1);
+              expect(user.purchased.plan.consecutive.trinkets).to.eql(2);
 
               data.sub.key = 'basic_12mo';
               data.updatedFrom.key = 'basic_6mo';
@@ -876,10 +1108,10 @@ describe('payments/index', () => {
               clock = sinon.useFakeTimers(new Date('2022-08-28'));
               await api.createSubscription(data);
               expect(user.purchased.plan.planId).to.eql('basic_12mo');
-              expect(user.purchased.plan.consecutive.trinkets).to.eql(13);
+              expect(user.purchased.plan.consecutive.trinkets).to.eql(4);
             });
 
-            it('Adds 12 to plan.consecutive.trinkets when upgrading from basic_3mo to basic_12mo after initial cycle', async () => {
+            it('Adds 3 to plan.consecutive.trinkets when upgrading from basic_3mo to basic_12mo after initial cycle', async () => {
               expect(user.purchased.plan.planId).to.not.exist;
 
               await api.createSubscription(data);
@@ -893,11 +1125,11 @@ describe('payments/index', () => {
               clock = sinon.useFakeTimers(new Date('2022-07-31'));
               await api.createSubscription(data);
               expect(user.purchased.plan.planId).to.eql('basic_12mo');
-              expect(user.purchased.plan.consecutive.trinkets).to.eql(13);
+              expect(user.purchased.plan.consecutive.trinkets).to.eql(4);
             });
           });
           context('Upgrades within second half of subscription', () => {
-            it('Adds 0 to plan.consecutive.gemCapExtra from basic_earned to basic_6mo', async () => {
+            it('Adds 10 to plan.consecutive.gemCapExtra from basic_earned to basic_6mo', async () => {
               data.sub.key = 'basic_earned';
               expect(user.purchased.plan.planId).to.not.exist;
 
@@ -912,16 +1144,16 @@ describe('payments/index', () => {
               clock = sinon.useFakeTimers(new Date('2022-01-20'));
               await api.createSubscription(data);
               expect(user.purchased.plan.planId).to.eql('basic_6mo');
-              expect(user.purchased.plan.consecutive.gemCapExtra).to.eql(0);
+              expect(user.purchased.plan.consecutive.gemCapExtra).to.eql(10);
             });
 
-            it('Adds 26 to plan.consecutive.gemCapExtra when upgrading from basic_3mo to basic_12mo', async () => {
+            it('Adds 20 to plan.consecutive.gemCapExtra when upgrading from basic_3mo to basic_12mo', async () => {
               expect(user.purchased.plan.planId).to.not.exist;
 
               await api.createSubscription(data);
 
               expect(user.purchased.plan.planId).to.eql('basic_3mo');
-              expect(user.purchased.plan.consecutive.gemCapExtra).to.eql(0);
+              expect(user.purchased.plan.consecutive.gemCapExtra).to.eql(5);
 
               data.sub.key = 'basic_12mo';
               data.updatedFrom.key = 'basic_3mo';
@@ -929,17 +1161,17 @@ describe('payments/index', () => {
               clock = sinon.useFakeTimers(new Date('2022-02-24'));
               await api.createSubscription(data);
               expect(user.purchased.plan.planId).to.eql('basic_12mo');
-              expect(user.purchased.plan.consecutive.gemCapExtra).to.eql(26);
+              expect(user.purchased.plan.consecutive.gemCapExtra).to.eql(25);
             });
 
-            it('Adds 0 to plan.consecutive.trinkets from basic_earned to basic_6mo', async () => {
+            it('Adds 2 to plan.consecutive.trinkets from basic_earned to basic_6mo', async () => {
               data.sub.key = 'basic_earned';
               expect(user.purchased.plan.planId).to.not.exist;
 
               await api.createSubscription(data);
 
               expect(user.purchased.plan.planId).to.eql('basic_earned');
-              expect(user.purchased.plan.consecutive.trinkets).to.eql(1);
+              expect(user.purchased.plan.consecutive.trinkets).to.eql(0);
 
               data.sub.key = 'basic_6mo';
               data.updatedFrom.key = 'basic_earned';
@@ -947,17 +1179,17 @@ describe('payments/index', () => {
               clock = sinon.useFakeTimers(new Date('2022-01-28'));
               await api.createSubscription(data);
               expect(user.purchased.plan.planId).to.eql('basic_6mo');
-              expect(user.purchased.plan.consecutive.trinkets).to.eql(1);
+              expect(user.purchased.plan.consecutive.trinkets).to.eql(2);
             });
 
-            it('Adds 12 to plan.consecutive.trinkets when upgrading from basic_6mo to basic_12mo', async () => {
+            it('Adds 4 to plan.consecutive.trinkets when upgrading from basic_6mo to basic_12mo', async () => {
               data.sub.key = 'basic_6mo';
               expect(user.purchased.plan.planId).to.not.exist;
 
               await api.createSubscription(data);
 
               expect(user.purchased.plan.planId).to.eql('basic_6mo');
-              expect(user.purchased.plan.consecutive.trinkets).to.eql(1);
+              expect(user.purchased.plan.consecutive.trinkets).to.eql(2);
 
               data.sub.key = 'basic_12mo';
               data.updatedFrom.key = 'basic_6mo';
@@ -965,10 +1197,10 @@ describe('payments/index', () => {
               clock = sinon.useFakeTimers(new Date('2022-05-28'));
               await api.createSubscription(data);
               expect(user.purchased.plan.planId).to.eql('basic_12mo');
-              expect(user.purchased.plan.consecutive.trinkets).to.eql(13);
+              expect(user.purchased.plan.consecutive.trinkets).to.eql(6);
             });
 
-            it('Adds 12 to plan.consecutive.trinkets when upgrading from basic_3mo to basic_12mo', async () => {
+            it('Adds 4 to plan.consecutive.trinkets when upgrading from basic_3mo to basic_12mo', async () => {
               expect(user.purchased.plan.planId).to.not.exist;
 
               await api.createSubscription(data);
@@ -982,17 +1214,17 @@ describe('payments/index', () => {
               clock = sinon.useFakeTimers(new Date('2022-03-03'));
               await api.createSubscription(data);
               expect(user.purchased.plan.planId).to.eql('basic_12mo');
-              expect(user.purchased.plan.consecutive.trinkets).to.eql(13);
+              expect(user.purchased.plan.consecutive.trinkets).to.eql(5);
             });
 
-            it('Adds 0 to plan.consecutive.trinkets from basic_earned to basic_6mo after initial cycle', async () => {
+            it('Adds 2 to plan.consecutive.trinkets from basic_earned to basic_6mo after initial cycle', async () => {
               data.sub.key = 'basic_earned';
               expect(user.purchased.plan.planId).to.not.exist;
 
               await api.createSubscription(data);
 
               expect(user.purchased.plan.planId).to.eql('basic_earned');
-              expect(user.purchased.plan.consecutive.trinkets).to.eql(1);
+              expect(user.purchased.plan.consecutive.trinkets).to.eql(0);
 
               data.sub.key = 'basic_6mo';
               data.updatedFrom.key = 'basic_earned';
@@ -1000,17 +1232,17 @@ describe('payments/index', () => {
               clock = sinon.useFakeTimers(new Date('2022-05-28'));
               await api.createSubscription(data);
               expect(user.purchased.plan.planId).to.eql('basic_6mo');
-              expect(user.purchased.plan.consecutive.trinkets).to.eql(1);
+              expect(user.purchased.plan.consecutive.trinkets).to.eql(2);
             });
 
-            it('Adds 12 to plan.consecutive.trinkets when upgrading from basic_6mo to basic_12mo after initial cycle', async () => {
+            it('Adds 4 to plan.consecutive.trinkets when upgrading from basic_6mo to basic_12mo after initial cycle', async () => {
               data.sub.key = 'basic_6mo';
               expect(user.purchased.plan.planId).to.not.exist;
 
               await api.createSubscription(data);
 
               expect(user.purchased.plan.planId).to.eql('basic_6mo');
-              expect(user.purchased.plan.consecutive.trinkets).to.eql(1);
+              expect(user.purchased.plan.consecutive.trinkets).to.eql(2);
 
               data.sub.key = 'basic_12mo';
               data.updatedFrom.key = 'basic_6mo';
@@ -1018,10 +1250,10 @@ describe('payments/index', () => {
               clock = sinon.useFakeTimers(new Date('2023-05-28'));
               await api.createSubscription(data);
               expect(user.purchased.plan.planId).to.eql('basic_12mo');
-              expect(user.purchased.plan.consecutive.trinkets).to.eql(13);
+              expect(user.purchased.plan.consecutive.trinkets).to.eql(6);
             });
 
-            it('Adds 12 to plan.consecutive.trinkets when upgrading from basic_3mo to basic_12mo after initial cycle', async () => {
+            it('Adds 4 to plan.consecutive.trinkets when upgrading from basic_3mo to basic_12mo after initial cycle', async () => {
               expect(user.purchased.plan.planId).to.not.exist;
 
               await api.createSubscription(data);
@@ -1035,7 +1267,7 @@ describe('payments/index', () => {
               clock = sinon.useFakeTimers(new Date('2023-09-03'));
               await api.createSubscription(data);
               expect(user.purchased.plan.planId).to.eql('basic_12mo');
-              expect(user.purchased.plan.consecutive.trinkets).to.eql(13);
+              expect(user.purchased.plan.consecutive.trinkets).to.eql(5);
             });
           });
           afterEach(async () => {
@@ -1045,6 +1277,22 @@ describe('payments/index', () => {
       });
 
       context('Downgrades subscription', () => {
+        it('does not remove from plan.consecutive.gemCapExtra from basic_6mo to basic_earned', async () => {
+          data.sub.key = 'basic_6mo';
+          expect(user.purchased.plan.planId).to.not.exist;
+
+          await api.createSubscription(data);
+
+          expect(user.purchased.plan.planId).to.eql('basic_6mo');
+          expect(user.purchased.plan.consecutive.gemCapExtra).to.eql(10);
+
+          data.sub.key = 'basic_earned';
+          data.updatedFrom = { key: 'basic_6mo' };
+          await api.createSubscription(data);
+          expect(user.purchased.plan.planId).to.eql('basic_earned');
+          expect(user.purchased.plan.consecutive.gemCapExtra).to.eql(10);
+        });
+
         it('does not remove from plan.consecutive.gemCapExtra from basic_12mo to basic_3mo', async () => {
           expect(user.purchased.plan.planId).to.not.exist;
 
@@ -1052,12 +1300,28 @@ describe('payments/index', () => {
           await api.createSubscription(data);
 
           expect(user.purchased.plan.planId).to.eql('basic_12mo');
-          expect(user.purchased.plan.consecutive.gemCapExtra).to.eql(26);
+          expect(user.purchased.plan.consecutive.gemCapExtra).to.eql(20);
 
           data.sub.key = 'basic_3mo';
           data.updatedFrom = { key: 'basic_12mo' };
           await api.createSubscription(data);
-          expect(user.purchased.plan.consecutive.gemCapExtra).to.eql(26);
+          expect(user.purchased.plan.consecutive.gemCapExtra).to.eql(20);
+        });
+
+        it('does not remove from plan.consecutive.trinkets from basic_6mo to basic_earned', async () => {
+          data.sub.key = 'basic_6mo';
+          expect(user.purchased.plan.planId).to.not.exist;
+
+          await api.createSubscription(data);
+
+          expect(user.purchased.plan.planId).to.eql('basic_6mo');
+          expect(user.purchased.plan.consecutive.trinkets).to.eql(2);
+
+          data.sub.key = 'basic_earned';
+          data.updatedFrom = { key: 'basic_6mo' };
+          await api.createSubscription(data);
+          expect(user.purchased.plan.planId).to.eql('basic_earned');
+          expect(user.purchased.plan.consecutive.trinkets).to.eql(2);
         });
 
         it('does not remove from plan.consecutive.trinkets from basic_12mo to basic_3mo', async () => {
@@ -1067,12 +1331,12 @@ describe('payments/index', () => {
           await api.createSubscription(data);
 
           expect(user.purchased.plan.planId).to.eql('basic_12mo');
-          expect(user.purchased.plan.consecutive.trinkets).to.eql(13);
+          expect(user.purchased.plan.consecutive.trinkets).to.eql(4);
 
           data.sub.key = 'basic_3mo';
           data.updatedFrom = { key: 'basic_12mo' };
           await api.createSubscription(data);
-          expect(user.purchased.plan.consecutive.trinkets).to.eql(13);
+          expect(user.purchased.plan.consecutive.trinkets).to.eql(4);
         });
       });
     });
@@ -1189,32 +1453,6 @@ describe('payments/index', () => {
         expect(user.purchased.plan.extraMonths).to.eql(0);
       });
 
-      it('does not reset gemCapExtra', async () => {
-        user.purchased.plan.consecutive.gemCapExtra = 12;
-
-        await api.cancelSubscription(data);
-
-        expect(user.purchased.plan.consecutive.gemCapExtra).to.eql(12);
-      });
-
-      it('initializes gemCapExtra', async () => {
-        await api.cancelSubscription(data);
-        expect(user.purchased.plan.consecutive.gemCapExtra).to.eql(0);
-      });
-
-      it('initializes hourglasses', async () => {
-        await api.cancelSubscription(data);
-        expect(user.purchased.plan.consecutive.trinkets).to.eql(0);
-      });
-
-      it('does not reset owned hourglasses', async () => {
-        user.purchased.plan.consecutive.trinkets = 12;
-
-        await api.cancelSubscription(data);
-
-        expect(user.purchased.plan.consecutive.trinkets).to.eql(12);
-      });
-
       it('sends an email', async () => {
         await api.cancelSubscription(data);
 

test/api/unit/libs/payments/paypal/checkout.test.js

@@ -4,7 +4,7 @@ import nconf from 'nconf';
 import paypalPayments from '../../../../../../website/server/libs/payments/paypal';
 import { model as User } from '../../../../../../website/server/models/user';
 import common from '../../../../../../website/common';
-import { apiError } from '../../../../../../website/server/libs/apiError';
+import apiError from '../../../../../../website/server/libs/apiError';
 import * as gems from '../../../../../../website/server/libs/payments/gems';
 
 const BASE_URL = nconf.get('BASE_URL');

test/api/unit/libs/payments/stripe/checkout.test.js

@@ -51,7 +51,6 @@ describe('Stripe - Checkout', () => {
         gift: undefined,
         sub: undefined,
         gemsBlock: gemsBlockKey,
-        server_url: BASE_URL,
       };
 
       expect(gems.validateGiftMessage).to.not.be.called;
@@ -102,7 +101,6 @@ describe('Stripe - Checkout', () => {
         gift: JSON.stringify(gift),
         sub: undefined,
         gemsBlock: undefined,
-        server_url: BASE_URL,
       };
 
       expect(gems.validateGiftMessage).to.be.calledOnce;
@@ -157,7 +155,6 @@ describe('Stripe - Checkout', () => {
         gift: JSON.stringify(gift),
         sub: undefined,
         gemsBlock: undefined,
-        server_url: BASE_URL,
       };
 
       expect(oneTimePayments.getOneTimePaymentInfo).to.be.calledOnce;
@@ -195,7 +192,6 @@ describe('Stripe - Checkout', () => {
         userId: user._id,
         gift: undefined,
         sub: JSON.stringify(sub),
-        server_url: BASE_URL,
       };
 
       expect(subscriptions.checkSubData).to.be.calledOnce;
@@ -262,7 +258,6 @@ describe('Stripe - Checkout', () => {
         userId: user._id,
         gift: undefined,
         sub: JSON.stringify(sub),
-        server_url: BASE_URL,
         groupId,
       };
 
@@ -333,9 +328,8 @@ describe('Stripe - Checkout', () => {
       user.purchased.plan.customerId = customerId;
 
       const metadata = {
-        type: 'edit-card-user',
         userId: user._id,
-        server_url: BASE_URL,
+        type: 'edit-card-user',
       };
 
       const res = await createEditCardCheckoutSession({ user }, stripe);
@@ -424,7 +418,6 @@ describe('Stripe - Checkout', () => {
         const metadata = {
           userId: user._id,
           type: 'edit-card-group',
-          server_url: BASE_URL,
           groupId,
         };
 
@@ -462,7 +455,6 @@ describe('Stripe - Checkout', () => {
           userId: anotherUser._id,
           type: 'edit-card-group',
           groupId,
-          server_url: BASE_URL,
         };
 
         const res = await createEditCardCheckoutSession({ user: anotherUser, groupId }, stripe);

test/api/unit/libs/payments/stripe/oneTimePayments.test.js

@@ -1,4 +1,4 @@
-import { apiError } from '../../../../../../website/server/libs/apiError';
+import apiError from '../../../../../../website/server/libs/apiError';
 import common from '../../../../../../website/common';
 import {
   getOneTimePaymentInfo,
@@ -308,7 +308,6 @@ describe('Stripe - One Time Payments', () => {
           customerId,
           paymentMethod: 'Gift',
           gift,
-          autoRenews: false,
           gemsBlock: undefined,
         });
       });

test/api/unit/libs/payments/stripe/subscriptions.test.js

@@ -173,7 +173,6 @@ describe('Stripe - Subscriptions', () => {
         paymentMethod: 'Stripe',
         sub: sinon.match({ ...sub }),
         groupId: null,
-        autoRenews: true,
       });
     });
 
@@ -198,7 +197,6 @@ describe('Stripe - Subscriptions', () => {
         paymentMethod: 'Stripe',
         sub: sinon.match({ ...sub }),
         groupId,
-        autoRenews: true,
       });
     });
 
@@ -233,7 +231,6 @@ describe('Stripe - Subscriptions', () => {
         paymentMethod: 'Stripe',
         sub: sinon.match({ ...sub }),
         groupId,
-        autoRenews: true,
       });
     });
   });

test/api/unit/libs/payments/stripe/webhooks.test.js

@@ -16,7 +16,6 @@ import * as subscriptions from '../../../../../../website/server/libs/payments/s
 const { i18n } = common;
 
 describe('Stripe - Webhooks', () => {
-  const BASE_URL = nconf.get('BASE_URL');
   const stripe = stripeModule('test');
   const endpointSecret = nconf.get('STRIPE_WEBHOOKS_ENDPOINT_SECRET');
   const headers = {};
@@ -285,9 +284,7 @@ describe('Stripe - Webhooks', () => {
     const session = {};
 
     beforeEach(() => {
-      session.metadata = {
-        server_url: BASE_URL,
-      };
+      session.metadata = {};
       event = { type: eventType, data: { object: session } };
       constructEventStub = sandbox.stub(stripe.webhooks, 'constructEvent');
       constructEventStub.returns(event);

test/api/unit/libs/pushNotifications.js

@@ -0,0 +1,184 @@
+import apn from '@parse/node-apn/mock';
+import _ from 'lodash';
+import nconf from 'nconf';
+import gcmLib from 'node-gcm'; // works with FCM notifications too
+import { model as User } from '../../../../website/server/models/user';
+import {
+  sendNotification as sendPushNotification,
+  MAX_MESSAGE_LENGTH,
+} from '../../../../website/server/libs/pushNotifications';
+
+describe('pushNotifications', () => {
+  let user;
+  let fcmSendSpy;
+  let apnSendSpy;
+
+  const identifier = 'identifier';
+  const title = 'title';
+  const message = 'message';
+
+  beforeEach(() => {
+    user = new User();
+    fcmSendSpy = sinon.spy();
+    apnSendSpy = sinon.spy();
+
+    sandbox.stub(nconf, 'get').returns('true-key');
+
+    sandbox.stub(gcmLib.Sender.prototype, 'send').callsFake(fcmSendSpy);
+
+    sandbox.stub(apn.Provider.prototype, 'send').returns({
+      on: () => null,
+      send: apnSendSpy,
+    });
+  });
+
+  afterEach(() => {
+    sandbox.restore();
+  });
+
+  it('throws if user is not supplied', () => {
+    expect(sendPushNotification).to.throw;
+    expect(fcmSendSpy).to.not.have.been.called;
+    expect(apnSendSpy).to.not.have.been.called;
+  });
+
+  it('throws if user.preferences.pushNotifications.unsubscribeFromAll is true', () => {
+    user.preferences.pushNotifications.unsubscribeFromAll = true;
+    expect(() => sendPushNotification(user)).to.throw;
+    expect(fcmSendSpy).to.not.have.been.called;
+    expect(apnSendSpy).to.not.have.been.called;
+  });
+
+  it('throws if details.identifier is not supplied', () => {
+    expect(() => sendPushNotification(user, {
+      title,
+      message,
+    })).to.throw;
+    expect(fcmSendSpy).to.not.have.been.called;
+    expect(apnSendSpy).to.not.have.been.called;
+  });
+
+  it('throws if details.title is not supplied', () => {
+    expect(() => sendPushNotification(user, {
+      identifier,
+      message,
+    })).to.throw;
+    expect(fcmSendSpy).to.not.have.been.called;
+    expect(apnSendSpy).to.not.have.been.called;
+  });
+
+  it('throws if details.message is not supplied', () => {
+    expect(() => sendPushNotification(user, {
+      identifier,
+      title,
+    })).to.throw;
+    expect(fcmSendSpy).to.not.have.been.called;
+    expect(apnSendSpy).to.not.have.been.called;
+  });
+
+  it('returns if no device is registered', () => {
+    sendPushNotification(user, {
+      identifier,
+      title,
+      message,
+    });
+    expect(fcmSendSpy).to.not.have.been.called;
+    expect(apnSendSpy).to.not.have.been.called;
+  });
+
+  it('cuts the message to 300 chars', () => {
+    const longMessage = `12345 12345 12345 12345 12345 12345 12345
+      12345 12345 12345 12345 12345 12345 12345 12345 12345 12345
+      12345 12345 12345 12345 12345 12345 12345 12345 12345 12345
+      12345 12345 12345 12345 12345 12345 12345 12345 12345 12345
+      12345 12345 12345 12345 12345 12345 12345 12345 12345 12345
+      12345 12345 12345 12345 12345 12345 12345 12345 12345 12345
+      12345 12345 12345 12345 12345 12345 12345 12345 12345 12345
+      12345 12345 12345 12345 12345 12345 12345 12345 12345 12345
+      12345 12345 12345 12345 12345 12345 12345 12345 12345 12345
+      12345 12345 12345 12345 12345 12345 12345 12345 12345 12345
+      12345 12345 12345 12345 12345 12345 12345 12345 12345 12345`;
+
+    expect(longMessage.length > MAX_MESSAGE_LENGTH).to.equal(true);
+
+    const details = {
+      identifier,
+      title,
+      message: longMessage,
+      payload: {
+        message: longMessage,
+      },
+    };
+
+    sendPushNotification(user, details);
+
+    expect(details.message).to.equal(_.truncate(longMessage, { length: MAX_MESSAGE_LENGTH }));
+    expect(details.payload.message)
+      .to.equal(_.truncate(longMessage, { length: MAX_MESSAGE_LENGTH }));
+
+    expect(details.message.length).to.equal(MAX_MESSAGE_LENGTH);
+    expect(details.payload.message.length).to.equal(MAX_MESSAGE_LENGTH);
+  });
+
+  it('cuts the message to 300 chars (no payload)', () => {
+    const longMessage = `12345 12345 12345 12345 12345 12345 12345
+      12345 12345 12345 12345 12345 12345 12345 12345 12345 12345
+      12345 12345 12345 12345 12345 12345 12345 12345 12345 12345
+      12345 12345 12345 12345 12345 12345 12345 12345 12345 12345
+      12345 12345 12345 12345 12345 12345 12345 12345 12345 12345
+      12345 12345 12345 12345 12345 12345 12345 12345 12345 12345
+      12345 12345 12345 12345 12345 12345 12345 12345 12345 12345
+      12345 12345 12345 12345 12345 12345 12345 12345 12345 12345
+      12345 12345 12345 12345 12345 12345 12345 12345 12345 12345
+      12345 12345 12345 12345 12345 12345 12345 12345 12345 12345
+      12345 12345 12345 12345 12345 12345 12345 12345 12345 12345`;
+
+    expect(longMessage.length > MAX_MESSAGE_LENGTH).to.equal(true);
+
+    const details = {
+      identifier,
+      title,
+      message: longMessage,
+    };
+
+    sendPushNotification(user, details);
+
+    expect(details.message).to.equal(_.truncate(longMessage, { length: MAX_MESSAGE_LENGTH }));
+    expect(details.message.length).to.equal(MAX_MESSAGE_LENGTH);
+  });
+
+  // TODO disabled because APN relies on a Promise
+  xit('uses APN for iOS devices', () => {
+    user.pushDevices.push({
+      type: 'ios',
+      regId: '123',
+    });
+
+    const details = {
+      identifier,
+      title,
+      message,
+      category: 'fun',
+      payload: {
+        a: true,
+        b: true,
+      },
+    };
+
+    const expectedNotification = new apn.Notification({
+      alert: message,
+      sound: 'default',
+      category: 'fun',
+      payload: {
+        identifier,
+        a: true,
+        b: true,
+      },
+    });
+
+    sendPushNotification(user, details);
+    expect(apnSendSpy).to.have.been.calledOnce;
+    expect(apnSendSpy).to.have.been.calledWithMatch(expectedNotification, '123');
+    expect(fcmSendSpy).to.not.have.been.called;
+  });
+});

test/api/unit/libs/pushNotifications.test.js

@@ -1,354 +0,0 @@
-import apn from '@parse/node-apn';
-import _ from 'lodash';
-import nconf from 'nconf';
-import admin from 'firebase-admin';
-import { model as User } from '../../../../website/server/models/user';
-import {
-  MAX_MESSAGE_LENGTH,
-} from '../../../../website/server/libs/pushNotifications';
-
-let sendPushNotification;
-
-describe('pushNotifications', () => {
-  let user;
-  let fcmSendSpy;
-  let apnSendSpy;
-  let updateStub;
-  let classStubbedInstance;
-
-  const identifier = 'identifier';
-  const title = 'title';
-  const message = 'message';
-
-  beforeEach(() => {
-    user = new User();
-    fcmSendSpy = sinon.stub().returns(Promise.resolve('success'));
-    apnSendSpy = sinon.stub().returns(Promise.resolve());
-
-    nconf.set('PUSH_CONFIGS_APN_ENABLED', 'true');
-
-    classStubbedInstance = sandbox.createStubInstance(apn.Provider, {
-      send: apnSendSpy,
-    });
-    sandbox.stub(apn, 'Provider').returns(classStubbedInstance);
-
-    delete require.cache[require.resolve('../../../../website/server/libs/pushNotifications')];
-    // eslint-disable-next-line global-require
-    sendPushNotification = require('../../../../website/server/libs/pushNotifications').sendNotification;
-
-    updateStub = sandbox.stub(User, 'updateOne').resolves();
-    sandbox.stub(admin, 'messaging').get(() => () => ({ send: fcmSendSpy }));
-  });
-
-  afterEach(() => {
-    sandbox.restore();
-  });
-
-  describe('validates supplied data', () => {
-    it('throws if user is not supplied', () => {
-      expect(sendPushNotification).to.throw;
-      expect(fcmSendSpy).to.not.have.been.called;
-      expect(apnSendSpy).to.not.have.been.called;
-    });
-
-    it('throws if user.preferences.pushNotifications.unsubscribeFromAll is true', () => {
-      user.preferences.pushNotifications.unsubscribeFromAll = true;
-      expect(() => sendPushNotification(user)).to.throw;
-      expect(fcmSendSpy).to.not.have.been.called;
-      expect(apnSendSpy).to.not.have.been.called;
-    });
-
-    it('throws if details.identifier is not supplied', () => {
-      expect(() => sendPushNotification(user, {
-        title,
-        message,
-      })).to.throw;
-      expect(fcmSendSpy).to.not.have.been.called;
-      expect(apnSendSpy).to.not.have.been.called;
-    });
-
-    it('throws if details.title is not supplied', () => {
-      expect(() => sendPushNotification(user, {
-        identifier,
-        message,
-      })).to.throw;
-      expect(fcmSendSpy).to.not.have.been.called;
-      expect(apnSendSpy).to.not.have.been.called;
-    });
-
-    it('throws if details.message is not supplied', () => {
-      expect(() => sendPushNotification(user, {
-        identifier,
-        title,
-      })).to.throw;
-      expect(fcmSendSpy).to.not.have.been.called;
-      expect(apnSendSpy).to.not.have.been.called;
-    });
-
-    it('returns if no device is registered', () => {
-      sendPushNotification(user, {
-        identifier,
-        title,
-        message,
-      });
-      expect(fcmSendSpy).to.not.have.been.called;
-      expect(apnSendSpy).to.not.have.been.called;
-    });
-  });
-
-  it('cuts the message to 300 chars', () => {
-    const longMessage = `12345 12345 12345 12345 12345 12345 12345
-      12345 12345 12345 12345 12345 12345 12345 12345 12345 12345
-      12345 12345 12345 12345 12345 12345 12345 12345 12345 12345
-      12345 12345 12345 12345 12345 12345 12345 12345 12345 12345
-      12345 12345 12345 12345 12345 12345 12345 12345 12345 12345
-      12345 12345 12345 12345 12345 12345 12345 12345 12345 12345
-      12345 12345 12345 12345 12345 12345 12345 12345 12345 12345
-      12345 12345 12345 12345 12345 12345 12345 12345 12345 12345
-      12345 12345 12345 12345 12345 12345 12345 12345 12345 12345
-      12345 12345 12345 12345 12345 12345 12345 12345 12345 12345
-      12345 12345 12345 12345 12345 12345 12345 12345 12345 12345`;
-
-    expect(longMessage.length > MAX_MESSAGE_LENGTH).to.equal(true);
-
-    const details = {
-      identifier,
-      title,
-      message: longMessage,
-      payload: {
-        message: longMessage,
-      },
-    };
-
-    sendPushNotification(user, details);
-
-    expect(details.message).to.equal(_.truncate(longMessage, { length: MAX_MESSAGE_LENGTH }));
-    expect(details.payload.message)
-      .to.equal(_.truncate(longMessage, { length: MAX_MESSAGE_LENGTH }));
-
-    expect(details.message.length).to.equal(MAX_MESSAGE_LENGTH);
-    expect(details.payload.message.length).to.equal(MAX_MESSAGE_LENGTH);
-  });
-
-  it('cuts the message to 300 chars (no payload)', () => {
-    const longMessage = `12345 12345 12345 12345 12345 12345 12345
-      12345 12345 12345 12345 12345 12345 12345 12345 12345 12345
-      12345 12345 12345 12345 12345 12345 12345 12345 12345 12345
-      12345 12345 12345 12345 12345 12345 12345 12345 12345 12345
-      12345 12345 12345 12345 12345 12345 12345 12345 12345 12345
-      12345 12345 12345 12345 12345 12345 12345 12345 12345 12345
-      12345 12345 12345 12345 12345 12345 12345 12345 12345 12345
-      12345 12345 12345 12345 12345 12345 12345 12345 12345 12345
-      12345 12345 12345 12345 12345 12345 12345 12345 12345 12345
-      12345 12345 12345 12345 12345 12345 12345 12345 12345 12345
-      12345 12345 12345 12345 12345 12345 12345 12345 12345 12345`;
-
-    expect(longMessage.length > MAX_MESSAGE_LENGTH).to.equal(true);
-
-    const details = {
-      identifier,
-      title,
-      message: longMessage,
-    };
-
-    sendPushNotification(user, details);
-
-    expect(details.message).to.equal(_.truncate(longMessage, { length: MAX_MESSAGE_LENGTH }));
-    expect(details.message.length).to.equal(MAX_MESSAGE_LENGTH);
-  });
-
-  describe('sends notifications', () => {
-    let details;
-
-    beforeEach(() => {
-      details = {
-        identifier,
-        title,
-        message,
-        category: 'fun',
-        payload: {
-          a: true,
-          b: true,
-        },
-      };
-    });
-
-    it('uses APN for iOS devices', async () => {
-      user.pushDevices.push({
-        type: 'ios',
-        regId: '123',
-      });
-
-      const expectedNotification = new apn.Notification({
-        alert: {
-          title,
-          body: message,
-        },
-        sound: 'default',
-        category: 'fun',
-        payload: {
-          identifier,
-          a: true,
-          b: true,
-        },
-      });
-
-      await sendPushNotification(user, details);
-      expect(apnSendSpy).to.have.been.calledOnce;
-      expect(apnSendSpy).to.have.been.calledWithMatch(expectedNotification, '123');
-      expect(fcmSendSpy).to.not.have.been.called;
-    });
-
-    it('uses FCM for Android devices', async () => {
-      user.pushDevices.push({
-        type: 'android',
-        regId: '123',
-      });
-
-      const expectedMessage = {
-        notification: {
-          title,
-          body: message,
-        },
-        data: {
-          identifier,
-          notificationIdentifier: identifier,
-        },
-        token: '123',
-      };
-
-      await sendPushNotification(user, details);
-      expect(fcmSendSpy).to.have.been.calledOnce;
-      expect(fcmSendSpy).to.have.been.calledWithMatch(expectedMessage);
-      expect(apnSendSpy).to.not.have.been.called;
-    });
-
-    it('handles multiple devices', async () => {
-      user.pushDevices.push({
-        type: 'android',
-        regId: '123',
-      });
-      user.pushDevices.push({
-        type: 'ios',
-        regId: '456',
-      });
-      user.pushDevices.push({
-        type: 'android',
-        regId: '789',
-      });
-
-      await sendPushNotification(user, details);
-      expect(fcmSendSpy).to.have.been.calledTwice;
-      expect(apnSendSpy).to.have.been.calledOnce;
-    });
-  });
-
-  describe('handles sending errors', () => {
-    let clock;
-
-    beforeEach(() => {
-      clock = sinon.useFakeTimers();
-    });
-
-    afterEach(() => {
-      clock.restore();
-    });
-
-    it('removes unregistered fcm devices', async () => {
-      user.pushDevices.push({
-        type: 'android',
-        regId: '123',
-      });
-
-      const error = new Error();
-      error.code = 'messaging/registration-token-not-registered';
-      fcmSendSpy.rejects(error);
-
-      await sendPushNotification(user, {
-        identifier,
-        title,
-        message,
-      });
-
-      expect(fcmSendSpy).to.have.been.calledOnce;
-      expect(apnSendSpy).to.not.have.been.called;
-      await clock.tick(10);
-      expect(updateStub).to.have.been.calledOnce;
-    });
-
-    it('removes invalid fcm devices', async () => {
-      user.pushDevices.push({
-        type: 'android',
-        regId: '123',
-      });
-
-      const error = new Error();
-      error.code = 'messaging/registration-token-not-registered';
-      fcmSendSpy.rejects(error);
-
-      await sendPushNotification(user, {
-        identifier,
-        title,
-        message,
-      });
-
-      expect(fcmSendSpy).to.have.been.calledOnce;
-      expect(apnSendSpy).to.not.have.been.called;
-      expect(updateStub).to.have.been.calledOnce;
-    });
-
-    it('removes unregistered apn devices', async () => {
-      user.pushDevices.push({
-        type: 'ios',
-        regId: '123',
-      });
-
-      const error = {
-        failed: [
-          {
-            device: '123',
-            response: { reason: 'Unregistered' },
-          },
-        ],
-      };
-      apnSendSpy.resolves(error);
-
-      await sendPushNotification(user, {
-        identifier,
-        title,
-        message,
-      });
-
-      expect(fcmSendSpy).to.not.have.been.called;
-      expect(apnSendSpy).to.have.been.calledOnce;
-      expect(updateStub).to.have.been.calledOnce;
-    });
-
-    it('removes invalid apn devices', async () => {
-      user.pushDevices.push({
-        type: 'ios',
-        regId: '123',
-      });
-
-      const error = {
-        failed: [
-          {
-            device: '123',
-            response: { reason: 'BadDeviceToken' },
-          },
-        ],
-      };
-      apnSendSpy.resolves(error);
-
-      await sendPushNotification(user, {
-        identifier,
-        title,
-        message,
-      });
-
-      expect(fcmSendSpy).to.not.have.been.called;
-      expect(apnSendSpy).to.have.been.calledOnce;
-      expect(updateStub).to.have.been.calledOnce;
-    });
-  });
-});

test/api/unit/middlewares/cronMiddleware.js

@@ -0,0 +1,332 @@
+import moment from 'moment';
+import { v4 as generateUUID } from 'uuid';
+import {
+  generateRes,
+  generateReq,
+  generateTodo,
+  generateDaily,
+} from '../../../helpers/api-unit.helper';
+import cronMiddleware from '../../../../website/server/middlewares/cron';
+import { model as User } from '../../../../website/server/models/user';
+import { model as Group } from '../../../../website/server/models/group';
+import * as Tasks from '../../../../website/server/models/task';
+import * as analyticsService from '../../../../website/server/libs/analyticsService';
+import * as cronLib from '../../../../website/server/libs/cron';
+
+const CRON_TIMEOUT_WAIT = new Date(60 * 60 * 1000).getTime();
+const CRON_TIMEOUT_UNIT = new Date(60 * 1000).getTime();
+
+describe('cron middleware', () => {
+  let res; let
+    req;
+  let user;
+
+  beforeEach(async () => {
+    res = generateRes();
+    req = generateReq();
+    user = await res.locals.user.save();
+    res.analytics = analyticsService;
+  });
+
+  afterEach(() => {
+    sandbox.restore();
+  });
+
+  it('calls next when user is not attached', done => {
+    res.locals.user = null;
+    cronMiddleware(req, res, done);
+  });
+
+  it('calls next when days have not been missed', done => {
+    cronMiddleware(req, res, done);
+  });
+
+  it('should clear todos older than 30 days for free users', async () => {
+    user.lastCron = moment(new Date()).subtract({ days: 2 });
+    const task = generateTodo(user);
+    task.dateCompleted = moment(new Date()).subtract({ days: 31 });
+    task.completed = true;
+    await task.save();
+    await user.save();
+
+    await new Promise((resolve, reject) => {
+      cronMiddleware(req, res, err => {
+        if (err) return reject(err);
+
+        Tasks.Task.findOne({ _id: task }).then(foundTask => {
+          expect(foundTask).to.not.exist;
+          resolve();
+        });
+
+        return null;
+      });
+    });
+  });
+
+  it('should not clear todos older than 30 days for subscribed users', async () => {
+    user.purchased.plan.customerId = 'subscribedId';
+    user.purchased.plan.dateUpdated = moment('012013', 'MMYYYY');
+    user.lastCron = moment(new Date()).subtract({ days: 2 });
+    const task = generateTodo(user);
+    task.dateCompleted = moment(new Date()).subtract({ days: 31 });
+    task.completed = true;
+    await task.save();
+    await user.save();
+
+    await new Promise((resolve, reject) => {
+      cronMiddleware(req, res, err => {
+        if (err) return reject(err);
+        Tasks.Task.findOne({ _id: task }).then(foundTask => {
+          expect(foundTask).to.exist;
+          return resolve();
+        });
+        return null;
+      });
+    });
+  });
+
+  it('should clear todos older than 90 days for subscribed users', async () => {
+    user.purchased.plan.customerId = 'subscribedId';
+    user.purchased.plan.dateUpdated = moment('012013', 'MMYYYY');
+    user.lastCron = moment(new Date()).subtract({ days: 2 });
+
+    const task = generateTodo(user);
+    task.dateCompleted = moment(new Date()).subtract({ days: 91 });
+    task.completed = true;
+    await task.save();
+    await user.save();
+
+    await new Promise((resolve, reject) => {
+      cronMiddleware(req, res, err => {
+        if (err) return reject(err);
+        Tasks.Task.findOne({ _id: task }).then(foundTask => {
+          expect(foundTask).to.not.exist;
+          return resolve();
+        });
+        return null;
+      });
+    });
+  });
+
+  it('should call next if user was not modified after cron', async () => {
+    const hpBefore = user.stats.hp;
+    user.lastCron = moment(new Date()).subtract({ days: 2 });
+    await user.save();
+
+    await new Promise((resolve, reject) => {
+      cronMiddleware(req, res, err => {
+        if (err) return reject(err);
+        expect(hpBefore).to.equal(user.stats.hp);
+        return resolve();
+      });
+    });
+  });
+
+  it('runs cron if previous cron was incomplete', async () => {
+    user.lastCron = moment(new Date()).subtract({ days: 1 });
+    user.auth.timestamps.loggedin = moment(new Date()).subtract({ days: 4 });
+    const now = new Date();
+    await user.save();
+
+    await new Promise((resolve, reject) => {
+      cronMiddleware(req, res, err => {
+        if (err) return reject(err);
+        expect(moment(now).isSame(user.lastCron, 'day'));
+        expect(moment(now).isSame(user.auth.timestamps.loggedin, 'day'));
+        return resolve();
+      });
+    });
+  });
+
+  it('updates user.auth.timestamps.loggedin and lastCron', async () => {
+    user.lastCron = moment(new Date()).subtract({ days: 2 });
+    const now = new Date();
+    await user.save();
+
+    await new Promise((resolve, reject) => {
+      cronMiddleware(req, res, err => {
+        if (err) return reject(err);
+        expect(moment(now).isSame(user.lastCron, 'day'));
+        expect(moment(now).isSame(user.auth.timestamps.loggedin, 'day'));
+        return resolve();
+      });
+    });
+  });
+
+  it('does damage for missing dailies', async () => {
+    const hpBefore = user.stats.hp;
+    user.lastCron = moment(new Date()).subtract({ days: 2 });
+    const daily = generateDaily(user);
+    daily.startDate = moment(new Date()).subtract({ days: 2 });
+    await daily.save();
+    await user.save();
+
+    await new Promise((resolve, reject) => {
+      cronMiddleware(req, res, err => {
+        if (err) return reject(err);
+        return User.findOne({ _id: user._id }).then(updatedUser => {
+          expect(updatedUser.stats.hp).to.be.lessThan(hpBefore);
+          return resolve();
+        });
+      });
+    });
+  });
+
+  it('updates tasks', async () => {
+    user.lastCron = moment(new Date()).subtract({ days: 2 });
+    const todo = generateTodo(user);
+    const todoValueBefore = todo.value;
+    await Promise.all([todo.save(), user.save()]);
+
+    await new Promise((resolve, reject) => {
+      cronMiddleware(req, res, err => {
+        if (err) return reject(err);
+        return Tasks.Task.findOne({ _id: todo._id }).then(todoFound => {
+          expect(todoFound.value).to.be.lessThan(todoValueBefore);
+          return resolve();
+        });
+      });
+    });
+  });
+
+  it('applies quest progress', async () => {
+    const hpBefore = user.stats.hp;
+    user.lastCron = moment(new Date()).subtract({ days: 2 });
+    const daily = generateDaily(user);
+    daily.startDate = moment(new Date()).subtract({ days: 2 });
+    await daily.save();
+
+    const questKey = 'dilatory';
+    user.party.quest.key = questKey;
+
+    const party = new Group({
+      type: 'party',
+      name: generateUUID(),
+      leader: user._id,
+    });
+    party.quest.members[user._id] = true;
+    party.quest.key = questKey;
+    await party.save();
+
+    user.party._id = party._id;
+    await user.save();
+
+    party.startQuest(user);
+
+    await new Promise((resolve, reject) => {
+      cronMiddleware(req, res, err => {
+        if (err) return reject(err);
+        return User.findOne({ _id: user._id }).then(updatedUser => {
+          expect(updatedUser.stats.hp).to.be.lessThan(hpBefore);
+          return resolve();
+        });
+      });
+    });
+  });
+
+  it('recovers from failed cron and does not error when user is already cronning', async () => {
+    user.lastCron = moment(new Date()).subtract({ days: 2 });
+    await user.save();
+
+    const updatedUser = user.toObject();
+    updatedUser.matchedCount = 0;
+
+    sandbox.spy(cronLib, 'recoverCron');
+
+    sandbox.stub(User, 'updateOne')
+      .withArgs({
+        _id: user._id,
+        $or: [
+          { _cronSignature: 'NOT_RUNNING' },
+          { _cronSignature: { $lt: sinon.match.number } },
+        ],
+      })
+      .returns({
+        exec () {
+          return Promise.resolve(updatedUser);
+        },
+      });
+
+    await new Promise((resolve, reject) => {
+      cronMiddleware(req, res, err => {
+        if (err) return reject(err);
+        expect(cronLib.recoverCron).to.be.calledOnce;
+
+        return resolve();
+      });
+    });
+  });
+
+  it('cronSignature less than an hour ago should error', async () => {
+    user.lastCron = moment(new Date()).subtract({ days: 2 });
+    const now = new Date();
+    await User.updateOne({
+      _id: user._id,
+    }, {
+      $set: {
+        _cronSignature: now.getTime() - CRON_TIMEOUT_WAIT + CRON_TIMEOUT_UNIT,
+      },
+    }).exec();
+    await user.save();
+    const expectedErrMessage = `Impossible to recover from cron for user ${user._id}.`;
+
+    await new Promise((resolve, reject) => {
+      cronMiddleware(req, res, err => {
+        if (!err) return reject(new Error('Cron should have failed.'));
+        expect(err.message).to.be.equal(expectedErrMessage);
+        return resolve();
+      });
+    });
+  });
+
+  it('cronSignature longer than an hour ago should allow cron', async () => {
+    user.lastCron = moment(new Date()).subtract({ days: 2 });
+    const now = new Date();
+    await User.updateOne({
+      _id: user._id,
+    }, {
+      $set: {
+        _cronSignature: now.getTime() - CRON_TIMEOUT_WAIT - CRON_TIMEOUT_UNIT,
+      },
+    }).exec();
+    await user.save();
+
+    await new Promise((resolve, reject) => {
+      cronMiddleware(req, res, err => {
+        if (err) return reject(err);
+        expect(moment(now).isSame(user.auth.timestamps.loggedin, 'day'));
+        expect(user._cronSignature).to.be.equal('NOT_RUNNING');
+        return resolve();
+      });
+    });
+  });
+
+  it('cron should not run more than once', async () => {
+    user.lastCron = moment(new Date()).subtract({ days: 2 });
+    await user.save();
+
+    sandbox.spy(cronLib, 'cron');
+
+    await Promise.all([new Promise((resolve, reject) => {
+      cronMiddleware(req, res, err => {
+        if (err) return reject(err);
+        return resolve();
+      });
+    }), new Promise((resolve, reject) => {
+      cronMiddleware(req, res, err => {
+        if (err) return reject(err);
+        return resolve();
+      });
+    }), new Promise((resolve, reject) => {
+      setTimeout(() => {
+        cronMiddleware(req, res, err => {
+          if (err) return reject(err);
+          return resolve();
+        });
+      }, 400);
+    }),
+    ]);
+
+    expect(cronLib.cron).to.be.calledOnce;
+  });
+});

test/api/unit/middlewares/ensureAccessRight.test.js

@@ -6,7 +6,7 @@ import {
 } from '../../../helpers/api-unit.helper';
 import { ensurePermission } from '../../../../website/server/middlewares/ensureAccessRight';
 import { NotAuthorized } from '../../../../website/server/libs/errors';
-import { apiError } from '../../../../website/server/libs/apiError';
+import apiError from '../../../../website/server/libs/apiError';
 
 describe('ensure access middlewares', () => {
   let res; let req; let

test/api/unit/middlewares/ensureDevelopmentMode.js

@@ -1,51 +0,0 @@
-/* eslint-disable global-require */
-import nconf from 'nconf';
-import {
-  generateRes,
-  generateReq,
-  generateNext,
-} from '../../../helpers/api-unit.helper';
-import ensureDevelopmentMode from '../../../../website/server/middlewares/ensureDevelopmentMode';
-import { NotFound } from '../../../../website/server/libs/errors';
-
-describe('developmentMode middleware', () => {
-  let res; let req; let next;
-  let nconfStub;
-
-  beforeEach(() => {
-    res = generateRes();
-    req = generateReq();
-    next = generateNext();
-    nconfStub = sandbox.stub(nconf, 'get');
-  });
-
-  it('returns not found when on production URL', () => {
-    nconfStub.withArgs('DEBUG_ENABLED').returns(true);
-    nconfStub.withArgs('BASE_URL').returns('https://habitica.com');
-
-    ensureDevelopmentMode(req, res, next);
-
-    const calledWith = next.getCall(0).args;
-    expect(calledWith[0] instanceof NotFound).to.equal(true);
-  });
-
-  it('returns not found when intentionally disabled', () => {
-    nconfStub.withArgs('DEBUG_ENABLED').returns(false);
-    nconfStub.withArgs('BASE_URL').returns('http://localhost:3000');
-
-    ensureDevelopmentMode(req, res, next);
-
-    const calledWith = next.getCall(0).args;
-    expect(calledWith[0] instanceof NotFound).to.equal(true);
-  });
-
-  it('passes when enabled and on non-production URL', () => {
-    nconfStub.withArgs('DEBUG_ENABLED').returns(true);
-    nconfStub.withArgs('BASE_URL').returns('http://localhost:3000');
-
-    ensureDevelopmentMode(req, res, next);
-
-    expect(next).to.be.calledOnce;
-    expect(next.args[0]).to.be.empty;
-  });
-});

test/api/unit/middlewares/ensureDevelpmentMode.js

@@ -0,0 +1,38 @@
+/* eslint-disable global-require */
+import nconf from 'nconf';
+import {
+  generateRes,
+  generateReq,
+  generateNext,
+} from '../../../helpers/api-unit.helper';
+import ensureDevelpmentMode from '../../../../website/server/middlewares/ensureDevelpmentMode';
+import { NotFound } from '../../../../website/server/libs/errors';
+
+describe('developmentMode middleware', () => {
+  let res; let req; let
+    next;
+
+  beforeEach(() => {
+    res = generateRes();
+    req = generateReq();
+    next = generateNext();
+  });
+
+  it('returns not found when in production mode', () => {
+    sandbox.stub(nconf, 'get').withArgs('IS_PROD').returns(true);
+
+    ensureDevelpmentMode(req, res, next);
+
+    const calledWith = next.getCall(0).args;
+    expect(calledWith[0] instanceof NotFound).to.equal(true);
+  });
+
+  it('passes when not in production', () => {
+    sandbox.stub(nconf, 'get').withArgs('IS_PROD').returns(false);
+
+    ensureDevelpmentMode(req, res, next);
+
+    expect(next).to.be.calledOnce;
+    expect(next.args[0]).to.be.empty;
+  });
+});

test/api/unit/middlewares/ensureTimeTravelMode.js

@@ -1,51 +0,0 @@
-/* eslint-disable global-require */
-import nconf from 'nconf';
-import {
-  generateRes,
-  generateReq,
-  generateNext,
-} from '../../../helpers/api-unit.helper';
-import { NotFound } from '../../../../website/server/libs/errors';
-import ensureTimeTravelMode from '../../../../website/server/middlewares/ensureTimeTravelMode';
-
-describe('timetravelMode middleware', () => {
-  let res; let req; let next;
-  let nconfStub;
-
-  beforeEach(() => {
-    res = generateRes();
-    req = generateReq();
-    next = generateNext();
-    nconfStub = sandbox.stub(nconf, 'get');
-  });
-
-  it('returns not found when using production URL', () => {
-    nconfStub.withArgs('TIME_TRAVEL_ENABLED').returns(false);
-    nconfStub.withArgs('BASE_URL').returns('https://habitica.com');
-
-    ensureTimeTravelMode(req, res, next);
-
-    const calledWith = next.getCall(0).args;
-    expect(calledWith[0] instanceof NotFound).to.equal(true);
-  });
-
-  it('returns not found when not in time travel mode', () => {
-    nconfStub.withArgs('TIME_TRAVEL_ENABLED').returns(false);
-    nconfStub.withArgs('BASE_URL').returns('http://localhost:3000');
-
-    ensureTimeTravelMode(req, res, next);
-
-    const calledWith = next.getCall(0).args;
-    expect(calledWith[0] instanceof NotFound).to.equal(true);
-  });
-
-  it('passes when in time travel mode', () => {
-    nconfStub.withArgs('TIME_TRAVEL_ENABLED').returns(true);
-    nconfStub.withArgs('BASE_URL').returns('http://localhost:3000');
-
-    ensureTimeTravelMode(req, res, next);
-
-    expect(next).to.be.calledOnce;
-    expect(next.args[0]).to.be.empty;
-  });
-});

test/api/unit/middlewares/ipBlocker.test.js

@@ -6,7 +6,7 @@ import {
   generateNext,
 } from '../../../helpers/api-unit.helper';
 import { Forbidden } from '../../../../website/server/libs/errors';
-import { apiError } from '../../../../website/server/libs/apiError';
+import apiError from '../../../../website/server/libs/apiError';
 
 function checkErrorThrown (next) {
   expect(next).to.have.been.calledOnce;

test/api/unit/middlewares/rateLimiter.test.js

@@ -7,7 +7,7 @@ import {
   generateNext,
 } from '../../../helpers/api-unit.helper';
 import { TooManyRequests } from '../../../../website/server/libs/errors';
-import { apiError } from '../../../../website/server/libs/apiError';
+import apiError from '../../../../website/server/libs/apiError';
 import logger from '../../../../website/server/libs/logger';
 
 describe('rateLimiter middleware', () => {
@@ -54,7 +54,6 @@ describe('rateLimiter middleware', () => {
 
   it('does not throw when there are available points', async () => {
     nconfGetStub.withArgs('RATE_LIMITER_ENABLED').returns('true');
-    nconfGetStub.withArgs('RATE_LIMITER_IP_COST').returns(1);
     const attachRateLimiter = requireAgain(pathToRateLimiter).default;
     await attachRateLimiter(req, res, next);
 
@@ -72,7 +71,6 @@ describe('rateLimiter middleware', () => {
 
   it('does not throw when an unknown error is thrown by the rate limiter', async () => {
     nconfGetStub.withArgs('RATE_LIMITER_ENABLED').returns('true');
-    nconfGetStub.withArgs('RATE_LIMITER_IP_COST').returns(1);
     sandbox.stub(logger, 'error');
     sandbox.stub(RateLimiterMemory.prototype, 'consume')
       .returns(Promise.reject(new Error('Unknown error.')));
@@ -89,73 +87,8 @@ describe('rateLimiter middleware', () => {
     expect(logger.error).to.have.been.calledWithMatch(Error, 'Rate Limiter Error');
   });
 
-  it('does not throw when LIVELINESS_PROBE_KEY is correct', async () => {
-    nconfGetStub.withArgs('RATE_LIMITER_ENABLED').returns('true');
-    nconfGetStub.withArgs('LIVELINESS_PROBE_KEY').returns('abc');
-    const attachRateLimiter = requireAgain(pathToRateLimiter).default;
-
-    req.query.liveliness = 'abc';
-    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;
-  });
-
-  it('limits when LIVELINESS_PROBE_KEY is incorrect', async () => {
-    nconfGetStub.withArgs('RATE_LIMITER_ENABLED').returns('true');
-    nconfGetStub.withArgs('LIVELINESS_PROBE_KEY').returns('abc');
-    nconfGetStub.withArgs('RATE_LIMITER_IP_COST').returns(1);
-    const attachRateLimiter = requireAgain(pathToRateLimiter).default;
-
-    req.query.liveliness = 'das';
-    await attachRateLimiter(req, res, next);
-
-    expect(next).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('limits when LIVELINESS_PROBE_KEY is not set', async () => {
-    nconfGetStub.withArgs('RATE_LIMITER_ENABLED').returns('true');
-    nconfGetStub.withArgs('LIVELINESS_PROBE_KEY').returns(undefined);
-    nconfGetStub.withArgs('RATE_LIMITER_IP_COST').returns(1);
-    const attachRateLimiter = requireAgain(pathToRateLimiter).default;
-
-    await attachRateLimiter(req, res, next);
-
-    expect(next).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('throws when LIVELINESS_PROBE_KEY is blank', async () => {
-    nconfGetStub.withArgs('RATE_LIMITER_ENABLED').returns('true');
-    nconfGetStub.withArgs('LIVELINESS_PROBE_KEY').returns('');
-    nconfGetStub.withArgs('RATE_LIMITER_IP_COST').returns(1);
-    const attachRateLimiter = requireAgain(pathToRateLimiter).default;
-
-    req.query.liveliness = '';
-    await attachRateLimiter(req, res, next);
-
-    expect(next).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('throws when there are no available points remaining', async () => {
     nconfGetStub.withArgs('RATE_LIMITER_ENABLED').returns('true');
-    nconfGetStub.withArgs('RATE_LIMITER_IP_COST').returns(1);
     const attachRateLimiter = requireAgain(pathToRateLimiter).default;
 
     // call for 31 times
@@ -179,7 +112,6 @@ describe('rateLimiter middleware', () => {
 
   it('uses the user id if supplied or the ip address', async () => {
     nconfGetStub.withArgs('RATE_LIMITER_ENABLED').returns('true');
-    nconfGetStub.withArgs('RATE_LIMITER_IP_COST').returns(1);
     const attachRateLimiter = requireAgain(pathToRateLimiter).default;
 
     req.ip = 1;
@@ -206,51 +138,4 @@ describe('rateLimiter middleware', () => {
       'X-RateLimit-Reset': sinon.match(Date),
     });
   });
-
-  it('applies increased cost for registration calls with and without user id', async () => {
-    nconfGetStub.withArgs('RATE_LIMITER_ENABLED').returns('true');
-    nconfGetStub.withArgs('RATE_LIMITER_REGISTRATION_COST').returns(3);
-    const attachRateLimiter = requireAgain(pathToRateLimiter).default;
-    req.path = '/api/v4/user/auth/local/register';
-
-    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': 27, // 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': 24, // 3 calls with only ip
-      'X-RateLimit-Reset': sinon.match(Date),
-    });
-  });
-
-  it('applies increased cost for unauthenticated API calls', async () => {
-    nconfGetStub.withArgs('RATE_LIMITER_ENABLED').returns('true');
-    nconfGetStub.withArgs('RATE_LIMITER_IP_COST').returns(10);
-    const attachRateLimiter = requireAgain(pathToRateLimiter).default;
-
-    req.ip = 1;
-    await attachRateLimiter(req, res, next);
-    await attachRateLimiter(req, res, next);
-
-    expect(res.set).to.have.been.calledWithMatch({
-      'X-RateLimit-Limit': 30,
-      'X-RateLimit-Remaining': 10,
-      'X-RateLimit-Reset': sinon.match(Date),
-    });
-  });
 });

test/api/unit/middlewares/requestLogHandler.test.js

@@ -1,37 +0,0 @@
-/* eslint-disable global-require */
-import requireAgain from 'require-again';
-import {
-  generateRes,
-  generateReq,
-  generateNext,
-} from '../../../helpers/api-unit.helper';
-
-describe('requestLogHandler middleware', () => {
-  let res; let req; let
-    next;
-  const pathToMiddleWare = '../../../../website/server/middlewares/requestLogHandler';
-
-  beforeEach(() => {
-    res = generateRes();
-    req = generateReq();
-    next = generateNext();
-  });
-
-  it('attaches start time and request ID object to req', () => {
-    const middleware = requireAgain(pathToMiddleWare);
-
-    middleware.logRequestData(req, res, next);
-
-    expect(req.requestStartTime).to.exist;
-    expect(req.requestStartTime).to.be.a('number');
-    expect(req.requestIdentifier).to.exist;
-    expect(req.requestIdentifier).to.be.a('string');
-  });
-
-  it('calls next', () => {
-    const middleware = requireAgain(pathToMiddleWare);
-    const spy = sinon.spy();
-    middleware.logRequestData(req, res, spy);
-    expect(spy.calledOnce).to.be.true;
-  });
-});

test/api/unit/models/group.test.js

@@ -1362,8 +1362,8 @@ describe('Group Model', () => {
         sandbox.spy(User, 'updateMany');
       });
 
-      it('formats message', async () => {
-        const chatMessage = await party.sendChat({
+      it('formats message', () => {
+        const chatMessage = party.sendChat({
           message: 'a _new_ message with *markdown*',
           user: {
             _id: 'user-id',
@@ -1396,8 +1396,8 @@ describe('Group Model', () => {
         expect(chat.user).to.eql('user name');
       });
 
-      it('formats message as system if no user is passed in', async () => {
-        const chat = await party.sendChat({ message: 'a system message' });
+      it('formats message as system if no user is passed in', () => {
+        const chat = party.sendChat({ message: 'a system message' });
 
         expect(chat.text).to.eql('a system message');
         expect(validator.isUUID(chat.id)).to.eql(true);
@@ -1411,8 +1411,8 @@ describe('Group Model', () => {
         expect(chat.user).to.not.exist;
       });
 
-      it('updates users about new messages in party', async () => {
-        await party.sendChat({ message: 'message' });
+      it('updates users about new messages in party', () => {
+        party.sendChat({ message: 'message' });
 
         expect(User.updateMany).to.be.calledOnce;
         expect(User.updateMany).to.be.calledWithMatch({
@@ -1421,12 +1421,12 @@ describe('Group Model', () => {
         });
       });
 
-      it('updates users about new messages in group', async () => {
+      it('updates users about new messages in group', () => {
         const group = new Group({
           type: 'guild',
         });
 
-        await group.sendChat({ message: 'message' });
+        group.sendChat({ message: 'message' });
 
         expect(User.updateMany).to.be.calledOnce;
         expect(User.updateMany).to.be.calledWithMatch({
@@ -1435,8 +1435,8 @@ describe('Group Model', () => {
         });
       });
 
-      it('does not send update to user that sent the message', async () => {
-        await party.sendChat({ message: 'message', user: { _id: 'user-id', profile: { name: 'user' } } });
+      it('does not send update to user that sent the message', () => {
+        party.sendChat({ message: 'message', user: { _id: 'user-id', profile: { name: 'user' } } });
 
         expect(User.updateMany).to.be.calledOnce;
         expect(User.updateMany).to.be.calledWithMatch({
@@ -1445,18 +1445,18 @@ describe('Group Model', () => {
         });
       });
 
-      it('skips sending new message notification for guilds with > 5000 members', async () => {
+      it('skips sending new message notification for guilds with > 5000 members', () => {
         party.memberCount = 5001;
 
-        await party.sendChat({ message: 'message' });
+        party.sendChat({ message: 'message' });
 
         expect(User.updateMany).to.not.be.called;
       });
 
-      it('skips sending messages to the tavern', async () => {
+      it('skips sending messages to the tavern', () => {
         party._id = TAVERN_ID;
 
-        await party.sendChat({ message: 'message' });
+        party.sendChat({ message: 'message' });
 
         expect(User.updateMany).to.not.be.called;
       });
@@ -2326,7 +2326,7 @@ describe('Group Model', () => {
 
         await guild.save();
 
-        const groupMessage = await guild.sendChat({ message: 'Test message.' });
+        const groupMessage = guild.sendChat({ message: 'Test message.' });
         await groupMessage.save();
 
         await sleep();

test/api/unit/models/webhook.test.js

@@ -1,7 +1,7 @@
 import { v4 as generateUUID } from 'uuid';
 import { model as Webhook } from '../../../../website/server/models/webhook';
 import { BadRequest } from '../../../../website/server/libs/errors';
-import { apiError } from '../../../../website/server/libs/apiError';
+import apiError from '../../../../website/server/libs/apiError';
 
 describe('Webhook Model', () => {
   context('Instance Methods', () => {

test/api/v3/integration/challenges/POST-challenge_flag.test.js

@@ -7,7 +7,6 @@ import {
 
 describe('POST /challenges/:challengeId/flag', () => {
   let user;
-  let challengeGroup;
   let challenge;
 
   beforeEach(async () => {
@@ -21,7 +20,6 @@ describe('POST /challenges/:challengeId/flag', () => {
     });
 
     user = groupLeader;
-    challengeGroup = group;
 
     challenge = await generateChallenge(user, group);
   });
@@ -61,19 +59,4 @@ describe('POST /challenges/:challengeId/flag', () => {
         message: t('messageChallengeFlagAlreadyReported'),
       });
   });
-
-  it('returns an error when user tries to flag an official challenge', async () => {
-    await user.updateOne({
-      permissions: {
-        challengeAdmin: true,
-      },
-    });
-    challenge = await generateChallenge(user, challengeGroup, { official: true });
-    await expect(user.post(`/challenges/${challenge._id}/flag`))
-      .to.eventually.be.rejected.and.eql({
-        code: 404,
-        error: 'NotFound',
-        message: t('messageChallengeFlagOfficial'),
-      });
-  });
 });

test/api/v3/integration/challenges/POST-challenges.test.js

@@ -331,71 +331,5 @@ describe('POST /challenges', () => {
 
       expect(updatedChallenge.summary).to.eql(summary);
     });
-
-    it('sets categories for challenges', async () => {
-      const testCategory = { _id: '65c1172997c0b24600371ea9', slug: 'test', name: 'Test' };
-      const challenge = await groupLeader.post('/challenges', {
-        group: group._id,
-        name: 'Test Challenge',
-        shortName: 'TC Label',
-        categories: [testCategory],
-      });
-
-      const updatedChallenge = await groupLeader.get(`/challenges/${challenge._id}`);
-
-      expect(updatedChallenge.categories).to.eql([testCategory]);
-    });
-
-    it('does not set habitica_official category for non-admins', async () => {
-      const testCategory = { _id: '65c1172997c0b24600371ea9', slug: 'habitica_official', name: 'habitica_official' };
-      await expect(groupLeader.post('/challenges', {
-        group: group._id,
-        name: 'Test Challenge',
-        shortName: 'TC Label',
-        categories: [testCategory],
-      })).to.eventually.be.rejected.and.eql({
-        code: 401,
-        error: 'NotAuthorized',
-        message: t('noPrivAccess'),
-      });
-    });
-
-    it('sets habitica_official category for admins', async () => {
-      await groupLeader.updateOne({
-        permissions: {
-          challengeAdmin: true,
-        },
-      });
-
-      const testCategory = { _id: '65c1172997c0b24600371ea9', slug: 'habitica_official', name: 'habitica_official' };
-      const challenge = await groupLeader.post('/challenges', {
-        group: group._id,
-        name: 'Test Challenge',
-        shortName: 'TC Label',
-        categories: [testCategory],
-      });
-
-      const updatedChallenge = await groupLeader.get(`/challenges/${challenge._id}`);
-      expect(updatedChallenge.categories).to.eql([testCategory]);
-    });
-
-    it('sets official if the habitica_official category is set for admins', async () => {
-      await groupLeader.updateOne({
-        permissions: {
-          challengeAdmin: true,
-        },
-      });
-
-      const testCategory = { _id: '65c1172997c0b24600371ea9', slug: 'habitica_official', name: 'habitica_official' };
-      const challenge = await groupLeader.post('/challenges', {
-        group: group._id,
-        name: 'Test Challenge',
-        shortName: 'TC Label',
-        categories: [testCategory],
-      });
-
-      const updatedChallenge = await groupLeader.get(`/challenges/${challenge._id}`);
-      expect(updatedChallenge.official).to.eql(true);
-    });
   });
 });

test/api/v3/integration/chat/GET-chat.test.js

@@ -3,7 +3,6 @@ import {
   createAndPopulateGroup,
   translate as t,
 } from '../../../../helpers/api-integration/v3';
-import { model as Group } from '../../../../../website/server/models/group';
 
 describe('GET /groups/:groupId/chat', () => {
   let user;
@@ -38,34 +37,4 @@ describe('GET /groups/:groupId/chat', () => {
       });
     });
   });
-
-  context('public Guild', () => {
-    let group;
-    before(async () => {
-      ({ group } = await createAndPopulateGroup({
-        groupDetails: {
-          name: 'test group',
-          type: 'guild',
-          privacy: 'private',
-        },
-        members: 1,
-        upgradeToGroupPlan: true,
-        chat: [
-          'Hello',
-          'Welcome to the Guild',
-        ],
-      }));
-
-      // Creation API is shut down, we need to simulate an extant public group
-      await Group.updateOne({ _id: group._id }, { $set: { privacy: 'public' }, $unset: { 'purchased.plan': 1 } }).exec();
-    });
-
-    it('returns error if user attempts to fetch a sunset Guild', async () => {
-      await expect(user.get(`/groups/${group._id}/chat`)).to.eventually.be.rejected.and.eql({
-        code: 400,
-        error: 'BadRequest',
-        message: t('featureRetired'),
-      });
-    });
-  });
 });

test/api/v3/integration/chat/POST-chat.flag.test.js

@@ -223,23 +223,4 @@ describe('POST /chat/:chatId/flag', () => {
 
     expect(auMessageToCheck).to.not.exist;
   });
-
-  it('validates that the message belongs to the passed group', async () => {
-    const { group: anotherGroup, groupLeader: anotherLeader } = await createAndPopulateGroup({
-      groupDetails: {
-        name: 'Another Guild',
-        type: 'guild',
-        privacy: 'private',
-      },
-      upgradeToGroupPlan: true,
-    });
-
-    const message = await anotherUser.post(`/groups/${group._id}/chat`, { message: TEST_MESSAGE });
-    await expect(anotherLeader.post(`/groups/${anotherGroup._id}/chat/${message.message.id}/flag`))
-      .to.eventually.be.rejected.and.eql({
-        code: 404,
-        error: 'NotFound',
-        message: t('messageGroupChatNotFound'),
-      });
-  });
 });

test/api/v3/integration/chat/POST-chat.like.test.js

@@ -1,10 +1,8 @@
 import { find } from 'lodash';
 import {
-  generateUser,
   createAndPopulateGroup,
   translate as t,
 } from '../../../../helpers/api-integration/v3';
-import { model as Group } from '../../../../../website/server/models/group';
 
 describe('POST /chat/:chatId/like', () => {
   let user;
@@ -41,21 +39,19 @@ describe('POST /chat/:chatId/like', () => {
       });
   });
 
-  it('Likes a chat', async () => {
-    const message = await anotherUser.post(`/groups/${groupWithChat._id}/chat`, { message: testMessage });
+  it('Returns an error when user tries to like their own message', async () => {
+    const message = await user.post(`/groups/${groupWithChat._id}/chat`, { message: testMessage });
 
-    const likeResult = await user.post(`/groups/${groupWithChat._id}/chat/${message.message.id}/like`);
-
-    expect(likeResult.likes[user._id]).to.equal(true);
-
-    const groupWithChatLikes = await user.get(`/groups/${groupWithChat._id}`);
-
-    const messageToCheck = find(groupWithChatLikes.chat, { id: message.message.id });
-    expect(messageToCheck.likes[user._id]).to.equal(true);
+    await expect(user.post(`/groups/${groupWithChat._id}/chat/${message.message.id}/like`))
+      .to.eventually.be.rejected.and.eql({
+        code: 404,
+        error: 'NotFound',
+        message: t('messageGroupChatLikeOwnMessage'),
+      });
   });
 
-  it('Allows to likes their own chat message', async () => {
-    const message = await user.post(`/groups/${groupWithChat._id}/chat`, { message: testMessage });
+  it('Likes a chat', async () => {
+    const message = await anotherUser.post(`/groups/${groupWithChat._id}/chat`, { message: testMessage });
 
     const likeResult = await user.post(`/groups/${groupWithChat._id}/chat/${message.message.id}/like`);
 
@@ -81,49 +77,4 @@ describe('POST /chat/:chatId/like', () => {
     const messageToCheck = find(groupWithoutChatLikes.chat, { id: message.message.id });
     expect(messageToCheck.likes[user._id]).to.equal(false);
   });
-
-  it('validates that the message belongs to the passed group', async () => {
-    const { group: anotherGroup, groupLeader: anotherLeader } = await createAndPopulateGroup({
-      groupDetails: {
-        name: 'Another Guild',
-        type: 'guild',
-        privacy: 'private',
-      },
-      upgradeToGroupPlan: true,
-    });
-
-    const message = await anotherUser.post(`/groups/${groupWithChat._id}/chat`, { message: testMessage });
-    await expect(anotherLeader.post(`/groups/${anotherGroup._id}/chat/${message.message.id}/like`))
-      .to.eventually.be.rejected.and.eql({
-        code: 404,
-        error: 'NotFound',
-        message: t('messageGroupChatNotFound'),
-      });
-  });
-
-  it('does not like a message if the user is not in the group', async () => {
-    const thirdUser = await generateUser();
-
-    const message = await user.post(`/groups/${groupWithChat._id}/chat`, { message: testMessage });
-    await expect(thirdUser.post(`/groups/${groupWithChat._id}/chat/${message.message.id}/like`))
-      .to.eventually.be.rejected.and.eql({
-        code: 404,
-        error: 'NotFound',
-        message: t('groupNotFound'),
-      });
-  });
-
-  it('does not like a message that belongs to a sunset public group', async () => {
-    const message = await anotherUser.post(`/groups/${groupWithChat._id}/chat`, { message: testMessage });
-
-    // Creation API is shut down, we need to simulate an extant public group
-    await Group.updateOne({ _id: groupWithChat._id }, { $set: { privacy: 'public' }, $unset: { 'purchased.plan': 1 } }).exec();
-
-    await expect(user.post(`/groups/${groupWithChat._id}/chat/${message.message.id}/like`))
-      .to.eventually.be.rejected.and.eql({
-        code: 400,
-        error: 'BadRequest',
-        message: t('featureRetired'),
-      });
-  });
 });

test/api/v3/integration/content/GET-content.test.js

@@ -22,38 +22,4 @@ describe('GET /content', () => {
     expect(res).to.have.nested.property('backgrounds.backgrounds062014.beach');
     expect(res.backgrounds.backgrounds062014.beach.text).to.equal(t('backgroundBeachText'));
   });
-
-  it('does not filter content for regular requests', async () => {
-    const res = await requester().get('/content');
-    expect(res).to.have.nested.property('backgrounds.backgrounds062014');
-    expect(res).to.have.nested.property('gear.tree');
-  });
-
-  it('filters content automatically for iOS requests', async () => {
-    const res = await requester(null, { 'x-client': 'habitica-ios' }).get('/content');
-    expect(res).to.have.nested.property('appearances.background.beach');
-    expect(res).to.not.have.nested.property('backgrounds.backgrounds062014');
-    expect(res).to.not.have.property('backgroundsFlat');
-    expect(res).to.not.have.nested.property('gear.tree');
-  });
-
-  it('filters content automatically for Android requests', async () => {
-    const res = await requester(null, { 'x-client': 'habitica-android' }).get('/content');
-    expect(res).to.not.have.nested.property('appearances.background.beach');
-    expect(res).to.have.nested.property('backgrounds.backgrounds062014');
-    expect(res).to.not.have.property('backgroundsFlat');
-    expect(res).to.not.have.nested.property('gear.tree');
-  });
-
-  it('filters content if the request specifies a filter', async () => {
-    const res = await requester().get('/content?filter=backgroundsFlat,gear.flat');
-    expect(res).to.not.have.property('backgroundsFlat');
-    expect(res).to.have.nested.property('gear.tree');
-    expect(res).to.not.have.nested.property('gear.flat');
-  });
-
-  it('filters content if the request contains invalid filters', async () => {
-    const res = await requester().get('/content?filter=backgroundsFlat,invalid');
-    expect(res).to.not.have.property('backgroundsFlat');
-  });
 });

test/api/v3/integration/coupons/GET-coupons.test.js

@@ -2,7 +2,7 @@ import {
   generateUser,
   resetHabiticaDB,
 } from '../../../../helpers/api-integration/v3';
-import { apiError } from '../../../../../website/server/libs/apiError';
+import apiError from '../../../../../website/server/libs/apiError';
 
 describe('GET /coupons/', () => {
   let user;

test/api/v3/integration/coupons/POST-coupons_generate_event.test.js

@@ -4,7 +4,7 @@ import {
   translate as t,
   resetHabiticaDB,
 } from '../../../../helpers/api-integration/v3';
-import { apiError } from '../../../../../website/server/libs/apiError';
+import apiError from '../../../../../website/server/libs/apiError';
 
 describe('POST /coupons/generate/:event', () => {
   let user;

test/api/v3/integration/debug/GET-debug-timeTravelTime.test.js

@@ -1,46 +0,0 @@
-import nconf from 'nconf';
-import {
-  generateUser,
-} from '../../../../helpers/api-integration/v3';
-
-describe('GET /debug/time-travel-time', () => {
-  let user;
-  let nconfStub;
-
-  before(async () => {
-    user = await generateUser({ permissions: { fullAccess: true } });
-  });
-
-  beforeEach(() => {
-    nconfStub = sandbox.stub(nconf, 'get');
-  });
-
-  afterEach(() => {
-    nconfStub.restore();
-  });
-
-  it('returns the shifted time', async () => {
-    nconfStub.withArgs('TIME_TRAVEL_ENABLED').returns(true);
-    const result = await user.get('/debug/time-travel-time');
-    expect(result.time).to.exist;
-    await user.post('/debug/jump-time', { disable: true });
-  });
-
-  it('returns shifted when the user is not an admin', async () => {
-    nconfStub.withArgs('TIME_TRAVEL_ENABLED').returns(true);
-    const regularUser = await generateUser();
-    const result = await regularUser.get('/debug/time-travel-time');
-    expect(result.time).to.exist;
-  });
-
-  it('returns error when not in time travel mode', async () => {
-    nconfStub.withArgs('TIME_TRAVEL_ENABLED').returns(false);
-
-    await expect(user.get('/debug/time-travel-time'))
-      .eventually.be.rejected.and.to.deep.equal({
-        code: 404,
-        error: 'NotFound',
-        message: 'Not found.',
-      });
-  });
-});

test/api/v3/integration/debug/POST-debug_addHourglass.test.js

@@ -5,23 +5,16 @@ import {
 
 describe('POST /debug/add-hourglass', () => {
   let userToGetHourGlass;
-  let nconfStub;
 
   before(async () => {
     userToGetHourGlass = await generateUser();
   });
 
-  beforeEach(() => {
-    nconfStub = sandbox.stub(nconf, 'get');
-    nconfStub.withArgs('BASE_URL').returns('https://example.com');
-  });
-
-  afterEach(() => {
-    nconfStub.restore();
+  after(() => {
+    nconf.set('IS_PROD', false);
   });
 
   it('adds Hourglass to the current user', async () => {
-    nconfStub.withArgs('DEBUG_ENABLED').returns(true);
     await userToGetHourGlass.post('/debug/add-hourglass');
 
     const userWithHourGlass = await userToGetHourGlass.get('/user');
@@ -30,7 +23,7 @@ describe('POST /debug/add-hourglass', () => {
   });
 
   it('returns error when not in production mode', async () => {
-    nconfStub.withArgs('DEBUG_ENABLED').returns(false);
+    nconf.set('IS_PROD', true);
 
     await expect(userToGetHourGlass.post('/debug/add-hourglass'))
       .eventually.be.rejected.and.to.deep.equal({

test/api/v3/integration/debug/POST-debug_addTenGems.test.js

@@ -5,23 +5,16 @@ import {
 
 describe('POST /debug/add-ten-gems', () => {
   let userToGainTenGems;
-  let nconfStub;
 
   before(async () => {
     userToGainTenGems = await generateUser();
   });
 
-  beforeEach(() => {
-    nconfStub = sandbox.stub(nconf, 'get');
-    nconfStub.withArgs('BASE_URL').returns('https://example.com');
-  });
-
-  afterEach(() => {
-    nconfStub.restore();
+  after(() => {
+    nconf.set('IS_PROD', false);
   });
 
   it('adds ten gems to the current user', async () => {
-    nconfStub.withArgs('DEBUG_ENABLED').returns(true);
     await userToGainTenGems.post('/debug/add-ten-gems');
 
     const userWithTenGems = await userToGainTenGems.get('/user');
@@ -30,7 +23,7 @@ describe('POST /debug/add-ten-gems', () => {
   });
 
   it('returns error when not in production mode', async () => {
-    nconfStub.withArgs('DEBUG_ENABLED').returns(false);
+    nconf.set('IS_PROD', true);
 
     await expect(userToGainTenGems.post('/debug/add-ten-gems'))
       .eventually.be.rejected.and.to.deep.equal({

test/api/v3/integration/debug/POST-debug_boss-rage.test.js

@@ -1,73 +0,0 @@
-import nconf from 'nconf';
-import {
-  generateUser,
-  createAndPopulateGroup,
-} from '../../../../helpers/api-integration/v3';
-
-describe('POST /debug/boss-rage', () => {
-  let user;
-  let nconfStub;
-
-  beforeEach(async () => {
-    user = await generateUser();
-  });
-
-  beforeEach(() => {
-    nconfStub = sandbox.stub(nconf, 'get');
-    nconfStub.withArgs('DEBUG_ENABLED').returns(true);
-    nconfStub.withArgs('BASE_URL').returns('https://example.com');
-  });
-
-  afterEach(() => {
-    nconfStub.restore();
-  });
-
-  it('errors if user is not in a party', async () => {
-    await expect(user.post('/debug/boss-rage'))
-      .to.eventually.be.rejected.and.deep.equal({
-        code: 400,
-        error: 'BadRequest',
-        message: 'User not in a party.',
-      });
-  });
-
-  it('returns error when not in production mode', async () => {
-    nconfStub.withArgs('DEBUG_ENABLED').returns(false);
-
-    await expect(user.post('/debug/boss-rage'))
-      .to.eventually.be.rejected.and.deep.equal({
-        code: 404,
-        error: 'NotFound',
-        message: 'Not found.',
-      });
-  });
-
-  context('user is in a party', async () => {
-    let party;
-
-    beforeEach(async () => {
-      const { group, groupLeader } = await createAndPopulateGroup({
-        groupDetails: {
-          name: 'Test Party',
-          type: 'party',
-        },
-        members: 2,
-      });
-      party = group;
-      user = groupLeader;
-    });
-
-    it('increases boss rage to 50', async () => {
-      await user.post('/debug/boss-rage');
-      await party.sync();
-      expect(party.quest.progress.rage).to.eql(50);
-    });
-
-    it('increases boss rage to 100', async () => {
-      await user.post('/debug/boss-rage');
-      await user.post('/debug/boss-rage');
-      await party.sync();
-      expect(party.quest.progress.rage).to.eql(100);
-    });
-  });
-});

test/api/v3/integration/debug/POST-debug_jumpTime.test.js

@@ -1,86 +0,0 @@
-import nconf from 'nconf';
-import {
-  generateUser,
-} from '../../../../helpers/api-integration/v3';
-
-describe('POST /debug/jump-time', () => {
-  let user;
-  let today;
-  let nconfStub;
-
-  before(async () => {
-    user = await generateUser({ permissions: { fullAccess: true } });
-    today = new Date();
-  });
-
-  beforeEach(() => {
-    nconfStub = sandbox.stub(nconf, 'get');
-    nconfStub.withArgs('TIME_TRAVEL_ENABLED').returns(true);
-  });
-
-  afterEach(() => {
-    nconfStub.restore();
-  });
-
-  after(async () => {
-    nconf.set('TIME_TRAVEL_ENABLED', true);
-    await user.post('/debug/jump-time', { disable: true });
-    nconf.set('TIME_TRAVEL_ENABLED', false);
-  });
-
-  it('Jumps forward', async () => {
-    const resultDate = new Date((await user.post('/debug/jump-time', { reset: true })).time);
-    expect(resultDate.getDate()).to.eql(today.getDate());
-    expect(resultDate.getMonth()).to.eql(today.getMonth());
-    expect(resultDate.getFullYear()).to.eql(today.getFullYear());
-    const newResultDate = new Date((await user.post('/debug/jump-time', { offsetDays: 1 })).time);
-    const tomorrow = new Date(today.valueOf());
-    tomorrow.setDate(today.getDate() + 1);
-    expect(newResultDate.getDate()).to.eql(tomorrow.getDate());
-    expect(newResultDate.getMonth()).to.eql(tomorrow.getMonth());
-    expect(newResultDate.getFullYear()).to.eql(tomorrow.getFullYear());
-  });
-
-  it('jumps back', async () => {
-    const resultDate = new Date((await user.post('/debug/jump-time', { reset: true })).time);
-    expect(resultDate.getDate()).to.eql(today.getDate());
-    expect(resultDate.getMonth()).to.eql(today.getMonth());
-    expect(resultDate.getFullYear()).to.eql(today.getFullYear());
-    const newResultDate = new Date((await user.post('/debug/jump-time', { offsetDays: -1 })).time);
-    const yesterday = new Date(today.valueOf());
-    yesterday.setDate(today.getDate() - 1);
-    expect(newResultDate.getDate()).to.eql(yesterday.getDate());
-    expect(newResultDate.getMonth()).to.eql(yesterday.getMonth());
-    expect(newResultDate.getFullYear()).to.eql(yesterday.getFullYear());
-  });
-
-  it('can jump a lot', async () => {
-    const resultDate = new Date((await user.post('/debug/jump-time', { reset: true })).time);
-    expect(resultDate.getDate()).to.eql(today.getDate());
-    expect(resultDate.getMonth()).to.eql(today.getMonth());
-    expect(resultDate.getFullYear()).to.eql(today.getFullYear());
-    const newResultDate = new Date((await user.post('/debug/jump-time', { offsetDays: 365 })).time);
-    expect(newResultDate.getFullYear()).to.eql(today.getFullYear() + 1);
-  });
-
-  it('returns error when the user is not an admin', async () => {
-    const regularUser = await generateUser();
-    await expect(regularUser.post('/debug/jump-time', { offsetDays: 1 }))
-      .eventually.be.rejected.and.to.deep.equal({
-        code: 400,
-        error: 'BadRequest',
-        message: 'You do not have permission to time travel.',
-      });
-  });
-
-  it('returns error when not in time travel mode', async () => {
-    nconfStub.withArgs('TIME_TRAVEL_ENABLED').returns(false);
-
-    await expect(user.post('/debug/jump-time', { offsetDays: 1 }))
-      .eventually.be.rejected.and.to.deep.equal({
-        code: 404,
-        error: 'NotFound',
-        message: 'Not found.',
-      });
-  });
-});

test/api/v3/integration/debug/POST-debug_make-admin.test.js

@@ -5,23 +5,16 @@ import {
 
 describe('POST /debug/make-admin', () => {
   let user;
-  let nconfStub;
 
   before(async () => {
     user = await generateUser();
   });
 
-  beforeEach(() => {
-    nconfStub = sandbox.stub(nconf, 'get');
-    nconfStub.withArgs('BASE_URL').returns('https://example.com');
-  });
-
   afterEach(() => {
-    nconfStub.restore();
+    nconf.set('IS_PROD', false);
   });
 
   it('makes user an admin', async () => {
-    nconfStub.withArgs('DEBUG_ENABLED').returns(true);
     await user.post('/debug/make-admin');
 
     await user.sync();
@@ -30,7 +23,7 @@ describe('POST /debug/make-admin', () => {
   });
 
   it('returns error when not in production mode', async () => {
-    nconfStub.withArgs('DEBUG_ENABLED').returns(false);
+    nconf.set('IS_PROD', true);
 
     await expect(user.post('/debug/make-admin'))
       .eventually.be.rejected.and.to.deep.equal({

test/api/v3/integration/debug/POST-debug_modify-inventory.test.js

@@ -8,7 +8,6 @@ import {
 describe('POST /debug/modify-inventory', () => {
   let user; let
     originalItems;
-  let nconfStub;
 
   before(async () => {
     originalItems = {
@@ -40,14 +39,8 @@ describe('POST /debug/modify-inventory', () => {
     });
   });
 
-  beforeEach(() => {
-    nconfStub = sandbox.stub(nconf, 'get');
-    nconfStub.withArgs('DEBUG_ENABLED').returns(true);
-    nconfStub.withArgs('BASE_URL').returns('https://example.com');
-  });
-
   afterEach(() => {
-    nconfStub.restore();
+    nconf.set('IS_PROD', false);
   });
 
   it('sets equipment', async () => {
@@ -156,7 +149,7 @@ describe('POST /debug/modify-inventory', () => {
   });
 
   it('returns error when not in production mode', async () => {
-    nconfStub.withArgs('DEBUG_ENABLED').returns(false);
+    nconf.set('IS_PROD', true);
 
     await expect(user.post('/debug/modify-inventory'))
       .eventually.be.rejected.and.to.deep.equal({

test/api/v3/integration/debug/POST-debug_quest-progress.test.js

@@ -5,20 +5,13 @@ import {
 
 describe('POST /debug/quest-progress', () => {
   let user;
-  let nconfStub;
 
   beforeEach(async () => {
     user = await generateUser();
   });
 
-  beforeEach(() => {
-    nconfStub = sandbox.stub(nconf, 'get');
-    nconfStub.withArgs('DEBUG_ENABLED').returns(true);
-    nconfStub.withArgs('BASE_URL').returns('https://example.com');
-  });
-
   afterEach(() => {
-    nconfStub.restore();
+    nconf.set('IS_PROD', false);
   });
 
   it('errors if user is not on a quest', async () => {
@@ -55,7 +48,7 @@ describe('POST /debug/quest-progress', () => {
   });
 
   it('returns error when not in production mode', async () => {
-    nconfStub.withArgs('DEBUG_ENABLED').returns(false);
+    nconf.set('IS_PROD', true);
 
     await expect(user.post('/debug/quest-progress'))
       .eventually.be.rejected.and.to.deep.equal({