fix(logging): use SRI for Loggly

route challenge task moves to the user endpoint, not group-tasks

.eslintignore

@@ -8,7 +8,6 @@ website/client/
 website/common/transpiled-babel/
 dist/
 dist-client/
-apidoc/html/
 content_cache/
 i18n_cache/
 node_modules/

.github/workflows/test.yml

@@ -36,29 +36,7 @@ jobs:
         CI: true
         NODE_ENV: test
     - run: npm run lint-no-fix
-  apidoc:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        node-version: [21.x]
-    steps:
-    - uses: actions/checkout@v4
-      with:
-        fetch-depth: 1
-    - name: Use Node.js ${{ matrix.node-version }}
-      uses: actions/setup-node@v4
-      with:
-        node-version: ${{ matrix.node-version }}
-    - run: sudo apt update
-    - run: sudo apt -y install libkrb5-dev
-    - run: cp config.json.example config.json
-    - name: npm install
-      run: |
-        npm i
-      env:
-        CI: true
-        NODE_ENV: test
-    - run: npm run apidoc
+
   sanity:
     runs-on: ubuntu-latest
     strategy:
@@ -106,6 +84,7 @@ jobs:
         CI: true
         NODE_ENV: test
     - run: npm run test:common
+
   content:
     runs-on: ubuntu-latest
     strategy:

apidoc/apidoc.json

@@ -1,14 +0,0 @@
-{
-  "name": "Habitica V3 API Documentation",
-  "title": "Habitica",
-  "url": "https://habitica.com",
-  "version": "3.0.0",
-  "sampleUrl": null,
-  "header": {
-    "title": "Introduction",
-    "filename": "apidoc/header.md"
-  },
-  "template": {
-    "withCompare": false
-  }
-}

apidoc/header.md

