4.41.6

.github/CONTRIBUTING.md

@@ -4,7 +4,7 @@
 
 # Pull Request
 
-[Please see these instructions for adding a pull request](http://habitica.fandom.com/wiki/Using_Your_Local_Install_to_Modify_Habitica%27s_Website_and_API)
+[Please see these instructions for adding a pull request](http://habitica.wikia.com/wiki/Using_Your_Local_Install_to_Modify_Habitica%27s_Website_and_API)
 
 # Requesting a feature
 
@@ -12,4 +12,4 @@ Habitica uses [Trello](https://trello.com/b/EpoYEYod/habitica) to track feature
 
 # Contributing Code
 
-See [Contributing to Habitica](http://habitica.fandom.com/wiki/Contributing_to_Habitica#Coders_.28Web_.26_Mobile.29)
+See [Contributing to Habitica](http://habitica.wikia.com/wiki/Contributing_to_Habitica#Coders_.28Web_.26_Mobile.29)

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,7 +1,7 @@
-[//]: # (Note: See http://habitica.fandom.com/wiki/Using_Your_Local_Install_to_Modify_Habitica%27s_Website_and_API for more info)
+[//]: # (Note: See http://habitica.wikia.com/wiki/Using_Your_Local_Install_to_Modify_Habitica%27s_Website_and_API for more info)
 
-[//]: # (Put Issue # here, if applicable. This will automatically close the issue if your PR is merged in)
-Fixes put_#_and_issue_numer_here
+[//]: # (Put Issue # or URL here, if applicable. This will automatically close the issue if your PR is merged in)
+Fixes put_issue_url_here
 
 ### Changes
 [//]: # (Describe the changes that were made in detail here. Include pictures if necessary)

.gitignore

@@ -39,8 +39,6 @@ dist-client
 test/client/unit/coverage
 test/client/e2e/reports
 test/client-old/spec/mocks/translations.js
-yarn.lock
-.gitattributes
 
 # Elastic Beanstalk Files
 .elasticbeanstalk/*

.nvmrc

@@ -1 +1 @@
-10
+8

.travis.yml

@@ -1,6 +1,6 @@
 language: node_js
 node_js:
-  - '10'
+  - '8'
 services:
   - mongodb
 cache:
@@ -20,9 +20,8 @@ env:
     - DISABLE_REQUEST_LOGGING=true
   matrix:
     - TEST="lint"
-    - TEST="test:api:unit" REQUIRES_SERVER=true COVERAGE=true
+    - TEST="test:api-v3:unit" REQUIRES_SERVER=true COVERAGE=true
     - TEST="test:api-v3:integration" REQUIRES_SERVER=true COVERAGE=true
-    - TEST="test:api-v4:integration" REQUIRES_SERVER=true COVERAGE=true
     - TEST="test:sanity"
     - TEST="test:content" COVERAGE=true
     - TEST="test:common" COVERAGE=true

Dockerfile

@@ -1,30 +1,18 @@
-FROM node:10
-
-ENV ADMIN_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
-
-# 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 https://github.com/HabitRPG/habitica.git /usr/src/habitrpg
-RUN npm install
-RUN gulp build:prod --force
-
-# Create Build dir
-RUN mkdir -p ./website/build
-
-# Start Habitica
-EXPOSE 3000
-CMD ["node", "./website/transpiled-babel/index.js"]
+FROM node:8
+
+# 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 https://github.com/HabitRPG/habitica.git /usr/src/habitrpg
+RUN cp config.json.example config.json
+RUN npm install
+
+# Create Build dir
+RUN mkdir -p ./website/build
+
+# Start Habitica
+EXPOSE 3000
+CMD ["npm", "start"]

Dockerfile-Dev

@@ -1,18 +0,0 @@
-FROM node:10
-
-# 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 https://github.com/HabitRPG/habitica.git /usr/src/habitrpg
-RUN cp config.json.example config.json
-RUN npm install
-
-# Create Build dir
-RUN mkdir -p ./website/build
-
-# Start Habitica
-EXPOSE 3000
-CMD ["npm", "start"]

Dockerfile-Production

@@ -0,0 +1,29 @@
+FROM node:8
+
+ENV ADMIN_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 NODE_ENV production
+ENV STRIPE_PUB_KEY pk_85fQ0yMECHNfHTSsZoxZXlPSwSNfA
+
+# 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 v4.41.0 https://github.com/HabitRPG/habitica.git /usr/src/habitrpg
+RUN npm install
+RUN gulp build:prod --force
+
+# Create Build dir
+RUN mkdir -p ./website/build
+
+# Start Habitica
+EXPOSE 3000
+CMD ["node", "./website/transpiled-babel/index.js"]

README.md

@@ -7,6 +7,6 @@ Habitica [![Build Status](https://travis-ci.org/HabitRPG/habitica.svg?branch=dev
 
 We need more programmers! Your assistance will be greatly appreciated.
 
-For an introduction to the technologies used and how the software is organized, refer to [Guidance for Blacksmiths](http://habitica.fandom.com/wiki/Guidance_for_Blacksmiths).
+For an introduction to the technologies used and how the software is organized, refer to [Guidance for Blacksmiths](http://habitica.wikia.com/wiki/Guidance_for_Blacksmiths).
 
-To set up a local install of Habitica for development and testing on various platforms, see [Setting up Habitica Locally](http://habitica.fandom.com/wiki/Setting_up_Habitica_Locally).
+To set up a local install of Habitica for development and testing on various platforms, see [Setting up Habitica Locally](http://habitica.wikia.com/wiki/Setting_up_Habitica_Locally).

VAGRANT.md

@@ -8,4 +8,4 @@ minimal dependencies on the developer's local platform. It can be used
 on a variety of systems including Windows, Mac OS X, and Linux.
 
 Instructions for using the Habitica Vagrant environment are in
-[Setting up Habitica Locally](http://habitica.fandom.com/wiki/Setting_up_Habitica_Locally).
+[Setting up Habitica Locally](http://habitica.wikia.com/wiki/Setting_up_Habitica_Locally).

config.json.example

@@ -1,83 +1,116 @@
 {
-  "ADMIN_EMAIL": "you@example.com",
-  "AMAZON_PAYMENTS_CLIENT_ID": "CLIENT_ID",
-  "AMAZON_PAYMENTS_MODE": "sandbox",
-  "AMAZON_PAYMENTS_MWS_KEY": "MWS_KEY",
-  "AMAZON_PAYMENTS_MWS_SECRET": "MWS_SECRET",
-  "AMAZON_PAYMENTS_SELLER_ID": "SELLER_ID",
-  "AMPLITUDE_KEY": "AMPLITUDE_KEY",
-  "AMPLITUDE_SECRET": "AMPLITUDE_SECRET",
-  "BASE_URL": "http://localhost:3000",
-  "CRON_SAFE_MODE": "false",
-  "CRON_SEMI_SAFE_MODE": "false",
-  "DISABLE_REQUEST_LOGGING": "true",
-  "EMAILS_COMMUNITY_MANAGER_EMAIL": "admin@habitica.com",
-  "EMAILS_PRESS_ENQUIRY_EMAIL": "admin@habitica.com",
-  "EMAILS_TECH_ASSISTANCE_EMAIL": "admin@habitica.com",
-  "EMAIL_SERVER_AUTH_PASSWORD": "password",
-  "EMAIL_SERVER_AUTH_USER": "user",
-  "EMAIL_SERVER_URL": "http://example.com",
-  "ENABLE_CONSOLE_LOGS_IN_PROD": "false",
-  "ENABLE_CONSOLE_LOGS_IN_TEST": "false",
-  "FACEBOOK_KEY": "123456789012345",
-  "FACEBOOK_SECRET": "aaaabbbbccccddddeeeeffff00001111",
-  "FLAG_REPORT_EMAIL": "email@example.com, email2@example.com",
-  "GA_ID": "GA_ID",
-  "GOOGLE_CLIENT_ID": "123456789012345",
-  "GOOGLE_CLIENT_SECRET": "aaaabbbbccccddddeeeeffff00001111",
-  "IAP_GOOGLE_KEYDIR": "/path/to/google/public/key/dir/",
-  "IGNORE_REDIRECT": "true",
-  "ITUNES_SHARED_SECRET": "aaaabbbbccccddddeeeeffff00001111",
-  "LOGGLY_CLIENT_TOKEN": "token",
-  "LOGGLY_SUBDOMAIN": "example-subdomain",
-  "LOGGLY_TOKEN": "example-token",
-  "MAINTENANCE_MODE": "false",
-  "NODE_DB_URI": "mongodb://localhost/habitrpg",
-  "NODE_ENV": "development",
-  "PATH": "bin:node_modules/.bin:/usr/local/bin:/usr/bin:/bin",
-  "PAYPAL_BILLING_PLANS_basic_12mo": "basic_12mo",
-  "PAYPAL_BILLING_PLANS_basic_3mo": "basic_3mo",
-  "PAYPAL_BILLING_PLANS_basic_6mo": "basic_6mo",
-  "PAYPAL_BILLING_PLANS_basic_earned": "basic_earned",
-  "PAYPAL_BILLING_PLANS_google_6mo": "google_6mo",
-  "PAYPAL_CLIENT_ID": "client_id",
-  "PAYPAL_CLIENT_SECRET": "client_secret",
-  "PAYPAL_EXPERIENCE_PROFILE_ID": "xp_profile_id",
-  "PAYPAL_MODE": "sandbox",
-  "PLAY_API_ACCESS_TOKEN": "aaaabbbbccccddddeeeeffff00001111",
-  "PLAY_API_CLIENT_ID": "aaaabbbbccccddddeeeeffff00001111",
-  "PLAY_API_CLIENT_SECRET": "aaaabbbbccccddddeeeeffff00001111",
-  "PLAY_API_REFRESH_TOKEN": "aaaabbbbccccddddeeeeffff00001111",
-  "PORT": 3000,
-  "PUSH_CONFIGS_APN_ENABLED": "false",
-  "PUSH_CONFIGS_APN_KEY": "xxxxxxxxxx",
-  "PUSH_CONFIGS_APN_KEY_ID": "xxxxxxxxxx",
-  "PUSH_CONFIGS_APN_TEAM_ID": "aaabbbcccd",
-  "PUSH_CONFIGS_FCM_SERVER_API_KEY": "aaabbbcccd",
-  "S3_ACCESS_KEY_ID": "accessKeyId",
-  "S3_BUCKET": "bucket",
-  "S3_SECRET_ACCESS_KEY": "secretAccessKey",
-  "SESSION_SECRET": "YOUR SECRET HERE",
-  "SESSION_SECRET_IV": "12345678912345678912345678912345",
-  "SESSION_SECRET_KEY": "1234567891234567891234567891234567891234567891234567891234567891",
-  "SITE_HTTP_AUTH_ENABLED": "false",
-  "SITE_HTTP_AUTH_PASSWORD": "password",
-  "SITE_HTTP_AUTH_USERNAME": "admin",
-  "SLACK_FLAGGING_FOOTER_LINK": "https://habitrpg.github.io/flag-o-rama/",
-  "SLACK_FLAGGING_URL": "https://hooks.slack.com/services/id/id/id",
-  "SLACK_SUBSCRIPTIONS_URL": "https://hooks.slack.com/services/id/id/id",
-  "SLACK_URL": "https://hooks.slack.com/services/some-url",
-  "SMTP_HOST": "example.com",
-  "SMTP_PASS": "password",
-  "SMTP_PORT": 587,
-  "SMTP_SERVICE": "Gmail",
-  "SMTP_TLS": "true",
-  "SMTP_USER": "user@example.com",
-  "STRIPE_API_KEY": "aaaabbbbccccddddeeeeffff00001111",
-  "STRIPE_PUB_KEY": "22223333444455556666777788889999",
-  "TEST_DB_URI": "mongodb://localhost/habitrpg_test",
-  "TRANSIFEX_SLACK_CHANNEL": "transifex",
-  "WEB_CONCURRENCY": 1,
-  "SKIP_SSL_CHECK_KEY": "key",
-  "ENABLE_STACKDRIVER_TRACING": "false"
+    "PORT":3000,
+    "ENABLE_CONSOLE_LOGS_IN_PROD":"false",
+    "IP":"0.0.0.0",
+    "WEB_CONCURRENCY":1,
+    "BASE_URL":"http://localhost:3000",
+    "FACEBOOK_KEY":"123456789012345",
+    "FACEBOOK_SECRET":"aaaabbbbccccddddeeeeffff00001111",
+    "GOOGLE_CLIENT_ID":"123456789012345",
+    "GOOGLE_CLIENT_SECRET":"aaaabbbbccccddddeeeeffff00001111",
+    "PLAY_API": {
+      "CLIENT_ID": "aaaabbbbccccddddeeeeffff00001111",
+      "CLIENT_SECRET": "aaaabbbbccccddddeeeeffff00001111",
+      "ACCESS_TOKEN":"aaaabbbbccccddddeeeeffff00001111",
+      "REFRESH_TOKEN":"aaaabbbbccccddddeeeeffff00001111"
+    },
+    "NODE_DB_URI":"mongodb://localhost/habitrpg",
+    "TEST_DB_URI":"mongodb://localhost/habitrpg_test",
+    "NODE_ENV":"development",
+    "ENABLE_CONSOLE_LOGS_IN_TEST": false,
+    "CRON_SAFE_MODE":"false",
+    "CRON_SEMI_SAFE_MODE":"false",
+    "MAINTENANCE_MODE": "false",
+    "SESSION_SECRET":"YOUR SECRET HERE",
+    "SESSION_SECRET_KEY": "1234567891234567891234567891234567891234567891234567891234567891",
+    "SESSION_SECRET_IV": "12345678912345678912345678912345",
+    "ADMIN_EMAIL": "you@example.com",
+    "SMTP_USER":"user@example.com",
+    "SMTP_PASS":"password",
+    "SMTP_SERVICE":"Gmail",
+    "SMTP_HOST":"example.com",
+    "SMTP_PORT": 587,
+    "SMTP_TLS": true,
+    "STRIPE_API_KEY":"aaaabbbbccccddddeeeeffff00001111",
+    "STRIPE_PUB_KEY":"22223333444455556666777788889999",
+    "NEW_RELIC_LICENSE_KEY":"NEW_RELIC_LICENSE_KEY",
+    "NEW_RELIC_NO_CONFIG_FILE":"true",
+    "NEW_RELIC_APPLICATION_ID":"NEW_RELIC_APPLICATION_ID",
+    "NEW_RELIC_API_KEY":"NEW_RELIC_API_KEY",
+    "GA_ID": "GA_ID",
+    "AMPLITUDE_KEY": "AMPLITUDE_KEY",
+    "AMAZON_PAYMENTS": {
+        "SELLER_ID": "SELLER_ID",
+        "CLIENT_ID": "CLIENT_ID",
+        "MWS_KEY": "",
+        "MWS_SECRET": ""
+    },
+    "FLAG_REPORT_EMAIL": "email@mod.com,email2@mod.com",
+    "EMAIL_SERVER": {
+        "url": "http://example.com",
+        "authUser": "user",
+        "authPassword": "password"
+    },
+    "S3":{
+        "bucket":"bucket",
+        "accessKeyId":"accessKeyId",
+        "secretAccessKey":"secretAccessKey"
+    },
+    "SLACK_URL": "https://hooks.slack.com/services/some-url",
+    "TRANSIFEX_SLACK_CHANNEL": "transifex",
+    "PAYPAL":{
+        "billing_plans": {
+            "basic_earned":"basic_earned",
+            "basic_3mo":"basic_3mo",
+            "basic_6mo":"basic_6mo",
+            "google_6mo":"google_6mo",
+            "basic_12mo":"basic_12mo"
+        },
+        "mode":"sandbox",
+        "client_id":"client_id",
+        "client_secret":"client_secret",
+        "experience_profile_id": ""
+    },
+    "IAP_GOOGLE_KEYDIR": "/path/to/google/public/key/dir/",
+    "LOGGLY_TOKEN": "token",
+    "LOGGLY_CLIENT_TOKEN": "token",
+    "LOGGLY_ACCOUNT": "account",
+    "PUSH_CONFIGS": {
+        "GCM_SERVER_API_KEY": "",
+        "APN_ENABLED": "false",
+        "FCM_SERVER_API_KEY": ""
+    },
+    "SITE_HTTP_AUTH": {
+        "ENABLED": "false",
+        "USERNAME": "admin",
+        "PASSWORD": "password"
+    },
+    "PUSHER": {
+        "ENABLED": "false",
+        "APP_ID": "appId",
+        "KEY": "key",
+        "SECRET": "secret"
+    },
+    "SLACK": {
+        "FLAGGING_URL": "https://hooks.slack.com/services/id/id/id",
+        "FLAGGING_FOOTER_LINK": "https://habitrpg.github.io/flag-o-rama/",
+        "SUBSCRIPTIONS_URL": "https://hooks.slack.com/services/id/id/id"
+    },
+    "ITUNES_SHARED_SECRET": "aaaabbbbccccddddeeeeffff00001111",
+    "EMAILS" : {
+        "COMMUNITY_MANAGER_EMAIL" : "admin@habitica.com",
+        "TECH_ASSISTANCE_EMAIL" : "admin@habitica.com",
+        "PRESS_ENQUIRY_EMAIL" : "admin@habitica.com"
+    },
+    "LOGGLY" : {
+        "TOKEN" : "example-token",
+        "SUBDOMAIN" : "exmaple-subdomain"
+    },
+    "KAFKA": {
+      "GROUP_ID": "",
+      "CLOUDKARAFKA_BROKERS": "",
+      "CLOUDKARAFKA_USERNAME": "",
+      "CLOUDKARAFKA_PASSWORD": "",
+      "CLOUDKARAFKA_TOPIC_PREFIX": ""
+    }
 }

database_reports/20180607_subscriber_histories.js

@@ -1,100 +0,0 @@
-import max from 'lodash/max';
-import mean from 'lodash/mean';
-import monk from 'monk';
-import round from 'lodash/round';
-import sum from 'lodash/sum';
-
-/*
- * Output data on subscribers' task histories, formatted for CSV.
- * User ID,Count of Dailies,Count of Habits,Total History Size,Max History Size,Mean History Size,Median History Size
- */
-const connectionString = 'mongodb://localhost:27017/habitrpg?auto_reconnect=true'; // FOR TEST DATABASE
-
-let dbUsers = monk(connectionString).get('users', { castIds: false });
-let dbTasks = monk(connectionString).get('tasks', { castIds: false });
-
-function usersReport () {
-  let allHistoryLengths = [];
-
-  console.info('User ID,Count of Dailies,Count of Habits,Total History Size,Max History Size,Mean History Size,Median History Size');
-
-  dbUsers.find(
-    {
-      $and:
-        [
-          {'purchased.plan.planId': {$ne:null}},
-          {'purchased.plan.planId': {$ne:''}},
-        ],
-      $or:
-        [
-          {'purchased.plan.dateTerminated': null},
-          {'purchased.plan.dateTerminated': ''},
-          {'purchased.plan.dateTerminated': {$gt:new Date()}},
-        ],
-    },
-    {
-      fields: {_id: 1},
-    }
-  ).each((user, {close, pause, resume}) => {
-    let historyLengths = [];
-    let habitCount = 0;
-    let dailyCount = 0;
-
-    pause();
-    return dbTasks.find(
-      {
-        userId: user._id,
-        $or:
-          [
-            {type: 'habit'},
-            {type: 'daily'},
-          ],
-      },
-      {
-        fields: {
-          type: 1,
-          history: 1,
-        },
-      }
-    ).each((task) => {
-      if (task.type === 'habit') {
-        habitCount++;
-      }
-      if (task.type === 'daily') {
-        dailyCount++;
-      }
-      if (task.history.length > 0) {
-        allHistoryLengths.push(task.history.length);
-        historyLengths.push(task.history.length);
-      }
-    }).then(() => {
-      const totalHistory = sum(historyLengths);
-      const maxHistory = historyLengths.length > 0 ? max(historyLengths) : 0;
-      const meanHistory = historyLengths.length > 0 ? round(mean(historyLengths)) : 0;
-      const medianHistory = historyLengths.length > 0 ? median(historyLengths) : 0;
-      console.info(`${user._id},${dailyCount},${habitCount},${totalHistory},${maxHistory},${meanHistory},${medianHistory}`);
-      resume();
-    });
-  }).then(() => {
-    console.info(`Total Subscriber History Entries: ${sum(allHistoryLengths)}`);
-    console.info(`Largest History Size: ${max(allHistoryLengths)}`);
-    console.info(`Mean History Size: ${round(mean(allHistoryLengths))}`);
-    console.info(`Median History Size: ${median(allHistoryLengths)}`);
-    return process.exit(0);
-  });
-}
-
-function median(values) { // https://gist.github.com/caseyjustus/1166258
-  values.sort( function(a,b) {return a - b;} );
-
-  var half = Math.floor(values.length/2);
-
-  if (values.length % 2) {
-    return values[half];
-  }
-  else {
-    return (values[half-1] + values[half]) / 2.0;
-  }
-}
-
-module.exports = usersReport;

database_reports/20181001_backtoschool_challenge.js

@@ -1,48 +0,0 @@
-import monk from 'monk';
-import nconf from 'nconf';
-
-/*
- * Output data on users who completed all the To-Do tasks in the 2018 Back-to-School Challenge.
- * User ID,Profile Name
- */
-const CONNECTION_STRING = nconf.get('MIGRATION_CONNECT_STRING');
-const CHALLENGE_ID = '0acb1d56-1660-41a4-af80-9259f080b62b';
-
-let dbUsers = monk(CONNECTION_STRING).get('users', { castIds: false });
-let dbTasks = monk(CONNECTION_STRING).get('tasks', { castIds: false });
-
-function usersReport() {
-  console.info('User ID,Profile Name');
-  let userCount = 0;
-
-  dbUsers.find(
-    {challenges: CHALLENGE_ID},
-    {fields:
-      {_id: 1, 'profile.name': 1}
-    },
-  ).each((user, {close, pause, resume}) => {
-    pause();
-    userCount++;
-    let completedTodos = 0;
-    return dbTasks.find(
-      {
-        userId: user._id,
-        'challenge.id': CHALLENGE_ID,
-        type: 'todo',
-      },
-      {fields: {completed: 1}}
-    ).each((task) => {
-      if (task.completed) completedTodos++;
-    }).then(() => {
-      if (completedTodos >= 7) {
-        console.info(`${user._id},${user.profile.name}`);
-      }
-      resume();
-    });
-  }).then(() => {
-    console.info(`${userCount} users reviewed`);
-    return process.exit(0);
-  });
-}
-
-module.exports = usersReport;

docker-compose.dev.yml

@@ -2,13 +2,9 @@ version: "3"
 services:
 
   client:
-    environment:
-      - NODE_ENV=development
     volumes:
       - '.:/usr/src/habitrpg'
 
   server:
-    environment:
-      - NODE_ENV=development
     volumes:
       - '.:/usr/src/habitrpg'

gulp/gulp-tests.js

@@ -165,9 +165,9 @@ gulp.task('test:content:safe', gulp.series('test:prepare:build', (cb) => {
   pipe(runner);
 }));
 
-gulp.task('test:api:unit', (done) => {
+gulp.task('test:api-v3:unit', (done) => {
   let runner = exec(
-    testBin('istanbul cover --dir coverage/api-unit node_modules/mocha/bin/_mocha -- test/api/unit --recursive --require ./test/helpers/start-server'),
+    testBin('node_modules/.bin/istanbul cover --dir coverage/api-v3-unit --report lcovonly node_modules/mocha/bin/_mocha -- test/api/v3/unit --recursive --require ./test/helpers/start-server'),
     (err) => {
       if (err) {
         process.exit(1);
@@ -179,13 +179,13 @@ gulp.task('test:api:unit', (done) => {
   pipe(runner);
 });
 
-gulp.task('test:api:unit:watch', () => {
-  return gulp.watch(['website/server/libs/*', 'test/api/unit/**/*', 'website/server/controllers/**/*'], gulp.series('test:api:unit', done => done()));
+gulp.task('test:api-v3:unit:watch', () => {
+  return gulp.watch(['website/server/libs/*', 'test/api/v3/unit/**/*', 'website/server/controllers/**/*'], gulp.series('test:api-v3:unit', done => done()));
 });
 
 gulp.task('test:api-v3:integration', (done) => {
   let runner = exec(
-    testBin('istanbul cover --dir coverage/api-v3-integration --report lcovonly node_modules/mocha/bin/_mocha -- test/api/v3/integration --recursive --require ./test/helpers/start-server'),
+    testBin('node_modules/.bin/istanbul cover --dir coverage/api-v3-integration --report lcovonly node_modules/mocha/bin/_mocha -- test/api/v3/integration --recursive --require ./test/helpers/start-server'),
     {maxBuffer: 500 * 1024},
     (err) => {
       if (err) {
@@ -215,43 +215,17 @@ gulp.task('test:api-v3:integration:separate-server', (done) => {
   pipe(runner);
 });
 
-gulp.task('test:api-v4:integration', (done) => {
-  let runner = exec(
-    testBin('istanbul cover --dir coverage/api-v4-integration --report lcovonly node_modules/mocha/bin/_mocha -- test/api/v4 --recursive --require ./test/helpers/start-server'),
-    {maxBuffer: 500 * 1024},
-    (err) => {
-      if (err) {
-        process.exit(1);
-      }
-      done();
-    }
-  );
-
-  pipe(runner);
-});
-
-gulp.task('test:api-v4:integration:separate-server', (done) => {
-  let runner = exec(
-    testBin('mocha test/api/v4 --recursive --require ./test/helpers/start-server', 'LOAD_SERVER=0'),
-    {maxBuffer: 500 * 1024},
-    (err) => done(err)
-  );
-
-  pipe(runner);
-});
-
 gulp.task('test', gulp.series(
   'test:sanity',
   'test:content',
   'test:common',
-  'test:api:unit',
+  'test:api-v3:unit',
   'test:api-v3:integration',
-  'test:api-v4:integration',
   done => done()
 ));
 
 gulp.task('test:api-v3', gulp.series(
-  'test:api:unit',
+  'test:api-v3:unit',
   'test:api-v3:integration',
   done => done()
 ));

migrations/archive/2017/20170111_announce_collection_quest_change_in_parties.js

@@ -19,7 +19,7 @@ const Timer = require('./utils/timer');
 const connectToDb = require('./utils/connect').connectToDb;
 const closeDb = require('./utils/connect').closeDb;
 
-const message = '`This party\'s collection quest has been made easier! For details, refer to http://habitica.fandom.com/wiki/User_blog:LadyAlys/Collection_Quests_are_Now_Easier`';
+const message = '`This party\'s collection quest has been made easier! For details, refer to http://habitica.wikia.com/wiki/User_blog:LadyAlys/Collection_Quests_are_Now_Easier`';
 
 const timer = new Timer();
 

migrations/archive/2018/20180724_summer_splash_orcas.js

@@ -1,99 +0,0 @@
-let migrationName = '20180724_summer-splash-orcas.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 ladder items to participants in this year's Summer Splash festivities
- */
-
-import monk from 'monk';
-import nconf from 'nconf';
-const CONNECTION_STRING = nconf.get('MIGRATION_CONNECT_STRING');
-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},
-    'auth.timestamps.loggedin': {$gt: new Date('2018-07-01')}, // rerun without date restriction after initial run
-  };
-
-  if (lastId) {
-    query._id = {
-      $gt: lastId,
-    };
-  }
-
-  dbUsers.find(query, {
-    sort: {_id: 1},
-    limit: 250,
-    fields: [
-      'items.mounts',
-    ], // 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 = {};
-
-  if (user && user.items && user.items.pets && typeof user.items.pets['Orca-Base'] !== 'undefined') {
-    set = {migration: migrationName};
-  } else if (user && user.items && user.items.mounts && typeof user.items.mounts['Orca-Base'] !== 'undefined') {
-    set = {migration: migrationName, 'items.pets.Orca-Base': 5};
-  } else {
-    set = {migration: migrationName, 'items.mounts.Orca-Base': true};
-  }
-
-  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/archive/2018/20180731_naming_day.js

@@ -1,123 +0,0 @@
-let migrationName = '20180731_naming-day.js'; // Update when running in future years
-let authorName = 'Sabe'; // in case script author needs to know when their ...
-let authorUuid = '7f14ed62-5408-4e1b-be83-ada62d504931'; // ... own data is done
-
-/*
- * Award Naming Day ladder items to participants in this month's Naming Day festivities
- */
-
-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},
-  };
-
-  if (lastId) {
-    query._id = {
-      $gt: lastId,
-    };
-  }
-
-  dbUsers.find(query, {
-    sort: {_id: 1},
-    limit: 250,
-    fields: [
-      'items.gear.owned',
-      'items.mounts',
-      'items.pets',
-    ], // 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;
-
-  const inc = {
-    'items.food.Cake_Base': 1,
-    'items.food.Cake_CottonCandyBlue': 1,
-    'items.food.Cake_CottonCandyPink': 1,
-    'items.food.Cake_Desert': 1,
-    'items.food.Cake_Golden': 1,
-    'items.food.Cake_Red': 1,
-    'items.food.Cake_Shade': 1,
-    'items.food.Cake_Skeleton': 1,
-    'items.food.Cake_White': 1,
-    'items.food.Cake_Zombie': 1,
-    'achievements.habiticaDays': 1,
-  };
-
-  if (user && user.items && user.items.gear && user.items.gear.owned && typeof user.items.gear.owned.head_special_namingDay2017 !== 'undefined') {
-    set = {migration: migrationName, 'items.gear.owned.body_special_namingDay2018': false};
-    push = {pinnedItems: {type: 'marketGear', path: 'gear.flat.body_special_namingDay2018', _id: monk.id()}};
-  } else if (user && user.items && user.items.pets && typeof user.items.pets['Gryphon-RoyalPurple'] !== 'undefined') {
-    set = {migration: migrationName, 'items.gear.owned.head_special_namingDay2017': false};
-    push = {pinnedItems: {type: 'marketGear', path: 'gear.flat.head_special_namingDay2017', _id: monk.id()}};
-  } else if (user && user.items && user.items.mounts && typeof user.items.mounts['Gryphon-RoyalPurple'] !== 'undefined') {
-    set = {migration: migrationName, 'items.pets.Gryphon-RoyalPurple': 5};
-  } else {
-    set = {migration: migrationName, 'items.mounts.Gryphon-RoyalPurple': true};
-  }
-
-  if (push) {
-    dbUsers.update({_id: user._id}, {$set: set, $push: push, $inc: inc});
-  } else {
-    dbUsers.update({_id: user._id}, {$set: set, $inc: inc});
-  }
-
-  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/archive/2018/20180811_inboxOutsideUser.js

@@ -1,147 +0,0 @@
-const migrationName = '20180811_inboxOutsideUser.js';
-const authorName = 'paglias'; // in case script author needs to know when their ...
-const authorUuid = 'ed4c688c-6652-4a92-9d03-a5a79844174a'; // ... own data is done
-
-/*
- * Move inbox messages from the user model to their own collection
- */
-
-const monk = require('monk');
-const nconf = require('nconf');
-const uuid = require('uuid').v4;
-
-const Inbox = require('../website/server/models/message').inboxModel;
-const connectionString = nconf.get('MIGRATION_CONNECT_STRING'); // FOR TEST DATABASE
-const dbInboxes = monk(connectionString).get('inboxes', { castIds: false });
-const dbUsers = monk(connectionString).get('users', { castIds: false });
-
-function processUsers (lastId) {
-  let query = {
-    migration: {$ne: migrationName},
-  };
-
-  if (lastId) {
-    query._id = {
-      $gt: lastId,
-    };
-  }
-
-  dbUsers.find(query, {
-    sort: {_id: 1},
-    limit: 1000,
-    fields: ['_id', 'inbox'],
-  })
-    .then(updateUsers)
-    .catch((err) => {
-      console.log(err);
-      return exiting(1, `ERROR! ${  err}`);
-    });
-}
-
-let progressCount = 1000;
-let count = 0;
-let msgCount = 0;
-
-function updateUsers (users) {
-  if (!users || users.length === 0) {
-    console.warn('All appropriate users and their tasks found and modified.');
-    displayData();
-    return;
-  }
-
-  let usersPromises = users.map(updateUser);
-  let lastUser = users[users.length - 1];
-
-  return Promise.all(usersPromises)
-    .then(() => {
-      return processUsers(lastUser._id);
-    });
-}
-
-function updateUser (user) {
-  count++;
-
-  if (count % progressCount === 0) console.warn(`${count  } ${  user._id}`);
-  if (msgCount % progressCount === 0) console.warn(`${msgCount  } messages processed`);
-  if (user._id === authorUuid) console.warn(`${authorName  } being processed`);
-
-  const oldInboxMessages = user.inbox.messages || {};
-  const oldInboxMessagesIds = Object.keys(oldInboxMessages);
-
-  msgCount += oldInboxMessagesIds.length;
-
-  const newInboxMessages = oldInboxMessagesIds.map(msgId => {
-    const msg = oldInboxMessages[msgId];
-    if (!msg || (!msg.id && !msg._id)) { // eslint-disable-line no-extra-parens
-      console.log('missing message or message _id and id', msg);
-      throw new Error('error!');
-    }
-
-    if (msg.id && !msg._id) msg._id = msg.id;
-    if (msg._id && !msg.id) msg.id = msg._id;
-
-    const newMsg = new Inbox(msg);
-    newMsg.ownerId = user._id;
-    return newMsg.toJSON();
-  });
-
-  const promises = newInboxMessages.map(newMsg => {
-    return (async function fn () {
-      const existing = await dbInboxes.find({_id: newMsg._id});
-
-      if (existing.length > 0) {
-        if (
-          existing[0].ownerId === newMsg.ownerId &&
-          existing[0].text === newMsg.text &&
-          existing[0].uuid === newMsg.uuid &&
-          existing[0].sent === newMsg.sent
-        ) {
-          return null;
-        }
-
-        newMsg.id = newMsg._id = uuid();
-      }
-
-      return newMsg;
-    })();
-  });
-
-  return Promise.all(promises)
-    .then((filteredNewMsg) => {
-      filteredNewMsg = filteredNewMsg.filter(m => Boolean(m && m.id && m._id && m.id == m._id));
-      return dbInboxes.insert(filteredNewMsg);
-    }).then(() => {
-      return dbUsers.update({_id: user._id}, {
-        $set: {
-          migration: migrationName,
-          'inbox.messages': {},
-        },
-      });
-    }).catch((err) => {
-      console.log(err);
-      return exiting(1, `ERROR! ${  err}`);
-    });
-}
-
-function displayData () {
-  console.warn(`\n${  count  } users processed\n`);
-  console.warn(`\n${  msgCount  } messages 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/archive/2018/20181001_generate_usernames.js

@@ -1,99 +0,0 @@
-let authorName = 'Sabe'; // in case script author needs to know when their ...
-let authorUuid = '7f14ed62-5408-4e1b-be83-ada62d504931'; // ... own data is done
-
-/*
- * Generate usernames for users who lack them
- */
-
-import monk from 'monk';
-import nconf from 'nconf';
-import { generateUsername } from '../../website/server/libs/auth/utils';
-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 = {
-    'auth.local.username': {$exists: false},
-    'auth.timestamps.loggedin': {$gt: new Date('2018-04-01')}, // Initial coverage for users active within last 6 months
-  };
-
-  if (lastId) {
-    query._id = {
-      $gt: lastId,
-    };
-  }
-
-  dbUsers.find(query, {
-    sort: {_id: 1},
-    limit: 250,
-    fields: [
-      'auth',
-    ], // 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++;
-
-  if (!user.auth.local.username) {
-    const newName = generateUsername();
-    dbUsers.update(
-      {_id: user._id},
-      {$set:
-        {
-          'auth.local.username': newName,
-          'auth.local.lowerCaseUsername': newName,
-        },
-      }
-    );
-  }
-  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/archive/2018/20181002_username_email.js

@@ -1,107 +0,0 @@
-const MIGRATION_NAME = '20181003_username_email.js';
-let authorName = 'Sabe'; // in case script author needs to know when their ...
-let authorUuid = '7f14ed62-5408-4e1b-be83-ada62d504931'; // ... own data is done
-
-/*
- * Send emails to eligible users announcing upcoming username changes
- */
-
-import monk from 'monk';
-import nconf from 'nconf';
-import { sendTxn } from '../../website/server/libs/email';
-const CONNECTION_STRING = nconf.get('MIGRATION_CONNECT_STRING');
-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: MIGRATION_NAME},
-    'auth.timestamps.loggedin': {$gt: new Date('2018-04-01')},
-  };
-
-  if (lastId) {
-    query._id = {
-      $gt: lastId,
-    };
-  }
-
-  dbUsers.find(query, {
-    sort: {_id: 1},
-    limit: 100,
-    fields: [
-      '_id',
-      'auth',
-      'preferences',
-      'profile',
-    ], // 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(() => delay(7000))
-    .then(() => {
-      processUsers(lastUser._id);
-    });
-}
-
-function updateUser (user) {
-  count++;
-
-  dbUsers.update({_id: user._id}, {$set: {migration: MIGRATION_NAME}});
-
-  sendTxn(
-    user,
-    'username-change',
-    [{name: 'UNSUB_EMAIL_TYPE_URL', content: '/user/settings/notifications?unsubFrom=importantAnnouncements'},
-     {name: 'LOGIN_NAME', content: user.auth.local.username}]
-  );
-
-  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 delay (t, v) {
-  return new Promise(function batchPause (resolve) {
-    setTimeout(resolve.bind(null, v), t);
-  });
-}
-
-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/archive/2018/20181023_veteran_pet_ladder.js

@@ -1,66 +0,0 @@
-/* eslint-disable no-console */
-const MIGRATION_NAME = '20181023_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 = {};
-
-  set.migration = MIGRATION_NAME;
-
-  if (user.items.pets['Bear-Veteran']) {
-    set['items.pets.Fox-Veteran'] = 5;
-  } else if (user.items.pets['Lion-Veteran']) {
-    set['items.pets.Bear-Veteran'] = 5;
-  } else if (user.items.pets['Tiger-Veteran']) {
-    set['items.pets.Lion-Veteran'] = 5;
-  } else if (user.items.pets['Wolf-Veteran']) {
-    set['items.pets.Tiger-Veteran'] = 5;
-  } else {
-    set['items.pets.Wolf-Veteran'] = 5;
-  }
-
-  if (count % progressCount === 0) console.warn(`${count} ${user._id}`);
-
-  return await User.update({_id: user._id}, {$set: set}).exec();
-}
-
-module.exports = async function processUsers () {
-  let query = {
-    migration: {$ne: MIGRATION_NAME},
-    'flags.verifiedUsername': true,
-  };
-
-  const fields = {
-    _id: 1,
-    items: 1,
-    migration: 1,
-    flags: 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/archive/2018/20181030_habitoween_ladder.js

@@ -1,116 +0,0 @@
-/*
- * Award Habitoween ladder items to participants in this month's Habitoween festivities
- */
-
-import monk from 'monk';
-import nconf from 'nconf';
-const MIGRATION_NAME = '20181030_habitoween_ladder.js'; // Update when running in future years
-const CONNECTION_STRING = nconf.get('MIGRATION_CONNECT_STRING');
-const AUTHOR_NAME = 'Sabe'; // in case script author needs to know when their ...
-const AUTHOR_UUID = '7f14ed62-5408-4e1b-be83-ada62d504931'; // ... own data is done
-
-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: MIGRATION_NAME},
-    'auth.timestamps.loggedin': {$gt: new Date('2018-10-01')},
-  };
-
-  if (lastId) {
-    query._id = {
-      $gt: lastId,
-    };
-  }
-
-  dbUsers.find(query, {
-    sort: {_id: 1},
-    limit: 250,
-    fields: [
-      'items.mounts',
-      'items.pets',
-    ], // 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}`);
-    });
-}
-
-const PROGRESS_COUNT = 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 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,
-  };
-
-  if (user && user.items && user.items.pets && user.items.mounts['JackOLantern-Ghost']) {
-    set['items.pets.JackOLantern-Glow'] = 5;
-  } else if (user && user.items && user.items.pets && user.items.pets['JackOLantern-Ghost']) {
-    set['items.mounts.JackOLantern-Ghost'] = true;
-  } else if (user && user.items && user.items.mounts && user.items.mounts['JackOLantern-Base']) {
-    set['items.pets.JackOLantern-Ghost'] = 5;
-  } else if (user && user.items && user.items.pets && user.items.pets['JackOLantern-Base']) {
-    set['items.mounts.JackOLantern-Base'] = true;
-  } else {
-    set['items.pets.JackOLantern-Base'] = 5;
-  }
-
-  dbUsers.update({_id: user._id}, {$set: set, $inc: inc});
-
-  if (count % PROGRESS_COUNT === 0) console.warn(`${count} ${user._id}`);
-  if (user._id === AUTHOR_UUID) console.warn(`${AUTHOR_NAME} 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/archive/2018/20181108_username_email.js

@@ -1,109 +0,0 @@
-const MIGRATION_NAME = '20181108_username_email.js';
-const AUTHOR_NAME = 'Sabe'; // in case script author needs to know when their ...
-const AUTHOR_UUID = '7f14ed62-5408-4e1b-be83-ada62d504931'; // ... own data is done
-
-/*
- * Send emails to eligible users announcing upcoming username changes
- */
-
-import monk from 'monk';
-import nconf from 'nconf';
-import { sendTxn } from '../../../website/server/libs/email';
-const CONNECTION_STRING = nconf.get('MIGRATION_CONNECT_STRING');
-const BASE_URL = nconf.get('BASE_URL');
-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: MIGRATION_NAME},
-    'flags.verifiedUsername': {$ne: true},
-    'auth.timestamps.loggedin': {$gt: new Date('2018-10-25')},
-  };
-
-  if (lastId) {
-    query._id = {
-      $gt: lastId,
-    };
-  }
-
-  dbUsers.find(query, {
-    sort: {_id: 1},
-    limit: 100,
-    fields: [
-      '_id',
-      'auth',
-      'preferences',
-      'profile',
-    ], // 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(() => delay(7000))
-    .then(() => {
-      processUsers(lastUser._id);
-    });
-}
-
-function updateUser (user) {
-  count++;
-
-  dbUsers.update({_id: user._id}, {$set: {migration: MIGRATION_NAME}});
-
-  sendTxn(
-    user,
-    'username-change-follow-up',
-    [{name: 'LOGIN_NAME', content: user.auth.local.username},
-     {name: 'BASE_URL', content: BASE_URL}]
-  );
-
-  if (count % progressCount === 0) console.warn(`${count} ${user._id}`);
-  if (user._id === AUTHOR_UUID) console.warn(`${AUTHOR_NAME} processed`);
-}
-
-function displayData () {
-  console.warn(`\n${count} users processed\n`);
-  return exiting(0);
-}
-
-function delay (t, v) {
-  return new Promise(function batchPause (resolve) {
-    setTimeout(resolve.bind(null, v), t);
-  });
-}
-
-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/archive/2018/20181122_turkey_day.js

@@ -1,109 +0,0 @@
-/* eslint-disable no-console */
-const MIGRATION_NAME = '20181122_turkey_day';
-import mongoose from 'mongoose';
-import { model as User } from '../../website/server/models/user';
-
-const progressCount = 1000;
-let count = 0;
-
-async function updateUser (user) {
-  count++;
-
-  const set = {};
-  let push;
-
-  set.migration = MIGRATION_NAME;
-
-  if (typeof user.items.gear.owned.armor_special_turkeyArmorBase !== 'undefined') {
-    set['items.gear.owned.head_special_turkeyHelmGilded'] = false;
-    set['items.gear.owned.armor_special_turkeyArmorGilded'] = false;
-    set['items.gear.owned.back_special_turkeyTailGilded'] = false;
-    push = [
-      {
-        type: 'marketGear',
-        path: 'gear.flat.head_special_turkeyHelmGilded',
-        _id: new mongoose.Types.ObjectId(),
-      },
-      {
-        type: 'marketGear',
-        path: 'gear.flat.armor_special_turkeyArmorGilded',
-        _id: new mongoose.Types.ObjectId(),
-      },
-      {
-        type: 'marketGear',
-        path: 'gear.flat.back_special_turkeyTailGilded',
-        _id: new mongoose.Types.ObjectId(),
-      },
-    ];
-  } else if (user.items && user.items.mounts && user.items.mounts['Turkey-Gilded']) {
-    set['items.gear.owned.head_special_turkeyHelmBase'] = false;
-    set['items.gear.owned.armor_special_turkeyArmorBase'] = false;
-    set['items.gear.owned.back_special_turkeyTailBase'] = false;
-    push = [
-      {
-        type: 'marketGear',
-        path: 'gear.flat.head_special_turkeyHelmBase',
-        _id: new mongoose.Types.ObjectId(),
-      },
-      {
-        type: 'marketGear',
-        path: 'gear.flat.armor_special_turkeyArmorBase',
-        _id: new mongoose.Types.ObjectId(),
-      },
-      {
-        type: 'marketGear',
-        path: 'gear.flat.back_special_turkeyTailBase',
-        _id: new mongoose.Types.ObjectId(),
-      },
-    ];
-  } else if (user.items && user.items.pets && user.items.pets['Turkey-Gilded']) {
-    set['items.mounts.Turkey-Gilded'] = true;
-  } else if (user.items && user.items.mounts && user.items.mounts['Turkey-Base']) {
-    set['items.pets.Turkey-Gilded'] = 5;
-  } else if (user.items && user.items.pets && user.items.pets['Turkey-Base']) {
-    set['items.mounts.Turkey-Base'] = true;
-  } else {
-    set['items.pets.Turkey-Base'] = 5;
-  }
-
-  if (count % progressCount === 0) console.warn(`${count} ${user._id}`);
-
-  if (push) {
-    return await User.update({_id: user._id}, {$set: set, $push: {pinnedItems: {$each: push}}}).exec();
-  } else {
-    return await User.update({_id: user._id}, {$set: set}).exec();
-  }
-}
-
-module.exports = async function processUsers () {
-  let query = {
-    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/archive/2018/20181231_nye.js

@@ -1,110 +0,0 @@
-/* eslint-disable no-console */
-const MIGRATION_NAME = '20181231_nye';
-import { model as User } from '../../../website/server/models/user';
-import mongoose from 'mongoose';
-import { v4 as uuid } from 'uuid';
-
-const progressCount = 1000;
-let count = 0;
-
-async function updateUser (user) {
-  count++;
-
-  const set = {'flags.newStuff': true};
-  let push;
-
-  set.migration = MIGRATION_NAME;
-
-  if (typeof user.items.gear.owned.head_special_nye2017 !== 'undefined') {
-    set['items.gear.owned.head_special_nye2018'] = false;
-    push = [
-      {
-        type: 'marketGear',
-        path: 'gear.flat.head_special_nye2018',
-        _id: uuid(),
-      },
-    ];
-  } else if (typeof user.items.gear.owned.head_special_nye2016 !== 'undefined') {
-    set['items.gear.owned.head_special_nye2017'] = false;
-    push = [
-      {
-        type: 'marketGear',
-        path: 'gear.flat.head_special_nye2017',
-        _id: uuid(),
-      },
-    ];
-  } else if (typeof user.items.gear.owned.head_special_nye2015 !== 'undefined') {
-    set['items.gear.owned.head_special_nye2016'] = false;
-    push = [
-      {
-        type: 'marketGear',
-        path: 'gear.flat.head_special_nye2016',
-        _id: uuid(),
-      },
-    ];
-  } else if (typeof user.items.gear.owned.head_special_nye2014 !== 'undefined') {
-    set['items.gear.owned.head_special_nye2015'] = false;
-    push = [
-      {
-        type: 'marketGear',
-        path: 'gear.flat.head_special_nye2015',
-        _id: uuid(),
-      },
-    ];
-  } else if (typeof user.items.gear.owned.head_special_nye !== 'undefined') {
-    set['items.gear.owned.head_special_nye2014'] = false;
-    push = [
-      {
-        type: 'marketGear',
-        path: 'gear.flat.head_special_nye2014',
-        _id: uuid(),
-      },
-    ];
-  } else {
-    set['items.gear.owned.head_special_nye'] = false;
-    push = [
-      {
-        type: 'marketGear',
-        path: 'gear.flat.head_special_nye',
-        _id: uuid(),
-      },
-    ];
-  }
-
-  if (count % progressCount === 0) console.warn(`${count} ${user._id}`);
-
-  return await User.update({_id: user._id}, {$set: set, $push: {pinnedItems: {$each: push}}}).exec();
-}
-
-module.exports = async function processUsers () {
-  let query = {
-    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/archive/2019/20190131_habit_birthday.js

@@ -1,88 +0,0 @@
-/* eslint-disable no-console */
-const MIGRATION_NAME = '20190131_habit_birthday';
-import { v4 as uuid } from 'uuid';
-
-import { model as User } from '../../../website/server/models/user';
-
-const progressCount = 1000;
-let count = 0;
-
-async function updateUser (user) {
-  count++;
-
-  const inc = {
-    'items.food.Cake_Skeleton': 1,
-    'items.food.Cake_Base': 1,
-    'items.food.Cake_CottonCandyBlue': 1,
-    'items.food.Cake_CottonCandyPink': 1,
-    'items.food.Cake_Shade': 1,
-    'items.food.Cake_White': 1,
-    'items.food.Cake_Golden': 1,
-    'items.food.Cake_Zombie': 1,
-    'items.food.Cake_Desert': 1,
-    'items.food.Cake_Red': 1,
-    'achievements.habitBirthdays': 1,
-  };
-  const set = {};
-  let push;
-
-  set.migration = MIGRATION_NAME;
-
-  if (typeof user.items.gear.owned.armor_special_birthday2018 !== 'undefined') {
-    set['items.gear.owned.armor_special_birthday2019'] = false;
-    push = {pinnedItems: {type: 'marketGear', path: 'gear.flat.armor_special_birthday2019', _id: uuid()}};
-  } else if (typeof user.items.gear.owned.armor_special_birthday2017 !== 'undefined') {
-    set['items.gear.owned.armor_special_birthday2018'] = false;
-    push = {pinnedItems: {type: 'marketGear', path: 'gear.flat.armor_special_birthday2018', _id: uuid()}};
-  } else if (typeof user.items.gear.owned.armor_special_birthday2016 !== 'undefined') {
-    set['items.gear.owned.armor_special_birthday2017'] = false;
-    push = {pinnedItems: {type: 'marketGear', path: 'gear.flat.armor_special_birthday2017', _id: uuid()}};
-  } else if (typeof user.items.gear.owned.armor_special_birthday2015 !== 'undefined') {
-    set['items.gear.owned.armor_special_birthday2016'] = false;
-    push = {pinnedItems: {type: 'marketGear', path: 'gear.flat.armor_special_birthday2016', _id: uuid()}};
-  } else if (typeof user.items.gear.owned.armor_special_birthday !== 'undefined') {
-    set['items.gear.owned.armor_special_birthday2015'] = false;
-    push = {pinnedItems: {type: 'marketGear', path: 'gear.flat.armor_special_birthday2015', _id: uuid()}};
-  } else {
-    set['items.gear.owned.armor_special_birthday'] = false;
-    push = {pinnedItems: {type: 'marketGear', path: 'gear.flat.armor_special_birthday', _id: uuid()}};
-  }
-
-  if (count % progressCount === 0) console.warn(`${count} ${user._id}`);
-
-  return await User.update({_id: user._id}, {$inc: inc, $set: set, $push: push}).exec();
-}
-
-module.exports = async function processUsers () {
-  let query = {
-    migration: {$ne: MIGRATION_NAME},
-    'auth.timestamps.loggedin': {$gt: new Date('2019-01-15')},
-  };
-
-  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/archive/mystery-items-old.js

@@ -1,110 +0,0 @@
-import monk from 'monk';
-import nconf from 'nconf';
-
-const migrationName = 'mystery-items-201808.js'; // Update per month
-const authorName = 'Sabe'; // in case script author needs to know when their ...
-const authorUuid = '7f14ed62-5408-4e1b-be83-ada62d504931'; // ... own data is done
-
-/*
- * Award this month's mystery items to subscribers
- */
-const MYSTERY_ITEMS = ['armor_mystery_201810', 'head_mystery_201810'];
-const CONNECTION_STRING = nconf.get('MIGRATION_CONNECT_STRING');
-
-let dbUsers = monk(CONNECTION_STRING).get('users', { castIds: false });
-let UserNotification = require('../../website/server/models/userNotification').model;
-
-function processUsers (lastId) {
-  // specify a query to limit the affected users (empty for all users):
-  let query = {
-    migration: {$ne: migrationName},
-    'purchased.plan.customerId': { $ne: null },
-    $or: [
-      { 'purchased.plan.dateTerminated': { $gte: new Date() } },
-      { 'purchased.plan.dateTerminated': { $exists: false } },
-      { 'purchased.plan.dateTerminated': { $eq: null } },
-    ],
-  };
-
-  if (lastId) {
-    query._id = {
-      $gt: lastId,
-    };
-  }
-
-  dbUsers.find(query, {
-    sort: {_id: 1},
-    limit: 250,
-    fields: [
-    ], // 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++;
-
-  const addToSet = {
-    'purchased.plan.mysteryItems': {
-      $each: MYSTERY_ITEMS,
-    },
-  };
-  const push = {
-    notifications: (new UserNotification({
-      type: 'NEW_MYSTERY_ITEMS',
-      data: {
-        MYSTERY_ITEMS,
-      },
-    })).toJSON(),
-  };
-
-  dbUsers.update({_id: user._id}, {$addToSet: addToSet, $push: push});
-
-  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/groups/reconcile-group-plan-members.js

@@ -1,107 +0,0 @@
-import monk from 'monk';
-import nconf from 'nconf';
-import stripePayments from '../../website/server/libs/payments/stripe';
-
-/*
- * Ensure that group plan billing is accurate by doing the following:
- * 1. Correct the memberCount in all paid groups whose counts are wrong
- * 2. Where the above uses Stripe, update their subscription counts in Stripe
- *
- * Provides output on what groups were fixed, which can be piped to CSV.
- */
-
-const CONNECTION_STRING = nconf.get('MIGRATION_CONNECT_STRING');
-
-let dbGroups = monk(CONNECTION_STRING).get('groups', { castIds: false });
-let dbUsers = monk(CONNECTION_STRING).get('users', { castIds: false });
-
-async function fixGroupPlanMembers () {
-  console.info('Group ID, Customer ID, Plan ID, Quantity, Recorded Member Count, Actual Member Count');
-  let groupPlanCount = 0;
-  let fixedGroupCount = 0;
-
-  dbGroups.find(
-    {
-      $and:
-        [
-          {'purchased.plan.planId': {$ne: null}},
-          {'purchased.plan.planId': {$ne: ''}},
-          {'purchased.plan.customerId': {$ne: 'cus_9f0DV4g7WHRzpM'}}, // Demo groups
-          {'purchased.plan.customerId': {$ne: 'cus_9maalqDOFTrvqx'}},
-        ],
-      $or:
-        [
-          {'purchased.plan.dateTerminated': null},
-          {'purchased.plan.dateTerminated': ''},
-        ],
-    },
-    {
-      fields: {
-        memberCount: 1,
-        'purchased.plan': 1,
-      },
-    }
-  ).each(async (group, {close, pause, resume}) => { // eslint-disable-line no-unused-vars
-    pause();
-    groupPlanCount++;
-
-    const canonicalMemberCount = await dbUsers.count(
-      {
-        $or:
-          [
-            {'party._id': group._id},
-            {guilds: group._id},
-          ],
-      }
-    );
-    const incorrectMemberCount = group.memberCount !== canonicalMemberCount;
-
-    const isMonthlyPlan = group.purchased.plan.planId === 'group_monthly';
-    const quantityMismatch = group.purchased.plan.quantity !== group.memberCount + 2;
-    const incorrectQuantity = isMonthlyPlan && quantityMismatch;
-
-    if (!incorrectMemberCount && !incorrectQuantity) {
-      resume();
-      return;
-    }
-
-    console.info(`${group._id}, ${group.purchased.plan.customerId}, ${group.purchased.plan.planId}, ${group.purchased.plan.quantity}, ${group.memberCount}, ${canonicalMemberCount}`);
-
-    const groupUpdate = await dbGroups.update(
-      { _id: group._id },
-      {
-        $set: {
-          memberCount: canonicalMemberCount,
-        },
-      }
-    );
-
-    if (!groupUpdate) return;
-
-    fixedGroupCount++;
-    if (group.purchased.plan.paymentMethod === 'Stripe') {
-      await stripePayments.chargeForAdditionalGroupMember(group);
-      await dbGroups.update(
-        {_id: group._id},
-        {$set: {'purchased.plan.quantity': canonicalMemberCount + 2}}
-      );
-    }
-
-    if (incorrectQuantity) {
-      await dbGroups.update(
-        {_id: group._id},
-        {$set: {'purchased.plan.quantity': canonicalMemberCount + 2}}
-      );
-    }
-
-    resume();
-  }).then(() => {
-    console.info(`Fixed ${fixedGroupCount} out of ${groupPlanCount} active Group Plans`);
-    return process.exit(0);
-  }).catch((err) => {
-    console.log(err);
-    return process.exit(1);
-  });
-}
-
-module.exports = fixGroupPlanMembers;

migrations/migration-runner.js

@@ -17,12 +17,5 @@ function setUpServer () {
 setUpServer();
 
 // Replace this with your migration
-const processUsers = require('./users/mystery-items.js');
-processUsers()
-  .then(function success () {
-    process.exit(0);
-  })
-  .catch(function failure (err) {
-    console.log(err);
-    process.exit(1);
-  });
+const processUsers = require('./groups/migrate-chat.js');
+processUsers();

migrations/takeThis.js

@@ -1,4 +1,4 @@
-let migrationName = '20180904_takeThis.js'; // Update per month
+let migrationName = '20180102_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
 
@@ -6,16 +6,15 @@ 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 });
+let monk = require('monk');
+let connectionString = 'mongodb://localhost:27017/habitrpg?auto_reconnect=true'; // FOR TEST DATABASE
+let dbUsers = monk(connectionString).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
+    challenges: {$in: ['5f70ce5b-2d82-4114-8e44-ca65615aae62']}, // Update per month
   };
 
   if (lastId) {

migrations/tasks/habits-one-history-entry-per-day-challenges.js

@@ -1,138 +0,0 @@
-// const migrationName = 'habits-one-history-entry-per-day';
-// const authorName = 'paglias'; // in case script author needs to know when their ...
-// const authorUuid = 'ed4c688c-6652-4a92-9d03-a5a79844174a'; // ... own data is done
-
-/*
- * Iterates over all habits and condense multiple history entries for the same day into a single entry
- */
-
-const monk = require('monk');
-const _ = require('lodash');
-const moment = require('moment');
-const connectionString = 'mongodb://localhost:27017/habitrpg?auto_reconnect=true'; // FOR TEST DATABASE
-const dbTasks = monk(connectionString).get('tasks', { castIds: false });
-
-function processChallengeHabits (lastId) {
-  let query = {
-    'challenge.id': {$exists: true},
-    userId: {$exists: false},
-    type: 'habit',
-  };
-
-  if (lastId) {
-    query._id = {
-      $gt: lastId,
-    };
-  }
-
-  dbTasks.find(query, {
-    sort: {_id: 1},
-    limit: 500,
-  })
-    .then(updateChallengeHabits)
-    .catch((err) => {
-      console.log(err);
-      return exiting(1, `ERROR! ${  err}`);
-    });
-}
-
-let progressCount = 1000;
-let count = 0;
-
-function updateChallengeHabits (habits) {
-  if (!habits || habits.length === 0) {
-    console.warn('All appropriate challenge habits found and modified.');
-    displayData();
-    return;
-  }
-
-  let habitsPromises = habits.map(updateChallengeHabit);
-  let lastHabit = habits[habits.length - 1];
-
-  return Promise.all(habitsPromises)
-    .then(() => {
-      return processChallengeHabits(lastHabit._id);
-    });
-}
-
-function updateChallengeHabit (habit) {
-  count++;
-
-  if (habit && habit.history && habit.history.length > 0) {
-    // First remove missing entries
-    habit.history = habit.history.filter(entry => Boolean(entry));
-
-    habit.history = _.chain(habit.history)
-      // processes all entries to identify an up or down score
-      .forEach((entry, index) => {
-        if (index === 0) { // first entry doesn't have a previous one
-          // first value < 0 identifies a negative score as the first action
-          entry.scoreDirection = entry.value >= 0 ? 'up' : 'down';
-        } else {
-          // could be missing if the previous entry was null and thus excluded
-          const previousEntry = habit.history[index - 1];
-          const previousValue = previousEntry.value;
-
-          entry.scoreDirection = entry.value > previousValue ? 'up' : 'down';
-        }
-      })
-      .groupBy(entry => { // group entries by aggregateBy
-        return moment(entry.date).format('YYYYMMDD');
-      })
-      .toPairs() // [key, entry]
-      .sortBy(([key]) => key) // sort by date
-      .map(keyEntryPair => {
-        let entries = keyEntryPair[1]; // 1 is entry, 0 is key
-        let scoredUp = 0;
-        let scoredDown = 0;
-
-        entries.forEach(entry => {
-          if (entry.scoreDirection === 'up') {
-            scoredUp += 1;
-          } else {
-            scoredDown += 1;
-          }
-
-          // delete the unnecessary scoreDirection and scoreNotes prop
-          delete entry.scoreDirection;
-          delete entry.scoreNotes;
-        });
-
-        return {
-          date: Number(entries[entries.length - 1].date), // keep last value
-          value: entries[entries.length - 1].value, // keep last value,
-          scoredUp,
-          scoredDown,
-        };
-      })
-      .value();
-
-    return dbTasks.update({_id: habit._id}, {
-      $set: {history: habit.history},
-    });
-  }
-
-  if (count % progressCount === 0) console.warn(`${count  } habits processed`);
-}
-
-function displayData () {
-  console.warn(`\n${  count  } tasks 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 = processChallengeHabits;

migrations/tasks/habits-one-history-entry-per-day-users.js

@@ -1,163 +0,0 @@
-const migrationName = 'habits-one-history-entry-per-day';
-const authorName = 'paglias'; // in case script author needs to know when their ...
-const authorUuid = 'ed4c688c-6652-4a92-9d03-a5a79844174a'; // ... own data is done
-
-/*
- * Iterates over all habits and condense multiple history entries for the same day into a single entry
- */
-
-const monk = require('monk');
-const _ = require('lodash');
-const moment = require('moment');
-const connectionString = 'mongodb://localhost:27017/habitrpg?auto_reconnect=true'; // FOR TEST DATABASE
-const dbTasks = monk(connectionString).get('tasks', { castIds: false });
-const dbUsers = monk(connectionString).get('users', { castIds: false });
-
-function processUsers (lastId) {
-  let query = {
-    migration: {$ne: migrationName},
-  };
-
-  if (lastId) {
-    query._id = {
-      $gt: lastId,
-    };
-  }
-
-  dbUsers.find(query, {
-    sort: {_id: 1},
-    limit: 50, // just 50 users per time since we have to process all their habits as well
-    fields: ['_id', 'preferences.timezoneOffset', 'preferences.dayStart'],
-  })
-    .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 and their tasks found and modified.');
-    displayData();
-    return;
-  }
-
-  let usersPromises = users.map(updateUser);
-  let lastUser = users[users.length - 1];
-
-  return Promise.all(usersPromises)
-    .then(() => {
-      return processUsers(lastUser._id);
-    });
-}
-
-function updateHabit (habit, timezoneOffset, dayStart) {
-  if (habit && habit.history && habit.history.length > 0) {
-    // First remove missing entries
-    habit.history = habit.history.filter(entry => Boolean(entry));
-
-    habit.history = _.chain(habit.history)
-      // processes all entries to identify an up or down score
-      .forEach((entry, index) => {
-        if (index === 0) { // first entry doesn't have a previous one
-          // first value < 0 identifies a negative score as the first action
-          entry.scoreDirection = entry.value >= 0 ? 'up' : 'down';
-        } else {
-          // could be missing if the previous entry was null and thus excluded
-          const previousEntry = habit.history[index - 1];
-          const previousValue = previousEntry.value;
-
-          entry.scoreDirection = entry.value > previousValue ? 'up' : 'down';
-        }
-      })
-      .groupBy(entry => { // group entries by aggregateBy
-        const entryDate = moment(entry.date).zone(timezoneOffset || 0);
-        if (entryDate.hour() < dayStart) entryDate.subtract(1, 'day');
-        return entryDate.format('YYYYMMDD');
-      })
-      .toPairs() // [key, entry]
-      .sortBy(([key]) => key) // sort by date
-      .map(keyEntryPair => {
-        let entries = keyEntryPair[1]; // 1 is entry, 0 is key
-        let scoredUp = 0;
-        let scoredDown = 0;
-
-        entries.forEach(entry => {
-          if (entry.scoreDirection === 'up') {
-            scoredUp += 1;
-          } else {
-            scoredDown += 1;
-          }
-
-          // delete the unnecessary scoreDirection and scoreNotes prop
-          delete entry.scoreDirection;
-          delete entry.scoreNotes;
-        });
-
-        return {
-          date: Number(entries[entries.length - 1].date), // keep last value
-          value: entries[entries.length - 1].value, // keep last value,
-          scoredUp,
-          scoredDown,
-        };
-      })
-      .value();
-
-    return dbTasks.update({_id: habit._id}, {
-      $set: {history: habit.history},
-    });
-  }
-}
-
-function updateUser (user) {
-  count++;
-
-  const timezoneOffset = user.preferences.timezoneOffset;
-  const dayStart = user.preferences.dayStart;
-
-  if (count % progressCount === 0) console.warn(`${count  } ${  user._id}`);
-  if (user._id === authorUuid) console.warn(`${authorName  } being processed`);
-
-  return dbTasks.find({
-    type: 'habit',
-    userId: user._id,
-  })
-    .then(habits => {
-      return Promise.all(habits.map(habit => updateHabit(habit, timezoneOffset, dayStart)));
-    })
-    .then(() => {
-      return dbUsers.update({_id: user._id}, {
-        $set: {migration: migrationName},
-      });
-    })
-    .catch((err) => {
-      console.log(err);
-      return exiting(1, `ERROR! ${  err}`);
-    });
-}
-
-function displayData () {
-  console.warn(`\n${  count  } tasks 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/tasks/tasks-set-everyX.js

@@ -7,7 +7,7 @@ let authorUuid = '7f14ed62-5408-4e1b-be83-ada62d504931'; // ... own data is done
  */
 
 let monk = require('monk');
-let connectionString = 'mongodb://localhost:27017/habitrpg?auto_reconnect=true';
+let connectionString = 'mongodb://sabrecat:z8e8jyRA8CTofMQ@ds013393-a0.mlab.com:13393/habitica?auto_reconnect=true';
 let dbTasks = monk(connectionString).get('tasks', { castIds: false });
 
 function processTasks (lastId) {

migrations/users/bulk-email.js

@@ -1,61 +0,0 @@
-/* eslint-disable no-console */
-import { sendTxn } from '../../website/server/libs/email';
-import { model as User } from '../../website/server/models/user';
-import moment from 'moment';
-import nconf from 'nconf';
-const BASE_URL = nconf.get('BASE_URL');
-const EMAIL_SLUG = 'mandrill-email-slug'; // Set email template to send
-const MIGRATION_NAME = 'bulk-email';
-
-const progressCount = 1000;
-let count = 0;
-
-async function updateUser (user) {
-  count++;
-
-  if (count % progressCount === 0) console.warn(`${count} ${user._id}`);
-
-  sendTxn(
-    user,
-    EMAIL_SLUG,
-    [{name: 'BASE_URL', content: BASE_URL}] // Add variables from template
-  );
-
-  return await User.update({_id: user._id}, {$set: {migration: MIGRATION_NAME}}).exec();
-}
-
-module.exports = async function processUsers () {
-  let query = {
-    migration: {$ne: MIGRATION_NAME},
-    'auth.timestamps.loggedin': {$gt: moment().subtract(2, 'weeks').toDate()}, // customize or remove to target different populations
-  };
-
-  const fields = {
-    _id: 1,
-    auth: 1,
-    preferences: 1,
-    profile: 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/full-stable.js

@@ -1,24 +1,67 @@
-/* eslint-disable no-console */
-const MIGRATION_NAME = 'full-stable';
 import each from 'lodash/each';
 import keys from 'lodash/keys';
 import content from '../../website/common/script/content/index';
-
-import { model as User } from '../../website/server/models/user';
-
-const progressCount = 1000;
-let count = 0;
+const migrationName = 'full-stable.js';
+const authorName = 'Sabe'; // in case script author needs to know when their ...
+const authorUuid = '7f14ed62-5408-4e1b-be83-ada62d504931'; // ... own data is done
 
 /*
  * Award users every extant pet and mount
  */
+const connectionString = 'mongodb://localhost:27017/habitrpg?auto_reconnect=true'; // FOR TEST DATABASE
 
-async function updateUser (user) {
+let monk = require('monk');
+let dbUsers = monk(connectionString).get('users', { castIds: false });
+
+function processUsers (lastId) {
+  // specify a query to limit the affected users (empty for all users):
+  let query = {
+    'profile.name': 'SabreCat',
+  };
+
+  if (lastId) {
+    query._id = {
+      $gt: lastId,
+    };
+  }
+
+  dbUsers.find(query, {
+    sort: {_id: 1},
+    limit: 250,
+    fields: [
+    ], // 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++;
-
-  const set = {};
-
-  set.migration = MIGRATION_NAME;
+  let set = {
+    migration: migrationName,
+  };
 
   each(keys(content.pets), (pet) => {
     set[`items.pets.${pet}`] = 5;
@@ -45,40 +88,30 @@ async function updateUser (user) {
     set[`items.mounts.${mount}`] = true;
   });
 
-  if (count % progressCount === 0) console.warn(`${count} ${user._id}`);
+  dbUsers.update({_id: user._id}, {$set: set});
 
-  return await User.update({_id: user._id}, {$set: set}).exec();
+  if (count % progressCount === 0) console.warn(`${count  } ${  user._id}`);
+  if (user._id === authorUuid) console.warn(`${authorName  } processed`);
 }
 
-module.exports = async function processUsers () {
-  let query = {
-    migration: {$ne: MIGRATION_NAME},
-    'auth.local.username': 'olson22',
-  };
+function displayData () {
+  console.warn(`\n${  count  } users processed\n`);
+  return exiting(0);
+}
 
-  const fields = {
-    _id: 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
+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/users/mystery-items.js

@@ -1,13 +1,68 @@
-/* eslint-disable no-console */
-const MIGRATION_NAME = 'mystery_items_201904';
-const MYSTERY_ITEMS = ['armor_mystery_201904', 'head_mystery_201904'];
-import { model as User } from '../../website/server/models/user';
-import { model as UserNotification } from '../../website/server/models/userNotification';
+const migrationName = 'mystery-items-201802.js'; // Update per month
+const authorName = 'Sabe'; // in case script author needs to know when their ...
+const authorUuid = '7f14ed62-5408-4e1b-be83-ada62d504931'; // ... own data is done
 
-const progressCount = 1000;
+/*
+ * Award this month's mystery items to subscribers
+ */
+const MYSTERY_ITEMS = ['back_mystery_201804', 'headAccessory_mystery_201804'];
+const connectionString = 'mongodb://localhost:27017/habitrpg?auto_reconnect=true'; // FOR TEST DATABASE
+
+let monk = require('monk');
+let dbUsers = monk(connectionString).get('users', { castIds: false });
+let UserNotification = require('../../website/server/models/userNotification').model;
+
+function processUsers (lastId) {
+  // specify a query to limit the affected users (empty for all users):
+  let query = {
+    migration: {$ne: migrationName},
+    'purchased.plan.customerId': { $ne: null },
+    $or: [
+      { 'purchased.plan.dateTerminated': { $gte: new Date() } },
+      { 'purchased.plan.dateTerminated': { $exists: false } },
+      { 'purchased.plan.dateTerminated': { $eq: null } },
+    ],
+  };
+
+  if (lastId) {
+    query._id = {
+      $gt: lastId,
+    };
+  }
+
+  dbUsers.find(query, {
+    sort: {_id: 1},
+    limit: 250,
+    fields: [
+    ], // 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;
 
-async function updateUser (user) {
+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++;
 
   const addToSet = {
@@ -23,49 +78,31 @@ async function updateUser (user) {
       },
     })).toJSON(),
   };
-  const set = {
-    migration: MIGRATION_NAME,
-  };
 
-  if (count % progressCount === 0) console.warn(`${count} ${user._id}`);
+  dbUsers.update({_id: user._id}, {$addToSet: addToSet, $push: push});
 
-  return await User.update({_id: user._id}, {$set: set, $push: push, $addToSet: addToSet}).exec();
+  if (count % progressCount === 0) console.warn(`${count  } ${  user._id}`);
+  if (user._id === authorUuid) console.warn(`${authorName  } processed`);
 }
 
-module.exports = async function processUsers () {
-  let query = {
-    migration: {$ne: MIGRATION_NAME},
-    'purchased.plan.customerId': { $ne: null },
-    $or: [
-      { 'purchased.plan.dateTerminated': { $gte: new Date() } },
-      { 'purchased.plan.dateTerminated': { $exists: false } },
-      { 'purchased.plan.dateTerminated': { $eq: null } },
-    ],
-  };
+function displayData () {
+  console.warn(`\n${  count  } users processed\n`);
+  return exiting(0);
+}
 
-  const fields = {
-    _id: 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
+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/users/pi-day.js

@@ -1,73 +0,0 @@
-/* eslint-disable no-console */
-const MIGRATION_NAME = '20190314_pi_day';
-import { v4 as uuid } from 'uuid';
-
-import { model as User } from '../../website/server/models/user';
-
-const progressCount = 1000;
-let count = 0;
-
-async function updateUser (user) {
-  count++;
-
-  const inc = {
-    'items.food.Pie_Skeleton': 1,
-    'items.food.Pie_Base': 1,
-    'items.food.Pie_CottonCandyBlue': 1,
-    'items.food.Pie_CottonCandyPink': 1,
-    'items.food.Pie_Shade': 1,
-    'items.food.Pie_White': 1,
-    'items.food.Pie_Golden': 1,
-    'items.food.Pie_Zombie': 1,
-    'items.food.Pie_Desert': 1,
-    'items.food.Pie_Red': 1,
-  };
-  const set = {};
-
-  set.migration = MIGRATION_NAME;
-
-  set['items.gear.owned.head_special_piDay'] = false;
-  set['items.gear.owned.shield_special_piDay'] = false;
-  const push = [
-    {type: 'marketGear', path: 'gear.flat.head_special_piDay', _id: uuid()},
-    {type: 'marketGear', path: 'gear.flat.shield_special_piDay', _id: uuid()},
-  ];
-
-  if (count % progressCount === 0) console.warn(`${count} ${user._id}`);
-
-  return await User.update({_id: user._id}, {$inc: inc, $set: set, $push: {pinnedItems: {$each: push}}}).exec();
-}
-
-module.exports = async function processUsers () {
-  let query = {
-    migration: {$ne: MIGRATION_NAME},
-    'auth.timestamps.loggedin': {$gt: new Date('2019-02-15')},
-  };
-
-  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/remove-social-users-extra-data.js

@@ -1,109 +0,0 @@
-const migrationName = 'remove-social-users-extra-data.js';
-const authorName = 'paglias'; // in case script author needs to know when their ...
-const authorUuid = 'ed4c688c-6652-4a92-9d03-a5a79844174a'; // ... own data is done
-
-/*
- * Remove not needed data from social profiles
- */
-const connectionString = 'mongodb://localhost:27017/habitrpg?auto_reconnect=true'; // FOR TEST DATABASE
-
-const monk = require('monk');
-const dbUsers = monk(connectionString).get('users', { castIds: false });
-
-function processUsers (lastId) {
-  // specify a query to limit the affected users (empty for all users):
-  let query = {
-    migration: {$ne: migrationName},
-    $or: [
-      { 'auth.facebook.id': { $exists: true } },
-      { 'auth.google.id': { $exists: true } },
-    ],
-  };
-
-  if (lastId) {
-    query._id = {
-      $gt: lastId,
-    };
-  }
-
-  dbUsers.find(query, {
-    sort: {_id: 1},
-    limit: 250,
-  })
-    .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++;
-
-  const isFacebook = user.auth.facebook && user.auth.facebook.id;
-  const isGoogle = user.auth.google && user.auth.google.id;
-
-  const update = { $set: {} };
-
-  if (isFacebook) {
-    update.$set['auth.facebook'] = {
-      id: user.auth.facebook.id,
-      emails: user.auth.facebook.emails,
-    };
-  }
-
-  if (isGoogle) {
-    update.$set['auth.google'] = {
-      id: user.auth.google.id,
-      emails: user.auth.google.emails,
-    };
-  }
-
-  dbUsers.update({
-    _id: user._id,
-  }, update);
-
-  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/users/take-this.js

@@ -1,81 +0,0 @@
-/* eslint-disable no-console */
-const MIGRATION_NAME = '20181203_take_this';
-import { v4 as uuid } from 'uuid';
-
-import { model as User } from '../../website/server/models/user';
-
-const progressCount = 1000;
-let count = 0;
-
-async function updateUser (user) {
-  count++;
-
-  const set = {};
-  let push;
-
-  set.migration = MIGRATION_NAME;
-
-  if (typeof user.items.gear.owned.back_special_takeThis !== 'undefined') {
-    push = false;
-  } else if (typeof user.items.gear.owned.body_special_takeThis !== 'undefined') {
-    set['items.gear.owned.back_special_takeThis'] = false;
-    push = {pinnedItems: {type: 'marketGear', path: 'gear.flat.back_special_takeThis', _id: uuid()}};
-  } else if (typeof user.items.gear.owned.head_special_takeThis !== 'undefined') {
-    set['items.gear.owned.body_special_takeThis'] = false;
-    push = {pinnedItems: {type: 'marketGear', path: 'gear.flat.body_special_takeThis', _id: uuid()}};
-  } else if (typeof user.items.gear.owned.armor_special_takeThis !== 'undefined') {
-    set['items.gear.owned.head_special_takeThis'] = false;
-    push = {pinnedItems: {type: 'marketGear', path: 'gear.flat.head_special_takeThis', _id: uuid()}};
-  } else if (typeof user.items.gear.owned.weapon_special_takeThis !== 'undefined') {
-    set['items.gear.owned.armor_special_takeThis'] = false;
-    push = {pinnedItems: {type: 'marketGear', path: 'gear.flat.armor_special_takeThis', _id: uuid()}};
-  } else if (typeof user.items.gear.owned.shield_special_takeThis !== 'undefined') {
-    set['items.gear.owned.weapon_special_takeThis'] = false;
-    push = {pinnedItems: {type: 'marketGear', path: 'gear.flat.weapon_special_takeThis', _id: uuid()}};
-  } else {
-    set['items.gear.owned.shield_special_takeThis'] = false;
-    push = {pinnedItems: {type: 'marketGear', path: 'gear.flat.shield_special_takeThis', _id: uuid()}};
-  }
-
-  if (count % progressCount === 0) console.warn(`${count} ${user._id}`);
-
-  if (push) {
-    return await User.update({_id: user._id}, {$set: set, $push: push}).exec();
-  } else {
-    return await User.update({_id: user._id}, {$set: set}).exec();
-  }
-}
-
-module.exports = async function processUsers () {
-  let query = {
-    migration: {$ne: MIGRATION_NAME},
-    challenges: '00708425-d477-41a5-bf27-6270466e7976',
-  };
-
-  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
-  }
-};

package.json

@@ -1,19 +1,16 @@
 {
   "name": "habitica",
   "description": "A habit tracker app which treats your goals like a Role Playing Game.",
-  "version": "4.93.2",
+  "version": "4.41.6",
   "main": "./website/server/index.js",
   "dependencies": {
-    "@google-cloud/trace-agent": "^3.6.0",
     "@slack/client": "^3.8.1",
     "accepts": "^1.3.5",
-    "amazon-payments": "^0.2.7",
+    "amazon-payments": "^0.2.6",
     "amplitude": "^3.5.0",
-    "amplitude-js": "^5.0.0",
     "apidoc": "^0.17.5",
-    "apn": "^2.2.0",
-    "autoprefixer": "^9.4.0",
-    "aws-sdk": "^2.432.0",
+    "autoprefixer": "^8.4.1",
+    "aws-sdk": "^2.230.1",
     "axios": "^0.18.0",
     "axios-progress-bar": "^1.2.0",
     "babel-core": "^6.26.3",
@@ -28,49 +25,49 @@
     "babel-preset-es2015": "^6.6.0",
     "babel-register": "^6.6.0",
     "babel-runtime": "^6.11.6",
-    "bcrypt": "^3.0.5",
-    "body-parser": "^1.18.3",
+    "bcrypt": "^2.0.0",
+    "body-parser": "^1.15.0",
     "bootstrap": "^4.1.1",
-    "bootstrap-vue": "^2.0.0-rc.18",
-    "compression": "^1.7.4",
-    "cookie-session": "^1.3.3",
+    "bootstrap-vue": "^2.0.0-rc.9",
+    "compression": "^1.7.2",
+    "cookie-session": "^1.2.0",
     "coupon-code": "^0.4.5",
-    "cross-env": "^5.2.0",
+    "cross-env": "^5.1.4",
     "css-loader": "^0.28.11",
-    "csv-stringify": "^5.1.0",
+    "csv-stringify": "^2.1.0",
     "cwait": "^1.1.1",
     "domain-middleware": "~0.1.0",
     "express": "^4.16.3",
     "express-basic-auth": "^1.1.5",
-    "express-validator": "^5.2.0",
+    "express-validator": "^5.1.2",
     "extract-text-webpack-plugin": "^3.0.2",
     "glob": "^7.1.2",
-    "got": "^9.0.0",
+    "got": "^8.3.1",
     "gulp": "^4.0.0",
     "gulp-babel": "^7.0.1",
-    "gulp-imagemin": "^5.0.3",
-    "gulp-nodemon": "^2.4.1",
+    "gulp-imagemin": "^4.1.0",
+    "gulp-nodemon": "^2.2.1",
     "gulp.spritesmith": "^6.9.0",
     "habitica-markdown": "^1.3.0",
-    "hellojs": "^1.18.1",
+    "hellojs": "^1.15.1",
     "html-webpack-plugin": "^3.2.0",
-    "image-size": "^0.7.0",
-    "in-app-purchase": "^1.11.3",
+    "image-size": "^0.6.2",
+    "in-app-purchase": "^1.9.3",
     "intro.js": "^2.9.3",
     "jquery": ">=3.0.0",
     "js2xmlparser": "^3.0.0",
     "lodash": "^4.17.10",
     "merge-stream": "^1.0.0",
-    "method-override": "^3.0.0",
+    "method-override": "^2.3.5",
     "moment": "^2.22.1",
     "moment-recur": "^1.0.7",
-    "mongoose": "^5.4.19",
+    "mongoose": "^5.0.17",
     "morgan": "^1.7.0",
     "nconf": "^0.10.0",
-    "node-gcm": "^1.0.2",
+    "node-gcm": "^0.14.4",
     "node-sass": "^4.9.0",
-    "nodemailer": "^6.0.0",
-    "ora": "^3.2.0",
+    "nodemailer": "^4.6.4",
+    "ora": "^2.1.0",
     "pageres": "^4.1.1",
     "passport": "^0.4.0",
     "passport-facebook": "^2.0.0",
@@ -81,54 +78,50 @@
     "postcss-easy-import": "^3.0.0",
     "ps-tree": "^1.0.0",
     "pug": "^2.0.3",
+    "push-notify": "git://github.com/habitrpg/push-notify.git#6bc2b5fdb1bdc9649b9ec1964d79ca50187fc8a9",
+    "pusher": "^1.3.0",
     "rimraf": "^2.4.3",
-    "sass-loader": "^7.0.3",
-    "shelljs": "^0.8.2",
-    "short-uuid": "^3.0.0",
-    "smartbanner.js": "^1.11.0",
-    "stripe": "^5.9.0",
-    "superagent": "^5.0.2",
+    "sass-loader": "^7.0.0",
+    "shelljs": "^0.8.1",
+    "stripe": "^5.8.0",
+    "superagent": "^3.8.3",
     "svg-inline-loader": "^0.8.0",
     "svg-url-loader": "^2.3.2",
-    "svgo": "^1.2.0",
+    "svgo": "^1.0.5",
     "svgo-loader": "^2.1.0",
-    "universal-analytics": "^0.4.17",
-    "update": "^0.7.4",
-    "upgrade": "^1.1.0",
+    "universal-analytics": "^0.4.16",
     "url-loader": "^1.0.0",
     "useragent": "^2.1.9",
     "uuid": "^3.0.1",
-    "validator": "^10.5.0",
+    "validator": "^9.4.1",
     "vinyl-buffer": "^1.0.1",
-    "vue": "^2.6.10",
+    "vue": "^2.5.16",
     "vue-loader": "^14.2.2",
     "vue-mugen-scroll": "^0.2.1",
     "vue-router": "^3.0.0",
     "vue-style-loader": "^4.1.0",
-    "vue-template-compiler": "^2.6.10",
-    "vuedraggable": "^2.20.0",
+    "vue-template-compiler": "^2.5.16",
+    "vuedraggable": "^2.15.0",
     "vuejs-datepicker": "git://github.com/habitrpg/vuejs-datepicker.git#5d237615463a84a23dd6f3f77c6ab577d68593ec",
-    "webpack": "^3.12.0",
-    "webpack-merge": "^4.1.3",
-    "winston": "^2.4.3",
+    "webpack": "^3.11.0",
+    "webpack-merge": "^4.0.0",
+    "winston": "^2.4.2",
     "winston-loggly-bulk": "^2.0.2",
     "xml2js": "^0.4.4"
   },
   "private": true,
   "engines": {
-    "node": "^10",
-    "npm": "^6"
+    "node": "^8.9.4",
+    "npm": "^5.6.0"
   },
   "scripts": {
     "lint": "eslint --ext .js,.vue .",
     "test": "npm run lint && gulp test && gulp apidoc",
     "test:build": "gulp test:prepare:build",
     "test:api-v3": "gulp test:api-v3",
-    "test:api:unit": "gulp test:api:unit",
+    "test:api-v3:unit": "gulp test:api-v3:unit",
     "test:api-v3:integration": "gulp test:api-v3:integration",
     "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": "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",
@@ -146,15 +139,15 @@
     "apidoc": "gulp apidoc"
   },
   "devDependencies": {
-    "@vue/test-utils": "^1.0.0-beta.29",
+    "@vue/test-utils": "^1.0.0-beta.15",
     "babel-plugin-istanbul": "^4.1.6",
     "babel-plugin-syntax-object-rest-spread": "^6.13.0",
     "chai": "^4.1.2",
     "chai-as-promised": "^7.1.1",
     "chalk": "^2.4.1",
-    "chromedriver": "^2.40.0",
+    "chromedriver": "^2.38.2",
     "connect-history-api-fallback": "^1.1.0",
-    "coveralls": "^3.0.3",
+    "coveralls": "^3.0.0",
     "cross-spawn": "^6.0.5",
     "eslint": "^4.19.1",
     "eslint-config-habitrpg": "^4.0.0",
@@ -164,33 +157,36 @@
     "eslint-plugin-mocha": "^5.0.0",
     "eventsource-polyfill": "^0.9.6",
     "expect.js": "^0.3.1",
-    "http-proxy-middleware": "^0.19.0",
+    "http-proxy-middleware": "^0.18.0",
     "istanbul": "^1.1.0-alpha.1",
-    "karma": "^4.0.1",
+    "karma": "^2.0.2",
     "karma-babel-preprocessor": "^7.0.0",
     "karma-chai-plugins": "^0.9.0",
     "karma-chrome-launcher": "^2.2.0",
-    "karma-coverage": "^1.1.2",
+    "karma-coverage": "^1.1.1",
     "karma-mocha": "^1.3.0",
     "karma-mocha-reporter": "^2.2.5",
-    "karma-sinon-chai": "^2.0.0",
+    "karma-sinon-chai": "^1.3.4",
     "karma-sinon-stub-promise": "^1.0.0",
     "karma-sourcemap-loader": "^0.3.7",
     "karma-spec-reporter": "0.0.32",
     "karma-webpack": "^3.0.0",
-    "lcov-result-merger": "^3.0.0",
+    "lcov-result-merger": "^2.0.0",
     "mocha": "^5.1.1",
-    "monk": "^6.0.6",
-    "nightwatch": "^1.0.16",
-    "puppeteer": "^1.14.0",
+    "monk": "^6.0.5",
+    "nightwatch": "^0.9.21",
+    "puppeteer": "^1.3.0",
     "require-again": "^2.0.0",
-    "selenium-server": "^3.12.0",
-    "sinon": "^7.2.4",
+    "selenium-server": "^3.11.0",
+    "sinon": "^4.5.0",
     "sinon-chai": "^3.0.0",
     "sinon-stub-promise": "^4.0.0",
-    "webpack-bundle-analyzer": "^2.12.0",
+    "webpack-bundle-analyzer": "^2.11.1",
     "webpack-dev-middleware": "^2.0.5",
-    "webpack-hot-middleware": "^2.22.2"
+    "webpack-hot-middleware": "^2.22.1"
   },
-  "optionalDependencies": {}
+  "optionalDependencies": {
+    "memwatch-next": "^0.3.0",
+    "node-rdkafka": "^2.3.0"
+  }
 }

scripts/gdpr-delete-users.js

@@ -1,89 +0,0 @@
-/* eslint-disable no-console */
-import axios from 'axios';
-import { model as User } from '../website/server/models/user';
-import nconf from 'nconf';
-
-const AMPLITUDE_KEY = nconf.get('AMPLITUDE_KEY');
-const AMPLITUDE_SECRET = nconf.get('AMPLITUDE_SECRET');
-const BASE_URL = nconf.get('BASE_URL');
-
-async function _deleteAmplitudeData (userId, email) {
-  const response = await axios.post(
-    'https://amplitude.com/api/2/deletions/users',
-    {
-      user_ids: userId, // eslint-disable-line camelcase
-      requester: email,
-    },
-    {
-      auth: {
-        username: AMPLITUDE_KEY,
-        password: AMPLITUDE_SECRET,
-      },
-    }
-  ).catch((err) => {
-    console.log(err.response.data);
-  });
-
-  if (response) console.log(`${response.status} ${response.statusText}`);
-}
-
-async function _deleteHabiticaData (user, email) {
-  await User.update(
-    {_id: user._id},
-    {$set: {
-      'auth.local.email': email,
-      'auth.local.hashed_password': '$2a$10$QDnNh1j1yMPnTXDEOV38xOePEWFd4X8DSYwAM8XTmqmacG5X0DKjW',
-      'auth.local.passwordHashMethod': 'bcrypt',
-    }}
-  );
-  const response = await axios.delete(
-    `${BASE_URL}/api/v3/user`,
-    {
-      data: {
-        password: 'test',
-      },
-      headers: {
-        'x-api-user': user._id,
-        'x-api-key': user.apiToken,
-      },
-    }
-  ).catch((err) => {
-    console.log(err.response.data);
-  });
-
-  if (response) {
-    console.log(`${response.status} ${response.statusText}`);
-    if (response.status === 200) console.log(`${user._id} (${email}) removed. Last login: ${user.auth.timestamps.loggedin}`);
-  }
-}
-
-async function _processEmailAddress (email) {
-  const emailRegex = new RegExp(`^${email}`, 'i');
-  const users = await User.find({
-    $or: [
-      {'auth.local.email': emailRegex},
-      {'auth.facebook.emails.value': emailRegex},
-      {'auth.google.emails.value': emailRegex},
-    ]},
-  {
-    _id: 1,
-    apiToken: 1,
-    auth: 1,
-  }).exec();
-
-  if (users.length < 1) {
-    console.log(`No users found with email address ${email}`);
-  } else {
-    for (const user of users) {
-      await _deleteAmplitudeData(user._id, email); // eslint-disable-line no-await-in-loop
-      await _deleteHabiticaData(user, email); // eslint-disable-line no-await-in-loop
-    }
-  }
-}
-
-function deleteUserData (emails) {
-  const emailPromises = emails.map(_processEmailAddress);
-  return Promise.all(emailPromises);
-}
-
-module.exports = deleteUserData;

scripts/paypalBillingSetup.js

@@ -12,27 +12,28 @@ const nconf = require('nconf');
 const _ = require('lodash');
 const paypal = require('paypal-rest-sdk');
 const blocks = require('../website/common').content.subscriptionBlocks;
-const live = nconf.get('PAYPAL_MODE') === 'live';
+const live = nconf.get('PAYPAL:mode') === 'live';
 
 nconf.argv().env().file('user', path.join(path.resolve(__dirname, '../config.json')));
 
-let OP = 'create'; // list get update create create-webprofile
+let OP = 'create'; // list create update remove
 
 paypal.configure({
-  mode: nconf.get('PAYPAL_MODE'), // sandbox or live
-  client_id: nconf.get('PAYPAL_CLIENT_ID'),
-  client_secret: nconf.get('PAYPAL_CLIENT_SECRET'),
+  mode: nconf.get('PAYPAL:mode'), // sandbox or live
+  client_id: nconf.get('PAYPAL:client_id'),
+  client_secret: nconf.get('PAYPAL:client_secret'),
 });
 
 // https://developer.paypal.com/docs/api/#billing-plans-and-agreements
 let billingPlanTitle = 'Habitica Subscription';
 let billingPlanAttributes = {
+  name: billingPlanTitle,
   description: billingPlanTitle,
   type: 'INFINITE',
   merchant_preferences: {
     auto_bill_amount: 'yes',
     cancel_url: live ? 'https://habitica.com' : 'http://localhost:3000',
-    return_url: `${live ? 'https://habitica.com' : 'http://localhost:3000'}/paypal/subscribe/success`,
+    return_url: `${live ? 'https://habitica.com' : 'http://localhost:3000'  }/paypal/subscribe/success`,
   },
   payment_definitions: [{
     type: 'REGULAR',
@@ -44,7 +45,7 @@ let billingPlanAttributes = {
 _.each(blocks, (block) => {
   block.definition = _.cloneDeep(billingPlanAttributes);
   _.merge(block.definition.payment_definitions[0], {
-    name: `${billingPlanTitle} ($${block.price} every ${block.months} months, recurring)`,
+    name: `${billingPlanTitle  } ($${block.price} every ${block.months} months, recurring)`,
     frequency_interval: `${block.months}`,
     amount: {
       currency: 'USD',
@@ -62,7 +63,7 @@ switch (OP) {
     });
     break;
   case 'get':
-    paypal.billingPlan.get(nconf.get('PAYPAL_BILLING_PLANS_basic_12mo'), (err, plan) => {
+    paypal.billingPlan.get(nconf.get('PAYPAL:billing_plans:12'), (err, plan) => {
       console.log({err, plan});
     });
     break;
@@ -74,7 +75,7 @@ switch (OP) {
         cancel_url: 'https://habitica.com',
       },
     };
-    paypal.billingPlan.update(nconf.get('PAYPAL_BILLING_PLANS_basic_12mo'), updatePayload, (err, res) => {
+    paypal.billingPlan.update(nconf.get('PAYPAL:billing_plans:12'), updatePayload, (err, res) => {
       console.log({err, plan: res});
     });
     break;
@@ -100,6 +101,9 @@ switch (OP) {
       });
     });
     break;
+
+  case 'remove': break;
+
   case 'create-webprofile':
     let webexpinfo = {
       name: 'HabiticaProfile',
@@ -112,4 +116,4 @@ switch (OP) {
       console.log(error, result);
     });
     break;
-}
+}

test/README.md

@@ -1 +1 @@
-For information about writing and running tests, see [Using Your Local Install to Modify Habitica's Website and API](http://habitica.fandom.com/wiki/Using_Your_Local_Install_to_Modify_Habitica%27s_Website_and_API).
+For information about writing and running tests, see [Using Your Local Install to Modify Habitica's Website and API](http://habitica.wikia.com/wiki/Using_Your_Local_Install_to_Modify_Habitica%27s_Website_and_API).

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

@@ -1,67 +0,0 @@
-/* eslint-disable camelcase */
-import {
-  validateItemPath,
-  getDefaultOwnedGear,
-} from '../../../../../website/server/libs/items/utils';
-
-describe('Items Utils', () => {
-  describe('getDefaultOwnedGear', () => {
-    it('clones the result object', () => {
-      const res1 = getDefaultOwnedGear();
-      res1.extraProperty = true;
-
-      const res2 = getDefaultOwnedGear();
-      expect(res2).not.to.have.property('extraProperty');
-    });
-  });
-
-  describe('validateItemPath', () => {
-    it('returns false if not an item path', () => {
-      expect(validateItemPath('notitems.gear.owned.item')).to.equal(false);
-    });
-
-    it('returns true if a valid schema path', () => {
-      expect(validateItemPath('items.gear.equipped.weapon')).to.equal(true);
-      expect(validateItemPath('items.currentPet')).to.equal(true);
-      expect(validateItemPath('items.special.snowball')).to.equal(true);
-    });
-
-    it('works with owned gear paths', () => {
-      expect(validateItemPath('items.gear.owned.head_armoire_crownOfHearts')).to.equal(true);
-      expect(validateItemPath('items.gear.owned.head_invalid')).to.equal(false);
-    });
-
-    it('works with pets paths', () => {
-      expect(validateItemPath('items.pets.Wolf-CottonCandyPink')).to.equal(true);
-      expect(validateItemPath('items.pets.Wolf-Invalid')).to.equal(false);
-    });
-
-    it('works with eggs paths', () => {
-      expect(validateItemPath('items.eggs.LionCub')).to.equal(true);
-      expect(validateItemPath('items.eggs.Armadillo')).to.equal(true);
-      expect(validateItemPath('items.eggs.NotAnArmadillo')).to.equal(false);
-    });
-
-    it('works with hatching potions paths', () => {
-      expect(validateItemPath('items.hatchingPotions.Base')).to.equal(true);
-      expect(validateItemPath('items.hatchingPotions.StarryNight')).to.equal(true);
-      expect(validateItemPath('items.hatchingPotions.Invalid')).to.equal(false);
-    });
-
-    it('works with food paths', () => {
-      expect(validateItemPath('items.food.Cake_Base')).to.equal(true);
-      expect(validateItemPath('items.food.Cake_Invalid')).to.equal(false);
-    });
-
-    it('works with mounts paths', () => {
-      expect(validateItemPath('items.mounts.Cactus-Base')).to.equal(true);
-      expect(validateItemPath('items.mounts.Aether-Invisible')).to.equal(true);
-      expect(validateItemPath('items.mounts.Aether-Invalid')).to.equal(false);
-    });
-
-    it('works with quests paths', () => {
-      expect(validateItemPath('items.quests.atom3')).to.equal(true);
-      expect(validateItemPath('items.quests.invalid')).to.equal(false);
-    });
-  });
-});

test/api/v3/integration/challenges/DELETE-challenges_challengeId.test.js

@@ -5,7 +5,7 @@ import {
   sleep,
   checkExistence,
   translate as t,
-} from '../../../../helpers/api-integration/v3';
+} from '../../../../helpers/api-v3-integration.helper';
 import { v4 as generateUUID } from 'uuid';
 
 describe('DELETE /challenges/:challengeId', () => {
@@ -41,7 +41,6 @@ describe('DELETE /challenges/:challengeId', () => {
       group = populatedGroup.group;
 
       challenge = await generateChallenge(groupLeader, group);
-      await groupLeader.post(`/challenges/${challenge._id}/join`);
 
       await groupLeader.post(`/tasks/challenge/${challenge._id}`, [
         {type: 'habit', text: taskText},

test/api/v3/integration/challenges/GET-challenges_challengeId.test.js

@@ -3,7 +3,7 @@ import {
   createAndPopulateGroup,
   generateChallenge,
   translate as t,
-} from '../../../../helpers/api-integration/v3';
+} from '../../../../helpers/api-v3-integration.helper';
 import { v4 as generateUUID } from 'uuid';
 
 describe('GET /challenges/:challengeId', () => {
@@ -33,11 +33,9 @@ describe('GET /challenges/:challengeId', () => {
       group = populatedGroup.group;
 
       challenge = await generateChallenge(groupLeader, group);
-      await groupLeader.post(`/challenges/${challenge._id}/join`);
     });
 
     it('should return challenge data', async () => {
-      await challenge.sync();
       let chal = await user.get(`/challenges/${challenge._id}`);
       expect(chal.memberCount).to.equal(challenge.memberCount);
       expect(chal.name).to.equal(challenge.name);
@@ -47,14 +45,6 @@ describe('GET /challenges/:challengeId', () => {
         _id: groupLeader._id,
         id: groupLeader._id,
         profile: {name: groupLeader.profile.name},
-        auth: {
-          local: {
-            username: groupLeader.auth.local.username,
-          },
-        },
-        flags: {
-          verifiedUsername: true,
-        },
       });
       expect(chal.group).to.eql({
         _id: group._id,
@@ -71,56 +61,44 @@ describe('GET /challenges/:challengeId', () => {
 
   context('private guild', () => {
     let groupLeader;
-    let challengeLeader;
     let group;
     let challenge;
     let members;
-    let nonMember;
-    let otherMember;
+    let user;
 
     beforeEach(async () => {
-      nonMember = await generateUser();
+      user = await generateUser();
 
       let populatedGroup = await createAndPopulateGroup({
         groupDetails: {type: 'guild', privacy: 'private'},
-        members: 2,
+        members: 1,
       });
 
       groupLeader = populatedGroup.groupLeader;
       group = populatedGroup.group;
       members = populatedGroup.members;
 
-      challengeLeader = members[0];
-      otherMember = members[1];
-
-      challenge = await generateChallenge(challengeLeader, group);
+      challenge = await generateChallenge(groupLeader, group);
+      await members[0].post(`/challenges/${challenge._id}/join`);
     });
 
-    it('fails if user isn\'t in the guild and isn\'t challenge leader', async () => {
-      await expect(nonMember.get(`/challenges/${challenge._id}`)).to.eventually.be.rejected.and.eql({
+    it('fails if user doesn\'t have access to the challenge', async () => {
+      await expect(user.get(`/challenges/${challenge._id}`)).to.eventually.be.rejected.and.eql({
         code: 404,
         error: 'NotFound',
         message: t('challengeNotFound'),
       });
     });
 
-    it('returns challenge data for any user in the guild', async () => {
-      let chal = await otherMember.get(`/challenges/${challenge._id}`);
+    it('should return challenge data', async () => {
+      let chal = await members[0].get(`/challenges/${challenge._id}`);
       expect(chal.name).to.equal(challenge.name);
       expect(chal._id).to.equal(challenge._id);
 
       expect(chal.leader).to.eql({
-        _id: challengeLeader._id,
-        id: challengeLeader._id,
-        profile: {name: challengeLeader.profile.name},
-        auth: {
-          local: {
-            username: challengeLeader.auth.local.username,
-          },
-        },
-        flags: {
-          verifiedUsername: true,
-        },
+        _id: groupLeader._id,
+        id: groupLeader._id,
+        profile: {name: groupLeader.profile.name},
       });
       expect(chal.group).to.eql({
         _id: group._id,
@@ -133,88 +111,52 @@ describe('GET /challenges/:challengeId', () => {
         leader: groupLeader.id,
       });
     });
-
-    it('returns challenge data if challenge leader isn\'t in the guild or challenge', async () => {
-      await challengeLeader.post(`/groups/${group._id}/leave`);
-      await challengeLeader.sync();
-      expect(challengeLeader.guilds).to.be.empty; // check that leaving worked
-
-      let chal = await challengeLeader.get(`/challenges/${challenge._id}`);
-      expect(chal.name).to.equal(challenge.name);
-      expect(chal._id).to.equal(challenge._id);
-
-      expect(chal.leader).to.eql({
-        _id: challengeLeader._id,
-        id: challengeLeader._id,
-        profile: {name: challengeLeader.profile.name},
-        auth: {
-          local: {
-            username: challengeLeader.auth.local.username,
-          },
-        },
-        flags: {
-          verifiedUsername: true,
-        },
-      });
-    });
   });
 
   context('party', () => {
     let groupLeader;
-    let challengeLeader;
     let group;
     let challenge;
     let members;
-    let nonMember;
-    let otherMember;
+    let user;
 
     beforeEach(async () => {
-      nonMember = await generateUser();
+      user = await generateUser();
 
       let populatedGroup = await createAndPopulateGroup({
-        groupDetails: {type: 'party', privacy: 'private'},
-        members: 2,
+        groupDetails: {type: 'party'},
+        members: 1,
       });
 
       groupLeader = populatedGroup.groupLeader;
       group = populatedGroup.group;
       members = populatedGroup.members;
 
-      challengeLeader = members[0];
-      otherMember = members[1];
-
-      challenge = await generateChallenge(challengeLeader, group);
+      challenge = await generateChallenge(groupLeader, group);
+      await members[0].post(`/challenges/${challenge._id}/join`);
     });
 
-    it('fails if user isn\'t in the party and isn\'t challenge leader', async () => {
-      await expect(nonMember.get(`/challenges/${challenge._id}`)).to.eventually.be.rejected.and.eql({
+    it('fails if user doesn\'t have access to the challenge', async () => {
+      await expect(user.get(`/challenges/${challenge._id}`)).to.eventually.be.rejected.and.eql({
         code: 404,
         error: 'NotFound',
         message: t('challengeNotFound'),
       });
     });
 
-    it('returns challenge data for any user in the party', async () => {
-      let chal = await otherMember.get(`/challenges/${challenge._id}`);
+    it('should return challenge data', async () => {
+      let chal = await members[0].get(`/challenges/${challenge._id}`);
       expect(chal.name).to.equal(challenge.name);
       expect(chal._id).to.equal(challenge._id);
 
       expect(chal.leader).to.eql({
-        _id: challengeLeader._id,
-        id: challengeLeader._id,
-        profile: {name: challengeLeader.profile.name},
-        auth: {
-          local: {
-            username: challengeLeader.auth.local.username,
-          },
-        },
-        flags: {
-          verifiedUsername: true,
-        },
+        _id: groupLeader._id,
+        id: groupLeader.id,
+        profile: {name: groupLeader.profile.name},
       });
       expect(chal.group).to.eql({
         _id: group._id,
-        id: group._id,
+        id: group.id,
         categories: [],
         name: group.name,
         summary: group.name,
@@ -223,29 +165,5 @@ describe('GET /challenges/:challengeId', () => {
         leader: groupLeader.id,
       });
     });
-
-    it('returns challenge data if challenge leader isn\'t in the party or challenge', async () => {
-      await challengeLeader.post('/groups/party/leave');
-      await challengeLeader.sync();
-      expect(challengeLeader.party._id).to.be.undefined; // check that leaving worked
-
-      let chal = await challengeLeader.get(`/challenges/${challenge._id}`);
-      expect(chal.name).to.equal(challenge.name);
-      expect(chal._id).to.equal(challenge._id);
-
-      expect(chal.leader).to.eql({
-        _id: challengeLeader._id,
-        id: challengeLeader._id,
-        profile: {name: challengeLeader.profile.name},
-        auth: {
-          local: {
-            username: challengeLeader.auth.local.username,
-          },
-        },
-        flags: {
-          verifiedUsername: true,
-        },
-      });
-    });
   });
 });

test/api/v3/integration/challenges/GET-challenges_challengeId_export_csv.test.js

@@ -4,7 +4,7 @@ import {
   generateChallenge,
   translate as t,
   sleep,
-} from '../../../../helpers/api-integration/v3';
+} from '../../../../helpers/api-v3-integration.helper';
 import { v4 as generateUUID } from 'uuid';
 
 describe('GET /challenges/:challengeId/export/csv', () => {
@@ -24,7 +24,6 @@ describe('GET /challenges/:challengeId/export/csv', () => {
     members = populatedGroup.members;
 
     challenge = await generateChallenge(groupLeader, group);
-    await groupLeader.post(`/challenges/${challenge._id}/join`);
     await members[0].post(`/challenges/${challenge._id}/join`);
     await members[1].post(`/challenges/${challenge._id}/join`);
     await members[2].post(`/challenges/${challenge._id}/join`);
@@ -65,11 +64,11 @@ describe('GET /challenges/:challengeId/export/csv', () => {
     const sortedMembers = _.sortBy([members[0], members[1], members[2], groupLeader], '_id');
     const splitRes = res.split('\n');
 
-    expect(splitRes[0]).to.equal('UUID,Display Name,Username,Task,Value,Notes,Streak,Task,Value,Notes,Streak');
-    expect(splitRes[1]).to.equal(`${sortedMembers[0]._id},${sortedMembers[0].profile.name},${sortedMembers[0].auth.local.username},habit:Task 1,0,,0,todo:Task 2,0,,0`);
-    expect(splitRes[2]).to.equal(`${sortedMembers[1]._id},${sortedMembers[1].profile.name},${sortedMembers[1].auth.local.username},habit:Task 1,0,,0,todo:Task 2,0,,0`);
-    expect(splitRes[3]).to.equal(`${sortedMembers[2]._id},${sortedMembers[2].profile.name},${sortedMembers[2].auth.local.username},habit:Task 1,0,,0,todo:Task 2,0,,0`);
-    expect(splitRes[4]).to.equal(`${sortedMembers[3]._id},${sortedMembers[3].profile.name},${sortedMembers[3].auth.local.username},habit:Task 1,0,,0,todo:Task 2,0,,0`);
+    expect(splitRes[0]).to.equal('UUID,name,Task,Value,Notes,Streak,Task,Value,Notes,Streak');
+    expect(splitRes[1]).to.equal(`${sortedMembers[0]._id},${sortedMembers[0].profile.name},habit:Task 1,0,,0,todo:Task 2,0,,0`);
+    expect(splitRes[2]).to.equal(`${sortedMembers[1]._id},${sortedMembers[1].profile.name},habit:Task 1,0,,0,todo:Task 2,0,,0`);
+    expect(splitRes[3]).to.equal(`${sortedMembers[2]._id},${sortedMembers[2].profile.name},habit:Task 1,0,,0,todo:Task 2,0,,0`);
+    expect(splitRes[4]).to.equal(`${sortedMembers[3]._id},${sortedMembers[3].profile.name},habit:Task 1,0,,0,todo:Task 2,0,,0`);
     expect(splitRes[5]).to.equal('');
   });
 
@@ -78,10 +77,10 @@ describe('GET /challenges/:challengeId/export/csv', () => {
     const res = await members[1].get(`/challenges/${challenge._id}/export/csv`);
     const sortedMembers = _.sortBy([members[1], members[2], groupLeader], '_id');
     const splitRes = res.split('\n');
-    expect(splitRes[0]).to.equal('UUID,Display Name,Username,Task,Value,Notes,Streak,Task,Value,Notes,Streak');
-    expect(splitRes[1]).to.equal(`${sortedMembers[0]._id},${sortedMembers[0].profile.name},${sortedMembers[0].auth.local.username},habit:Task 1,0,,0,todo:Task 2,0,,0`);
-    expect(splitRes[2]).to.equal(`${sortedMembers[1]._id},${sortedMembers[1].profile.name},${sortedMembers[1].auth.local.username},habit:Task 1,0,,0,todo:Task 2,0,,0`);
-    expect(splitRes[3]).to.equal(`${sortedMembers[2]._id},${sortedMembers[2].profile.name},${sortedMembers[2].auth.local.username},habit:Task 1,0,,0,todo:Task 2,0,,0`);
+    expect(splitRes[0]).to.equal('UUID,name,Task,Value,Notes,Streak,Task,Value,Notes,Streak');
+    expect(splitRes[1]).to.equal(`${sortedMembers[0]._id},${sortedMembers[0].profile.name},habit:Task 1,0,,0,todo:Task 2,0,,0`);
+    expect(splitRes[2]).to.equal(`${sortedMembers[1]._id},${sortedMembers[1].profile.name},habit:Task 1,0,,0,todo:Task 2,0,,0`);
+    expect(splitRes[3]).to.equal(`${sortedMembers[2]._id},${sortedMembers[2].profile.name},habit:Task 1,0,,0,todo:Task 2,0,,0`);
     expect(splitRes[4]).to.equal('');
   });
 });

test/api/v3/integration/challenges/GET-challenges_challengeId_members.test.js

@@ -1,17 +1,16 @@
 import {
   generateUser,
   generateGroup,
-  createAndPopulateGroup,
   generateChallenge,
   translate as t,
-} from '../../../../helpers/api-integration/v3';
+} from '../../../../helpers/api-v3-integration.helper';
 import { v4 as generateUUID } from 'uuid';
 
 describe('GET /challenges/:challengeId/members', () => {
   let user;
 
   beforeEach(async () => {
-    user = await generateUser({ balance: 1 });
+    user = await generateUser();
   });
 
   it('validates optional req.query.lastId to be an UUID', async () => {
@@ -22,7 +21,7 @@ describe('GET /challenges/:challengeId/members', () => {
     });
   });
 
-  it('fails if challenge doesn\'t exist', async () => {
+  it('fails if challenge doesn\'t exists', async () => {
     await expect(user.get(`/challenges/${generateUUID()}/members`)).to.eventually.be.rejected.and.eql({
       code: 404,
       error: 'NotFound',
@@ -30,8 +29,8 @@ describe('GET /challenges/:challengeId/members', () => {
     });
   });
 
-  it('fails if user isn\'t in the private group and isn\'t challenge leader', async () => {
-    let group = await generateGroup(user, {type: 'party', privacy: 'private'});
+  it('fails if user doesn\'t have access to the challenge', async () => {
+    let group = await generateGroup(user);
     let challenge = await generateChallenge(user, group);
     let anotherUser = await generateUser();
 
@@ -42,55 +41,17 @@ describe('GET /challenges/:challengeId/members', () => {
     });
   });
 
-  it('works if user isn\'t in the private group but is challenge leader', async () => {
-    let populatedGroup = await createAndPopulateGroup({
-      groupDetails: {type: 'party', privacy: 'private'},
-      members: 1,
-    });
-    let groupLeader = populatedGroup.groupLeader;
-    let challengeLeader = populatedGroup.members[0];
-    let challenge = await generateChallenge(challengeLeader, populatedGroup.group);
-    await groupLeader.post(`/challenges/${challenge._id}/join`);
-    await challengeLeader.post('/groups/party/leave');
-    await challengeLeader.sync();
-    expect(challengeLeader.party._id).to.be.undefined; // check that leaving worked
-
-    let res = await challengeLeader.get(`/challenges/${challenge._id}/members`);
-    expect(res[0]).to.eql({
-      _id: groupLeader._id,
-      id: groupLeader._id,
-      profile: {name: groupLeader.profile.name},
-      auth: {
-        local: {
-          username: groupLeader.auth.local.username,
-        },
-      },
-      flags: {
-        verifiedUsername: true,
-      },
-    });
-  });
-
   it('works with challenges belonging to public guild', async () => {
     let leader = await generateUser({balance: 4});
     let group = await generateGroup(leader, {type: 'guild', privacy: 'public', name: generateUUID()});
     let challenge = await generateChallenge(leader, group);
-    await leader.post(`/challenges/${challenge._id}/join`);
     let res = await user.get(`/challenges/${challenge._id}/members`);
     expect(res[0]).to.eql({
       _id: leader._id,
       id: leader._id,
       profile: {name: leader.profile.name},
-      auth: {
-        local: {
-          username: leader.auth.local.username,
-        },
-      },
-      flags: {
-        verifiedUsername: true,
-      },
     });
-    expect(res[0]).to.have.all.keys(['_id', 'auth', 'flags', 'id', 'profile']);
+    expect(res[0]).to.have.all.keys(['_id', 'id', 'profile']);
     expect(res[0].profile).to.have.all.keys(['name']);
   });
 
@@ -98,29 +59,19 @@ describe('GET /challenges/:challengeId/members', () => {
     let anotherUser = await generateUser({balance: 3});
     let group = await generateGroup(anotherUser, {type: 'guild', privacy: 'public', name: generateUUID()});
     let challenge = await generateChallenge(anotherUser, group);
-    await anotherUser.post(`/challenges/${challenge._id}/join`);
     let res = await user.get(`/challenges/${challenge._id}/members`);
     expect(res[0]).to.eql({
       _id: anotherUser._id,
       id: anotherUser._id,
       profile: {name: anotherUser.profile.name},
-      auth: {
-        local: {
-          username: anotherUser.auth.local.username,
-        },
-      },
-      flags: {
-        verifiedUsername: true,
-      },
     });
-    expect(res[0]).to.have.all.keys(['_id', 'auth', 'flags', 'id', 'profile']);
+    expect(res[0]).to.have.all.keys(['_id', 'id', 'profile']);
     expect(res[0].profile).to.have.all.keys(['name']);
   });
 
   it('returns only first 30 members if req.query.includeAllMembers is not true', async () => {
     let group = await generateGroup(user, {type: 'party', name: generateUUID()});
     let challenge = await generateChallenge(user, group);
-    await user.post(`/challenges/${challenge._id}/join`);
 
     let usersToGenerate = [];
     for (let i = 0; i < 31; i++) {
@@ -131,7 +82,7 @@ describe('GET /challenges/:challengeId/members', () => {
     let res = await user.get(`/challenges/${challenge._id}/members?includeAllMembers=not-true`);
     expect(res.length).to.equal(30);
     res.forEach(member => {
-      expect(member).to.have.all.keys(['_id', 'auth', 'flags', 'id', 'profile']);
+      expect(member).to.have.all.keys(['_id', 'id', 'profile']);
       expect(member.profile).to.have.all.keys(['name']);
     });
   });
@@ -139,7 +90,6 @@ describe('GET /challenges/:challengeId/members', () => {
   it('returns only first 30 members if req.query.includeAllMembers is not defined', async () => {
     let group = await generateGroup(user, {type: 'party', name: generateUUID()});
     let challenge = await generateChallenge(user, group);
-    await user.post(`/challenges/${challenge._id}/join`);
 
     let usersToGenerate = [];
     for (let i = 0; i < 31; i++) {
@@ -150,7 +100,7 @@ describe('GET /challenges/:challengeId/members', () => {
     let res = await user.get(`/challenges/${challenge._id}/members`);
     expect(res.length).to.equal(30);
     res.forEach(member => {
-      expect(member).to.have.all.keys(['_id', 'auth', 'flags', 'id', 'profile']);
+      expect(member).to.have.all.keys(['_id', 'id', 'profile']);
       expect(member.profile).to.have.all.keys(['name']);
     });
   });
@@ -158,7 +108,6 @@ describe('GET /challenges/:challengeId/members', () => {
   it('returns all members if req.query.includeAllMembers is true', async () => {
     let group = await generateGroup(user, {type: 'party', name: generateUUID()});
     let challenge = await generateChallenge(user, group);
-    await user.post(`/challenges/${challenge._id}/join`);
 
     let usersToGenerate = [];
     for (let i = 0; i < 31; i++) {
@@ -169,16 +118,14 @@ describe('GET /challenges/:challengeId/members', () => {
     let res = await user.get(`/challenges/${challenge._id}/members?includeAllMembers=true`);
     expect(res.length).to.equal(32);
     res.forEach(member => {
-      expect(member).to.have.all.keys(['_id', 'auth', 'flags', 'id', 'profile']);
+      expect(member).to.have.all.keys(['_id', 'id', 'profile']);
       expect(member.profile).to.have.all.keys(['name']);
     });
   });
 
-  it('supports using req.query.lastId to get more members', async function () {
-    this.timeout(30000); // @TODO: times out after 8 seconds
+  it('supports using req.query.lastId to get more members', async () => {
     let group = await generateGroup(user, {type: 'party', name: generateUUID()});
     let challenge = await generateChallenge(user, group);
-    await user.post(`/challenges/${challenge._id}/join`);
 
     let usersToGenerate = [];
     for (let i = 0; i < 57; i++) {
@@ -199,7 +146,6 @@ describe('GET /challenges/:challengeId/members', () => {
   it('supports using req.query.search to get search members', async () => {
     let group = await generateGroup(user, {type: 'party', name: generateUUID()});
     let challenge = await generateChallenge(user, group);
-    await user.post(`/challenges/${challenge._id}/join`);
 
     let usersToGenerate = [];
     for (let i = 0; i < 3; i++) {

test/api/v3/integration/challenges/GET-challenges_challengeId_members_memberId.test.js

@@ -3,7 +3,7 @@ import {
   generateChallenge,
   generateGroup,
   translate as t,
-} from '../../../../helpers/api-integration/v3';
+} from '../../../../helpers/api-v3-integration.helper';
 import { v4 as generateUUID } from 'uuid';
 
 describe('GET /challenges/:challengeId/members/:memberId', () => {
@@ -50,7 +50,6 @@ describe('GET /challenges/:challengeId/members/:memberId', () => {
   it('fails if user doesn\'t have access to the challenge', async () => {
     let group = await generateGroup(user, {type: 'party', name: generateUUID()});
     let challenge = await generateChallenge(user, group);
-    await user.post(`/challenges/${challenge._id}/join`);
     let anotherUser = await generateUser();
     let member = await generateUser();
     await expect(anotherUser.get(`/challenges/${challenge._id}/members/${member._id}`)).to.eventually.be.rejected.and.eql({
@@ -63,7 +62,6 @@ describe('GET /challenges/:challengeId/members/:memberId', () => {
   it('fails if member is not part of the challenge', async () => {
     let group = await generateGroup(user, {type: 'party', name: generateUUID()});
     let challenge = await generateChallenge(user, group);
-    await user.post(`/challenges/${challenge._id}/join`);
     let member = await generateUser();
     await expect(user.get(`/challenges/${challenge._id}/members/${member._id}`)).to.eventually.be.rejected.and.eql({
       code: 404,
@@ -76,12 +74,11 @@ describe('GET /challenges/:challengeId/members/:memberId', () => {
     let groupLeader = await generateUser({balance: 4});
     let group = await generateGroup(groupLeader, {type: 'guild', privacy: 'public', name: generateUUID()});
     let challenge = await generateChallenge(groupLeader, group);
-    await groupLeader.post(`/challenges/${challenge._id}/join`);
     let taskText = 'Test Text';
     await groupLeader.post(`/tasks/challenge/${challenge._id}`, [{type: 'habit', text: taskText}]);
 
     let memberProgress = await user.get(`/challenges/${challenge._id}/members/${groupLeader._id}`);
-    expect(memberProgress).to.have.all.keys(['_id', 'auth', 'flags', 'id', 'profile', 'tasks']);
+    expect(memberProgress).to.have.all.keys(['_id', 'id', 'profile', 'tasks']);
     expect(memberProgress.profile).to.have.all.keys(['name']);
     expect(memberProgress.tasks.length).to.equal(1);
   });
@@ -89,7 +86,6 @@ describe('GET /challenges/:challengeId/members/:memberId', () => {
   it('returns the member tasks for the challenges', async () => {
     let group = await generateGroup(user, {type: 'party', name: generateUUID()});
     let challenge = await generateChallenge(user, group);
-    await user.post(`/challenges/${challenge._id}/join`);
     await user.post(`/tasks/challenge/${challenge._id}`, [{type: 'habit', text: 'Test Text'}]);
 
     let memberProgress = await user.get(`/challenges/${challenge._id}/members/${user._id}`);
@@ -102,7 +98,6 @@ describe('GET /challenges/:challengeId/members/:memberId', () => {
   it('returns the tasks without the tags and checklist', async () => {
     let group = await generateGroup(user, {type: 'party', name: generateUUID()});
     let challenge = await generateChallenge(user, group);
-    await user.post(`/challenges/${challenge._id}/join`);
     let taskText = 'Test Text';
     await user.post(`/tasks/challenge/${challenge._id}`, [{
       type: 'todo',

test/api/v3/integration/challenges/GET-challenges_group_groupid.test.js

@@ -3,7 +3,7 @@ import {
   generateChallenge,
   createAndPopulateGroup,
   translate as t,
-} from '../../../../helpers/api-integration/v3';
+} from '../../../../helpers/api-v3-integration.helper';
 import { TAVERN_ID } from '../../../../../website/common/script/constants';
 
 describe('GET challenges/groups/:groupId', () => {
@@ -25,9 +25,7 @@ describe('GET challenges/groups/:groupId', () => {
       nonMember = await generateUser();
 
       challenge = await generateChallenge(user, group);
-      await user.post(`/challenges/${challenge._id}/join`);
       challenge2 = await generateChallenge(user, group);
-      await user.post(`/challenges/${challenge2._id}/join`);
     });
 
     it('should return group challenges for non member with populated leader', async () => {
@@ -39,14 +37,6 @@ describe('GET challenges/groups/:groupId', () => {
         _id: publicGuild.leader._id,
         id: publicGuild.leader._id,
         profile: {name: user.profile.name},
-        auth: {
-          local: {
-            username: user.auth.local.username,
-          },
-        },
-        flags: {
-          verifiedUsername: true,
-        },
       });
       let foundChallenge2 = _.find(challenges, { _id: challenge2._id });
       expect(foundChallenge2).to.exist;
@@ -54,14 +44,6 @@ describe('GET challenges/groups/:groupId', () => {
         _id: publicGuild.leader._id,
         id: publicGuild.leader._id,
         profile: {name: user.profile.name},
-        auth: {
-          local: {
-            username: user.auth.local.username,
-          },
-        },
-        flags: {
-          verifiedUsername: true,
-        },
       });
     });
 
@@ -74,14 +56,6 @@ describe('GET challenges/groups/:groupId', () => {
         _id: publicGuild.leader._id,
         id: publicGuild.leader._id,
         profile: {name: user.profile.name},
-        auth: {
-          local: {
-            username: user.auth.local.username,
-          },
-        },
-        flags: {
-          verifiedUsername: true,
-        },
       });
       let foundChallenge2 = _.find(challenges, { _id: challenge2._id });
       expect(foundChallenge2).to.exist;
@@ -89,14 +63,6 @@ describe('GET challenges/groups/:groupId', () => {
         _id: publicGuild.leader._id,
         id: publicGuild.leader._id,
         profile: {name: user.profile.name},
-        auth: {
-          local: {
-            username: user.auth.local.username,
-          },
-        },
-        flags: {
-          verifiedUsername: true,
-        },
       });
     });
 
@@ -107,7 +73,6 @@ describe('GET challenges/groups/:groupId', () => {
       expect(foundChallengeIndex).to.eql(0);
 
       let newChallenge = await generateChallenge(user, publicGuild);
-      await user.post(`/challenges/${newChallenge._id}/join`);
 
       challenges = await user.get(`/challenges/groups/${publicGuild._id}`);
 
@@ -134,9 +99,7 @@ describe('GET challenges/groups/:groupId', () => {
       nonMember = await generateUser();
 
       challenge = await generateChallenge(user, group);
-      await user.post(`/challenges/${challenge._id}/join`);
       challenge2 = await generateChallenge(user, group);
-      await user.post(`/challenges/${challenge2._id}/join`);
     });
 
     it('should prevent non-member from seeing challenges', async () => {
@@ -157,14 +120,6 @@ describe('GET challenges/groups/:groupId', () => {
         _id: privateGuild.leader._id,
         id: privateGuild.leader._id,
         profile: {name: user.profile.name},
-        auth: {
-          local: {
-            username: user.auth.local.username,
-          },
-        },
-        flags: {
-          verifiedUsername: true,
-        },
       });
       let foundChallenge2 = _.find(challenges, { _id: challenge2._id });
       expect(foundChallenge2).to.exist;
@@ -172,14 +127,6 @@ describe('GET challenges/groups/:groupId', () => {
         _id: privateGuild.leader._id,
         id: privateGuild.leader._id,
         profile: {name: user.profile.name},
-        auth: {
-          local: {
-            username: user.auth.local.username,
-          },
-        },
-        flags: {
-          verifiedUsername: true,
-        },
       });
     });
   });
@@ -209,12 +156,9 @@ describe('GET challenges/groups/:groupId', () => {
           slug: 'habitica_official',
         }],
       });
-      await user.post(`/challenges/${officialChallenge._id}/join`);
 
       challenge = await generateChallenge(user, group);
-      await user.post(`/challenges/${challenge._id}/join`);
       challenge2 = await generateChallenge(user, group);
-      await user.post(`/challenges/${challenge2._id}/join`);
     });
 
     it('should return official challenges first', async () => {
@@ -234,7 +178,6 @@ describe('GET challenges/groups/:groupId', () => {
       expect(foundChallengeIndex).to.eql(1);
 
       let newChallenge = await generateChallenge(user, publicGuild);
-      await user.post(`/challenges/${newChallenge._id}/join`);
 
       challenges = await user.get(`/challenges/groups/${publicGuild._id}`);
 
@@ -260,9 +203,7 @@ describe('GET challenges/groups/:groupId', () => {
       nonMember = await generateUser();
 
       challenge = await generateChallenge(user, group);
-      await user.post(`/challenges/${challenge._id}/join`);
       challenge2 = await generateChallenge(user, group);
-      await user.post(`/challenges/${challenge2._id}/join`);
     });
 
     it('should prevent non-member from seeing challenges', async () => {
@@ -283,14 +224,6 @@ describe('GET challenges/groups/:groupId', () => {
         _id: party.leader._id,
         id: party.leader._id,
         profile: {name: user.profile.name},
-        auth: {
-          local: {
-            username: user.auth.local.username,
-          },
-        },
-        flags: {
-          verifiedUsername: true,
-        },
       });
       let foundChallenge2 = _.find(challenges, { _id: challenge2._id });
       expect(foundChallenge2).to.exist;
@@ -298,14 +231,6 @@ describe('GET challenges/groups/:groupId', () => {
         _id: party.leader._id,
         id: party.leader._id,
         profile: {name: user.profile.name},
-        auth: {
-          local: {
-            username: user.auth.local.username,
-          },
-        },
-        flags: {
-          verifiedUsername: true,
-        },
       });
     });
 
@@ -318,14 +243,6 @@ describe('GET challenges/groups/:groupId', () => {
         _id: party.leader._id,
         id: party.leader._id,
         profile: {name: user.profile.name},
-        auth: {
-          local: {
-            username: user.auth.local.username,
-          },
-        },
-        flags: {
-          verifiedUsername: true,
-        },
       });
       let foundChallenge2 = _.find(challenges, { _id: challenge2._id });
       expect(foundChallenge2).to.exist;
@@ -333,14 +250,6 @@ describe('GET challenges/groups/:groupId', () => {
         _id: party.leader._id,
         id: party.leader._id,
         profile: {name: user.profile.name},
-        auth: {
-          local: {
-            username: user.auth.local.username,
-          },
-        },
-        flags: {
-          verifiedUsername: true,
-        },
       });
     });
   });
@@ -354,9 +263,7 @@ describe('GET challenges/groups/:groupId', () => {
       tavern = await user.get(`/groups/${TAVERN_ID}`);
 
       challenge = await generateChallenge(user, tavern, {prize: 1});
-      await user.post(`/challenges/${challenge._id}/join`);
       challenge2 = await generateChallenge(user, tavern, {prize: 1});
-      await user.post(`/challenges/${challenge2._id}/join`);
     });
 
     it('should return tavern challenges with populated leader', async () => {
@@ -368,14 +275,6 @@ describe('GET challenges/groups/:groupId', () => {
         _id: user._id,
         id: user._id,
         profile: {name: user.profile.name},
-        auth: {
-          local: {
-            username: user.auth.local.username,
-          },
-        },
-        flags: {
-          verifiedUsername: true,
-        },
       });
       let foundChallenge2 = _.find(challenges, { _id: challenge2._id });
       expect(foundChallenge2).to.exist;
@@ -383,14 +282,6 @@ describe('GET challenges/groups/:groupId', () => {
         _id: user._id,
         id: user._id,
         profile: {name: user.profile.name},
-        auth: {
-          local: {
-            username: user.auth.local.username,
-          },
-        },
-        flags: {
-          verifiedUsername: true,
-        },
       });
     });
 
@@ -403,14 +294,6 @@ describe('GET challenges/groups/:groupId', () => {
         _id: user._id,
         id: user._id,
         profile: {name: user.profile.name},
-        auth: {
-          local: {
-            username: user.auth.local.username,
-          },
-        },
-        flags: {
-          verifiedUsername: true,
-        },
       });
       let foundChallenge2 = _.find(challenges, { _id: challenge2._id });
       expect(foundChallenge2).to.exist;
@@ -418,14 +301,6 @@ describe('GET challenges/groups/:groupId', () => {
         _id: user._id,
         id: user._id,
         profile: {name: user.profile.name},
-        auth: {
-          local: {
-            username: user.auth.local.username,
-          },
-        },
-        flags: {
-          verifiedUsername: true,
-        },
       });
     });
   });

test/api/v3/integration/challenges/GET-challenges_user.test.js

@@ -2,7 +2,7 @@ import {
   generateUser,
   generateChallenge,
   createAndPopulateGroup,
-} from '../../../../helpers/api-integration/v3';
+} from '../../../../helpers/api-v3-integration.helper';
 
 describe('GET challenges/user', () => {
   context('no official challenges', () => {
@@ -24,9 +24,7 @@ describe('GET challenges/user', () => {
       nonMember = await generateUser();
 
       challenge = await generateChallenge(user, group);
-      await user.post(`/challenges/${challenge._id}/join`);
       challenge2 = await generateChallenge(user, group);
-      await user.post(`/challenges/${challenge2._id}/join`);
     });
 
     it('should return challenges user has joined', async () => {
@@ -40,14 +38,6 @@ describe('GET challenges/user', () => {
         _id: publicGuild.leader._id,
         id: publicGuild.leader._id,
         profile: {name: user.profile.name},
-        auth: {
-          local: {
-            username: user.auth.local.username,
-          },
-        },
-        flags: {
-          verifiedUsername: true,
-        },
       });
       expect(foundChallenge.group).to.eql({
         _id: publicGuild._id,
@@ -70,14 +60,6 @@ describe('GET challenges/user', () => {
         _id: publicGuild.leader._id,
         id: publicGuild.leader._id,
         profile: {name: user.profile.name},
-        auth: {
-          local: {
-            username: user.auth.local.username,
-          },
-        },
-        flags: {
-          verifiedUsername: true,
-        },
       });
       expect(foundChallenge1.group).to.eql({
         _id: publicGuild._id,
@@ -95,14 +77,6 @@ describe('GET challenges/user', () => {
         _id: publicGuild.leader._id,
         id: publicGuild.leader._id,
         profile: {name: user.profile.name},
-        auth: {
-          local: {
-            username: user.auth.local.username,
-          },
-        },
-        flags: {
-          verifiedUsername: true,
-        },
       });
       expect(foundChallenge2.group).to.eql({
         _id: publicGuild._id,
@@ -125,14 +99,6 @@ describe('GET challenges/user', () => {
         _id: publicGuild.leader._id,
         id: publicGuild.leader._id,
         profile: {name: user.profile.name},
-        auth: {
-          local: {
-            username: user.auth.local.username,
-          },
-        },
-        flags: {
-          verifiedUsername: true,
-        },
       });
       expect(foundChallenge1.group).to.eql({
         _id: publicGuild._id,
@@ -150,14 +116,6 @@ describe('GET challenges/user', () => {
         _id: publicGuild.leader._id,
         id: publicGuild.leader._id,
         profile: {name: user.profile.name},
-        auth: {
-          local: {
-            username: user.auth.local.username,
-          },
-        },
-        flags: {
-          verifiedUsername: true,
-        },
       });
       expect(foundChallenge2.group).to.eql({
         _id: publicGuild._id,
@@ -188,7 +146,6 @@ describe('GET challenges/user', () => {
       expect(foundChallengeIndex).to.eql(0);
 
       let newChallenge = await generateChallenge(user, publicGuild);
-      await user.post(`/challenges/${newChallenge._id}/join`);
 
       challenges = await user.get('/challenges/user');
 
@@ -207,7 +164,6 @@ describe('GET challenges/user', () => {
       });
 
       let privateChallenge = await generateChallenge(groupLeader, group);
-      await groupLeader.post(`/challenges/${privateChallenge._id}/join`);
 
       let challenges = await nonMember.get('/challenges/user');
 
@@ -242,12 +198,9 @@ describe('GET challenges/user', () => {
           slug: 'habitica_official',
         }],
       });
-      await user.post(`/challenges/${officialChallenge._id}/join`);
 
       challenge = await generateChallenge(user, group);
-      await user.post(`/challenges/${challenge._id}/join`);
       challenge2 = await generateChallenge(user, group);
-      await user.post(`/challenges/${challenge2._id}/join`);
     });
 
     it('should return official challenges first', async () => {
@@ -267,7 +220,6 @@ describe('GET challenges/user', () => {
       expect(foundChallengeIndex).to.eql(1);
 
       let newChallenge = await generateChallenge(user, publicGuild);
-      await user.post(`/challenges/${newChallenge._id}/join`);
 
       challenges = await user.get('/challenges/user');
 
@@ -300,14 +252,12 @@ describe('GET challenges/user', () => {
       await user.update({balance: 20});
 
       for (let i = 0; i < 11; i += 1) {
-        let challenge = await generateChallenge(user, group); // eslint-disable-line
-        await user.post(`/challenges/${challenge._id}/join`); // eslint-disable-line
+        await generateChallenge(user, group); // eslint-disable-line
       }
     });
 
     it('returns public guilds filtered by category', async () => {
       const categoryChallenge = await generateChallenge(user, guild, {categories});
-      await user.post(`/challenges/${categoryChallenge._id}/join`);
       const challenges = await user.get(`/challenges/user?categories=${categories[0].slug}`);
 
       expect(challenges[0]._id).to.eql(categoryChallenge._id);

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

@@ -2,7 +2,7 @@ import {
   generateUser,
   createAndPopulateGroup,
   translate as t,
-} from '../../../../helpers/api-integration/v3';
+} from '../../../../helpers/api-v3-integration.helper';
 import { v4 as generateUUID } from 'uuid';
 
 describe('POST /challenges', () => {
@@ -94,6 +94,16 @@ describe('POST /challenges', () => {
       });
     });
 
+    it('returns an error when non-leader member creates a challenge in leaderOnly group', async () => {
+      await expect(groupMember.post('/challenges', {
+        group: group._id,
+      })).to.eventually.be.rejected.and.eql({
+        code: 401,
+        error: 'NotAuthorized',
+        message: t('onlyGroupLeaderChal'),
+      });
+    });
+
     it('allows non-leader member to create a challenge', async () => {
       let populatedGroup = await createAndPopulateGroup({
         members: 1,
@@ -232,6 +242,7 @@ describe('POST /challenges', () => {
     it('returns an error when challenge validation fails; doesn\'s save user or group', async () => {
       let oldChallengeCount = group.challengeCount;
       let oldUserBalance = groupLeader.balance;
+      let oldUserChallenges = groupLeader.challenges;
       let oldGroupBalance = group.balance;
 
       await expect(groupLeader.post('/challenges', {
@@ -249,6 +260,7 @@ describe('POST /challenges', () => {
       expect(group.challengeCount).to.eql(oldChallengeCount);
       expect(group.balance).to.eql(oldGroupBalance);
       expect(groupLeader.balance).to.eql(oldUserBalance);
+      expect(groupLeader.challenges).to.eql(oldUserChallenges);
     });
 
     it('sets all properites of the challenge as passed', async () => {
@@ -279,29 +291,28 @@ describe('POST /challenges', () => {
         name: group.name,
         type: group.type,
       });
-      expect(challenge.memberCount).to.eql(0);
+      expect(challenge.memberCount).to.eql(1);
       expect(challenge.prize).to.eql(prize);
     });
 
-    it('does not add challenge to creator\'s challenges', async () => {
-      await groupLeader.post('/challenges', {
+    it('adds challenge to creator\'s challenges', async () => {
+      let challenge = await groupLeader.post('/challenges', {
         group: group._id,
         name: 'Test Challenge',
         shortName: 'TC Label',
       });
 
-      await groupLeader.sync();
-      expect(groupLeader.challenges.length).to.equal(0);
+      await expect(groupLeader.sync()).to.eventually.have.property('challenges').to.include(challenge._id);
     });
 
-    it('does not award joinedChallenge achievement for creating a challenge', async () => {
+    it('awards achievement if this is creator\'s first challenge', async () => {
       await groupLeader.post('/challenges', {
         group: group._id,
         name: 'Test Challenge',
         shortName: 'TC Label',
       });
       groupLeader = await groupLeader.sync();
-      expect(groupLeader.achievements.joinedChallenge).to.not.be.true;
+      expect(groupLeader.achievements.joinedChallenge).to.be.true;
     });
 
     it('sets summary to challenges name when not supplied', async () => {

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

@@ -3,7 +3,7 @@ import {
   generateChallenge,
   createAndPopulateGroup,
   translate as t,
-} from '../../../../helpers/api-integration/v3';
+} from '../../../../helpers/api-v3-integration.helper';
 import { v4 as generateUUID } from 'uuid';
 
 describe('POST /challenges/:challengeId/join', () => {
@@ -43,10 +43,9 @@ describe('POST /challenges/:challengeId/join', () => {
       authorizedUser = populatedGroup.members[0];
 
       challenge = await generateChallenge(groupLeader, group);
-      await groupLeader.post(`/challenges/${challenge._id}/join`);
     });
 
-    it('returns an error when user isn\'t in the private group and isn\'t challenge leader', async () => {
+    it('returns an error when user doesn\'t have permissions to access the challenge', async () => {
       let unauthorizedUser = await generateUser();
 
       await expect(unauthorizedUser.post(`/challenges/${challenge._id}/join`)).to.eventually.be.rejected.and.eql({
@@ -56,16 +55,6 @@ describe('POST /challenges/:challengeId/join', () => {
       });
     });
 
-    it('succeeds when user isn\'t in the private group but is challenge leader', async () => {
-      await groupLeader.post(`/challenges/${challenge._id}/leave`);
-      await groupLeader.post(`/groups/${group._id}/leave`);
-      await groupLeader.sync();
-      expect(groupLeader.guilds).to.be.empty; // check that leaving worked
-
-      let res = await groupLeader.post(`/challenges/${challenge._id}/join`);
-      expect(res.name).to.equal(challenge.name);
-    });
-
     it('returns challenge data', async () => {
       let res = await authorizedUser.post(`/challenges/${challenge._id}/join`);
 
@@ -79,14 +68,6 @@ describe('POST /challenges/:challengeId/join', () => {
         _id: groupLeader._id,
         id: groupLeader._id,
         profile: {name: groupLeader.profile.name},
-        auth: {
-          local: {
-            username: groupLeader.auth.local.username,
-          },
-        },
-        flags: {
-          verifiedUsername: true,
-        },
       });
       expect(res.name).to.equal(challenge.name);
     });
@@ -110,7 +91,6 @@ describe('POST /challenges/:challengeId/join', () => {
     });
 
     it('increases memberCount of challenge', async () => {
-      await challenge.sync();
       let oldMemberCount = challenge.memberCount;
 
       await authorizedUser.post(`/challenges/${challenge._id}/join`);

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

@@ -3,7 +3,7 @@ import {
   generateChallenge,
   createAndPopulateGroup,
   translate as t,
-} from '../../../../helpers/api-integration/v3';
+} from '../../../../helpers/api-v3-integration.helper';
 import { v4 as generateUUID } from 'uuid';
 
 describe('POST /challenges/:challengeId/leave', () => {
@@ -48,7 +48,6 @@ describe('POST /challenges/:challengeId/leave', () => {
       notInGroupLeavingUser = populatedGroup.members[2];
 
       challenge = await generateChallenge(groupLeader, group);
-      await groupLeader.post(`/challenges/${challenge._id}/join`);
 
       taskText = 'A challenge task text';
 

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

@@ -5,7 +5,7 @@ import {
   sleep,
   checkExistence,
   translate as t,
-} from '../../../../helpers/api-integration/v3';
+} from '../../../../helpers/api-v3-integration.helper';
 import { v4 as generateUUID } from 'uuid';
 
 describe('POST /challenges/:challengeId/winner/:winnerId', () => {
@@ -58,7 +58,6 @@ describe('POST /challenges/:challengeId/winner/:winnerId', () => {
       challenge = await generateChallenge(groupLeader, group, {
         prize: 1,
       });
-      await groupLeader.post(`/challenges/${challenge._id}/join`);
 
       await groupLeader.post(`/tasks/challenge/${challenge._id}`, [
         {type: 'habit', text: taskText},

test/api/v3/integration/challenges/POST_challenges_id_clone.test.js

@@ -1,7 +1,7 @@
 import {
   generateUser,
   generateGroup,
-} from '../../../../helpers/api-integration/v3';
+} from '../../../../helpers/api-v3-integration.helper';
 
 describe('POST /challenges/:challengeId/clone', () => {
   it('clones a challenge', async () => {

test/api/v3/integration/challenges/PUT-challenges_challengeId.test.js

@@ -3,7 +3,7 @@ import {
   generateChallenge,
   createAndPopulateGroup,
   translate as t,
-} from '../../../../helpers/api-integration/v3';
+} from '../../../../helpers/api-v3-integration.helper';
 
 describe('PUT /challenges/:challengeId', () => {
   let privateGuild, user, nonMember, challenge, member;
@@ -25,7 +25,6 @@ describe('PUT /challenges/:challengeId', () => {
     member = members[0];
 
     challenge = await generateChallenge(user, group);
-    await user.post(`/challenges/${challenge._id}/join`);
     await member.post(`/challenges/${challenge._id}/join`);
   });
 
@@ -79,14 +78,6 @@ describe('PUT /challenges/:challengeId', () => {
       _id: member._id,
       id: member._id,
       profile: {name: member.profile.name},
-      auth: {
-        local: {
-          username: member.auth.local.username,
-        },
-      },
-      flags: {
-        verifiedUsername: true,
-      },
     });
     expect(res.name).to.equal('New Challenge Name');
     expect(res.description).to.equal('New challenge description.');

test/api/v3/integration/chat/DELETE-chat_id.test.js

@@ -2,7 +2,7 @@ import {
   createAndPopulateGroup,
   generateUser,
   translate as t,
-} from '../../../../helpers/api-integration/v3';
+} from '../../../../helpers/api-v3-integration.helper';
 import { v4 as generateUUID } from 'uuid';
 
 describe('DELETE /groups/:groupId/chat/:chatId', () => {

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

@@ -2,7 +2,7 @@ import {
   generateUser,
   generateGroup,
   translate as t,
-} from '../../../../helpers/api-integration/v3';
+} from '../../../../helpers/api-v3-integration.helper';
 
 describe('GET /groups/:groupId/chat', () => {
   let user;

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

@@ -1,25 +1,17 @@
 import {
   generateUser,
   translate as t,
-} from '../../../../helpers/api-integration/v3';
+} from '../../../../helpers/api-v3-integration.helper';
 import { find } from 'lodash';
-import moment from 'moment';
-import nconf from 'nconf';
-import { IncomingWebhook } from '@slack/client';
-
-const BASE_URL = nconf.get('BASE_URL');
 
 describe('POST /chat/:chatId/flag', () => {
-  let user, admin, anotherUser, newUser, group;
+  let user, admin, anotherUser, group;
   const TEST_MESSAGE = 'Test Message';
-  const USER_AGE_FOR_FLAGGING = 3;
 
   beforeEach(async () => {
-    user = await generateUser({balance: 1, 'auth.timestamps.created': moment().subtract(USER_AGE_FOR_FLAGGING + 1, 'days').toDate()});
+    user = await generateUser({balance: 1});
     admin = await generateUser({balance: 1, 'contributor.admin': true});
-    anotherUser = await generateUser({'auth.timestamps.created': moment().subtract(USER_AGE_FOR_FLAGGING + 1, 'days').toDate()});
-    newUser = await generateUser({'auth.timestamps.created': moment().subtract(1, 'days').toDate()});
-    sandbox.stub(IncomingWebhook.prototype, 'send');
+    anotherUser = await generateUser();
 
     group = await user.post('/groups', {
       name: 'Test Guild',
@@ -28,10 +20,6 @@ describe('POST /chat/:chatId/flag', () => {
     });
   });
 
-  afterEach(() => {
-    sandbox.restore();
-  });
-
   it('Returns an error when chat message is not found', async () => {
     await expect(user.post(`/groups/${group._id}/chat/incorrectMessage/flag`))
       .to.eventually.be.rejected.and.eql({
@@ -46,7 +34,7 @@ describe('POST /chat/:chatId/flag', () => {
     await expect(user.post(`/groups/${group._id}/chat/${message.message.id}/flag`)).to.eventually.be.ok;
   });
 
-  it('Flags a chat and sends normal message to moderator Slack when user is not new', async () => {
+  it('Flags a chat', async () => {
     let { message } = await anotherUser.post(`/groups/${group._id}/chat`, {message: TEST_MESSAGE});
 
     let flagResult = await user.post(`/groups/${group._id}/chat/${message.id}/flag`);
@@ -57,62 +45,6 @@ describe('POST /chat/:chatId/flag', () => {
 
     let messageToCheck = find(groupWithFlags.chat, {id: message.id});
     expect(messageToCheck.flags[user._id]).to.equal(true);
-
-    // Slack message to mods
-    const timestamp = `${moment(message.timestamp).utc().format('YYYY-MM-DD HH:mm')} UTC`;
-
-    /* eslint-disable camelcase */
-    expect(IncomingWebhook.prototype.send).to.be.calledWith({
-      text: `${user.profile.name} (${user.id}; language: en) flagged a group message`,
-      attachments: [{
-        fallback: 'Flag Message',
-        color: 'danger',
-        author_name: `@${anotherUser.auth.local.username} ${anotherUser.profile.name} (${anotherUser.auth.local.email}; ${anotherUser._id})\n${timestamp}`,
-        title: 'Flag in Test Guild',
-        title_link: `${BASE_URL}/groups/guild/${group._id}`,
-        text: TEST_MESSAGE,
-        footer: `<https://habitrpg.github.io/flag-o-rama/?groupId=${group._id}&chatId=${message.id}|Flag this message.>`,
-        mrkdwn_in: [
-          'text',
-        ],
-      }],
-    });
-    /* eslint-ensable camelcase */
-  });
-
-  it('Does not increment message flag count and sends different message to moderator Slack when user is new', async () => {
-    let automatedComment = `The post's flag count has not been increased because the flagger's account is less than ${USER_AGE_FOR_FLAGGING} days old.`;
-    let { message } = await newUser.post(`/groups/${group._id}/chat`, {message: TEST_MESSAGE});
-
-    let flagResult = await newUser.post(`/groups/${group._id}/chat/${message.id}/flag`);
-    expect(flagResult.flags[newUser._id]).to.equal(true);
-    expect(flagResult.flagCount).to.equal(0);
-
-    let groupWithFlags = await admin.get(`/groups/${group._id}`);
-
-    let messageToCheck = find(groupWithFlags.chat, {id: message.id});
-    expect(messageToCheck.flags[newUser._id]).to.equal(true);
-
-    // Slack message to mods
-    const timestamp = `${moment(message.timestamp).utc().format('YYYY-MM-DD HH:mm')} UTC`;
-
-    /* eslint-disable camelcase */
-    expect(IncomingWebhook.prototype.send).to.be.calledWith({
-      text: `${newUser.profile.name} (${newUser.id}; language: en) flagged a group message`,
-      attachments: [{
-        fallback: 'Flag Message',
-        color: 'danger',
-        author_name: `@${newUser.auth.local.username} ${newUser.profile.name} (${newUser.auth.local.email}; ${newUser._id})\n${timestamp}`,
-        title: 'Flag in Test Guild',
-        title_link: `${BASE_URL}/groups/guild/${group._id}`,
-        text: TEST_MESSAGE,
-        footer: `<https://habitrpg.github.io/flag-o-rama/?groupId=${group._id}&chatId=${message.id}|Flag this message.> ${automatedComment}`,
-        mrkdwn_in: [
-          'text',
-        ],
-      }],
-    });
-    /* eslint-ensable camelcase */
   });
 
   it('Flags a chat when the author\'s account was deleted', async () => {
@@ -185,7 +117,7 @@ describe('POST /chat/:chatId/flag', () => {
       });
   });
 
-  it('Returns an error when user tries to flag a message that they already flagged', async () => {
+  it('Returns an error when user tries to flag a message that is already flagged', async () => {
     let { message } = await anotherUser.post(`/groups/${group._id}/chat`, {message: TEST_MESSAGE});
 
     await user.post(`/groups/${group._id}/chat/${message.id}/flag`);

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

@@ -1,7 +1,7 @@
 import {
   createAndPopulateGroup,
   translate as t,
-} from '../../../../helpers/api-integration/v3';
+} from '../../../../helpers/api-v3-integration.helper';
 import { find } from 'lodash';
 
 describe('POST /chat/:chatId/like', () => {

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

@@ -1,12 +1,10 @@
-import { IncomingWebhook } from '@slack/client';
-import nconf from 'nconf';
 import {
   createAndPopulateGroup,
   generateUser,
   translate as t,
   sleep,
   server,
-} from '../../../../helpers/api-integration/v3';
+} from '../../../../helpers/api-v3-integration.helper';
 import {
   SPAM_MESSAGE_LIMIT,
   SPAM_MIN_EXEMPT_CONTRIB_LEVEL,
@@ -17,6 +15,8 @@ import { getMatchesByWordArray } from '../../../../../website/server/libs/string
 import bannedWords from '../../../../../website/server/libs/bannedWords';
 import guildsAllowingBannedWords from '../../../../../website/server/libs/guildsAllowingBannedWords';
 import * as email from '../../../../../website/server/libs/email';
+import { IncomingWebhook } from '@slack/client';
+import nconf from 'nconf';
 
 const BASE_URL = nconf.get('BASE_URL');
 
@@ -80,14 +80,12 @@ describe('POST /chat', () => {
     });
   });
 
-  describe('mute user', () => {
-    it('returns an error when chat privileges are revoked when sending a message to a public guild', async () => {
-      const userWithChatRevoked = await member.update({'flags.chatRevoked': true});
-      await expect(userWithChatRevoked.post(`/groups/${groupWithChat._id}/chat`, { message: testMessage})).to.eventually.be.rejected.and.eql({
-        code: 401,
-        error: 'NotAuthorized',
-        message: t('chatPrivilegesRevoked'),
-      });
+  it('returns an error when chat privileges are revoked when sending a message to a public guild', async () => {
+    let userWithChatRevoked = await member.update({'flags.chatRevoked': true});
+    await expect(userWithChatRevoked.post(`/groups/${groupWithChat._id}/chat`, { message: testMessage})).to.eventually.be.rejected.and.eql({
+      code: 401,
+      error: 'NotAuthorized',
+      message: t('chatPrivilegesRevoked'),
     });
   });
 
@@ -257,10 +255,11 @@ describe('POST /chat', () => {
         attachments: [{
           fallback: 'Slur Message',
           color: 'danger',
-          author_name: `@${user.auth.local.username} ${user.profile.name} (${user.auth.local.email}; ${user._id})`,
+          author_name: `${user.profile.name} - ${user.auth.local.email} - ${user._id}`,
           title: 'Slur in Test Guild',
           title_link: `${BASE_URL}/groups/guild/${groupWithChat.id}`,
           text: testSlurMessage,
+          // footer: sandbox.match(/<.*?groupId=group-id&chatId=chat-id\|Flag this message>/),
           mrkdwn_in: [
             'text',
           ],
@@ -275,7 +274,6 @@ describe('POST /chat', () => {
         message: t('chatPrivilegesRevoked'),
       });
 
-      // @TODO: The next test should not depend on this. We should reset the user test in a beforeEach
       // Restore chat privileges to continue testing
       user.flags.chatRevoked = false;
       await user.update({'flags.chatRevoked': false});
@@ -310,10 +308,11 @@ describe('POST /chat', () => {
         attachments: [{
           fallback: 'Slur Message',
           color: 'danger',
-          author_name: `@${members[0].auth.local.username} ${members[0].profile.name} (${members[0].auth.local.email}; ${members[0]._id})`,
+          author_name: `${members[0].profile.name} - ${members[0].auth.local.email} - ${members[0]._id}`,
           title: 'Slur in Party - (private party)',
           title_link: undefined,
           text: testSlurMessage,
+          // footer: sandbox.match(/<.*?groupId=group-id&chatId=chat-id\|Flag this message>/),
           mrkdwn_in: [
             'text',
           ],
@@ -389,23 +388,6 @@ describe('POST /chat', () => {
     expect(groupMessages[0].id).to.exist;
   });
 
-  it('creates a chat with a max length of 3000 chars', async () => {
-    const veryLongMessage = `
-    123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789.
-    THIS PART WON'T BE IN THE MESSAGE (over 3000)
-    `;
-
-    const newMessage = await user.post(`/groups/${groupWithChat._id}/chat`, { message: veryLongMessage});
-    const groupMessages = await user.get(`/groups/${groupWithChat._id}/chat`);
-
-    expect(newMessage.message.id).to.exist;
-    expect(groupMessages[0].id).to.exist;
-
-    expect(newMessage.message.text.length).to.eql(3000);
-    expect(newMessage.message.text).to.not.contain('MESSAGE');
-    expect(groupMessages[0].text.length).to.eql(3000);
-  });
-
   it('creates a chat with user styles', async () => {
     const mount = 'test-mount';
     const pet = 'test-pet';

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

@@ -1,7 +1,7 @@
 import {
   createAndPopulateGroup,
   sleep,
-} from '../../../../helpers/api-integration/v3';
+} from '../../../../helpers/api-v3-integration.helper';
 
 describe('POST /groups/:id/chat/seen', () => {
   context('Guild', () => {

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

@@ -2,26 +2,25 @@ import {
   createAndPopulateGroup,
   generateUser,
   translate as t,
-} from '../../../../helpers/api-integration/v3';
+} from '../../../../helpers/api-v3-integration.helper';
 import config from '../../../../../config.json';
-import moment from 'moment';
 import { v4 as generateUUID } from 'uuid';
 
 describe('POST /groups/:id/chat/:id/clearflags', () => {
-  const USER_AGE_FOR_FLAGGING = 3;
   let groupWithChat, message, author, nonAdmin, admin;
 
   before(async () => {
-    let { group, groupLeader } = await createAndPopulateGroup({
+    let { group, groupLeader, members } = await createAndPopulateGroup({
       groupDetails: {
         type: 'guild',
         privacy: 'public',
       },
+      members: 1,
     });
 
     groupWithChat = group;
     author = groupLeader;
-    nonAdmin = await generateUser({'auth.timestamps.created': moment().subtract(USER_AGE_FOR_FLAGGING + 1, 'days').toDate()});
+    nonAdmin = members[0];
     admin = await generateUser({'contributor.admin': true});
 
     message = await author.post(`/groups/${groupWithChat._id}/chat`, { message: 'Some message' });
@@ -70,14 +69,9 @@ describe('POST /groups/:id/chat/:id/clearflags', () => {
       privateMessage = privateMessage.message;
 
       await admin.post(`/groups/${group._id}/chat/${privateMessage.id}/flag`);
-
-      // first test that the flag was actually successful
-      let messages = await members[0].get(`/groups/${group._id}/chat`);
-      expect(messages[0].flagCount).to.eql(5);
-
       await admin.post(`/groups/${group._id}/chat/${privateMessage.id}/clearflags`);
 
-      messages = await members[0].get(`/groups/${group._id}/chat`);
+      let messages = await members[0].get(`/groups/${group._id}/chat`);
       expect(messages[0].flagCount).to.eql(0);
     });
 
@@ -106,7 +100,7 @@ describe('POST /groups/:id/chat/:id/clearflags', () => {
         .to.eventually.be.rejected.and.eql({
           code: 400,
           error: 'BadRequest',
-          message: t('messageCannotFlagSystemMessages', {communityManagerEmail: config.EMAILS_COMMUNITY_MANAGER_EMAIL}),
+          message: t('messageCannotFlagSystemMessages', {communityManagerEmail: config.EMAILS.COMMUNITY_MANAGER_EMAIL}),
         });
       // let messages = await members[0].get(`/groups/${group._id}/chat`);
       // expect(messages[0].id).to.eql(skillMsg.id);

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

@@ -1,7 +1,7 @@
 import {
   requester,
   translate as t,
-} from '../../../../helpers/api-integration/v3';
+} from '../../../../helpers/api-v3-integration.helper';
 import i18n from '../../../../../website/common/script/i18n';
 
 describe('GET /content', () => {

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

@@ -1,8 +1,8 @@
 import {
   generateUser,
   resetHabiticaDB,
-} from '../../../../helpers/api-integration/v3';
-import apiError from '../../../../../website/server/libs/apiError';
+} from '../../../../helpers/api-v3-integration.helper';
+import apiMessages from '../../../../../website/server/libs/apiMessages';
 
 describe('GET /coupons/', () => {
   let user;
@@ -19,7 +19,7 @@ describe('GET /coupons/', () => {
     await expect(user.get('/coupons')).to.eventually.be.rejected.and.eql({
       code: 401,
       error: 'NotAuthorized',
-      message: apiError('noSudoAccess'),
+      message: apiMessages('noSudoAccess'),
     });
   });
 

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

@@ -2,7 +2,7 @@ import {
   generateUser,
   translate as t,
   resetHabiticaDB,
-} from '../../../../helpers/api-integration/v3';
+} from '../../../../helpers/api-v3-integration.helper';
 
 describe('POST /coupons/enter/:code', () => {
   let user;

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

@@ -2,9 +2,9 @@ import {
   generateUser,
   translate as t,
   resetHabiticaDB,
-} from '../../../../helpers/api-integration/v3';
+} from '../../../../helpers/api-v3-integration.helper';
 import couponCode from 'coupon-code';
-import apiError from '../../../../../website/server/libs/apiError';
+import apiMessages from '../../../../../website/server/libs/apiMessages';
 
 describe('POST /coupons/generate/:event', () => {
   let user;
@@ -26,7 +26,7 @@ describe('POST /coupons/generate/:event', () => {
     await expect(user.post('/coupons/generate/aaa')).to.eventually.be.rejected.and.eql({
       code: 401,
       error: 'NotAuthorized',
-      message: apiError('noSudoAccess'),
+      message: apiMessages('noSudoAccess'),
     });
   });
 

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

@@ -2,7 +2,7 @@ import {
   generateUser,
   requester,
   resetHabiticaDB,
-} from '../../../../helpers/api-integration/v3';
+} from '../../../../helpers/api-v3-integration.helper';
 
 describe('POST /coupons/validate/:code', () => {
   let api = requester();

test/api/v3/integration/dataexport/GET-export_avatar-memberId.html.test.js

@@ -1,7 +1,7 @@
 import {
   generateUser,
   translate as t,
-} from '../../../../helpers/api-integration/v3';
+} from '../../../../helpers/api-v3-integration.helper';
 import { v4 as generateUUID } from 'uuid';
 
 xdescribe('GET /export/avatar-:memberId.html', () => {

test/api/v3/integration/dataexport/GET-export_history.csv.test.js

@@ -1,6 +1,6 @@
 import {
   generateUser,
-} from '../../../../helpers/api-integration/v3';
+} from '../../../../helpers/api-v3-integration.helper';
 import {
   updateDocument,
 } from '../../../../helpers/mongo';

test/api/v3/integration/dataexport/GET-export_inbox.html.test.js

@@ -1,6 +1,6 @@
 import {
   generateUser,
-} from '../../../../helpers/api-integration/v3';
+} from '../../../../helpers/api-v3-integration.helper';
 
 describe('GET /export/inbox.html', () => {
   let user;

test/api/v3/integration/dataexport/GET-export_userdata.json.test.js

@@ -1,6 +1,6 @@
 import {
   generateUser,
-} from '../../../../helpers/api-integration/v3';
+} from '../../../../helpers/api-v3-integration.helper';
 
 describe('GET /export/userdata.json', () => {
   it('should return a valid JSON file with user data', async () => {

test/api/v3/integration/dataexport/GET-export_userdata.xml.test.js

@@ -1,6 +1,6 @@
 import {
   generateUser,
-} from '../../../../helpers/api-integration/v3';
+} from '../../../../helpers/api-v3-integration.helper';
 import xml2js from 'xml2js';
 import util from 'util';
 
@@ -23,17 +23,6 @@ describe('GET /export/userdata.xml', () => {
 
     ]);
 
-    // add pinnedItem
-    await user.get('/user/toggle-pinned-item/marketGear/gear.flat.shield_rogue_5');
-
-    // add a private message
-    let receiver = await generateUser();
-
-    user.post('/members/send-private-message', {
-      message: 'Your first message, hi!',
-      toUserId: receiver._id,
-    });
-
     let response = await user.get('/export/userdata.xml');
     let {user: res} = await parseStringAsync(response, {explicitArray: false});
 

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

@@ -1,7 +1,7 @@
 import nconf from 'nconf';
 import {
   generateUser,
-} from '../../../../helpers/api-integration/v3';
+} from '../../../../helpers/api-v3-integration.helper';
 
 describe('POST /debug/add-hourglass', () => {
   let userToGetHourGlass;

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

@@ -1,7 +1,7 @@
 import nconf from 'nconf';
 import {
   generateUser,
-} from '../../../../helpers/api-integration/v3';
+} from '../../../../helpers/api-v3-integration.helper';
 
 describe('POST /debug/add-ten-gems', () => {
   let userToGainTenGems;

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

@@ -1,7 +1,7 @@
 import nconf from 'nconf';
 import {
   generateUser,
-} from '../../../../helpers/api-integration/v3';
+} from '../../../../helpers/api-v3-integration.helper';
 
 describe('POST /debug/make-admin (pended for v3 prod testing)', () => {
   let user;

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

@@ -3,7 +3,7 @@
 import nconf from 'nconf';
 import {
   generateUser,
-} from '../../../../helpers/api-integration/v3';
+} from '../../../../helpers/api-v3-integration.helper';
 
 describe('POST /debug/modify-inventory', () => {
   let user, originalItems;

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

@@ -1,7 +1,7 @@
 import nconf from 'nconf';
 import {
   generateUser,
-} from '../../../../helpers/api-integration/v3';
+} from '../../../../helpers/api-v3-integration.helper';
 
 describe('POST /debug/quest-progress', () => {
   let user;

test/api/v3/integration/debug/POST-debug_set-cron.test.js

@@ -1,7 +1,7 @@
 import nconf from 'nconf';
 import {
   generateUser,
-} from '../../../../helpers/api-integration/v3';
+} from '../../../../helpers/api-v3-integration.helper';
 
 describe('POST /debug/set-cron', () => {
   let user;

test/api/v3/integration/emails/GET-email-unsubscribe.test.js

@@ -1,7 +1,7 @@
 import {
   generateUser,
   translate as t,
-} from '../../../../helpers/api-integration/v3';
+} from '../../../../helpers/api-v3-integration.helper';
 import { encrypt } from '../../../../../website/server/libs/encryption';
 import { v4 as generateUUID } from 'uuid';
 

test/api/v3/integration/groups/GET-group-plans.test.js

@@ -1,7 +1,7 @@
 import {
   generateUser,
   generateGroup,
-} from '../../../../helpers/api-integration/v3';
+} from '../../../../helpers/api-v3-integration.helper';
 
 describe('GET /group-plans', () => {
   let user;

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

@@ -3,11 +3,11 @@ import {
   resetHabiticaDB,
   generateGroup,
   translate as t,
-} from '../../../../helpers/api-integration/v3';
+} from '../../../../helpers/api-v3-integration.helper';
 import {
   TAVERN_ID,
 } from '../../../../../website/server/models/group';
-import apiError from '../../../../../website/server/libs/apiError';
+import apiMessages from '../../../../../website/server/libs/apiMessages';
 
 describe('GET /groups', () => {
   let user;
@@ -167,7 +167,7 @@ describe('GET /groups', () => {
         .to.eventually.be.rejected.and.eql({
           code: 400,
           error: 'BadRequest',
-          message: apiError('guildsOnlyPaginate'),
+          message: apiMessages('guildsOnlyPaginate'),
         });
     });
 
@@ -203,7 +203,7 @@ describe('GET /groups', () => {
       let page2 = await expect(user.get('/groups?type=publicGuilds&paginate=true&page=2'))
         .to.eventually.have.a.lengthOf(1 + 4); // 1 created now, 4 by other tests
       expect(page2[4].name).to.equal('guild with less members');
-    }).timeout(10000);
+    });
   });
 
   it('returns all the user\'s guilds when guilds passed in as query', async () => {

test/api/v3/integration/groups/GET-groups_groupId_invites.test.js

@@ -2,7 +2,7 @@ import {
   generateUser,
   generateGroup,
   translate as t,
-} from '../../../../helpers/api-integration/v3';
+} from '../../../../helpers/api-v3-integration.helper';
 import { v4 as generateUUID } from 'uuid';
 
 describe('GET /groups/:groupId/invites', () => {
@@ -50,14 +50,6 @@ describe('GET /groups/:groupId/invites', () => {
       _id: invited._id,
       id: invited._id,
       profile: {name: invited.profile.name},
-      auth: {
-        local: {
-          username: invited.auth.local.username,
-        },
-      },
-      flags: {
-        verifiedUsername: true,
-      },
     });
   });
 
@@ -66,7 +58,7 @@ describe('GET /groups/:groupId/invites', () => {
     let invited = await generateUser();
     await user.post(`/groups/${group._id}/invite`, {uuids: [invited._id]});
     let res = await user.get('/groups/party/invites');
-    expect(res[0]).to.have.all.keys(['_id', 'auth', 'flags', 'id', 'profile']);
+    expect(res[0]).to.have.all.keys(['_id', 'id', 'profile']);
     expect(res[0].profile).to.have.all.keys(['name']);
   });
 
@@ -84,13 +76,12 @@ describe('GET /groups/:groupId/invites', () => {
     let res = await leader.get(`/groups/${group._id}/invites`);
     expect(res.length).to.equal(30);
     res.forEach(member => {
-      expect(member).to.have.all.keys(['_id', 'auth', 'flags', 'id', 'profile']);
+      expect(member).to.have.all.keys(['_id', 'id', 'profile']);
       expect(member.profile).to.have.all.keys(['name']);
     });
-  }).timeout(10000);
+  });
 
-  it('supports using req.query.lastId to get more invites', async function () {
-    this.timeout(30000); // @TODO: times out after 8 seconds
+  it('supports using req.query.lastId to get more invites', async () => {
     let leader = await generateUser({balance: 4});
     let group = await generateGroup(leader, {type: 'guild', privacy: 'public', name: generateUUID()});
 

test/api/v3/integration/groups/GET-groups_groupId_members.test.js

@@ -2,7 +2,7 @@ import {
   generateUser,
   generateGroup,
   translate as t,
-} from '../../../../helpers/api-integration/v3';
+} from '../../../../helpers/api-v3-integration.helper';
 import { v4 as generateUUID } from 'uuid';
 import common from '../../../../../website/common';
 
@@ -56,21 +56,13 @@ describe('GET /groups/:groupId/members', () => {
       _id: user._id,
       id: user._id,
       profile: {name: user.profile.name},
-      auth: {
-        local: {
-          username: user.auth.local.username,
-        },
-      },
-      flags: {
-        verifiedUsername: true,
-      },
     });
   });
 
   it('populates only some fields', async () => {
     await generateGroup(user, {type: 'party', name: generateUUID()});
     let res = await user.get('/groups/party/members');
-    expect(res[0]).to.have.all.keys(['_id', 'auth', 'flags', 'id', 'profile']);
+    expect(res[0]).to.have.all.keys(['_id', 'id', 'profile']);
     expect(res[0].profile).to.have.all.keys(['name']);
   });
 
@@ -82,10 +74,10 @@ describe('GET /groups/:groupId/members', () => {
       '_id', 'id', 'preferences', 'profile', 'stats', 'achievements', 'party',
       'backer', 'contributor', 'auth', 'items', 'inbox', 'loginIncentives', 'flags',
     ]);
-    expect(Object.keys(memberRes.auth)).to.eql(['local', 'timestamps']);
+    expect(Object.keys(memberRes.auth)).to.eql(['timestamps']);
     expect(Object.keys(memberRes.preferences).sort()).to.eql([
       'size', 'hair', 'skin', 'shirt',
-      'chair', 'costume', 'sleep', 'background', 'tasks', 'disableClasses',
+      'chair', 'costume', 'sleep', 'background', 'tasks',
     ].sort());
 
     expect(memberRes.stats.maxMP).to.exist;
@@ -103,10 +95,10 @@ describe('GET /groups/:groupId/members', () => {
       '_id', 'id', 'preferences', 'profile', 'stats', 'achievements', 'party',
       'backer', 'contributor', 'auth', 'items', 'inbox', 'loginIncentives', 'flags',
     ]);
-    expect(Object.keys(memberRes.auth)).to.eql(['local', 'timestamps']);
+    expect(Object.keys(memberRes.auth)).to.eql(['timestamps']);
     expect(Object.keys(memberRes.preferences).sort()).to.eql([
       'size', 'hair', 'skin', 'shirt',
-      'chair', 'costume', 'sleep', 'background', 'tasks', 'disableClasses',
+      'chair', 'costume', 'sleep', 'background', 'tasks',
     ].sort());
 
     expect(memberRes.stats.maxMP).to.exist;
@@ -128,7 +120,7 @@ describe('GET /groups/:groupId/members', () => {
     let res = await user.get('/groups/party/members');
     expect(res.length).to.equal(30);
     res.forEach(member => {
-      expect(member).to.have.all.keys(['_id', 'auth', 'flags', 'id', 'profile']);
+      expect(member).to.have.all.keys(['_id', 'id', 'profile']);
       expect(member.profile).to.have.all.keys(['name']);
     });
   });
@@ -145,13 +137,12 @@ describe('GET /groups/:groupId/members', () => {
     let res = await user.get('/groups/party/members?includeAllMembers=true');
     expect(res.length).to.equal(30);
     res.forEach(member => {
-      expect(member).to.have.all.keys(['_id', 'auth', 'flags', 'id', 'profile']);
+      expect(member).to.have.all.keys(['_id', 'id', 'profile']);
       expect(member.profile).to.have.all.keys(['name']);
     });
   });
 
-  it('supports using req.query.lastId to get more members', async function () {
-    this.timeout(30000); // @TODO: times out after 8 seconds
+  it('supports using req.query.lastId to get more members', async () => {
     let leader = await generateUser({balance: 4});
     let group = await generateGroup(leader, {type: 'guild', privacy: 'public', name: generateUUID()});
 

test/api/v3/integration/groups/GET-groups_id.test.js

@@ -2,7 +2,7 @@ import {
   generateUser,
   createAndPopulateGroup,
   translate as t,
-} from '../../../../helpers/api-integration/v3';
+} from '../../../../helpers/api-v3-integration.helper';
 import { v4 as generateUUID } from 'uuid';
 
 import {

test/api/v3/integration/groups/POST-group_remove_manager.test.js

@@ -1,7 +1,7 @@
 import {
   createAndPopulateGroup,
   translate as t,
-} from '../../../../helpers/api-integration/v3';
+} from '../../../../helpers/api-v3-integration.helper';
 import { find } from 'lodash';
 
 describe('POST /group/:groupId/remove-manager', () => {

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

@@ -1,7 +1,7 @@
 import {
   generateUser,
   translate as t,
-} from '../../../../helpers/api-integration/v3';
+} from '../../../../helpers/api-v3-integration.helper';
 
 describe('POST /group', () => {
   let user;

test/api/v3/integration/groups/POST-groups_groupId_join.test.js

@@ -3,7 +3,7 @@ import {
   createAndPopulateGroup,
   checkExistence,
   translate as t,
-} from '../../../../helpers/api-integration/v3';
+} from '../../../../helpers/api-v3-integration.helper';
 import { v4 as generateUUID } from 'uuid';
 
 describe('POST /group/:groupId/join', () => {

test/api/v3/integration/groups/POST-groups_groupId_leave.js

@@ -5,7 +5,7 @@ import {
   sleep,
   generateUser,
   translate as t,
-} from '../../../../helpers/api-integration/v3';
+} from '../../../../helpers/api-v3-integration.helper';
 import { v4 as generateUUID } from 'uuid';
 import {
   each,
@@ -93,7 +93,6 @@ describe('POST /groups/:groupId/leave', () => {
 
         beforeEach(async () => {
           challenge = await generateChallenge(leader, groupToLeave);
-          await leader.post(`/challenges/${challenge._id}/join`);
 
           await leader.post(`/tasks/challenge/${challenge._id}`, {
             text: 'test habit',

test/api/v3/integration/groups/POST-groups_groupId_reject.test.js

@@ -2,7 +2,7 @@ import {
   generateUser,
   createAndPopulateGroup,
   translate as t,
-} from '../../../../helpers/api-integration/v3';
+} from '../../../../helpers/api-v3-integration.helper';
 
 describe('POST /group/:groupId/reject-invite', () => {
   context('Rejecting a public guild invite', () => {

test/api/v3/integration/groups/POST-groups_id_removeMember.test.js

@@ -3,7 +3,7 @@ import {
   createAndPopulateGroup,
   translate as t,
   sleep,
-} from '../../../../helpers/api-integration/v3';
+} from '../../../../helpers/api-v3-integration.helper';
 import * as email from '../../../../../website/server/libs/email';
 
 describe('POST /groups/:groupId/removeMember/:memberId', () => {

test/api/v3/integration/groups/POST-groups_invite.test.js

@@ -2,7 +2,7 @@ import {
   generateUser,
   generateGroup,
   translate as t,
-} from '../../../../helpers/api-integration/v3';
+} from '../../../../helpers/api-v3-integration.helper';
 import { v4 as generateUUID } from 'uuid';
 import nconf from 'nconf';
 
@@ -23,73 +23,6 @@ describe('Post /groups/:groupId/invite', () => {
     });
   });
 
-  describe('username invites', () => {
-    it('returns an error when invited user is not found', async () => {
-      const fakeID = 'fakeuserid';
-
-      await expect(inviter.post(`/groups/${group._id}/invite`, {
-        usernames: [fakeID],
-      }))
-        .to.eventually.be.rejected.and.eql({
-          code: 404,
-          error: 'NotFound',
-          message: t('userWithUsernameNotFound', {username: fakeID}),
-        });
-    });
-
-    it('returns an error when inviting yourself to a group', async () => {
-      await expect(inviter.post(`/groups/${group._id}/invite`, {
-        usernames: [inviter.auth.local.lowerCaseUsername],
-      }))
-        .to.eventually.be.rejected.and.eql({
-          code: 400,
-          error: 'BadRequest',
-          message: t('cannotInviteSelfToGroup'),
-        });
-    });
-
-    it('invites a user to a group by username', async () => {
-      const userToInvite = await generateUser();
-
-      await expect(inviter.post(`/groups/${group._id}/invite`, {
-        usernames: [userToInvite.auth.local.lowerCaseUsername],
-      })).to.eventually.deep.equal([{
-        id: group._id,
-        name: groupName,
-        inviter: inviter._id,
-        publicGuild: false,
-      }]);
-
-      await expect(userToInvite.get('/user'))
-        .to.eventually.have.nested.property('invitations.guilds[0].id', group._id);
-    });
-
-    it('invites multiple users to a group by uuid', async () => {
-      const userToInvite = await generateUser();
-      const userToInvite2 = await generateUser();
-
-      await expect(inviter.post(`/groups/${group._id}/invite`, {
-        usernames: [userToInvite.auth.local.lowerCaseUsername, userToInvite2.auth.local.lowerCaseUsername],
-      })).to.eventually.deep.equal([
-        {
-          id: group._id,
-          name: groupName,
-          inviter: inviter._id,
-          publicGuild: false,
-        },
-        {
-          id: group._id,
-          name: groupName,
-          inviter: inviter._id,
-          publicGuild: false,
-        },
-      ]);
-
-      await expect(userToInvite.get('/user')).to.eventually.have.nested.property('invitations.guilds[0].id', group._id);
-      await expect(userToInvite2.get('/user')).to.eventually.have.nested.property('invitations.guilds[0].id', group._id);
-    });
-  });
-
   describe('user id invites', () => {
     it('returns an error when inviter has no chat privileges', async () => {
       let inviterMuted = await inviter.update({'flags.chatRevoked': true});
@@ -160,7 +93,7 @@ describe('Post /groups/:groupId/invite', () => {
         .to.eventually.be.rejected.and.eql({
           code: 400,
           error: 'BadRequest',
-          message: t('inviteMustNotBeEmpty'),
+          message: t('inviteMissingUuid'),
         });
     });
 
@@ -181,19 +114,6 @@ describe('Post /groups/:groupId/invite', () => {
         });
     });
 
-    it('returns error when recipient has blocked the senders', async () => {
-      const inviterNoBlocks = await inviter.update({'inbox.blocks': []});
-      let userWithBlockedInviter = await generateUser({'inbox.blocks': [inviter._id]});
-      await expect(inviterNoBlocks.post(`/groups/${group._id}/invite`, {
-        uuids: [userWithBlockedInviter._id],
-      }))
-        .to.eventually.be.rejected.and.eql({
-          code: 401,
-          error: 'NotAuthorized',
-          message: t('notAuthorizedToSendMessageToThisUser'),
-        });
-    });
-
     it('invites a user to a group by uuid', async () => {
       let userToInvite = await generateUser();
 
@@ -295,7 +215,7 @@ describe('Post /groups/:groupId/invite', () => {
         .to.eventually.be.rejected.and.eql({
           code: 400,
           error: 'BadRequest',
-          message: t('inviteMustNotBeEmpty'),
+          message: t('inviteMissingEmail'),
         });
     });
 
@@ -333,7 +253,7 @@ describe('Post /groups/:groupId/invite', () => {
         .to.eventually.be.rejected.and.eql({
           code: 401,
           error: 'NotAuthorized',
-          message: t('inviteLimitReached', {techAssistanceEmail: nconf.get('EMAILS_TECH_ASSISTANCE_EMAIL')}),
+          message: t('inviteLimitReached', {techAssistanceEmail: nconf.get('EMAILS:TECH_ASSISTANCE_EMAIL')}),
         });
     });
 
@@ -484,7 +404,7 @@ describe('Post /groups/:groupId/invite', () => {
       expect(await inviter.post(`/groups/${group._id}/invite`, {
         uuids: generatedInvites.map(invite => invite._id),
       })).to.be.an('array');
-    }).timeout(10000);
+    });
 
     // @TODO: Add this after we are able to mock the group plan route
     xit('returns an error when a non-leader invites to a group plan', async () => {
@@ -631,7 +551,7 @@ describe('Post /groups/:groupId/invite', () => {
       expect(await inviter.post(`/groups/${party._id}/invite`, {
         uuids: generatedInvites.map(invite => invite._id),
       })).to.be.an('array');
-    }).timeout(10000);
+    });
 
     it('does not allow 30+ members in a party', async () => {
       let invitesToGenerate = [];
@@ -649,6 +569,6 @@ describe('Post /groups/:groupId/invite', () => {
           error: 'BadRequest',
           message: t('partyExceedsMembersLimit', {maxMembersParty: PARTY_LIMIT_MEMBERS}),
         });
-    }).timeout(10000);
+    });
   });
 });

test/api/v3/integration/groups/POST-groups_manager.test.js

@@ -2,7 +2,7 @@ import {
   generateUser,
   createAndPopulateGroup,
   translate as t,
-} from '../../../../helpers/api-integration/v3';
+} from '../../../../helpers/api-v3-integration.helper';
 
 describe('POST /group/:groupId/add-manager', () => {
   let leader, nonLeader, groupToUpdate;

test/api/v3/integration/groups/PUT-groups.test.js

@@ -2,7 +2,7 @@ import {
   createAndPopulateGroup,
   generateUser,
   translate as t,
-} from '../../../../helpers/api-integration/v3';
+} from '../../../../helpers/api-v3-integration.helper';
 
 describe('PUT /group', () => {
   let leader, nonLeader, groupToUpdate, adminUser;

test/api/v3/integration/hall/GET-hall_heroes.test.js

@@ -1,7 +1,7 @@
 import {
   generateUser,
   resetHabiticaDB,
-} from '../../../../helpers/api-integration/v3';
+} from '../../../../helpers/api-v3-integration.helper';
 
 describe('GET /hall/heroes', () => {
   it('returns all heroes sorted by -contributor.level and with correct fields', async () => {

test/api/v3/integration/hall/GET-hall_heroes_heroId.test.js

@@ -1,7 +1,7 @@
 import {
   generateUser,
   translate as t,
-} from '../../../../helpers/api-integration/v3';
+} from '../../../../helpers/api-v3-integration.helper';
 import { v4 as generateUUID } from 'uuid';
 
 describe('GET /heroes/:heroId', () => {
@@ -25,9 +25,9 @@ describe('GET /heroes/:heroId', () => {
 
   it('validates req.params.heroId', async () => {
     await expect(user.get('/hall/heroes/invalidUUID')).to.eventually.be.rejected.and.eql({
-      code: 404,
-      error: 'NotFound',
-      message: t('userWithIDNotFound', {userId: 'invalidUUID'}),
+      code: 400,
+      error: 'BadRequest',
+      message: t('invalidReqParams'),
     });
   });
 
@@ -40,7 +40,7 @@ describe('GET /heroes/:heroId', () => {
     });
   });
 
-  it('returns only necessary hero data given user id', async () => {
+  it('returns only necessary hero data', async () => {
     let hero = await generateUser({
       contributor: {tier: 23},
     });
@@ -53,24 +53,4 @@ describe('GET /heroes/:heroId', () => {
     expect(heroRes.auth.local).not.to.have.keys(['salt', 'hashed_password']);
     expect(heroRes.profile).to.have.all.keys(['name']);
   });
-
-  it('returns only necessary hero data given username', async () => {
-    let hero = await generateUser({
-      contributor: {tier: 23},
-    });
-    let heroRes = await user.get(`/hall/heroes/${hero.auth.local.username}`);
-
-    expect(heroRes).to.have.all.keys([ // works as: object has all and only these keys
-      '_id', 'id', 'balance', 'profile', 'purchased',
-      'contributor', 'auth', 'items',
-    ]);
-    expect(heroRes.auth.local).not.to.have.keys(['salt', 'hashed_password']);
-    expect(heroRes.profile).to.have.all.keys(['name']);
-  });
-
-  it('returns correct hero using search with difference case', async () => {
-    await generateUser({}, { username: 'TestUpperCaseName123' });
-    let heroRes = await user.get('/hall/heroes/TestuPPerCasEName123');
-    expect(heroRes.auth.local.username).to.equal('TestUpperCaseName123');
-  });
 });

test/api/v3/integration/hall/GET-hall_patrons.test.js

@@ -2,7 +2,7 @@ import {
   generateUser,
   translate as t,
   resetHabiticaDB,
-} from '../../../../helpers/api-integration/v3';
+} from '../../../../helpers/api-v3-integration.helper';
 import { times } from 'lodash';
 
 describe('GET /hall/patrons', () => {
@@ -56,5 +56,5 @@ describe('GET /hall/patrons', () => {
     expect(morePatrons.length).to.equal(2);
     expect(morePatrons[0].backer.tier).to.equal(2);
     expect(morePatrons[1].backer.tier).to.equal(1);
-  }).timeout(10000);
+  });
 });