@@ -1,5 +0,0 @@
-# Introduction
-
-This webpage includes the documentation for version 3 of the [Habitica](https://habitica.com) API.
-
-If you're developing a 3rd party tool that uses the Habitica API, read the [API Usage Guidelines](https://github.com/HabitRPG/habitica/wiki/API-Usage-Guidelines), which describe how to be a responsible user of our server resources!

docker-compose.mongo-only.yml

@@ -21,3 +21,4 @@ services:
       timeout: 30s
       start_period: 0s
       retries: 30
+  

gulp/gulp-apidoc.js

@@ -1,26 +0,0 @@
-import gulp from 'gulp';
-import clean from 'rimraf';
-import apidoc from 'apidoc';
-
-const APIDOC_DEST_PATH = './apidoc/html';
-const APIDOC_SRC_PATH = './website/server';
-const APIDOC_CONFIG_PATH = './apidoc/apidoc.json';
-gulp.task('apidoc:clean', done => {
-  clean(APIDOC_DEST_PATH, done);
-});
-
-gulp.task('apidoc', gulp.series('apidoc:clean', done => {
-  const result = apidoc.createDoc({
-    src: APIDOC_SRC_PATH,
-    dest: APIDOC_DEST_PATH,
-    config: APIDOC_CONFIG_PATH,
-  });
-
-  if (result === false) {
-    done(new Error('There was a problem generating apiDoc documentation.'));
-  } else {
-    done();
-  }
-}));
-
-gulp.task('apidoc:watch', gulp.series('apidoc', done => gulp.watch(`${APIDOC_SRC_PATH}/**/*.js`, gulp.series('apidoc', done))));

gulp/gulp-build.js

@@ -26,7 +26,6 @@ gulp.task('build:cache', gulp.parallel(
 
 gulp.task('build:prod', gulp.series(
   'build:babel',
-  'apidoc',
   'build:cache',
   done => done(),
 ));

gulpfile.js

@@ -12,11 +12,9 @@ require('@babel/register');
 const gulp = require('gulp');
 
 if (process.env.NODE_ENV === 'production') { // eslint-disable-line no-process-env
-  require('./gulp/gulp-apidoc'); // eslint-disable-line global-require
   require('./gulp/gulp-cache'); // eslint-disable-line global-require
   require('./gulp/gulp-build'); // eslint-disable-line global-require
 } else {
-  require('./gulp/gulp-apidoc'); // eslint-disable-line global-require
   require('./gulp/gulp-cache'); // eslint-disable-line global-require
   require('./gulp/gulp-build'); // eslint-disable-line global-require
   require('./gulp/gulp-console'); // eslint-disable-line global-require

package.json

@@ -1,7 +1,7 @@
 {
   "name": "habitica",
   "description": "A habit tracker app which treats your goals like a Role Playing Game.",
-  "version": "5.47.4",
+  "version": "5.48.2",
   "main": "./website/server/index.js",
   "dependencies": {
     "@babel/core": "^7.22.10",
@@ -13,12 +13,12 @@
     "accepts": "^1.3.8",
     "amazon-payments": "^0.2.9",
     "amplitude": "^6.0.0",
-    "apidoc": "^0.54.0",
     "apple-auth": "^1.0.9",
     "babel-preset-env": "^1.7.0",
     "bcrypt": "^5.1.1",
     "body-parser": "^1.20.3",
     "bootstrap": "^4.6.2",
+    "bullmq": "^5.71.1",
     "compression": "^1.8.1",
     "cookie-session": "^2.1.1",
     "coupon-code": "^0.4.5",
@@ -30,6 +30,7 @@
     "eslint-plugin-mocha": "^5.0.0",
     "express": "^4.21.1",
     "express-basic-auth": "^1.2.1",
+    "express-sitemap-xml": "^3.1.0",
     "express-validator": "^5.2.0",
     "firebase-admin": "^12.1.1",
     "glob": "^8.1.0",
@@ -41,8 +42,9 @@
     "gulp.spritesmith": "^6.13.0",
     "habitica-markdown": "^4.1.0",
     "heapdump": "^0.3.15",
-    "helmet": "^8.1.0",
+    "helmet": "^4.6.0",
     "in-app-purchase": "^1.11.3",
+    "ioredis": "^5.10.1",
     "js2xmlparser": "^5.0.0",
     "jsonwebtoken": "^9.0.2",
     "jwks-rsa": "^2.1.5",
@@ -52,7 +54,7 @@
     "micromustache": "^8.0.3",
     "moment": "^2.29.4",
     "moment-recur": "git://github.com/HabitRPG/moment-recur.git#d3e8e6da0806f13b74dd2e4d7d9053e6a63db119",
-    "mongoose": "^8.9.5",
+    "mongoose": "^8.23.0",
     "morgan": "^1.10.1",
     "nan": "^2.25.0",
     "nconf": "^0.12.1",
@@ -66,7 +68,6 @@
     "pp-ipn": "^1.1.0",
     "ps-tree": "^1.0.0",
     "rate-limiter-flexible": "^2.4.2",
-    "redis": "^3.1.2",
     "remove-markdown": "^0.5.0",
     "rimraf": "^3.0.2",
     "short-uuid": "^4.2.2",
@@ -88,7 +89,7 @@
   "scripts": {
     "lint": "eslint --ext .js --fix . && cd website/client && npm run lint",
     "lint-no-fix": "eslint --ext .js . && cd website/client && npm run lint-no-fix",
-    "test": "npm run lint && gulp test && gulp apidoc",
+    "test": "npm run lint && gulp test",
     "test:build": "gulp test:prepare:build",
     "test:api-v3": "gulp test:api-v3",
     "test:api:unit": "gulp test:api:unit",
@@ -113,7 +114,6 @@
     "docker:mongo:test": "docker compose -f docker-compose.mongo-test-local.yml up",
     "mongo:test": "node scripts/start-local-mongo.mjs --test-db",
     "postinstall": "git config --global url.\"https://\".insteadOf git:// && gulp build && cd website/client && npm install",
-    "apidoc": "gulp apidoc",
     "heroku-postbuild": ".heroku/report_deploy.sh"
   },
   "devDependencies": {

test/api/unit/libs/analyticsService.test.js

@@ -1,560 +0,0 @@
-/* eslint-disable camelcase */
-import nconf from 'nconf';
-import Amplitude from 'amplitude';
-import * as analyticsService from '../../../../website/server/libs/analyticsService';
-
-describe('analyticsService', () => {
-  beforeEach(() => {
-    sandbox.stub(Amplitude.prototype, 'track').returns(Promise.resolve());
-  });
-
-  afterEach(() => {
-    sandbox.restore();
-  });
-
-  describe('#getServiceByEnvironment', () => {
-    it('returns mock methods when not in production', () => {
-      sandbox.stub(nconf, 'get').withArgs('IS_PROD').returns(false);
-      expect(analyticsService.getAnalyticsServiceByEnvironment())
-        .to.equal(analyticsService.mockAnalyticsService);
-    });
-
-    it('returns real methods when in production', () => {
-      sandbox.stub(nconf, 'get').withArgs('IS_PROD').returns(true);
-      expect(analyticsService.getAnalyticsServiceByEnvironment().track)
-        .to.equal(analyticsService.track);
-      expect(analyticsService.getAnalyticsServiceByEnvironment().trackPurchase)
-        .to.equal(analyticsService.trackPurchase);
-    });
-  });
-
-  describe('#track', () => {
-    let eventType; let
-      data;
-
-    beforeEach(() => {
-      eventType = 'Cron';
-      data = {
-        category: 'behavior',
-        uuid: 'unique-user-id',
-        resting: true,
-        cronCount: 5,
-        headers: {
-          'x-client': 'habitica-web',
-          'user-agent': '',
-        },
-        user: {
-          preferences: {
-            analyticsConsent: true,
-          },
-        },
-      };
-    });
-
-    context('Amplitude', () => {
-      it('calls out to amplitude', () => analyticsService.track(eventType, data)
-        .then(() => {
-          expect(Amplitude.prototype.track).to.be.calledOnce;
-        }));
-
-      it('uses a dummy user id if none is provided', () => {
-        delete data.uuid;
-
-        return analyticsService.track(eventType, data)
-          .then(() => {
-            expect(Amplitude.prototype.track).to.be.calledWithMatch({
-              user_id: 'no-user-id-was-provided',
-            });
-          });
-      });
-
-      context('platform', () => {
-        it('logs web platform', () => {
-          data.headers = { 'x-client': 'habitica-web' };
-
-          return analyticsService.track(eventType, data)
-            .then(() => {
-              expect(Amplitude.prototype.track).to.be.calledWithMatch({
-                platform: 'Web',
-              });
-            });
-        });
-
-        it('logs iOS platform', () => {
-          data.headers = { 'x-client': 'habitica-ios' };
-
-          return analyticsService.track(eventType, data)
-            .then(() => {
-              expect(Amplitude.prototype.track).to.be.calledWithMatch({
-                platform: 'iOS',
-              });
-            });
-        });
-
-        it('logs Android platform', () => {
-          data.headers = { 'x-client': 'habitica-android' };
-
-          return analyticsService.track(eventType, data)
-            .then(() => {
-              expect(Amplitude.prototype.track).to.be.calledWithMatch({
-                platform: 'Android',
-              });
-            });
-        });
-
-        it('logs 3rd Party platform', () => {
-          data.headers = { 'x-client': 'some-third-party' };
-
-          return analyticsService.track(eventType, data)
-            .then(() => {
-              expect(Amplitude.prototype.track).to.be.calledWithMatch({
-                platform: '3rd Party',
-              });
-            });
-        });
-
-        it('logs unknown if headers are not passed in', () => {
-          delete data.headers;
-
-          return analyticsService.track(eventType, data)
-            .then(() => {
-              expect(Amplitude.prototype.track).to.be.calledWithMatch({
-                platform: 'Unknown',
-              });
-            });
-        });
-      });
-
-      context('Operating System', () => {
-        it('sets default', () => {
-          data.headers = {
-            'x-client': 'third-party',
-            'user-agent': 'foo',
-          };
-
-          return analyticsService.track(eventType, data)
-            .then(() => {
-              expect(Amplitude.prototype.track).to.be.calledWithMatch({
-                os_name: 'Other',
-                os_version: '0',
-              });
-            });
-        });
-
-        it('sets iOS', () => {
-          data.headers = {
-            'x-client': 'habitica-ios',
-            'user-agent': 'Habitica/148 (iPhone; iOS 9.3; Scale/2.00)',
-          };
-
-          return analyticsService.track(eventType, data)
-            .then(() => {
-              expect(Amplitude.prototype.track).to.be.calledWithMatch({
-                os_name: 'iOS',
-                os_version: '9.3.0',
-              });
-            });
-        });
-
-        it('sets Android', () => {
-          data.headers = {
-            'x-client': 'habitica-android',
-            'user-agent': 'Mozilla/5.0 (Linux; Android 4.0.4; Galaxy Nexus Build/IMM76B) AppleWebKit/535.19 (KHTML, like Gecko) Chrome/18.0.1025.133 Mobile Safari/535.19',
-          };
-
-          return analyticsService.track(eventType, data)
-            .then(() => {
-              expect(Amplitude.prototype.track).to.be.calledWithMatch({
-                os_name: 'Android',
-                os_version: '4.0.4',
-              });
-            });
-        });
-
-        it('sets Unknown if headers are not passed in', () => {
-          delete data.headers;
-
-          return analyticsService.track(eventType, data)
-            .then(() => {
-              expect(Amplitude.prototype.track).to.be.calledWithMatch({
-                os_name: undefined,
-                os_version: undefined,
-              });
-            });
-        });
-      });
-
-      it('sends details about event', () => analyticsService.track(eventType, data)
-        .then(() => {
-          expect(Amplitude.prototype.track).to.be.calledWithMatch({
-            event_properties: {
-              category: 'behavior',
-              resting: true,
-              cronCount: 5,
-            },
-          });
-        }));
-
-      it('sends english item name for gear if itemKey is provided', () => {
-        data.itemKey = 'headAccessory_special_foxEars';
-
-        return analyticsService.track(eventType, data)
-          .then(() => {
-            expect(Amplitude.prototype.track).to.be.calledWithMatch({
-              event_properties: {
-                itemKey: data.itemKey,
-                itemName: 'Fox Ears',
-              },
-            });
-          });
-      });
-
-      it('sends english item name for egg if itemKey is provided', () => {
-        data.itemKey = 'Wolf';
-
-        return analyticsService.track(eventType, data)
-          .then(() => {
-            expect(Amplitude.prototype.track).to.be.calledWithMatch({
-              event_properties: {
-                itemKey: data.itemKey,
-                itemName: 'Wolf Egg',
-              },
-            });
-          });
-      });
-
-      it('sends english item name for food if itemKey is provided', () => {
-        data.itemKey = 'Cake_Skeleton';
-
-        return analyticsService.track(eventType, data)
-          .then(() => {
-            expect(Amplitude.prototype.track).to.be.calledWithMatch({
-              event_properties: {
-                itemKey: data.itemKey,
-                itemName: 'Bare Bones Cake',
-              },
-            });
-          });
-      });
-
-      it('sends english item name for hatching potion if itemKey is provided', () => {
-        data.itemKey = 'Golden';
-
-        return analyticsService.track(eventType, data)
-          .then(() => {
-            expect(Amplitude.prototype.track).to.be.calledWithMatch({
-              event_properties: {
-                itemKey: data.itemKey,
-                itemName: 'Golden Hatching Potion',
-              },
-            });
-          });
-      });
-
-      it('sends english item name for quest if itemKey is provided', () => {
-        data.itemKey = 'atom1';
-
-        return analyticsService.track(eventType, data)
-          .then(() => {
-            expect(Amplitude.prototype.track).to.be.calledWithMatch({
-              event_properties: {
-                itemKey: data.itemKey,
-                itemName: 'Attack of the Mundane, Part 1: Dish Disaster!',
-              },
-            });
-          });
-      });
-
-      it('sends english item name for purchased spell if itemKey is provided', () => {
-        data.itemKey = 'seafoam';
-
-        return analyticsService.track(eventType, data)
-          .then(() => {
-            expect(Amplitude.prototype.track).to.be.calledWithMatch({
-              event_properties: {
-                itemKey: data.itemKey,
-                itemName: 'Seafoam',
-              },
-            });
-          });
-      });
-
-      it('sends user data if provided', () => {
-        const stats = {
-          class: 'wizard', exp: 5, gp: 23, hp: 10, lvl: 4, mp: 30,
-        };
-        const user = {
-          stats,
-          contributor: { level: 1 },
-          purchased: { plan: { planId: 'foo-plan' } },
-          flags: { tour: { intro: -2 } },
-          habits: [{ _id: 'habit' }],
-          dailys: [{ _id: 'daily' }],
-          todos: [{ _id: 'todo' }],
-          rewards: [{ _id: 'reward' }],
-          balance: 12,
-          loginIncentives: 1,
-          preferences: {
-            analyticsConsent: true,
-          },
-        };
-
-        data.user = user;
-
-        return analyticsService.track(eventType, data)
-          .then(() => {
-            expect(Amplitude.prototype.track).to.be.calledWithMatch({
-              user_properties: {
-                Class: 'wizard',
-                Experience: 5,
-                Gold: 23,
-                Health: 10,
-                Level: 4,
-                Mana: 30,
-                tutorialComplete: true,
-                'Number Of Tasks': {
-                  habits: 1,
-                  dailys: 1,
-                  todos: 1,
-                  rewards: 1,
-                },
-                contributorLevel: 1,
-                subscription: 'foo-plan',
-                balance: 12,
-                balanceGemAmount: 48,
-                loginIncentives: 1,
-              },
-            });
-          });
-      });
-    });
-  });
-
-  describe('#trackPurchase', () => {
-    let data;
-
-    beforeEach(() => {
-      data = {
-        uuid: 'user-id',
-        sku: 'paypal-checkout',
-        paymentMethod: 'PayPal',
-        itemPurchased: 'Gems',
-        purchaseValue: 8,
-        purchaseType: 'checkout',
-        gift: false,
-        quantity: 1,
-        headers: {
-          'x-client': 'habitica-web',
-          'user-agent': '',
-        },
-        user: {
-          preferences: {
-            analyticsConsent: true,
-          },
-        },
-      };
-    });
-
-    context('Amplitude', () => {
-      it('calls out to amplitude', () => analyticsService.trackPurchase(data)
-        .then(() => {
-          expect(Amplitude.prototype.track).to.be.calledOnce;
-        }));
-
-      it('uses a dummy user id if none is provided', () => {
-        delete data.uuid;
-
-        return analyticsService.trackPurchase(data)
-          .then(() => {
-            expect(Amplitude.prototype.track).to.be.calledWithMatch({
-              user_id: 'no-user-id-was-provided',
-            });
-          });
-      });
-
-      context('platform', () => {
-        it('logs web platform', () => {
-          data.headers = { 'x-client': 'habitica-web' };
-
-          return analyticsService.trackPurchase(data)
-            .then(() => {
-              expect(Amplitude.prototype.track).to.be.calledWithMatch({
-                platform: 'Web',
-              });
-            });
-        });
-
-        it('logs iOS platform', () => {
-          data.headers = { 'x-client': 'habitica-ios' };
-
-          return analyticsService.trackPurchase(data)
-            .then(() => {
-              expect(Amplitude.prototype.track).to.be.calledWithMatch({
-                platform: 'iOS',
-              });
-            });
-        });
-
-        it('logs Android platform', () => {
-          data.headers = { 'x-client': 'habitica-android' };
-
-          return analyticsService.trackPurchase(data)
-            .then(() => {
-              expect(Amplitude.prototype.track).to.be.calledWithMatch({
-                platform: 'Android',
-              });
-            });
-        });
-
-        it('logs 3rd Party platform', () => {
-          data.headers = { 'x-client': 'some-third-party' };
-
-          return analyticsService.trackPurchase(data)
-            .then(() => {
-              expect(Amplitude.prototype.track).to.be.calledWithMatch({
-                platform: '3rd Party',
-              });
-            });
-        });
-
-        it('logs unknown if headers are not passed in', () => {
-          delete data.headers;
-
-          return analyticsService.trackPurchase(data)
-            .then(() => {
-              expect(Amplitude.prototype.track).to.be.calledWithMatch({
-                platform: 'Unknown',
-              });
-            });
-        });
-      });
-
-      context('Operating System', () => {
-        it('sets default', () => {
-          data.headers = {
-            'x-client': 'third-party',
-            'user-agent': 'foo',
-          };
-
-          return analyticsService.trackPurchase(data)
-            .then(() => {
-              expect(Amplitude.prototype.track).to.be.calledWithMatch({
-                os_name: 'Other',
-                os_version: '0',
-              });
-            });
-        });
-
-        it('sets iOS', () => {
-          data.headers = {
-            'x-client': 'habitica-ios',
-            'user-agent': 'Habitica/148 (iPhone; iOS 9.3; Scale/2.00)',
-          };
-
-          return analyticsService.trackPurchase(data)
-            .then(() => {
-              expect(Amplitude.prototype.track).to.be.calledWithMatch({
-                os_name: 'iOS',
-                os_version: '9.3.0',
-              });
-            });
-        });
-
-        it('sets Android', () => {
-          data.headers = {
-            'x-client': 'habitica-android',
-            'user-agent': 'Mozilla/5.0 (Linux; Android 4.0.4; Galaxy Nexus Build/IMM76B) AppleWebKit/535.19 (KHTML, like Gecko) Chrome/18.0.1025.133 Mobile Safari/535.19',
-          };
-
-          return analyticsService.trackPurchase(data)
-            .then(() => {
-              expect(Amplitude.prototype.track).to.be.calledWithMatch({
-                os_name: 'Android',
-                os_version: '4.0.4',
-              });
-            });
-        });
-
-        it('sets Unknown if headers are not passed in', () => {
-          delete data.headers;
-
-          return analyticsService.trackPurchase(data)
-            .then(() => {
-              expect(Amplitude.prototype.track).to.be.calledWithMatch({
-                os_name: undefined,
-                os_version: undefined,
-              });
-            });
-        });
-      });
-
-      it('sends details about purchase', () => analyticsService.trackPurchase(data)
-        .then(() => {
-          expect(Amplitude.prototype.track).to.be.calledWithMatch({
-            event_properties: {
-              gift: false,
-              itemPurchased: 'Gems',
-              paymentMethod: 'PayPal',
-              purchaseType: 'checkout',
-              quantity: 1,
-              sku: 'paypal-checkout',
-            },
-          });
-        }));
-
-      it('sends user data if provided', () => {
-        const stats = {
-          class: 'wizard', exp: 5, gp: 23, hp: 10, lvl: 4, mp: 30,
-        };
-        const user = {
-          stats,
-          contributor: { level: 1 },
-          purchased: { plan: { planId: 'foo-plan' } },
-          flags: { tour: { intro: -2 } },
-          habits: [{ _id: 'habit' }],
-          dailys: [{ _id: 'daily' }],
-          todos: [{ _id: 'todo' }],
-          rewards: [{ _id: 'reward' }],
-          preferences: {
-            analyticsConsent: true,
-          },
-        };
-
-        data.user = user;
-
-        return analyticsService.trackPurchase(data)
-          .then(() => {
-            expect(Amplitude.prototype.track).to.be.calledWithMatch({
-              user_properties: {
-                Class: 'wizard',
-                Experience: 5,
-                Gold: 23,
-                Health: 10,
-                Level: 4,
-                Mana: 30,
-                tutorialComplete: true,
-                'Number Of Tasks': {
-                  habits: 1,
-                  dailys: 1,
-                  todos: 1,
-                  rewards: 1,
-                },
-                contributorLevel: 1,
-                subscription: 'foo-plan',
-              },
-            });
-          });
-      });
-    });
-  });
-
-  describe('mockAnalyticsService', () => {
-    it('has stubbed track method', () => {
-      expect(analyticsService.mockAnalyticsService).to.respondTo('track');
-    });
-
-    it('has stubbed trackPurchase method', () => {
-      expect(analyticsService.mockAnalyticsService).to.respondTo('trackPurchase');
-    });
-  });
-});

test/api/unit/libs/cron.test.js

@@ -13,7 +13,6 @@ import { cron, cronWrapper } from '../../../../website/server/libs/cron';
 import { model as User } from '../../../../website/server/models/user';
 import * as Tasks from '../../../../website/server/models/task';
 import common from '../../../../website/common';
-import * as analytics from '../../../../website/server/libs/analyticsService';
 import { model as Group } from '../../../../website/server/models/group';
 
 const CRON_TIMEOUT_WAIT = new Date(5 * 60 * 1000).getTime();
@@ -41,20 +40,17 @@ describe('cron', async () => {
         },
       },
     });
-
-    sinon.spy(analytics, 'track');
   });
 
   afterEach(async () => {
     if (clock !== null) clock.restore();
-    analytics.track.restore();
   });
 
   it('updates user.preferences.timezoneOffsetAtLastCron', async () => {
     const timezoneUtcOffsetFromUserPrefs = -1;
 
     await cron({
-      user, tasksByType, daysMissed, analytics, timezoneUtcOffsetFromUserPrefs,
+      user, tasksByType, daysMissed, timezoneUtcOffsetFromUserPrefs,
     });
 
     expect(user.preferences.timezoneOffsetAtLastCron).to.equal(1);
@@ -63,7 +59,7 @@ describe('cron', async () => {
   it('resets user.items.lastDrop.count', async () => {
     user.items.lastDrop.count = 4;
     await cron({
-      user, tasksByType, daysMissed, analytics,
+      user, tasksByType, daysMissed,
     });
     expect(user.items.lastDrop.count).to.equal(0);
   });
@@ -71,26 +67,11 @@ describe('cron', async () => {
   it('increments user cron count', async () => {
     const cronCountBefore = user.flags.cronCount;
     await cron({
-      user, tasksByType, daysMissed, analytics,
+      user, tasksByType, daysMissed,
     });
     expect(user.flags.cronCount).to.be.greaterThan(cronCountBefore);
   });
 
-  it('calls analytics', async () => {
-    await cron({
-      user, tasksByType, daysMissed, analytics,
-    });
-    expect(analytics.track.callCount).to.equal(1);
-  });
-
-  it('calls analytics when user is sleeping', async () => {
-    user.preferences.sleep = true;
-    await cron({
-      user, tasksByType, daysMissed, analytics,
-    });
-    expect(analytics.track.callCount).to.equal(1);
-  });
-
   describe('end of the month perks', async () => {
     beforeEach(async () => {
       user.purchased.plan.customerId = 'subscribedId';
@@ -101,7 +82,7 @@ describe('cron', async () => {
       user.purchased.plan.dateUpdated = new Date('2018-12-11');
       clock = sinon.useFakeTimers(new Date('2019-01-29'));
       await cron({
-        user, tasksByType, daysMissed, analytics,
+        user, tasksByType, daysMissed,
       });
       expect(user.purchased.plan.mysteryItems.length).to.eql(2);
       const filteredNotifications = user.notifications.filter(n => n.type === 'NEW_MYSTERY_ITEMS');
@@ -112,7 +93,7 @@ describe('cron', async () => {
       user.purchased.plan.dateUpdated = new Date('2018-11-11');
       clock = sinon.useFakeTimers(new Date('2019-01-29'));
       await cron({
-        user, tasksByType, daysMissed, analytics,
+        user, tasksByType, daysMissed,
       });
       expect(user.purchased.plan.mysteryItems.length).to.eql(4);
       const filteredNotifications = user.notifications.filter(n => n.type === 'NEW_MYSTERY_ITEMS');
@@ -122,7 +103,7 @@ describe('cron', async () => {
     it('resets plan.gemsBought on a new month', async () => {
       user.purchased.plan.gemsBought = 10;
       await cron({
-        user, tasksByType, daysMissed, analytics,
+        user, tasksByType, daysMissed,
       });
       expect(user.purchased.plan.gemsBought).to.equal(0);
     });
@@ -131,7 +112,7 @@ describe('cron', async () => {
       user.purchased.plan.gemsBought = 10;
       user.purchased.plan.dateUpdated = undefined;
       await cron({
-        user, tasksByType, daysMissed, analytics,
+        user, tasksByType, daysMissed,
       });
       expect(user.purchased.plan.gemsBought).to.equal(0);
     });
@@ -142,7 +123,7 @@ describe('cron', async () => {
 
       user.purchased.plan.gemsBought = 10;
       await cron({
-        user, tasksByType, daysMissed, analytics,
+        user, tasksByType, daysMissed,
       });
       expect(user.purchased.plan.gemsBought).to.equal(10);
     });
@@ -150,7 +131,7 @@ describe('cron', async () => {
     it('resets plan.dateUpdated on a new month', async () => {
       const currentMonth = moment().startOf('month');
       await cron({
-        user, tasksByType, daysMissed, analytics,
+        user, tasksByType, daysMissed,
       });
       expect(moment(user.purchased.plan.dateUpdated).startOf('month').isSame(currentMonth)).to.eql(true);
     });
@@ -158,7 +139,7 @@ describe('cron', async () => {
     it('increments plan.consecutive.count', async () => {
       user.purchased.plan.consecutive.count = 0;
       await cron({
-        user, tasksByType, daysMissed, analytics,
+        user, tasksByType, daysMissed,
       });
       expect(user.purchased.plan.consecutive.count).to.equal(1);
     });
@@ -166,7 +147,7 @@ describe('cron', async () => {
     it('increments plan.cumulativeCount', async () => {
       user.purchased.plan.cumulativeCount = 0;
       await cron({
-        user, tasksByType, daysMissed, analytics,
+        user, tasksByType, daysMissed,
       });
       expect(user.purchased.plan.cumulativeCount).to.equal(1);
     });
@@ -175,7 +156,7 @@ describe('cron', async () => {
       user.purchased.plan.dateUpdated = moment().subtract(2, 'months').toDate();
       user.purchased.plan.consecutive.count = 0;
       await cron({
-        user, tasksByType, daysMissed, analytics,
+        user, tasksByType, daysMissed,
       });
       expect(user.purchased.plan.consecutive.count).to.equal(2);
     });
@@ -184,7 +165,7 @@ describe('cron', async () => {
       user.purchased.plan.dateUpdated = moment().subtract(3, 'months').toDate();
       user.purchased.plan.cumulativeCount = 0;
       await cron({
-        user, tasksByType, daysMissed, analytics,
+        user, tasksByType, daysMissed,
       });
       expect(user.purchased.plan.cumulativeCount).to.equal(3);
     });
@@ -196,7 +177,7 @@ describe('cron', async () => {
       user.purchased.plan.consecutive.trinkets = 1;
 
       await cron({
-        user, tasksByType, daysMissed, analytics,
+        user, tasksByType, daysMissed,
       });
 
       expect(user.purchased.plan.consecutive.trinkets).to.equal(1);
@@ -206,7 +187,7 @@ describe('cron', async () => {
       user.purchased.plan.consecutive.gemCapExtra = 26;
       user.purchased.plan.consecutive.count = 5;
       await cron({
-        user, tasksByType, daysMissed, analytics,
+        user, tasksByType, daysMissed,
       });
       expect(user.purchased.plan.consecutive.gemCapExtra).to.equal(26);
     });
@@ -214,7 +195,7 @@ describe('cron', async () => {
     it('does not reset plan stats if we are before the last day of the cancelled month', async () => {
       user.purchased.plan.dateTerminated = moment(new Date()).add({ days: 1 });
       await cron({
-        user, tasksByType, daysMissed, analytics,
+        user, tasksByType, daysMissed,
       });
       expect(user.purchased.plan.customerId).to.exist;
     });
@@ -225,7 +206,7 @@ describe('cron', async () => {
       user.purchased.plan.consecutive.count = 5;
 
       await cron({
-        user, tasksByType, daysMissed, analytics,
+        user, tasksByType, daysMissed,
       });
 
       expect(user.purchased.plan.customerId).to.not.exist;
@@ -264,7 +245,7 @@ describe('cron', async () => {
         // Add 2 days so that we're sure we're not affected by any start-of-month effects
         // e.g., from time zone oddness.
         await cron({
-          user: user1, tasksByType, daysMissed, analytics,
+          user: user1, tasksByType, daysMissed,
         });
         expect(user1.purchased.plan.consecutive.count).to.equal(1);
         expect(user1.purchased.plan.consecutive.trinkets).to.equal(2);
@@ -276,7 +257,7 @@ describe('cron', async () => {
           .add(2, 'days')
           .toDate());
         await cron({
-          user: user1, tasksByType, daysMissed, analytics,
+          user: user1, tasksByType, daysMissed,
         });
         expect(user1.purchased.plan.consecutive.count).to.equal(10);
         expect(user1.purchased.plan.consecutive.trinkets).to.equal(11);
@@ -311,7 +292,7 @@ describe('cron', async () => {
           .add(2, 'days')
           .toDate());
         await cron({
-          user: user3, tasksByType, daysMissed, analytics,
+          user: user3, tasksByType, daysMissed,
         });
         expect(user3.purchased.plan.consecutive.count).to.equal(1);
         expect(user3.purchased.plan.consecutive.trinkets).to.equal(2);
@@ -323,7 +304,7 @@ describe('cron', async () => {
           .add(2, 'days')
           .toDate());
         await cron({
-          user: user3, tasksByType, daysMissed, analytics,
+          user: user3, tasksByType, daysMissed,
         });
         expect(user3.purchased.plan.consecutive.count).to.equal(10);
         expect(user3.purchased.plan.consecutive.trinkets).to.equal(11);
@@ -358,7 +339,7 @@ describe('cron', async () => {
           .add(2, 'days')
           .toDate());
         await cron({
-          user: user6, tasksByType, daysMissed, analytics,
+          user: user6, tasksByType, daysMissed,
         });
         expect(user6.purchased.plan.consecutive.count).to.equal(1);
         expect(user6.purchased.plan.consecutive.trinkets).to.equal(2);
@@ -391,7 +372,7 @@ describe('cron', async () => {
           .add(2, 'days')
           .toDate());
         await cron({
-          user: user12, tasksByType, daysMissed, analytics,
+          user: user12, tasksByType, daysMissed,
         });
         expect(user12.purchased.plan.consecutive.count).to.equal(1);
         expect(user12.purchased.plan.consecutive.trinkets).to.equal(2);
@@ -403,7 +384,7 @@ describe('cron', async () => {
           .add(2, 'days')
           .toDate());
         await cron({
-          user: user12, tasksByType, daysMissed, analytics,
+          user: user12, tasksByType, daysMissed,
         });
         expect(user12.purchased.plan.consecutive.count).to.equal(10);
         expect(user12.purchased.plan.consecutive.trinkets).to.equal(11);
@@ -439,7 +420,7 @@ describe('cron', async () => {
           .add(2, 'days')
           .toDate());
         await cron({
-          user: user3g, tasksByType, daysMissed, analytics,
+          user: user3g, tasksByType, daysMissed,
         });
         expect(user3g.purchased.plan.consecutive.count).to.equal(1);
         expect(user3g.purchased.plan.cumulativeCount).to.equal(1);
@@ -452,7 +433,7 @@ describe('cron', async () => {
           .add(2, 'days')
           .toDate());
         await cron({
-          user: user3g, tasksByType, daysMissed, analytics,
+          user: user3g, tasksByType, daysMissed,
         });
         // subscription has been erased by now
         expect(user3g.purchased.plan.consecutive.count).to.equal(0);
@@ -471,7 +452,7 @@ describe('cron', async () => {
     it('resets plan.gemsBought on a new month', async () => {
       user.purchased.plan.gemsBought = 10;
       await cron({
-        user, tasksByType, daysMissed, analytics,
+        user, tasksByType, daysMissed,
       });
       expect(user.purchased.plan.gemsBought).to.equal(0);
     });
@@ -482,14 +463,14 @@ describe('cron', async () => {
 
       user.purchased.plan.gemsBought = 10;
       await cron({
-        user, tasksByType, daysMissed, analytics,
+        user, tasksByType, daysMissed,
       });
       expect(user.purchased.plan.gemsBought).to.equal(10);
     });
 
     it('does not reset plan.dateUpdated on a new month', async () => {
       await cron({
-        user, tasksByType, daysMissed, analytics,
+        user, tasksByType, daysMissed,
       });
       expect(user.purchased.plan.dateUpdated).to.be.empty;
     });
@@ -497,7 +478,7 @@ describe('cron', async () => {
     it('does not increment plan.consecutive.count', async () => {
       user.purchased.plan.consecutive.count = 0;
       await cron({
-        user, tasksByType, daysMissed, analytics,
+        user, tasksByType, daysMissed,
       });
       expect(user.purchased.plan.consecutive.count).to.equal(0);
     });
@@ -505,7 +486,7 @@ describe('cron', async () => {
     it('does not increment plan.cumulativeCount', async () => {
       user.purchased.plan.cumulativeCount = 0;
       await cron({
-        user, tasksByType, daysMissed, analytics,
+        user, tasksByType, daysMissed,
       });
       expect(user.purchased.plan.cumulativeCount).to.equal(0);
     });
@@ -513,7 +494,7 @@ describe('cron', async () => {
     it('does not increment plan.consecutive.trinkets when user has reached a month that is a multiple of 3', async () => {
       user.purchased.plan.consecutive.count = 5;
       await cron({
-        user, tasksByType, daysMissed, analytics,
+        user, tasksByType, daysMissed,
       });
       expect(user.purchased.plan.consecutive.trinkets).to.equal(0);
     });
@@ -521,7 +502,7 @@ describe('cron', async () => {
     it('does not increment plan.consecutive.gemCapExtra when user has reached a month that is a multiple of 3', async () => {
       user.purchased.plan.consecutive.count = 5;
       await cron({
-        user, tasksByType, daysMissed, analytics,
+        user, tasksByType, daysMissed,
       });
       expect(user.purchased.plan.consecutive.gemCapExtra).to.equal(0);
     });
@@ -530,7 +511,7 @@ describe('cron', async () => {
       user.purchased.plan.consecutive.gemCapExtra = 26;
       user.purchased.plan.consecutive.count = 5;
       await cron({
-        user, tasksByType, daysMissed, analytics,
+        user, tasksByType, daysMissed,
       });
       expect(user.purchased.plan.consecutive.gemCapExtra).to.equal(26);
     });
@@ -538,7 +519,7 @@ describe('cron', async () => {
     it('does nothing to plan stats if we are before the last day of the cancelled month', async () => {
       user.purchased.plan.dateTerminated = moment(new Date()).add({ days: 1 });
       await cron({
-        user, tasksByType, daysMissed, analytics,
+        user, tasksByType, daysMissed,
       });
       expect(user.purchased.plan.customerId).to.not.exist;
     });
@@ -564,7 +545,7 @@ describe('cron', async () => {
     it('should make uncompleted todos redder', async () => {
       const valueBefore = tasksByType.todos[0].value;
       await cron({
-        user, tasksByType, daysMissed, analytics,
+        user, tasksByType, daysMissed,
       });
       expect(tasksByType.todos[0].value).to.be.lessThan(valueBefore);
     });
@@ -573,7 +554,7 @@ describe('cron', async () => {
       tasksByType.todos[0].completed = true;
       const valueBefore = tasksByType.todos[0].value;
       await cron({
-        user, tasksByType, daysMissed, analytics,
+        user, tasksByType, daysMissed,
       });
       expect(tasksByType.todos[0].value).to.equal(valueBefore);
     });
@@ -582,7 +563,7 @@ describe('cron', async () => {
       tasksByType.todos[0].completed = true;
 
       await cron({
-        user, tasksByType, daysMissed, analytics,
+        user, tasksByType, daysMissed,
       });
 
       expect(user.history.todos).to.be.lengthOf(1);
@@ -608,7 +589,7 @@ describe('cron', async () => {
       expect(user.tasksOrder.todos).to.be.lengthOf(3);
 
       await cron({
-        user, tasksByType, daysMissed, analytics,
+        user, tasksByType, daysMissed,
       });
 
       // user.tasksOrder.todos should be filtered while tasks by type remains unchanged
@@ -635,7 +616,7 @@ describe('cron', async () => {
       const original = user.tasksOrder.todos; // Preserve the original order
 
       await cron({
-        user, tasksByType, daysMissed, analytics,
+        user, tasksByType, daysMissed,
       });
 
       let listsAreEqual = true;
@@ -675,7 +656,7 @@ describe('cron', async () => {
       tasksByType.dailys[0].everyX = 5;
       tasksByType.dailys[0].startDate = moment().add(1, 'days').toDate();
       await cron({
-        user, tasksByType, daysMissed, analytics,
+        user, tasksByType, daysMissed,
       });
       expect(tasksByType.dailys[0].isDue).to.be.false;
     });
@@ -686,7 +667,7 @@ describe('cron', async () => {
       tasksByType.dailys[0].everyX = 5;
       tasksByType.dailys[0].startDate = moment().toDate();
       await cron({
-        user, tasksByType, daysMissed, analytics,
+        user, tasksByType, daysMissed,
       });
       expect(tasksByType.dailys[0].isDue).to.exist;
     });
@@ -696,14 +677,14 @@ describe('cron', async () => {
       tasksByType.dailys[0].everyX = 5;
       tasksByType.dailys[0].startDate = moment().add(1, 'days').toDate();
       await cron({
-        user, tasksByType, daysMissed, analytics,
+        user, tasksByType, daysMissed,
       });
       expect(tasksByType.dailys[0].nextDue.length).to.eql(6);
     });
 
     it('should add history', async () => {
       await cron({
-        user, tasksByType, daysMissed, analytics,
+        user, tasksByType, daysMissed,
       });
       expect(tasksByType.dailys[0].history).to.be.lengthOf(1);
     });
@@ -711,7 +692,7 @@ describe('cron', async () => {
     it('should set tasks completed to false', async () => {
       tasksByType.dailys[0].completed = true;
       await cron({
-        user, tasksByType, daysMissed, analytics,
+        user, tasksByType, daysMissed,
       });
       expect(tasksByType.dailys[0].completed).to.be.false;
     });
@@ -720,7 +701,7 @@ describe('cron', async () => {
       user.preferences.sleep = true;
       tasksByType.dailys[0].completed = true;
       await cron({
-        user, tasksByType, daysMissed, analytics,
+        user, tasksByType, daysMissed,
       });
       expect(tasksByType.dailys[0].completed).to.be.false;
     });
@@ -729,7 +710,7 @@ describe('cron', async () => {
       tasksByType.dailys[0].checklist.push({ title: 'test', completed: false });
       tasksByType.dailys[0].completed = true;
       await cron({
-        user, tasksByType, daysMissed, analytics,
+        user, tasksByType, daysMissed,
       });
       expect(tasksByType.dailys[0].checklist[0].completed).to.be.false;
     });
@@ -739,7 +720,7 @@ describe('cron', async () => {
       tasksByType.dailys[0].checklist.push({ title: 'test', completed: false });
       tasksByType.dailys[0].completed = true;
       await cron({
-        user, tasksByType, daysMissed, analytics,
+        user, tasksByType, daysMissed,
       });
       expect(tasksByType.dailys[0].checklist[0].completed).to.be.false;
     });
@@ -749,7 +730,7 @@ describe('cron', async () => {
       tasksByType.dailys[0].checklist.push({ title: 'test', completed: false });
       tasksByType.dailys[0].startDate = moment(new Date()).subtract({ days: 1 });
       await cron({
-        user, tasksByType, daysMissed, analytics,
+        user, tasksByType, daysMissed,
       });
       expect(tasksByType.dailys[0].checklist[0].completed).to.be.false;
     });
@@ -759,7 +740,7 @@ describe('cron', async () => {
       const hpBefore = user.stats.hp;
       tasksByType.dailys[0].startDate = moment(new Date()).subtract({ days: 1 });
       await cron({
-        user, tasksByType, daysMissed, analytics,
+        user, tasksByType, daysMissed,
       });
       expect(user.stats.hp).to.be.lessThan(hpBefore);
     });
@@ -770,7 +751,7 @@ describe('cron', async () => {
       const hpBefore = user.stats.hp;
       tasksByType.dailys[0].startDate = moment(new Date()).subtract({ days: 1 });
       await cron({
-        user, tasksByType, daysMissed, analytics,
+        user, tasksByType, daysMissed,
       });
       expect(user.stats.hp).to.equal(hpBefore);
     });
@@ -784,7 +765,7 @@ describe('cron', async () => {
       tasksByType.dailys[0].startDate = moment(new Date()).subtract({ days: 1 });
 
       cronOverride({
-        user, tasksByType, daysMissed, analytics,
+        user, tasksByType, daysMissed,
       });
 
       expect(user.stats.hp).to.equal(hpBefore);
@@ -797,7 +778,7 @@ describe('cron', async () => {
       tasksByType.dailys[0].startDate = moment(new Date()).subtract({ days: 1 });
 
       await cron({
-        user, tasksByType, daysMissed, analytics,
+        user, tasksByType, daysMissed,
       });
 
       expect(user.stats.hp).to.equal(hpBefore);
@@ -808,7 +789,7 @@ describe('cron', async () => {
       let hpBefore = user.stats.hp;
       tasksByType.dailys[0].startDate = moment(new Date()).subtract({ days: 1 });
       await cron({
-        user, tasksByType, daysMissed, analytics,
+        user, tasksByType, daysMissed,
       });
       const hpDifferenceOfFullyIncompleteDaily = hpBefore - user.stats.hp;
 
@@ -816,7 +797,7 @@ describe('cron', async () => {
       tasksByType.dailys[0].checklist.push({ title: 'test', completed: true });
       tasksByType.dailys[0].checklist.push({ title: 'test2', completed: false });
       await cron({
-        user, tasksByType, daysMissed, analytics,
+        user, tasksByType, daysMissed,
       });
       const hpDifferenceOfPartiallyIncompleteDaily = hpBefore - user.stats.hp;
 
@@ -829,7 +810,7 @@ describe('cron', async () => {
       tasksByType.dailys[0].startDate = moment(new Date()).subtract({ days: 1 });
 
       const progress = await cron({
-        user, tasksByType, daysMissed, analytics,
+        user, tasksByType, daysMissed,
       });
 
       expect(progress.down).to.equal(-1);
@@ -841,7 +822,7 @@ describe('cron', async () => {
       tasksByType.dailys[0].startDate = moment(new Date()).subtract({ days: 1 });
 
       const progress = await cron({
-        user, tasksByType, daysMissed, analytics,
+        user, tasksByType, daysMissed,
       });
 
       expect(progress.down).to.equal(0);
@@ -862,7 +843,7 @@ describe('cron', async () => {
       tasksByType.dailys[1].frequency = 'daily';
 
       await cron({
-        user, tasksByType, daysMissed, analytics,
+        user, tasksByType, daysMissed,
       });
 
       expect(user.stats.hp).to.equal(48);
@@ -886,7 +867,7 @@ describe('cron', async () => {
       tasksByType.habits[0].down = false;
 
       await cron({
-        user, tasksByType, daysMissed, analytics,
+        user, tasksByType, daysMissed,
       });
 
       expect(tasksByType.habits[0].value).to.be.lessThan(1);
@@ -897,7 +878,7 @@ describe('cron', async () => {
       tasksByType.habits[0].up = false;
 
       await cron({
-        user, tasksByType, daysMissed, analytics,
+        user, tasksByType, daysMissed,
       });
 
       expect(tasksByType.habits[0].value).to.be.lessThan(1);
@@ -909,7 +890,7 @@ describe('cron', async () => {
       tasksByType.habits[0].down = true;
 
       await cron({
-        user, tasksByType, daysMissed, analytics,
+        user, tasksByType, daysMissed,
       });
 
       expect(tasksByType.habits[0].value).to.equal(1);
@@ -928,7 +909,7 @@ describe('cron', async () => {
         tasksByType.habits[0].counterDown = 1;
 
         await cron({
-          user, tasksByType, daysMissed, analytics,
+          user, tasksByType, daysMissed,
         });
 
         expect(tasksByType.habits[0].counterUp).to.equal(0);
@@ -941,7 +922,7 @@ describe('cron', async () => {
         tasksByType.habits[0].counterDown = 1;
 
         await cron({
-          user, tasksByType, daysMissed, analytics,
+          user, tasksByType, daysMissed,
         });
 
         expect(tasksByType.habits[0].counterUp).to.equal(0);
@@ -955,7 +936,7 @@ describe('cron', async () => {
 
         // should not reset
         await cron({
-          user, tasksByType, daysMissed, analytics,
+          user, tasksByType, daysMissed,
         });
 
         expect(tasksByType.habits[0].counterUp).to.equal(1);
@@ -964,7 +945,7 @@ describe('cron', async () => {
         // should reset
         daysMissed = 8;
         await cron({
-          user, tasksByType, daysMissed, analytics,
+          user, tasksByType, daysMissed,
         });
 
         expect(tasksByType.habits[0].counterUp).to.equal(0);
@@ -988,7 +969,7 @@ describe('cron', async () => {
 
         // should not reset
         await cron({
-          user, tasksByType, daysMissed, analytics,
+          user, tasksByType, daysMissed,
         });
 
         expect(tasksByType.habits[0].counterUp).to.equal(1);
@@ -1002,7 +983,7 @@ describe('cron', async () => {
 
         // should reset after user CDS
         await cron({
-          user, tasksByType, daysMissed, analytics,
+          user, tasksByType, daysMissed,
         });
 
         expect(tasksByType.habits[0].counterUp).to.equal(0);
@@ -1026,7 +1007,7 @@ describe('cron', async () => {
 
         // should not reset
         await cron({
-          user, tasksByType, daysMissed, analytics,
+          user, tasksByType, daysMissed,
         });
 
         expect(tasksByType.habits[0].counterUp).to.equal(1);
@@ -1036,7 +1017,7 @@ describe('cron', async () => {
         // should reset
         daysMissed = 2;
         await cron({
-          user, tasksByType, daysMissed, analytics,
+          user, tasksByType, daysMissed,
         });
 
         expect(tasksByType.habits[0].counterUp).to.equal(0);
@@ -1060,7 +1041,7 @@ describe('cron', async () => {
 
         // should reset
         await cron({
-          user, tasksByType, daysMissed, analytics,
+          user, tasksByType, daysMissed,
         });
 
         expect(tasksByType.habits[0].counterUp).to.equal(0);
@@ -1084,7 +1065,7 @@ describe('cron', async () => {
 
         // should not reset
         await cron({
-          user, tasksByType, daysMissed, analytics,
+          user, tasksByType, daysMissed,
         });
 
         expect(tasksByType.habits[0].counterUp).to.equal(1);
@@ -1098,7 +1079,7 @@ describe('cron', async () => {
 
         // should not reset
         await cron({
-          user, tasksByType, daysMissed, analytics,
+          user, tasksByType, daysMissed,
         });
 
         expect(tasksByType.habits[0].counterUp).to.equal(1);
@@ -1107,7 +1088,7 @@ describe('cron', async () => {
         // should reset
         daysMissed = 32;
         await cron({
-          user, tasksByType, daysMissed, analytics,
+          user, tasksByType, daysMissed,
         });
 
         expect(tasksByType.habits[0].counterUp).to.equal(0);
@@ -1132,7 +1113,7 @@ describe('cron', async () => {
 
         // should reset
         await cron({
-          user, tasksByType, daysMissed, analytics,
+          user, tasksByType, daysMissed,
         });
 
         expect(tasksByType.habits[0].counterUp).to.equal(0);
@@ -1156,7 +1137,7 @@ describe('cron', async () => {
 
         // should not reset
         await cron({
-          user, tasksByType, daysMissed, analytics,
+          user, tasksByType, daysMissed,
         });
 
         expect(tasksByType.habits[0].counterUp).to.equal(1);
@@ -1166,7 +1147,7 @@ describe('cron', async () => {
         // should reset
         daysMissed = 2;
         await cron({
-          user, tasksByType, daysMissed, analytics,
+          user, tasksByType, daysMissed,
         });
 
         expect(tasksByType.habits[0].counterUp).to.equal(0);
@@ -1199,7 +1180,7 @@ describe('cron', async () => {
       user.stats.lvl = 2;
 
       await cron({
-        user, tasksByType, daysMissed, analytics,
+        user, tasksByType, daysMissed,
       });
 
       expect(user.history.exp).to.have.lengthOf(1);
@@ -1212,7 +1193,7 @@ describe('cron', async () => {
       tasksByType.dailys[0].isDue = true;
 
       await cron({
-        user, tasksByType, daysMissed, analytics,
+        user, tasksByType, daysMissed,
       });
 
       expect(user.achievements.perfect).to.equal(1);
@@ -1224,7 +1205,7 @@ describe('cron', async () => {
       tasksByType.dailys[0].isDue = false;
 
       await cron({
-        user, tasksByType, daysMissed, analytics,
+        user, tasksByType, daysMissed,
       });
 
       expect(user.achievements.perfect).to.equal(0);
@@ -1238,7 +1219,7 @@ describe('cron', async () => {
       const previousBuffs = user.stats.buffs.toObject();
 
       await cron({
-        user, tasksByType, daysMissed, analytics,
+        user, tasksByType, daysMissed,
       });
 
       expect(user.stats.buffs.str).to.be.greaterThan(previousBuffs.str);
@@ -1256,7 +1237,7 @@ describe('cron', async () => {
       const previousBuffs = user.stats.buffs.toObject();
 
       await cron({
-        user, tasksByType, daysMissed, analytics,
+        user, tasksByType, daysMissed,
       });
 
       expect(user.stats.buffs.str).to.be.greaterThan(previousBuffs.str);
@@ -1280,7 +1261,7 @@ describe('cron', async () => {
       };
 
       await cron({
-        user, tasksByType, daysMissed, analytics,
+        user, tasksByType, daysMissed,
       });
 
       expect(user.stats.buffs.str).to.equal(0);
@@ -1307,7 +1288,7 @@ describe('cron', async () => {
       };
 
       await cron({
-        user, tasksByType, daysMissed, analytics,
+        user, tasksByType, daysMissed,
       });
 
       expect(user.stats.buffs.str).to.equal(0);
@@ -1333,7 +1314,7 @@ describe('cron', async () => {
       };
 
       await cron({
-        user, tasksByType, daysMissed, analytics,
+        user, tasksByType, daysMissed,
       });
 
       expect(user.stats.buffs.str).to.equal(0);
@@ -1360,7 +1341,7 @@ describe('cron', async () => {
       };
 
       await cron({
-        user, tasksByType, daysMissed, analytics,
+        user, tasksByType, daysMissed,
       });
 
       expect(user.stats.buffs.str).to.equal(0);
@@ -1381,7 +1362,7 @@ describe('cron', async () => {
       const previousBuffs = user.stats.buffs.toObject();
 
       cronOverride({
-        user, tasksByType, daysMissed, analytics,
+        user, tasksByType, daysMissed,
       });
 
       expect(user.stats.buffs.str).to.be.greaterThan(previousBuffs.str);
@@ -1401,7 +1382,7 @@ describe('cron', async () => {
       const previousBuffs = user.stats.buffs.toObject();
 
       cronOverride({
-        user, tasksByType, daysMissed, analytics,
+        user, tasksByType, daysMissed,
       });
 
       expect(user.stats.buffs.str).to.be.greaterThan(previousBuffs.str);
@@ -1420,7 +1401,7 @@ describe('cron', async () => {
       tasksByType.dailys[0].completed = true;
       stubbedStatsComputed.returns(Object.assign(statsComputedRes, { maxMP: 100 }));
       await cron({
-        user, tasksByType, daysMissed, analytics,
+        user, tasksByType, daysMissed,
       });
       expect(user.stats.mp).to.be.greaterThan(mpBefore);
 
@@ -1436,7 +1417,7 @@ describe('cron', async () => {
       tasksByType.dailys[0].completed = true;
       stubbedStatsComputed.returns(Object.assign(statsComputedRes, { maxMP: 100 }));
       await cron({
-        user, tasksByType, daysMissed, analytics,
+        user, tasksByType, daysMissed,
       });
       expect(user.stats.mp).to.equal(mpBefore);
 
@@ -1449,7 +1430,7 @@ describe('cron', async () => {
       user.stats.mp = 120;
       stubbedStatsComputed.returns(Object.assign(statsComputedRes, { maxMP: 100 }));
       await cron({
-        user, tasksByType, daysMissed, analytics,
+        user, tasksByType, daysMissed,
       });
       expect(user.stats.mp).to.equal(common.statsComputed(user).maxMP);
 
@@ -1482,7 +1463,7 @@ describe('cron', async () => {
 
     it('resets user progress', async () => {
       await cron({
-        user, tasksByType, daysMissed, analytics,
+        user, tasksByType, daysMissed,
       });
       expect(user.party.quest.progress.up).to.equal(0);
       expect(user.party.quest.progress.down).to.equal(0);
@@ -1491,7 +1472,7 @@ describe('cron', async () => {
 
     it('applies the user progress', async () => {
       const progress = await cron({
-        user, tasksByType, daysMissed, analytics,
+        user, tasksByType, daysMissed,
       });
       expect(progress.down).to.equal(-1);
     });
@@ -1529,19 +1510,19 @@ describe('cron', async () => {
   describe('login incentives', async () => {
     it('increments incentive counter each cron', async () => {
       await cron({
-        user, tasksByType, daysMissed, analytics,
+        user, tasksByType, daysMissed,
       });
       expect(user.loginIncentives).to.eql(1);
       user.lastCron = moment(new Date()).subtract({ days: 1 });
       await cron({
-        user, tasksByType, daysMissed, analytics,
+        user, tasksByType, daysMissed,
       });
       expect(user.loginIncentives).to.eql(2);
     });
 
     it('pushes a notification of the day\'s incentive each cron', async () => {
       await cron({
-        user, tasksByType, daysMissed, analytics,
+        user, tasksByType, daysMissed,
       });
       expect(user.notifications.length).to.eql(1);
       expect(user.notifications[0].type).to.eql('LOGIN_INCENTIVE');
@@ -1549,13 +1530,13 @@ describe('cron', async () => {
 
     it('replaces previous notifications', async () => {
       await cron({
-        user, tasksByType, daysMissed, analytics,
+        user, tasksByType, daysMissed,
       });
       await cron({
-        user, tasksByType, daysMissed, analytics,
+        user, tasksByType, daysMissed,
       });
       await cron({
-        user, tasksByType, daysMissed, analytics,
+        user, tasksByType, daysMissed,
       });
 
       const filteredNotifications = user.notifications.filter(n => n.type === 'LOGIN_INCENTIVE');
@@ -1566,7 +1547,7 @@ describe('cron', async () => {
     it('increments loginIncentives by 1 even if days are skipped in between', async () => {
       daysMissed = 3;
       await cron({
-        user, tasksByType, daysMissed, analytics,
+        user, tasksByType, daysMissed,
       });
       expect(user.loginIncentives).to.eql(1);
     });
@@ -1574,14 +1555,14 @@ describe('cron', async () => {
     it('increments loginIncentives by 1 even if user is sleeping', async () => {
       user.preferences.sleep = true;
       await cron({
-        user, tasksByType, daysMissed, analytics,
+        user, tasksByType, daysMissed,
       });
       expect(user.loginIncentives).to.eql(1);
     });
 
     it('awards user bard robes if login incentive is 1', async () => {
       await cron({
-        user, tasksByType, daysMissed, analytics,
+        user, tasksByType, daysMissed,
       });
       expect(user.loginIncentives).to.eql(1);
       expect(user.items.gear.owned.armor_special_bardRobes).to.eql(true);
@@ -1591,7 +1572,7 @@ describe('cron', async () => {
     it('awards user incentive backgrounds if login incentive is 2', async () => {
       user.loginIncentives = 1;
       await cron({
-        user, tasksByType, daysMissed, analytics,
+        user, tasksByType, daysMissed,
       });
       expect(user.loginIncentives).to.eql(2);
       expect(user.purchased.background.blue).to.eql(true);
@@ -1605,7 +1586,7 @@ describe('cron', async () => {
     it('awards user Bard Hat if login incentive is 3', async () => {
       user.loginIncentives = 2;
       await cron({
-        user, tasksByType, daysMissed, analytics,
+        user, tasksByType, daysMissed,
       });
       expect(user.loginIncentives).to.eql(3);
       expect(user.items.gear.owned.head_special_bardHat).to.eql(true);
@@ -1615,7 +1596,7 @@ describe('cron', async () => {
     it('awards user RoyalPurple Hatching Potion if login incentive is 4', async () => {
       user.loginIncentives = 3;
       await cron({
-        user, tasksByType, daysMissed, analytics,
+        user, tasksByType, daysMissed,
       });
       expect(user.loginIncentives).to.eql(4);
       expect(user.items.hatchingPotions.RoyalPurple).to.eql(1);
@@ -1625,7 +1606,7 @@ describe('cron', async () => {
     it('awards user a Chocolate, Meat and Pink Contton Candy if login incentive is 5', async () => {
       user.loginIncentives = 4;
       await cron({
-        user, tasksByType, daysMissed, analytics,
+        user, tasksByType, daysMissed,
       });
       expect(user.loginIncentives).to.eql(5);
 
@@ -1639,7 +1620,7 @@ describe('cron', async () => {
     it('awards user moon quest if login incentive is 7', async () => {
       user.loginIncentives = 6;
       await cron({
-        user, tasksByType, daysMissed, analytics,
+        user, tasksByType, daysMissed,
       });
       expect(user.loginIncentives).to.eql(7);
       expect(user.items.quests.moon1).to.eql(1);
@@ -1649,7 +1630,7 @@ describe('cron', async () => {
     it('awards user RoyalPurple Hatching Potion if login incentive is 10', async () => {
       user.loginIncentives = 9;
       await cron({
-        user, tasksByType, daysMissed, analytics,
+        user, tasksByType, daysMissed,
       });
       expect(user.loginIncentives).to.eql(10);
       expect(user.items.hatchingPotions.RoyalPurple).to.eql(1);
@@ -1659,7 +1640,7 @@ describe('cron', async () => {
     it('awards user a Strawberry, Patato and Blue Contton Candy if login incentive is 14', async () => {
       user.loginIncentives = 13;
       await cron({
-        user, tasksByType, daysMissed, analytics,
+        user, tasksByType, daysMissed,
       });
       expect(user.loginIncentives).to.eql(14);
 
@@ -1673,7 +1654,7 @@ describe('cron', async () => {
     it('awards user a bard instrument if login incentive is 18', async () => {
       user.loginIncentives = 17;
       await cron({
-        user, tasksByType, daysMissed, analytics,
+        user, tasksByType, daysMissed,
       });
       expect(user.loginIncentives).to.eql(18);
       expect(user.items.gear.owned.weapon_special_bardInstrument).to.eql(true);
@@ -1683,7 +1664,7 @@ describe('cron', async () => {
     it('awards user second moon quest if login incentive is 22', async () => {
       user.loginIncentives = 21;
       await cron({
-        user, tasksByType, daysMissed, analytics,
+        user, tasksByType, daysMissed,
       });
       expect(user.loginIncentives).to.eql(22);
       expect(user.items.quests.moon2).to.eql(1);
@@ -1693,7 +1674,7 @@ describe('cron', async () => {
     it('awards user a RoyalPurple hatching potion if login incentive is 26', async () => {
       user.loginIncentives = 25;
       await cron({
-        user, tasksByType, daysMissed, analytics,
+        user, tasksByType, daysMissed,
       });
       expect(user.loginIncentives).to.eql(26);
       expect(user.items.hatchingPotions.RoyalPurple).to.eql(1);
@@ -1703,7 +1684,7 @@ describe('cron', async () => {
     it('awards user Fish, Milk, Rotten Meat and Honey if login incentive is 30', async () => {
       user.loginIncentives = 29;
       await cron({
-        user, tasksByType, daysMissed, analytics,
+        user, tasksByType, daysMissed,
       });
       expect(user.loginIncentives).to.eql(30);
 
@@ -1718,7 +1699,7 @@ describe('cron', async () => {
     it('awards user a RoyalPurple hatching potion if login incentive is 35', async () => {
       user.loginIncentives = 34;
       await cron({
-        user, tasksByType, daysMissed, analytics,
+        user, tasksByType, daysMissed,
       });
       expect(user.loginIncentives).to.eql(35);
       expect(user.items.hatchingPotions.RoyalPurple).to.eql(1);
@@ -1728,7 +1709,7 @@ describe('cron', async () => {
     it('awards user the third moon quest if login incentive is 40', async () => {
       user.loginIncentives = 39;
       await cron({
-        user, tasksByType, daysMissed, analytics,
+        user, tasksByType, daysMissed,
       });
       expect(user.loginIncentives).to.eql(40);
       expect(user.items.quests.moon3).to.eql(1);
@@ -1738,7 +1719,7 @@ describe('cron', async () => {
     it('awards user a RoyalPurple hatching potion if login incentive is 45', async () => {
       user.loginIncentives = 44;
       await cron({
-        user, tasksByType, daysMissed, analytics,
+        user, tasksByType, daysMissed,
       });
       expect(user.loginIncentives).to.eql(45);
       expect(user.items.hatchingPotions.RoyalPurple).to.eql(1);
@@ -1748,7 +1729,7 @@ describe('cron', async () => {
     it('awards user a saddle if login incentive is 50', async () => {
       user.loginIncentives = 49;
       await cron({
-        user, tasksByType, daysMissed, analytics,
+        user, tasksByType, daysMissed,
       });
       expect(user.loginIncentives).to.eql(50);
       expect(user.items.food.Saddle).to.eql(1);
@@ -1766,7 +1747,6 @@ describe('cron wrapper', () => {
     res = generateRes();
     req = generateReq();
     user = await res.locals.user.save();
-    res.analytics = analytics;
   });
 
   afterEach(() => {

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

@@ -1,9 +1,9 @@
 /* eslint-disable global-require */
-import got from 'got';
 import nconf from 'nconf';
 import requireAgain from 'require-again';
 import { TAVERN_ID } from '../../../../website/server/models/group';
 import { defer } from '../../../helpers/api-unit.helper';
+import worker from '../../../../website/server/libs/worker';
 
 function getUser () {
   return {
@@ -127,7 +127,7 @@ describe('emails', () => {
     let sendTxn = null;
 
     beforeEach(() => {
-      sandbox.stub(got, 'post').returns(defer().promise);
+      sandbox.stub(worker, 'sendJob').returns(defer().promise);
 
       const nconfGetStub = sandbox.stub(nconf, 'get');
       nconfGetStub.withArgs('IS_PROD').returns(true);
@@ -149,13 +149,12 @@ describe('emails', () => {
       };
 
       sendTxn(mailingInfo, emailType);
-      expect(got.post).to.be.called;
-      expect(got.post).to.be.calledWith('http://example.com/job', sinon.match({
-        json: {
-          data: {
-            emailType: sinon.match.same(emailType),
-            to: sinon.match(value => Array.isArray(value) && value[0].name === mailingInfo.name, 'matches mailing info array'),
-          },
+      expect(worker.sendJob).to.be.called;
+      expect(worker.sendJob).to.be.calledWith('email', sinon.match({
+        identifier: emailType,
+        data: {
+          emailType: sinon.match.same(emailType),
+          to: sinon.match(value => Array.isArray(value) && value[0].name === mailingInfo.name, 'matches mailing info array'),
         },
       }));
     });
@@ -168,7 +167,7 @@ describe('emails', () => {
       };
 
       sendTxn(mailingInfo, emailType);
-      expect(got.post).not.to.be.called;
+      expect(worker.sendJob).not.to.be.called;
     });
 
     it('throws error when mail target is only a string', async () => {
@@ -233,13 +232,12 @@ describe('emails', () => {
       const mailingInfo = getUser();
 
       sendTxn(mailingInfo, emailType);
-      expect(got.post).to.be.called;
-      expect(got.post).to.be.calledWith('http://example.com/job', sinon.match({
-        json: {
-          data: {
-            emailType: sinon.match.same(emailType),
-            to: sinon.match(val => val[0]._id === mailingInfo._id),
-          },
+      expect(worker.sendJob).to.be.called;
+      expect(worker.sendJob).to.be.calledWith('email', sinon.match({
+        identifier: emailType,
+        data: {
+          emailType: sinon.match.same(emailType),
+          to: sinon.match(val => val[0]._id === mailingInfo._id),
         },
       }));
     });
@@ -253,15 +251,14 @@ describe('emails', () => {
       const variables = [];
 
       sendTxn(mailingInfo, emailType, variables);
-      expect(got.post).to.be.called;
-      expect(got.post).to.be.calledWith('http://example.com/job', sinon.match({
-        json: {
-          data: {
-            variables: sinon.match(value => value[0].name === 'BASE_URL', 'matches variables'),
-            personalVariables: sinon.match(value => value[0].rcpt === mailingInfo.email
-                && value[0].vars[0].name === 'RECIPIENT_NAME'
+      expect(worker.sendJob).to.be.called;
+      expect(worker.sendJob).to.be.calledWith('email', sinon.match({
+        identifier: emailType,
+        data: {
+          variables: sinon.match(value => value[0].name === 'BASE_URL', 'matches variables'),
+          personalVariables: sinon.match(value => value[0].rcpt === mailingInfo.email
+              && value[0].vars[0].name === 'RECIPIENT_NAME'
                 && value[0].vars[1].name === 'RECIPIENT_UNSUB_URL', 'matches personal variables'),
-          },
         },
       }));
     });

test/api/unit/libs/localAnalytics.test.js

@@ -0,0 +1,100 @@
+import nconf from 'nconf';
+import requireAgain from 'require-again';
+import { model as User } from '../../../../website/server/models/user';
+import { RegistrationEventModel } from '../../../../website/server/models/analytics/registrationEvent';
+import { SubscriptionEventModel } from '../../../../website/server/models/analytics/subscriptionEvent';
+
+describe('localAnalytics', () => {
+  let user;
+  let localAnalytics;
+  before(() => {
+    const nconfGetStub = sandbox.stub(nconf, 'get');
+    nconfGetStub.withArgs('ANALYTICS_DB').returns('analytics');
+    nconfGetStub.withArgs('DISABLE_LOCAL_ANALYTICS').returns(false);
+    localAnalytics = requireAgain('../../../../website/server/libs/localAnalytics');
+  });
+
+  beforeEach(async () => {
+    user = new User({
+      auth: {
+        local: {
+          username: 'username',
+          email: 'email@example.com',
+        },
+      },
+      registeredThrough: 'habitica-web',
+    });
+  });
+
+  describe('trackRegistrationEvent', () => {
+    afterEach(async () => {
+      await RegistrationEventModel.deleteMany({});
+    });
+
+    it('creates a registration event when a user registers', async () => {
+      user._id = '00000000-0000-0000-0000-000000000001';
+      await localAnalytics.trackRegistrationEvent({ user, ipAddress: '127.0.0.1' });
+
+      const registrationEvents = await RegistrationEventModel.find({ userId: user._id });
+      expect(registrationEvents).to.have.lengthOf(1);
+      expect(registrationEvents[0]).to.have.property('userId', user._id);
+      expect(registrationEvents[0]).to.have.property('ipAddress', '127.0.0.1');
+    });
+
+    it('saves the correct data to the database', async () => {
+      user._id = '00000000-0000-0000-0000-000000000002';
+      user.auth.google = { id: 'abc', emails: [{ value: 'email@example.com' }] };
+      await localAnalytics.trackRegistrationEvent({ user, ipAddress: '127.0.0.2' });
+
+      const registrationEvent = await RegistrationEventModel.findOne({ userId: user._id });
+      expect(registrationEvent).to.have.property('userId', user._id);
+      expect(registrationEvent).to.have.property('ipAddress', '127.0.0.2');
+      expect(registrationEvent).to.have.property('authenticationMethod', 'google');
+    });
+  });
+
+  describe('trackSubscriptionEvent', () => {
+    afterEach(async () => {
+      await SubscriptionEventModel.deleteMany({});
+    });
+
+    it('creates a subscription event when a user subscribes', async () => {
+      user._id = '00000000-0000-0000-0000-000000000003';
+      await localAnalytics.trackSubscriptionEvent({
+        eventType: 'subscribed',
+        user,
+        paymentMethod: 'stripe',
+        customerId: 'cus_123',
+        planId: 'plan_123',
+      });
+
+      const subscriptionEvents = await SubscriptionEventModel.find({ userId: user._id });
+      expect(subscriptionEvents).to.have.lengthOf(1);
+      expect(subscriptionEvents[0]).to.have.property('userId', user._id);
+      expect(subscriptionEvents[0]).to.have.property('eventType', 'subscribed');
+      expect(subscriptionEvents[0]).to.have.property('paymentMethod', 'stripe');
+      expect(subscriptionEvents[0]).to.have.property('customerId', 'cus_123');
+      expect(subscriptionEvents[0]).to.have.property('planId', 'plan_123');
+    });
+
+    it('creates a subscription event with cancellation reason when a user cancels', async () => {
+      user._id = '00000000-0000-0000-0000-000000000004';
+      await localAnalytics.trackSubscriptionEvent({
+        eventType: 'cancelled',
+        user,
+        paymentMethod: 'stripe',
+        customerId: 'cus_456',
+        planId: 'plan_456',
+        cancellationReason: 'No longer needed',
+      });
+
+      const subscriptionEvent = await SubscriptionEventModel.findOne({ userId: user._id });
+      expect(subscriptionEvent).to.have.property('userId', user._id);
+      expect(subscriptionEvent).to.have.property('eventType', 'cancelled');
+      expect(subscriptionEvent).to.have.property('paymentMethod', 'stripe');
+      expect(subscriptionEvent).to.have.property('customerId', 'cus_456');
+      expect(subscriptionEvent).to.have.property('planId', 'plan_456');
+      expect(subscriptionEvent).to.have.property('cancellationReason', 'No longer needed');
+    });
+  });
+});

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

@@ -3,7 +3,6 @@ import moment from 'moment';
 import * as sender from '../../../../../website/server/libs/email';
 import common from '../../../../../website/common';
 import api from '../../../../../website/server/libs/payments/payments';
-import * as analytics from '../../../../../website/server/libs/analyticsService';
 import * as notifications from '../../../../../website/server/libs/pushNotifications';
 import { model as User } from '../../../../../website/server/models/user';
 import { translate as t } from '../../../../helpers/api-integration/v3';
@@ -13,6 +12,7 @@ import {
 import * as worldState from '../../../../../website/server/libs/worldState';
 import { TransactionModel } from '../../../../../website/server/models/transaction';
 import { REPEATING_EVENTS } from '../../../../../website/common/script/content/constants/events';
+import { SubscriptionEventModel } from '../../../../../website/server/models/analytics/subscriptionEvent';
 
 describe('payments/index', () => {
   let user;
@@ -36,8 +36,6 @@ describe('payments/index', () => {
 
     sandbox.stub(sender, 'sendTxn');
     sandbox.stub(user, 'sendMessage');
-    sandbox.stub(analytics.mockAnalyticsService, 'trackPurchase');
-    sandbox.stub(analytics.mockAnalyticsService, 'track');
     sandbox.stub(notifications, 'sendNotification');
 
     data = {
@@ -97,6 +95,16 @@ describe('payments/index', () => {
         expect(recipient.items.pets['Jackalope-RoyalPurple']).to.eql(5);
       });
 
+      it('tracks subscription events', async () => {
+        await api.createSubscription(data);
+        const subscriptionEvent = await SubscriptionEventModel.findOne({ userId: recipient._id });
+        expect(subscriptionEvent).to.exist;
+        expect(subscriptionEvent).to.have.property('eventType', 'subscribed');
+        expect(subscriptionEvent).to.have.property('userId', recipient._id);
+        expect(subscriptionEvent).to.have.property('planId', 'basic_3mo');
+        expect(subscriptionEvent).to.have.property('paymentMethod', 'Payment Method');
+      });
+
       it('adds extra months to an existing subscription', async () => {
         recipient.purchased.plan = plan;
 
@@ -298,28 +306,6 @@ describe('payments/index', () => {
         expect(notifications.sendNotification).to.be.calledOnce;
       });
 
-      it('tracks subscription purchase as gift', async () => {
-        await api.createSubscription(data);
-
-        expect(analytics.mockAnalyticsService.trackPurchase).to.be.calledOnce;
-        expect(analytics.mockAnalyticsService.trackPurchase).to.be.calledWith({
-          uuid: user._id,
-          groupId: undefined,
-          itemPurchased: 'Subscription',
-          sku: 'payment method-subscription',
-          purchaseType: 'subscribe',
-          paymentMethod: data.paymentMethod,
-          quantity: 1,
-          gift: true,
-          purchaseValue: 15,
-          firstPurchase: true,
-          headers: {
-            'x-client': 'habitica-web',
-            'user-agent': '',
-          },
-        });
-      });
-
       context('No Active Promotion', () => {
         beforeEach(() => {
           sinon.stub(worldState, 'getCurrentEventList').returns([]);
@@ -455,6 +441,16 @@ describe('payments/index', () => {
         expect(user.purchased.plan.dateCreated).to.exist;
       });
 
+      it('tracks subscription events', async () => {
+        await api.createSubscription(data);
+        const subscriptionEvent = await SubscriptionEventModel.findOne({ userId: user._id });
+        expect(subscriptionEvent).to.exist;
+        expect(subscriptionEvent).to.have.property('userId', user._id);
+        expect(subscriptionEvent).to.have.property('ipAddress');
+        expect(subscriptionEvent).to.have.property('planId', 'basic_3mo');
+        expect(subscriptionEvent).to.have.property('paymentMethod', 'Payment Method');
+      });
+
       it('sets plan.dateCreated if it did not previously exist', async () => {
         expect(user.purchased.plan.dateCreated).to.not.exist;
 
@@ -543,29 +539,24 @@ describe('payments/index', () => {
         expect(sender.sendTxn).to.be.calledWith(data.user, 'subscription-begins');
       });
 
-      it('tracks subscription purchase', async () => {
-        await api.createSubscription(data);
-
-        expect(analytics.mockAnalyticsService.trackPurchase).to.be.calledOnce;
-        expect(analytics.mockAnalyticsService.trackPurchase).to.be.calledWith({
-          uuid: user._id,
-          groupId: undefined,
-          itemPurchased: 'Subscription',
-          sku: 'payment method-subscription',
-          purchaseType: 'subscribe',
-          paymentMethod: data.paymentMethod,
-          quantity: 1,
-          gift: false,
-          purchaseValue: 15,
-          firstPurchase: true,
-          headers: {
-            'x-client': 'habitica-web',
-            'user-agent': '',
-          },
-        });
-      });
-
       context('Upgrades subscription', () => {
+        it('tracks subscription events', async () => {
+          data.sub.key = 'basic_earned';
+          expect(user.purchased.plan.planId).to.not.exist;
+
+          await api.createSubscription(data);
+
+          data.sub.key = 'basic_6mo';
+          data.updatedFrom = { key: 'basic_earned' };
+          await api.createSubscription(data);
+
+          const subscriptionEvent = await SubscriptionEventModel.findOne({ userId: user._id, planId: 'basic_6mo' });
+          expect(subscriptionEvent).to.exist;
+          expect(subscriptionEvent).to.have.property('eventType', 'upgraded');
+          expect(subscriptionEvent).to.have.property('userId', user._id);
+          expect(subscriptionEvent).to.have.property('paymentMethod', 'Payment Method');
+        });
+
         it('from basic_earned to basic_6mo', async () => {
           data.sub.key = 'basic_earned';
           expect(user.purchased.plan.planId).to.not.exist;
@@ -608,6 +599,23 @@ describe('payments/index', () => {
       });
 
       context('Downgrades subscription', () => {
+        it('tracks subscription events', async () => {
+          data.sub.key = 'basic_6mo';
+          expect(user.purchased.plan.planId).to.not.exist;
+
+          await api.createSubscription(data);
+
+          data.sub.key = 'basic_earned';
+          data.updatedFrom = { key: 'basic_6mo' };
+          await api.createSubscription(data);
+
+          const subscriptionEvent = await SubscriptionEventModel.findOne({ userId: user._id, planId: 'basic_earned' });
+          expect(subscriptionEvent).to.exist;
+          expect(subscriptionEvent).to.have.property('eventType', 'downgraded');
+          expect(subscriptionEvent).to.have.property('userId', user._id);
+          expect(subscriptionEvent).to.have.property('paymentMethod', 'Payment Method');
+        });
+
         it('from basic_6mo to basic_earned', async () => {
           data.sub.key = 'basic_6mo';
           expect(user.purchased.plan.planId).to.not.exist;
@@ -1136,6 +1144,15 @@ describe('payments/index', () => {
         expect(daysTillTermination).to.be.within(29, 30); // 1 month +/- 1 days
       });
 
+      it('tracks subscription events', async () => {
+        await api.cancelSubscription(data);
+
+        const subscriptionEvent = await SubscriptionEventModel.findOne({ userId: user._id });
+        expect(subscriptionEvent).to.exist;
+        expect(subscriptionEvent).to.have.property('eventType', 'cancelled');
+        expect(subscriptionEvent).to.have.property('userId', user._id);
+      });
+
       it('adds extraMonths to dateTerminated value', async () => {
         user.purchased.plan.extraMonths = 2;
 

test/api/unit/middlewares/analytics.test.js

@@ -1,50 +0,0 @@
-/* eslint-disable global-require */
-import nconf from 'nconf';
-import requireAgain from 'require-again';
-import {
-  generateRes,
-  generateReq,
-  generateNext,
-} from '../../../helpers/api-unit.helper';
-import * as analyticsService from '../../../../website/server/libs/analyticsService';
-
-describe('analytics middleware', () => {
-  let res; let req; let
-    next;
-  const pathToAnalyticsMiddleware = '../../../../website/server/middlewares/analytics';
-
-  beforeEach(() => {
-    res = generateRes();
-    req = generateReq();
-    next = generateNext();
-  });
-
-  it('attaches analytics object to res', () => {
-    const attachAnalytics = requireAgain(pathToAnalyticsMiddleware).default;
-
-    attachAnalytics(req, res, next);
-
-    expect(res.analytics).to.exist;
-  });
-
-  it('attaches stubbed methods for non-prod environments', () => {
-    sandbox.stub(nconf, 'get').withArgs('IS_PROD').returns(false);
-    const attachAnalytics = requireAgain(pathToAnalyticsMiddleware).default;
-
-    attachAnalytics(req, res, next);
-
-    expect(res.analytics.track).to.eql(analyticsService.mockAnalyticsService.track);
-    expect(res.analytics.trackPurchase).to.eql(analyticsService.mockAnalyticsService.trackPurchase);
-  });
-
-  it('attaches real methods for prod environments', () => {
-    sandbox.stub(nconf, 'get').withArgs('IS_PROD').returns(true);
-
-    const attachAnalytics = requireAgain(pathToAnalyticsMiddleware).default;
-
-    attachAnalytics(req, res, next);
-
-    expect(res.analytics.track).to.eql(analyticsService.track);
-    expect(res.analytics.trackPurchase).to.eql(analyticsService.trackPurchase);
-  });
-});

test/api/unit/middlewares/cors.test.js

@@ -23,6 +23,7 @@ describe('cors middleware', () => {
       'Access-Control-Allow-Methods': 'OPTIONS,GET,POST,PUT,HEAD,DELETE',
       'Access-Control-Allow-Headers': 'Authorization,Content-Type,Accept,Content-Encoding,X-Requested-With,x-api-user,x-api-key,x-client',
       'Access-Control-Expose-Headers': 'X-RateLimit-Limit,X-RateLimit-Remaining,X-RateLimit-Reset,Retry-After',
+      'Content-Security-Policy': "default-src 'self' habitica.com *.habitica.com *.amazon.com *.amazonaws.com *.amplitude.com *.loggly.com *.payments-amazon.com *.stripe.com *.stripe.network; base-uri 'self'; font-src 'self' https: data:; form-action 'self'; frame-ancestors 'self'; img-src * data:; object-src 'none'; script-src-attr 'none'; style-src 'self' https: 'unsafe-inline'",
     });
     expect(res.sendStatus).to.not.have.been.called;
     expect(next).to.have.been.calledOnce;
@@ -36,6 +37,7 @@ describe('cors middleware', () => {
       'Access-Control-Allow-Methods': 'OPTIONS,GET,POST,PUT,HEAD,DELETE',
       'Access-Control-Allow-Headers': 'Authorization,Content-Type,Accept,Content-Encoding,X-Requested-With,x-api-user,x-api-key,x-client',
       'Access-Control-Expose-Headers': 'X-RateLimit-Limit,X-RateLimit-Remaining,X-RateLimit-Reset,Retry-After',
+      'Content-Security-Policy': "default-src 'self' habitica.com *.habitica.com *.amazon.com *.amazonaws.com *.amplitude.com *.loggly.com *.payments-amazon.com *.stripe.com *.stripe.network; base-uri 'self'; font-src 'self' https: data:; form-action 'self'; frame-ancestors 'self'; img-src * data:; object-src 'none'; script-src-attr 'none'; style-src 'self' https: 'unsafe-inline'",
     });
     expect(res.sendStatus).to.have.been.calledWith(200);
     expect(next).to.not.have.been.called;

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

@@ -32,7 +32,8 @@ describe('rateLimiter middleware', () => {
 
   it('is disabled when the env var is not defined', () => {
     nconfGetStub.withArgs('RATE_LIMITER_ENABLED').returns(undefined);
-    const attachRateLimiter = requireAgain(pathToRateLimiter).default;
+    const setupRateLimiter = requireAgain(pathToRateLimiter).default;
+    const attachRateLimiter = setupRateLimiter();
     attachRateLimiter(req, res, next);
 
     expect(next).to.have.been.calledOnce;
@@ -43,7 +44,8 @@ describe('rateLimiter middleware', () => {
 
   it('is disabled when the env var is an not "true"', () => {
     nconfGetStub.withArgs('RATE_LIMITER_ENABLED').returns('false');
-    const attachRateLimiter = requireAgain(pathToRateLimiter).default;
+    const setupRateLimiter = requireAgain(pathToRateLimiter).default;
+    const attachRateLimiter = setupRateLimiter();
     attachRateLimiter(req, res, next);
 
     expect(next).to.have.been.calledOnce;
@@ -55,7 +57,8 @@ describe('rateLimiter middleware', () => {
   it('does not throw when there are available points', async () => {
     nconfGetStub.withArgs('RATE_LIMITER_ENABLED').returns('true');
     nconfGetStub.withArgs('RATE_LIMITER_IP_COST').returns(1);
-    const attachRateLimiter = requireAgain(pathToRateLimiter).default;
+    const setupRateLimiter = requireAgain(pathToRateLimiter).default;
+    const attachRateLimiter = setupRateLimiter();
     await attachRateLimiter(req, res, next);
 
     expect(next).to.have.been.calledOnce;
@@ -77,7 +80,8 @@ describe('rateLimiter middleware', () => {
     sandbox.stub(RateLimiterMemory.prototype, 'consume')
       .returns(Promise.reject(new Error('Unknown error.')));
 
-    const attachRateLimiter = requireAgain(pathToRateLimiter).default;
+    const setupRateLimiter = requireAgain(pathToRateLimiter).default;
+    const attachRateLimiter = setupRateLimiter();
     await attachRateLimiter(req, res, next);
 
     expect(next).to.have.been.calledOnce;
@@ -92,7 +96,8 @@ describe('rateLimiter middleware', () => {
   it('does not throw when LIVELINESS_PROBE_KEY is correct', async () => {
     nconfGetStub.withArgs('RATE_LIMITER_ENABLED').returns('true');
     nconfGetStub.withArgs('LIVELINESS_PROBE_KEY').returns('abc');
-    const attachRateLimiter = requireAgain(pathToRateLimiter).default;
+    const setupRateLimiter = requireAgain(pathToRateLimiter).default;
+    const attachRateLimiter = setupRateLimiter();
 
     req.query.liveliness = 'abc';
     await attachRateLimiter(req, res, next);
@@ -107,7 +112,8 @@ describe('rateLimiter middleware', () => {
     nconfGetStub.withArgs('RATE_LIMITER_ENABLED').returns('true');
     nconfGetStub.withArgs('LIVELINESS_PROBE_KEY').returns('abc');
     nconfGetStub.withArgs('RATE_LIMITER_IP_COST').returns(1);
-    const attachRateLimiter = requireAgain(pathToRateLimiter).default;
+    const setupRateLimiter = requireAgain(pathToRateLimiter).default;
+    const attachRateLimiter = setupRateLimiter();
 
     req.query.liveliness = 'das';
     await attachRateLimiter(req, res, next);
@@ -124,7 +130,8 @@ describe('rateLimiter middleware', () => {
     nconfGetStub.withArgs('RATE_LIMITER_ENABLED').returns('true');
     nconfGetStub.withArgs('LIVELINESS_PROBE_KEY').returns(undefined);
     nconfGetStub.withArgs('RATE_LIMITER_IP_COST').returns(1);
-    const attachRateLimiter = requireAgain(pathToRateLimiter).default;
+    const setupRateLimiter = requireAgain(pathToRateLimiter).default;
+    const attachRateLimiter = setupRateLimiter();
 
     await attachRateLimiter(req, res, next);
 
@@ -140,7 +147,8 @@ describe('rateLimiter middleware', () => {
     nconfGetStub.withArgs('RATE_LIMITER_ENABLED').returns('true');
     nconfGetStub.withArgs('LIVELINESS_PROBE_KEY').returns('');
     nconfGetStub.withArgs('RATE_LIMITER_IP_COST').returns(1);
-    const attachRateLimiter = requireAgain(pathToRateLimiter).default;
+    const setupRateLimiter = requireAgain(pathToRateLimiter).default;
+    const attachRateLimiter = setupRateLimiter();
 
     req.query.liveliness = '';
     await attachRateLimiter(req, res, next);
@@ -156,7 +164,8 @@ describe('rateLimiter middleware', () => {
   it('throws when there are no available points remaining', async () => {
     nconfGetStub.withArgs('RATE_LIMITER_ENABLED').returns('true');
     nconfGetStub.withArgs('RATE_LIMITER_IP_COST').returns(1);
-    const attachRateLimiter = requireAgain(pathToRateLimiter).default;
+    const setupRateLimiter = requireAgain(pathToRateLimiter).default;
+    const attachRateLimiter = setupRateLimiter();
 
     // call for 31 times
     for (let i = 0; i < 31; i += 1) {
@@ -180,7 +189,8 @@ describe('rateLimiter middleware', () => {
   it('uses the user id if supplied or the ip address', async () => {
     nconfGetStub.withArgs('RATE_LIMITER_ENABLED').returns('true');
     nconfGetStub.withArgs('RATE_LIMITER_IP_COST').returns(1);
-    const attachRateLimiter = requireAgain(pathToRateLimiter).default;
+    const setupRateLimiter = requireAgain(pathToRateLimiter).default;
+    const attachRateLimiter = setupRateLimiter();
 
     req.ip = 1;
     await attachRateLimiter(req, res, next);
@@ -210,7 +220,8 @@ describe('rateLimiter middleware', () => {
   it('applies increased cost for registration calls with and without user id', async () => {
     nconfGetStub.withArgs('RATE_LIMITER_ENABLED').returns('true');
     nconfGetStub.withArgs('RATE_LIMITER_REGISTRATION_COST').returns(3);
-    const attachRateLimiter = requireAgain(pathToRateLimiter).default;
+    const setupRateLimiter = requireAgain(pathToRateLimiter).default;
+    const attachRateLimiter = setupRateLimiter();
     req.path = '/api/v4/user/auth/local/register';
 
     req.ip = 1;
@@ -241,7 +252,8 @@ describe('rateLimiter middleware', () => {
   it('applies increased cost for unauthenticated API calls', async () => {
     nconfGetStub.withArgs('RATE_LIMITER_ENABLED').returns('true');
     nconfGetStub.withArgs('RATE_LIMITER_IP_COST').returns(10);
-    const attachRateLimiter = requireAgain(pathToRateLimiter).default;
+    const setupRateLimiter = requireAgain(pathToRateLimiter).default;
+    const attachRateLimiter = setupRateLimiter();
 
     req.ip = 1;
     await attachRateLimiter(req, res, next);

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

@@ -6,6 +6,8 @@ import {
   SPAM_MESSAGE_LIMIT,
   SPAM_MIN_EXEMPT_CONTRIB_LEVEL,
   SPAM_WINDOW_LENGTH,
+  MAX_CHAT_COUNT,
+  MAX_SUBBED_GROUP_CHAT_COUNT,
   INVITES_LIMIT,
   model as Group,
 } from '../../../../website/server/models/group';
@@ -18,6 +20,7 @@ import {
 import * as email from '../../../../website/server/libs/email';
 import { TAVERN_ID } from '../../../../website/common/script/constants';
 import shared from '../../../../website/common';
+import { chatModel as Chat } from '../../../../website/server/models/message';
 
 describe('Group Model', () => {
   let party; let questLeader; let participatingMember;
@@ -1356,6 +1359,29 @@ describe('Group Model', () => {
       });
     });
 
+    describe('#getEffectiveChatLimit', () => {
+      it('returns the correct chat limit', () => {
+        const group = new Group();
+        expect(group.getEffectiveChatLimit()).to.eql(MAX_CHAT_COUNT);
+      });
+
+      it('returns the passed limit if it is lower than the max', () => {
+        const group = new Group();
+        expect(group.getEffectiveChatLimit(10)).to.eql(10);
+      });
+
+      it('returns the max if the passed limit is higher', () => {
+        const group = new Group();
+        expect(group.getEffectiveChatLimit(MAX_CHAT_COUNT + 10)).to.eql(MAX_CHAT_COUNT);
+      });
+
+      it('returns the max for group plans', () => {
+        const group = new Group();
+        group.purchased.plan.customerId = '110002222333';
+        expect(group.getEffectiveChatLimit()).to.eql(MAX_SUBBED_GROUP_CHAT_COUNT);
+      });
+    });
+
     describe('#sendChat', () => {
       beforeEach(() => {
         sandbox.spy(User, 'updateOne');
@@ -1462,6 +1488,34 @@ describe('Group Model', () => {
       });
     });
 
+    describe('#trimChat', () => {
+      it('Only checks last message when not enough messages to trim', async () => {
+        sandbox.spy(Chat, 'find');
+        sandbox.spy(Chat, 'deleteMany');
+        await Chat.insertOne({ groupId: party._id, timestamp: new Date() });
+        await Chat.insertOne({ groupId: party._id, timestamp: new Date() });
+        await Chat.insertOne({ groupId: party._id, timestamp: new Date() });
+        await party.trimChat();
+
+        expect(Chat.find).to.be.calledOnce;
+        expect(Chat.deleteMany).to.not.be.called;
+        expect(await Chat.countDocuments({ groupId: party._id })).to.eql(3);
+      });
+      it('Deletes messages over the limit', async () => {
+        sandbox.spy(Chat, 'find');
+        sandbox.spy(Chat, 'deleteMany');
+        await Chat.insertOne({ groupId: party._id, timestamp: new Date() });
+        await Chat.insertOne({ groupId: party._id, timestamp: new Date() });
+        await Chat.insertOne({ groupId: party._id, timestamp: new Date() });
+
+        await party.trimChat(1);
+
+        expect(Chat.find).to.be.calledOnce;
+        expect(Chat.deleteMany).to.be.calledOnce;
+        expect(await Chat.countDocuments({ groupId: party._id })).to.eql(1);
+      });
+    });
+
     describe('#startQuest', () => {
       context('Failure Conditions', () => {
         it('throws an error if group is not a party', async () => {

test/api/v3/integration/analytics/POST-analytics_track_eventName.test.js

@@ -1,19 +0,0 @@
-import {
-  generateUser,
-  requester,
-} from '../../../../helpers/api-integration/v3';
-import { mockAnalyticsService as analytics } from '../../../../../website/server/libs/analyticsService';
-
-describe('POST /analytics/track/:eventName', () => {
-  it('calls res.analytics', async () => {
-    const user = await generateUser();
-    sandbox.spy(analytics, 'track');
-
-    const requestWithHeaders = requester(user, { 'x-client': 'habitica-web' });
-    await requestWithHeaders.post('/analytics/track/eventName', { data: 'example' }, { 'x-client': 'habitica-web' });
-    expect(analytics.track).to.be.calledOnce;
-    expect(analytics.track).to.be.calledWith('eventName', sandbox.match({ data: 'example' }));
-
-    sandbox.restore();
-  });
-});

test/api/v3/integration/quests/POST-groups_groupId_quests_accept.test.js

@@ -91,6 +91,23 @@ describe('POST /groups/:groupId/quests/accept', () => {
       expect(partyMembers[0].party.quest.RSVPNeeded).to.be.false;
     });
 
+    it('heals stuck RSVPNeeded when group already has the user accepted', async () => {
+      await leader.post(`/groups/${questingGroup._id}/quests/invite/${PET_QUEST}`);
+      await partyMembers[0].post(`/groups/${questingGroup._id}/quests/accept`);
+
+      await partyMembers[0].updateOne({ 'party.quest.RSVPNeeded': true });
+      await partyMembers[0].sync();
+      expect(partyMembers[0].party.quest.RSVPNeeded).to.be.true;
+
+      const res = await partyMembers[0].post(`/groups/${questingGroup._id}/quests/accept`);
+      expect(res).to.exist;
+
+      await partyMembers[0].sync();
+      await questingGroup.sync();
+      expect(partyMembers[0].party.quest.RSVPNeeded).to.equal(false);
+      expect(questingGroup.quest.members[partyMembers[0]._id]).to.equal(true);
+    });
+
     it('does not accept invite for a quest already underway', async () => {
       await leader.post(`/groups/${questingGroup._id}/quests/invite/${PET_QUEST}`);
       await partyMembers[0].post(`/groups/${questingGroup._id}/quests/accept`);

test/api/v3/integration/quests/POST-groups_groupId_quests_force-start.test.js

@@ -193,23 +193,6 @@ describe('POST /groups/:groupId/quests/force-start', () => {
       expect(questingGroup.quest.members[notInPartyUser._id]).to.not.exist;
     });
 
-    it('removes users who have been deleted from quest.members', async () => {
-      await leader.post(`/groups/${questingGroup._id}/quests/invite/${PET_QUEST}`);
-      await partyMembers[0].post(`/groups/${questingGroup._id}/quests/accept`);
-
-      await partyMembers[0].del('/user', {
-        password: 'password',
-      });
-
-      await leader.post(`/groups/${questingGroup._id}/quests/force-start`);
-
-      await sleep(0.5);
-
-      await questingGroup.sync();
-
-      expect(questingGroup.quest.members[partyMembers[0]._id]).to.not.exist;
-    });
-
     it('removes users who don\'t have true value in quest.members from quest.members', async () => {
       const partyMemberThatRejects = partyMembers[1];
       const partyMemberThatIgnores = partyMembers[2];

test/api/v3/integration/quests/POST-groups_groupid_quests_reject.test.js

@@ -100,6 +100,23 @@ describe('POST /groups/:groupId/quests/reject', () => {
       expect(partyMembers[0].party.quest.RSVPNeeded).to.be.false;
     });
 
+    it('heals stuck RSVPNeeded when group already has the user rejected', async () => {
+      await leader.post(`/groups/${questingGroup._id}/quests/invite/${PET_QUEST}`);
+      await partyMembers[0].post(`/groups/${questingGroup._id}/quests/reject`);
+
+      await partyMembers[0].updateOne({ 'party.quest.RSVPNeeded': true });
+      await partyMembers[0].sync();
+      expect(partyMembers[0].party.quest.RSVPNeeded).to.be.true;
+
+      const res = await partyMembers[0].post(`/groups/${questingGroup._id}/quests/reject`);
+      expect(res).to.exist;
+
+      await partyMembers[0].sync();
+      await questingGroup.sync();
+      expect(partyMembers[0].party.quest.RSVPNeeded).to.equal(false);
+      expect(questingGroup.quest.members[partyMembers[0]._id]).to.equal(false);
+    });
+
     it('return an error when a user rejects an invite already accepted', async () => {
       await leader.post(`/groups/${questingGroup._id}/quests/invite/${PET_QUEST}`);
       await partyMembers[0].post(`/groups/${questingGroup._id}/quests/accept`);

test/api/v3/integration/user/DELETE-user.test.js

@@ -1,13 +1,7 @@
-import {
-  each,
-  map,
-} from 'lodash';
 import {
   checkExistence,
-  createAndPopulateGroup,
   generateGroup,
   generateUser,
-  generateChallenge,
   translate as t,
 } from '../../../../helpers/api-integration/v3';
 import {
@@ -15,6 +9,7 @@ import {
   sha1Encrypt as sha1EncryptPassword,
 } from '../../../../../website/server/libs/password';
 import * as email from '../../../../../website/server/libs/email';
+import sendJob from '../../../../../website/server/libs/worker';
 
 const DELETE_CONFIRMATION = 'DELETE';
 
@@ -47,12 +42,13 @@ describe('DELETE /user', () => {
       });
     });
 
-    it('deletes the user', async () => {
-      await expect(checkExistence('users', user._id)).to.eventually.eql(true);
+    it('sends deletion job to worker', async () => {
+      const workerStub = sandbox.stub(sendJob, 'sendJob');
       await user.del('/user', {
         password,
       });
-      await expect(checkExistence('users', user._id)).to.eventually.eql(false);
+      expect(workerStub).to.be.calledOnce;
+      workerStub.restore();
     });
 
     it('returns an error if excessive feedback is supplied', async () => {
@@ -84,53 +80,6 @@ describe('DELETE /user', () => {
       });
     });
 
-    it('deletes the user\'s tasks', async () => {
-      await user.post('/tasks/user', {
-        text: 'test habit',
-        type: 'habit',
-      });
-      await user.sync();
-
-      // gets the user's tasks ids
-      const ids = [];
-      each(user.tasksOrder, idsForOrder => {
-        ids.push(...idsForOrder);
-      });
-
-      expect(ids.length).to.be.above(0); // make sure the user has some task to delete
-
-      await user.del('/user', {
-        password,
-      });
-
-      await Promise.all(map(ids, id => expect(checkExistence('tasks', id)).to.eventually.eql(false)));
-    });
-
-    it('reduces memberCount in challenges user is linked to', async () => {
-      const populatedGroup = await createAndPopulateGroup({
-        members: 2,
-      });
-
-      const { group } = populatedGroup;
-      const authorizedUser = populatedGroup.members[1];
-
-      const challenge = await generateChallenge(populatedGroup.groupLeader, group);
-      await populatedGroup.groupLeader.post(`/challenges/${challenge._id}/join`);
-      await authorizedUser.post(`/challenges/${challenge._id}/join`);
-
-      await challenge.sync();
-
-      expect(challenge.memberCount).to.eql(2);
-
-      await authorizedUser.del('/user', {
-        password,
-      });
-
-      await challenge.sync();
-
-      expect(challenge.memberCount).to.eql(1);
-    });
-
     it('sends feedback to the admin email', async () => {
       sandbox.spy(email, 'sendTxn');
 
@@ -158,10 +107,10 @@ describe('DELETE /user', () => {
     });
 
     it('deletes the user with a legacy sha1 password', async () => {
-      await expect(checkExistence('users', user._id)).to.eventually.eql(true);
       const textPassword = 'mySecretPassword';
       const salt = sha1MakeSalt();
       const sha1HashedPassword = sha1EncryptPassword(textPassword, salt);
+      const workerStub = sandbox.stub(sendJob, 'sendJob');
 
       await user.updateOne({
         'auth.local.hashed_password': sha1HashedPassword,
@@ -179,7 +128,8 @@ describe('DELETE /user', () => {
       await user.del('/user', {
         password: textPassword,
       });
-      await expect(checkExistence('users', user._id)).to.eventually.eql(false);
+      expect(workerStub).to.be.calledOnce;
+      workerStub.restore();
     });
 
     context('last member of a party', () => {
@@ -213,11 +163,12 @@ describe('DELETE /user', () => {
     });
 
     it('deletes a Google user', async () => {
-      await expect(checkExistence('users', user._id)).to.eventually.eql(true);
+      const workerStub = sandbox.stub(sendJob, 'sendJob');
       await user.del('/user', {
         password: DELETE_CONFIRMATION,
       });
-      await expect(checkExistence('users', user._id)).to.eventually.eql(false);
+      expect(workerStub).to.be.calledOnce;
+      workerStub.restore();
     });
   });
 
@@ -232,12 +183,13 @@ describe('DELETE /user', () => {
       });
     });
 
-    it('deletes a Apple user', async () => {
-      await expect(checkExistence('users', user._id)).to.eventually.eql(true);
+    it('deletes an Apple user', async () => {
+      const workerStub = sandbox.stub(sendJob, 'sendJob');
       await user.del('/user', {
         password: DELETE_CONFIRMATION,
       });
-      await expect(checkExistence('users', user._id)).to.eventually.eql(false);
+      expect(workerStub).to.be.calledOnce;
+      workerStub.restore();
     });
   });
 });

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

@@ -1,7 +1,6 @@
 import {
   generateUser,
 } from '../../../../helpers/api-integration/v3';
-import { mockAnalyticsService as analytics } from '../../../../../website/server/libs/analyticsService';
 
 describe('POST /user/sleep', () => {
   let user;
@@ -23,15 +22,4 @@ describe('POST /user/sleep', () => {
     await user.sync();
     expect(user.preferences.sleep).to.be.false;
   });
-
-  it('sends sleep status to analytics service', async () => {
-    sandbox.spy(analytics, 'track');
-
-    await user.post('/user/sleep');
-    await user.sync();
-    expect(analytics.track).to.be.calledOnce;
-    expect(analytics.track).to.be.calledWith('sleep', sandbox.match.has('status', user.preferences.sleep));
-
-    sandbox.restore();
-  });
 });

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

@@ -9,6 +9,7 @@ import {
 } from '../../../../../helpers/api-integration/v3';
 import { ApiUser } from '../../../../../helpers/api-integration/api-classes';
 import { encrypt } from '../../../../../../website/server/libs/encryption';
+import { RegistrationEventModel } from '../../../../../../website/server/models/analytics/registrationEvent';
 
 function generateRandomUserName () {
   return (Date.now() + uuid()).substring(0, 20);
@@ -41,6 +42,25 @@ describe('POST /user/auth/local/register', () => {
       expect(user.newUser).to.eql(true);
     });
 
+    it('tracks a registration event', async () => {
+      const username = generateRandomUserName();
+      const email = `${username}@example.com`;
+      const password = 'password';
+
+      const user = await api.post('/user/auth/local/register', {
+        username,
+        email,
+        password,
+        confirmPassword: password,
+      });
+
+      const registrationEvent = await RegistrationEventModel.findOne({ userId: user._id });
+      expect(registrationEvent).to.exist;
+      expect(registrationEvent).to.have.property('userId', user._id);
+      expect(registrationEvent).to.have.property('ipAddress');
+      expect(registrationEvent).to.have.property('authenticationMethod', 'local');
+    });
+
     it('registers a new user and sets verifiedUsername to true', async () => {
       const username = generateRandomUserName();
       const email = `${username}@example.com`;

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

@@ -7,6 +7,7 @@ import {
   getProperty,
 } from '../../../../../helpers/api-integration/v3';
 import apiErrorMessages from '../../../../../../website/common/script/errors/apiErrorMessages';
+import { RegistrationEventModel } from '../../../../../../website/server/models/analytics/registrationEvent';
 
 describe('POST /user/auth/social', () => {
   let api;
@@ -65,6 +66,19 @@ describe('POST /user/auth/social', () => {
       await expect(getProperty('users', response.id, 'profile.name')).to.eventually.equal('a google user');
     });
 
+    it('tracks a registration event', async () => {
+      const socialUser = await api.post(endpoint, {
+        authResponse: { access_token: randomAccessToken }, // eslint-disable-line camelcase
+        network,
+      });
+
+      const registrationEvent = await RegistrationEventModel.findOne({ userId: socialUser.id });
+      expect(registrationEvent).to.exist;
+      expect(registrationEvent).to.have.property('userId', socialUser.id);
+      expect(registrationEvent).to.have.property('ipAddress');
+      expect(registrationEvent).to.have.property('authenticationMethod', 'google');
+    });
+
     it('includes sanitized version of provided username', async () => {
       const response = await api.post(endpoint, {
         authResponse: { access_token: randomAccessToken }, // eslint-disable-line camelcase
@@ -231,6 +245,17 @@ describe('POST /user/auth/social', () => {
       expect(response.newUser).to.be.false;
     });
 
+    it('does not track a registration event for existing users', async () => {
+      const beforeEvents = await RegistrationEventModel.find({ userId: user._id });
+      await user.post(endpoint, {
+        authResponse: { access_token: randomAccessToken }, // eslint-disable-line camelcase
+        network,
+      });
+
+      const registrationEvents = await RegistrationEventModel.find({ userId: user._id });
+      expect(registrationEvents).to.have.lengthOf(beforeEvents.length);
+    });
+
     it('does not log into other account if social auth already exists', async () => {
       const registerResponse = await api.post(endpoint, {
         authResponse: { access_token: randomAccessToken }, // eslint-disable-line camelcase

test/common/ops/buy/buy.test.js

@@ -13,7 +13,6 @@ import { errorMessage } from '../../../../website/common/script/libs/errorMessag
 
 describe('shared.ops.buy', () => {
   let user;
-  const analytics = { track () {} };
 
   beforeEach(() => {
     user = generateUser({
@@ -32,12 +31,6 @@ describe('shared.ops.buy', () => {
         },
       },
     });
-
-    sinon.stub(analytics, 'track');
-  });
-
-  afterEach(() => {
-    analytics.track.restore();
   });
 
   it('returns error when key is not provided', async () => {
@@ -51,10 +44,8 @@ describe('shared.ops.buy', () => {
 
   it('buys health potion', async () => {
     user.stats.hp = 30;
-    await buy(user, { params: { key: 'potion' } }, analytics);
+    await buy(user, { params: { key: 'potion' } });
     expect(user.stats.hp).to.eql(45);
-
-    expect(analytics.track).to.be.calledOnce;
   });
 
   it('adds equipment to inventory', async () => {

test/common/ops/buy/buyArmoire.test.js

@@ -29,10 +29,9 @@ describe('shared.ops.buyArmoire', () => {
   const YIELD_EQUIPMENT = 0.5;
   const YIELD_FOOD = 0.7;
   const YIELD_EXP = 0.9;
-  const analytics = { track () {} };
 
-  async function buyArmoire (_user, _req, _analytics) {
-    const buyOp = new BuyArmoireOperation(_user, _req, _analytics);
+  async function buyArmoire (_user, _req) {
+    const buyOp = new BuyArmoireOperation(_user, _req);
 
     return buyOp.purchase();
   }
@@ -50,12 +49,10 @@ describe('shared.ops.buyArmoire', () => {
     user.items.food = {};
 
     sandbox.stub(randomValFns, 'trueRandom');
-    sinon.stub(analytics, 'track');
   });
 
   afterEach(() => {
     randomValFns.trueRandom.restore();
-    analytics.track.restore();
   });
 
   context('failure conditions', () => {
@@ -147,7 +144,7 @@ describe('shared.ops.buyArmoire', () => {
 
       expect(_.size(user.items.gear.owned)).to.equal(2);
 
-      await buyArmoire(user, {}, analytics);
+      await buyArmoire(user, {});
 
       expect(_.size(user.items.gear.owned)).to.equal(3);
 
@@ -155,7 +152,6 @@ describe('shared.ops.buyArmoire', () => {
 
       expect(armoireCount).to.eql(_.size(getFullArmoire()) - 2);
       expect(user.stats.gp).to.eql(100);
-      expect(analytics.track).to.be.calledTwice;
     });
   });
 });

test/common/ops/buy/buyGem.test.js

@@ -1,6 +1,5 @@
 /* eslint-disable camelcase */
 
-import sinon from 'sinon'; // eslint-disable-line no-shadow
 import {
   generateUser,
 } from '../../../helpers/common.helper';
@@ -11,15 +10,14 @@ import i18n from '../../../../website/common/script/i18n';
 import { BuyGemOperation } from '../../../../website/common/script/ops/buy/buyGem';
 import planGemLimits from '../../../../website/common/script/libs/planGemLimits';
 
-async function buyGem (user, req, analytics) {
-  const buyOp = new BuyGemOperation(user, req, analytics);
+async function buyGem (user, req) {
+  const buyOp = new BuyGemOperation(user, req);
 
   return buyOp.purchase();
 }
 
 describe('shared.ops.buyGem', () => {
   let user;
-  const analytics = { track () {} };
   const goldPoints = 40;
   const gemsBought = 40;
   const userGemAmount = 10;
@@ -35,23 +33,16 @@ describe('shared.ops.buyGem', () => {
         },
       },
     });
-
-    sinon.stub(analytics, 'track');
-  });
-
-  afterEach(() => {
-    analytics.track.restore();
   });
 
   context('Gems', () => {
     it('purchases gems', async () => {
-      const [, message] = await buyGem(user, { params: { type: 'gems', key: 'gem' } }, analytics);
+      const [, message] = await buyGem(user, { params: { type: 'gems', key: 'gem' } });
 
       expect(message).to.equal(i18n.t('plusGem', { count: 1 }));
       expect(user.balance).to.equal(userGemAmount + 0.25);
       expect(user.purchased.plan.gemsBought).to.equal(1);
       expect(user.stats.gp).to.equal(goldPoints - planGemLimits.convRate);
-      expect(analytics.track).to.be.calledOnce;
     });
 
     it('purchases gems with a different language than the default', async () => {

test/common/ops/buy/buyHealthPotion.test.js

@@ -10,10 +10,9 @@ import i18n from '../../../../website/common/script/i18n';
 
 describe('shared.ops.buyHealthPotion', () => {
   let user;
-  const analytics = { track () {} };
 
-  async function buyHealthPotion (_user, _req, _analytics) {
-    const buyOp = new BuyHealthPotionOperation(_user, _req, _analytics);
+  async function buyHealthPotion (_user, _req) {
+    const buyOp = new BuyHealthPotionOperation(_user, _req);
 
     return buyOp.purchase();
   }
@@ -32,19 +31,13 @@ describe('shared.ops.buyHealthPotion', () => {
       },
       stats: { gp: 200 },
     });
-    sinon.stub(analytics, 'track');
-  });
-
-  afterEach(() => {
-    analytics.track.restore();
   });
 
   context('Potion', () => {
     it('recovers 15 hp', async () => {
       user.stats.hp = 30;
-      await buyHealthPotion(user, {}, analytics);
+      await buyHealthPotion(user, {});
       expect(user.stats.hp).to.eql(45);
-      expect(analytics.track).to.be.calledOnce;
     });
 
     it('does not increase hp above 50', async () => {

test/common/ops/buy/buyMarketGear.test.js

@@ -13,15 +13,14 @@ import {
 import i18n from '../../../../website/common/script/i18n';
 import { errorMessage } from '../../../../website/common/script/libs/errorMessage';
 
-async function buyGear (user, req, analytics) {
-  const buyOp = new BuyMarketGearOperation(user, req, analytics);
+async function buyGear (user, req) {
+  const buyOp = new BuyMarketGearOperation(user, req);
 
   return buyOp.purchase();
 }
 
 describe('shared.ops.buyMarketGear', () => {
   let user;
-  const analytics = { track () {} };
   let clock;
 
   beforeEach(() => {
@@ -47,14 +46,12 @@ describe('shared.ops.buyMarketGear', () => {
     sinon.stub(shared, 'randomVal');
     sinon.stub(shared.onboarding, 'checkOnboardingStatus');
     sinon.stub(shared.fns, 'predictableRandom');
-    sinon.stub(analytics, 'track');
   });
 
   afterEach(() => {
     shared.randomVal.restore();
     shared.fns.predictableRandom.restore();
     shared.onboarding.checkOnboardingStatus.restore();
-    analytics.track.restore();
 
     if (clock) {
       clock.restore();
@@ -65,7 +62,7 @@ describe('shared.ops.buyMarketGear', () => {
     it('adds equipment to inventory', async () => {
       user.stats.gp = 31;
 
-      await buyGear(user, { params: { key: 'armor_warrior_1' } }, analytics);
+      await buyGear(user, { params: { key: 'armor_warrior_1' } });
 
       expect(user.items.gear.owned).to.eql({
         weapon_warrior_0: true,
@@ -92,13 +89,12 @@ describe('shared.ops.buyMarketGear', () => {
         eyewear_special_whiteHalfMoon: true,
         eyewear_special_yellowHalfMoon: true,
       });
-      expect(analytics.track).to.be.calledOnce;
     });
 
     it('adds the onboarding achievement to the user and checks the onboarding status', async () => {
       user.stats.gp = 31;
 
-      await buyGear(user, { params: { key: 'armor_warrior_1' } }, analytics);
+      await buyGear(user, { params: { key: 'armor_warrior_1' } });
 
       expect(user.addAchievement).to.be.calledOnce;
       expect(user.addAchievement).to.be.calledWith('purchasedEquipment');
@@ -111,7 +107,7 @@ describe('shared.ops.buyMarketGear', () => {
       user.stats.gp = 31;
       user.achievements.purchasedEquipment = true;
 
-      await buyGear(user, { params: { key: 'armor_warrior_1' } }, analytics);
+      await buyGear(user, { params: { key: 'armor_warrior_1' } });
 
       expect(user.addAchievement).to.not.be.called;
     });

test/common/ops/buy/buyMysterySet.test.js

@@ -14,7 +14,6 @@ import { errorMessage } from '../../../../website/common/script/libs/errorMessag
 
 describe('shared.ops.buyMysterySet', () => {
   let user;
-  const analytics = { track () {} };
   let clock;
 
   beforeEach(() => {
@@ -27,11 +26,9 @@ describe('shared.ops.buyMysterySet', () => {
         },
       },
     });
-    sinon.stub(analytics, 'track');
   });
 
   afterEach(() => {
-    analytics.track.restore();
     if (clock) {
       clock.restore();
     }
@@ -93,7 +90,7 @@ describe('shared.ops.buyMysterySet', () => {
     context('successful purchases', () => {
       it('buys Steampunk Accessories Set', async () => {
         user.purchased.plan.consecutive.trinkets = 1;
-        await buyMysterySet(user, { params: { key: '301404' } }, analytics);
+        await buyMysterySet(user, { params: { key: '301404' } });
 
         expect(user.purchased.plan.consecutive.trinkets).to.eql(0);
         expect(user.items.gear.owned).to.have.property('weapon_warrior_0', true);
@@ -106,7 +103,7 @@ describe('shared.ops.buyMysterySet', () => {
       it('buys mystery set if it is available', async () => {
         clock = sinon.useFakeTimers(new Date('2024-01-16'));
         user.purchased.plan.consecutive.trinkets = 1;
-        await buyMysterySet(user, { params: { key: '201601' } }, analytics);
+        await buyMysterySet(user, { params: { key: '201601' } });
 
         expect(user.purchased.plan.consecutive.trinkets).to.eql(0);
         expect(user.items.gear.owned).to.have.property('shield_mystery_201601', true);

test/common/ops/buy/buyQuestGems.test.js

@@ -12,10 +12,9 @@ describe('shared.ops.buyQuestGems', () => {
   let user;
   let clock;
   const goldPoints = 40;
-  const analytics = { track () {} };
 
-  async function buyQuest (_user, _req, _analytics) {
-    const buyOp = new BuyQuestWithGemOperation(_user, _req, _analytics);
+  async function buyQuest (_user, _req) {
+    const buyOp = new BuyQuestWithGemOperation(_user, _req);
 
     return buyOp.purchase();
   }
@@ -25,13 +24,11 @@ describe('shared.ops.buyQuestGems', () => {
   });
 
   beforeEach(() => {
-    sinon.stub(analytics, 'track');
     sinon.spy(pinnedGearUtils, 'removeItemByPath');
     clock = sinon.useFakeTimers(new Date('2024-01-16'));
   });
 
   afterEach(() => {
-    analytics.track.restore();
     pinnedGearUtils.removeItemByPath.restore();
     clock.restore();
   });

test/common/ops/buy/buyQuestGold.test.js

@@ -12,21 +12,15 @@ import { errorMessage } from '../../../../website/common/script/libs/errorMessag
 
 describe('shared.ops.buyQuest', () => {
   let user;
-  const analytics = { track () {} };
 
-  async function buyQuest (_user, _req, _analytics) {
-    const buyOp = new BuyQuestWithGoldOperation(_user, _req, _analytics);
+  async function buyQuest (_user, _req) {
+    const buyOp = new BuyQuestWithGoldOperation(_user, _req);
 
     return buyOp.purchase();
   }
 
   beforeEach(() => {
     user = generateUser();
-    sinon.stub(analytics, 'track');
-  });
-
-  afterEach(() => {
-    analytics.track.restore();
   });
 
   it('buys a Quest scroll', async () => {
@@ -35,12 +29,11 @@ describe('shared.ops.buyQuest', () => {
       params: {
         key: 'dilatoryDistress1',
       },
-    }, analytics);
+    });
     expect(user.items.quests).to.eql({
       dilatoryDistress1: 1,
     });
     expect(user.stats.gp).to.equal(5);
-    expect(analytics.track).to.be.calledOnce;
   });
 
   it('if a user\'s count of a quest scroll is negative, it will be reset to 0 before incrementing when they buy a new one.', async () => {
@@ -49,10 +42,9 @@ describe('shared.ops.buyQuest', () => {
     user.items.quests[key] = -1;
     await buyQuest(user, {
       params: { key },
-    }, analytics);
+    });
     expect(user.items.quests[key]).to.equal(1);
     expect(user.stats.gp).to.equal(5);
-    expect(analytics.track).to.be.calledOnce;
   });
 
   it('buys a Quest scroll with the right quantity if a string is passed for quantity', async () => {
@@ -61,13 +53,13 @@ describe('shared.ops.buyQuest', () => {
       params: {
         key: 'dilatoryDistress1',
       },
-    }, analytics);
+    });
     await buyQuest(user, {
       params: {
         key: 'dilatoryDistress1',
       },
       quantity: '3',
-    }, analytics);
+    });
 
     expect(user.items.quests).to.eql({
       dilatoryDistress1: 4,
@@ -82,7 +74,7 @@ describe('shared.ops.buyQuest', () => {
           key: 'dilatoryDistress1',
         },
         quantity: 'a',
-      }, analytics);
+      });
     } catch (err) {
       expect(err).to.be.an.instanceof(BadRequest);
       expect(err.message).to.equal(i18n.t('invalidQuantity'));
@@ -187,12 +179,11 @@ describe('shared.ops.buyQuest', () => {
       params: {
         key: 'dilatoryDistress3',
       },
-    }, analytics);
+    });
 
     expect(user.items.quests).to.eql({
       dilatoryDistress3: 1,
     });
     expect(user.stats.gp).to.equal(100);
-    expect(analytics.track).to.be.calledOnce;
   });
 });

test/common/ops/buy/buySpell.test.js

@@ -14,20 +14,17 @@ import { errorMessage } from '../../../../website/common/script/libs/errorMessag
 describe('shared.ops.buySpecialSpell', () => {
   let user;
   let clock;
-  const analytics = { track () {} };
 
-  async function buySpecialSpell (_user, _req, _analytics) {
-    const buyOp = new BuySpellOperation(_user, _req, _analytics);
+  async function buySpecialSpell (_user, _req) {
+    const buyOp = new BuySpellOperation(_user, _req);
 
     return buyOp.purchase();
   }
   beforeEach(() => {
     user = generateUser();
-    sinon.stub(analytics, 'track');
   });
 
   afterEach(() => {
-    analytics.track.restore();
     if (clock) {
       clock.restore();
     }
@@ -78,7 +75,7 @@ describe('shared.ops.buySpecialSpell', () => {
         params: {
           key: 'thankyou',
         },
-      }, analytics);
+      });
 
       expect(user.stats.gp).to.equal(1);
       expect(user.items.special.thankyou).to.equal(1);
@@ -89,7 +86,6 @@ describe('shared.ops.buySpecialSpell', () => {
       expect(message).to.equal(i18n.t('messageBought', {
         itemText: item.text(),
       }));
-      expect(analytics.track).to.be.calledOnce;
     });
 
     it('buys a limited card when it is available', async () => {
@@ -101,7 +97,7 @@ describe('shared.ops.buySpecialSpell', () => {
         params: {
           key: 'nye',
         },
-      }, analytics);
+      });
 
       expect(user.stats.gp).to.equal(1);
       expect(user.items.special.nye).to.equal(1);
@@ -112,7 +108,6 @@ describe('shared.ops.buySpecialSpell', () => {
       expect(message).to.equal(i18n.t('messageBought', {
         itemText: item.text(),
       }));
-      expect(analytics.track).to.be.calledOnce;
     });
 
     it('throws an error if the card is not currently available', async () => {
@@ -140,7 +135,7 @@ describe('shared.ops.buySpecialSpell', () => {
         params: {
           key: 'seafoam',
         },
-      }, analytics);
+      });
 
       expect(user.stats.gp).to.equal(1);
       expect(user.items.special.seafoam).to.equal(1);
@@ -151,7 +146,6 @@ describe('shared.ops.buySpecialSpell', () => {
       expect(message).to.equal(i18n.t('messageBought', {
         itemText: item.text(),
       }));
-      expect(analytics.track).to.be.calledOnce;
     });
 
     it('throws an error if the spell is not currently available', async () => {

test/common/ops/buy/hourglassPurchase.test.js

@@ -13,21 +13,15 @@ import { BuyHourglassMountOperation } from '../../../../website/common/script/op
 
 describe('common.ops.hourglassPurchase', () => {
   let user;
-  const analytics = { track () {} };
 
-  async function buyMount (_user, _req, _analytics) {
-    const buyOp = new BuyHourglassMountOperation(_user, _req, _analytics);
+  async function buyMount (_user, _req) {
+    const buyOp = new BuyHourglassMountOperation(_user, _req);
 
     return buyOp.purchase();
   }
 
   beforeEach(() => {
     user = generateUser();
-    sinon.stub(analytics, 'track');
-  });
-
-  afterEach(() => {
-    analytics.track.restore();
   });
 
   context('failure conditions', () => {
@@ -131,12 +125,11 @@ describe('common.ops.hourglassPurchase', () => {
     it('buys a pet', async () => {
       user.purchased.plan.consecutive.trinkets = 2;
 
-      const [, message] = await hourglassPurchase(user, { params: { type: 'pets', key: 'MantisShrimp-Base' } }, analytics);
+      const [, message] = await hourglassPurchase(user, { params: { type: 'pets', key: 'MantisShrimp-Base' } });
 
       expect(message).to.eql(i18n.t('hourglassPurchase'));
       expect(user.purchased.plan.consecutive.trinkets).to.eql(1);
       expect(user.items.pets).to.eql({ 'MantisShrimp-Base': 5 });
-      expect(analytics.track).to.be.calledOnce;
     });
 
     it('buys a mount', async () => {

test/common/ops/buy/purchase.test.js

@@ -17,20 +17,17 @@ describe('shared.ops.purchase', () => {
   let user;
   let clock;
   const goldPoints = 40;
-  const analytics = { track () {} };
 
   before(() => {
     user = generateUser({ 'stats.class': 'rogue' });
   });
 
   beforeEach(() => {
-    sinon.stub(analytics, 'track');
     sinon.spy(pinnedGearUtils, 'removeItemByPath');
     clock = sandbox.useFakeTimers(new Date('2024-01-10'));
   });
 
   afterEach(() => {
-    analytics.track.restore();
     pinnedGearUtils.removeItemByPath.restore();
     clock.restore();
   });
@@ -187,11 +184,10 @@ describe('shared.ops.purchase', () => {
       const type = 'eggs';
       const key = 'Wolf';
 
-      await purchase(user, { params: { type, key } }, analytics);
+      await purchase(user, { params: { type, key } });
 
       expect(user.items[type][key]).to.equal(1);
       expect(pinnedGearUtils.removeItemByPath.notCalled).to.equal(true);
-      expect(analytics.track).to.be.calledOnce;
     });
 
     it('purchases hatchingPotions', async () => {
@@ -332,7 +328,7 @@ describe('shared.ops.purchase', () => {
       const key = 'Wolf';
 
       try {
-        await purchase(user, { params: { type, key }, quantity: 'jamboree' }, analytics);
+        await purchase(user, { params: { type, key }, quantity: 'jamboree' });
       } catch (err) {
         expect(err).to.be.an.instanceof(BadRequest);
         expect(err.message).to.equal(i18n.t('invalidQuantity'));
@@ -345,7 +341,7 @@ describe('shared.ops.purchase', () => {
       user.balance = 10;
 
       try {
-        await purchase(user, { params: { type, key }, quantity: -2 }, analytics);
+        await purchase(user, { params: { type, key }, quantity: -2 });
       } catch (err) {
         expect(err).to.be.an.instanceof(BadRequest);
         expect(err.message).to.equal(i18n.t('invalidQuantity'));
@@ -358,7 +354,7 @@ describe('shared.ops.purchase', () => {
       user.balance = 10;
 
       try {
-        await purchase(user, { params: { type, key }, quantity: 2.9 }, analytics);
+        await purchase(user, { params: { type, key }, quantity: 2.9 });
       } catch (err) {
         expect(err).to.be.an.instanceof(BadRequest);
         expect(err.message).to.equal(i18n.t('invalidQuantity'));

test/content/armoire.test.js

@@ -54,19 +54,4 @@ describe('armoire', () => {
     const febuaryItems = armoire.all;
     expect(febuaryItems.length).to.equal(384);
   });
-
-  it('sets have at least 2 items', () => {
-    const setMap = {};
-    forEach(armoire.all, item => {
-      // Gotta have one outlier
-      if (!item.set || item.set.startsWith('armoire-')) return;
-      if (setMap[item.set] === undefined) {
-        setMap[item.set] = 0;
-      }
-      setMap[item.set] += 1;
-    });
-    Object.keys(setMap).forEach(set => {
-      expect(setMap[set], set).to.be.at.least(2);
-    });
-  });
 });

test/helpers/api-integration/requester.js

@@ -40,7 +40,6 @@ function _requestMaker (user, method, additionalSets = {}) {
       || route.indexOf('/paypal') === 0
       || route.indexOf('/amazon') === 0
       || route.indexOf('/stripe') === 0
-      || route.indexOf('/analytics') === 0
     ) {
       url += `${route}`;
     } else {

website/client/index.html

@@ -30,7 +30,13 @@
 
     <div id="app"></div>
 
-    <script type="text/javascript" src="//cloudfront.loggly.com/js/loggly.tracker-latest.min.js" async></script>
+    <script
+      type="text/javascript"
+      src="https://cloudfront.loggly.com/js/loggly.tracker-2.2.4.min.js"
+      integrity="sha384-ZvM/0vF3kE06VouL+Bw9hXzsu35aY1S+Ke5QMdziFtODNWO/+/bq9IiWZ+EAvIVn"
+      crossorigin="anonymous"
+      async
+    ></script>
     <!-- Translations -->
     <script type='text/javascript' src='/api/v4/i18n/core' vite-ignore></script>
   </body>

website/client/src/assets/css/sprites/spritesmith-main.css

@@ -695,6 +695,11 @@
   width: 141px;
   height: 147px;
 }
+.background_beach_with_volcano {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/background_beach_with_volcano.png');
+  width: 141px;
+  height: 147px;
+}
 .background_beehive {
   background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/background_beehive.png');
   width: 141px;
@@ -2346,6 +2351,11 @@
   width: 141px;
   height: 147px;
 }
+.background_tropical_coral_garden {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/background_tropical_coral_garden.png');
+  width: 141px;
+  height: 147px;
+}
 .background_tulip_garden {
   background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/background_tulip_garden.png');
   width: 141px;
@@ -2401,6 +2411,11 @@
   width: 141px;
   height: 147px;
 }
+.background_vegetable_garden {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/background_vegetable_garden.png');
+  width: 141px;
+  height: 147px;
+}
 .background_viking_ship {
   background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/background_viking_ship.png');
   width: 141px;
@@ -29880,6 +29895,11 @@
   width: 114px;
   height: 90px;
 }
+.broad_armor_armoire_kendoBogu {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/broad_armor_armoire_kendoBogu.png');
+  width: 114px;
+  height: 90px;
+}
 .broad_armor_armoire_lamplightersGreatcoat {
   background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/broad_armor_armoire_lamplightersGreatcoat.png');
   width: 114px;
@@ -30535,6 +30555,11 @@
   width: 90px;
   height: 90px;
 }
+.head_armoire_kendoMen {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/head_armoire_kendoMen.png');
+  width: 114px;
+  height: 90px;
+}
 .head_armoire_lamplightersTopHat {
   background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/head_armoire_lamplightersTopHat.png');
   width: 114px;
@@ -30920,6 +30945,11 @@
   width: 114px;
   height: 90px;
 }
+.shield_armoire_gardenHose {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shield_armoire_gardenHose.png');
+  width: 114px;
+  height: 90px;
+}
 .shield_armoire_gardenersSpade {
   background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shield_armoire_gardenersSpade.png');
   width: 114px;
@@ -31550,6 +31580,11 @@
   width: 114px;
   height: 90px;
 }
+.slim_armor_armoire_kendoBogu {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/slim_armor_armoire_kendoBogu.png');
+  width: 114px;
+  height: 90px;
+}
 .slim_armor_armoire_lamplightersGreatcoat {
   background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/slim_armor_armoire_lamplightersGreatcoat.png');
   width: 114px;
@@ -31930,6 +31965,11 @@
   width: 114px;
   height: 90px;
 }
+.weapon_armoire_brightRainbowKite {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/weapon_armoire_brightRainbowKite.png');
+  width: 114px;
+  height: 90px;
+}
 .weapon_armoire_buoyantBubbles {
   background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/weapon_armoire_buoyantBubbles.png');
   width: 114px;
@@ -32030,6 +32070,11 @@
   width: 114px;
   height: 90px;
 }
+.weapon_armoire_gardenRake {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/weapon_armoire_gardenRake.png');
+  width: 114px;
+  height: 90px;
+}
 .weapon_armoire_gardenersWateringCan {
   background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/weapon_armoire_gardenersWateringCan.png');
   width: 114px;
@@ -32125,6 +32170,11 @@
   width: 114px;
   height: 90px;
 }
+.weapon_armoire_kendoShinai {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/weapon_armoire_kendoShinai.png');
+  width: 114px;
+  height: 90px;
+}
 .weapon_armoire_lamplighter {
   background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/weapon_armoire_lamplighter.png');
   width: 114px;
@@ -32210,6 +32260,11 @@
   width: 114px;
   height: 90px;
 }
+.weapon_armoire_pastelRainbowKite {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/weapon_armoire_pastelRainbowKite.png');
+  width: 114px;
+  height: 90px;
+}
 .weapon_armoire_pinkKite {
   background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/weapon_armoire_pinkKite.png');
   width: 114px;
@@ -34200,6 +34255,11 @@
   width: 114px;
   height: 90px;
 }
+.eyewear_mystery_202606 {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/eyewear_mystery_202606.png');
+  width: 117px;
+  height: 120px;
+}
 .head_mystery_202512 {
   background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/head_mystery_202512.png');
   width: 114px;
@@ -34220,11 +34280,31 @@
   width: 114px;
   height: 90px;
 }
+.head_mystery_202606 {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/head_mystery_202606.png');
+  width: 117px;
+  height: 120px;
+}
 .shield_mystery_202605 {
   background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shield_mystery_202605.png');
   width: 114px;
   height: 90px;
 }
+.shield_mystery_202606 {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shield_mystery_202606.png');
+  width: 117px;
+  height: 120px;
+}
+.shield_mystery_202607 {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shield_mystery_202607.png');
+  width: 117px;
+  height: 120px;
+}
+.shield_mystery_202608 {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shield_mystery_202608.png');
+  width: 117px;
+  height: 120px;
+}
 .slim_armor_mystery_202512 {
   background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/slim_armor_mystery_202512.png');
   width: 114px;
@@ -34250,6 +34330,16 @@
   width: 114px;
   height: 90px;
 }
+.weapon_mystery_202607 {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/weapon_mystery_202607.png');
+  width: 117px;
+  height: 120px;
+}
+.weapon_mystery_202608 {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/weapon_mystery_202608.png');
+  width: 117px;
+  height: 120px;
+}
 .back_mystery_201402 {
   background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/back_mystery_201402.png');
   width: 90px;
@@ -37715,6 +37805,26 @@
   width: 114px;
   height: 90px;
 }
+.broad_armor_special_summer2026Healer {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/broad_armor_special_summer2026Healer.png');
+  width: 114px;
+  height: 90px;
+}
+.broad_armor_special_summer2026Mage {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/broad_armor_special_summer2026Mage.png');
+  width: 114px;
+  height: 117px;
+}
+.broad_armor_special_summer2026Rogue {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/broad_armor_special_summer2026Rogue.png');
+  width: 114px;
+  height: 117px;
+}
+.broad_armor_special_summer2026Warrior {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/broad_armor_special_summer2026Warrior.png');
+  width: 114px;
+  height: 90px;
+}
 .broad_armor_special_summerHealer {
   background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/broad_armor_special_summerHealer.png');
   width: 90px;
@@ -37965,6 +38075,26 @@
   width: 114px;
   height: 90px;
 }
+.head_special_summer2026Healer {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/head_special_summer2026Healer.png');
+  width: 114px;
+  height: 90px;
+}
+.head_special_summer2026Mage {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/head_special_summer2026Mage.png');
+  width: 114px;
+  height: 117px;
+}
+.head_special_summer2026Rogue {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/head_special_summer2026Rogue.png');
+  width: 114px;
+  height: 117px;
+}
+.head_special_summer2026Warrior {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/head_special_summer2026Warrior.png');
+  width: 114px;
+  height: 90px;
+}
 .head_special_summerHealer {
   background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/head_special_summerHealer.png');
   width: 90px;
@@ -38155,6 +38285,21 @@
   width: 114px;
   height: 90px;
 }
+.shield_special_summer2026Healer {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shield_special_summer2026Healer.png');
+  width: 114px;
+  height: 90px;
+}
+.shield_special_summer2026Rogue {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shield_special_summer2026Rogue.png');
+  width: 114px;
+  height: 117px;
+}
+.shield_special_summer2026Warrior {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shield_special_summer2026Warrior.png');
+  width: 114px;
+  height: 90px;
+}
 .shield_special_summerHealer {
   background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shield_special_summerHealer.png');
   width: 90px;
@@ -38395,6 +38540,26 @@
   width: 114px;
   height: 90px;
 }
+.slim_armor_special_summer2026Healer {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/slim_armor_special_summer2026Healer.png');
+  width: 114px;
+  height: 90px;
+}
+.slim_armor_special_summer2026Mage {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/slim_armor_special_summer2026Mage.png');
+  width: 114px;
+  height: 117px;
+}
+.slim_armor_special_summer2026Rogue {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/slim_armor_special_summer2026Rogue.png');
+  width: 114px;
+  height: 117px;
+}
+.slim_armor_special_summer2026Warrior {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/slim_armor_special_summer2026Warrior.png');
+  width: 114px;
+  height: 90px;
+}
 .slim_armor_special_summerHealer {
   background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/slim_armor_special_summerHealer.png');
   width: 90px;
@@ -38635,6 +38800,26 @@
   width: 114px;
   height: 90px;
 }
+.weapon_special_summer2026Healer {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/weapon_special_summer2026Healer.png');
+  width: 114px;
+  height: 90px;
+}
+.weapon_special_summer2026Mage {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/weapon_special_summer2026Mage.png');
+  width: 114px;
+  height: 117px;
+}
+.weapon_special_summer2026Rogue {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/weapon_special_summer2026Rogue.png');
+  width: 114px;
+  height: 117px;
+}
+.weapon_special_summer2026Warrior {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/weapon_special_summer2026Warrior.png');
+  width: 114px;
+  height: 90px;
+}
 .weapon_special_summerHealer {
   background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/weapon_special_summerHealer.png');
   width: 90px;

website/client/src/assets/scss/faq.scss

@@ -42,6 +42,7 @@ ul {
     font-weight: 400;
     line-height: 1.75;
     color: $purple-200;
+    cursor: pointer;
   }
 
   h4 {

website/client/src/components/appFooter.vue

@@ -141,7 +141,7 @@
           <ul>
             <li>
               <a
-                href="/apidoc"
+                href="https://apidoc.habitica.com"
                 target="_blank"
               >{{ $t('APIv3') }}
               </a>

website/client/src/components/group-plans/taskInformation.vue

@@ -198,7 +198,6 @@ import dailyIcon from '@/assets/svg/daily.svg?raw';
 import todoIcon from '@/assets/svg/todo.svg?raw';
 import rewardIcon from '@/assets/svg/reward.svg?raw';
 
-import * as Analytics from '@/libs/analytics';
 import { mapState } from '@/libs/store';
 
 export default {
@@ -438,14 +437,6 @@ export default {
       return false;
     },
     changeMirrorPreference (newVal) {
-      Analytics.track({
-        eventName: 'mirror tasks',
-        eventAction: 'mirror tasks',
-        eventCategory: 'behavior',
-        hitType: 'event',
-        mirror: newVal,
-        group: this.group._id,
-      }, { trackOnClient: true });
       const groupsToMirror = this.user.preferences.tasks.mirrorGroupTasks || [];
       if (newVal) { // we're turning copy ON for this group
         groupsToMirror.push(this.group._id);

website/client/src/components/groups/createPartyModal.vue

@@ -240,7 +240,6 @@
 
 <script>
 import { mapState } from '@/libs/store';
-import * as Analytics from '@/libs/analytics';
 import notifications from '@/mixins/notifications';
 import closeX from '../ui/closeX';
 
@@ -276,11 +275,6 @@ export default {
       this.$store.state.party.data = party;
       this.user.party._id = party._id;
 
-      Analytics.updateUser({
-        partyID: party._id,
-        partySize: 1,
-      });
-
       this.$root.$emit('bv::hide::modal', 'create-party-modal');
       await this.$router.push('/party');
     },

website/client/src/components/groups/group.vue

@@ -314,7 +314,6 @@ import extend from 'lodash/extend';
 import groupUtilities from '@/mixins/groupsUtilities';
 import styleHelper from '@/mixins/styleHelper';
 import { mapGetters } from '@/libs/store';
-import * as Analytics from '@/libs/analytics';
 import participantListModal from './participantListModal';
 import groupFormModal from './groupFormModal';
 import groupGemsModal from '@/components/groups/groupGemsModal';
@@ -560,7 +559,6 @@ export default {
 
       if (this.isParty) {
         data.type = 'party';
-        Analytics.updateUser({ partySize: null, partyID: null });
         this.$store.state.partyMembers = [];
       }
 

website/client/src/components/groups/questDetailModal.vue

@@ -334,7 +334,6 @@ import orderBy from 'lodash/orderBy';
 import * as quests from '@/../../common/script/content/quests';
 import getItemInfo from '@/../../common/script/libs/getItemInfo';
 import { mapState } from '@/libs/store';
-import * as Analytics from '@/libs/analytics';
 
 import navigationBack from '@/assets/svg/navigation_back.svg?raw';
 import questDialogContent from '../shops/quests/questDialogContent';
@@ -421,11 +420,6 @@ export default {
     async questInit () {
       this.loading = true;
 
-      Analytics.updateUser({
-        partyID: this.group._id,
-        partySize: this.group.memberCount,
-      });
-
       const groupId = this.group._id || this.user.party._id;
 
       const key = this.selectedQuest;

website/client/src/components/header/index.vue

@@ -123,7 +123,6 @@
 
 <script>
 import orderBy from 'lodash/orderBy';
-import * as Analytics from '@/libs/analytics';
 import { mapGetters, mapActions } from '@/libs/store';
 import MemberDetails from '../memberDetails';
 import createPartyModal from '../groups/createPartyModal';
@@ -236,22 +235,8 @@ export default {
     },
     async createOrInviteParty () {
       if (this.user.party._id) {
-        await Analytics.track({
-          eventName: 'Header Party CTA',
-          eventAction: 'Header Party CTA',
-          eventCategory: 'behavior',
-          hitType: 'event',
-          state: 'Find Party Members',
-        });
         this.$router.push('/looking-for-party');
       } else {
-        await Analytics.track({
-          eventName: 'Header Party CTA',
-          eventAction: 'Header Party CTA',
-          eventCategory: 'behavior',
-          hitType: 'event',
-          state: 'Get Started',
-        });
         this.$root.$emit('bv::show::modal', 'create-party-modal');
       }
     },

website/client/src/components/notifications.vue

@@ -114,7 +114,6 @@ import { mapState } from '@/libs/store';
 import notifications from '@/mixins/notifications';
 import guide from '@/mixins/guide';
 import { CONSTANTS, setLocalSetting } from '@/libs/userlocalManager';
-import * as Analytics from '@/libs/analytics';
 
 import yesterdailyModal from './tasks/yesterdailyModal';
 import newStuff from './news/modal';
@@ -648,15 +647,6 @@ export default {
         // Reset daily analytics actions
         setLocalSetting(CONSTANTS.keyConstants.TASKS_SCORED_COUNT, 0);
         setLocalSetting(CONSTANTS.keyConstants.TASKS_CREATED_COUNT, 0);
-      } else {
-        // Note a failed cron event, for our records and investigation
-        Analytics.track({
-          eventName: 'cron failed',
-          eventAction: 'cron failed',
-          eventCategory: 'behavior',
-          hitType: 'event',
-          responseCode: response.status,
-        }, { trackOnClient: true });
       }
 
       // Sync

website/client/src/components/payments/successModal.vue

@@ -433,9 +433,6 @@ import lockableLabel from '@/components/tasks/modal-controls/lockableLabel';
 import notificationsMixin from '@/mixins/notifications';
 import paymentsMixin from '@/mixins/payments';
 
-// analytics
-import * as Analytics from '@/libs/analytics';
-
 export default {
   components: {
     selectTranslatedArray,
@@ -536,16 +533,6 @@ export default {
       this.close();
     },
     submit () {
-      if (this.paymentData.group && !this.paymentData.newGroup) {
-        Analytics.track({
-          hitType: 'event',
-          eventName: 'group plan upgrade',
-          eventAction: 'group plan upgrade',
-          eventCategory: 'behavior',
-          demographics: this.upgradedGroup.demographics,
-          type: this.paymentData.group.type,
-        }, { trackOnClient: true });
-      }
       this.paymentData = {};
       this.$root.$emit('bv::hide::modal', 'payments-success-modal');
     },

website/client/src/components/tasks/column.vue

@@ -83,7 +83,7 @@
         </div>
       </div>
       <draggable
-        v-if="taskList.length > 0"
+        v-if="taskList.length > 0 && !rerendering"
         ref="tasksList"
         class="sortable-tasks"
         :disabled="activeFilter.label === 'scheduled' || !canBeDragged()"
@@ -432,6 +432,7 @@ export default {
 
       selectedItemToBuy: {},
       dragging: false,
+      rerendering: false,
     };
   },
   computed: {
@@ -548,8 +549,8 @@ export default {
       if (this.taskListOverride) originTasks = this.taskListOverride;
 
       // Server
-      const taskIdToReplace = filteredList[data.newIndex];
-      const newIndexOnServer = originTasks.findIndex(taskId => taskId === taskIdToReplace);
+      const taskIdToReplace = filteredList[data.newIndex]._id;
+      const newIndexOnServer = originTasks.findIndex(task => task._id === taskIdToReplace);
 
       let newOrder;
       if (taskToMove.group.id && !this.isUser) {
@@ -568,6 +569,9 @@ export default {
       // Client
       const deleted = originTasks.splice(data.oldIndex, 1);
       originTasks.splice(data.newIndex, 0, deleted[0]);
+      this.rerendering = true;
+      await this.$nextTick();
+      this.rerendering = false;
     },
     async moveTo (task, where) { // where is 'top' or 'bottom'
       const taskIdToMove = task._id;
@@ -578,7 +582,7 @@ export default {
       const newPosition = where === 'top' ? 0 : list.length;
       list.splice(newPosition, 0, moved[0]);
 
-      if (!this.isUser) {
+      if (task.group.id && !this.isUser) {
         await this.$store.dispatch('tasks:moveGroupTask', {
           taskId: taskIdToMove,
           position: newPosition,
@@ -588,7 +592,7 @@ export default {
           taskId: taskIdToMove,
           position: newPosition,
         });
-        this.user.tasksOrder[`${this.type}s`] = newOrder;
+        if (!this.taskListOverride) this.user.tasksOrder[`${this.type}s`] = newOrder;
       }
     },
     async rewardSorted (data) {

website/client/src/components/tasks/task.vue

@@ -13,6 +13,8 @@
       }, `type_${task.type}`
       ]"
       @click="castEnd($event, task)"
+      tabindex="0"
+      @keypress.enter="$emit('editTask', task)"
     >
       <div
         class="d-flex"
@@ -98,9 +100,7 @@
           <div
             class="task-clickable-area pt-1 pl-75 pb-0"
             :class="{ 'cursor-auto': !teamManagerAccess }"
-            tabindex="0"
             @click="edit($event, task)"
-            @keypress.enter="edit($event, task)"
           >
             <div class="d-flex justify-content-between">
               <h3
@@ -432,10 +432,6 @@
     outline: none;
     transition: none;
     border: $purple-400 solid 1px;
-
-    :not(task-best-control-inner-habit) { // round icon
-      border-radius: 4px;
-    }
   }
 
   .control-bottom-box {
@@ -462,16 +458,13 @@
     &:hover:not(.task-not-editable.task-not-scoreable),
     &:focus-within:not(.task-not-editable.task-not-scoreable) {
       box-shadow: 0 1px 8px 0 rgba($black, 0.12), 0 4px 4px 0 rgba($black, 0.16);
-      z-index: 11;
     }
   }
 
   .task:not(.groupTask) {
-    &:hover,
-    &:focus-within {
-      .left-control, .right-control, .task-content {
-        border-color: $purple-400;
-      }
+    &:hover, &:focus {
+      border: none;
+      outline: 1px solid $purple-400;
     }
   }
 
@@ -522,11 +515,6 @@
     &-user {
       padding-right: 0px;
     }
-
-    &:focus {
-      border-radius: 4px;
-      border: $purple-400 solid 1px;
-    }
   }
 
   .task-title + .task-dropdown ::v-deep .dropdown-menu {

website/client/src/components/tasks/taskModal.vue

@@ -55,11 +55,31 @@
         </div>
       </div>
       <div class="form-group">
-        <lockable-label
-          :class-override="cssClass('headings')"
-          :locked="challengeAccessRequired"
-          :text="`${$t('text')}*`"
-        />
+        <div class="d-flex align-items-center">
+          <lockable-label
+            class="mr-auto"
+            :class-override="cssClass('headings')"
+            :locked="challengeAccessRequired"
+            :text="`${$t('text')}*`"
+          />
+          <div
+            id="spi-alert"
+            class="d-flex align-items-center"
+            :class="cssClass('headings')"
+          >
+            <div
+              class="svg svg-icon color icon-16 mr-1"
+              v-html="icons.alert"
+            ></div>
+            <small
+              class="my-1"
+            >
+              <a
+                :class="cssClass('headings')"
+              >{{ $t('avoidSPI') }}</a>
+            </small>
+          </div>
+        </div>
         <input
           ref="inputToFocus"
           v-model="task.text"
@@ -79,10 +99,20 @@
           @keydown.esc="autoCompleteMixinHandleEscape($event)"
         >
       </div>
+      <b-popover
+        :target="'spi-alert'"
+        triggers="hover"
+        placement="bottom"
+        offset="-128"
+      >
+        <div
+          v-html="$t('avoidSPIDetails', spiLinkData)">
+        </div>
+      </b-popover>
       <div
         class="form-group mb-0"
       >
-        <div class="d-flex">
+        <div class="d-flex align-items-center">
           <lockable-label
             class="mr-auto"
             :class-override="cssClass('headings')"
@@ -382,6 +412,25 @@
             </div>
           </div>
         </div>
+        <p
+          v-if="task.type === 'daily' && schedulingSummary"
+          class="scheduling-summary mt-2 mb-0"
+        >
+          {{ schedulingSummary }}
+        </p>
+        <div
+          v-if="task.type === 'daily' && schedulingWarning"
+          class="scheduling-warning mt-2"
+        >
+          <span
+            class="scheduling-warning-icon svg-icon color gray-50"
+            v-html="icons.alert"
+          ></span>
+          <span
+            class="scheduling-warning-text"
+            v-html="schedulingWarning"
+          ></span>
+        </div>
         <div
           v-if="!groupId"
           class="tags-select option mt-3"
@@ -963,6 +1012,20 @@
         box-shadow: 0px 1px 3px 0px rgba(26, 24, 29, 0.12), 0px 1px 2px 0px rgba(26, 24, 29, 0.24);
       }
     }
+
+    .b-popover {
+      margin-top: -5px;
+      max-width: 330px;
+    }
+
+    .popover-body {
+      text-align: left;
+
+      a {
+        color: $gray-500;
+        text-decoration: underline;
+      }
+    }
   }
 
   @media only screen and (max-width: 768px) {
@@ -1065,6 +1128,42 @@
     height: 1rem;
   }
 
+  .scheduling-summary {
+    font-family: 'Roboto', sans-serif;
+    font-weight: 400;
+    font-style: normal;
+    font-size: 12px;
+    line-height: 16px;
+    color: $gray-50;
+    text-align: left;
+  }
+
+  .scheduling-warning {
+    display: flex;
+    align-items: flex-start;
+    font-family: 'Roboto', sans-serif;
+    font-weight: 400;
+    font-style: normal;
+    font-size: 12px;
+    line-height: 16px;
+    color: $gray-50;
+  }
+
+  .scheduling-warning-icon {
+    display: inline-flex;
+    align-items: center;
+    justify-content: center;
+    width: 16px;
+    height: 16px;
+    flex-shrink: 0;
+    margin-right: 6px;
+    margin-top: -1px;
+  }
+
+  .scheduling-warning-text {
+    flex: 1;
+  }
+
   label {
     display: inline-flex;
     align-items: center;
@@ -1196,6 +1295,7 @@ import chevronIcon from '@/assets/svg/chevron.svg?raw';
 import calendarIcon from '@/assets/svg/calendar.svg?raw';
 import gripIcon from '@/assets/svg/grip.svg?raw';
 import InformationIcon from '@/components/ui/informationIcon.vue';
+import alertIcon from '@/assets/svg/for-css/alert-white.svg?raw';
 
 export default {
   components: {
@@ -1231,6 +1331,7 @@ export default {
         streak: streakIcon,
         calendar: calendarIcon,
         grip: gripIcon,
+        alert: alertIcon,
       }),
       members: [],
       membersNameAndId: [],
@@ -1251,6 +1352,11 @@ export default {
         { key: 'per', label: 'perception', description: 'perTaskText' },
       ],
       calendarHighlights: { dates: [new Date()] },
+      spiLinkData: {
+        firstLink: '<a href="/static/privacy#section_1" target="_blank">',
+        secondLink: '<a href="/static/privacy" target="_blank">',
+        linkClose: '</a>',
+      },
     };
   },
   computed: {
@@ -1326,6 +1432,87 @@ export default {
       }
       return null;
     },
+    schedulingSummary () {
+      if (!this.task || this.task.type !== 'daily') return '';
+      const { task } = this;
+      const everyXValue = +task.everyX;
+
+      let interval;
+      if (task.frequency === 'daily') {
+        interval = everyXValue === 1 ? this.$t('everyDay') : this.$t('everyXDays', { count: everyXValue });
+      } else if (task.frequency === 'weekly') {
+        interval = everyXValue === 1 ? this.$t('everyWeek') : this.$t('everyXWeeks', { count: everyXValue });
+      } else if (task.frequency === 'monthly') {
+        interval = everyXValue === 1 ? this.$t('everyMonth') : this.$t('everyXMonths', { count: everyXValue });
+      } else if (task.frequency === 'yearly') {
+        interval = everyXValue === 1 ? this.$t('everyYear') : this.$t('everyXYears', { count: everyXValue });
+      } else {
+        return '';
+      }
+
+      let details = '';
+      if (task.frequency === 'weekly') {
+        const dayNames = {
+          su: 'Sunday',
+          m: 'Monday',
+          t: 'Tuesday',
+          w: 'Wednesday',
+          th: 'Thursday',
+          f: 'Friday',
+          s: 'Saturday',
+        };
+        const activeDays = Object.keys(task.repeat || {}).filter(d => task.repeat[d]);
+        if (activeDays.length > 0) {
+          details = ` on ${activeDays.map(d => dayNames[d]).join(', ')}`;
+        }
+      } else if (task.frequency === 'monthly' && task.startDate) {
+        const dayOfMonth = moment(task.startDate).date();
+        if (task.weeksOfMonth && task.weeksOfMonth.length > 0) {
+          const weekNum = task.weeksOfMonth[0] + 1;
+          const weekStr = String(weekNum);
+          const lastDigit = weekStr.slice(-1);
+          let suffix = 'th';
+          if (lastDigit === '1' && weekStr !== '11') suffix = 'st';
+          if (lastDigit === '2' && weekStr !== '12') suffix = 'nd';
+          if (lastDigit === '3' && weekStr !== '13') suffix = 'rd';
+          const dayName = moment(task.startDate).format('dddd');
+          details = ` on the ${weekNum}${suffix} ${dayName} of the month`;
+        } else if (task.daysOfMonth && task.daysOfMonth.length > 0) {
+          const dom = task.daysOfMonth[0];
+          const domStr = String(dom);
+          const lastDigit = domStr.slice(-1);
+          let suffix = 'th';
+          if (lastDigit === '1' && domStr !== '11') suffix = 'st';
+          if (lastDigit === '2' && domStr !== '12') suffix = 'nd';
+          if (lastDigit === '3' && domStr !== '13') suffix = 'rd';
+          details = ` on the ${dom}${suffix}`;
+        } else {
+          const domStr = String(dayOfMonth);
+          const lastDigit = domStr.slice(-1);
+          let suffix = 'th';
+          if (lastDigit === '1' && domStr !== '11') suffix = 'st';
+          if (lastDigit === '2' && domStr !== '12') suffix = 'nd';
+          if (lastDigit === '3' && domStr !== '13') suffix = 'rd';
+          details = ` on the ${dayOfMonth}${suffix}`;
+        }
+      } else if (task.frequency === 'yearly' && task.startDate) {
+        details = ` on ${moment(task.startDate).format('MMMM Do')}`;
+      }
+
+      return `${this.$t('repeats')} ${interval}${details}`;
+    },
+    schedulingWarning () {
+      if (!this.task || this.task.type !== 'daily') return '';
+      const { task } = this;
+      if (task.frequency === 'monthly'
+        && task.weeksOfMonth && task.weeksOfMonth.length > 0
+        && task.weeksOfMonth[0] === 4
+        && task.startDate) {
+        const dayName = moment(task.startDate).format('dddd');
+        return this.$t('fifthWeekWarning', { day: dayName });
+      }
+      return '';
+    },
     repeatsOn: {
       get () {
         let repeatsOn = 'dayOfMonth';

website/client/src/components/tasks/taskSummary.vue

@@ -222,14 +222,22 @@ export default {
       return usernames;
     },
     summarySentence () {
+      let fifthWeekWarning = '';
+      if (this.task.type === 'daily' && this.task.frequency === 'monthly'
+        && this.task.weeksOfMonth && this.task.weeksOfMonth.length > 0
+        && this.task.weeksOfMonth[0] === 4) {
+        const activeDays = keys(pickBy(this.task.repeat, value => value === true));
+        const dayName = this.expandDayString[activeDays[0]];
+        fifthWeekWarning = ` ${this.$t('fifthWeekWarning', { day: dayName })}`;
+      }
       if (this.task.type === 'daily' && moment().isBefore(this.task.startDate)) {
         return `This is ${this.formattedDifficulty(this.task.priority)} task that will repeat
         ${this.formattedRepeatInterval(this.task.frequency, this.task.everyX)}${this.formattedDays(this.task.frequency, this.task.repeat, this.task.daysOfMonth, this.task.weeksOfMonth, this.task.startDate)}
-        starting on <strong>${moment(this.task.startDate).format('MM/DD/YYYY')}</strong>.`;
+        starting on <strong>${moment(this.task.startDate).format('MM/DD/YYYY')}</strong>.${fifthWeekWarning}`;
       }
       if (this.task.type === 'daily') {
         return `This is ${this.formattedDifficulty(this.task.priority)} task that repeats
-        ${this.formattedRepeatInterval(this.task.frequency, this.task.everyX)}${this.formattedDays(this.task.frequency, this.task.repeat, this.task.daysOfMonth, this.task.weeksOfMonth, this.task.startDate)}.`;
+        ${this.formattedRepeatInterval(this.task.frequency, this.task.everyX)}${this.formattedDays(this.task.frequency, this.task.repeat, this.task.daysOfMonth, this.task.weeksOfMonth, this.task.startDate)}.${fifthWeekWarning}`;
       }
       if (this.task.date) {
         return `This is ${this.formattedDifficulty(this.task.priority)} task that is due <strong>${moment(this.task.date).format('MM/DD/YYYY')}.`;
@@ -287,25 +295,14 @@ export default {
             });
             dayStringArray.push('</strong>');
           } else if (weeksOfMonth.length > 0) {
-            switch (weeksOfMonth[0]) {
-              case 0:
-                dayStringArray.push('first');
-                break;
-              case 1:
-                dayStringArray.push('second');
-                break;
-              case 2:
-                dayStringArray.push('third');
-                break;
-              case 3:
-                dayStringArray.push('fourth');
-                break;
-              case 4:
-                dayStringArray.push('fifth');
-                break;
-              default:
-                break;
-            }
+            const weekNum = weeksOfMonth[0] + 1;
+            const weekNumStr = String(weekNum);
+            const lastDigit = weekNumStr.slice(-1);
+            let ordinalSuffix = 'th';
+            if (lastDigit === '1' && weekNumStr !== '11') ordinalSuffix = 'st';
+            if (lastDigit === '2' && weekNumStr !== '12') ordinalSuffix = 'nd';
+            if (lastDigit === '3' && weekNumStr !== '13') ordinalSuffix = 'rd';
+            dayStringArray.push(`${weekNum}${ordinalSuffix}`);
             activeDays = keys(pickBy(repeat, value => value === true));
             dayStringArray.push(` ${this.expandDayString[activeDays[0]]} of the month</strong>`);
           }
@@ -343,9 +340,8 @@ export default {
           if (numericX === 2) return '<strong>every other week</strong>';
           return `<strong>every ${numericX} weeks</strong>`;
         case 'monthly':
-          if (numericX === 1) return '<strong>every month</strong>';
-          if (numericX === 2) return '<strong>every other month</strong>';
-          return `<strong>every ${numericX} months</strong>`;
+          if (numericX === 1) return `<strong>${this.$t('everyMonth')}</strong>`;
+          return `<strong>${this.$t('everyXMonths', { count: numericX })}</strong>`;
         case 'yearly':
           if (numericX === 1) return '<strong>every year</strong>';
           return `<strong>every ${everyX} years</strong>`;

website/client/src/components/ui/datepicker.vue

@@ -68,8 +68,12 @@ export default {
   },
   methods: {
     upDate (after) {
-      this.value = after;
-      this.$emit('update:date', after);
+      // zero out the time so the server doesn't shift the day across a DST boundary on save
+      const normalized = after
+        ? new Date(after.getFullYear(), after.getMonth(), after.getDate())
+        : null;
+      this.value = normalized;
+      this.$emit('update:date', normalized);
     },
     setToday () {
       this.upDate(moment().toDate());

website/client/src/mixins/payments.js

@@ -6,7 +6,6 @@ import { mapState } from '@/libs/store';
 import encodeParams from '@/libs/encodeParams';
 import notificationsMixin from '@/mixins/notifications';
 import { CONSTANTS, setLocalSetting } from '@/libs/userlocalManager';
-import * as Analytics from '@/libs/analytics';
 
 const { STRIPE_PUB_KEY } = import.meta.env;
 
@@ -207,16 +206,6 @@ export default {
           alert(`Error while redirecting to Stripe: ${checkoutSessionResult.error.message}`);
           throw checkoutSessionResult.error;
         }
-        if (paymentType === 'groupPlan') {
-          Analytics.track({
-            hitType: 'event',
-            eventName: 'group plan create',
-            eventAction: 'group plan create',
-            eventCategory: 'behavior',
-            demographics: appState.newGroup.demographics,
-            type: appState.newGroup.type,
-          }, { trackOnClient: true });
-        }
       } catch (err) {
         console.error('Error while redirecting to Stripe', err); // eslint-disable-line
         alert(`Error while redirecting to Stripe: ${err.message}`);

website/client/src/mixins/scoreTask.js

@@ -3,7 +3,6 @@ import Vue from 'vue';
 import scoreTask from '@/../../common/script/ops/scoreTask';
 import notifications from './notifications';
 import { mapState } from '@/libs/store';
-import * as Analytics from '@/libs/analytics';
 import { CONSTANTS, getLocalSetting, setLocalSetting } from '@/libs/userlocalManager';
 
 export default {
@@ -58,15 +57,6 @@ export default {
 
       const tasksScoredCount = getLocalSetting(CONSTANTS.keyConstants.TASKS_SCORED_COUNT);
       if (!tasksScoredCount || tasksScoredCount < 2) {
-        Analytics.track({
-          eventName: 'task scored',
-          eventAction: 'task scored',
-          eventCategory: 'behavior',
-          hitType: 'event',
-          uuid: user._id,
-          taskType: task.type,
-          direction,
-        }, { trackOnClient: true });
         if (!tasksScoredCount) {
           setLocalSetting(CONSTANTS.keyConstants.TASKS_SCORED_COUNT, 1);
         } else {

website/client/src/pages/settings/settingRows/deleteAccount.vue

@@ -67,7 +67,7 @@
 
         <div
           v-once
-          class="feedback"
+          class="feedback mt-3"
           v-html="$t('feedback')"
         >
         </div>

website/client/src/pages/user-main.vue

@@ -4,6 +4,7 @@
     :class="{
       'casting-spell': castingSpell,
     }"
+    @dragover.prevent
   >
     <!-- <banned-account-modal /> -->
     <amazon-payments-modal v-if="!isStaticPage" />
@@ -130,7 +131,6 @@ import PrivacyBanner from '@/components/header/banners/privacy';
 import AppFooter from '@/components/appFooter';
 import notificationsDisplay from '@/components/notifications';
 import { mapState } from '@/libs/store';
-import * as Analytics from '@/libs/analytics';
 import BuyModal from '@/components/shops/buyModal.vue';
 import SelectMembersModal from '@/components/selectMembersModal.vue';
 import notifications from '@/mixins/notifications';
@@ -276,7 +276,6 @@ export default {
         }
       }
 
-      Analytics.updateUser();
       return this.loadAllTranslations();
     }).then(() => {
       this.$store.state.isUserLoaded = true;

website/client/src/router/index.js

@@ -1,6 +1,5 @@
 import Vue from 'vue';
 import VueRouter from 'vue-router';
-import * as Analytics from '@/libs/analytics';
 import getStore from '@/store';
 import handleRedirect from './handleRedirect';
 
@@ -8,6 +7,7 @@ import { PAGES } from '@/libs/consts';
 import { STATIC_ROUTES } from './static-routes';
 import { USER_ROUTES } from './user-routes';
 import { DEPRECATED_ROUTES } from '@/router/deprecated-routes';
+import { NotFoundPage } from './shared-route-imports';
 
 // NOTE: when adding a page make sure to implement the `common:setTitle` action
 
@@ -260,6 +260,13 @@ const router = new VueRouter({
     // Only used to handle some redirects
     // See router.beforeEach
     { path: '/static/tavern-and-guilds', redirect: '/static/faq/tavern-and-guilds' },
+    {
+      path: '/apidoc',
+      component: NotFoundPage,
+      beforeEnter () {
+        window.location.href = 'https://apidoc.habitica.com';
+      },
+    },
     { path: '/redirect/:redirect', name: 'redirect' },
     { path: '*', redirect: { name: 'notFound' } },
   ],
@@ -318,15 +325,6 @@ router.beforeEach(async (to, from, next) => {
     router.app.$root.$emit('update-party');
   }
 
-  if (to.name === 'lookingForParty') {
-    Analytics.track({
-      hitType: 'event',
-      eventName: 'View Find Members',
-      eventAction: 'View Find Members',
-      eventCategory: 'behavior',
-    }, { trackOnClient: true });
-  }
-
   // Redirect old guild urls
   if (to.hash.indexOf('#/options/groups/guilds/') !== -1) {
     const splits = to.hash.split('/');

website/client/src/store/actions/chat.js

@@ -1,6 +1,5 @@
 import axios from 'axios';
 import Vue from 'vue';
-import * as Analytics from '@/libs/analytics';
 
 export async function getChat (store, payload) {
   const response = await axios.get(`/api/v4/groups/${payload.groupId}/chat?limit=400`);
@@ -17,13 +16,6 @@ export async function postChat (store, payload) {
     url += `?previousMsg=${payload.previousMsg}`;
   }
 
-  if (group.type === 'party') {
-    Analytics.updateUser({
-      partyID: group.id,
-      partySize: group.memberCount,
-    });
-  }
-
   const response = await axios.post(url, {
     message: payload.message,
   });

website/client/src/store/actions/guilds.js

@@ -1,7 +1,6 @@
 import axios from 'axios';
 import omit from 'lodash/omit';
 import findIndex from 'lodash/findIndex';
-import * as Analytics from '@/libs/analytics';
 import { loadAsyncResource } from '@/libs/asyncResource';
 
 export async function getPublicGuilds (store, payload) {
@@ -74,7 +73,6 @@ export async function join (store, payload) {
     if (invitationI !== -1) invitations.parties.splice(invitationI, 1);
 
     user.party._id = groupId;
-    Analytics.updateUser({ partyID: groupId });
     // load the party members so that they get shown in the header
     store.dispatch('party:getMembers');
   }

website/client/src/store/actions/index.js

@@ -18,7 +18,6 @@ import * as shops from './shops';
 import * as snackbars from './snackbars';
 import * as worldState from './worldState';
 import * as news from './news';
-import * as analytics from './analytics';
 import * as faq from './faq';
 import * as blockers from './blockers';
 
@@ -44,7 +43,6 @@ const actions = flattenAndNamespace({
   snackbars,
   worldState,
   news,
-  analytics,
   faq,
   blockers,
 });

website/client/src/store/actions/quests.js

@@ -1,26 +1,6 @@
 import axios from 'axios';
-import * as Analytics from '@/libs/analytics';
-
-// export async function initQuest (store) {
-// }
 
 export async function sendAction (store, payload) { // eslint-disable-line import/prefer-default-export, max-len
-  // @TODO: Maybe move this to server
-  let partyData = {};
-  if (store.state.party && store.state.party.data) {
-    partyData = {
-      partyID: store.state.party.data._id,
-      partySize: store.state.party.data.memberCount,
-    };
-  } else {
-    partyData = {
-      partyID: store.state.user.data.party._id,
-      partySize: store.state.partyMembers.data.length,
-    };
-  }
-
-  Analytics.updateUser(partyData);
-
   const response = await axios.post(`/api/v4/groups/${payload.groupId}/${payload.action}`);
 
   // @TODO: Update user?

website/client/src/store/actions/tasks.js

@@ -3,7 +3,6 @@ import Vue from 'vue';
 import compact from 'lodash/compact';
 import omit from 'lodash/omit';
 import { loadAsyncResource } from '@/libs/asyncResource';
-import * as Analytics from '@/libs/analytics';
 import { CONSTANTS, getLocalSetting, setLocalSetting } from '@/libs/userlocalManager';
 
 export function fetchUserTasks (store, options = {}) {
@@ -112,15 +111,6 @@ export async function create (store, createdTask) {
     }
     const tasksCreatedCount = getLocalSetting(CONSTANTS.keyConstants.TASKS_CREATED_COUNT);
     if (!tasksCreatedCount || tasksCreatedCount < 2) {
-      const uuid = store.state.user.data._id;
-      Analytics.track({
-        eventName: 'task created',
-        eventAction: 'task created',
-        eventCategory: 'behavior',
-        hitType: 'event',
-        uuid,
-        taskType: taskRes.type,
-      }, { trackOnClient: true });
       if (!tasksCreatedCount) {
         setLocalSetting(CONSTANTS.keyConstants.TASKS_CREATED_COUNT, 1);
       } else {
@@ -168,11 +158,15 @@ export async function collapseChecklist (store, task) {
 }
 
 export async function destroy (store, task) {
-  const list = store.state.tasks.data[`${task.type}s`];
-  const taskIndex = list.findIndex(t => t._id === task._id);
+  const type = `${task.type}s`;
+  const listIndex = store.state.tasks.data[type].findIndex(t => t._id === task._id);
+  const orderIndex = store.state.user.data.tasksOrder[type].indexOf(task._id);
 
-  if (taskIndex > -1) {
-    list.splice(taskIndex, 1);
+  if (listIndex > -1) {
+    store.state.tasks.data[type].splice(listIndex, 1);
+  }
+  if (orderIndex > -1) {
+    store.state.user.data.tasksOrder[type].splice(orderIndex, 1);
   }
 
   await axios.delete(`/api/v4/tasks/${task._id}`);

website/client/tests/unit/components/tasks/column.spec.js

@@ -237,5 +237,84 @@ describe('Task Column', () => {
         });
       });
     });
+
+    // each board type should hit the right move route
+    describe('moveTo (task ordering route)', () => {
+      function makeStore (userData = {}, extraGetters = {}) {
+        return new Store({
+          getters: {
+            'tasks:getFilteredTaskList': () => () => [],
+            'tasks:getUnfilteredTaskList': () => () => [],
+            ...extraGetters,
+          },
+          state: {
+            user: {
+              data: {
+                preferences: { tasks: { activeFilter: {} } },
+                tasksOrder: { habits: [] },
+                ...userData,
+              },
+            },
+          },
+        });
+      }
+
+      function stubDispatch (vm) {
+        const calls = [];
+        vm.$store.dispatch = (action, payload) => {
+          calls.push({ action, payload });
+          return Promise.resolve(['b', 'a']);
+        };
+        return calls;
+      }
+
+      test('challenge tasks (no group.id) use tasks:move and keep the user order untouched', async () => {
+        wrapper = makeWrapper({ store: makeStore() });
+        wrapper.setProps({
+          isUser: false,
+          challenge: { _id: 'c1' },
+          taskListOverride: [{ _id: 'a', group: {} }, { _id: 'b', group: {} }],
+        });
+        const calls = stubDispatch(wrapper.vm);
+
+        await wrapper.vm.moveTo({ _id: 'a', group: {} }, 'bottom');
+
+        expect(calls).to.have.lengthOf(1);
+        expect(calls[0].action).to.eq('tasks:move');
+        // an overridden list must never overwrite the user's personal order
+        expect(wrapper.vm.user.tasksOrder.habits.join(',')).to.eq('');
+      });
+
+      test('group-plan tasks (with group.id) use tasks:moveGroupTask', async () => {
+        wrapper = makeWrapper({ store: makeStore() });
+        wrapper.setProps({
+          isUser: false,
+          group: { _id: 'g1' },
+          taskListOverride: [{ _id: 'a', group: { id: 'g1' } }, { _id: 'b', group: { id: 'g1' } }],
+        });
+        const calls = stubDispatch(wrapper.vm);
+
+        await wrapper.vm.moveTo({ _id: 'a', group: { id: 'g1' } }, 'bottom');
+
+        expect(calls).to.have.lengthOf(1);
+        expect(calls[0].action).to.eq('tasks:moveGroupTask');
+      });
+
+      test('user tasks use tasks:move and update the user order', async () => {
+        const store = makeStore(
+          { tasksOrder: { habits: ['a', 'b'] } },
+          { 'tasks:getUnfilteredTaskList': () => () => [{ _id: 'a', group: {} }, { _id: 'b', group: {} }] },
+        );
+        wrapper = makeWrapper({ store });
+        wrapper.setProps({ isUser: true });
+        const calls = stubDispatch(wrapper.vm);
+
+        await wrapper.vm.moveTo({ _id: 'a', group: {} }, 'bottom');
+
+        expect(calls).to.have.lengthOf(1);
+        expect(calls[0].action).to.eq('tasks:move');
+        expect(wrapper.vm.user.tasksOrder.habits.join(',')).to.eq('b,a');
+      });
+    });
   });
 });

website/client/vite.config.mjs

@@ -159,10 +159,6 @@ export default defineConfig({
         target: DEV_BASE_URL,
         changeOrigin: true,
       },
-      '^/analytics': {
-        target: DEV_BASE_URL,
-        changeOrigin: true,
-      },
     }
   }
 })

website/common/locales/bg/backgrounds.json

@@ -213,7 +213,7 @@
     "backgroundStormyRooftopsNotes": "Промъквайте се върху буреносни покриви.",
     "backgroundWindyAutumnText": "Ветровита есен",
     "backgroundWindyAutumnNotes": "Гонете листа през ветровита есен.",
-    "incentiveBackgrounds": "Комплект едноцветни фонове",
+    "incentiveBackgrounds": "Стандартни фонове",
     "backgroundVioletText": "Виолетово",
     "backgroundVioletNotes": "Енергичен виолетов фон.",
     "backgroundBlueText": "Синьо",
@@ -494,7 +494,7 @@
     "backgroundSnowglobeText": "Снежна топка",
     "backgroundDesertWithSnowNotes": "Бъди свидетел на рядката и мълчалива красота на Снежната пустиня.",
     "backgroundTeaPartyNotes": "Участвай в изискано Чаено парти.",
-    "backgroundButterflyGardenNotes": "Забавлявайте се с опрашителите в Градина на пеперудите",
+    "backgroundButterflyGardenNotes": "Купонясвайте с опрашители в градина за пеперуди",
     "backgroundAnimalCloudsText": "Животински облаци",
     "backgroundButterflyGardenText": "Градина на пеперудите",
     "backgroundWinterNocturneText": "Зимен ноктюрн",
@@ -503,5 +503,18 @@
     "hideLockedBackgrounds": "Скрий заключените фонове",
     "backgroundSnowglobeNotes": "Разклати Снежната топка и заеми мястото си в микрокосмоса на снежния пейзаж.",
     "backgroundAmongGiantFlowersText": "Сред гигантски цветя",
-    "backgroundAnimalCloudsNotes": "Използвай въображението си, за да намериш Животни в Облаците."
+    "backgroundAnimalCloudsNotes": "Използвай въображението си, за да намериш Животни в Облаците.",
+    "backgroundSucculentGardenNotes": "",
+    "backgroundSucculentGardenText": "Градина със сукуленти",
+    "backgroundHotAirBalloonText": "горещ въздух балон",
+    "backgroundHeatherFieldText": "пирен поле",
+    "backgroundRainyBarnyardText": "Дъждовен фермерски двор",
+    "backgroundRelaxationRiverText": "Релаксация Река",
+    "backgroundFlyingOverGlacierNotes": "‐",
+    "backgroundUnderwaterRuinsText": "Подводен Руини",
+    "backgroundBeachCabanaText": "Плаж Кабана",
+    "backgroundSaltLakeText": "Сол Езеро",
+    "backgroundWintryCastleText": "Зимен Замък",
+    "backgroundVikingShipText": "Викинг Кораб",
+    "backgroundCampingOutText": "Къмпинг Навън"
 }

website/common/locales/bg/faq.json

@@ -4,7 +4,7 @@
     "androidFaqStillNeedHelp": "Ако имате въпрос, който не намирате в този списък или в [ЧЗВ в уикито](http://habitica.fandom.com/wiki/FAQ), задайте го в кръчмата чрез Меню > Кръчма! Ще се радваме да помогнем.",
     "webFaqStillNeedHelp": "Ако имате въпрос, който не намирате в този списък или в [ЧЗВ в уикито](http://habitica.fandom.com/wiki/FAQ), задайте го в [Помощната гилдия на Хабитика](https://habitica.com/groups/guild/5481ccf3-5d2d-48a9-a871-70a7380cee5a)! Ще се радваме да помогнем.",
     "webFaqAnswer28": "Да! Бутона \"Пауза на щетите\" може да се намери в Настройки. Той ще ви предпази от загуба на точки живот (HP) за пропуснати ежедневни задачи. Това е полезно, ако сте на ваканция, нуждаете се от почивка или по какъвто и да било друг повод, за който имате нужда от почивка. Ако участвате в мисия, вашето собствено неприключило напредване ще бъде спряно, но все още ще получавате щети от пропуснатите ежедневни задачи на членовете на вашата група.\n\nЗа да поставите на пауза конкретни ежедневни задачи, можете да редактирате графика им, за да се изпълняват на всеки 0 дни, докато не сте готови да ги стартирате отново.",
-    "webFaqAnswer32": "В Habitica има четири класа: Войн, Магьосник, Крадец и Лечител. Всички играчи започват като клас \"Войн\", докато достигнат ниво 10. След като достигнете ниво 10, ще получите възможността да изберете нов клас или да продължите като Войн.\n\nВсеки клас разполага с различни Екипировка и Умения. Ако не искате да изберете клас, можете да изберете \"Отказ\". Ако изберете да се откажете, винаги можете да активирате Класовата система от Настройки по-късно.",
+    "webFaqAnswer32": "Всички играчи започват като клас \"Войн\", докато достигнат ниво 10. След като достигнете ниво 10, ще получите възможността да изберете нов клас или да продължите като Войн.\n\nВсеки клас разполага с различни Екипировка и Умения. Ако не искате да изберете клас, можете да изберете \"Отказ\". Ако изберете да се откажете, винаги можете да активирате Класовата система от Настройки по-късно.\n\nАко искате да промените класа си след ниво 10, можете да го направите, като използвате Орбът на прераждането. Орбът на прераждането е достъпен в Пазара за 6 диаманта на ниво 50 или безплатен на ниво 100.\n\nСъщо така, можете да промените своя клас по всяко време от Настройки за 3 диаманта. Това няма да нулира нивото ви като Орбът на прераждането, но ще ви позволи да преразпределите точките на уменията, които сте събрали, като сте вдигнали нивото си, за да са релевантни с новия ви клас.",
     "commonQuestions": "Чести въпроси",
     "faqQuestion25": "Какви са различните видове задачи?",
     "webFaqAnswer25": "Habitica използва три различни типа задачи, за да отговори на вашите нужди: Навици, Ежедневни и Задачи.\n\nНавиците могат да бъдат положителни или отрицателни и представляват нещо, което искате да проследявате няколко пъти на ден или според незададен график. Положителните навици ще ви наградят със злато и опит (Exp), докато отрицателните навици ще ви наказват със загуба на точки живот (HP).\n\nЕжедневните задачи са повтарящи се задачи, които искате да изпълнявате по-структурирано. Например веднъж на ден, три пъти на седмица или четири пъти на месец. Пропускането на ежедневни задачи води до загуба на HP, но колкото по-трудни са, толкова по-добри са наградите!\n\nЗадачите са еднократни задачи, за които получавате награди след като ги изпълните. Задачите могат да имат срок, но няма загуба на HP, ако го пропуснете.\n\nИзберете типа задача, който най-добре отговаря на това, което искате да постигнете!",
@@ -16,7 +16,7 @@
     "faqQuestion29": "Как да възстановя загубени точки живот (HP)?",
     "webFaqAnswer29": "Можете да възвърнете 15 HP, като закупите отвара от колоната си за Награди, за 25 злато. Освен това винаги ще възвърнете пълното си HP, когато качите ниво!",
     "faqQuestion30": "Какво става, когато изчерпам HP?",
-    "webFaqAnswer30": "Ако вашите HP стигнат до нула, ще загубите едно ниво, цялото си злато и един случаен предмет, който може да бъде закупен отново.",
+    "webFaqAnswer30": "Ако вашето HP стигне до нула, ще загубите едно ниво, цялото си злато и един случаен предмет, който може да бъде закупен отново.",
     "faqQuestion31": "Защо загубих HP при неотрицателна задача ?",
     "webFaqAnswer31": "Ако завършите задача и загубите HP, когато не би трябвало, сте срещнали забавяне, докато сървърът синхронизира промените, направени на други платформи. Например, ако използвате злато, мана или загубите HP в мобилното приложение и след това завършите задача в уебсайта, сървърът просто потвърждава, че всичко е синхронизирано.",
     "faqQuestion32": "Кога мога да си избера клас?",

website/common/locales/bg/settings.json

@@ -18,7 +18,7 @@
     "resetAccPop": "Започнете отначало, премахвайки всички нива, злато, екипировка, история и задачи.",
     "deleteAccount": "Изтриване на профила",
     "deleteAccPop": "Изтрива и премахва Вашия профил в Хабитика.",
-    "feedback": "Ако искате да ни изпратите отзивите си, моля, въведете ги по-долу. Ще се радваме да научим какво Ви е харесало, или пък не, в Хабитика! Не говорите английски добре? Няма проблем! Пишете на който искате език.",
+    "feedback": "Ако искате да ни изпратите отзивите си, моля, въведете ги по-долу. Ще се радваме да чуем обратната ви връзка! Ще бде анонимно, освен ако не изберете да въведете контактите си. Не говорите английски добре? Няма проблем! Пишете ни на езика, който предпочитате.",
     "dataExport": "Изнасяне на данни",
     "saveData": "Ето няколко възможности за запазване на данните Ви.",
     "habitHistory": "История на навиците",
@@ -157,5 +157,24 @@
     "changeUsernameDisclaimer": "Потребителското ви име се ползва за покани, @споменавания в чата и съобщения, трябва да е от 1 до 20 символа, да съдържа само буквите от a до z, цифрите от 0 до 9, тирета или долни черти и не може да съдържа неприлични думи.",
     "verifyUsernameVeteranPet": "Един от тези любимци-ветерани ще Ви чака след като приключите с потвърждението!",
     "subscriptionReminders": "Абонаментни Напомняния",
-    "newPMNotificationTitle": "Ново съобщение от <%= name %>"
+    "newPMNotificationTitle": "Ново съобщение от <%= name %>",
+    "resetAccount": "Нулирай акаунт",
+    "generalSettings": "Общи настройки",
+    "taskSettings": "Настройки на Задачите",
+    "confirmCancelChanges": "Сигурни ли сте? Ще загубите незапазените промени.",
+    "account": "Акаунт",
+    "loginMethods": "Методи за Влизане",
+    "character": "Герой",
+    "siteLanguage": "Език на сайта",
+    "showLevelUpModal": "Когато вдигате ниво",
+    "showHatchPetModal": "Когато излюпвате Любимец",
+    "showRaisePetModal": "Когато отгледате Любимец до Оседлан Любимец",
+    "baileyAnnouncement": "Най-новите вести на Бейли",
+    "view": "Виж",
+    "feedbackPlaceholder": "Добавете обратна връзка",
+    "downloadCSV": "Изтеглете CSV",
+    "yourUserData": "Вашите Потребителски Данни",
+    "taskHistory": "История на Задачите",
+    "yourUserDataDisclaimer": "Тук можете да изтеглите копие на историята на задачите си или пълните си потребителски данни.",
+    "useridCopied": "Потребителският ID е копиран."
 }

website/common/locales/cs/achievements.json

@@ -164,5 +164,6 @@
     "achievementRodentRulerModalText": "Nasbíral jsi všechny hlodavce!",
     "achievementCatsText": "Vylíhly se všechny standardní barvy kočičích mazlíčků: gepard, lev, šavlozubý tygr a tygr!",
     "achievementRodentRuler": "Vládce hlodavců",
-    "achievementCats": "Pasák koček"
+    "achievementCats": "Pasák koček",
+    "achievementDomesticated": "Hejá"
 }

website/common/locales/cs/backgrounds.json

@@ -117,7 +117,7 @@
     "backgroundTavernNotes": "Navštiv krčmu města Habitica.",
     "backgrounds102015": "Sada 17: zveřejněna v říjnu 2015",
     "backgroundHarvestMoonText": "Měsíc při sklizni",
-    "backgroundHarvestMoonNotes": "Kdákání pod měsícem při sklizni.",
+    "backgroundHarvestMoonNotes": "Chechtej se pod sklizňovým měsícem.",
     "backgroundSlimySwampText": "Slizká bažina",
     "backgroundSlimySwampNotes": "Přebroď se slizkou bažinou.",
     "backgroundSwarmingDarknessText": "Valící se temnota",
@@ -213,7 +213,7 @@
     "backgroundStormyRooftopsNotes": "Propliž se přes bouřlivé střechy.",
     "backgroundWindyAutumnText": "Větrný podzim",
     "backgroundWindyAutumnNotes": "Hoň se za listy během větrného podzimu.",
-    "incentiveBackgrounds": "Prosté pozadí",
+    "incentiveBackgrounds": "Standardní pozadí",
     "backgroundVioletText": "Fialová",
     "backgroundVioletNotes": "Živá fialová tapeta.",
     "backgroundBlueText": "Modrá",
@@ -736,7 +736,64 @@
     "backgroundMaskMakersWorkshopNotes": "Vyzkoušej novou tvář v maskářově dílně.",
     "backgroundCemeteryGateText": "Hřbitovní brána",
     "backgroundCemeteryGateNotes": "Straš u hřbitovní brány.",
-    "backgroundAutumnBridgeText": "Podzimní most",
-    "backgroundAutumnBridgeNotes": "Obdivuj krásu podzimního mostu.",
-    "backgroundInsideACrystalText": "Uvnitř krystalu."
+    "backgroundAutumnBridgeText": "Most na podzim",
+    "backgroundAutumnBridgeNotes": "Obdivuj krásu mostu na podzim.",
+    "backgroundInsideACrystalText": "Uvnitř krystalu",
+    "backgrounds032023": "Sada 106: Zveřejněna v březnu 2023",
+    "backgroundOldTimeyBasketballCourtText": "Retro basketbalové hřiště",
+    "backgroundOldTimeyBasketballCourtNotes": "Zaházej si na koš na retro basketbalovém hřišti.",
+    "backgroundJungleWateringHoleText": "Napajedlo v džungli",
+    "backgroundJungleWateringHoleNotes": "Zastav se na doušek u džunglového napajedla.",
+    "backgroundMangroveForestText": "Mangrovový les",
+    "backgroundMangroveForestNotes": "Prozkoumej okraj mangrovového lesa.",
+    "backgrounds052023": "Sada 108: Zveřejněna v květnu 2023",
+    "backgroundInAPaintingText": "V obraze",
+    "backgroundFlyingOverHedgeMazeText": "Let nad labyrintem ze živého plotu",
+    "backgroundFlyingOverHedgeMazeNotes": "Žasněte při letu nad labyrintem ze živého plotu.",
+    "backgroundCretaceousForestText": "Křídový les",
+    "backgroundCretaceousForestNotes": "Vychutnejte si pradávnou zeleň křídového lesa.",
+    "backgroundLeafyTreeTunnelNotes": "Procházejte se tunelem z listnatých stromů.",
+    "backgroundSpringtimeShowerText": "Jarní přeháňka",
+    "backgroundSpringtimeShowerNotes": "Podívejte se na květnatou jarní přeháňku.",
+    "backgroundUnderWisteriaText": "Pod vistérií",
+    "backgrounds022023": "SADA 105: Vydáno v únoru 2023",
+    "backgroundInFrontOfFountainText": "Před Fontánou",
+    "backgroundInFrontOfFountainNotes": "Procházej se před Fontánou.",
+    "backgroundGoldenBirdcageText": "Zlatá klec",
+    "backgroundGoldenBirdcageNotes": "Schovej se v zlaté kleci.",
+    "backgroundFancyBedroomText": "Luxusní ložnice",
+    "backgroundFancyBedroomNotes": "Dopřej si luxus v luxusní ložnici.",
+    "backgrounds042023": "Sada 107: Zveřejněna v dubnu 2023",
+    "backgroundLeafyTreeTunnelText": "Tunel z listnatých stromů",
+    "backgroundUnderWisteriaNotes": "Odpočiňte si pod vistérií.",
+    "backgroundInAPaintingNotes": "Užijte si kreativní činnosti uvnitř obrazu.",
+    "backgrounds012023": "SADA 104: Vydáno v lednu 2023",
+    "backgroundRimeIceText": "Jinovatka",
+    "backgroundRimeIceNotes": "Pokochej se třpytivou jinovatkou.",
+    "backgroundSnowyTempleText": "Zasněžený chrám",
+    "backgroundSnowyTempleNotes": "Pokochej se klidným zasněženým chrámem.",
+    "backgroundWinterLakeWithSwansText": "Zimní jezero s labutěmi",
+    "backgroundWinterLakeWithSwansNotes": "Užij si přírodu u zimního jezera s labutěmi.",
+    "backgrounds122022": "SADA 103: Vydáno v prosinci 2022",
+    "backgroundBranchesOfAHolidayTreeText": "Větve svátečního stromku",
+    "backgroundBranchesOfAHolidayTreeNotes": "Dováděj na větvích svátečního stromku.",
+    "backgroundInsideACrystalNotes": "Vyhlédni z nitra krystalu.",
+    "backgroundSnowyVillageText": "Zasněžená vesnice",
+    "backgroundSnowyVillageNotes": "Pokochej se zasněženou vesnicí.",
+    "backgrounds062023": "Sada 109: Zveřejněna v červnu 2023",
+    "backgroundInAnAquariumText": "V akváriu",
+    "backgroundInAnAquariumNotes": "Zaplavejte si poklidně s rybkami v akváriu.",
+    "backgroundInsideAdventurersHideoutText": "V úkrytu dobrodruhů",
+    "backgroundInsideAdventurersHideoutNotes": "Naplánujte cestu v úkrytu dobrodruhů.",
+    "backgroundCraterLakeText": "Kráterové jezero",
+    "backgroundCraterLakeNotes": "Obdivujte nádherné kráterové jezero.",
+    "backgrounds072023": "Sada 110: Zveřejněna v červenci 2023",
+    "backgroundOnAPaddlewheelBoatText": "Na loďce s lopatkovým kolem",
+    "backgroundOnAPaddlewheelBoatNotes": "Projet se na loďce s lopatkovým kolem.",
+    "backgroundColorfulCoralText": "Barevný korál",
+    "backgroundColorfulCoralNotes": "Potopte se mezi barevné korály.",
+    "backgrounds082023": "Sada 111: zveřejněaa v srpnu 2023",
+    "backgroundBonsaiCollectionText": "Sbírka bonsají",
+    "backgroundBoardwalkIntoSunsetNotes": "Vydejte se po Stezce do západu slunce.",
+    "backgroundBoardwalkIntoSunsetText": "Stezka do západu slunce"
 }

website/common/locales/cs/character.json

@@ -54,7 +54,7 @@
     "battleGear": "Bojová výzbroj",
     "gear": "Výbava",
     "autoEquipBattleGear": "Automaticky použít nové vybavení",
-    "costume": "Kostým",
+    "costume": "kostým",
     "useCostume": "Použít kostým",
     "costumePopoverText": "Vyber \"Použít kostým\", abys vybavil svého avatara, aniž bys nějak ovlivnil statistiky tvé bojové výzbroje! To znamená, že můžeš obléct svého avatara do jakéhokoliv vybavení chceš a stále mít tvojí nejlepší bojovou výzbroj na sobě.",
     "autoEquipPopoverText": "Zvol tuto možnost pro automatické nasazení koupeného vybavení.",
@@ -184,5 +184,6 @@
     "chatCastSpellUser": "<%= username %> použil/a <%= spell %> na <%= target %>.",
     "purchasePetItemConfirm": "Tento nákup by překročil počet položek, které potřebujete k vylíhnutí všech možných <%= itemText %> domácích zvířátek. Jsi si jistá?",
     "notEnoughGold": "Nedostatek zlaťáků.",
-    "chatCastSpellPartyTimes": "<%= username %> použil/a <%= spell %> pro skupinu <%= times %> times."
+    "chatCastSpellPartyTimes": "<%= username %> použil/a <%= spell %> pro skupinu <%= times %> times.",
+    "pointsAvailable": "Dostupné body"
 }

website/common/locales/cs/pets.json

@@ -1,5 +1,5 @@
 {
-    "stable": "Stáj",
+    "stable": "Mazlíčci a Mounty",
     "pets": "Mazlíčci",
     "activePet": "Aktivní mazlíček",
     "noActivePet": "Bez aktivního mazlíčka",
@@ -109,5 +109,7 @@
     "wackyPets": "Šílená zvířátka",
     "invalidAmount": "Neplatný počet jídla,je vyžadováno pozitivní celé číslo",
     "tooMuchFood": "Snažíš se dát svému zvířeti moc jídla, akce byla zrušena",
-    "notEnoughFood": "Nemáš dost jídla"
+    "notEnoughFood": "Nemáš dost jídla",
+    "veteranCactus": "Kaktus Veterán",
+    "veteranDragon": "Drak Veterán"
 }

website/common/locales/cs/settings.json

@@ -160,5 +160,25 @@
     "newPMNotificationTitle": "Nová zpráva od <%= name %>",
     "displaynameIssueNewline": "Zobrazovaná jména nesmí obsahovat zpětné lomítko následované písmenem N.",
     "resetAccount": "Resetovat účet",
-    "giftedSubscriptionWinterPromo": "Ahoj <%= username %>, získal/a jsi <%= monthCount %> měsíce/ů předplatného jako součást naší sváteční dárkové akce!"
+    "giftedSubscriptionWinterPromo": "Ahoj <%= username %>, získal/a jsi <%= monthCount %> měsíce/ů předplatného jako součást naší sváteční dárkové akce!",
+    "generalSettings": "Hlavní nastavení",
+    "siteData": "Údaje o webu",
+    "taskSettings": "Nastavení úkolu",
+    "confirmCancelChanges": "Jste si jistí? Neuložené změny přijdou vniveč.",
+    "account": "Účet",
+    "loginMethods": "Možnosti přihlášení",
+    "character": "Postava",
+    "siteLanguage": "Jazyk webu",
+    "showLevelUpModal": "Při dosažení vyšší úrovně",
+    "showHatchPetModal": "Při odchovu zvířátka",
+    "showRaisePetModal": "Jak z domácího mazlíčka vychovat jízdní zvíře",
+    "showStreakModal": "Při dosažení úspěchu v sérii",
+    "baileyAnnouncement": "Nejnovější oznámení společnosti Bailey",
+    "view": "Zobrazit",
+    "feedbackPlaceholder": "Vlož zpětnou vazbu",
+    "downloadCSV": "Stáhni si CSV",
+    "downloadAs": "Ulož jako",
+    "yourUserData": "Tvá uživatelská data",
+    "taskHistory": "Historie",
+    "yourUserDataDisclaimer": "Zde si lze stáhnout výpis historie úkolů nebo kompletní uživatelská data."
 }

website/common/locales/de/backgrounds.json

@@ -935,5 +935,11 @@
     "backgroundWaterfallWithRainbowText": "Wasserfall mit Regenbogen",
     "backgroundWaterfallWithRainbowNotes": "Bewundere die atemberaubende Schönheit eines Wasserfalls mit Regenbogen.",
     "backgrounds042026": "SET 143: Veröffentlicht im April 2026",
-    "backgrounds052026": "SET 144: Veröffentlicht im Mai 2026"
+    "backgrounds052026": "SET 144: Veröffentlicht im Mai 2026",
+    "backgroundRidingACometText": "Ein Kometenritt",
+    "backgroundRidingACometNotes": "Reise durch das All bei einem Kometenritt!",
+    "backgroundElvenCitadelText": "Elven Citadel",
+    "backgroundElvenCitadelNotes": "Unternehmen Sie die malerische Reise zu einer Elfenzitadelle.",
+    "backgroundOnAStrangePlanetNotes": "Wage dich dorthin, wo noch kein Habitican gewesen ist: Auf einem fremden Planeten.",
+    "backgroundOnAStrangePlanetText": "un eine strange planete"
 }

website/common/locales/de/content.json

@@ -410,5 +410,6 @@
     "questEggPlatypusText": "Schnabeltier",
     "questEggPlatypusMountText": "Schnabeltier",
     "questEggPlatypusAdjective": "ein Perfektionist",
-    "hatchingPotionOpal": "Opal"
+    "hatchingPotionOpal": "Opal",
+    "hatchingPotionAlien": "Außerirdischer"
 }

website/common/locales/de/front.json

@@ -187,5 +187,7 @@
     "minPasswordLengthLogin": "Dein Passwort ist mindestens 8 Zeichen lang.",
     "enterValidEmail": "Bitte gib eine gültige E-Mail-Adresse ein.",
     "whatToCallYou": "Wie sollen wir dich nennen?",
-    "acceptPrivacyTOS": "Du bestätigst, dass du mindestens 18 Jahre alt bist und dass du unsere <a href='/static/terms' target='_blank'>Nutzungsbedingungen</a> und <a href='/static/privacy' target='_blank'>Datenschutz-Bestimmungen</a> gelesen hast und akzeptierst"
+    "acceptPrivacyTOS": "Du bestätigst, dass du mindestens 18 Jahre alt bist und dass du unsere <a href='/static/terms' target='_blank'>Nutzungsbedingungen</a> und <a href='/static/privacy' target='_blank'>Datenschutz-Bestimmungen</a> gelesen hast und akzeptierst",
+    "emailAddress": "E-Mail_adresse",
+    "emailRequiredForSupport": "Wir benötigen eine E-Mail-Adresse für den Benutzersupport. Bitte geben Sie eine E-Mail-Adresse ein, um mit der Erstellung Ihres Kontos fortzufahren."
 }

website/common/locales/de/gear.json

@@ -3484,7 +3484,7 @@
     "shieldSpecialWinter2026WarriorText": "Raureif Schild",
     "shieldSpecialWinter2026WarriorNotes": "Stoppe eiskalt Hindernisse mit diesem praktischen, pieksigen Schild. Erhöht Ausdauer um %= con %>. Limitierte Ausgabe Winterausrüstung 2025-2026.",
     "headMystery202602Text": "Kirschblüte Fuchsohren",
-    "headMystery202602Notes": " Diese Ohren schärfen dein Gehör so sehr, dass du im nahenden Frühling das Wachsen der Blütenknospen an den Zweigen der Bäume hören kannst. Gewährt keinen Attributbonus. Februar 2026 Abonnentengegenstand.",
+    "headMystery202602Notes": "Diese Ohren schärfen dein Gehör so sehr, dass du im nahenden Frühling das Wachsen der Blütenknospen an den Zweigen der Bäume hören kannst. Gewährt keinen Attributbonus. Februar 2026 Abonnentengegenstand.",
     "headArmoireLoneCowpokeHatNotes": "Howdy Kumpel! Hasst du’s auch so, wenn du draußen auf dem Schießstand bist, an Aufgaben arbeitest und dir die Sonne in die Augen scheint? Also, gute Sache, dass du dafür jetzt ’nen Hut hast. Erhöht deine Wahrnehmung um <%= per %>. Verzauberter Schrank: Einsamer Cowboy Set (Item 1 of 2)",
     "shieldSpecialWinter2026HealerText": "Sternenexplosion",
     "shieldArmoireDoubleBassNotes": "Bom doo bom brrrr brr brr brrrr! Versammle deine Party, um euch zu erden oder zu tanzen, während ihr euch Musik von dieser tiefen Double Bass anhört. Erhört Ausdauer und Stärke um jeweils <%= attrs %>. Verzauberter Schwank: Musikinstrumente Set 2 (Gegenstand 3 von 3)",
@@ -3497,5 +3497,11 @@
     "backMystery202602Notes": "Diese flauschigen Schweife haben die Farbe der Kirschblüte, eine Erinnerung, dass der Frühling auf dem Weg ist. Gewährt keinen Autobusbonus. Februar 2026 Abonnentengegenstand.",
     "backArmoireHarpsichordText": "Cembalo",
     "weaponSpecialSpring2026HealerText": "Schneeglöckchen Stab",
-    "weaponSpecialSpring2026HealerNotes": "Eine Gelegenheit für einen Neuanfang liegt direkt vor dir, und mit diesem prächtigen Stab wirst du bereit sein! Erhöht Intelligenz um <%= int %>. Limitierte Ausgabe Frühlingsausrüstung 2026."
+    "weaponSpecialSpring2026HealerNotes": "Eine Gelegenheit für einen Neuanfang liegt direkt vor dir, und mit diesem prächtigen Stab wirst du bereit sein! Erhöht Intelligenz um <%= int %>. Limitierte Ausgabe Frühlingsausrüstung 2026.",
+    "armorSpecialSpring2026WarriorText": "Froschrüstung",
+    "armorSpecialSpring2026WarriorNotes": "Hüpf in Aktion, sobald der Schnee taut. Erhöht Ausdauer um <%= con %>. Limitierte Ausgabe Frühlingsausrüstung 2026.",
+    "armorSpecialSpring2026RogueText": "Birkenrinde Rüstung",
+    "armorSpecialSpring2026RogueNotes": "Trotze dem unvermeidlichen Frühlingsregen ebenso wie leichten Brisen. Erhöht Wahrnehmung um <%= per %>. Limitierte Ausgabe Frühlingsausrüstung 2026.",
+    "weaponMystery202608Notes": "Hell, wunderschön und gefährlich für deine unerledigte Tagesaufgaben. Gewährt keinen Attributbonus. August 2026 Abonnentengegenstand.",
+    "weaponMystery202608Text": "Leuchtende Magenta-Klinge"
 }

website/common/locales/de/generic.json

@@ -243,5 +243,7 @@
     "newMessage": "Neue Nachricht",
     "rememberToBeKind": "Bitte sei freundlich, respektvoll, und folge den <a href='/static/community-guidelines' target='_blank'>Community-Richtlinien</a>.",
     "gem": "Edelstein",
-    "confirmPurchase": "Kauf bestätigen"
+    "confirmPurchase": "Kauf bestätigen",
+    "avoidSPI": "vermeiden SPI",
+    "avoidSPIDetails": "Zu Ihrer Privatsphäre vermeiden Sie es, <%= firstLink %>sensible persönliche Informationen<%= linkClose %> (SPI) beim Verwenden von Habitica anzugeben. Ihre Kontodaten, einschließlich Aufgaben, werden auf unseren Servern gespeichert, sodass Sie von jedem Gerät aus darauf zugreifen können.<br><br>Um mehr zu erfahren, lesen Sie unsere <%= secondLink %>Datenschutzerklärung<%= linkClose %>."
 }

website/common/locales/de/limited.json

@@ -270,14 +270,14 @@
     "winter2025StringLightsHealerSet": "Lichterketten Heiler Set",
     "winter2025SnowRogueSet": "Schneeschurken Set",
     "winter2025MooseWarriorSet": "Elchkrieger Set",
-    "winter2025AuroraMageSet": "Aurora Magier Set",
-    "spring2025PlumeriaHealerSet": "Plumeria Heiler Set",
-    "spring2025MantisMageSet": "Fangschrecken Magier Set",
+    "winter2025AuroraMageSet": "Aurora Set (Mage)",
+    "spring2025PlumeriaHealerSet": "Plumeria Set (Healer)",
+    "spring2025MantisMageSet": "Fangschrecken-Set (Magier)",
     "spring2025SunshineWarriorSet": "Sonnenschein Krieger Set",
     "spring2025CrystalPointRogueSet": "Kristallspitzen Schurken Set",
-    "summer2025ScallopWarriorSet": "Jakobsmuschel Krieger Set",
-    "summer2025SquidRogueSet": "Tintenfisch Schurken Set",
-    "summer2025SeaAngelHealerSet": "Ruderschnecken Heiler Set",
+    "summer2025ScallopWarriorSet": "Jakobsmuschel-Set (Krieger)",
+    "summer2025SquidRogueSet": "Tintenfisch-Set (Schurken)",
+    "summer2025SeaAngelHealerSet": "Ruderschnecken-Set (Heiler)",
     "summer2025FairyWrasseMageSet": "Feenlippfisch Magier Set",
     "fall2025SasquatchWarriorSet": "Sasquatch Krieger Set",
     "fall2025SkeletonRogueSet": "Skelett Schurken Set",
@@ -289,5 +289,6 @@
     "winter2026MidwinterCandleMageSet": "Mittwinterkerzen Magier Set",
     "spring2026FrogWarriorSet": "Frosch Set (Krieger)",
     "spring2026SnowdropHealerSet": "Schneeglöckchen Set (Heiler)",
-    "spring2026MaypoleMageSet": "Maibaum Set (Magier)"
+    "spring2026MaypoleMageSet": "Maibaum Set (Magier)",
+    "spring2026BranchRogueSet": "Fruling Ast Set (Schurke)"
 }

website/common/locales/de/questscontent.json

@@ -189,7 +189,7 @@
     "questTRexUndeadBoss": "Skelettierter Tyrannosaurus",
     "questTRexUndeadRageTitle": "Knöcherne Heilung",
     "questTRexUndeadRageDescription": "Diese Leiste füllt sich, wenn Du Deine Tagesaufgaben nicht erfüllst. Wenn sie voll ist, heilt sich der skelettierte Tyrannosaurus um 30% seiner übrigen Lebenspunkte!",
-    "questTRexUndeadRageEffect": "'Der Skelettierte Tyrannosaurus benutzt KNÖCHERNE HEILUNG!'\n\nDas Monster lässt ein furchtbares Brüllen ertönen und einige seiner gesplitterten Knochen setzen sich wieder zusammen!",
+    "questTRexUndeadRageEffect": "Skeletal Tyrannosaur uses SKELETON HEALING!\n\nThe monster lets forth an unearthly roar, and some of its damaged bones knit back together!\n\nDas Monster lässt ein furchtbares Brüllen ertönen und einige seiner gesplitterten Knochen setzen sich wieder zusammen!",
     "questTRexDropTRexEgg": "Tyrannosaurus (Ei)",
     "questTRexUnlockText": "Schaltet den Kauf von Tyrannosauruseiern auf dem Marktplatz frei",
     "questRockText": "Entkomme dem Höhlenungetüm",

website/common/locales/de/rebirth.json

@@ -1,7 +1,7 @@
 {
     "rebirthNew": "Wiedergeburt: Ein neues Abenteuer erwartet Dich!",
     "rebirthUnlock": "Du hast die Wiedergeburt freigeschaltet! Dieser besondere Gegenstand gestattet es Dir ein neues Spiel mit Level 1 zu beginnen, jedoch behältst Du Deine Aufgaben, Erfolge, Haustiere und mehr. Verwende den Gegenstand um Habitica neues Leben einzuhauchen wenn Du glaubst alles erreicht zu haben, oder um neue Features aus dem Blickwinkel eines Anfängers zu erleben!",
-    "rebirthAchievement": "Du hast ein neues Abenteuer begonnen! Das ist Deine <%= number %>. Wiedergeburt. Dein höchstes jemals erreichtes Level ist <%= level %>. Um diesen Erfolg zu stapeln, beginne Dein nächstes Abenteuer wenn Du ein noch höheres Level erreicht hast!",
+    "rebirthAchievement": "Du hast ube die Orb of Rebirth <strong><%+numer%<>/Strong> ohr und  höchste Ebene ist <strong><%=",
     "rebirthAchievement100": "Du hast ein neues Abenteuer begonnen! Das ist Deine <%= number %>. Wiedergeburt. Dein höchstes jemals erreichtes Level ist 100 oder mehr. Um diesen Erfolg zu stapeln, beginne Dein nächstes Abenteuer wenn Du mindestens Level 100 erreicht hast!",
     "rebirthBegan": "Hat ein neues Abenteuer begonnen",
     "rebirthText": "Hat <%= rebirths %> neue Abenteuer begonnen",
@@ -11,5 +11,12 @@
     "rebirthPop": "Beginne sofort von vorn mit einem Charakter auf Level 1, aber behalte Erfolge, Sammelgegenstände und Ausrüstung. Deine Aufgaben und ihre Verläufe bleiben erhalten, werden aber auf gelb zurückgesetzt. Deine Strähnen verfallen, außer für Aufgaben, die von aktiven Herausforderungen oder Gruppenplänen stammen. Gold, Erfahrung, Mana und alle Effekte von Fähigkeiten werden entfernt. All das wird sofort in Kraft treten.",
     "rebirthName": "Sphäre der Wiedergeburt",
     "rebirthComplete": "Du wurdest wiedergeboren!",
-    "nextFreeRebirth": "<strong><%= days %> Tage</strong> bis zur <strong>KOSTENLOSEN</strong> Sphäre der Wiedergeburt"
+    "nextFreeRebirth": "<strong><%= days %> Tage</strong> bis zur <strong>KOSTENLOSEN</strong> Sphäre der Wiedergeburt",
+    "rebirthUnlockedNewItem": "Ort der Wiedergeburt Freigeschaltet",
+    "rebirthUnlockedOrb": "Ein neues Abenteuer ist verfügbar!",
+    "rebirthUnlockedDesc": "Nutze den Ort der Wiedergeburt um ein neues Leben in dein Habitica Abendteuer zu bekommen wenn du das Gefühl hast, alles erreicht zu haben. Du beginnst wieder bei Level 1 und es beginnt wieder von vorne.",
+    "rebirthNewAchievement": "Neue Auszeichnung",
+    "rebirthNewAdventure": "Ein neues Abenteuer beginnt nun!",
+    "rebirthStackInfo": "Diese Auszeichnung kann sich stapeln, jedes Mal, wenn du den Ort der Wiedergeburt nutzt.",
+    "rebirthAchievementPlural": "Du hast ube die Orb of Rebirth <strong><%+numer%<>/Strong> ohr und höchste Ebene ist <strong><%="
 }

website/common/locales/de/settings.json

@@ -116,7 +116,7 @@
     "generate": "Erstelle",
     "getCodes": "Codes erhalten",
     "webhooks": "WebHooks",
-    "webhooksInfo": "WebHooks bieten Entwicklern die Möglichkeit, Benachrichtigungen zu erhalten, wenn eine bestimmte Aktion durchgeführt wird, z. B. das Bewerten oder Aktualisieren einer Aufgabe oder das Senden einer Nachricht in einer Gruppe. Indem du einen WebHook erstellst, kannst du Änderungen in Habitica wahrnehmen und Anwendungen entwickeln, die auf diese Änderungen reagieren. <br><br> Weitere Informationen und Beispiele findest Du bei den <a target=\"_blank\" href=\"https://habitica.com/apidoc/#api-Webhook-AddWebhook\">API Docs</a>.",
+    "webhooksInfo": "WebHooks bieten Entwicklern die Möglichkeit, Benachrichtigungen zu erhalten, wenn eine bestimmte Aktion durchgeführt wird, z. B. das Bewerten oder Aktualisieren einer Aufgabe oder das Senden einer Nachricht in einer Gruppe. Indem du einen WebHook erstellst, kannst du Änderungen in Habitica wahrnehmen und Anwendungen entwickeln, die auf diese Änderungen reagieren. <br><br> Weitere Informationen und Beispiele findest Du bei den <a target=\"_blank\" href=\"https://apidoc.habitica.com/#api-Webhook-AddWebhook\">API Docs</a>.",
     "enabled": "Aktiviert",
     "webhookURL": "WebHook-URL",
     "invalidUrl": "Ungültige URL",

website/common/locales/de/subscriber.json

@@ -274,5 +274,8 @@
     "mysterySet202601": "Winter-Ägide set",
     "subscriptionBillingFYI": "Abos verlängern sich automatisch, sofern du sie nicht mindestens 24 Stunden vor Ablauf des aktuellen Zeitraums kündigst. Du kannst dein Abo in den Einstellungen unter „Abonnement“ verwalten. Die Abbuchung von deinem Konto erfolgt innerhalb von 24 Stunden nach dem Verlängerungsdatum zum gleichen Preis wie bei der ersten Abbuchung.",
     "subscriptionBillingFYIShort": "Abos verlängern sich automatisch, sofern du sie nicht mindestens 24 Stunden vor Ablauf des aktuellen Zeitraums kündigst. Die Abbuchung von deinem Konto erfolgt innerhalb von 24 Stunden nach dem Verlängerungsdatum zum gleichen Preis wie bei der ersten Abbuchung.",
-    "mysterySet202602": "Sakura Fuchs Set"
+    "mysterySet202602": "Sakura Fuchs Set",
+    "mysterySet202603": "Glyzinie Hexa Satze",
+    "mysterySet202604": "Kuhn Weltraumerkunder Set",
+    "mysterySet202605": "Nachtfall Nimbus Set"
 }

website/common/locales/de/tasks.json

@@ -143,5 +143,13 @@
     "deleteXTasks": "<%= count %> Aufgaben löschen",
     "confirmDeleteTasks": "Möchtest du diese Aufgaben löschen?",
     "deleteType": "Lösche <%= type %>",
-    "brokenChallengeTaskCount": "Das ist eine von <%= count %> Aufgaben, die Teil einer Herausforderung sind, die nicht mehr existiert."
+    "brokenChallengeTaskCount": "Das ist eine von <%= count %> Aufgaben, die Teil einer Herausforderung sind, die nicht mehr existiert.",
+    "everyDay": "jeden Tag",
+    "everyXDays": "alle <%= count %> Tage",
+    "everyWeek": "jede Woche",
+    "everyXWeeks": "alle <%= count %> Wochen",
+    "everyMonth": "jeden Monat",
+    "everyYear": "jedes Jahr",
+    "everyXYears": "alle <%= count %> Jahre",
+    "everyXMonths": "alle <%= count %> Monate"
 }

website/common/locales/en/backgrounds.json

@@ -1075,6 +1075,18 @@
   "backgroundElvenCitadelText": "Elven Citadel",
   "backgroundElvenCitadelNotes": "Take the scenic journey to an Elven Citadel.",
 
+  "backgrounds062026": "SET 145: Released June 2026",
+  "backgroundBeachWithVolcanoText": "Beach with Volcano",
+  "backgroundBeachWithVolcanoNotes": "Watch nature's wonder on a Beach with a Volcano.",
+
+  "backgrounds072026": "SET 146: Released July 2026",
+  "backgroundTropicalCoralGardenText": "Tropical Coral Garden",
+  "backgroundTropicalCoralGardenNotes": "Dive into a Tropical Coral Garden.",
+
+  "backgrounds082026": "SET 147: Released August 2026",
+  "backgroundVegetableGardenText": "Vegetable Garden",
+  "backgroundVegetableGardenNotes": "Plant tasty greens in a Vegetable Garden.",
+
   "timeTravelBackgrounds": "Steampunk Backgrounds",
   "backgroundAirshipText": "Airship",
   "backgroundAirshipNotes": "Become a sky sailor on board your very own Airship.",

website/common/locales/en/gear.json

@@ -587,6 +587,15 @@
   "weaponSpecialSpring2026MageText": "Maypole Parasol",
   "weaponSpecialSpring2026MageNotes": "An opportunity to celebrate approaches, and with this pretty parasol pole, you will be ready! Increases Intelligence by <%= int %> and Perception by <%= per %>. Limited Edition Spring 2026 Gear.",
 
+  "weaponSpecialSummer2026WarriorText": "Gator Machete",
+  "weaponSpecialSummer2026WarriorNotes": "This flashy, fancy weapon fits right into your swampcore aesthetic. Increases Strength by <%= str %>. Limited Edition Summer 2026 Gear.",
+  "weaponSpecialSummer2026RogueText": "Tsunami Blade",
+  "weaponSpecialSummer2026RogueNotes": "This clever, curvy weapon fits right into your seacore aesthetic. Increases Strength by <%= str %>. Limited Edition Summer 2026 Gear.",
+  "weaponSpecialSummer2026HealerText": "Puffin Lance",
+  "weaponSpecialSummer2026HealerNotes": "This fine, feather-adorned weapon fits right into your islandcore aesthetic. Increases Intelligence by <%= int %>. Limited Edition Summer 2026 Gear.",
+  "weaponSpecialSummer2026MageText": "Tiger Shark Spear",
+  "weaponSpecialSummer2026MageNotes": "This dangerous, double-ended weapon fits right into your oceancore aesthetic. Increases Intelligence by <%= int %> and Perception by <%= per %>. Limited Edition Summer 2026 Gear.",
+
   "weaponMystery201411Text": "Pitchfork of Feasting",
   "weaponMystery201411Notes": "Stab your enemies or dig in to your favorite foods - this versatile pitchfork does it all! Confers no benefit. November 2014 Subscriber Item.",
   "weaponMystery201502Text": "Shimmery Winged Staff of Love and Also Truth",
@@ -637,6 +646,10 @@
   "weaponMystery202601Notes": "An icy bubble shield that grants magical protection from opposing elements. Confers no benefit. January 2026 Subscriber Item.",
   "weaponMystery202603Text": "Wisteria Wizard Staff",
   "weaponMystery202603Notes": "Cast spells to warm the spring air and encourage the blossoms to bud! Confers no benefit. March 2026 Subscriber Item.",
+  "weaponMystery202607Text": "Oceanmancer's Fishy Familiars",
+  "weaponMystery202607Notes": "These colorful companions will channel your aqueous abilities. Confers no benefit. July 2026 Subscriber Item.",
+  "weaponMystery202608Text": "Beaming Magenta Blade",
+  "weaponMystery202608Notes": "Bright, beautiful, dangerous to your undone Dailies. Confers no benefit. August 2026 Subscriber Item.",
 
   "weaponMystery301404Text": "Steampunk Cane",
   "weaponMystery301404Notes": "Excellent for taking a turn about town. March 3015 Subscriber Item. Confers no benefit.",
@@ -865,6 +878,14 @@
   "weaponArmoireBambooFluteNotes": "Hwhoooo! Hu-whooooo! Gather your party for a meditation session or self-care nap while relaxing to tunes played on this bamboo flute. Increases Constitution and Intelligence by <%= attrs %> each. Enchanted Armoire: Musical Instrument Set 2 (Item 2 of 3)",
   "weaponArmoirePrettyPinkParasolText": "Pretty Pink Parasol",
   "weaponArmoirePrettyPinkParasolNotes": "Pretty and practical is the preeminent permutation. And for a particularly impressive presentation, give this parasol a spin! Increases all stats by <%= attrs %> each. Enchanted Armoire: Pretty in Pink Set (Item 1 of 2)",
+  "weaponArmoireBrightRainbowKiteText": "Rainbow Kite",
+  "weaponArmoireBrightRainbowKiteNotes": "This kite’s colors are bright and loud. Watching it soar high will make you proud! Increases all stats by <%= attrs %> each. Enchanted Armoire: Rainbow Kite Set (Item 1 of 2).",
+  "weaponArmoirePastelRainbowKiteText": "Pastel Rainbow Kite",
+  "weaponArmoirePastelRainbowKiteNotes": "This kite’s colors are muted and soft. It dances and spins as it soars aloft! Increases all stats by <%= attrs %> each. Enchanted Armoire: Rainbow Kite Set (Item 2 of 2).",
+  "weaponArmoireKendoShinaiText": "Kendo Shinai",
+  "weaponArmoireKendoShinaiNotes": "Light and soft, you can use this bamboo practice sword as you strive to improve yourself. Increases Strength by <%= str %>. Enchanted Armoire: Kendo Set (Item 3 of 3).",
+  "weaponArmoireGardenRakeText": "Garden Rake",
+  "weaponArmoireGardenRakeNotes": "Step 1: Rake all the fallen leaves into a giant pile. Step 2: Celebrate a job well done by jumping into the pile. Step 3: Repeat. Increases Constitution by <%= con %>. Enchanted Armoire: Gardener Set 2 (Item 1 of 2).",
 
   "armor": "armor",
   "armorCapitalized": "Armor",
@@ -1432,6 +1453,15 @@
   "armorSpecialSpring2026MageText": "Maypole Dancer Outfit",
   "armorSpecialSpring2026MageNotes": "Arrive ready to dance, picnic, and enjoy the warm weather spring brings. Increases Intelligence by <%= int %>. Limited Edition Spring 2026 Gear.",
 
+  "armorSpecialSummer2026WarriorText": "Gator Suit",
+  "armorSpecialSummer2026WarriorNotes": "Conceal yourself in this suit, but don’t hide from your problems. Gather your gator grit and meet your tasks like the alligator you are. Increases Constitution by <%= con %>. Limited Edition Summer 2026 Gear.",
+  "armorSpecialSummer2026RogueText": "Tsunami Suit",
+  "armorSpecialSummer2026RogueNotes": "Cloak yourself in this tsunami suit, but don’t hide from your problems. Summon a strong storm to have your back and meet your tasks like the adventurer you are. Increases Perception by <%= per %>. Limited Edition Summer 2026 Gear.",
+  "armorSpecialSummer2026HealerText": "Puffin Suit",
+  "armorSpecialSummer2026HealerNotes": "Fit yourself in this suit, but don’t hide from your problems. Produce your puffin power and tackle your tasks like the puffin you are. Increases Constitution by <%= con %>. Limited Edition Summer 2026 Gear.",
+  "armorSpecialSummer2026MageText": "Tiger Shark Suit",
+  "armorSpecialSummer2026MageNotes": "Slide into this suit, but don’t hide from your problems. Show your shark shine and swim right up to face those tasks like the shark you are. Increases Intelligence by <%= int %>. Limited Edition Summer 2026 Gear.",
+
   "armorMystery201402Text": "Messenger Robes",
   "armorMystery201402Notes": "Shimmering and strong, these robes have many pockets to carry letters. Confers no benefit. February 2014 Subscriber Item.",
   "armorMystery201403Text": "Forest Walker Armor",
@@ -1826,6 +1856,8 @@
   "armorArmoireSoftYellowSuitNotes": "Yellow is an energetic color. Wear this to bed, and you will wake up with the sun the next morning ready to tackle a day full of tasks. Increases Constitution and Strength by <%= attrs %> each. Enchanted Armoire: Yellow Loungewear Set (Item 2 of 3).",
   "armorArmoireHandstandOutfitText": "Handstand",
   "armorArmoireHandstandOutfitNotes": "Things sure do look different when you’re upside-down, don’t they? If you’re feeling stuck, it’s time for a fresh perspective! Increases Perception by <%= per %>. Enchanted Armoire: Handstand Set (Item 1 of 1).",
+  "armorArmoireKendoBoguText": "Kendo Bōgu",
+  "armorArmoireKendoBoguNotes": "This might be training armor, but it offers more than enough protection for your path ahead. Increases Constitution by <%= con %>. Enchanted Armoire: Kendo Set (Item 2 of 3).",
 
   "headgear": "helm",
   "headgearCapitalized": "Headgear",
@@ -2387,6 +2419,15 @@
   "headSpecialSpring2026MageText": "Mayflower Crown",
   "headSpecialSpring2026MageNotes": "Make a joyous statement with bright blooms encircling your head. Increases Perception by <%= per %>. Limited Edition Spring 2026 Gear.",
 
+  "headSpecialSummer2026WarriorText": "Gator Helm",
+  "headSpecialSummer2026WarriorNotes": "Go forth and be productive! If you get any pushback, just snap back and show your sharp teeth. Increases Strength by <%= str %>. Limited Edition Summer 2026 Gear.",
+  "headSpecialSummer2026RogueText": "Tsunami Helm",
+  "headSpecialSummer2026RogueNotes": "Go forth and be productive! If you lose your way, just follow the flow. Increases Perception by <%= per %>. Limited Edition Summer 2026 Gear.",
+  "headSpecialSummer2026HealerText": "Puffin Helm",
+  "headSpecialSummer2026HealerNotes": "Go forth and be productive! If you encounter complications, just gather them up in your colorful beak and take them somewhere else. Increases Intelligence by <%= int %>. Limited Edition Summer 2026 Gear.",
+  "headSpecialSummer2026MageText": "Tiger Shark Helm",
+  "headSpecialSummer2026MageNotes": "Go forth and be productive! If an obstacle dares to get in your way, just crush it with your mighty jaws. Increases Perception by <%= per %>. Limited Edition Summer 2026 Gear.",
+
   "headSpecialGaymerxText": "Rainbow Warrior Helm",
   "headSpecialGaymerxNotes": "In celebration of the GaymerX Conference, this special helmet is decorated with a radiant, colorful rainbow pattern! GaymerX is a game convention celebrating LGTBQ and gaming and is open to everyone.",
 
@@ -2578,6 +2619,8 @@
   "headMystery202603Notes": "This jaunty hat not only enhances your magical ability, it also has a lovely spring scent! Confers no benefit. March 2026 Subscriber Item.",
   "headMystery202604Text": "Audacious Astronaut Helmet",
   "headMystery202604Notes": "In space, no one can hear you check off your To Do’s. But the real reward is your sense of personal accomplishment! Confers no benefit. April 2026 Subscriber Item.",
+  "headMystery202606Text": "Holiday Hat",
+  "headMystery202606Notes": "Holidays are made for enjoying the sunshine - but don’t get burned! Confers no benefit. June 2026 Subscriber Item.",
 
   "headMystery301404Text": "Fancy Top Hat",
   "headMystery301404Notes": "A fancy top hat for the finest of gentlefolk! January 3015 Subscriber Item. Confers no benefit.",
@@ -2812,6 +2855,8 @@
   "headArmoireFloppyYellowHatNotes": "Many spells have been sewn into this simple hat, giving it a youthful yellow color. Increases all stats by <%= attrs %> each. Enchanted Armoire: Yellow Loungewear Set (Item 1 of 3).",
   "headArmoireVerdantArmingCapText": "Verdant Page Arming Cap",
   "headArmoireVerdantArmingCapNotes": "This comfy, cushioned coif makes you battle-ready and helps you withstand anything heavy that could come your way. Increases Perception and Constitution by <%= attrs %> each. Enchanted Armoire: Verdant Page Set (Item 1 of 2).",
+  "headArmoireKendoMenText": "Kendo Men",
+  "headArmoireKendoMenNotes": "You might be surprised by how well you can see through the grille as you follow the way of the sword. Increases Perception by <%= per %>. Enchanted Armoire: Kendo Set (Item 1 of 3).",
 
   "offhand": "off-hand item",
   "offHandCapitalized": "Off-Hand Item",
@@ -3136,6 +3181,11 @@
   "shieldSpecialSpring2026HealerText": "Snowdrop Leaf",
   "shieldSpecialSpring2026HealerNotes": "Create a light breeze with this fan as the days grow warmer. It doubles as a writing utensil in a pinch. Increases Constitution by <%= con %>. Limited Edition Spring 2026 Gear.",
 
+  "shieldSpecialSummer2026WarriorText": "Gator Shield",
+  "shieldSpecialSummer2026WarriorNotes": "Deflect oncoming challenges with this stylish, shiny shield. And when you’ve successfully cleared your list, crank up the music and have a party! Increases Constitution by <%= con %>. Limited Edition Summer 2026 Gear.",
+  "shieldSpecialSummer2026HealerText": "Puffin Potion",
+  "shieldSpecialSummer2026HealerNotes": "Keep your colony of fellow puffins healthy with this potion. It tastes great with fish! Increases Constitution by <%= con %>. Limited Edition Summer 2026 Gear.",
+
   "shieldMystery201601Text": "Resolution Slayer",
   "shieldMystery201601Notes": "This blade can be used to parry away all distractions. Confers no benefit. January 2016 Subscriber Item.",
   "shieldMystery201701Text": "Time-Freezer Shield",
@@ -3168,6 +3218,12 @@
   "shieldMystery202511Notes": "This rugged shield of icy rock protects you from bad Habits but won't freeze your hands. Confers no benefit. November 2025 Subscriber Item.",
   "shieldMystery202605Text": "Nightfall Shield",
   "shieldMystery202605Notes": "Let the moon’s shining light protect you from dangers in the dark. Confers no benefit. May 2026 Subscriber Item.",
+  "shieldMystery202606Text": "Holiday Hammock",
+  "shieldMystery202606Notes": "Between tasks, hop in this hammock, relax, and enjoy the scenery! Confers no benefit. June 2026 Subscriber Item.",
+  "shieldMystery202607Text": "Oceanmancer's Briny Bubble",
+  "shieldMystery202607Notes": "Tumultuous waters bend to your mighty magical will. Confers no benefit. July 2026 Subscriber Item.",
+  "shieldMystery202608Text": "Brilliant Emerald Blade",
+  "shieldMystery202608Notes": "Slice and dice all your tasks into manageable pieces! Confers no benefit. August 2026 Subscriber Item.",
 
   "shieldMystery301405Text": "Clock Shield",
   "shieldMystery301405Notes": "Time is on your side with this towering clock shield! Confers no benefit. June 3015 Subscriber Item.",
@@ -3353,7 +3409,9 @@
   "shieldArmoireSoftYellowPillowText": "Soft Yellow Pillow",
   "shieldArmoireSoftYellowPillowNotes": "The experienced warrior packs a pillow for any expedition. Grow and shine as you consolidate all you’ve learned during past adventures… even while you nap. Increases Intelligence and Perception by <%= attrs %> each. Enchanted Armoire: Yellow Loungewear Set (Item 3 of 3).",
   "shieldArmoireVerdantBannerText": "Verdant Page Banner",
-  "shieldArmoireVerdantBannerNotes": "Wave your banner high to signal friends it’s time to rally together! Intelligence by <%= int %>. Enchanted Armoire: Verdant Page Set (Item 2 of 2).",
+  "shieldArmoireVerdantBannerNotes": "Wave your banner high to signal friends it’s time to rally together! Increases Intelligence by <%= int %>. Enchanted Armoire: Verdant Page Set (Item 2 of 2).",
+  "shieldArmoireGardenHoseText": "Garden Hose",
+  "shieldArmoireGardenHoseNotes": "This magical hose never kinks and can infinitely stretch to reach every inch of your space. All your flowers, trees, shrubs, and thirsty pets can enjoy a drink from it. Increases Perception by <%= per %>. Enchanted Armoire: Gardener Set 2 (Item 2 of 2).",
 
   "back": "Back Accessory",
   "backBase0Text": "No Back Accessory",
@@ -3805,6 +3863,8 @@
   "eyewearMystery202503Notes": "This piercing gaze will strike terror into any fighter who dares to challenge you! Confers no benefit. March 2025 Subscriber Item.",
   "eyewearMystery202510Text": "Gliding Ghoul Eyes",
   "eyewearMystery202510Notes": "These spooky eyes glow like the Harvest Moon. Confers no benefit. October 2025 Subscriber Item.",
+  "eyewearMystery202606Text": "Holiday Shades",
+  "eyewearMystery202606Notes": "Your eyes are shaded but your outlook is still sunny! Confers no benefit. June 2026 Subscriber Item.",
 
   "eyewearMystery301404Text": "Eyewear Goggles",
   "eyewearMystery301404Notes": "No eyewear could be fancier than a pair of goggles - except, perhaps, for a monocle. Confers no benefit. April 3015 Subscriber Item.",

website/common/locales/en/generic.json

@@ -243,5 +243,7 @@
   "playerReportModalBody": "You should only report a player who violates the <%= firstLinkStart %>Community Guidelines<%= linkEnd %> and/or <%= secondLinkStart %>Terms of Service<%= linkEnd %>. Submitting a false report is a violation of Habitica’s Community Guidelines.",
   "targetUserNotExist": "Target User: '<%= userName %>' does not exist.",
   "rememberToBeKind": "Please remember to be kind, respectful, and follow the <a href='/static/community-guidelines' target='_blank'>Community Guidelines</a>.",
-  "confirmPurchase": "Confirm Purchase"
+  "confirmPurchase": "Confirm Purchase",
+  "avoidSPI": "Avoid SPI",
+  "avoidSPIDetails": "For your privacy, avoid including <%= firstLink %>sensitive personal information<%= linkClose %> (SPI) when using Habitica. Your account data, including tasks, is stored on our servers so you can access it from any device.<br><br>To learn more, review our <%= secondLink %>Privacy Policy<%= linkClose %>."
 }

website/common/locales/en/limited.json

@@ -209,44 +209,48 @@
   "fall2023BogCreatureHealerSet": "Bog Creature (Healer)",
   "winter2024SnowyOwlRogueSet": "Snowy Owl (Rogue)",
   "winter2024FrozenHealerSet": "Frozen (Healer)",
-  "winter2024PeppermintBarkWarriorSet": "Peppermint Bark Set (Warrior)",
-  "winter2024NarwhalWizardMageSet": "Narwhal Wizard Set (Mage)",
-  "spring2024FluoriteWarriorSet": "Fluorite Set (Warrior)",
-  "spring2024HibiscusMageSet": "Hibiscus Set (Mage)",
-  "spring2024BluebirdHealerSet": "Bluebird Set (Healer)",
-  "spring2024MeltingSnowRogueSet": "Melting Snow Set (Rogue)",
-  "summer2024WhaleSharkWarriorSet": "Whale Shark Set (Warrior)",
-  "summer2024SeaAnemoneMageSet": "Sea Anemone Set (Mage)",
-  "summer2024SeaSnailHealerSet": "Sea Snail Set (Healer)",
-  "summer2024NudibranchRogueSet": "Nudibranch Set (Rogue)",
-  "fall2024FieryImpWarriorSet": "Fiery Imp Set (Warrior)",
-  "fall2024UnderworldSorcerorMageSet": "Underworld Sorceror Set (Mage)",
-  "fall2024SpaceInvaderHealerSet": "Space Invader Set (Healer)",
-  "fall2024BlackCatRogueSet": "Black Cat Set (Rogue)",
-  "winter2025MooseWarriorSet": "Moose Set (Warrior)",
-  "winter2025AuroraMageSet": "Aurora Set (Mage)",
-  "winter2025StringLightsHealerSet": "String Lights Set (Healer)",
-  "winter2025SnowRogueSet": "Snow Set (Rogue)",
-  "spring2025SunshineWarriorSet": "Sunshine Set (Warrior)",
-  "spring2025CrystalPointRogueSet": "Crystal Point Set (Rogue)",
-  "spring2025PlumeriaHealerSet": "Plumeria Set (Healer)",
-  "spring2025MantisMageSet": "Mantis Set (Mage)",
-  "summer2025ScallopWarriorSet": "Scallop Set (Warrior)",
-  "summer2025SquidRogueSet": "Squid Set (Rogue)",
-  "summer2025SeaAngelHealerSet": "Sea Angel Set (Healer)",
-  "summer2025FairyWrasseMageSet": "Fairy Wrasse Set (Mage)",
-  "fall2025SasquatchWarriorSet": "Sasquatch Set (Warrior)",
-  "fall2025SkeletonRogueSet": "Skeleton Set (Rogue)",
-  "fall2025KoboldHealerSet": "Kobold Set (Healer)",
-  "fall2025MaskedGhostMageSet": "Masked Ghost Set (Mage)",
-  "winter2026RimeReaperWarriorSet": "Rime Reaper Set (Warrior)",
-  "winter2026SkiRogueSet": "Ski Set (Rogue)",
-  "winter2026PolarBearHealerSet": "Polar Bear Set (Healer)",
-  "winter2026MidwinterCandleMageSet": "Midwinter Candle Set (Mage)",
-  "spring2026FrogWarriorSet": "Frog Set (Warrior)",
-  "spring2026BranchRogueSet": "Spring Branch Set (Rogue)",
-  "spring2026SnowdropHealerSet": "Snowdrop Set (Healer)",
-  "spring2026MaypoleMageSet": "Maypole Set (Mage)",
+  "winter2024PeppermintBarkWarriorSet": "Peppermint Bark (Warrior)",
+  "winter2024NarwhalWizardMageSet": "Narwhal Wizard (Mage)",
+  "spring2024FluoriteWarriorSet": "Fluorite (Warrior)",
+  "spring2024HibiscusMageSet": "Hibiscus (Mage)",
+  "spring2024BluebirdHealerSet": "Bluebird (Healer)",
+  "spring2024MeltingSnowRogueSet": "Melting Snow (Rogue)",
+  "summer2024WhaleSharkWarriorSet": "Whale Shark (Warrior)",
+  "summer2024SeaAnemoneMageSet": "Sea Anemone (Mage)",
+  "summer2024SeaSnailHealerSet": "Sea Snail (Healer)",
+  "summer2024NudibranchRogueSet": "Nudibranch (Rogue)",
+  "fall2024FieryImpWarriorSet": "Fiery Imp (Warrior)",
+  "fall2024UnderworldSorcerorMageSet": "Underworld Sorceror (Mage)",
+  "fall2024SpaceInvaderHealerSet": "Space Invader (Healer)",
+  "fall2024BlackCatRogueSet": "Black Cat (Rogue)",
+  "winter2025MooseWarriorSet": "Moose (Warrior)",
+  "winter2025AuroraMageSet": "Aurora (Mage)",
+  "winter2025StringLightsHealerSet": "String Lights (Healer)",
+  "winter2025SnowRogueSet": "Snow (Rogue)",
+  "spring2025SunshineWarriorSet": "Sunshine (Warrior)",
+  "spring2025CrystalPointRogueSet": "Crystal Point (Rogue)",
+  "spring2025PlumeriaHealerSet": "Plumeria (Healer)",
+  "spring2025MantisMageSet": "Mantis (Mage)",
+  "summer2025ScallopWarriorSet": "Scallop (Warrior)",
+  "summer2025SquidRogueSet": "Squid (Rogue)",
+  "summer2025SeaAngelHealerSet": "Sea Angel (Healer)",
+  "summer2025FairyWrasseMageSet": "Fairy Wrasse (Mage)",
+  "fall2025SasquatchWarriorSet": "Sasquatch (Warrior)",
+  "fall2025SkeletonRogueSet": "Skeleton (Rogue)",
+  "fall2025KoboldHealerSet": "Kobold (Healer)",
+  "fall2025MaskedGhostMageSet": "Masked Ghost (Mage)",
+  "winter2026RimeReaperWarriorSet": "Rime Reaper (Warrior)",
+  "winter2026SkiRogueSet": "Ski (Rogue)",
+  "winter2026PolarBearHealerSet": "Polar Bear (Healer)",
+  "winter2026MidwinterCandleMageSet": "Midwinter Candle (Mage)",
+  "spring2026FrogWarriorSet": "Frog (Warrior)",
+  "spring2026BranchRogueSet": "Spring Branch (Rogue)",
+  "spring2026SnowdropHealerSet": "Snowdrop (Healer)",
+  "spring2026MaypoleMageSet": "Maypole (Mage)",
+  "summer2026AlligatorWarriorSet": "Alligator (Warrior)",
+  "summer2026PuffinHealerSet": "Puffin (Healer)",
+  "summer2026TigerSharkMageSet": "Tiger Shark (Mage)",
+  "summer2026TsunamiRogueSet": "Tsunami (Rogue)",
   "winterPromoGiftHeader": "GIFT A SUBSCRIPTION, GET ONE FREE!",
   "winterPromoGiftDetails1": "Until January 6th only, when you gift somebody a subscription, you get the same subscription for yourself for free!",
   "winterPromoGiftDetails2": "Please note that if you or your gift recipient already have a recurring subscription, the gifted subscription will only start after that subscription is cancelled or has expired. Thanks so much for your support! <3",

website/common/locales/en/settings.json

@@ -33,7 +33,7 @@
     "resetAccPop": "Start over, removing all levels, gold, gear, history, and tasks.",
     "deleteAccount": "Delete Account",
     "deleteAccPop": "Cancel and remove your Habitica account.",
-    "feedback": "If you'd like to give us feedback, please enter it below - we'd love to hear your feedback! It will be anonymous unless you choose to enter your contact details. Don't speak English well? No problem! Use the language you prefer.",
+    "feedback": "We'd love to hear your feedback! If you'd like to share any, enter it below. It will be anonymous unless you choose to include your contact details.",
     "feedbackPlaceholder": "Add your feedback",
     "dataExport": "Data Export",
     "saveData": "Here are a few options for saving your data.",
@@ -82,8 +82,8 @@
     "resetText2": "Another option is using an <b>Orb of Rebirth</b>, which will reset everything else while preserving your Tasks and Equipment.",
     "resetTextLocal": "If you're absolutely certain, type your password into the text box below.",
     "resetTextSocial": "If you're absolutely certain, type <b>\"<%= magicWord %>\"</b> into the text box below.",
-    "deleteLocalAccountText": "<b>Are you sure?</b> This will delete your account forever, and it can never be restored! You will need to register a new account to use Habitica again. Banked or spent Gems will not be refunded. If you're absolutely certain, type your password into the text box below.",
-    "deleteSocialAccountText": "<b>Are you sure?</b> This will delete your account forever, and it can never be restored! You will need to register a new account to use Habitica again. Banked or spent Gems will not be refunded. If you're absolutely certain, type <b>\"<%= magicWord %>\"</b> into the text box below.",
+    "deleteLocalAccountText": "<b>Are you sure?</b> This action is permanent. Deleting your account will remove all of your data, and it cannot be recovered. Gems will not be refunded.<br><br>Please allow up to 24 hours for account deletion to complete, and up to 30 days for analytics data to be removed if you opted in. Once complete, you'll be able to register for a new Habitica account using your previous login information.<br><br>To continue, type your password below.",
+    "deleteSocialAccountText": "<b>Are you sure?</b> This action is permanent. Deleting your account will remove all of your data, and it cannot be recovered. Gems will not be refunded.<br><br>Please allow up to 24 hours for account deletion to complete, and up to 30 days for analytics data to be removed if you opted in. Once complete, you'll be able to register for a new Habitica account using your previous login information.<br><br>To continue, type <%= magicWord %> below.",
     "API": "API",
     "APICopied": "API token copied to clipboard.",
     "APITokenTitle": "API Token",
@@ -163,7 +163,7 @@
     "generate": "Generate",
     "getCodes": "Get Codes",
     "webhooks": "Webhooks",
-    "webhooksInfo": "Webhooks provide a way for developers to receive notifications when a particular action is performed, such as scoring or updating a Task, or sending a message in a Group. By creating a webhook, you will be able to listen to changes in Habitica and build apps that respond to these changes.<br><br>For additional information and examples on webhooks, please visit our <a target=\"_blank\" href=\"https://habitica.com/apidoc/#api-Webhook-AddWebhook\">API Docs</a>.",
+    "webhooksInfo": "Webhooks provide a way for developers to receive notifications when a particular action is performed, such as scoring or updating a Task, or sending a message in a Group. By creating a webhook, you will be able to listen to changes in Habitica and build apps that respond to these changes.<br><br>For additional information and examples on webhooks, please visit our <a target=\"_blank\" href=\"https://apidoc.habitica.com/#api-Webhook-AddWebhook\">API Docs</a>.",
     "enabled": "Enabled",
     "webhookURL": "Webhook URL",
     "addWebhook": "Add Webhook",

website/common/locales/en/subscriber.json

@@ -186,6 +186,9 @@
     "mysterySet202603": "Wisteria Wizard Set",
     "mysterySet202604": "Audacious Astronaut Set",
     "mysterySet202605": "Nightfall Nimbus Set",
+    "mysterySet202606": "Holiday Hammock Set",
+    "mysterySet202607": "Oceanmancer Set",
+    "mysterySet202608": "Beaming Blades Set",
     "mysterySet301404": "Steampunk Standard Set",
     "mysterySet301405": "Steampunk Accessories Set",
     "mysterySet301703": "Peacock Steampunk Set",

website/common/locales/en/tasks.json

@@ -123,6 +123,16 @@
   "dayOfMonth": "Day of the Month",
   "month": "Month",
   "months": "Months",
+  "every": "every",
+  "everyDay": "every day",
+  "everyXDays": "every <%= count %> days",
+  "everyWeek": "every week",
+  "everyXWeeks": "every <%= count %> weeks",
+  "everyMonth": "every month",
+  "everyXMonths": "every <%= count %> months",
+  "everyYear": "every year",
+  "everyXYears": "every <%= count %> years",
+  "fifthWeekWarning": "This task <strong>will not</strong> appear due during months with fewer <%= day %>s",
   "week": "Week",
   "weeks": "Weeks",
   "year": "Year",

website/common/locales/en_GB/achievements.json

@@ -63,11 +63,11 @@
     "letsGetStarted": "Let's get started!",
     "onboardingProgress": "<%= percentage %>% progress",
     "gettingStartedDesc": "Complete these onboarding tasks and you’ll earn <strong>5 Achievements</strong> and <strong class=\"gold-amount\">100 Gold</strong> once you’re done!",
-    "achievementRosyOutlookModalText": "You tamed all the Cotton Candy Pink Mounts!",
-    "achievementRosyOutlookText": "Has tamed all Cotton Candy Pink Mounts.",
+    "achievementRosyOutlookModalText": "You tamed all the Candyfloss Pink Mounts!",
+    "achievementRosyOutlookText": "Has tamed all Candyfloss Pink Mounts.",
     "achievementRosyOutlook": "Rosy Outlook",
-    "achievementTickledPinkModalText": "You collected all the Cotton Candy Pink Pets!",
-    "achievementTickledPinkText": "Has collected all Cotton Candy Pink Pets.",
+    "achievementTickledPinkModalText": "You collected all the Candyfloss Pink Pets!",
+    "achievementTickledPinkText": "Has collected all Candyfloss Pink Pets.",
     "achievementTickledPink": "Tickled Pink",
     "foundNewItemsCTA": "Head to your Inventory and try combining your new hatching potion and egg!",
     "foundNewItemsExplanation": "Completing tasks gives you a chance to find items, like Eggs, Hatching Potions, and Pet Food.",
@@ -109,11 +109,11 @@
     "achievementSeasonalSpecialistModalText": "You completed all the seasonal quests!",
     "achievementSeasonalSpecialistText": "Has completed all the Spring and Winter seasonal quests: Egg Hunt, Trapper Santa, and Find the Cub!",
     "achievementSeasonalSpecialist": "Seasonal Specialist",
-    "achievementVioletsAreBlueText": "Has collected all Cotton Candy Blue Pets.",
-    "achievementVioletsAreBlueModalText": "You collected all the Cotton Candy Blue Pets!",
-    "achievementWildBlueYonderModalText": "You tamed all the Cotton Candy Blue Mounts!",
+    "achievementVioletsAreBlueText": "Has collected all Candyfloss Blue Pets.",
+    "achievementVioletsAreBlueModalText": "You collected all the Candyfloss Blue Pets!",
+    "achievementWildBlueYonderModalText": "You tamed all the Candyfloss Blue Mounts!",
     "achievementDomesticated": "E-I-E-I-O",
-    "achievementWildBlueYonderText": "Has tamed all Cotton Candy Blue Mounts.",
+    "achievementWildBlueYonderText": "Has tamed all Candyfloss Blue Mounts.",
     "achievementVioletsAreBlue": "Violets are Blue",
     "achievementWildBlueYonder": "Wild Blue Yonder",
     "achievementDomesticatedModalText": "You collected all the domesticated pets!",
@@ -123,7 +123,7 @@
     "achievementZodiacZookeeperText": "Has hatched all standard colours of zodiac pets: Rat, Cow, Bunny, Snake, Horse, Sheep, Monkey, Rooster, Wolf, Tiger, Flying Pig, and Dragon!",
     "achievementShadyCustomer": "Shady Customer",
     "achievementShadyCustomerText": "Has collected all Shade Pets.",
-    "achievementShadyCustomerModalText": "You colleted all the Shade Pets!",
+    "achievementShadyCustomerModalText": "You collected all the Shade Pets!",
     "achievementShadeOfItAll": "The Shade of It All",
     "achievementShadeOfItAllText": "Has tamed all Shade Mounts.",
     "achievementShadeOfItAllModalText": "You tamed all the Shade Mounts!",

website/common/locales/en_GB/backgrounds.json

@@ -37,7 +37,7 @@
     "backgroundHauntedHouseText": "Haunted House",
     "backgroundHauntedHouseNotes": "Sneak through a Haunted House.",
     "backgroundPumpkinPatchText": "Pumpkin Patch",
-    "backgroundPumpkinPatchNotes": "Carve jack-o-lanterns in a Pumpkin Patch.",
+    "backgroundPumpkinPatchNotes": "Carve jack-o'-lanterns in a Pumpkin Patch.",
     "backgrounds112014": "SET 6: Released November 2014",
     "backgroundHarvestFeastText": "Harvest Feast",
     "backgroundHarvestFeastNotes": "Enjoy a Harvest Feast.",
@@ -665,7 +665,7 @@
     "backgroundRopeBridgeText": "Rope Bridge",
     "backgrounds112021": "SET 90: Released November 2021",
     "backgroundFortuneTellersShopText": "Fortune Teller's Shop",
-    "backgroundFortuneTellersShopNotes": "Seek tantalizing hints of your future in a Fortune Teller's Shop.",
+    "backgroundFortuneTellersShopNotes": "Seek tantalising hints of your future in a Fortune Teller’s Shop.",
     "backgroundInsideAPotionBottleText": "Inside a Potion Bottle",
     "backgroundInsideAPotionBottleNotes": "Peer through the glass while hoping for rescue from Inside a Potion Bottle.",
     "backgroundSpiralStaircaseText": "Spiral Staircase",
@@ -865,8 +865,8 @@
     "backgroundSpectralCandleRoomNotes": "Commune with spirits in a Room of Spectral Candles.",
     "backgroundMonstrousCaveText": "Monstrous Cave",
     "backgroundMonstrousCaveNotes": "Gaze into the maw of the Monstrous Cave.",
-    "backgroundJackOLanternStacksText": "Jack O'Lantern Stacks",
-    "backgroundJackOLanternStacksNotes": "Admire a field of Jack O’Lantern Stacks.",
+    "backgroundJackOLanternStacksText": "Jack-o’-Lantern Stacks",
+    "backgroundJackOLanternStacksNotes": "Admire a field of Jack-o’-Lantern Stacks.",
     "backgrounds062024": "Set 121: Released June 2024",
     "backgroundShellGateText": "Shell Gate",
     "backgroundShellGateNotes": "March through the decorated coral of a Shell Gate.",
@@ -930,5 +930,25 @@
     "backgroundWinterDesertWithSaguarosText": "Winter Desert with Saguaros",
     "backgroundWinterDesertWithSaguarosNotes": "Breathe the crisp air of a Winter Desert with Saguaros.",
     "backgrounds022026": "SET 141: Released February 2026",
-    "backgroundElegantPalaceText": "Elegant Palace"
+    "backgroundElegantPalaceText": "Elegant Palace",
+    "backgroundWaterfallWithRainbowText": "Waterfall with Rainbow",
+    "backgroundWaterfallWithRainbowNotes": "Admire the breathtaking beauty of a Waterfall with a Rainbow.",
+    "backgroundRidingACometText": "Riding a Comet",
+    "backgrounds032026": "SET 142: Released March 2026",
+    "backgrounds042026": "SET 143: Released April 2026",
+    "backgroundRidingACometNotes": "Travel through space while Riding a Comet!",
+    "backgroundElvenCitadelText": "Elven Citadel",
+    "backgroundElvenCitadelNotes": "Take a scenic journey to an Elven Citadel.",
+    "backgrounds052026": "SET 144: Released May 2026",
+    "backgroundOnAStrangePlanetText": "On a Strange Planet",
+    "backgroundOnAStrangePlanetNotes": "Venture where no Habitican has gone before: On a Strange Planet.",
+    "backgroundBeachWithVolcanoText": "Beach with Volcano",
+    "backgrounds072026": "SET 146: Released July 2026",
+    "backgroundTropicalCoralGardenText": "Tropical Coral Garden",
+    "backgroundTropicalCoralGardenNotes": "Dive into a Tropical Coral Garden.",
+    "backgrounds082026": "SET 147: Released August 2026",
+    "backgroundVegetableGardenText": "Vegetable Garden",
+    "backgroundVegetableGardenNotes": "Plant tasty greens in a Vegetable Garden.",
+    "backgrounds062026": "SET 145: Released June 2026",
+    "backgroundBeachWithVolcanoNotes": "Watch nature’s wonder on a Beach with a Volcano."
 }

website/common/locales/en_GB/challenge.json

@@ -5,7 +5,7 @@
     "keepIt": "Keep It",
     "removeIt": "Remove It",
     "brokenChallenge": "Broken Challenge Link",
-    "challengeCompleted": "This challenge has been completed, and the winner was <span class=\"badge\"><%= user %></span>! What to do with the orphan tasks?",
+    "challengeCompleted": "Challenge Completed!",
     "unsubChallenge": "Broken Challenge Link: this task was part of a challenge, but you have unsubscribed from the challenge. What to do with the orphan tasks?",
     "challenges": "Challenges",
     "endDate": "Ends",
@@ -40,12 +40,12 @@
     "onlyGroupLeaderChal": "Only the group leader can create challenges",
     "tavChalsMinPrize": "Prize must be at least 1 Gem for Public Challenges.",
     "cantAfford": "You can't afford this prize. Purchase more gems or lower the prize amount.",
-    "challengeIdRequired": "\"challengeId\" must be a valid UUID.",
-    "winnerIdRequired": "\"winnerId\" must be a valid UUID.",
+    "challengeIdRequired": "“challengeId” must be a valid UUID.",
+    "winnerIdRequired": "“winnerId” must be a valid UUID.",
     "challengeNotFound": "Challenge not found or you don't have access.",
     "onlyLeaderDeleteChal": "Only the challenge leader can delete it.",
     "onlyLeaderUpdateChal": "Only the challenge leader can update it.",
-    "winnerNotFound": "Winner with id \"<%= userId %>\" not found or not part of the challenge.",
+    "winnerNotFound": "Winner with id “<%= userId %>” not found or not part of the challenge.",
     "onlyChalLeaderEditTasks": "Tasks belonging to a challenge can only be edited by the leader.",
     "userAlreadyInChallenge": "User is already participating in this challenge.",
     "cantOnlyUnlinkChalTask": "Only broken challenges tasks can be un-linked.",
@@ -103,11 +103,14 @@
     "flaggedAndHidden": "Challenge flagged and hidden",
     "messageChallengeFlagAlreadyReported": "You have already reported this Challenge.",
     "flaggedNotHidden": "Challenge flagged once, not hidden",
-    "cannotClone": "This Challenge cannot be cloned because one or more players have reported it as inappropriate. A staff member will contact you shortly with instructions. If over 48 hours have passed and you have not heard from them, please email admin@habitica.com for assistance.",
+    "cannotClone": "This Challenge cannot be cloned because one or more players have reported it as inappropriate. A staff member will contact you shortly with instructions. If over 48 hours have passed and you have not heard from them, please e-mail admin@habitica.com for assistance.",
     "resetFlags": "Reset Flags",
-    "cannotClose": "This Challenge cannot be closed because one or more players have reported it as inappropriate. A staff members will contact you shortly with instructions. If over 48 hours have passed and you have not heard from them, please email admin@habitica.com for assistance.",
+    "cannotClose": "This Challenge cannot be closed because one or more players have reported it as inappropriate. A staff members will contact you shortly with instructions. If over 48 hours have passed and you have not heard from them, please e-mail admin@habitica.com for assistance.",
     "abuseFlagModalBodyChallenge": "You should only report a Challenge that violates the <%= firstLinkStart %>Community Guidelines<%= linkEnd %> and/or <%= secondLinkStart %>Terms of Service<%= linkEnd %>. Submitting a false report is a violation of Habitica's Community Guidelines.",
     "cannotMakeChallenge": "You are unable to create public Challenges as your account currently does not have chat privileges. Please contact admin@habitica.com for more information.",
     "deleteChallengeRefundDescription": "If you delete this Challenge, you will be refunded the Gem prize and the Challenge tasks will remain on the participants' task boards.",
-    "brokenTask": "Broken Challenge Link"
+    "brokenTask": "Broken Challenge Link",
+    "brokenTaskDescription": "This task was part of a challenge, but has been removed from it. What would you like to do?",
+    "brokenChallengeDescription": "This task was part of a challenge, but the challenge (or group) has been deleted. What to do with the orphan tasks?",
+    "challengeCompletedDescription": "The winner was <%= user %>! What to do with the orphan tasks?"
 }

website/common/locales/en_GB/character.json

@@ -1,5 +1,5 @@
 {
-    "communityGuidelinesWarning": "Please keep in mind that your Display Name, profile photo, and blurb must comply with the <a href='https://habitica.com/static/community-guidelines' target='_blank'>Community Guidelines</a> (e.g. no profanity, no adult topics, no insults, etc). If you have any questions about whether or not something is appropriate, feel free to email <%= hrefBlankCommunityManagerEmail %>!",
+    "communityGuidelinesWarning": "Please keep in mind that your Display Name, profile photo, and blurb must comply with the <a href='https://habitica.com/static/community-guidelines' target='_blank'>Community Guidelines</a> (e.g. no profanity, no adult topics, no insults, etc). If you have any questions about whether or not something is appropriate, feel free to e-mail <%= hrefBlankCommunityManagerEmail %>!",
     "profile": "Profile",
     "avatar": "Customise Avatar",
     "editAvatar": "Customise Avatar",
@@ -56,14 +56,14 @@
     "autoEquipBattleGear": "Auto-equip new gear",
     "costume": "Costume",
     "useCostume": "Use Costume",
-    "costumePopoverText": "Select \"Use Costume\" to equip items to your avatar without affecting the Stats from your Battle Gear! This means that you can dress up your avatar in whatever outfit you like while still having your best Battle Gear equipped.",
+    "costumePopoverText": "Select “Use Costume” to equip items to your avatar without affecting the Stats from your Battle Gear! This means that you can dress up your avatar in whatever outfit you like while still having your best Battle Gear equipped.",
     "autoEquipPopoverText": "Select this option to automatically equip gear as soon as you purchase it.",
     "costumeDisabled": "You have disabled your costume.",
-    "gearAchievement": "You have earned the \"Ultimate Gear\" Achievement for upgrading to the maximum gear set for a class! You have attained the following complete sets:",
-    "gearAchievementNotification": "You have earned the \"Ultimate Gear\" Achievement for upgrading to the maximum gear set for a class!",
+    "gearAchievement": "You have earned the “Ultimate Gear” Achievement for upgrading to the maximum gear set for a class! You have attained the following complete sets:",
+    "gearAchievementNotification": "You have earned the “Ultimate Gear” Achievement for upgrading to the maximum gear set for a class!",
     "moreGearAchievements": "To attain more Ultimate Gear badges, change classes on <a href='/user/settings/site' target='_blank'>the Settings &gt; Site page</a> and buy your new class's gear!",
     "armoireUnlocked": "For more equipment, check out the <strong>Enchanted Armoire!</strong> Click on the Enchanted Armoire Reward for a random chance at special Equipment! It may also give you random XP or food items.",
-    "ultimGearName": "Ultimate Gear - <%= ultClass %>",
+    "ultimGearName": "Ultimate Gear—<%= ultClass %>",
     "ultimGearText": "Has upgraded to the maximum weapon and armour set for the <%= ultClass %> class.",
     "level": "Level",
     "levelUp": "Level Up!",
@@ -86,7 +86,7 @@
     "noMoreAllocate": "Now that you've hit level 100, you won't gain any more Stat Points. You can continue levelling up, or start a new adventure at level 1 by using the <a href='/shops/market'>Orb of Rebirth</a>.",
     "stats": "Stats",
     "strength": "Strength",
-    "strText": "Strength increases the chance of random \"critical hits\" and the Gold, Experience, and drop chance boost from them. It also helps deal damage to boss monsters.",
+    "strText": "Strength increases the chance of random “critical hits” and the Gold, Experience, and drop chance boost from them. It also helps deal damage to boss monsters.",
     "constitution": "Constitution",
     "conText": "Constitution reduces the damage you take from negative Habits and missed Dailies.",
     "perception": "Perception",
@@ -122,7 +122,7 @@
     "taskAllocationPop": "Assigns points based on the Strength, Intelligence, Constitution, and Perception categories associated with the tasks you complete",
     "distributePoints": "Distribute Unallocated Points",
     "distributePointsPop": "Assigns all unallocated Stat Points according to the selected allocation scheme.",
-    "warriorText": "Warriors score more and better \"critical hits\", which randomly give bonus Gold, Experience, and drop chance for scoring a task. They also deal heavy damage to boss monsters. Play a Warrior if you find motivation from unpredictable jackpot-style rewards, or want to dish out the hurt in boss Quests!",
+    "warriorText": "Warriors score more and better “critical hits”, which randomly give bonus Gold, Experience, and drop chance for scoring a task. They also deal heavy damage to boss monsters. Play a Warrior if you find motivation from unpredictable jackpot-style rewards, or want to dish out the hurt in boss Quests!",
     "wizardText": "Mages learn swiftly, gaining Experience and Levels faster than other classes. They also get a great deal of Mana for using special abilities. Play a Mage if you enjoy the tactical game aspects of Habitica, or if you are strongly motivated by levelling up and unlocking advanced features!",
     "mageText": "Mages learn swiftly, gaining Experience and Levels faster than other classes. They also get a great deal of Mana for using special abilities. Play a Mage if you enjoy the tactical game aspects of Habitica, or if you are strongly motivated by levelling up and unlocking advanced features!",
     "rogueText": "Rogues love to accumulate wealth, gaining more Gold than anyone else, and are adept at finding random items. Their iconic Stealth ability lets them duck the consequences of missed Dailies. Play a Rogue if you find strong motivation from Rewards and Achievements, striving for loot and badges!",
@@ -193,5 +193,12 @@
     "customizations": "Customisations",
     "skins": "Skins",
     "pointsAvailable": "Points Available",
-    "assignedStat": "Assigned Stat"
+    "assignedStat": "Assigned Stat",
+    "strTaskText": "Increases critical hit chance and damage when scoring tasks. Also increases damage dealt to Quest bosses.",
+    "perTaskText": "Increases item drop chance, daily item drop cap, task streak bonuses, and Gold earned when completing tasks.",
+    "autoAllocate": "Auto Allocate",
+    "allocationMethod": "Allocation Method",
+    "statAllocationInfo": "Each level earns you one point to assign to a Stat of your choice. You can do so manually, or let the game decide for you using one of the Automatic Allocation options.",
+    "conTaskText": "Reduces damage taken from missed Dailies and negative Habits. Does not reduce damage from Quest bosses.",
+    "intTaskText": "Increases Experience earned from tasks. Also increases your Mana cap and Mana regeneration rate."
 }

website/common/locales/en_GB/communityguidelines.json

@@ -12,10 +12,10 @@
     "commGuideList02C": "<strong>Do not post images or text that are violent, threatening, or sexually explicit/suggestive, or that promote discrimination, bigotry, racism, sexism, hatred, harassment or harm against any individual or group</strong>. Not even as a joke or meme. This includes slurs as well as statements. Not everyone has the same sense of humour, and so something that you consider a joke may be hurtful to another.",
     "commGuideList02D": "<strong>Be mindful that Habiticans are of all ages and backgrounds</strong>. Challenges and player profiles should not mention adult topics, use profanity, or promote contention or conflict.",
     "commGuideList02E": "<strong>If a staff member tells you that a term is disallowed on Habitica, even if it is a term that you did not realise was problematic, that decision is final.</strong> Additionally, slurs will be dealt with very severely, as they are also a violation of the Terms of Service.",
-    "commGuideList02G": "<strong>Comply immediately with any Staff request.</strong> This could include, but is not limited to, requesting you limit your posts in a particular space, editing your profile to remove unsuitable content, etc. Do not argue with Staff. If you have concerns or comments about Staff actions, email <a href='mailto:admin@habitica.com' target='_blank'>admin@habitica.com</a> to contact our community manager.",
+    "commGuideList02G": "<strong>Comply immediately with any Staff request.</strong> This could include, but is not limited to, requesting you limit your posts in a particular space, editing your profile to remove unsuitable content, etc. Do not argue with Staff. If you have concerns or comments about Staff actions, e-mail <a href='mailto:admin@habitica.com' target='_blank'>admin@habitica.com</a> to contact our community manager.",
     "commGuideList02J": "<strong>Do not spam</strong>. Spamming may include, but is not limited to: sending multiple unsolicited private messages, sending nonsensical messages, sending multiple promotional messages about a Party or Challenge, or creating multiple similar or low quality Challenges in a row. Staff has discretion to determine what messages are considered spamming.",
     "commGuideList02K": "<strong>Do not send links without explanation or context</strong>. If players clicking on a link will result in any benefit to you, you need to disclose that. This applies in messages as well as Challenges.",
-    "commGuideList02L": "<strong>We highly discourage the exchange of personal information--particularly information that can be used to identify you</strong>. Identifying information can include but is not limited to: your address, your email, and your password or API token. If you are asked for personal information in a Party chat or private message, we highly recommend that you do not respond, and alert the Staff by either reporting the message or contacting <a href='mailto:admin@habitica.com' target='_blank'>admin@habitica.com</a> with screenshots of the messages if more context is needed.",
+    "commGuideList02L": "<strong>We highly discourage the exchange of personal information—particularly information that can be used to identify you</strong>. Identifying information can include but is not limited to: your address, your e-mail, and your password or API token. If you are asked for personal information in a Party chat or private message, we highly recommend that you do not respond, and alert the Staff by either reporting the message or contacting <a href='mailto:admin@habitica.com' target='_blank'>admin@habitica.com</a> with screenshots of the messages if more context is needed.",
     "commGuidePara037": "<strong>No Guilds, Public or Private, should be created for the purpose of attacking any group or individual</strong>. Creating such a Guild is grounds for an instant ban. Fight bad habits, not your fellow adventurers!",
     "commGuideHeadingInfractionsEtc": "Infractions, Consequences, and Restoration",
     "commGuideHeadingInfractions": "Infractions",
@@ -27,21 +27,21 @@
     "commGuideList05A": "Other breaches of the Terms and Conditions not specified here",
     "commGuideList05B": "Hate Speech/Images, Harassment/Stalking, Cyber-Bullying, Flaming, and Trolling",
     "commGuideList05C": "Violation of Probation",
-    "commGuideList05D": "Impersonation of Staff - this includes claiming player-created spaces not affiliated with Habitica are official and/or moderated by Habitica or its Staff",
+    "commGuideList05D": "Impersonation of Staff—this includes claiming player-created spaces not affiliated with Habitica are official and/or moderated by Habitica or its Staff",
     "commGuideList05E": "Repeated Moderate Infractions",
     "commGuideList05F": "Creation of a duplicate account to avoid consequences",
     "commGuideList05G": "Intentional deception of Staff in order to avoid consequences or to get another user in trouble",
     "commGuideHeadingModerateInfractions": "Moderate Infractions",
     "commGuidePara054": "These infractions will have moderate consequences. When in conjunction with multiple infractions, the consequences may grow more severe.",
     "commGuidePara055": "The following are some examples of Moderate Infractions. This is not a comprehensive list.",
-    "commGuideList06A": "Ignoring, disrespecting or arguing with Staff. If you are concerned about one of the rules or the behavior of the staff, please contact us at <a href='mailto:admin@habitica.com' target='_blank'>admin@habitica.com</a>.",
+    "commGuideList06A": "Ignoring, disrespecting or arguing with Staff. If you are concerned about one of the rules or the behaviour of the staff, please contact us at <a href='mailto:admin@habitica.com' target='_blank'>admin@habitica.com</a>.",
     "commGuideList06C": "Intentionally flagging innocent Challenges, profiles, or messages.",
     "commGuideList06E": "Repeatedly Committing Minor Infractions",
     "commGuideHeadingMinorInfractions": "Minor Infractions",
     "commGuidePara056": "Minor Infractions, while discouraged, still have minor consequences. If they continue to occur, they can lead to more severe consequences over time. Minor infractions are typically first time violations of these Guidelines but may include other circumstances.",
     "commGuidePara057": "The following are some examples of Minor Infractions. This is not a comprehensive list.",
     "commGuideList07A": "First-time violation of Public Space Guidelines",
-    "commGuideList07B": "Any statements or actions that trigger a \"Please Don't\" from a Staff member. When you are asked not to do something publicly, this in itself can be a consequence. If Staff have to issue many of these corrections to the same person, it may count as a larger infraction",
+    "commGuideList07B": "Any statements or actions that trigger a “Please Don’t” from a Staff member. When you are asked not to do something publicly, this in itself can be a consequence. If Staff have to issue many of these corrections to the same person, it may count as a larger infraction.",
     "commGuidePara057A": "Some posts may be hidden because they contain sensitive information or might give people the wrong idea. Typically this does not count as an infraction, particularly not the first time it happens!",
     "commGuideHeadingConsequences": "Consequences",
     "commGuidePara059": "<strong>Community infractions have direct consequences.</strong> Some sample consequences are outlined below.",
@@ -58,20 +58,20 @@
     "commGuideList11E": "Edits of problematic content by Staff",
     "commGuideHeadingRestoration": "Restoration",
     "commGuidePara061": "Habitica is devoted to self-improvement, and we believe in second chances. <strong>If you commit an infraction and receive a consequence, view it as a chance to evaluate your actions and strive to be a better member of the community</strong>.",
-    "commGuidePara062": "<strong>If you wish to ask questions about your infraction or consequences, apologize, or make a plea for reinstatement, please contact us at <a href='mailto:admin@habitica.com' target='_blank'>admin@habitica.com</a> with your User ID or @username</strong>. It is <strong>your</strong> responsibility to reach out.",
+    "commGuidePara062": "<strong>If you wish to ask questions about your infraction or consequences, apologise, or make a plea for reinstatement, please contact us at <a href='mailto:admin@habitica.com' target='_blank'>admin@habitica.com</a> with your User ID or @username</strong>. It is <strong>your</strong> responsibility to reach out.",
     "commGuidePara063": "If you do not understand your consequences or the nature of your infraction, or if you have other questions related to the matter, you can contact the staff to discuss it at <a href='mailto:admin@habitica.com' target='_blank'>admin@habitica.com</a>. Cooperate with any restrictions which have been imposed, and endeavor to meet the requirements to have any penalties lifted.",
     "commGuideHeadingMeet": "Meet the Staff",
-    "commGuidePara007": "The Habitica Staff keep the app and sites running and can act as chat moderators. They have purple tags marked with crowns. Their title is \"Heroic\".",
+    "commGuidePara007": "The Habitica Staff keep the app and sites running and can act as chat moderators. They have purple tags marked with crowns. Their title is “Heroic”.",
     "commGuidePara009": "The current Staff Members are (from left to right):",
     "commGuideAKA": "<%= habitName %> aka <%= realName %>",
     "commGuideOnGitHub": "<%= gitHubName %> on GitHub",
     "commGuidePara011b": "on GitHub/Fandom",
     "commGuidePara011c": "on the Wiki",
     "commGuidePara011d": "on GitHub",
-    "commGuidePara013": "In a community as big as Habitica, players come and go, and sometimes a Staff member or moderator needs to lay down their noble mantle and relax. The following are Staff and Moderators Emeritus. They no longer act with the power of a Staff member or Moderator, but we would still like to honor their work!",
+    "commGuidePara013": "In a community as big as Habitica, players come and go, and sometimes a Staff member or moderator needs to lay down their noble mantle and relax. The following are Staff and Moderators Emeritus. They no longer act with the power of a Staff member or Moderator, but we would still like to honour their work!",
     "commGuidePara014": "Staff and Moderators Emeritus:",
     "commGuideHeadingFinal": "The Final Section",
-    "commGuidePara067": "So there you have it, brave Habitican -- the Community Guidelines! Wipe that sweat off of your brow and give yourself some EXP for reading it all. If you have any questions or concerns about these Community Guidelines, please reach out to us via <a href='mailto:admin@habitica.com' target='_blank'>admin@habitica.com</a> and we will be happy to help clarify things.",
+    "commGuidePara067": "So there you have it, brave Habitican—the Community Guidelines! Wipe that sweat off your brow and give yourself some EXP for reading it all. If you have any questions or concerns about these Community Guidelines, please reach out to us via <a href='mailto:admin@habitica.com' target='_blank'>admin@habitica.com</a> and we will be happy to help clarify things.",
     "commGuidePara068": "Now go forth, brave adventurer, and slay some Dailies!",
     "commGuideHeadingLinks": "Useful Links",
     "commGuideLink02": "<a href='https://habitica.fandom.com/wiki/Habitica_Wiki' target='_blank'>The Wiki</a>: the biggest collection of information about Habitica. Note that this space is unofficial, being hosted by Fandom and maintained by players.",