fix(auth): downgrade helmet

5.47.5
fix(auth): disable broken CSP for now
2026-04-22 02:59:28 -05:00 · 2026-04-10 11:42:27 -05:00 · 2026-04-09 12:54:31 -05:00 · 2026-04-09 12:44:27 -05:00 · 2026-04-08 15:35:47 -05:00 · 2026-04-08 15:35:47 -05:00
410 changed files with 8549 additions and 5288 deletions
@@ -75,7 +75,6 @@
  "S3_ACCESS_KEY_ID": "accessKeyId",
  "S3_BUCKET": "bucket",
  "S3_SECRET_ACCESS_KEY": "secretAccessKey",
-  "SESSION_SECRET_IV": "12345678912345678912345678912345",
  "SESSION_SECRET_KEY": "1234567891234567891234567891234567891234567891234567891234567891",
  "SESSION_SECRET": "YOUR SECRET HERE",
  "SITE_HTTP_AUTH_ENABLED": "false",
@@ -21,3 +21,4 @@ services:
      timeout: 30s
      start_period: 0s
      retries: 30
+  
@@ -1,12 +1,12 @@
 {
  "name": "habitica",
-  "version": "5.44.2",
+  "version": "5.47.5",
  "lockfileVersion": 3,
  "requires": true,
  "packages": {
    "": {
      "name": "habitica",
-      "version": "5.44.2",
+      "version": "5.47.5",
      "hasInstallScript": true,
      "dependencies": {
        "@babel/core": "^7.22.10",
@@ -44,7 +44,7 @@
        "gulp-filter": "^7.0.0",
        "gulp-imagemin": "^7.1.0",
        "gulp.spritesmith": "^6.13.0",
-        "habitica-markdown": "^3.0.0",
+        "habitica-markdown": "^4.1.0",
        "heapdump": "^0.3.15",
        "helmet": "^4.6.0",
        "in-app-purchase": "^1.11.3",
@@ -57,7 +57,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",
@@ -81,7 +81,6 @@
        "useragent": "^2.1.9",
        "uuid": "^9.0.0",
        "validator": "^13.11.0",
-        "webpack-bundle-analyzer": "^4.10.2",
        "winston": "^3.10.0",
        "winston-loggly-bulk": "^3.3.0",
        "xml2js": "^0.6.2"
@@ -105,6 +104,9 @@
        "npm": "^10"
      }
    },
+    "../habitica-markdown/habitica-markdown": {
+      "extraneous": true
+    },
    "node_modules/@aashutoshrathi/word-wrap": {
      "version": "1.2.6",
      "resolved": "https://registry.npmjs.org/@aashutoshrathi/word-wrap/-/word-wrap-1.2.6.tgz",
@@ -2621,6 +2623,19 @@
        "node": ">=12.0.0"
      }
    },
+    "node_modules/@google-cloud/trace-agent/node_modules/gcp-metadata": {
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/gcp-metadata/-/gcp-metadata-5.3.0.tgz",
+      "integrity": "sha512-FNTkdNEnBdlqF2oatizolQqNANMrcqJt6AAYt99B3y1aLLC8Hc5IOBb+ZnnzllodEEf6xMBp6wRcBbc16fa65w==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "gaxios": "^5.0.0",
+        "json-bigint": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
    "node_modules/@google-cloud/trace-agent/node_modules/lru-cache": {
      "version": "6.0.0",
      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
@@ -3049,9 +3064,9 @@
      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
    },
    "node_modules/@mongodb-js/saslprep": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/@mongodb-js/saslprep/-/saslprep-1.3.2.tgz",
-      "integrity": "sha512-QgA5AySqB27cGTXBFmnpifAi7HxoGUeezwo6p9dI03MuDB6Pp33zgclqVb6oVK3j6I9Vesg0+oojW2XxB59SGg==",
+      "version": "1.4.6",
+      "resolved": "https://registry.npmjs.org/@mongodb-js/saslprep/-/saslprep-1.4.6.tgz",
+      "integrity": "sha512-y+x3H1xBZd38n10NZF/rEBlvDOOMQ6LKUTHqr8R9VkJ+mmQOYtJFxIlkkK8fZrtOiL6VixbOBWMbZGBdal3Z1g==",
      "license": "MIT",
      "dependencies": {
        "sparse-bitfield": "^3.0.3"
@@ -3262,11 +3277,6 @@
      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
    },
-    "node_modules/@polka/url": {
-      "version": "1.0.0-next.25",
-      "resolved": "https://registry.npmjs.org/@polka/url/-/url-1.0.0-next.25.tgz",
-      "integrity": "sha512-j7P6Rgr3mmtdkeDGTe0E/aYyWEWVtc5yFXtHCRHs28/jptDEWfaVOc5T7cblqy1XKPPfCxJc/8DwQ5YgLOZOVQ=="
-    },
    "node_modules/@protobufjs/aspromise": {
      "version": "1.1.2",
      "resolved": "https://registry.npmjs.org/@protobufjs/aspromise/-/aspromise-1.1.2.tgz",
@@ -3929,17 +3939,6 @@
        "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0"
      }
    },
-    "node_modules/acorn-walk": {
-      "version": "8.3.3",
-      "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.3.3.tgz",
-      "integrity": "sha512-MxXdReSRhGO7VlFe1bRG/oI7/mdLV9B9JJT0N8vZOhF7gFRR5l3M8W9G8JxmKV+JC5mGqJ0QvqfSOLsCPa4nUw==",
-      "dependencies": {
-        "acorn": "^8.11.0"
-      },
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
    "node_modules/agent-base": {
      "version": "6.0.2",
      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz",
@@ -4167,6 +4166,12 @@
        "node": ">=14.0.0"
      }
    },
+    "node_modules/apidoc/node_modules/argparse": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
+      "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
+      "license": "Python-2.0"
+    },
    "node_modules/apidoc/node_modules/bootstrap": {
      "version": "3.4.1",
      "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-3.4.1.tgz",
@@ -4202,6 +4207,15 @@
        "url": "https://github.com/sponsors/isaacs"
      }
    },
+    "node_modules/apidoc/node_modules/linkify-it": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-3.0.3.tgz",
+      "integrity": "sha512-ynTsyrFSdE5oZ/O9GEf00kPngmOfVwazR5GKDq6EYfhlpFug3J2zybX56a2PRRpc9P+FuSoGNAwjlbDs9jJBPQ==",
+      "license": "MIT",
+      "dependencies": {
+        "uc.micro": "^1.0.1"
+      }
+    },
    "node_modules/apidoc/node_modules/lru-cache": {
      "version": "6.0.0",
      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
@@ -4213,6 +4227,22 @@
        "node": ">=10"
      }
    },
+    "node_modules/apidoc/node_modules/markdown-it": {
+      "version": "12.3.2",
+      "resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-12.3.2.tgz",
+      "integrity": "sha512-TchMembfxfNVpHkbtriWltGWc+m3xszaRD0CZup7GFFhzIgQqxIfn3eGj1yZpfuflzPvfkt611B2Q/Bsk1YnGg==",
+      "license": "MIT",
+      "dependencies": {
+        "argparse": "^2.0.1",
+        "entities": "~2.1.0",
+        "linkify-it": "^3.0.1",
+        "mdurl": "^1.0.1",
+        "uc.micro": "^1.0.5"
+      },
+      "bin": {
+        "markdown-it": "bin/markdown-it.js"
+      }
+    },
    "node_modules/apidoc/node_modules/nodemon": {
      "version": "2.0.22",
      "resolved": "https://registry.npmjs.org/nodemon/-/nodemon-2.0.22.tgz",
@@ -6282,6 +6312,7 @@
      "resolved": "https://registry.npmjs.org/bl/-/bl-2.2.1.tgz",
      "integrity": "sha512-6Pesp1w0DEX1N550i/uGV/TqucVL4AM/pgThFSN/Qq9si1/DF9aIHs1BxD8V/QU0HoeHO6cQRTAuYnLPKq1e4g==",
      "dev": true,
+      "license": "MIT",
      "dependencies": {
        "readable-stream": "^2.3.5",
        "safe-buffer": "^5.1.1"
@@ -6291,13 +6322,15 @@
      "version": "1.0.0",
      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
      "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
    },
    "node_modules/bl/node_modules/readable-stream": {
      "version": "2.3.8",
      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz",
      "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==",
      "dev": true,
+      "license": "MIT",
      "dependencies": {
        "core-util-is": "~1.0.0",
        "inherits": "~2.0.3",
@@ -6313,6 +6346,7 @@
      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
      "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
      "dev": true,
+      "license": "MIT",
      "dependencies": {
        "safe-buffer": "~5.1.0"
      }
@@ -7717,11 +7751,6 @@
      "resolved": "https://registry.npmjs.org/data-uri-to-buffer/-/data-uri-to-buffer-0.0.3.tgz",
      "integrity": "sha512-Cp+jOa8QJef5nXS5hU7M1DWzXPEIoVR3kbV0dQuVGwROZg8bGf1DcCnkmajBTnvghTtSNMUdRrPjgaT6ZQucbw=="
    },
-    "node_modules/debounce": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/debounce/-/debounce-1.2.1.tgz",
-      "integrity": "sha512-XRRe6Glud4rd/ZGQfiV1ruXSfbvfJedlV9Y6zOlP+2K04vBYiJEte6stfFkCP03aMnY5tsipamumUjL14fofug=="
-    },
    "node_modules/debug": {
      "version": "4.4.3",
      "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz",
@@ -11195,18 +11224,6 @@
        "node": ">=12"
      }
    },
-    "node_modules/gcp-metadata": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/gcp-metadata/-/gcp-metadata-5.3.0.tgz",
-      "integrity": "sha512-FNTkdNEnBdlqF2oatizolQqNANMrcqJt6AAYt99B3y1aLLC8Hc5IOBb+ZnnzllodEEf6xMBp6wRcBbc16fa65w==",
-      "dependencies": {
-        "gaxios": "^5.0.0",
-        "json-bigint": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=12"
-      }
-    },
    "node_modules/gensync": {
      "version": "1.0.0-beta.2",
      "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz",
@@ -11950,6 +11967,19 @@
        "node": ">=12"
      }
    },
+    "node_modules/google-auth-library/node_modules/gcp-metadata": {
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/gcp-metadata/-/gcp-metadata-5.3.0.tgz",
+      "integrity": "sha512-FNTkdNEnBdlqF2oatizolQqNANMrcqJt6AAYt99B3y1aLLC8Hc5IOBb+ZnnzllodEEf6xMBp6wRcBbc16fa65w==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "gaxios": "^5.0.0",
+        "json-bigint": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
    "node_modules/google-auth-library/node_modules/lru-cache": {
      "version": "6.0.0",
      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
@@ -12482,65 +12512,16 @@
        "node": ">= 0.10"
      }
    },
-    "node_modules/gzip-size": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/gzip-size/-/gzip-size-6.0.0.tgz",
-      "integrity": "sha512-ax7ZYomf6jqPTQ4+XCpUGyXKHk5WweS+e05MBO4/y3WJ5RkmPXNKvX+bx1behVILVwr6JSQvZAku021CHPXG3Q==",
-      "dependencies": {
-        "duplexer": "^0.1.2"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
    "node_modules/habitica-markdown": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/habitica-markdown/-/habitica-markdown-3.0.0.tgz",
-      "integrity": "sha512-rw1LJ5Vsjx8sfjNa4e2wFuZf5eqqyb5/kfZXPxqfMMgJCCgIhWStDqY3nIclnpGWpemlKd+qbdh2rLiLgm9kng==",
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/habitica-markdown/-/habitica-markdown-4.1.0.tgz",
+      "integrity": "sha512-iqiFT8BbuWIrrs6v9eIXSG7UfWOBdJVGDi9FjGiFFOe8+dOPi62yyXhm81vrx79/5Y2s+jG+7LItyaemD310uQ==",
+      "license": "GPL-3.0",
      "dependencies": {
-        "habitica-markdown-emoji": "1.2.4",
-        "markdown-it": "10.0.0",
-        "markdown-it-link-attributes": "3.0.0",
-        "markdown-it-linkify-images": "^1.1.1"
-      }
-    },
-    "node_modules/habitica-markdown-emoji": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/habitica-markdown-emoji/-/habitica-markdown-emoji-1.2.4.tgz",
-      "integrity": "sha512-UV0AxpDToldFQULuhTxC1y4sdNTApaIOh7ZuV/92HCPmCGkv3DAlHtYE67OmCqLVfs26HWAGVJaU3+OEnW3gjg==",
-      "dependencies": {
-        "markdown-it-emoji": "^1.1.1"
-      }
-    },
-    "node_modules/habitica-markdown/node_modules/entities": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/entities/-/entities-2.0.3.tgz",
-      "integrity": "sha512-MyoZ0jgnLvB2X3Lg5HqpFmn1kybDiIfEQmKzTb5apr51Rb+T3KdmMiqa70T+bhGnyv7bQ6WMj2QMHpGMmlrUYQ=="
-    },
-    "node_modules/habitica-markdown/node_modules/linkify-it": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-2.2.0.tgz",
-      "integrity": "sha512-GnAl/knGn+i1U/wjBz3akz2stz+HrHLsxMwHQGofCDfPvlf+gDKN58UtfmUquTY4/MXeE2x7k19KQmeoZi94Iw==",
-      "dependencies": {
-        "uc.micro": "^1.0.1"
-      }
-    },
-    "node_modules/habitica-markdown/node_modules/markdown-it": {
-      "version": "10.0.0",
-      "resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-10.0.0.tgz",
-      "integrity": "sha512-YWOP1j7UbDNz+TumYP1kpwnP0aEa711cJjrAQrzd0UXlbJfc5aAq0F/PZHjiioqDC1NKgvIMX+o+9Bk7yuM2dg==",
-      "dependencies": {
-        "argparse": "^1.0.7",
-        "entities": "~2.0.0",
-        "linkify-it": "^2.0.0",
-        "mdurl": "^1.0.1",
-        "uc.micro": "^1.0.5"
-      },
-      "bin": {
-        "markdown-it": "bin/markdown-it.js"
+        "markdown-it": "^14.0.0",
+        "markdown-it-emoji": "^2.0.2",
+        "markdown-it-link-attributes": "^4.0.1",
+        "markdown-it-linkify-images": "^3.0.0"
      }
    },
    "node_modules/handlebars": {
@@ -12820,6 +12801,7 @@
      "version": "4.6.0",
      "resolved": "https://registry.npmjs.org/helmet/-/helmet-4.6.0.tgz",
      "integrity": "sha512-HVqALKZlR95ROkrnesdhbbZJFi/rIVSoNq6f3jA/9u6MIbTsPh3xZwihjeI5+DO/2sOV6HMHooXcEOuwskHpTg==",
+      "license": "MIT",
      "engines": {
        "node": ">=10.0.0"
      }
@@ -12872,7 +12854,8 @@
    "node_modules/html-escaper": {
      "version": "2.0.2",
      "resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz",
-      "integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg=="
+      "integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==",
+      "dev": true
    },
    "node_modules/http-cache-semantics": {
      "version": "4.1.1",
@@ -14552,13 +14535,20 @@
      "integrity": "sha512-FWWMIEOxz3GwUI4Ts/IvgVy6LPvoMPgjMdQ185nN6psJyBJ4yOpzqm695/h5umdLJg2vW3GR5iG11MAkR2AzJA=="
    },
    "node_modules/linkify-it": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-3.0.3.tgz",
-      "integrity": "sha512-ynTsyrFSdE5oZ/O9GEf00kPngmOfVwazR5GKDq6EYfhlpFug3J2zybX56a2PRRpc9P+FuSoGNAwjlbDs9jJBPQ==",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-5.0.0.tgz",
+      "integrity": "sha512-5aHCbzQRADcdP+ATqnDuhhJ/MRIqDkZX5pyjFHRRysS8vZ5AbqGEoFIb6pYHPZ+L/OC2Lc+xT8uHVVR5CAK/wQ==",
+      "license": "MIT",
      "dependencies": {
-        "uc.micro": "^1.0.1"
+        "uc.micro": "^2.0.0"
      }
    },
+    "node_modules/linkify-it/node_modules/uc.micro": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/uc.micro/-/uc.micro-2.1.0.tgz",
+      "integrity": "sha512-ARDJmphmdvUk6Glw7y9DQ2bFkKBHwQHLi2lsaH6PPmz/Ka9sFOBsBluozhDltWmnv9u/cF6Rt87znRTPV+yp/A==",
+      "license": "MIT"
+    },
    "node_modules/load-json-file": {
      "version": "1.1.0",
      "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz",
@@ -14906,59 +14896,79 @@
      }
    },
    "node_modules/markdown-it": {
-      "version": "12.3.2",
-      "resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-12.3.2.tgz",
-      "integrity": "sha512-TchMembfxfNVpHkbtriWltGWc+m3xszaRD0CZup7GFFhzIgQqxIfn3eGj1yZpfuflzPvfkt611B2Q/Bsk1YnGg==",
+      "version": "14.1.0",
+      "resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-14.1.0.tgz",
+      "integrity": "sha512-a54IwgWPaeBCAAsv13YgmALOF1elABB08FxO9i+r4VFk5Vl4pKokRPeX8u5TCgSsPi6ec1otfLjdOpVcgbpshg==",
+      "license": "MIT",
      "dependencies": {
        "argparse": "^2.0.1",
-        "entities": "~2.1.0",
-        "linkify-it": "^3.0.1",
-        "mdurl": "^1.0.1",
-        "uc.micro": "^1.0.5"
+        "entities": "^4.4.0",
+        "linkify-it": "^5.0.0",
+        "mdurl": "^2.0.0",
+        "punycode.js": "^2.3.1",
+        "uc.micro": "^2.1.0"
      },
      "bin": {
-        "markdown-it": "bin/markdown-it.js"
+        "markdown-it": "bin/markdown-it.mjs"
      }
    },
    "node_modules/markdown-it-emoji": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/markdown-it-emoji/-/markdown-it-emoji-1.4.0.tgz",
-      "integrity": "sha512-QCz3Hkd+r5gDYtS2xsFXmBYrgw6KuWcJZLCEkdfAuwzZbShCmCfta+hwAMq4NX/4xPzkSHduMKgMkkPUJxSXNg=="
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/markdown-it-emoji/-/markdown-it-emoji-2.0.2.tgz",
+      "integrity": "sha512-zLftSaNrKuYl0kR5zm4gxXjHaOI3FAOEaloKmRA5hijmJZvSjmxcokOLlzycb/HXlUFWzXqpIEoyEMCE4i9MvQ==",
+      "license": "MIT"
    },
    "node_modules/markdown-it-link-attributes": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/markdown-it-link-attributes/-/markdown-it-link-attributes-3.0.0.tgz",
-      "integrity": "sha512-B34ySxVeo6MuEGSPCWyIYryuXINOvngNZL87Mp7YYfKIf6DcD837+lXA8mo6EBbauKsnGz22ZH0zsbOiQRWTNg=="
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/markdown-it-link-attributes/-/markdown-it-link-attributes-4.0.1.tgz",
+      "integrity": "sha512-pg5OK0jPLg62H4k7M9mRJLT61gUp9nvG0XveKYHMOOluASo9OEF13WlXrpAp2aj35LbedAy3QOCgQCw0tkLKAQ==",
+      "license": "MIT"
    },
    "node_modules/markdown-it-linkify-images": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/markdown-it-linkify-images/-/markdown-it-linkify-images-1.1.1.tgz",
-      "integrity": "sha512-1IEmAaAjIgAwY+tZI0sxDXdy9QKHutj5cN0lH2JBiSZt+2NYKrWRJj0cloQW3OFIfP2MLFA1E+6OLJhXPiLgNw==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/markdown-it-linkify-images/-/markdown-it-linkify-images-3.0.0.tgz",
+      "integrity": "sha512-Vs5yGJa5MWjFgytzgtn8c1U6RcStj3FZKhhx459U8dYbEE5FTWZ6mMRkYMiDlkFO0j4VCsQT1LT557bY0ETgtg==",
+      "license": "MIT",
      "dependencies": {
-        "markdown-it": "^8.4.2"
+        "markdown-it": "^13.0.1"
      }
    },
+    "node_modules/markdown-it-linkify-images/node_modules/argparse": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
+      "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
+      "license": "Python-2.0"
+    },
    "node_modules/markdown-it-linkify-images/node_modules/entities": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/entities/-/entities-1.1.2.tgz",
-      "integrity": "sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w=="
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/entities/-/entities-3.0.1.tgz",
+      "integrity": "sha512-WiyBqoomrwMdFG1e0kqvASYfnlb0lp8M5o5Fw2OFq1hNZxxcNk8Ik0Xm7LxzBhuidnZB/UtBqVCgUz3kBOP51Q==",
+      "license": "BSD-2-Clause",
+      "engines": {
+        "node": ">=0.12"
+      },
+      "funding": {
+        "url": "https://github.com/fb55/entities?sponsor=1"
+      }
    },
    "node_modules/markdown-it-linkify-images/node_modules/linkify-it": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-2.2.0.tgz",
-      "integrity": "sha512-GnAl/knGn+i1U/wjBz3akz2stz+HrHLsxMwHQGofCDfPvlf+gDKN58UtfmUquTY4/MXeE2x7k19KQmeoZi94Iw==",
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-4.0.1.tgz",
+      "integrity": "sha512-C7bfi1UZmoj8+PQx22XyeXCuBlokoyWQL5pWSP+EI6nzRylyThouddufc2c1NDIcP9k5agmN9fLpA7VNJfIiqw==",
+      "license": "MIT",
      "dependencies": {
        "uc.micro": "^1.0.1"
      }
    },
    "node_modules/markdown-it-linkify-images/node_modules/markdown-it": {
-      "version": "8.4.2",
-      "resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-8.4.2.tgz",
-      "integrity": "sha512-GcRz3AWTqSUphY3vsUqQSFMbgR38a4Lh3GWlHRh/7MRwz8mcu9n2IO7HOh+bXHrR9kOPDl5RNCaEsrneb+xhHQ==",
+      "version": "13.0.2",
+      "resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-13.0.2.tgz",
+      "integrity": "sha512-FtwnEuuK+2yVU7goGn/MJ0WBZMM9ZPgU9spqlFs7/A/pDIUNSOQZhUgOqYCficIuR2QaFnrt8LHqBWsbTAoI5w==",
+      "license": "MIT",
      "dependencies": {
-        "argparse": "^1.0.7",
-        "entities": "~1.1.1",
-        "linkify-it": "^2.0.0",
+        "argparse": "^2.0.1",
+        "entities": "~3.0.1",
+        "linkify-it": "^4.0.1",
        "mdurl": "^1.0.1",
        "uc.micro": "^1.0.5"
      },
@@ -14969,7 +14979,32 @@
    "node_modules/markdown-it/node_modules/argparse": {
      "version": "2.0.1",
      "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
-      "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q=="
+      "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
+      "license": "Python-2.0"
+    },
+    "node_modules/markdown-it/node_modules/entities": {
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz",
+      "integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==",
+      "license": "BSD-2-Clause",
+      "engines": {
+        "node": ">=0.12"
+      },
+      "funding": {
+        "url": "https://github.com/fb55/entities?sponsor=1"
+      }
+    },
+    "node_modules/markdown-it/node_modules/mdurl": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/mdurl/-/mdurl-2.0.0.tgz",
+      "integrity": "sha512-Lf+9+2r+Tdp5wXDXC4PcIBjTDtq4UKjCPMQhKIuzpJNW0b96kVqSwW0bT7FhRSfmAiFYgP+SCRvdrDozfh0U5w==",
+      "license": "MIT"
+    },
+    "node_modules/markdown-it/node_modules/uc.micro": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/uc.micro/-/uc.micro-2.1.0.tgz",
+      "integrity": "sha512-ARDJmphmdvUk6Glw7y9DQ2bFkKBHwQHLi2lsaH6PPmz/Ka9sFOBsBluozhDltWmnv9u/cF6Rt87znRTPV+yp/A==",
+      "license": "MIT"
    },
    "node_modules/matchdep": {
      "version": "2.0.0",
@@ -15506,128 +15541,14 @@
      }
    },
    "node_modules/mongodb": {
-      "version": "3.7.4",
-      "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-3.7.4.tgz",
-      "integrity": "sha512-K5q8aBqEXMwWdVNh94UQTwZ6BejVbFhh1uB6c5FKtPE9eUMZPUO3sRZdgIEcHSrAWmxzpG/FeODDKL388sqRmw==",
-      "dev": true,
-      "dependencies": {
-        "bl": "^2.2.1",
-        "bson": "^1.1.4",
-        "denque": "^1.4.1",
-        "optional-require": "^1.1.8",
-        "safe-buffer": "^5.1.2"
-      },
-      "engines": {
-        "node": ">=4"
-      },
-      "optionalDependencies": {
-        "saslprep": "^1.0.0"
-      },
-      "peerDependenciesMeta": {
-        "aws4": {
-          "optional": true
-        },
-        "bson-ext": {
-          "optional": true
-        },
-        "kerberos": {
-          "optional": true
-        },
-        "mongodb-client-encryption": {
-          "optional": true
-        },
-        "mongodb-extjson": {
-          "optional": true
-        },
-        "snappy": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/mongodb-connection-string-url": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/mongodb-connection-string-url/-/mongodb-connection-string-url-3.0.2.tgz",
-      "integrity": "sha512-rMO7CGo/9BFwyZABcKAWL8UJwH/Kc2x0g72uhDWzG48URRax5TCIcJ7Rc3RZqffZzO/Gwff/jyKwCU9TN8gehA==",
+      "version": "6.20.0",
+      "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-6.20.0.tgz",
+      "integrity": "sha512-Tl6MEIU3K4Rq3TSHd+sZQqRBoGlFsOgNrH5ltAcFBV62Re3Fd+FcaVf8uSEQFOJ51SDowDVttBTONMfoYWrWlQ==",
      "license": "Apache-2.0",
      "dependencies": {
-        "@types/whatwg-url": "^11.0.2",
-        "whatwg-url": "^14.1.0 || ^13.0.0"
-      }
-    },
-    "node_modules/mongodb-connection-string-url/node_modules/tr46": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/tr46/-/tr46-5.0.0.tgz",
-      "integrity": "sha512-tk2G5R2KRwBd+ZN0zaEXpmzdKyOYksXwywulIX95MBODjSzMIuQnQ3m8JxgbhnL1LeVo7lqQKsYa1O3Htl7K5g==",
-      "license": "MIT",
-      "dependencies": {
-        "punycode": "^2.3.1"
-      },
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/mongodb-connection-string-url/node_modules/webidl-conversions": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-7.0.0.tgz",
-      "integrity": "sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g==",
-      "license": "BSD-2-Clause",
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/mongodb-connection-string-url/node_modules/whatwg-url": {
-      "version": "14.1.0",
-      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-14.1.0.tgz",
-      "integrity": "sha512-jlf/foYIKywAt3x/XWKZ/3rz8OSJPiWktjmk891alJUEjiVxKX9LEO92qH3hv4aJ0mN3MWPvGMCy8jQi95xK4w==",
-      "license": "MIT",
-      "dependencies": {
-        "tr46": "^5.0.0",
-        "webidl-conversions": "^7.0.0"
-      },
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/mongodb/node_modules/bson": {
-      "version": "1.1.6",
-      "resolved": "https://registry.npmjs.org/bson/-/bson-1.1.6.tgz",
-      "integrity": "sha512-EvVNVeGo4tHxwi8L6bPj3y3itEvStdwvvlojVxxbyYfoaxJ6keLgrTuKdyfEAszFK+H3olzBuafE0yoh0D1gdg==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.6.19"
-      }
-    },
-    "node_modules/mongoose": {
-      "version": "8.9.7",
-      "resolved": "https://registry.npmjs.org/mongoose/-/mongoose-8.9.7.tgz",
-      "integrity": "sha512-mvNXmU0V8qZzMR/qoK2mjT4Ti2ALdtfS0teK+twxhlGkwzOD76V02/zWajTu2MJ7QyEmZe9OWvnJsIY0iAuX3Q==",
-      "license": "MIT",
-      "dependencies": {
-        "bson": "^6.10.1",
-        "kareem": "2.6.3",
-        "mongodb": "~6.12.0",
-        "mpath": "0.9.0",
-        "mquery": "5.0.0",
-        "ms": "2.1.3",
-        "sift": "17.1.3"
-      },
-      "engines": {
-        "node": ">=16.20.1"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/mongoose"
-      }
-    },
-    "node_modules/mongoose/node_modules/mongodb": {
-      "version": "6.12.0",
-      "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-6.12.0.tgz",
-      "integrity": "sha512-RM7AHlvYfS7jv7+BXund/kR64DryVI+cHbVAy9P61fnb1RcWZqOW1/Wj2YhqMCx+MuYhqTRGv7AwHBzmsCKBfA==",
-      "license": "Apache-2.0",
-      "dependencies": {
-        "@mongodb-js/saslprep": "^1.1.9",
-        "bson": "^6.10.1",
-        "mongodb-connection-string-url": "^3.0.0"
+        "@mongodb-js/saslprep": "^1.3.0",
+        "bson": "^6.10.4",
+        "mongodb-connection-string-url": "^3.0.2"
      },
      "engines": {
        "node": ">=16.20.1"
@@ -15638,7 +15559,7 @@
        "gcp-metadata": "^5.2.0",
        "kerberos": "^2.0.1",
        "mongodb-client-encryption": ">=6.0.0 <7",
-        "snappy": "^7.2.2",
+        "snappy": "^7.3.2",
        "socks": "^2.7.1"
      },
      "peerDependenciesMeta": {
@@ -15665,6 +15586,72 @@
        }
      }
    },
+    "node_modules/mongodb-connection-string-url": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/mongodb-connection-string-url/-/mongodb-connection-string-url-3.0.2.tgz",
+      "integrity": "sha512-rMO7CGo/9BFwyZABcKAWL8UJwH/Kc2x0g72uhDWzG48URRax5TCIcJ7Rc3RZqffZzO/Gwff/jyKwCU9TN8gehA==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@types/whatwg-url": "^11.0.2",
+        "whatwg-url": "^14.1.0 || ^13.0.0"
+      }
+    },
+    "node_modules/mongodb-connection-string-url/node_modules/tr46": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/tr46/-/tr46-5.1.1.tgz",
+      "integrity": "sha512-hdF5ZgjTqgAntKkklYw0R03MG2x/bSzTtkxmIRw/sTNV8YXsCJ1tfLAX23lhxhHJlEf3CRCOCGGWw3vI3GaSPw==",
+      "license": "MIT",
+      "dependencies": {
+        "punycode": "^2.3.1"
+      },
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/mongodb-connection-string-url/node_modules/webidl-conversions": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-7.0.0.tgz",
+      "integrity": "sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g==",
+      "license": "BSD-2-Clause",
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/mongodb-connection-string-url/node_modules/whatwg-url": {
+      "version": "14.2.0",
+      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-14.2.0.tgz",
+      "integrity": "sha512-De72GdQZzNTUBBChsXueQUnPKDkg/5A5zp7pFDuQAj5UFoENpiACU0wlCvzpAGnTkj++ihpKwKyYewn/XNUbKw==",
+      "license": "MIT",
+      "dependencies": {
+        "tr46": "^5.1.0",
+        "webidl-conversions": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/mongoose": {
+      "version": "8.23.0",
+      "resolved": "https://registry.npmjs.org/mongoose/-/mongoose-8.23.0.tgz",
+      "integrity": "sha512-Bul4Ha6J8IqzFrb0B1xpVzkC3S0sk43dmLSnhFOn8eJlZiLwL5WO6cRymmjaADdCMjUcCpj2ce8hZI6O4ZFSug==",
+      "license": "MIT",
+      "dependencies": {
+        "bson": "^6.10.4",
+        "kareem": "2.6.3",
+        "mongodb": "~6.20.0",
+        "mpath": "0.9.0",
+        "mquery": "5.0.0",
+        "ms": "2.1.3",
+        "sift": "17.1.3"
+      },
+      "engines": {
+        "node": ">=16.20.1"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/mongoose"
+      }
+    },
    "node_modules/mongoose/node_modules/ms": {
      "version": "2.1.3",
      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
@@ -15724,6 +15711,56 @@
      "integrity": "sha512-jSTz73B/+pGTTvhu5Ym8xsG6+QqaWab53UXnXdNNlTijTdLvcHABCLJXudQiJxob5N1Mzr5EOSx5ziwn2sihPQ==",
      "dev": true
    },
+    "node_modules/monk/node_modules/bson": {
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/bson/-/bson-1.1.6.tgz",
+      "integrity": "sha512-EvVNVeGo4tHxwi8L6bPj3y3itEvStdwvvlojVxxbyYfoaxJ6keLgrTuKdyfEAszFK+H3olzBuafE0yoh0D1gdg==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "engines": {
+        "node": ">=0.6.19"
+      }
+    },
+    "node_modules/monk/node_modules/mongodb": {
+      "version": "3.7.4",
+      "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-3.7.4.tgz",
+      "integrity": "sha512-K5q8aBqEXMwWdVNh94UQTwZ6BejVbFhh1uB6c5FKtPE9eUMZPUO3sRZdgIEcHSrAWmxzpG/FeODDKL388sqRmw==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "bl": "^2.2.1",
+        "bson": "^1.1.4",
+        "denque": "^1.4.1",
+        "optional-require": "^1.1.8",
+        "safe-buffer": "^5.1.2"
+      },
+      "engines": {
+        "node": ">=4"
+      },
+      "optionalDependencies": {
+        "saslprep": "^1.0.0"
+      },
+      "peerDependenciesMeta": {
+        "aws4": {
+          "optional": true
+        },
+        "bson-ext": {
+          "optional": true
+        },
+        "kerberos": {
+          "optional": true
+        },
+        "mongodb-client-encryption": {
+          "optional": true
+        },
+        "mongodb-extjson": {
+          "optional": true
+        },
+        "snappy": {
+          "optional": true
+        }
+      }
+    },
    "node_modules/morgan": {
      "version": "1.10.1",
      "resolved": "https://registry.npmjs.org/morgan/-/morgan-1.10.1.tgz",
@@ -15801,14 +15838,6 @@
        "node": ">=14.0.0"
      }
    },
-    "node_modules/mrmime": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/mrmime/-/mrmime-2.0.0.tgz",
-      "integrity": "sha512-eu38+hdgojoyq63s+yTpN4XMBdt5l8HhMhc4VKLO9KM5caLIBvUm4thi7fFaxyTmCKeNnXZ5pAlBwCUnhA09uw==",
-      "engines": {
-        "node": ">=10"
-      }
-    },
    "node_modules/ms": {
      "version": "2.1.2",
      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
@@ -17077,19 +17106,12 @@
        "url": "https://github.com/sponsors/sindresorhus"
      }
    },
-    "node_modules/opener": {
-      "version": "1.5.2",
-      "resolved": "https://registry.npmjs.org/opener/-/opener-1.5.2.tgz",
-      "integrity": "sha512-ur5UIdyw5Y7yEj9wLzhqXiy6GZ3Mwx0yGI+5sMn2r0N0v3cKJvUmFH5yPP+WXh9e0xfyzyJX95D8l088DNFj7A==",
-      "bin": {
-        "opener": "bin/opener-bin.js"
-      }
-    },
    "node_modules/optional-require": {
-      "version": "1.1.8",
-      "resolved": "https://registry.npmjs.org/optional-require/-/optional-require-1.1.8.tgz",
-      "integrity": "sha512-jq83qaUb0wNg9Krv1c5OQ+58EK+vHde6aBPzLvPPqJm89UQWsvSuFy9X/OSNJnFeSOKo7btE0n8Nl2+nE+z5nA==",
+      "version": "1.1.10",
+      "resolved": "https://registry.npmjs.org/optional-require/-/optional-require-1.1.10.tgz",
+      "integrity": "sha512-0r3OB9EIQsP+a5HVATHq2ExIy2q/Vaffoo4IAikW1spCYswhLxqWQS0i3GwS3AdY/OIP4SWZHLGz8CMU558PGw==",
      "dev": true,
+      "license": "Apache-2.0",
      "dependencies": {
        "require-at": "^1.0.6"
      },
@@ -18049,6 +18071,15 @@
        "node": ">=6"
      }
    },
+    "node_modules/punycode.js": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/punycode.js/-/punycode.js-2.3.1.tgz",
+      "integrity": "sha512-uxFIHU0YlHYhDQtV4R9J6a52SLx28BCjT+4ieh7IGbgwVJWO+km431c4yRlREUAsAmt/uMjQUyQHNEPf0M39CA==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      }
+    },
    "node_modules/q": {
      "version": "1.5.1",
      "resolved": "https://registry.npmjs.org/q/-/q-1.5.1.tgz",
@@ -18562,6 +18593,7 @@
      "resolved": "https://registry.npmjs.org/require-at/-/require-at-1.0.6.tgz",
      "integrity": "sha512-7i1auJbMUrXEAZCOQ0VNJgmcT2VOKPRl2YGJwgpHpC9CE91Mv4/4UYIUm4chGJaI381ZDq1JUicFii64Hapd8g==",
      "dev": true,
+      "license": "Apache-2.0",
      "engines": {
        "node": ">=4"
      }
@@ -18860,6 +18892,7 @@
      "resolved": "https://registry.npmjs.org/saslprep/-/saslprep-1.0.3.tgz",
      "integrity": "sha512-/MY/PEMbk2SuY5sScONwhUDsV2p77Znkb/q3nSVstq/yQzYJOH/Azh29p9oJLsl3LnQwSvZDKagDGBsBwSooag==",
      "dev": true,
+      "license": "MIT",
      "optional": true,
      "dependencies": {
        "sparse-bitfield": "^3.0.3"
@@ -19286,19 +19319,6 @@
        "node": ">=8"
      }
    },
-    "node_modules/sirv": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/sirv/-/sirv-2.0.4.tgz",
-      "integrity": "sha512-94Bdh3cC2PKrbgSOUqTiGPWVZeSiXfKOVZNJniWoqrWrRkB1CJzBU3NEbiTsPcYy1lDsANA/THzS+9WBiy5nfQ==",
-      "dependencies": {
-        "@polka/url": "^1.0.0-next.24",
-        "mrmime": "^2.0.0",
-        "totalist": "^3.0.0"
-      },
-      "engines": {
-        "node": ">= 10"
-      }
-    },
    "node_modules/slash": {
      "version": "3.0.0",
      "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
@@ -20789,14 +20809,6 @@
        "node": ">=0.6"
      }
    },
-    "node_modules/totalist": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/totalist/-/totalist-3.0.1.tgz",
-      "integrity": "sha512-sf4i37nQ2LBx4m3wB74y+ubopq6W/dIzXg0FDGjsYnZHVa1Da8FH853wlL2gtUhg+xJXjfk3kUZS3BRoQeoQBQ==",
-      "engines": {
-        "node": ">=6"
-      }
-    },
    "node_modules/touch": {
      "version": "3.1.0",
      "resolved": "https://registry.npmjs.org/touch/-/touch-3.1.0.tgz",
@@ -21810,50 +21822,6 @@
        }
      }
    },
-    "node_modules/webpack-bundle-analyzer": {
-      "version": "4.10.2",
-      "resolved": "https://registry.npmjs.org/webpack-bundle-analyzer/-/webpack-bundle-analyzer-4.10.2.tgz",
-      "integrity": "sha512-vJptkMm9pk5si4Bv922ZbKLV8UTT4zib4FPgXMhgzUny0bfDDkLXAVQs3ly3fS4/TN9ROFtb0NFrm04UXFE/Vw==",
-      "dependencies": {
-        "@discoveryjs/json-ext": "0.5.7",
-        "acorn": "^8.0.4",
-        "acorn-walk": "^8.0.0",
-        "commander": "^7.2.0",
-        "debounce": "^1.2.1",
-        "escape-string-regexp": "^4.0.0",
-        "gzip-size": "^6.0.0",
-        "html-escaper": "^2.0.2",
-        "opener": "^1.5.2",
-        "picocolors": "^1.0.0",
-        "sirv": "^2.0.3",
-        "ws": "^7.3.1"
-      },
-      "bin": {
-        "webpack-bundle-analyzer": "lib/bin/analyzer.js"
-      },
-      "engines": {
-        "node": ">= 10.13.0"
-      }
-    },
-    "node_modules/webpack-bundle-analyzer/node_modules/commander": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz",
-      "integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==",
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/webpack-bundle-analyzer/node_modules/escape-string-regexp": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
-      "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
    "node_modules/webpack-cli": {
      "version": "4.10.0",
      "resolved": "https://registry.npmjs.org/webpack-cli/-/webpack-cli-4.10.0.tgz",
@@ -22219,26 +22187,6 @@
        "typedarray-to-buffer": "^3.1.5"
      }
    },
-    "node_modules/ws": {
-      "version": "7.5.10",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.10.tgz",
-      "integrity": "sha512-+dbF1tHwZpXcbOJdVOkzLDxZP1ailvSxM6ZweXTegylPny803bFhA+vqBYw4s31NSAk4S2Qz+AKXK9a4wkdjcQ==",
-      "engines": {
-        "node": ">=8.3.0"
-      },
-      "peerDependencies": {
-        "bufferutil": "^4.0.1",
-        "utf-8-validate": "^5.0.2"
-      },
-      "peerDependenciesMeta": {
-        "bufferutil": {
-          "optional": true
-        },
-        "utf-8-validate": {
-          "optional": true
-        }
-      }
-    },
    "node_modules/xml-crypto": {
      "version": "0.10.1",
      "resolved": "https://registry.npmjs.org/xml-crypto/-/xml-crypto-0.10.1.tgz",
@@ -1,7 +1,7 @@
 {
  "name": "habitica",
  "description": "A habit tracker app which treats your goals like a Role Playing Game.",
-  "version": "5.44.2",
+  "version": "5.47.5",
  "main": "./website/server/index.js",
  "dependencies": {
    "@babel/core": "^7.22.10",
@@ -39,7 +39,7 @@
    "gulp-filter": "^7.0.0",
    "gulp-imagemin": "^7.1.0",
    "gulp.spritesmith": "^6.13.0",
-    "habitica-markdown": "^3.0.0",
+    "habitica-markdown": "^4.1.0",
    "heapdump": "^0.3.15",
    "helmet": "^4.6.0",
    "in-app-purchase": "^1.11.3",
@@ -52,7 +52,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",
@@ -76,7 +76,6 @@
    "useragent": "^2.1.9",
    "uuid": "^9.0.0",
    "validator": "^13.11.0",
-    "webpack-bundle-analyzer": "^4.10.2",
    "winston": "^3.10.0",
    "winston-loggly-bulk": "^3.3.0",
    "xml2js": "^0.6.2"
@@ -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');
-    });
-  });
-});
@@ -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(() => {
@@ -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');
+    });
+  });
+});
@@ -66,13 +66,15 @@ describe('Amazon Payments - Cancel Subscription', () => {
    group = generateGroup({
      name: 'test group',
      type: 'guild',
-      privacy: 'public',
+      privacy: 'private',
      leader: user._id,
    });
    group.purchased.plan.customerId = 'customer-id';
    group.purchased.plan.planId = subKey;
    group.purchased.plan.lastBillingDate = new Date();
    await group.save();
+    user.guilds.push(group._id);
+    await user.save();

    subscriptionBlock = common.content.subscriptionBlocks[subKey];
    subscriptionLength = subscriptionBlock.months * 30;
@@ -30,12 +30,14 @@ describe('Amazon Payments - Subscribe', () => {
    group = generateGroup({
      name: 'test group',
      type: 'guild',
-      privacy: 'public',
+      privacy: 'private',
      leader: user._id,
    });
    group.purchased.plan.customerId = 'customer-id';
    group.purchased.plan.planId = subKey;
    await group.save();
+    user.guilds.push(group._id);
+    await user.save();

    amount = common.content.subscriptionBlocks[subKey].price;
    billingAgreementId = 'billingAgreementId';
@@ -246,11 +248,6 @@ describe('Amazon Payments - Subscribe', () => {
    user.guilds.push(groupId);
    await user.save();

-    // Add existing users
-    user = new User();
-    user.guilds.push(groupId);
-    await user.save();
-
    // Set expected amount
    sub.key = 'group_monthly';
    sub.price = 9;
@@ -128,11 +128,12 @@ describe('Purchasing a group plan for group', () => {
    expect(publicGroup.purchased.plan.planId).to.not.exist;
    data.groupId = publicGroup._id;

+    // Public Guilds are no longer even findable
    await expect(api.createSubscription(data))
      .to.eventually.be.rejected.and.to.eql({
-        httpCode: 401,
-        name: 'NotAuthorized',
-        message: i18n.t('onlyPrivateGuildsCanUpgrade'),
+        httpCode: 404,
+        name: 'NotFound',
+        message: i18n.t('groupNotFound'),
      });

    const updatedGroup = await Group.findById(publicGroup._id).exec();
@@ -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;

@@ -30,13 +30,15 @@ describe('paypal - subscribeCancel', () => {
    group = generateGroup({
      name: 'test group',
      type: 'guild',
-      privacy: 'public',
+      privacy: 'private',
      leader: user._id,
    });
    group.purchased.plan.customerId = groupCustomerId;
    group.purchased.plan.planId = subKey;
    group.purchased.plan.lastBillingDate = new Date();
    await group.save();
+    user.guilds.push(group._id);
+    await user.save();

    nextBillingDate = new Date();

@@ -236,7 +236,7 @@ describe('Stripe - Checkout', () => {
      const group = generateGroup({
        name: 'test group',
        type: 'guild',
-        privacy: 'public',
+        privacy: 'private',
        leader: user._id,
      });
      const groupId = group._id;
@@ -376,11 +376,13 @@ describe('Stripe - Checkout', () => {
        group = generateGroup({
          name: 'test group',
          type: 'guild',
-          privacy: 'public',
+          privacy: 'private',
          leader: user._id,
        });
        groupId = group._id;
        await group.save();
+        user.guilds.push(group._id);
+        await user.save();
      });

      it('throws if user is not allowed to change group plan', async () => {
@@ -136,7 +136,7 @@ describe('Stripe - Subscriptions', () => {
      group = generateGroup({
        name: 'test group',
        type: 'guild',
-        privacy: 'public',
+        privacy: 'private',
        leader: user._id,
      });
      groupId = group._id;
@@ -315,12 +315,14 @@ describe('Stripe - Subscriptions', () => {
      group = generateGroup({
        name: 'test group',
        type: 'guild',
-        privacy: 'public',
+        privacy: 'private',
        leader: user._id,
      });
      group.purchased.plan.customerId = 'customer-id';
      group.purchased.plan.planId = subKey;
      await group.save();
+      user.guilds.push(group._id);
+      await user.save();

      groupId = group._id;
    });
@@ -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);
-  });
-});
@@ -50,5 +50,59 @@ describe('UserNotification Model', () => {
      expect(safeNotifications[0].type).to.equal('NEW_CHAT_MESSAGE');
      expect(safeNotifications[0].id).to.equal('123');
    });
+
+    it('removes duplicate STREAK_ACHIEVEMENT notifications', () => {
+      // Fixes issue #13325 - Users receiving duplicate streak achievement notifications
+      const notifications = [
+        new UserNotification({
+          type: 'STREAK_ACHIEVEMENT',
+          id: 123,
+          data: {},
+        }),
+        new UserNotification({
+          type: 'STREAK_ACHIEVEMENT',
+          id: 456,
+          data: {},
+        }),
+        new UserNotification({
+          type: 'CRON',
+          id: 789,
+          data: {},
+        }), // different type, should be kept
+      ];
+
+      const safeNotifications = UserNotification.cleanupCorruptData(notifications);
+      expect(safeNotifications.length).to.equal(2);
+      expect(safeNotifications[0].type).to.equal('STREAK_ACHIEVEMENT');
+      expect(safeNotifications[0].id).to.equal('123');
+      expect(safeNotifications[1].type).to.equal('CRON');
+      expect(safeNotifications[1].id).to.equal('789');
+    });
+
+    it('handles multiple STREAK_ACHIEVEMENT duplicates correctly', () => {
+      // Test case: 3 duplicate STREAK_ACHIEVEMENT notifications
+      const notifications = [
+        new UserNotification({
+          type: 'STREAK_ACHIEVEMENT',
+          id: 111,
+          data: {},
+        }),
+        new UserNotification({
+          type: 'STREAK_ACHIEVEMENT',
+          id: 222,
+          data: {},
+        }),
+        new UserNotification({
+          type: 'STREAK_ACHIEVEMENT',
+          id: 333,
+          data: {},
+        }),
+      ];
+
+      const safeNotifications = UserNotification.cleanupCorruptData(notifications);
+      expect(safeNotifications.length).to.equal(1);
+      expect(safeNotifications[0].type).to.equal('STREAK_ACHIEVEMENT');
+      expect(safeNotifications[0].id).to.equal('111'); // Keep first one
+    });
  });
 });
@@ -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();
-  });
-});
@@ -5,6 +5,8 @@ import {
  createAndPopulateGroup,
  translate as t,
 } from '../../../../helpers/api-integration/v3';
+import { model as Group } from '../../../../../website/server/models/group';
+import { TAVERN_ID } from '../../../../../website/common/script/constants';

 describe('POST /challenges/:challengeId/join', () => {
  it('returns error when challengeId is not a valid UUID', async () => {
@@ -27,6 +29,37 @@ describe('POST /challenges/:challengeId/join', () => {
    });
  });

+  context('public Guild', () => {
+    let group;
+    let groupLeader;
+    let members;
+    let challenge;
+    before(async () => {
+      ({ group, groupLeader, members } = await createAndPopulateGroup({
+        groupDetails: {
+          name: 'test group',
+          type: 'guild',
+          privacy: 'private',
+        },
+        members: 1,
+        upgradeToGroupPlan: true,
+      }));
+      challenge = await generateChallenge(groupLeader, group);
+      // Creation API is shut down, we need to simulate an extant public group
+      await Group.updateOne({ _id: group._id }, { $set: { privacy: 'public' }, $unset: { 'purchased.plan': 1 } }).exec();
+    });
+
+    it('returns error when challengeId is in an old public Guild', async () => {
+      const authorizedUser = members[0]; // eslint-disable-line prefer-destructuring
+
+      await expect(authorizedUser.post(`/challenges/${challenge._id}/join`)).to.eventually.be.rejected.and.eql({
+        code: 404,
+        error: 'NotFound',
+        message: t('challengeNotFound'),
+      });
+    });
+  });
+
  context('Joining a valid challenge', () => {
    let groupLeader;
    let group;
@@ -66,6 +99,15 @@ describe('POST /challenges/:challengeId/join', () => {
      expect(res.name).to.equal(challenge.name);
    });

+    it('succeeds when it\'s a Tavern challenge, even if the user isn\'t a "member" of Tavern', async () => {
+      const tavern = await groupLeader.get(`/groups/${TAVERN_ID}`);
+      const tavernChallenge = await generateChallenge(groupLeader, tavern, { prize: 1 });
+      const generalUser = await generateUser();
+
+      const res = await generalUser.post(`/challenges/${tavernChallenge._id}/join`);
+      expect(res.name).to.equal(tavernChallenge.name);
+    });
+
    it('returns challenge data', async () => {
      const res = await authorizedUser.post(`/challenges/${challenge._id}/join`);

@@ -62,9 +62,9 @@ describe('GET /groups/:groupId/chat', () => {

    it('returns error if user attempts to fetch a sunset Guild', async () => {
      await expect(user.get(`/groups/${group._id}/chat`)).to.eventually.be.rejected.and.eql({
-        code: 400,
-        error: 'BadRequest',
-        message: t('featureRetired'),
+        code: 404,
+        error: 'NotFound',
+        message: t('groupNotFound'),
      });
    });
  });
@@ -121,9 +121,9 @@ describe('POST /chat/:chatId/like', () => {

    await expect(user.post(`/groups/${groupWithChat._id}/chat/${message.message.id}/like`))
      .to.eventually.be.rejected.and.eql({
-        code: 400,
-        error: 'BadRequest',
-        message: t('featureRetired'),
+        code: 404,
+        error: 'NotFound',
+        message: t('groupNotFound'),
      });
  });
 });
@@ -1,35 +0,0 @@
-import { v4 as generateUUID } from 'uuid';
-import {
-  generateUser,
-  translate as t,
-} from '../../../../helpers/api-integration/v3';
-
-xdescribe('GET /export/avatar-:memberId.html', () => {
-  let user;
-
-  before(async () => {
-    user = await generateUser();
-  });
-
-  it('validates req.params.memberId', async () => {
-    await expect(user.get('/export/avatar-:memberId.html')).to.eventually.be.rejected.and.eql({
-      code: 400,
-      error: 'BadRequest',
-      message: t('invalidReqParams'),
-    });
-  });
-
-  it('handles non-existing members', async () => {
-    const dummyId = generateUUID();
-    await expect(user.get(`/export/avatar-${dummyId}.html`)).to.eventually.be.rejected.and.eql({
-      code: 404,
-      error: 'NotFound',
-      message: t('userWithIDNotFound', { userId: dummyId }),
-    });
-  });
-
-  it('returns an html page', async () => {
-    const res = await user.get(`/export/avatar-${user._id}.html`);
-    expect(res.substring(0, 100).indexOf('<!DOCTYPE html>')).to.equal(0);
-  });
-});
@@ -1,3 +0,0 @@
-// TODO how to test this route since it points to a file on AWS s3?
-
-describe('GET /export/avatar-:memberId.png', () => {});
@@ -38,7 +38,7 @@ describe('GET /export/inbox.html', () => {
  it('renders the markdown messages as html', async () => {
    const res = await user.get('/export/inbox.html');

-    expect(res).to.include('img class="habitica-emoji"');
+    expect(res).to.include('😄');
    expect(res).to.include('<h1>Hello!</h1>');
    expect(res).to.include('<li>list 1</li>');
  });
@@ -46,7 +46,7 @@ describe('GET /export/inbox.html', () => {
  it('sorts messages from newest to oldest', async () => {
    const res = await user.get('/export/inbox.html');

-    const emojiPosition = res.indexOf('img class="habitica-emoji"');
+    const emojiPosition = res.indexOf('😄');
    const headingPosition = res.indexOf('<h1>Hello!</h1>');
    const listPosition = res.indexOf('<li>list 1</li>');

@@ -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();
-  });
 });
@@ -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`;
@@ -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
@@ -0,0 +1,67 @@
+import md from 'habitica-markdown';
+
+describe('habiticaMarkdown emoji plugin', () => {
+  it('renders standard emoji as Unicode', () => {
+    const result = md.render(':smile:');
+    expect(result).to.include('😄');
+    expect(result).not.to.include('img');
+  });
+
+  it('renders thumbsup emoji as Unicode', () => {
+    const result = md.render(':thumbsup:');
+    expect(result).to.include('👍');
+  });
+
+  it('renders +1 emoji as Unicode', () => {
+    const result = md.render(':+1:');
+    expect(result).to.include('👍');
+  });
+
+  it('renders melior as an img tag', () => {
+    const result = md.render(':melior:');
+    expect(result).to.include('<img class="habitica-emoji"');
+    expect(result).to.include('src="https://s3.amazonaws.com/habitica-assets/cdn/emoji/melior.png"');
+    expect(result).to.include('alt="melior"');
+  });
+
+  it('does NOT convert emoji inside markdown links', () => {
+    const result = md.render('[:smile: link](http://example.com)');
+    expect(result).to.include(':smile: link');
+    expect(result).not.to.include('😄');
+  });
+
+  it('converts emoji outside of links normally', () => {
+    const result = md.render(':smile: [link](http://example.com)');
+    expect(result).to.include('😄');
+    expect(result).to.include('link');
+  });
+
+  it('leaves removed custom emoji (bowtie) as literal text', () => {
+    const result = md.render(':bowtie:');
+    expect(result).to.include(':bowtie:');
+    expect(result).not.to.include('img');
+  });
+
+  it('leaves unknown shortcodes as literal text', () => {
+    const result = md.render(':nonexistent_emoji_xyz:');
+    expect(result).to.include(':nonexistent_emoji_xyz:');
+  });
+
+  it('renders new emoji not in the old dataset', () => {
+    const result = md.render(':yawning_face:');
+    expect(result).to.include('🥱');
+  });
+
+  it('supports unsafeHTMLRender', () => {
+    const result = md.unsafeHTMLRender('<b>bold</b> :smile:');
+    expect(result).to.include('<b>bold</b>');
+    expect(result).to.include('😄');
+  });
+
+  it('supports renderWithMentions', () => {
+    const result = md.renderWithMentions(':smile: @testuser', { userName: 'testuser' });
+    expect(result).to.include('😄');
+    expect(result).to.include('at-text');
+    expect(result).to.include('at-highlight');
+  });
+});
@@ -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 () => {
@@ -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;
    });
  });
 });
@@ -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 () => {
@@ -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 () => {
@@ -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;
    });
@@ -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);
@@ -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();
  });
@@ -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;
  });
 });
@@ -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 () => {
@@ -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 () => {
@@ -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'));
@@ -211,22 +211,32 @@ describe('shared.ops.rebirth', () => {
    expect(user.achievements.rebirthLevel).to.equal(2);
  });

-  it('does not increment rebirth achievements when level is lower than previous', async () => {
+  it('increments rebirth achievements even when level is lower than previous', async () => {
    user.stats.lvl = 2;
    user.achievements.rebirths = 1;
    user.achievements.rebirthLevel = 3;

    await rebirth(user);

-    expect(user.achievements.rebirths).to.equal(1);
+    expect(user.achievements.rebirths).to.equal(2);
    expect(user.achievements.rebirthLevel).to.equal(3);
  });

-  it('always increments rebirth achievements when level is MAX_LEVEL', async () => {
+  it('updates rebirthLevel when current level is higher than previous', async () => {
+    user.stats.lvl = 5;
+    user.achievements.rebirths = 1;
+    user.achievements.rebirthLevel = 3;
+
+    await rebirth(user);
+
+    expect(user.achievements.rebirths).to.equal(2);
+    expect(user.achievements.rebirthLevel).to.equal(5);
+  });
+
+  it('increments rebirth achievements when level is MAX_LEVEL', async () => {
    user.stats.lvl = MAX_LEVEL;
    user.achievements.rebirths = 1;
-    // this value is not actually possible (actually capped at MAX_LEVEL) but makes a good test
-    user.achievements.rebirthLevel = MAX_LEVEL + 1;
+    user.achievements.rebirthLevel = MAX_LEVEL;

    await rebirth(user);

@@ -234,11 +244,10 @@ describe('shared.ops.rebirth', () => {
    expect(user.achievements.rebirthLevel).to.equal(MAX_LEVEL);
  });

-  it('always increments rebirth achievements when level is greater than MAX_LEVEL', async () => {
+  it('increments rebirth achievements when level is greater than MAX_LEVEL', async () => {
    user.stats.lvl = MAX_LEVEL + 1;
    user.achievements.rebirths = 1;
-    // this value is not actually possible (actually capped at MAX_LEVEL) but makes a good test
-    user.achievements.rebirthLevel = MAX_LEVEL + 2;
+    user.achievements.rebirthLevel = MAX_LEVEL;

    await rebirth(user);

@@ -0,0 +1,41 @@
+import { getMatchingSwap, makeSubstitutionMap } from '../../website/common/script/content/constants/aprilFools';
+
+describe('April Fools', () => {
+  describe('getMatchingSwap', () => {
+    it('returns Veggie for 2020', () => {
+      const swap = getMatchingSwap(new Date('2020-04-01'));
+      expect(swap).to.equal('Veggie');
+    });
+    it('returns Alien for 2026', () => {
+      const swap = getMatchingSwap(new Date('2026-04-01'));
+      expect(swap).to.equal('Alien');
+    });
+    it('Cycles through swaps correctly', () => {
+      const swap = getMatchingSwap(new Date('2027-04-01'));
+      expect(swap).to.equal('Veggie');
+    });
+  });
+
+  describe('makeSubstitutionMap', () => {
+    it('returns correct substitution for Veggie', () => {
+      const substitutions = makeSubstitutionMap('Veggie');
+      expect(substitutions.pets['Pet-Wolf-']).to.equal('Pet-Wolf-Veggie');
+      expect(substitutions.pets['Pet-TigerCub-']).to.equal('Pet-TigerCub-Veggie');
+      expect(substitutions.pets['Pet-Yarn-']).to.equal('Pet-BearCub-Veggie');
+      expect(substitutions.pets.default).to.equal('Pet-Dragon-Veggie');
+      expect(substitutions.pets.noPet).to.equal('Pet-Wolf-Veggie');
+      expect(substitutions.pets.noPetIOS).to.equal('Pet-TigerCub-Veggie');
+      expect(substitutions.pets.noPetAndroid).to.equal('Pet-Cactus-Veggie');
+    });
+
+    it('returns correct substitution for Cryptid', () => {
+      const substitutions = makeSubstitutionMap('Cryptid');
+      expect(substitutions.pets['Pet-Fox-']).to.equal('Pet-Fox-Cryptid');
+      expect(substitutions.pets['Pet-FlyingPig-']).to.equal('Pet-FlyingPig-Cryptid');
+      expect(substitutions.pets['Pet-Yarn-']).to.equal('Pet-BearCub-Cryptid');
+      expect(substitutions.pets.default).to.equal('Pet-Dragon-Cryptid');
+      expect(substitutions.pets.noPet).to.equal('Pet-Wolf-Cryptid');
+      expect(substitutions.pets.noPetAndroid).to.equal('Pet-Cactus-Cryptid');
+    });
+  });
+});
@@ -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);
-    });
-  });
 });
@@ -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 {
@@ -12,20 +12,12 @@ module.exports = {
  rules: {
    'no-console': process.env.NODE_ENV === 'production' ? 'error' : 'off',
    'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off',
-    // TODO find a way to let eslint understand webpack aliases
    'import/no-unresolved': 'off',
    'import/no-extraneous-dependencies': 'off',
    'import/extensions': 'off',
    'prefer-regex-literals': 'warn',
    'vue/no-v-html': 'off',
    'vue/no-mutating-props': 'warn',
-    // this creates issues with the current way we have to push the process.env vars to webpack
-    // https://github.com/eslint/eslint/issues/14918
-    // https://github.com/webpack/webpack/issues/5392
-    // off for now, because any eslint --fix will then still do it anyway
-    // maybe this can be turned on again once we switch to newer vue/vite
-    // Important! process.env.XYZ should not be destructured
-    'prefer-destructuring': 'off',
    'vue/html-self-closing': ['error', {
      html: {
        void: 'never',
@@ -23,7 +23,7 @@
        "eslint-config-habitrpg": "6.2.0",
        "eslint-plugin-mocha": "5.3.0",
        "eslint-plugin-vue": "7.20.0",
-        "habitica-markdown": "^3.0.0",
+        "habitica-markdown": "^4.0.0",
        "hellojs": "^1.20.0",
        "intro.js": "^7.2.0",
        "jquery": "^3.7.1",
@@ -41,7 +41,6 @@
        "vite": "^6.3.6",
        "vite-plugin-compression2": "^1.3.3",
        "vue": "^2.7.10",
-        "vue-fragment": "^1.6.0",
        "vue-mugen-scroll": "^0.2.6",
        "vue-router": "^3.6.5",
        "vuedraggable": "^2.24.3",
@@ -55,9 +54,7 @@
        "jsdom": "^26.0.0",
        "mocha": "^11.1.0",
        "playwright": "^1.50.1",
-        "terser-webpack-plugin": "^5.3.10",
-        "vitest": "^3.0.5",
-        "webpack": "^5.94.0"
+        "vitest": "^3.0.5"
      }
    },
    "node_modules/@amplitude/analytics-connector": {
@@ -2111,8 +2108,9 @@
      "version": "0.3.11",
      "resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.11.tgz",
      "integrity": "sha512-ZMp1V8ZFcPG5dIWnQLr3NSI1MiCU7UETdS/A0G8V/XWHvJv3ZsFqutJn1Y5RPmAPX6F3BiE397OqveU/9NCuIA==",
-      "devOptional": true,
      "license": "MIT",
+      "optional": true,
+      "peer": true,
      "dependencies": {
        "@jridgewell/gen-mapping": "^0.3.5",
        "@jridgewell/trace-mapping": "^0.3.25"
@@ -3634,41 +3632,12 @@
      "dev": true,
      "license": "MIT"
    },
-    "node_modules/@types/eslint": {
-      "version": "9.6.1",
-      "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-9.6.1.tgz",
-      "integrity": "sha512-FXx2pKgId/WyYo2jXw63kk7/+TY7u7AziEJxJAnSFzHlqTAS3Ync6SvgYAN/k4/PQpnnVuzoMuVnByKK2qp0ag==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@types/estree": "*",
-        "@types/json-schema": "*"
-      }
-    },
-    "node_modules/@types/eslint-scope": {
-      "version": "3.7.7",
-      "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.7.tgz",
-      "integrity": "sha512-MzMFlSLBqNF2gcHWO0G1vP/YQyfvrxZ0bF+u7mzUdZ1/xK4A4sru+nraZz5i3iEIk1l1uyicaDVTB4QbbEkAYg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@types/eslint": "*",
-        "@types/estree": "*"
-      }
-    },
    "node_modules/@types/estree": {
      "version": "1.0.8",
      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.8.tgz",
      "integrity": "sha512-dWHzHa2WqEXI/O1E9OjrocMTKJl2mSrEolh1Iomrv6U+JuNwaHXsXx9bLu5gG7BUWFIN0skIQJQ/L1rIex4X6w==",
      "license": "MIT"
    },
-    "node_modules/@types/json-schema": {
-      "version": "7.0.15",
-      "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.15.tgz",
-      "integrity": "sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==",
-      "dev": true,
-      "license": "MIT"
-    },
    "node_modules/@types/json5": {
      "version": "0.0.29",
      "resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz",
@@ -3679,8 +3648,9 @@
      "version": "24.10.1",
      "resolved": "https://registry.npmjs.org/@types/node/-/node-24.10.1.tgz",
      "integrity": "sha512-GNWcUTRBgIRJD5zj+Tq0fKOJ5XZajIiBroOF0yvj2bSU1WvNdYS/dn9UxwsujGW4JX06dnHyjV2y9rRaybH0iQ==",
-      "devOptional": true,
      "license": "MIT",
+      "optional": true,
+      "peer": true,
      "dependencies": {
        "undici-types": "~7.16.0"
      }
@@ -3876,181 +3846,6 @@
        "vue-template-compiler": "^2.x"
      }
    },
-    "node_modules/@webassemblyjs/ast": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.14.1.tgz",
-      "integrity": "sha512-nuBEDgQfm1ccRp/8bCQrx1frohyufl4JlbMMZ4P1wpeOfDhF6FQkxZJ1b/e+PLwr6X1Nhw6OLme5usuBWYBvuQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@webassemblyjs/helper-numbers": "1.13.2",
-        "@webassemblyjs/helper-wasm-bytecode": "1.13.2"
-      }
-    },
-    "node_modules/@webassemblyjs/floating-point-hex-parser": {
-      "version": "1.13.2",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.13.2.tgz",
-      "integrity": "sha512-6oXyTOzbKxGH4steLbLNOu71Oj+C8Lg34n6CqRvqfS2O71BxY6ByfMDRhBytzknj9yGUPVJ1qIKhRlAwO1AovA==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/@webassemblyjs/helper-api-error": {
-      "version": "1.13.2",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.13.2.tgz",
-      "integrity": "sha512-U56GMYxy4ZQCbDZd6JuvvNV/WFildOjsaWD3Tzzvmw/mas3cXzRJPMjP83JqEsgSbyrmaGjBfDtV7KDXV9UzFQ==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/@webassemblyjs/helper-buffer": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.14.1.tgz",
-      "integrity": "sha512-jyH7wtcHiKssDtFPRB+iQdxlDf96m0E39yb0k5uJVhFGleZFoNw1c4aeIcVUPPbXUVJ94wwnMOAqUHyzoEPVMA==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/@webassemblyjs/helper-numbers": {
-      "version": "1.13.2",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.13.2.tgz",
-      "integrity": "sha512-FE8aCmS5Q6eQYcV3gI35O4J789wlQA+7JrqTTpJqn5emA4U2hvwJmvFRC0HODS+3Ye6WioDklgd6scJ3+PLnEA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@webassemblyjs/floating-point-hex-parser": "1.13.2",
-        "@webassemblyjs/helper-api-error": "1.13.2",
-        "@xtuc/long": "4.2.2"
-      }
-    },
-    "node_modules/@webassemblyjs/helper-wasm-bytecode": {
-      "version": "1.13.2",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.13.2.tgz",
-      "integrity": "sha512-3QbLKy93F0EAIXLh0ogEVR6rOubA9AoZ+WRYhNbFyuB70j3dRdwH9g+qXhLAO0kiYGlg3TxDV+I4rQTr/YNXkA==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/@webassemblyjs/helper-wasm-section": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.14.1.tgz",
-      "integrity": "sha512-ds5mXEqTJ6oxRoqjhWDU83OgzAYjwsCV8Lo/N+oRsNDmx/ZDpqalmrtgOMkHwxsG0iI//3BwWAErYRHtgn0dZw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@webassemblyjs/ast": "1.14.1",
-        "@webassemblyjs/helper-buffer": "1.14.1",
-        "@webassemblyjs/helper-wasm-bytecode": "1.13.2",
-        "@webassemblyjs/wasm-gen": "1.14.1"
-      }
-    },
-    "node_modules/@webassemblyjs/ieee754": {
-      "version": "1.13.2",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.13.2.tgz",
-      "integrity": "sha512-4LtOzh58S/5lX4ITKxnAK2USuNEvpdVV9AlgGQb8rJDHaLeHciwG4zlGr0j/SNWlr7x3vO1lDEsuePvtcDNCkw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@xtuc/ieee754": "^1.2.0"
-      }
-    },
-    "node_modules/@webassemblyjs/leb128": {
-      "version": "1.13.2",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.13.2.tgz",
-      "integrity": "sha512-Lde1oNoIdzVzdkNEAWZ1dZ5orIbff80YPdHx20mrHwHrVNNTjNr8E3xz9BdpcGqRQbAEa+fkrCb+fRFTl/6sQw==",
-      "dev": true,
-      "license": "Apache-2.0",
-      "dependencies": {
-        "@xtuc/long": "4.2.2"
-      }
-    },
-    "node_modules/@webassemblyjs/utf8": {
-      "version": "1.13.2",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.13.2.tgz",
-      "integrity": "sha512-3NQWGjKTASY1xV5m7Hr0iPeXD9+RDobLll3T9d2AO+g3my8xy5peVyjSag4I50mR1bBSN/Ct12lo+R9tJk0NZQ==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/@webassemblyjs/wasm-edit": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.14.1.tgz",
-      "integrity": "sha512-RNJUIQH/J8iA/1NzlE4N7KtyZNHi3w7at7hDjvRNm5rcUXa00z1vRz3glZoULfJ5mpvYhLybmVcwcjGrC1pRrQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@webassemblyjs/ast": "1.14.1",
-        "@webassemblyjs/helper-buffer": "1.14.1",
-        "@webassemblyjs/helper-wasm-bytecode": "1.13.2",
-        "@webassemblyjs/helper-wasm-section": "1.14.1",
-        "@webassemblyjs/wasm-gen": "1.14.1",
-        "@webassemblyjs/wasm-opt": "1.14.1",
-        "@webassemblyjs/wasm-parser": "1.14.1",
-        "@webassemblyjs/wast-printer": "1.14.1"
-      }
-    },
-    "node_modules/@webassemblyjs/wasm-gen": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.14.1.tgz",
-      "integrity": "sha512-AmomSIjP8ZbfGQhumkNvgC33AY7qtMCXnN6bL2u2Js4gVCg8fp735aEiMSBbDR7UQIj90n4wKAFUSEd0QN2Ukg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@webassemblyjs/ast": "1.14.1",
-        "@webassemblyjs/helper-wasm-bytecode": "1.13.2",
-        "@webassemblyjs/ieee754": "1.13.2",
-        "@webassemblyjs/leb128": "1.13.2",
-        "@webassemblyjs/utf8": "1.13.2"
-      }
-    },
-    "node_modules/@webassemblyjs/wasm-opt": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.14.1.tgz",
-      "integrity": "sha512-PTcKLUNvBqnY2U6E5bdOQcSM+oVP/PmrDY9NzowJjislEjwP/C4an2303MCVS2Mg9d3AJpIGdUFIQQWbPds0Sw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@webassemblyjs/ast": "1.14.1",
-        "@webassemblyjs/helper-buffer": "1.14.1",
-        "@webassemblyjs/wasm-gen": "1.14.1",
-        "@webassemblyjs/wasm-parser": "1.14.1"
-      }
-    },
-    "node_modules/@webassemblyjs/wasm-parser": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.14.1.tgz",
-      "integrity": "sha512-JLBl+KZ0R5qB7mCnud/yyX08jWFw5MsoalJ1pQ4EdFlgj9VdXKGuENGsiCIjegI1W7p91rUlcB/LB5yRJKNTcQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@webassemblyjs/ast": "1.14.1",
-        "@webassemblyjs/helper-api-error": "1.13.2",
-        "@webassemblyjs/helper-wasm-bytecode": "1.13.2",
-        "@webassemblyjs/ieee754": "1.13.2",
-        "@webassemblyjs/leb128": "1.13.2",
-        "@webassemblyjs/utf8": "1.13.2"
-      }
-    },
-    "node_modules/@webassemblyjs/wast-printer": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.14.1.tgz",
-      "integrity": "sha512-kPSSXE6De1XOR820C90RIo2ogvZG+c3KiHzqUoO/F34Y2shGzesfqv7o57xrxovZJH/MetF5UjroJ/R/3isoiw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@webassemblyjs/ast": "1.14.1",
-        "@xtuc/long": "4.2.2"
-      }
-    },
-    "node_modules/@xtuc/ieee754": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz",
-      "integrity": "sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==",
-      "dev": true,
-      "license": "BSD-3-Clause"
-    },
-    "node_modules/@xtuc/long": {
-      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz",
-      "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==",
-      "dev": true,
-      "license": "Apache-2.0"
-    },
    "node_modules/acorn": {
      "version": "7.4.1",
      "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz",
@@ -4098,48 +3893,6 @@
        "url": "https://github.com/sponsors/epoberezkin"
      }
    },
-    "node_modules/ajv-formats": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/ajv-formats/-/ajv-formats-2.1.1.tgz",
-      "integrity": "sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "ajv": "^8.0.0"
-      },
-      "peerDependencies": {
-        "ajv": "^8.0.0"
-      },
-      "peerDependenciesMeta": {
-        "ajv": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/ajv-formats/node_modules/ajv": {
-      "version": "8.17.1",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz",
-      "integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "fast-deep-equal": "^3.1.3",
-        "fast-uri": "^3.0.1",
-        "json-schema-traverse": "^1.0.0",
-        "require-from-string": "^2.0.2"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/epoberezkin"
-      }
-    },
-    "node_modules/ajv-formats/node_modules/json-schema-traverse": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
-      "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
-      "dev": true,
-      "license": "MIT"
-    },
    "node_modules/amplitude-js": {
      "version": "8.21.9",
      "resolved": "https://registry.npmjs.org/amplitude-js/-/amplitude-js-8.21.9.tgz",
@@ -4617,8 +4370,9 @@
      "version": "1.1.2",
      "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz",
      "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==",
-      "devOptional": true,
-      "license": "MIT"
+      "license": "MIT",
+      "optional": true,
+      "peer": true
    },
    "node_modules/cac": {
      "version": "6.7.14",
@@ -4783,16 +4537,6 @@
        "url": "https://paulmillr.com/funding/"
      }
    },
-    "node_modules/chrome-trace-event": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.4.tgz",
-      "integrity": "sha512-rNjApaLzuwaOTjCiT8lSDdGN1APCiqkChLMJxJPWLunPAt5fy8xgU9/jNOchV84wfIxrA0lRQB7oCT8jrn/wrQ==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=6.0"
-      }
-    },
    "node_modules/cli-cursor": {
      "version": "3.1.0",
      "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz",
@@ -4859,8 +4603,9 @@
      "version": "2.20.3",
      "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
      "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
-      "devOptional": true,
-      "license": "MIT"
+      "license": "MIT",
+      "optional": true,
+      "peer": true
    },
    "node_modules/concat-map": {
      "version": "0.0.1",
@@ -5196,20 +4941,6 @@
      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
      "license": "MIT"
    },
-    "node_modules/enhanced-resolve": {
-      "version": "5.18.3",
-      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.18.3.tgz",
-      "integrity": "sha512-d4lC8xfavMeBjzGr2vECC3fsGXziXZQyJxD868h2M/mBI3PwAuODxAkLkq5HYuvrPYcUtiLzsTo8U3PgX3Ocww==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "graceful-fs": "^4.2.4",
-        "tapable": "^2.2.0"
-      },
-      "engines": {
-        "node": ">=10.13.0"
-      }
-    },
    "node_modules/enquirer": {
      "version": "2.4.1",
      "resolved": "https://registry.npmjs.org/enquirer/-/enquirer-2.4.1.tgz",
@@ -6384,16 +6115,6 @@
        "node": ">=0.10.0"
      }
    },
-    "node_modules/events": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/events/-/events-3.3.0.tgz",
-      "integrity": "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.8.x"
-      }
-    },
    "node_modules/expect-type": {
      "version": "1.2.2",
      "resolved": "https://registry.npmjs.org/expect-type/-/expect-type-1.2.2.tgz",
@@ -6871,13 +6592,6 @@
        "node": ">= 6"
      }
    },
-    "node_modules/glob-to-regexp": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz",
-      "integrity": "sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==",
-      "dev": true,
-      "license": "BSD-2-Clause"
-    },
    "node_modules/globals": {
      "version": "13.24.0",
      "resolved": "https://registry.npmjs.org/globals/-/globals-13.24.0.tgz",
@@ -6921,77 +6635,18 @@
        "url": "https://github.com/sponsors/ljharb"
      }
    },
-    "node_modules/graceful-fs": {
-      "version": "4.2.11",
-      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz",
-      "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==",
-      "dev": true,
-      "license": "ISC"
-    },
    "node_modules/habitica-markdown": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/habitica-markdown/-/habitica-markdown-3.0.0.tgz",
-      "integrity": "sha512-rw1LJ5Vsjx8sfjNa4e2wFuZf5eqqyb5/kfZXPxqfMMgJCCgIhWStDqY3nIclnpGWpemlKd+qbdh2rLiLgm9kng==",
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/habitica-markdown/-/habitica-markdown-4.1.0.tgz",
+      "integrity": "sha512-iqiFT8BbuWIrrs6v9eIXSG7UfWOBdJVGDi9FjGiFFOe8+dOPi62yyXhm81vrx79/5Y2s+jG+7LItyaemD310uQ==",
      "license": "GPL-3.0",
      "dependencies": {
-        "habitica-markdown-emoji": "1.2.4",
-        "markdown-it": "10.0.0",
-        "markdown-it-link-attributes": "3.0.0",
-        "markdown-it-linkify-images": "^1.1.1"
+        "markdown-it": "^14.0.0",
+        "markdown-it-emoji": "^2.0.2",
+        "markdown-it-link-attributes": "^4.0.1",
+        "markdown-it-linkify-images": "^3.0.0"
      }
    },
-    "node_modules/habitica-markdown-emoji": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/habitica-markdown-emoji/-/habitica-markdown-emoji-1.2.4.tgz",
-      "integrity": "sha512-UV0AxpDToldFQULuhTxC1y4sdNTApaIOh7ZuV/92HCPmCGkv3DAlHtYE67OmCqLVfs26HWAGVJaU3+OEnW3gjg==",
-      "license": "GPL-3.0",
-      "dependencies": {
-        "markdown-it-emoji": "^1.1.1"
-      }
-    },
-    "node_modules/habitica-markdown/node_modules/entities": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/entities/-/entities-2.0.3.tgz",
-      "integrity": "sha512-MyoZ0jgnLvB2X3Lg5HqpFmn1kybDiIfEQmKzTb5apr51Rb+T3KdmMiqa70T+bhGnyv7bQ6WMj2QMHpGMmlrUYQ==",
-      "license": "BSD-2-Clause"
-    },
-    "node_modules/habitica-markdown/node_modules/linkify-it": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-2.2.0.tgz",
-      "integrity": "sha512-GnAl/knGn+i1U/wjBz3akz2stz+HrHLsxMwHQGofCDfPvlf+gDKN58UtfmUquTY4/MXeE2x7k19KQmeoZi94Iw==",
-      "license": "MIT",
-      "dependencies": {
-        "uc.micro": "^1.0.1"
-      }
-    },
-    "node_modules/habitica-markdown/node_modules/markdown-it": {
-      "version": "10.0.0",
-      "resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-10.0.0.tgz",
-      "integrity": "sha512-YWOP1j7UbDNz+TumYP1kpwnP0aEa711cJjrAQrzd0UXlbJfc5aAq0F/PZHjiioqDC1NKgvIMX+o+9Bk7yuM2dg==",
-      "license": "MIT",
-      "dependencies": {
-        "argparse": "^1.0.7",
-        "entities": "~2.0.0",
-        "linkify-it": "^2.0.0",
-        "mdurl": "^1.0.1",
-        "uc.micro": "^1.0.5"
-      },
-      "bin": {
-        "markdown-it": "bin/markdown-it.js"
-      }
-    },
-    "node_modules/habitica-markdown/node_modules/mdurl": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/mdurl/-/mdurl-1.0.1.tgz",
-      "integrity": "sha512-/sKlQJCBYVY9Ers9hqzKou4H6V5UWc/M59TH2dvkt+84itfnq7uFOMLpOiOS4ujvHP4etln18fmIxA5R5fll0g==",
-      "license": "MIT"
-    },
-    "node_modules/habitica-markdown/node_modules/uc.micro": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/uc.micro/-/uc.micro-1.0.6.tgz",
-      "integrity": "sha512-8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA==",
-      "license": "MIT"
-    },
    "node_modules/has-bigints": {
      "version": "1.1.0",
      "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.1.0.tgz",
@@ -7778,37 +7433,6 @@
        "@pkgjs/parseargs": "^0.11.0"
      }
    },
-    "node_modules/jest-worker": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-27.5.1.tgz",
-      "integrity": "sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@types/node": "*",
-        "merge-stream": "^2.0.0",
-        "supports-color": "^8.0.0"
-      },
-      "engines": {
-        "node": ">= 10.13.0"
-      }
-    },
-    "node_modules/jest-worker/node_modules/supports-color": {
-      "version": "8.1.1",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
-      "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/supports-color?sponsor=1"
-      }
-    },
    "node_modules/jquery": {
      "version": "3.7.1",
      "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.7.1.tgz",
@@ -7893,13 +7517,6 @@
      "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==",
      "license": "MIT"
    },
-    "node_modules/json-parse-even-better-errors": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
-      "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==",
-      "dev": true,
-      "license": "MIT"
-    },
    "node_modules/json-schema-traverse": {
      "version": "0.4.1",
      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
@@ -7963,20 +7580,6 @@
        "uc.micro": "^2.0.0"
      }
    },
-    "node_modules/loader-runner": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-4.3.1.tgz",
-      "integrity": "sha512-IWqP2SCPhyVFTBtRcgMHdzlf9ul25NwaFx4wCEH/KjAXuuHY4yNjvPXsBokp8jCB936PyWRaPKUNh8NvylLp2Q==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=6.11.5"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      }
-    },
    "node_modules/locate-path": {
      "version": "6.0.0",
      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
@@ -8084,50 +7687,62 @@
      }
    },
    "node_modules/markdown-it-emoji": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/markdown-it-emoji/-/markdown-it-emoji-1.4.0.tgz",
-      "integrity": "sha512-QCz3Hkd+r5gDYtS2xsFXmBYrgw6KuWcJZLCEkdfAuwzZbShCmCfta+hwAMq4NX/4xPzkSHduMKgMkkPUJxSXNg==",
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/markdown-it-emoji/-/markdown-it-emoji-2.0.2.tgz",
+      "integrity": "sha512-zLftSaNrKuYl0kR5zm4gxXjHaOI3FAOEaloKmRA5hijmJZvSjmxcokOLlzycb/HXlUFWzXqpIEoyEMCE4i9MvQ==",
      "license": "MIT"
    },
    "node_modules/markdown-it-link-attributes": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/markdown-it-link-attributes/-/markdown-it-link-attributes-3.0.0.tgz",
-      "integrity": "sha512-B34ySxVeo6MuEGSPCWyIYryuXINOvngNZL87Mp7YYfKIf6DcD837+lXA8mo6EBbauKsnGz22ZH0zsbOiQRWTNg==",
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/markdown-it-link-attributes/-/markdown-it-link-attributes-4.0.1.tgz",
+      "integrity": "sha512-pg5OK0jPLg62H4k7M9mRJLT61gUp9nvG0XveKYHMOOluASo9OEF13WlXrpAp2aj35LbedAy3QOCgQCw0tkLKAQ==",
      "license": "MIT"
    },
    "node_modules/markdown-it-linkify-images": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/markdown-it-linkify-images/-/markdown-it-linkify-images-1.1.1.tgz",
-      "integrity": "sha512-1IEmAaAjIgAwY+tZI0sxDXdy9QKHutj5cN0lH2JBiSZt+2NYKrWRJj0cloQW3OFIfP2MLFA1E+6OLJhXPiLgNw==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/markdown-it-linkify-images/-/markdown-it-linkify-images-3.0.0.tgz",
+      "integrity": "sha512-Vs5yGJa5MWjFgytzgtn8c1U6RcStj3FZKhhx459U8dYbEE5FTWZ6mMRkYMiDlkFO0j4VCsQT1LT557bY0ETgtg==",
      "license": "MIT",
      "dependencies": {
-        "markdown-it": "^8.4.2"
+        "markdown-it": "^13.0.1"
      }
    },
+    "node_modules/markdown-it-linkify-images/node_modules/argparse": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
+      "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
+      "license": "Python-2.0"
+    },
    "node_modules/markdown-it-linkify-images/node_modules/entities": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/entities/-/entities-1.1.2.tgz",
-      "integrity": "sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w==",
-      "license": "BSD-2-Clause"
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/entities/-/entities-3.0.1.tgz",
+      "integrity": "sha512-WiyBqoomrwMdFG1e0kqvASYfnlb0lp8M5o5Fw2OFq1hNZxxcNk8Ik0Xm7LxzBhuidnZB/UtBqVCgUz3kBOP51Q==",
+      "license": "BSD-2-Clause",
+      "engines": {
+        "node": ">=0.12"
+      },
+      "funding": {
+        "url": "https://github.com/fb55/entities?sponsor=1"
+      }
    },
    "node_modules/markdown-it-linkify-images/node_modules/linkify-it": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-2.2.0.tgz",
-      "integrity": "sha512-GnAl/knGn+i1U/wjBz3akz2stz+HrHLsxMwHQGofCDfPvlf+gDKN58UtfmUquTY4/MXeE2x7k19KQmeoZi94Iw==",
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-4.0.1.tgz",
+      "integrity": "sha512-C7bfi1UZmoj8+PQx22XyeXCuBlokoyWQL5pWSP+EI6nzRylyThouddufc2c1NDIcP9k5agmN9fLpA7VNJfIiqw==",
      "license": "MIT",
      "dependencies": {
        "uc.micro": "^1.0.1"
      }
    },
    "node_modules/markdown-it-linkify-images/node_modules/markdown-it": {
-      "version": "8.4.2",
-      "resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-8.4.2.tgz",
-      "integrity": "sha512-GcRz3AWTqSUphY3vsUqQSFMbgR38a4Lh3GWlHRh/7MRwz8mcu9n2IO7HOh+bXHrR9kOPDl5RNCaEsrneb+xhHQ==",
+      "version": "13.0.2",
+      "resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-13.0.2.tgz",
+      "integrity": "sha512-FtwnEuuK+2yVU7goGn/MJ0WBZMM9ZPgU9spqlFs7/A/pDIUNSOQZhUgOqYCficIuR2QaFnrt8LHqBWsbTAoI5w==",
      "license": "MIT",
      "dependencies": {
-        "argparse": "^1.0.7",
-        "entities": "~1.1.1",
-        "linkify-it": "^2.0.0",
+        "argparse": "^2.0.1",
+        "entities": "~3.0.1",
+        "linkify-it": "^4.0.1",
        "mdurl": "^1.0.1",
        "uc.micro": "^1.0.5"
      },
@@ -8168,13 +7783,6 @@
      "integrity": "sha512-Lf+9+2r+Tdp5wXDXC4PcIBjTDtq4UKjCPMQhKIuzpJNW0b96kVqSwW0bT7FhRSfmAiFYgP+SCRvdrDozfh0U5w==",
      "license": "MIT"
    },
-    "node_modules/merge-stream": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
-      "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==",
-      "dev": true,
-      "license": "MIT"
-    },
    "node_modules/micromatch": {
      "version": "4.0.8",
      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz",
@@ -8498,13 +8106,6 @@
        "node": ">= 0.4.0"
      }
    },
-    "node_modules/neo-async": {
-      "version": "2.6.2",
-      "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz",
-      "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==",
-      "dev": true,
-      "license": "MIT"
-    },
    "node_modules/nice-try": {
      "version": "1.0.5",
      "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz",
@@ -9544,63 +9145,6 @@
        "node": ">=v12.22.7"
      }
    },
-    "node_modules/schema-utils": {
-      "version": "4.3.3",
-      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.3.3.tgz",
-      "integrity": "sha512-eflK8wEtyOE6+hsaRVPxvUKYCpRgzLqDTb8krvAsRIwOGlHoSgYLgBXoubGgLd2fT41/OUYdb48v4k4WWHQurA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@types/json-schema": "^7.0.9",
-        "ajv": "^8.9.0",
-        "ajv-formats": "^2.1.1",
-        "ajv-keywords": "^5.1.0"
-      },
-      "engines": {
-        "node": ">= 10.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      }
-    },
-    "node_modules/schema-utils/node_modules/ajv": {
-      "version": "8.17.1",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz",
-      "integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "fast-deep-equal": "^3.1.3",
-        "fast-uri": "^3.0.1",
-        "json-schema-traverse": "^1.0.0",
-        "require-from-string": "^2.0.2"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/epoberezkin"
-      }
-    },
-    "node_modules/schema-utils/node_modules/ajv-keywords": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz",
-      "integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "fast-deep-equal": "^3.1.3"
-      },
-      "peerDependencies": {
-        "ajv": "^8.8.2"
-      }
-    },
-    "node_modules/schema-utils/node_modules/json-schema-traverse": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
-      "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
-      "dev": true,
-      "license": "MIT"
-    },
    "node_modules/secure-keys": {
      "version": "1.0.0",
      "resolved": "https://registry.npmjs.org/secure-keys/-/secure-keys-1.0.0.tgz",
@@ -9878,8 +9422,9 @@
      "version": "0.5.21",
      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz",
      "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==",
-      "devOptional": true,
      "license": "MIT",
+      "optional": true,
+      "peer": true,
      "dependencies": {
        "buffer-from": "^1.0.0",
        "source-map": "^0.6.0"
@@ -10170,20 +9715,6 @@
      "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
      "license": "MIT"
    },
-    "node_modules/tapable": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.3.0.tgz",
-      "integrity": "sha512-g9ljZiwki/LfxmQADO3dEY1CbpmXT5Hm2fJ+QaGKwSXUylMybePR7/67YW7jOrrvjEgL1Fmz5kzyAjWVWLlucg==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=6"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      }
-    },
    "node_modules/tar-mini": {
      "version": "0.2.0",
      "resolved": "https://registry.npmjs.org/tar-mini/-/tar-mini-0.2.0.tgz",
@@ -10194,8 +9725,9 @@
      "version": "5.44.1",
      "resolved": "https://registry.npmjs.org/terser/-/terser-5.44.1.tgz",
      "integrity": "sha512-t/R3R/n0MSwnnazuPpPNVO60LX0SKL45pyl9YlvxIdkH0Of7D5qM2EVe+yASRIlY5pZ73nclYJfNANGWPwFDZw==",
-      "devOptional": true,
      "license": "BSD-2-Clause",
+      "optional": true,
+      "peer": true,
      "dependencies": {
        "@jridgewell/source-map": "^0.3.3",
        "acorn": "^8.15.0",
@@ -10209,47 +9741,13 @@
        "node": ">=10"
      }
    },
-    "node_modules/terser-webpack-plugin": {
-      "version": "5.3.14",
-      "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.14.tgz",
-      "integrity": "sha512-vkZjpUjb6OMS7dhV+tILUW6BhpDR7P2L/aQSAv+Uwk+m8KATX9EccViHTJR2qDtACKPIYndLGCyl3FMo+r2LMw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@jridgewell/trace-mapping": "^0.3.25",
-        "jest-worker": "^27.4.5",
-        "schema-utils": "^4.3.0",
-        "serialize-javascript": "^6.0.2",
-        "terser": "^5.31.1"
-      },
-      "engines": {
-        "node": ">= 10.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      },
-      "peerDependencies": {
-        "webpack": "^5.1.0"
-      },
-      "peerDependenciesMeta": {
-        "@swc/core": {
-          "optional": true
-        },
-        "esbuild": {
-          "optional": true
-        },
-        "uglify-js": {
-          "optional": true
-        }
-      }
-    },
    "node_modules/terser/node_modules/acorn": {
      "version": "8.15.0",
      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.15.0.tgz",
      "integrity": "sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==",
-      "devOptional": true,
      "license": "MIT",
+      "optional": true,
+      "peer": true,
      "bin": {
        "acorn": "bin/acorn"
      },
@@ -10625,8 +10123,9 @@
      "version": "7.16.0",
      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.16.0.tgz",
      "integrity": "sha512-Zz+aZWSj8LE6zoxD+xrjh4VfkIG8Ya6LvYkZqtUQGJPZjYl53ypCaUwWqo7eI0x66KBGeRo+mlBEkMSeSZ38Nw==",
-      "devOptional": true,
-      "license": "MIT"
+      "license": "MIT",
+      "optional": true,
+      "peer": true
    },
    "node_modules/update-browserslist-db": {
      "version": "1.1.4",
@@ -11005,15 +10504,6 @@
        "node": ">=6.0.0"
      }
    },
-    "node_modules/vue-fragment": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/vue-fragment/-/vue-fragment-1.6.0.tgz",
-      "integrity": "sha512-a5T8ZZZK/EQzgVShEl374HbobUJ0a7v12BzOzS6Z/wd/5EE/5SffcyHC+7bf9hP3L7Yc0hhY/GhMdwFQ25O/8A==",
-      "license": "MIT",
-      "peerDependencies": {
-        "vue": "^2.5.16"
-      }
-    },
    "node_modules/vue-functional-data-merge": {
      "version": "3.1.0",
      "resolved": "https://registry.npmjs.org/vue-functional-data-merge/-/vue-functional-data-merge-3.1.0.tgz",
@@ -11081,20 +10571,6 @@
        "node": ">=18"
      }
    },
-    "node_modules/watchpack": {
-      "version": "2.4.4",
-      "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.4.tgz",
-      "integrity": "sha512-c5EGNOiyxxV5qmTtAB7rbiXxi1ooX1pQKMLX/MIabJjRA0SJBQOjKF+KSVfHkr9U1cADPon0mRiVe/riyaiDUA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "glob-to-regexp": "^0.4.1",
-        "graceful-fs": "^4.1.2"
-      },
-      "engines": {
-        "node": ">=10.13.0"
-      }
-    },
    "node_modules/webidl-conversions": {
      "version": "7.0.0",
      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-7.0.0.tgz",
@@ -11105,91 +10581,6 @@
        "node": ">=12"
      }
    },
-    "node_modules/webpack": {
-      "version": "5.102.1",
-      "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.102.1.tgz",
-      "integrity": "sha512-7h/weGm9d/ywQ6qzJ+Xy+r9n/3qgp/thalBbpOi5i223dPXKi04IBtqPN9nTd+jBc7QKfvDbaBnFipYp4sJAUQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@types/eslint-scope": "^3.7.7",
-        "@types/estree": "^1.0.8",
-        "@types/json-schema": "^7.0.15",
-        "@webassemblyjs/ast": "^1.14.1",
-        "@webassemblyjs/wasm-edit": "^1.14.1",
-        "@webassemblyjs/wasm-parser": "^1.14.1",
-        "acorn": "^8.15.0",
-        "acorn-import-phases": "^1.0.3",
-        "browserslist": "^4.26.3",
-        "chrome-trace-event": "^1.0.2",
-        "enhanced-resolve": "^5.17.3",
-        "es-module-lexer": "^1.2.1",
-        "eslint-scope": "5.1.1",
-        "events": "^3.2.0",
-        "glob-to-regexp": "^0.4.1",
-        "graceful-fs": "^4.2.11",
-        "json-parse-even-better-errors": "^2.3.1",
-        "loader-runner": "^4.2.0",
-        "mime-types": "^2.1.27",
-        "neo-async": "^2.6.2",
-        "schema-utils": "^4.3.3",
-        "tapable": "^2.3.0",
-        "terser-webpack-plugin": "^5.3.11",
-        "watchpack": "^2.4.4",
-        "webpack-sources": "^3.3.3"
-      },
-      "bin": {
-        "webpack": "bin/webpack.js"
-      },
-      "engines": {
-        "node": ">=10.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      },
-      "peerDependenciesMeta": {
-        "webpack-cli": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/webpack-sources": {
-      "version": "3.3.3",
-      "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.3.3.tgz",
-      "integrity": "sha512-yd1RBzSGanHkitROoPFd6qsrxt+oFhg/129YzheDGqeustzX0vTZJZsSsQjVQC4yzBQ56K55XU8gaNCtIzOnTg==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=10.13.0"
-      }
-    },
-    "node_modules/webpack/node_modules/acorn": {
-      "version": "8.15.0",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.15.0.tgz",
-      "integrity": "sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==",
-      "dev": true,
-      "license": "MIT",
-      "bin": {
-        "acorn": "bin/acorn"
-      },
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
-    "node_modules/webpack/node_modules/acorn-import-phases": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/acorn-import-phases/-/acorn-import-phases-1.0.4.tgz",
-      "integrity": "sha512-wKmbr/DDiIXzEOiWrTTUcDm24kQ2vGfZQvM2fwg2vXqR5uW6aapr7ObPtj1th32b9u90/Pf4AItvdTh42fBmVQ==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=10.13.0"
-      },
-      "peerDependencies": {
-        "acorn": "^8.14.0"
-      }
-    },
    "node_modules/whatwg-encoding": {
      "version": "3.1.1",
      "resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-3.1.1.tgz",
@@ -28,7 +28,7 @@
    "eslint-config-habitrpg": "6.2.0",
    "eslint-plugin-mocha": "5.3.0",
    "eslint-plugin-vue": "7.20.0",
-    "habitica-markdown": "^3.0.0",
+    "habitica-markdown": "^4.0.0",
    "hellojs": "^1.20.0",
    "intro.js": "^7.2.0",
    "jquery": "^3.7.1",
@@ -46,7 +46,6 @@
    "vite": "^6.3.6",
    "vite-plugin-compression2": "^1.3.3",
    "vue": "^2.7.10",
-    "vue-fragment": "^1.6.0",
    "vue-mugen-scroll": "^0.2.6",
    "vue-router": "^3.6.5",
    "vuedraggable": "^2.24.3",
@@ -60,8 +59,6 @@
    "jsdom": "^26.0.0",
    "mocha": "^11.1.0",
    "playwright": "^1.50.1",
-    "terser-webpack-plugin": "^5.3.10",
-    "vitest": "^3.0.5",
-    "webpack": "^5.94.0"
+    "vitest": "^3.0.5"
  }
 }
@@ -229,6 +229,11 @@ export default {
            }
            return Promise.resolve(error);
          }
+          if (error.response.status === 404
+            && error.response.config.method === 'get'
+            && error.response.config.url.indexOf('/api/v4/groups/party') !== -1) {
+            return Promise.reject(error);
+          }
        }

        const errorData = error.response.data;
@@ -22,8 +22,15 @@
  height: 219px;
 }

+.quest_alien {
+  background: url("https://habitica-assets.s3.amazonaws.com/mobileApp/images/quest_alien.gif") no-repeat;
+  width: 219px;
+  height: 219px;
+}
+
 .Pet_HatchingPotion_Dessert, .Pet_HatchingPotion_Veggie, .Pet_HatchingPotion_Windup,
-.Pet_HatchingPotion_VirtualPet, .Pet_HatchingPotion_Fungi, .Pet_HatchingPotion_Cryptid {
+.Pet_HatchingPotion_VirtualPet, .Pet_HatchingPotion_Fungi, .Pet_HatchingPotion_Cryptid,
+.Pet_HatchingPotion_Alien {
  width: 68px;
  height: 68px;
 }
@@ -52,6 +59,10 @@
  background: url("https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet_HatchingPotion_Cryptid.gif") no-repeat;
 }

+.Pet_HatchingPotion_Alien {
+  background: url("https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet_HatchingPotion_Alien.gif") no-repeat;
+}
+
 .Gems {
  display:inline-block;
  margin-right:5px;
@@ -1060,6 +1060,11 @@
  width: 141px;
  height: 147px;
 }
+.background_elven_citadel {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/background_elven_citadel.png');
+  width: 141px;
+  height: 147px;
+}
 .background_enchanted_music_room {
  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/background_enchanted_music_room.png');
  width: 141px;
@@ -1796,6 +1801,11 @@
  width: 141px;
  height: 147px;
 }
+.background_on_a_strange_planet {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/background_on_a_strange_planet.png');
+  width: 141px;
+  height: 147px;
+}
 .background_on_tree_branch {
  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/background_on_tree_branch.png');
  width: 141px;
@@ -1931,6 +1941,11 @@
  width: 141px;
  height: 147px;
 }
+.background_riding_a_comet {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/background_riding_a_comet.png');
+  width: 141px;
+  height: 147px;
+}
 .background_rime_ice {
  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/background_rime_ice.png');
  width: 141px;
@@ -2427,6 +2442,11 @@
  width: 141px;
  height: 147px;
 }
+.background_waterfall_with_rainbow {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/background_waterfall_with_rainbow.png');
+  width: 141px;
+  height: 147px;
+}
 .background_wedding_arch {
  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/background_wedding_arch.png');
  width: 141px;
@@ -29800,6 +29820,11 @@
  width: 114px;
  height: 90px;
 }
+.broad_armor_armoire_handstandOutfit {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/broad_armor_armoire_handstandOutfit.png');
+  width: 114px;
+  height: 90px;
+}
 .broad_armor_armoire_hattersSuit {
  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/broad_armor_armoire_hattersSuit.png');
  width: 114px;
@@ -30075,6 +30100,11 @@
  width: 114px;
  height: 90px;
 }
+.broad_armor_armoire_softYellowSuit {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/broad_armor_armoire_softYellowSuit.png');
+  width: 114px;
+  height: 90px;
+}
 .broad_armor_armoire_springPetalYukata {
  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/broad_armor_armoire_springPetalYukata.png');
  width: 114px;
@@ -30385,6 +30415,11 @@
  width: 114px;
  height: 90px;
 }
+.head_armoire_floppyYellowHat {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/head_armoire_floppyYellowHat.png');
+  width: 114px;
+  height: 90px;
+}
 .head_armoire_flutteryWig {
  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/head_armoire_flutteryWig.png');
  width: 114px;
@@ -30705,6 +30740,11 @@
  width: 114px;
  height: 90px;
 }
+.head_armoire_verdantArmingCap {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/head_armoire_verdantArmingCap.png');
+  width: 114px;
+  height: 90px;
+}
 .head_armoire_vermilionArcherHelm {
  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/head_armoire_vermilionArcherHelm.png');
  width: 90px;
@@ -31120,6 +31160,11 @@
  width: 114px;
  height: 90px;
 }
+.shield_armoire_softYellowPillow {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shield_armoire_softYellowPillow.png');
+  width: 114px;
+  height: 90px;
+}
 .shield_armoire_spanishGuitar {
  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shield_armoire_spanishGuitar.png');
  width: 114px;
@@ -31170,6 +31215,11 @@
  width: 114px;
  height: 90px;
 }
+.shield_armoire_verdantBanner {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shield_armoire_verdantBanner.png');
+  width: 114px;
+  height: 90px;
+}
 .shield_armoire_vikingShield {
  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shield_armoire_vikingShield.png');
  width: 90px;
@@ -31440,6 +31490,11 @@
  width: 114px;
  height: 90px;
 }
+.slim_armor_armoire_handstandOutfit {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/slim_armor_armoire_handstandOutfit.png');
+  width: 114px;
+  height: 90px;
+}
 .slim_armor_armoire_hattersSuit {
  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/slim_armor_armoire_hattersSuit.png');
  width: 114px;
@@ -31715,6 +31770,11 @@
  width: 114px;
  height: 90px;
 }
+.slim_armor_armoire_softYellowSuit {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/slim_armor_armoire_softYellowSuit.png');
+  width: 114px;
+  height: 90px;
+}
 .slim_armor_armoire_springPetalYukata {
  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/slim_armor_armoire_springPetalYukata.png');
  width: 114px;
@@ -34125,11 +34185,21 @@
  width: 114px;
  height: 90px;
 }
+.back_mystery_202605 {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/back_mystery_202605.png');
+  width: 114px;
+  height: 90px;
+}
 .broad_armor_mystery_202512 {
  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/broad_armor_mystery_202512.png');
  width: 114px;
  height: 90px;
 }
+.broad_armor_mystery_202604 {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/broad_armor_mystery_202604.png');
+  width: 114px;
+  height: 90px;
+}
 .head_mystery_202512 {
  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/head_mystery_202512.png');
  width: 114px;
@@ -34140,11 +34210,31 @@
  width: 114px;
  height: 90px;
 }
+.head_mystery_202603 {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/head_mystery_202603.png');
+  width: 114px;
+  height: 90px;
+}
+.head_mystery_202604 {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/head_mystery_202604.png');
+  width: 114px;
+  height: 90px;
+}
+.shield_mystery_202605 {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shield_mystery_202605.png');
+  width: 114px;
+  height: 90px;
+}
 .slim_armor_mystery_202512 {
  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/slim_armor_mystery_202512.png');
  width: 114px;
  height: 90px;
 }
+.slim_armor_mystery_202604 {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/slim_armor_mystery_202604.png');
+  width: 114px;
+  height: 90px;
+}
 .weapon_mystery_202512 {
  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/weapon_mystery_202512.png');
  width: 114px;
@@ -34155,6 +34245,11 @@
  width: 114px;
  height: 90px;
 }
+.weapon_mystery_202603 {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/weapon_mystery_202603.png');
+  width: 114px;
+  height: 90px;
+}
 .back_mystery_201402 {
  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/back_mystery_201402.png');
  width: 90px;
@@ -36275,6 +36370,26 @@
  width: 114px;
  height: 90px;
 }
+.broad_armor_special_spring2026Healer {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/broad_armor_special_spring2026Healer.png');
+  width: 114px;
+  height: 90px;
+}
+.broad_armor_special_spring2026Mage {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/broad_armor_special_spring2026Mage.png');
+  width: 114px;
+  height: 90px;
+}
+.broad_armor_special_spring2026Rogue {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/broad_armor_special_spring2026Rogue.png');
+  width: 114px;
+  height: 90px;
+}
+.broad_armor_special_spring2026Warrior {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/broad_armor_special_spring2026Warrior.png');
+  width: 114px;
+  height: 90px;
+}
 .broad_armor_special_springHealer {
  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/broad_armor_special_springHealer.png');
  width: 90px;
@@ -36595,6 +36710,26 @@
  width: 114px;
  height: 90px;
 }
+.head_special_spring2026Healer {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/head_special_spring2026Healer.png');
+  width: 114px;
+  height: 90px;
+}
+.head_special_spring2026Mage {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/head_special_spring2026Mage.png');
+  width: 114px;
+  height: 90px;
+}
+.head_special_spring2026Rogue {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/head_special_spring2026Rogue.png');
+  width: 114px;
+  height: 90px;
+}
+.head_special_spring2026Warrior {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/head_special_spring2026Warrior.png');
+  width: 114px;
+  height: 90px;
+}
 .head_special_springHealer {
  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/head_special_springHealer.png');
  width: 90px;
@@ -36780,6 +36915,21 @@
  width: 114px;
  height: 90px;
 }
+.shield_special_spring2026Healer {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shield_special_spring2026Healer.png');
+  width: 114px;
+  height: 90px;
+}
+.shield_special_spring2026Rogue {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shield_special_spring2026Rogue.png');
+  width: 114px;
+  height: 90px;
+}
+.shield_special_spring2026Warrior {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shield_special_spring2026Warrior.png');
+  width: 114px;
+  height: 90px;
+}
 .shield_special_springHealer {
  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shield_special_springHealer.png');
  width: 90px;
@@ -37015,6 +37165,26 @@
  width: 114px;
  height: 90px;
 }
+.slim_armor_special_spring2026Healer {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/slim_armor_special_spring2026Healer.png');
+  width: 114px;
+  height: 90px;
+}
+.slim_armor_special_spring2026Mage {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/slim_armor_special_spring2026Mage.png');
+  width: 114px;
+  height: 90px;
+}
+.slim_armor_special_spring2026Rogue {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/slim_armor_special_spring2026Rogue.png');
+  width: 114px;
+  height: 90px;
+}
+.slim_armor_special_spring2026Warrior {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/slim_armor_special_spring2026Warrior.png');
+  width: 114px;
+  height: 90px;
+}
 .slim_armor_special_springHealer {
  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/slim_armor_special_springHealer.png');
  width: 90px;
@@ -37255,6 +37425,26 @@
  width: 114px;
  height: 90px;
 }
+.weapon_special_spring2026Healer {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/weapon_special_spring2026Healer.png');
+  width: 114px;
+  height: 90px;
+}
+.weapon_special_spring2026Mage {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/weapon_special_spring2026Mage.png');
+  width: 114px;
+  height: 90px;
+}
+.weapon_special_spring2026Rogue {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/weapon_special_spring2026Rogue.png');
+  width: 114px;
+  height: 90px;
+}
+.weapon_special_spring2026Warrior {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/weapon_special_spring2026Warrior.png');
+  width: 114px;
+  height: 90px;
+}
 .weapon_special_springHealer {
  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/weapon_special_springHealer.png');
  width: 90px;
@@ -53038,6 +53228,11 @@
  width: 81px;
  height: 99px;
 }
+.Pet-BearCub-Alien {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-BearCub-Alien.png');
+  width: 81px;
+  height: 99px;
+}
 .Pet-BearCub-Amber {
  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-BearCub-Amber.png');
  width: 81px;
@@ -53528,6 +53723,11 @@
  width: 81px;
  height: 99px;
 }
+.Pet-Cactus-Alien {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-Cactus-Alien.png');
+  width: 81px;
+  height: 99px;
+}
 .Pet-Cactus-Amber {
  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-Cactus-Amber.png');
  width: 81px;
@@ -54318,6 +54518,11 @@
  width: 81px;
  height: 99px;
 }
+.Pet-Dragon-Alien {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-Dragon-Alien.png');
+  width: 81px;
+  height: 99px;
+}
 .Pet-Dragon-Amber {
  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-Dragon-Amber.png');
  width: 81px;
@@ -54813,6 +55018,11 @@
  width: 81px;
  height: 99px;
 }
+.Pet-FlyingPig-Alien {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-FlyingPig-Alien.png');
+  width: 81px;
+  height: 99px;
+}
 .Pet-FlyingPig-Amber {
  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-FlyingPig-Amber.png');
  width: 81px;
@@ -55148,6 +55358,11 @@
  width: 81px;
  height: 99px;
 }
+.Pet-Fox-Alien {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-Fox-Alien.png');
+  width: 81px;
+  height: 99px;
+}
 .Pet-Fox-Amber {
  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-Fox-Amber.png');
  width: 81px;
@@ -55928,6 +56143,11 @@
  width: 81px;
  height: 99px;
 }
+.Pet-LionCub-Alien {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-LionCub-Alien.png');
+  width: 81px;
+  height: 99px;
+}
 .Pet-LionCub-Amber {
  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-LionCub-Amber.png');
  width: 81px;
@@ -56533,6 +56753,11 @@
  width: 81px;
  height: 99px;
 }
+.Pet-PandaCub-Alien {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-PandaCub-Alien.png');
+  width: 81px;
+  height: 99px;
+}
 .Pet-PandaCub-Amber {
  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-PandaCub-Amber.png');
  width: 81px;
@@ -57928,6 +58153,11 @@
  width: 81px;
  height: 99px;
 }
+.Pet-TigerCub-Alien {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-TigerCub-Alien.png');
+  width: 81px;
+  height: 99px;
+}
 .Pet-TigerCub-Amber {
  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-TigerCub-Amber.png');
  width: 81px;
@@ -58573,6 +58803,11 @@
  width: 81px;
  height: 99px;
 }
+.Pet-Wolf-Alien {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-Wolf-Alien.png');
+  width: 81px;
+  height: 99px;
+}
 .Pet-Wolf-Amber {
  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-Wolf-Amber.png');
  width: 81px;
@@ -58,6 +58,11 @@ h3.markdown {
  img {
    max-width: 100%;
  }
+
+  .emoji-native {
+    font-size: 0.85em;
+    vertical-align: middle;
+  }
  
  blockquote {
    padding: 0 16px;
@@ -16,6 +16,10 @@
  border-bottom: 0;
 }

+.d-content {
+  display: contents;
+}
+
 * {
  transition: none;
 }
@@ -0,0 +1,5 @@
+<svg width="330" height="80" viewBox="0 0 330 80" preserveAspectRatio="none" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M159.797 60.5502C165.534 61.8466 171.631 62.7536 178.221 63.1767C208.94 65.1492 233.733 56.6838 260.68 47.483C282.33 40.091 305.37 32.2243 333.99 28.9144L336 16.3018C260.81 7.08865 233.373 23.1672 205.362 39.5825C192.037 47.3908 178.583 55.2753 159.797 60.5502Z" fill="#BDA8FF"/>
+<path d="M0 80L331.948 79.9998V29.1594C268.976 36.9871 233.03 66.6959 178.221 63.1767C112.951 58.9858 95.9516 7.31934 0.000104656 0L0 80Z" fill="#925CF3"/>
+<path d="M203.54 40.6496C166.339 36.8525 141.531 39.6251 122.334 45.4666C133.94 51.8989 145.792 57.3851 159.797 60.5502C177.727 55.5155 190.801 48.1036 203.54 40.6496Z" fill="#D5C8FF"/>
+</svg>
@@ -1,53 +1,228 @@
 <template>
  <b-modal
    id="rebirth"
-    :title="$t('modalAchievement')"
-    size="md"
-    :hide-footer="true"
+    size="sm"
+    :hide-header="true"
  >
-    <div class="modal-body">
-      <div class="col-12">
-        <!-- @TODO: +achievementAvatar('sun',0)--><achievement-avatar class="avatar" />
-      </div><div class="col-6 offset-3 text-center">
-        <div v-if="user.achievements.rebirthLevel < 100">
-          {{ $t('rebirthAchievement', {
-            number: user.achievements.rebirths,
-            level: user.achievements.rebirthLevel}) }}
-        </div><div v-if="user.achievements.rebirthLevel >= 100">
-          {{ $t('rebirthAchievement100', {number: user.achievements.rebirths}) }}
-        </div><br><button
-          class="btn btn-primary"
-          @click="close()"
-        >
-          {{ $t('huzzah') }}
-        </button>
+    <div
+      class="close-x"
+      @click.stop="close()"
+    >
+      <div
+        class="svg-icon svg-close"
+        v-html="icons.close"
+      ></div>
+    </div>
+    <div class="content text-center">
+      <h2
+        v-once
+        class="header"
+      >
+        {{ $t('rebirthNewAchievement') }}
+      </h2>
+      <div class="d-flex align-items-center justify-content-center icon-area">
+        <div
+          v-once
+          class="svg-icon sparkles mirror"
+          v-html="icons.starGroup"
+        ></div>
+        <Sprite
+          class="achievement-icon"
+          image-name="achievement-sun2x"
+        />
+        <div
+          v-once
+          class="svg-icon sparkles"
+          v-html="icons.starGroup"
+        ></div>
      </div>
-    </div><achievement-footer />
+      <p class="subtitle">
+        {{ $t('rebirthNewAdventure') }}
+      </p>
+      <p
+        class="description"
+        v-html="achievementText"
+      ></p>
+      <p
+        v-once
+        class="stack-info"
+      >
+        {{ $t('rebirthStackInfo') }}
+      </p>
+      <button
+        v-once
+        class="btn btn-primary"
+        @click="close()"
+      >
+        {{ $t('onwards') }}
+      </button>
+    </div>
+    <div
+      slot="modal-footer"
+      class="footer-wave"
+      v-html="icons.purpleWaves"
+    ></div>
  </b-modal>
 </template>

-<style scoped>
-  .avatar {
-    width: 140px;
-    margin: 0 auto;
-    margin-bottom: 1.5em;
-    margin-top: 1.5em;
+<style lang="scss">
+  @import '@/assets/scss/colors.scss';
+
+  #rebirth {
+    .modal-dialog {
+      width: 330px;
+    }
+
+    .modal-content {
+      border: none;
+      border-radius: 8px;
+      overflow: hidden;
+      box-shadow: 0 14px 28px 0 rgba($black, 0.24), 0 10px 10px 0 rgba($black, 0.28);
+    }
+
+    .modal-body {
+      padding: 0;
+    }
+
+    .modal-footer {
+      padding: 0;
+      border-top: none;
+      border-radius: 0;
+      margin: 0;
+      line-height: 0;
+    }
+  }
+</style>
+
+<style lang="scss" scoped>
+  @import '@/assets/scss/colors.scss';
+
+  .content {
+    padding: 24px 24px 0;
+  }
+
+  .header {
+    font-size: 1.25rem;
+    line-height: 1.4;
+    color: $purple-200;
+    margin-top: 8px;
+    margin-bottom: 16px;
+  }
+
+  .icon-area {
+    margin-bottom: 16px;
+  }
+
+  .sparkles {
+    width: 40px;
+    height: 64px;
+
+    &.mirror {
+      transform: scaleX(-1);
+    }
+  }
+
+  .close-x {
+    position: absolute;
+    right: 16px;
+    top: 16px;
+    cursor: pointer;
+    z-index: 2;
+
+    &:hover .svg-close {
+      opacity: 0.75;
+    }
+
+    .svg-close {
+      width: 16px;
+      height: 16px;
+      opacity: 0.5;
+      transition: opacity 0.2s ease;
+      pointer-events: none;
+    }
+  }
+
+  .achievement-icon {
+    margin: 0 24px;
+  }
+
+  .subtitle {
+    font-family: 'Roboto', sans-serif;
+    font-weight: 700;
+    font-style: normal;
+    font-size: 14px;
+    line-height: 24px;
+    letter-spacing: 0;
+    margin-bottom: 12px;
+    color: $gray-10;
+  }
+
+  .description {
+    font-size: 0.875rem;
+    line-height: 1.71;
+    margin-bottom: 12px;
+    color: $gray-50;
+  }
+
+  .stack-info {
+    font-size: 0.875rem;
+    line-height: 1.71;
+    color: $gray-50;
+    margin-bottom: 24px;
+  }
+
+  .btn-primary {
+    margin-bottom: 8px;
+  }
+
+  .footer-wave {
+    width: 100%;
+
+    ::v-deep svg {
+      display: block;
+      width: calc(100% + 8px);
+      height: auto;
+      margin: 0 -4px -4px;
+    }
  }
 </style>

 <script>
-import achievementFooter from './achievementFooter';
-import achievementAvatar from './achievementAvatar';
-
+import closeIcon from '@/assets/svg/close.svg?raw';
+import Sprite from '@/components/ui/sprite';
+import starGroup from '@/assets/svg/star-group.svg?raw';
+import purpleWaves from '@/assets/svg/purple-waves.svg?raw';
 import { mapState } from '@/libs/store';

 export default {
  components: {
-    achievementFooter,
-    achievementAvatar,
+    Sprite,
+  },
+  data () {
+    return {
+      icons: Object.freeze({
+        starGroup,
+        purpleWaves,
+        close: closeIcon,
+      }),
+    };
  },
  computed: {
    ...mapState({ user: 'user.data' }),
+    achievementText () {
+      const rebirths = this.user.achievements.rebirths || 0;
+      const level = this.user.achievements.rebirthLevel || 0;
+
+      if (level >= 100) {
+        return this.$t('rebirthAchievement100', { number: rebirths, level });
+      }
+
+      if (rebirths === 1) {
+        return this.$t('rebirthAchievement', { number: rebirths, level });
+      }
+
+      return this.$t('rebirthAchievementPlural', { number: rebirths, level });
+    },
  },
  methods: {
    close () {
@@ -1,41 +1,186 @@
 <template>
  <b-modal
    id="rebirth-enabled"
-    :title="$t('rebirthNew')"
-    size="md"
-    :hide-footer="true"
+    size="sm"
+    :hide-header="true"
  >
-    <div class="modal-body">
-      <div class="col-12">
-        <div class="rebirth_orb"></div>
-        <p>
-          <span>{{ $t('rebirthUnlock') }}</span>
-        </p>
-      </div>
+    <div
+      class="close-x"
+      @click.stop="close()"
+    >
+      <div
+        class="svg-icon svg-close"
+        v-html="icons.close"
+      ></div>
    </div>
-    <div class="modal-footer">
-      <div class="col-12 text-center">
-        <button
-          class="btn btn-primary"
-          @click="close()"
+    <div class="content text-center">
+      <h2
+        v-once
+        class="header"
+      >
+        {{ $t('rebirthUnlockedNewItem') }}
+      </h2>
+      <div class="d-flex align-items-center justify-content-center icon-area">
+        <div
+          v-once
+          class="svg-icon sparkles mirror"
+          v-html="icons.starGroup"
+        ></div>
+        <img
+          class="orb-icon"
+          src="@/assets/images/rebirth-orb.png"
+          alt="Orb of Rebirth"
        >
-          {{ $t('close') }}
-        </button>
+        <div
+          v-once
+          class="svg-icon sparkles"
+          v-html="icons.starGroup"
+        ></div>
      </div>
+      <p
+        v-once
+        class="subtitle"
+      >
+        {{ $t('rebirthUnlockedOrb') }}
+      </p>
+      <p
+        v-once
+        class="description"
+      >
+        {{ $t('rebirthUnlockedDesc') }}
+      </p>
+      <button
+        v-once
+        class="btn btn-primary"
+        @click="close()"
+      >
+        {{ $t('onwards') }}
+      </button>
    </div>
+    <div
+      slot="modal-footer"
+      class="clearfix"
+    ></div>
  </b-modal>
 </template>

-<style scoped>
-  .rebirth_orb {
-    margin: 0 auto;
+<style lang="scss">
+  @import '@/assets/scss/colors.scss';
+
+  #rebirth-enabled {
+    .modal-dialog {
+      width: 330px;
+    }
+
+    .modal-content {
+      border-radius: 8px;
+      overflow: hidden;
+      box-shadow: 0 14px 28px 0 rgba($black, 0.24), 0 10px 10px 0 rgba($black, 0.28);
+    }
+
+    .modal-body {
+      padding: 0;
+    }
+
+    .modal-footer {
+      padding: 0;
+      border-top: none;
+    }
+  }
+</style>
+
+<style lang="scss" scoped>
+  @import '@/assets/scss/colors.scss';
+
+  .content {
+    padding: 24px 24px 0;
+  }
+
+  .header {
+    font-size: 1.25rem;
+    line-height: 1.4;
+    color: $purple-200;
+    margin-top: 8px;
+    margin-bottom: 12px;
+  }
+
+  .icon-area {
+    margin-bottom: 12px;
+  }
+
+  .sparkles {
+    width: 40px;
+    height: 64px;
+
+    &.mirror {
+      transform: scaleX(-1);
+    }
+  }
+
+  .close-x {
+    position: absolute;
+    right: 16px;
+    top: 16px;
+    cursor: pointer;
+    z-index: 2;
+
+    &:hover .svg-close {
+      opacity: 0.75;
+    }
+
+    .svg-close {
+      width: 16px;
+      height: 16px;
+      opacity: 0.5;
+      transition: opacity 0.2s ease;
+      pointer-events: none;
+    }
+  }
+
+  .orb-icon {
+    width: 62px;
+    height: 62px;
+    margin: 0 24px;
+    image-rendering: pixelated;
+  }
+
+  .subtitle {
+    font-family: 'Roboto', sans-serif;
+    font-weight: 700;
+    font-style: normal;
+    font-size: 14px;
+    line-height: 24px;
+    letter-spacing: 0;
+    margin-bottom: 12px;
+    color: $gray-50;
+  }
+
+  .description {
+    font-size: 0.875rem;
+    line-height: 1.71;
+    margin-bottom: 24px;
+    color: $gray-100;
+  }
+
+  .btn-primary {
+    margin-bottom: 24px;
  }
 </style>

 <script>
+import closeIcon from '@/assets/svg/close.svg?raw';
+import starGroup from '@/assets/svg/star-group.svg?raw';
 import { mapState } from '@/libs/store';

 export default {
+  data () {
+    return {
+      icons: Object.freeze({
+        starGroup,
+        close: closeIcon,
+      }),
+    };
+  },
  computed: {
    ...mapState({ user: 'user.data' }),
  },
@@ -108,15 +108,15 @@ export default {
      const allEmails = [];
      if (user.auth.local.email) allEmails.push(user.auth.local.email);
      if (user.auth.google && user.auth.google.emails) {
-        const emails = user.auth.google.emails;
+        const { emails } = user.auth.google;
        allEmails.push(...this.findSocialEmails(emails));
      }
      if (user.auth.apple && user.auth.apple.emails) {
-        const emails = user.auth.apple.emails;
+        const { emails } = user.auth.apple;
        allEmails.push(...this.findSocialEmails(emails));
      }
      if (user.auth.facebook && user.auth.facebook.emails) {
-        const emails = user.auth.facebook.emails;
+        const { emails } = user.auth.facebook;
        allEmails.push(...this.findSocialEmails(emails));
      }
      return allEmails;
@@ -609,7 +609,7 @@ import subscriptionBlocks from '@/../../common/script/content/subscriptionBlocks
 import saveHero from '../mixins/saveHero';
 import LoadingSpinner from '@/components/ui/loadingSpinner';

-const PLAY_CONSOLE_ORDERS_BASE_URL = import.meta.env.PLAY_CONSOLE_ORDERS_BASE_URL;
+const { PLAY_CONSOLE_ORDERS_BASE_URL } = import.meta.env;

 const humanReadablePaymentDetails = {
  customerId: {
@@ -20,6 +20,29 @@
          class="form mx-auto"
          @submit.prevent.stop="register()"
        >
+          <div v-if="needsEmailField">
+            <input
+              id="emailInput"
+              v-model="email"
+              class="form-control dark"
+              type="text"
+              :placeholder="$t('emailAddress')"
+              :class="{
+                'mb-3': !emailError,
+                'input-invalid input-with-error mb-2': emailError,
+                'input-valid': email && emailValid,
+              }"
+            >
+            <div
+              v-if="emailError"
+              class="input-error"
+            >
+              {{ emailError }}
+            </div>
+            <p class="purple-600 mb-3">
+              {{ $t('emailRequiredForSupport') }}
+            </p>
+          </div>
          <input
            id="usernameInput"
            v-model="username"
@@ -58,8 +81,9 @@
            ></label>
          </div>
          <button
-            class="btn btn-info d-block w-100 sign-up mx-auto mb-5"
-            :disabled="!username || usernameInvalid || !privacyAccepted"
+            class="btn btn-info d-flex justify-content-center
+              align-items-center w-100 sign-up mx-auto mb-5"
+            :disabled="!email || emailError || !username || usernameInvalid || !privacyAccepted"
            type="submit"
          >
            {{ $t('getStarted') }}
@@ -133,10 +157,12 @@
    border: 2px solid transparent;
    box-shadow: 0 1px 3px 0 rgba($black, 0.16), 0 1px 3px 0 rgba($black, 0.24);

-    &:focus, &:active {
-      background-color: $blue-50;
-      border: 2px solid $purple-400;
-      box-shadow: 0 3px 6px 0 rgba($black, 0.16), 0 3px 6px 0 rgba($black, 0.24);
+    &:not(:disabled):not(.disabled) {
+      &:focus, &:active {
+        background-color: $blue-50;
+        border: 2px solid $purple-400;
+        box-shadow: 0 3px 6px 0 rgba($black, 0.16), 0 3px 6px 0 rgba($black, 0.24);
+      }
    }
  }

@@ -148,23 +174,19 @@
 <script>
 import debounce from 'lodash/debounce';
 import PrivacyBanner from '@/components/header/banners/privacy';
+import accountCreation from '@/mixins/accountCreation';
 import sanitizeRedirect from '@/mixins/sanitizeRedirect';

 export default {
  components: {
    PrivacyBanner,
  },
-  mixins: [sanitizeRedirect],
+  mixins: [accountCreation, sanitizeRedirect],
  data () {
    return {
-      authData: {},
-      email: '',
-      password: '',
-      passwordConfirm: '',
      privacyAccepted: false,
-      registrationMethod: null,
-      username: '',
      usernameIssues: [],
+      needsEmailField: false,
    };
  },
  computed: {
@@ -183,30 +205,40 @@ export default {
    },
  },
  mounted () {
-    if (window.sessionStorage.getItem('apple-token')) {
-      this.registrationMethod = 'apple';
-    } else if (!this.$store.state.registrationOptions.registrationMethod) {
-      this.$router.push('/');
-    } else {
-      this.registrationMethod = this.$store.state.registrationOptions.registrationMethod;
-    }
    this.authData = this.$store.state.registrationOptions.authData;
    this.email = this.$store.state.registrationOptions.email;
    this.username = this.$store.state.registrationOptions.username;
    this.password = this.$store.state.registrationOptions.password;
    this.passwordConfirm = this.$store.state.registrationOptions.passwordConfirm;

-    if (!this.email) {
+    if (window.sessionStorage.getItem('apple-token')) {
+      this.registrationMethod = 'apple';
+      if (!this.email) {
+        this.email = window.sessionStorage.getItem('apple-email');
+      }
+    } else if (!this.$store.state.registrationOptions.registrationMethod) {
+      this.$router.push('/');
+    } else {
+      this.registrationMethod = this.$store.state.registrationOptions.registrationMethod;
+    }
+
+    if (!this.email && this.registrationMethod !== 'apple') {
      return;
    }
-    const usernameToCheck = this.email.split('@')[0].replace(/[^a-zA-Z0-9\-_]/g, '');
-    this.$store.dispatch('auth:verifyUsername', {
-      username: usernameToCheck,
-    }).then(res => {
-      if (!res.issues) {
-        this.username = usernameToCheck;
-      }
-    });
+
+    if ((!this.email || this.email === '') && this.registrationMethod === 'apple') {
+      this.needsEmailField = true;
+    }
+    if (this.email) {
+      const usernameToCheck = this.email.split('@')[0].replace(/[^a-zA-Z0-9\-_]/g, '');
+      this.$store.dispatch('auth:verifyUsername', {
+        username: usernameToCheck,
+      }).then(res => {
+        if (!res.issues) {
+          this.username = usernameToCheck;
+        }
+      });
+    }
    document.getElementById('usernameInput').focus();
  },
  methods: {
@@ -237,6 +269,7 @@ export default {
          idToken: window.sessionStorage.getItem('apple-token'),
          name: window.sessionStorage.getItem('apple-name'),
          username: this.username,
+          email: this.email,
          allowRegister: true,
        });
      } else {
@@ -321,10 +321,11 @@ export default {
      return null;
    },
    petClass () {
-      const foolEvent = this.currentEventList?.find(event => event.aprilFools && moment()
-        .isBetween(event.start, event.end));
-      if (foolEvent) {
-        return this.foolPet(this.member.items.currentPet, foolEvent.aprilFools);
+      const substitutionEvent = this.currentEventList?.find(event => event.spriteSubstitutions
+        && moment().isBetween(event.start, event.end));
+      if (substitutionEvent && substitutionEvent.spriteSubstitutions.pets) {
+        return this.foolPet(`Pet-${this.member.items.currentPet}`,
+          substitutionEvent.spriteSubstitutions.pets);
      }
      if (this.member?.items.currentPet) return `Pet-${this.member.items.currentPet}`;
      return '';
@@ -12,23 +12,39 @@
        <label>
          <strong v-once>{{ $t('name') }} *</strong>
        </label>
-        <b-form-input
+        <input
+          ref="nameInput"
          v-model="workingChallenge.name"
+          class="form-control"
          type="text"
          :placeholder="$t('challengeNamePlaceholder')"
-          @keydown="enableSubmit"
-        />
+          @focus="setActiveField('name')"
+          @keydown="onFieldKeydown($event)"
+          @keydown.tab="autoCompleteMixinHandleTab($event)"
+          @keydown.up="autoCompleteMixinSelectPreviousAutocomplete($event)"
+          @keydown.down="autoCompleteMixinSelectNextAutocomplete($event)"
+          @keypress.enter="autoCompleteMixinSelectAutocomplete($event)"
+          @keydown.esc="autoCompleteMixinHandleEscape($event)"
+        >
      </div>
      <div class="form-group">
        <label>
          <strong v-once>{{ $t('shortName') }} *</strong>
        </label>
-        <b-form-input
+        <input
+          ref="shortNameInput"
          v-model="workingChallenge.shortName"
+          class="form-control"
          type="text"
          :placeholder="$t('shortNamePlaceholder')"
-          @keydown="enableSubmit"
-        />
+          @focus="setActiveField('shortName')"
+          @keydown="onFieldKeydown($event)"
+          @keydown.tab="autoCompleteMixinHandleTab($event)"
+          @keydown.up="autoCompleteMixinSelectPreviousAutocomplete($event)"
+          @keydown.down="autoCompleteMixinSelectNextAutocomplete($event)"
+          @keypress.enter="autoCompleteMixinSelectAutocomplete($event)"
+          @keydown.esc="autoCompleteMixinHandleEscape($event)"
+        >
      </div>
      <div class="form-group">
        <label>
@@ -40,10 +56,17 @@
          {{ $t('charactersRemaining', {characters: charactersRemaining}) }}
        </div>
        <textarea
+          ref="summaryTextarea"
          v-model="workingChallenge.summary"
          class="summary-textarea form-control"
          :placeholder="$t('challengeSummaryPlaceholder')"
-          @keydown="enableSubmit"
+          @focus="setActiveField('summary')"
+          @keydown="onFieldKeydown($event)"
+          @keydown.tab="autoCompleteMixinHandleTab($event)"
+          @keydown.up="autoCompleteMixinSelectPreviousAutocomplete($event)"
+          @keydown.down="autoCompleteMixinSelectNextAutocomplete($event)"
+          @keypress.enter="autoCompleteMixinSelectAutocomplete($event)"
+          @keydown.esc="autoCompleteMixinHandleEscape($event)"
        ></textarea>
      </div>
      <div class="form-group">
@@ -55,11 +78,26 @@
          class="float-right"
        ></a>
        <textarea
+          ref="descriptionTextarea"
          v-model="workingChallenge.description"
          class="description-textarea form-control"
          :placeholder="$t('challengeDescriptionPlaceholder')"
-          @keydown="enableSubmit"
+          @focus="setActiveField('description')"
+          @keydown="onFieldKeydown($event)"
+          @keydown.tab="autoCompleteMixinHandleTab($event)"
+          @keydown.up="autoCompleteMixinSelectPreviousAutocomplete($event)"
+          @keydown.down="autoCompleteMixinSelectNextAutocomplete($event)"
+          @keypress.enter="autoCompleteMixinSelectAutocomplete($event)"
+          @keydown.esc="autoCompleteMixinHandleEscape($event)"
        ></textarea>
+        <emoji-auto-complete
+          ref="emojiAutocomplete"
+          :text="activeFieldText"
+          :textbox="textbox"
+          :coords="mixinData.autoComplete.coords"
+          :caret-position="mixinData.autoComplete.caretPosition"
+          @select="selectedAutocomplete"
+        />
      </div>
      <div
        v-if="creating"
@@ -280,12 +318,17 @@ import { TAVERN_ID, MIN_SHORTNAME_SIZE_FOR_CHALLENGES, MAX_SUMMARY_SIZE_FOR_CHAL
 import CategoryOptions from '@/../../common/script/content/categoryOptions';
 import markdownDirective from '@/directives/markdown';
 import { userStateMixin } from '../../mixins/userState';
+import emojiAutoComplete from '@/components/chat/emojiAutoComplete';
+import { autoCompleteHelperMixin } from '@/mixins/autoCompleteHelper';

 export default {
+  components: {
+    emojiAutoComplete,
+  },
  directives: {
    markdown: markdownDirective,
  },
-  mixins: [userStateMixin],
+  mixins: [userStateMixin, autoCompleteHelperMixin],
  props: ['groupId'],
  data () {
    const categoryOptions = CategoryOptions;
@@ -319,9 +362,14 @@ export default {
      categoriesHashByKey,
      loading: false,
      groups: [],
+      textbox: null,
+      activeField: 'name',
    };
  },
  computed: {
+    activeFieldText () {
+      return this.workingChallenge[this.activeField] || '';
+    },
    creating () {
      return !this.workingChallenge.id;
    },
@@ -589,6 +637,29 @@ export default {
    toggleCategorySelect () {
      this.showCategorySelect = !this.showCategorySelect;
    },
+    setActiveField (field) {
+      this.activeField = field;
+      const refMap = {
+        name: 'nameInput',
+        shortName: 'shortNameInput',
+        summary: 'summaryTextarea',
+        description: 'descriptionTextarea',
+      };
+      this.textbox = this.$refs[refMap[field]] || null;
+    },
+    onFieldKeydown (e) {
+      this.enableSubmit();
+      this.autoCompleteMixinUpdateCarretPosition(e);
+    },
+    selectedAutocomplete (newText, newCaret) {
+      this.workingChallenge[this.activeField] = newText;
+      this.$nextTick(() => {
+        if (this.textbox) {
+          this.textbox.setSelectionRange(newCaret, newCaret);
+          this.textbox.focus();
+        }
+      });
+    },
    enableSubmit: throttle(function enableSubmit () {
      /* Enables the submit button if it was disabled */
      if (this.loading) {
@@ -0,0 +1,282 @@
+<template>
+  <div
+    v-if="searchResults.length > 0"
+    class="autocomplete-selection"
+    :style="autocompleteStyle"
+  >
+    <div
+      v-for="result in searchResults"
+      :key="result.shortcode"
+      class="autocomplete-results d-flex align-items-center"
+      :class="{'hover-background': result.hover}"
+      @click="select(result)"
+      @mouseenter="setHover(result)"
+      @mouseleave="resetSelection()"
+    >
+      <img
+        v-if="result.imageUrl"
+        class="emoji-img"
+        :src="result.imageUrl"
+        :alt="result.shortcode"
+      >
+      <span
+        v-else
+        class="emoji-char"
+      >{{ result.emoji }}</span>
+      <span
+        class="shortcode ml-2"
+        :class="{'hover-foreground': result.hover}"
+      >:{{ result.shortcode }}:</span>
+    </div>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+  @import '@/assets/scss/colors.scss';
+
+  .autocomplete-results {
+    padding: .5em;
+  }
+
+  .autocomplete-selection {
+    box-shadow: 1px 1px 1px #efefef;
+  }
+
+  .hover-background {
+    background-color: rgba(213, 200, 255, 0.32);
+    cursor: pointer;
+  }
+
+  .hover-foreground {
+    color: $purple-300 !important;
+  }
+
+  .emoji-char {
+    font-size: 20px;
+    line-height: 1;
+  }
+
+  .emoji-img {
+    height: 20px;
+    width: 20px;
+  }
+
+  .shortcode {
+    color: $gray-200;
+    font-size: 14px;
+  }
+</style>
+
+<script>
+import habiticaMarkdown from 'habitica-markdown';
+
+export default {
+  props: ['text', 'caretPosition', 'coords', 'textbox'],
+  data () {
+    return {
+      colonRegex: /:([a-zA-Z0-9_+]*)$/,
+      currentSearch: '',
+      searchActive: false,
+      searchResults: [],
+      selected: null,
+      emojiList: [],
+      renderTick: 0,
+      internalCoords: { TOP: 0, LEFT: 0 },
+    };
+  },
+  computed: {
+    autocompleteStyle () {
+      // eslint-disable-next-line no-unused-vars
+      const _tick = this.renderTick;
+      const isTextarea = this.textbox.tagName === 'TEXTAREA';
+      const dropdownPA = (this.$el && this.$el.nodeType === 1) ? this.$el.offsetParent : null;
+      const textboxOP = this.textbox.offsetParent;
+      const needsRectCalc = dropdownPA && textboxOP && dropdownPA !== textboxOP;
+
+      let top;
+      let left;
+      const caretLeft = this.internalCoords.LEFT - (this.textbox.scrollLeft || 0);
+
+      if (needsRectCalc) {
+        const textboxRect = this.textbox.getBoundingClientRect();
+        const parentRect = dropdownPA.getBoundingClientRect();
+        const parentScrollTop = dropdownPA.scrollTop || 0;
+
+        if (isTextarea) {
+          const computedStyle = window.getComputedStyle(this.textbox);
+          const lineHeight = parseFloat(computedStyle.lineHeight)
+            || (parseFloat(computedStyle.fontSize) * 1.4);
+          const caretTopInTextbox = this.internalCoords.TOP
+            - (this.textbox.scrollTop || 0) + lineHeight;
+          const clamped = Math.min(Math.max(caretTopInTextbox, 0), this.textbox.offsetHeight);
+          top = (textboxRect.top - parentRect.top) + parentScrollTop + clamped + 2;
+        } else {
+          top = (textboxRect.bottom - parentRect.top) + parentScrollTop + 2;
+        }
+        left = (textboxRect.left - parentRect.left) + caretLeft;
+      } else {
+        if (isTextarea) {
+          const computedStyle = window.getComputedStyle(this.textbox);
+          const lineHeight = parseFloat(computedStyle.lineHeight)
+            || (parseFloat(computedStyle.fontSize) * 1.4);
+          const caretTopInTextbox = this.internalCoords.TOP
+            - (this.textbox.scrollTop || 0) + lineHeight;
+          const clamped = Math.min(Math.max(caretTopInTextbox, 0), this.textbox.offsetHeight);
+          top = this.textbox.offsetTop + clamped + 2;
+        } else {
+          top = this.textbox.offsetTop + this.textbox.offsetHeight + 2;
+        }
+        left = this.textbox.offsetLeft + caretLeft;
+      }
+
+      return {
+        top: `${top}px`,
+        left: `${left}px`,
+        position: 'absolute',
+        minWidth: '150px',
+        zIndex: 100,
+        backgroundColor: 'white',
+      };
+    },
+  },
+  watch: {
+    searchResults (results, oldResults) {
+      if (results.length > 0 && (!oldResults || oldResults.length === 0)) {
+        this.$nextTick(() => {
+          this.renderTick += 1;
+        });
+      }
+    },
+    text (newText, prevText) {
+      if (!this.textbox) return;
+      this._measureCaretCoords();
+      const delCharsBool = prevText.length > newText.length;
+      const caretPosition = this.textbox.selectionEnd;
+      const lastFocusChar = delCharsBool ? prevText[caretPosition] : newText[caretPosition - 1];
+      if (
+        newText.length === 0
+        || (lastFocusChar === ':' && delCharsBool)
+      ) {
+        this.cancel();
+      } else {
+        if (lastFocusChar === ':') this.searchActive = true;
+        if (this.searchActive) {
+          this.searchResults = this.solveSearchResults(newText.substring(0, caretPosition));
+        }
+      }
+    },
+  },
+  created () {
+    const defs = habiticaMarkdown.emojiDefs;
+    if (!defs) return;
+    const customEmojis = habiticaMarkdown.customEmojis || {};
+    const list = [];
+    const keys = Object.keys(defs);
+    keys.sort();
+    for (const key of keys) {
+      const entry = { shortcode: key, emoji: defs[key], hover: false };
+      if (customEmojis[key]) {
+        entry.imageUrl = customEmojis[key];
+      }
+      list.push(entry);
+    }
+    this.emojiList = list;
+  },
+  methods: {
+    solveSearchResults (textFocus) {
+      const regexRes = this.colonRegex.exec(textFocus);
+      if (!regexRes) {
+        this.cancel();
+        return [];
+      }
+      this.currentSearch = regexRes[1]; // eslint-disable-line prefer-destructuring
+
+      if (this.currentSearch.length === 0) return [];
+
+      const lowerSearch = this.currentSearch.toLowerCase();
+      return this.emojiList
+        .filter(entry => entry.shortcode.startsWith(lowerSearch))
+        .slice(0, 6)
+        .map(entry => ({ ...entry, hover: false }));
+    },
+    select (result) {
+      const { text } = this;
+      const targetName = `${result.shortcode}: `;
+      const oldCaret = this.caretPosition;
+      const escapedSearch = this.currentSearch.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+      let newText = text.substring(0, this.caretPosition)
+        .replace(new RegExp(`${escapedSearch}$`), targetName);
+      const newCaret = newText.length;
+      newText += text.substring(oldCaret, text.length);
+      this.$emit('select', newText, newCaret);
+
+      this.cancel();
+    },
+    setHover (result) {
+      this.resetSelection();
+      result.hover = true;
+    },
+    clearHover () {
+      for (const selection of this.searchResults) {
+        selection.hover = false;
+      }
+    },
+    resetSelection () {
+      this.clearHover();
+      this.selected = null;
+    },
+    selectNext () {
+      if (this.searchResults.length > 0) {
+        this.clearHover();
+        this.selected = this.selected === null
+          ? 0
+          : (this.selected + 1) % this.searchResults.length;
+        this.searchResults[this.selected].hover = true;
+      }
+    },
+    selectPrevious () {
+      if (this.searchResults.length > 0) {
+        this.clearHover();
+        this.selected = this.selected === null
+          ? this.searchResults.length - 1
+          : (this.selected - 1 + this.searchResults.length) % this.searchResults.length;
+        this.searchResults[this.selected].hover = true;
+      }
+    },
+    makeSelection () {
+      if (this.searchResults.length > 0 && this.selected !== null) {
+        const result = this.searchResults[this.selected];
+        this.select(result);
+      }
+    },
+    _measureCaretCoords () {
+      const el = this.textbox;
+      const caretPosition = el.selectionEnd;
+      const div = document.createElement('div');
+      const span = document.createElement('span');
+      const copyStyle = getComputedStyle(el);
+
+      [].forEach.call(copyStyle, prop => {
+        div.style[prop] = copyStyle[prop];
+      });
+
+      div.style.position = 'absolute';
+      div.style.visibility = 'hidden';
+      document.body.appendChild(div);
+      div.textContent = el.value.substr(0, caretPosition);
+      span.textContent = el.value.substr(caretPosition) || '.';
+      div.appendChild(span);
+      this.internalCoords = {
+        TOP: span.offsetTop,
+        LEFT: span.offsetLeft,
+      };
+      document.body.removeChild(div);
+    },
+    cancel () {
+      this.searchActive = false;
+      this.searchResults = [];
+      this.resetSelection();
+    },
+  },
+};
+</script>
@@ -187,7 +187,8 @@
          </div>
        </div>
        <div
-          v-if="user.purchased.background.birthday_bash"
+          v-if="user.purchased.background.birthday_bash
+            || user.purchased.background.on_a_strange_planet"
        >
          <div
            class="row justify-content-center title-row mb-3"
@@ -0,0 +1,577 @@
+<template>
+  <b-modal
+    id="group-plan-selection"
+    :hide-footer="true"
+    :hide-header="true"
+    size="md"
+    @show="loadData"
+    @hide="onHide"
+  >
+    <div class="selection-modal">
+      <div class="modal-header-row">
+        <h2 class="title">
+          {{ $t('chooseAnOption') }}
+        </h2>
+        <div class="header-actions">
+          <span
+            class="cancel-text"
+            @click="close"
+          >
+            {{ $t('cancel') }}
+          </span>
+          <button
+            class="btn btn-primary next-button"
+            :class="{ disabled: !selectedOption }"
+            :disabled="!selectedOption"
+            @click="continueFlow"
+          >
+            {{ $t('next') }}
+          </button>
+        </div>
+      </div>
+
+      <div
+        v-if="loading"
+        class="loading-container"
+      >
+        <div class="spinner-border text-secondary"></div>
+      </div>
+
+      <template v-else>
+        <div
+          v-if="hasUpgradeableGroups"
+          class="section-header"
+        >
+          {{ $t('upgradeExistingGroup') }}
+        </div>
+
+        <selectable-card
+          v-for="group in upgradeableGuilds"
+          :key="group._id"
+          class="option-card"
+          :selected="isSelected(group)"
+          @click="selectOption(group)"
+        >
+          <div class="option-content">
+            <div class="option-info">
+              <div class="option-name">
+                {{ group.name }}
+              </div>
+              <div class="option-members">
+                {{ formatMemberCount(group.memberCount) }}
+              </div>
+              <div class="option-label previously-upgraded">
+                <div
+                  class="svg-icon sparkle-icon"
+                  v-html="icons.sparkles"
+                ></div>
+                {{ $t('previouslyUpgradedGroup') }}
+              </div>
+            </div>
+            <div class="option-price">
+              ${{ calculatePrice(group.memberCount) }}.00/mo
+            </div>
+          </div>
+        </selectable-card>
+
+        <selectable-card
+          v-if="upgradeableParty"
+          class="option-card"
+          :class="{ 'has-pending-warning': partyPendingInviteCount > 0 }"
+          :selected="isSelected(upgradeableParty)"
+          @click="selectOption(upgradeableParty)"
+        >
+          <div class="option-content">
+            <div class="option-info">
+              <div class="option-name">
+                {{ upgradeableParty.name }}
+              </div>
+              <div class="option-members">
+                {{ formatMemberCount(upgradeableParty.memberCount) }}
+                <span
+                  v-if="partyPendingInviteCount > 0"
+                  class="pending-count"
+                >
+                  {{ $t('pendingCount', { count: partyPendingInviteCount }) }}
+                </span>
+              </div>
+              <div
+                v-if="isPartyPreviouslyUpgraded"
+                class="option-label previously-upgraded"
+              >
+                <div
+                  class="svg-icon sparkle-icon"
+                  v-html="icons.sparkles"
+                ></div>
+                {{ $t('previouslyUpgradedGroup') }}
+              </div>
+              <div
+                v-else
+                class="option-label your-party"
+              >
+                <div
+                  class="svg-icon member-icon"
+                  v-html="icons.member"
+                ></div>
+                {{ $t('yourParty') }}
+              </div>
+            </div>
+            <div class="option-price">
+              ${{ calculatePrice(upgradeableParty.memberCount) }}.00/mo
+            </div>
+          </div>
+          <div
+            v-if="partyPendingInviteCount > 0"
+            class="pending-warning-banner"
+          >
+            <div
+              class="svg-icon alert-icon"
+              v-html="icons.alert"
+            ></div>
+            <span class="warning-text">{{ $t('upgradeCancelsPendingInvites') }}</span>
+          </div>
+        </selectable-card>
+
+        <div
+          v-if="hasUpgradeableGroups"
+          class="or-divider"
+        >
+          <div class="divider-line"></div>
+          <span class="or-text">{{ $t('or') }}</span>
+          <div class="divider-line"></div>
+        </div>
+
+        <selectable-card
+          class="option-card create-new"
+          :selected="selectedOption === 'new'"
+          @click="selectOption('new')"
+        >
+          <div class="option-content">
+            <div class="option-info">
+              <div class="option-name">
+                {{ $t('createNewGroup') }}
+              </div>
+              <div class="option-description">
+                {{ $t('inviteOthersForAdditional') }}
+                <span class="price-highlight">${{ perMemberPrice }}.00</span>
+                {{ $t('perMember') }}.
+              </div>
+            </div>
+            <div class="option-price">
+              ${{ basePrice }}.00/mo
+            </div>
+          </div>
+        </selectable-card>
+
+        <div class="footer-note">
+          {{ $t('additionalMembersProrated') }}
+        </div>
+      </template>
+    </div>
+  </b-modal>
+</template>
+
+<style lang="scss" scoped>
+@import '@/assets/scss/colors.scss';
+
+.selection-modal {
+  padding: 24px;
+}
+
+.modal-header-row {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  margin-bottom: 24px;
+}
+
+.title {
+  font-family: 'Roboto Condensed', sans-serif;
+  font-weight: 700;
+  font-size: 20px;
+  line-height: 28px;
+  color: $purple-200;
+  margin: 0;
+}
+
+.header-actions {
+  display: flex;
+  align-items: center;
+}
+
+.cancel-text {
+  color: $blue-10;
+  font-size: 0.875rem;
+  margin-right: 16px;
+  cursor: pointer;
+}
+
+.next-button {
+  min-width: 64px;
+
+  &.disabled {
+    background-color: $gray-300;
+    border-color: $gray-300;
+    cursor: not-allowed;
+  }
+}
+
+.loading-container {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  min-height: 200px;
+}
+
+.section-header {
+  font-family: 'Roboto', sans-serif;
+  font-weight: 700;
+  font-size: 14px;
+  line-height: 24px;
+  color: $gray-10;
+  margin-bottom: 12px;
+}
+
+.option-card {
+  margin-bottom: 12px;
+
+  ::v-deep .option-name {
+    color: $gray-50;
+  }
+
+  &.selected ::v-deep .option-name {
+    color: $purple-200;
+  }
+}
+
+.pending-warning-banner {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  height: 32px;
+  background-color: $yellow-50;
+  border-radius: 0 0 6px 6px;
+  margin: 16px -16px 0 -16px;
+  gap: 4px;
+
+  .selected & {
+    margin: 15px -15px 0 -15px;
+  }
+
+  .alert-icon {
+    width: 16px;
+    height: 16px;
+    flex-shrink: 0;
+
+    ::v-deep path {
+      fill: $gray-10;
+    }
+  }
+
+  .warning-text {
+    font-family: 'Roboto', sans-serif;
+    font-weight: 400;
+    font-size: 12px;
+    line-height: 16px;
+    color: $gray-10;
+  }
+}
+
+.option-content {
+  display: flex;
+  justify-content: space-between;
+  align-items: flex-start;
+  padding-left: 32px;
+  padding-right: 8px;
+}
+
+.option-info {
+  flex: 1;
+}
+
+.option-name {
+  font-family: 'Roboto', sans-serif;
+  font-size: 14px;
+  font-weight: 700;
+  line-height: 24px;
+  margin-bottom: 4px;
+}
+
+.option-members {
+  font-family: 'Roboto', sans-serif;
+  font-weight: 400;
+  font-size: 12px;
+  line-height: 16px;
+  color: $gray-100;
+  margin-bottom: 8px;
+
+  .pending-count {
+    font-weight: 700;
+    color: $yellow-5;
+  }
+}
+
+.option-label {
+  display: flex;
+  align-items: center;
+  font-family: 'Roboto', sans-serif;
+  font-size: 12px;
+  line-height: 16px;
+  gap: 4px;
+
+  &.previously-upgraded {
+    font-weight: 700;
+    color: $blue-10;
+  }
+
+  &.your-party {
+    font-weight: 700;
+    color: $gray-100;
+  }
+
+  .svg-icon {
+    width: 14px;
+    height: 14px;
+  }
+
+  .sparkle-icon {
+    color: $blue-10;
+  }
+
+  .member-icon {
+    color: $gray-100;
+
+    ::v-deep path {
+      fill: $gray-100;
+      stroke: $gray-100;
+      stroke-width: 0.5px;
+    }
+  }
+}
+
+.option-description {
+  font-family: 'Roboto', sans-serif;
+  font-weight: 400;
+  font-size: 12px;
+  line-height: 16px;
+  color: $gray-100;
+
+  .price-highlight {
+    font-weight: 700;
+  }
+}
+
+.option-price {
+  font-family: 'Roboto', sans-serif;
+  font-weight: 700;
+  font-size: 20px;
+  line-height: 24px;
+  color: $purple-200;
+  white-space: nowrap;
+}
+
+.or-divider {
+  display: flex;
+  align-items: center;
+  margin: 20px 0;
+
+  .divider-line {
+    flex: 1;
+    height: 1px;
+    background-color: $gray-500;
+  }
+
+  .or-text {
+    padding: 0 16px;
+    font-family: 'Roboto', sans-serif;
+    font-weight: 700;
+    font-size: 12px;
+    line-height: 16px;
+    letter-spacing: 0.2em;
+    text-transform: uppercase;
+    color: $gray-100;
+  }
+}
+
+.create-new {
+  .option-name {
+    margin-bottom: 8px;
+  }
+}
+
+.footer-note {
+  font-family: 'Roboto', sans-serif;
+  font-weight: 400;
+  font-size: 12px;
+  line-height: 16px;
+  color: $gray-100;
+  text-align: center;
+  margin-top: 16px;
+  margin-left: 24px;
+  margin-right: 24px;
+}
+</style>
+
+<style lang="scss">
+#group-plan-selection {
+  .modal-dialog {
+    max-width: 504px;
+  }
+
+  .modal-content {
+    border-radius: 8px;
+    box-shadow: 0 14px 28px 0 rgba(26, 24, 29, 0.24), 0 10px 10px 0 rgba(26, 24, 29, 0.28);
+  }
+
+  .modal-body {
+    padding: 0;
+  }
+
+  .option-card.has-pending-warning.selectable-card {
+    padding-bottom: 0;
+  }
+}
+</style>
+
+<script>
+import axios from 'axios';
+import paymentsMixin from '@/mixins/payments';
+import { mapState } from '@/libs/store';
+import SelectableCard from '@/components/ui/selectableCard.vue';
+import svgSparkles from '@/assets/svg/sparkles.svg?raw';
+import svgMember from '@/assets/svg/member-icon.svg?raw';
+import svgAlert from '@/assets/svg/for-css/alert.svg?raw';
+
+export default {
+  components: {
+    SelectableCard,
+  },
+  mixins: [paymentsMixin],
+  data () {
+    return {
+      selectedOption: null,
+      userGuilds: [],
+      userParty: null,
+      activeGroupPlanIds: [],
+      loading: true,
+      basePrice: 9,
+      perMemberPrice: 3,
+      icons: Object.freeze({
+        sparkles: svgSparkles,
+        member: svgMember,
+        alert: svgAlert,
+      }),
+      partyPendingInviteCount: 0,
+    };
+  },
+  computed: {
+    ...mapState({ user: 'user.data' }),
+    upgradeableGuilds () {
+      return this.userGuilds.filter(group => {
+        const leaderId = group.leader?._id || group.leader;
+        if (leaderId !== this.user._id) return false;
+        const { purchased } = group;
+        if (!purchased?.wasUpgraded) return false;
+        if (this.activeGroupPlanIds.includes(group._id)) return false;
+        if (!purchased.dateTerminated) return false;
+        return new Date(purchased.dateTerminated) < new Date();
+      });
+    },
+    upgradeableParty () {
+      if (!this.userParty) return null;
+
+      const leaderId = this.userParty.leader?._id || this.userParty.leader;
+      if (leaderId !== this.user._id) return null;
+
+      if (this.activeGroupPlanIds.includes(this.userParty._id)) return null;
+
+      return this.userParty;
+    },
+    hasUpgradeableGroups () {
+      return this.upgradeableGuilds.length > 0 || this.upgradeableParty !== null;
+    },
+    isPartyPreviouslyUpgraded () {
+      if (!this.userParty) return false;
+      const { purchased } = this.userParty;
+      if (!purchased?.wasUpgraded) return false;
+      if (!purchased.dateTerminated) return false;
+      return new Date(purchased.dateTerminated) < new Date();
+    },
+  },
+  methods: {
+    async loadData () {
+      this.loading = true;
+      this.selectedOption = null;
+      this.partyPendingInviteCount = 0;
+
+      try {
+        const [guildsResponse, partyResponse] = await Promise.all([
+          axios.get('/api/v4/groups', { params: { type: 'guilds', includeExpiredPlans: 'true' } }),
+          axios.get('/api/v4/groups/party').catch(() => ({ data: { data: null } })),
+        ]);
+
+        this.userGuilds = guildsResponse.data.data || [];
+        this.userParty = partyResponse.data.data;
+
+        if (this.userParty) {
+          try {
+            const invitesResponse = await axios.get(`/api/v4/groups/${this.userParty._id}/invites`);
+            this.partyPendingInviteCount = invitesResponse.data.data?.length || 0;
+          } catch (e) {
+            this.partyPendingInviteCount = 0;
+          }
+        }
+
+        await this.$store.dispatch('guilds:getGroupPlans', true);
+        const groupPlans = this.$store.state.groupPlans?.data || [];
+        this.activeGroupPlanIds = groupPlans.map(g => g._id);
+      } catch (e) {
+        console.error('Error loading group data:', e);
+      }
+
+      this.loading = false;
+
+      this.$nextTick(() => {
+        if (this.upgradeableGuilds.length > 0) {
+          [this.selectedOption] = this.upgradeableGuilds;
+        } else if (this.upgradeableParty) {
+          this.selectedOption = this.upgradeableParty;
+        } else {
+          this.selectedOption = 'new';
+        }
+      });
+    },
+    selectOption (option) {
+      this.selectedOption = option;
+    },
+    isSelected (group) {
+      if (!this.selectedOption || this.selectedOption === 'new') return false;
+      return this.selectedOption._id === group._id;
+    },
+    calculatePrice (memberCount) {
+      return this.basePrice + (this.perMemberPrice * (memberCount - 1));
+    },
+    formatMemberCount (count) {
+      return count === 1 ? this.$t('oneMember') : this.$t('membersCount', { count });
+    },
+    continueFlow () {
+      if (!this.selectedOption) return;
+
+      const selection = this.selectedOption;
+      this.close();
+
+      if (selection === 'new') {
+        this.$root.$emit('bv::show::modal', 'create-group');
+      } else {
+        this.stripeGroup({ group: selection, upgrade: true });
+      }
+    },
+    close () {
+      this.$root.$emit('bv::hide::modal', 'group-plan-selection');
+    },
+    onHide () {
+      this.selectedOption = null;
+    },
+  },
+};
+</script>
@@ -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);
@@ -41,6 +41,14 @@
          :chat="group.chat"
          @select="selectedAutocomplete"
        />
+        <emoji-auto-complete
+          ref="emojiAutocomplete"
+          :text="newMessage"
+          :textbox="textbox"
+          :coords="mixinData.autoComplete.coords"
+          :caret-position="mixinData.autoComplete.caretPosition"
+          @select="selectedAutocomplete"
+        />
      </div>
      <community-guidelines />
      <div class="row chat-actions">
@@ -90,6 +98,7 @@ import { MAX_MESSAGE_LENGTH } from '@/../../common/script/constants';
 import externalLinks from '../../mixins/externalLinks';

 import autocomplete from '../chat/autoComplete';
+import emojiAutoComplete from '../chat/emojiAutoComplete';
 import communityGuidelines from './communityGuidelines';
 import chatMessages from '../chat/chatMessages';
 import { mapState } from '@/libs/store';
@@ -102,6 +111,7 @@ export default {
  },
  components: {
    autocomplete,
+    emojiAutoComplete,
    communityGuidelines,
    chatMessages,
  },
@@ -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');
    },
@@ -25,53 +25,61 @@
        <div class="col-12 col-md-6">
          <div class="row icon-row">
            <div
-              class="item-with-icon"
+              class="item-with-icon p-2"
              tabindex="0"
              role="button"
              @keyup.enter="showMemberModal()"
              @click="showMemberModal()"
            >
-              <div
-                v-if="group.memberCount > 1000"
-                class="svg-icon shield"
-                v-html="icons.goldGuildBadgeIcon"
-              ></div>
-              <div
-                v-if="group.memberCount > 100 && group.memberCount < 999"
-                class="svg-icon shield"
-                v-html="icons.silverGuildBadgeIcon"
-              ></div>
-              <div
-                v-if="group.memberCount < 100"
-                class="svg-icon shield"
-                v-html="icons.bronzeGuildBadgeIcon"
-              ></div>
-              <span class="number">{{ group.memberCount | abbrNum }}</span>
-              <div
-                v-once
-                class="member-list label"
-              >
-                {{ $t('memberList') }}
+              <div class="box-content">
+                <div class="icon-number-row">
+                  <div
+                    v-if="group.memberCount > 1000"
+                    class="svg-icon shield"
+                    v-html="icons.goldGuildBadgeIcon"
+                  ></div>
+                  <div
+                    v-if="group.memberCount > 100 && group.memberCount < 999"
+                    class="svg-icon shield"
+                    v-html="icons.silverGuildBadgeIcon"
+                  ></div>
+                  <div
+                    v-if="group.memberCount < 100"
+                    class="svg-icon shield"
+                    v-html="icons.bronzeGuildBadgeIcon"
+                  ></div>
+                  <span class="number">{{ group.memberCount | abbrNum }}</span>
+                </div>
+                <div
+                  v-once
+                  class="details"
+                >
+                  {{ $t('memberList') }}
+                </div>
              </div>
            </div>
            <div v-if="!isParty">
              <div
-                class="item-with-icon"
+                class="item-with-icon p-2"
                tabindex="0"
                role="button"
                @keyup.enter="showGroupGems()"
                @click="showGroupGems()"
              >
-                <div
-                  class="svg-icon gem"
-                  v-html="icons.gem"
-                ></div>
-                <span class="number">{{ group.balance * 4 }}</span>
-                <div
-                  v-once
-                  class="label"
-                >
-                  {{ $t('guildBank') }}
+                <div class="box-content">
+                  <div class="icon-number-row">
+                    <div
+                      class="svg-icon gem"
+                      v-html="icons.gem"
+                    ></div>
+                    <span class="number">{{ group.balance * 4 }}</span>
+                  </div>
+                  <div
+                    v-once
+                    class="details"
+                  >
+                    {{ $t('guildBank') }}
+                  </div>
                </div>
              </div>
            </div>
@@ -128,35 +136,57 @@
  }

  .item-with-icon {
+    display: inline-block;
    border-radius: 2px;
-    background-color: #ffffff;
+    background-color: $white;
    box-shadow: 0 2px 2px 0 rgba(26, 24, 29, 0.16), 0 1px 4px 0 rgba(26, 24, 29, 0.12);
-    padding: 1em;
-    text-align: center;
-    min-width: 120px;
+    margin-left: 1em;
+    width: 120px;
    height: 76px;
-    margin-right: 1rem;
+    text-align: center;
+    font-size: 20px;
+    vertical-align: bottom;
+    overflow: hidden;
+    position: relative;

-    &:last-of-type {
-      margin-left: 0.5rem;
+    .box-content {
+      display: flex;
+      flex-direction: column;
+      align-items: center;
+      justify-content: center;
+      height: 100%;
+      width: 100%;
    }

-    .svg-icon.shield, .svg-icon.gem {
-      width: 28px;
-      height: auto;
-      margin: 0 auto;
+    .icon-number-row {
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      margin-bottom: 0.1em;
+
+      .number {
+        font-size: 18px;
+        font-weight: normal;
+        margin-left: 0.2em;
+      }
+    }
+
+    .svg-icon {
+      width: 24px;
+      height: 24px;
      display: inline-block;
      vertical-align: bottom;
-      margin-right: 0.5em;
    }

-    .number {
-      font-size: 22px;
-      font-weight: bold;
-    }
-
-    .label {
-      margin-top: .5em;
+    .details {
+      font-size: 11px;
+      color: $gray-200;
+      width: 100%;
+      padding: 0 4px;
+      line-height: 1.1;
+      word-break: break-word;
+      max-height: 2.2em;
+      overflow: visible;
    }
  }

@@ -215,11 +245,6 @@
  .icon-row {
    margin-top: 1em;
    justify-content: flex-end;
-
-    .number {
-      font-size: 22px;
-      font-weight: bold;
-    }
  }

  .chat-row {
@@ -289,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';
@@ -535,7 +559,6 @@ export default {

      if (this.isParty) {
        data.type = 'party';
-        Analytics.updateUser({ partySize: null, partyID: null });
        this.$store.state.partyMembers = [];
      }

@@ -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;
@@ -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');
      }
    },
@@ -182,12 +182,10 @@ export default {
      return 'GreyedOut';
    },
    imageName () {
-      const foolEvent = this.currentEventList?.find(event => moment()
-        .isBetween(event.start, event.end) && event.aprilFools);
-      if (this.isOwned() && foolEvent) {
-        if (this.isSpecial()) return `stable_${this.foolPet(this.item.key, foolEvent.aprilFools)}`;
-        const petString = `${this.item.eggKey}-${this.item.key}`;
-        return `stable_${this.foolPet(petString, foolEvent.aprilFools)}`;
+      const substitutionEvent = this.currentEventList?.find(event => moment()
+        .isBetween(event.start, event.end) && event.spriteSubstitutions);
+      if (this.isOwned() && substitutionEvent && substitutionEvent.spriteSubstitutions.pets) {
+        return `stable_${this.foolPet(`Pet-${this.item.key}`, substitutionEvent.spriteSubstitutions.pets)}`;
      }

      if (this.isOwned() || (this.mountOwned() && this.isHatchable())) {
@@ -10,6 +10,9 @@
  >
    <div class="modal-body">
      <news-content ref="newsContent" />
+      <close-x
+        @close="dismissAlert()"
+      />
    </div>

    <div class="modal-footer d-flex align-items-center pb-0">
@@ -30,12 +33,18 @@
 </template>

 <script>
+import { mapState } from '@/libs/store';
 import newsContent from './newsContent';
+import closeX from '../ui/closeX.vue';

 export default {
  components: {
+    closeX,
    newsContent,
  },
+  computed: {
+    ...mapState({ user: 'user.data' }),
+  },
  methods: {
    async onShow () {
      this.$refs.newsContent.getPosts();
@@ -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';
@@ -330,6 +329,7 @@ export default {
      handledNotifications,
      isInitialLoadComplete: false,
      pendingRebirthNotification: null,
+      lastShownStreakCount: null, // Track last shown streak to prevent duplicates
    };
  },
  computed: {
@@ -647,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
@@ -726,17 +717,24 @@ export default {
            this.$root.$emit('habitica:won-challenge', notification);
            break;
          case 'REBIRTH_ACHIEVEMENT':
-            if (localStorage.getItem('show-rebirth-confirmation') === 'true') {
-              markAsRead = false;
-            } else if (!this.isInitialLoadComplete) {
-              this.pendingRebirthNotification = notification;
-              markAsRead = false;
-            } else {
-              this.playSound('Achievement_Unlocked');
-              this.$root.$emit('bv::show::modal', 'rebirth');
+            if (localStorage.getItem('show-rebirth-confirmation') !== 'true') {
+              if (!this.isInitialLoadComplete) {
+                this.pendingRebirthNotification = notification;
+                markAsRead = false;
+              } else {
+                this.playSound('Achievement_Unlocked');
+                this.$root.$emit('bv::show::modal', 'rebirth');
+              }
            }
            break;
          case 'STREAK_ACHIEVEMENT':
+            // Client-side deduplication: prevent showing duplicate streak achievements
+            if (this.lastShownStreakCount === this.user.achievements.streak) {
+              // Same streak already shown, skip this notification
+              break;
+            }
+            this.lastShownStreakCount = this.user.achievements.streak;
+
            this.text(`${this.$t('streaks')}: ${this.user.achievements.streak}`, () => {
              this.$root.$emit('bv::show::modal', 'streak');
            }, this.user.preferences.suppressModals.streak);
@@ -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');
    },
@@ -42,7 +42,7 @@
              :hide-class-badge="true"
              :with-background="true"
              :override-avatar-gear="getAvatarOverrides(item)"
-              :sprites-margin="'0px auto 0px -24px'"
+              :sprites-margin="'0px auto 0px -2px'"
            />
          </div>
          <item
@@ -498,8 +498,13 @@ export default {

    await this.triggerGetWorldState();
    this.currentEvent = _find(this.currentEventList, event => Boolean(event.season));
-    this.imageURLs.background = `url(/static/npc/${this.currentEvent.season}/seasonal_shop_opened_background.png)`;
-    this.imageURLs.npc = `url(/static/npc/${this.currentEvent.season}/seasonal_shop_opened_npc.png)`;
+    if (this.currentEvent.season === 'valentines') {
+      this.imageURLs.background = 'url(/static/npc/spring/seasonal_shop_opened_background.png)';
+      this.imageURLs.npc = 'url(/static/npc/spring/seasonal_shop_opened_npc.png)';
+    } else {
+      this.imageURLs.background = `url(/static/npc/${this.currentEvent.season}/seasonal_shop_opened_background.png)`;
+      this.imageURLs.npc = `url(/static/npc/${this.currentEvent.season}/seasonal_shop_opened_npc.png)`;
+    }
  },
  beforeDestroy () {
    this.$root.$off('buyModal::boughtItem');
@@ -37,6 +37,9 @@ export default {
      window.location.href = '/';
    } else {
      window.sessionStorage.setItem('apple-token', response.idToken);
+      if (response.email) {
+        window.sessionStorage.setItem('apple-email', response.email);
+      }
      window.location.href = '/username';
    }
  },
@@ -1,5 +1,6 @@
 <template>
  <div>
+    <group-plan-selection-modal />
    <group-plan-creation-modal />
    <div class="d-flex justify-content-center">
      <div
@@ -315,10 +316,12 @@
 import { setup as setupPayments } from '@/libs/payments';
 import paymentsMixin from '../../mixins/payments';
 import GroupPlanCreationModal from '../group-plans/groupPlanCreationModal.vue';
+import GroupPlanSelectionModal from '../group-plans/groupPlanSelectionModal.vue';

 export default {
  components: {
    GroupPlanCreationModal,
+    GroupPlanSelectionModal,
  },
  mixins: [paymentsMixin],
  data () {
@@ -359,7 +362,7 @@ export default {
      if (this.upgradingGroup._id) {
        return this.stripeGroup({ group: this.upgradingGroup, upgrade: true });
      }
-      return this.$root.$emit('bv::show::modal', 'create-group');
+      return this.$root.$emit('bv::show::modal', 'group-plan-selection');
    },
  },
 };
@@ -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()"
@@ -348,7 +348,6 @@
 import throttle from 'lodash/throttle';
 import isEmpty from 'lodash/isEmpty';
 import draggable from 'vuedraggable';
-import { shouldDo } from '@/../../common/script/cron';
 import inAppRewards from '@/../../common/script/libs/inAppRewards';
 import taskDefaults from '@/../../common/script/libs/taskDefaults';
 import Task from './task';
@@ -433,6 +432,7 @@ export default {

      selectedItemToBuy: {},
      dragging: false,
+      rerendering: false,
    };
  },
  computed: {
@@ -482,25 +482,10 @@ export default {
      return this.$t('addATask', { type });
    },
    badgeCount () {
-      // 0 means the badge will not be shown
-      // It is shown for the all and due views of dailies
-      // and for the active and scheduled views of todos.
-      if (this.type === 'todo' && this.activeFilter.label !== 'complete2') {
-        return this.taskList.length;
-      } if (this.type === 'daily') {
-        if (this.activeFilter.label === 'due') {
-          return this.taskList.length;
-        } if (this.activeFilter.label === 'all') {
-          return this.taskList
-            .reduce(
-              (count, t) => (!t.completed
-                && shouldDo(new Date(), t, this.getUserPreferences) ? count + 1 : count),
-              0,
-            );
-        }
+      if (this.type === 'reward') {
+        return 0;
      }
-
-      return 0;
+      return this.taskList.length;
    },
  },
  watch: {
@@ -564,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) {
@@ -584,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;
@@ -48,11 +48,19 @@
          />

          <input
+            :ref="'checklistItem-' + $index"
            v-model="item.text"
            class="inline-edit-input checklist-item form-control"
            type="text"
            :disabled="disabled || disableEdit"
            :class="summaryClass(item)"
+            @focus="setActiveItem($index)"
+            @keydown="autoCompleteMixinUpdateCarretPosition"
+            @keydown.tab="autoCompleteMixinHandleTab($event)"
+            @keydown.up="autoCompleteMixinSelectPreviousAutocomplete($event)"
+            @keydown.down="autoCompleteMixinSelectNextAutocomplete($event)"
+            @keypress.enter="autoCompleteMixinSelectAutocomplete($event)"
+            @keydown.esc="autoCompleteMixinHandleEscape($event)"
          >
          <span
            v-if="!disabled && !disableEdit"
@@ -81,15 +89,30 @@
        </span>

        <input
+          ref="newChecklistInput"
          v-model="newChecklistItem"
          class="inline-edit-input checklist-item form-control"
          type="text"
          :placeholder="$t('newChecklistItem')"
-          @keypress.enter="setHasPossibilityOfIMEConversion(false)"
+          @focus="setActiveItem(-1)"
+          @keydown="autoCompleteMixinUpdateCarretPosition"
+          @keydown.tab="autoCompleteMixinHandleTab($event)"
+          @keydown.up="autoCompleteMixinSelectPreviousAutocomplete($event)"
+          @keydown.down="autoCompleteMixinSelectNextAutocomplete($event)"
+          @keypress.enter="newChecklistEnterHandler($event)"
          @keyup.enter="addChecklistItem($event, true)"
+          @keydown.esc="autoCompleteMixinHandleEscape($event)"
          @blur="addChecklistItem($event, false)"
        >
      </div>
+      <emoji-auto-complete
+        ref="emojiAutocomplete"
+        :text="activeFieldText"
+        :textbox="textbox"
+        :coords="mixinData.autoComplete.coords"
+        :caret-position="mixinData.autoComplete.caretPosition"
+        @select="selectedAutocomplete"
+      />
    </b-collapse>
  </div>
 </template>
@@ -105,6 +128,8 @@ import chevronIcon from '@/assets/svg/chevron.svg?raw';
 import gripIcon from '@/assets/svg/grip.svg?raw';
 import checkbox from '@/components/ui/checkbox';
 import lockableLabel from './lockableLabel';
+import emojiAutoComplete from '@/components/chat/emojiAutoComplete';
+import { autoCompleteHelperMixin } from '@/mixins/autoCompleteHelper';

 export default {
  name: 'Checklist',
@@ -112,7 +137,9 @@ export default {
    checkbox,
    draggable,
    lockableLabel,
+    emojiAutoComplete,
  },
+  mixins: [autoCompleteHelperMixin],
  props: {
    disabled: {
      type: Boolean,
@@ -133,6 +160,8 @@ export default {
      showChecklist: true,
      hasPossibilityOfIMEConversion: true,
      newChecklistItem: null,
+      textbox: null,
+      activeItemIndex: -1,
      icons: Object.freeze({
        positive: positiveIcon,
        destroy: deleteIcon,
@@ -141,6 +170,15 @@ export default {
      }),
    };
  },
+  computed: {
+    activeFieldText () {
+      if (this.activeItemIndex === -1) {
+        return this.newChecklistItem || '';
+      }
+      const item = this.checklist[this.activeItemIndex];
+      return item ? item.text || '' : '';
+    },
+  },
  methods: {
    summaryClass (item) {
      if (!this.disableEdit) return '';
@@ -179,6 +217,40 @@ export default {
      this.checklist.splice(i, 1);
      this.updateChecklist();
    },
+    setActiveItem (index) {
+      this.activeItemIndex = index;
+      if (index === -1) {
+        this.textbox = this.$refs.newChecklistInput;
+      } else {
+        const refArr = this.$refs[`checklistItem-${index}`];
+        this.textbox = refArr ? refArr[0] || refArr : null;
+      }
+    },
+    newChecklistEnterHandler (e) {
+      const ac = this._getActiveAutocomplete();
+      if (ac && ac.selected !== null) {
+        e.preventDefault();
+        ac.makeSelection();
+      } else if (ac) {
+        ac.cancel();
+        this.setHasPossibilityOfIMEConversion(false);
+      } else {
+        this.setHasPossibilityOfIMEConversion(false);
+      }
+    },
+    selectedAutocomplete (newText, newCaret) {
+      if (this.activeItemIndex === -1) {
+        this.newChecklistItem = newText;
+      } else {
+        this.checklist[this.activeItemIndex].text = newText;
+      }
+      this.$nextTick(() => {
+        if (this.textbox) {
+          this.textbox.setSelectionRange(newCaret, newCaret);
+          this.textbox.focus();
+        }
+      });
+    },
  },
 };
 </script>
@@ -187,6 +259,7 @@ export default {
  @import '@/assets/scss/colors.scss';

  .checklist-component {
+    position: relative;

    .chevron-flip {
      transform: translateY(-5px) rotate(180deg);
@@ -9,12 +9,27 @@
      @toggle="openOrClose($event)"
    >
      <b-dropdown-header>
-        <div class="mb-2">
+        <div class="mb-2 search-input-wrapper">
          <b-form-input
+            ref="searchInput"
            v-model="search"
            type="text"
            :placeholder="searchPlaceholder"
-            @keyup.enter="handleSubmit"
+            @focus="setTextbox"
+            @keydown="autoCompleteMixinUpdateCarretPosition"
+            @keydown.tab="autoCompleteMixinHandleTab($event)"
+            @keydown.up="autoCompleteMixinSelectPreviousAutocomplete($event)"
+            @keydown.down="autoCompleteMixinSelectNextAutocomplete($event)"
+            @keydown.enter="searchEnterHandler($event)"
+            @keydown.esc="searchEscHandler($event)"
+          />
+          <emoji-auto-complete
+            ref="emojiAutocomplete"
+            :text="search"
+            :textbox="textbox"
+            :coords="mixinData.autoComplete.coords"
+            :caret-position="mixinData.autoComplete.caretPosition"
+            @select="selectedAutocomplete"
          />
        </div>

@@ -41,7 +56,7 @@
        v-if="addNew || availableToSelect.length > 0"
        :class="{
          'item-group': true,
-          'add-new': availableToSelect.length === 0 && search !== '',
+          'add-new': search !== '' && !hasExactMatch,
          'scroll': availableToSelect.length > 5
        }"
      >
@@ -71,7 +86,7 @@
        </b-dropdown-item-button>

        <div
-          v-if="addNew"
+          v-if="addNew && search !== '' && !hasExactMatch"
          class="hint"
        >
          {{ $t('pressEnterToAddTag', { tagName: search }) }}
@@ -94,6 +109,10 @@ $itemHeight: 2rem;
 }

 .select-multi {
+  .search-input-wrapper {
+    position: relative;
+  }
+
  .dropdown-toggle {
    padding-left: 0.75rem;
  }
@@ -152,7 +171,8 @@ $itemHeight: 2rem;
    max-height: #{5*$itemHeight};

    &.add-new {
-      height: 30px;
+      min-height: 30px;
+      height: auto;

      .hint {
        display: block;
@@ -185,6 +205,8 @@ $itemHeight: 2rem;
 import Vue from 'vue';
 import MultiList from '@/components/tasks/modal-controls/multiList';
 import markdownDirective from '@/directives/markdown';
+import emojiAutoComplete from '@/components/chat/emojiAutoComplete';
+import { autoCompleteHelperMixin } from '@/mixins/autoCompleteHelper';

 export default {
  directives: {
@@ -192,7 +214,9 @@ export default {
  },
  components: {
    MultiList,
+    emojiAutoComplete,
  },
+  mixins: [autoCompleteHelperMixin],
  props: {
    addNew: {
      type: Boolean,
@@ -221,6 +245,8 @@ export default {
      wasTagAdded: false,
      selected: this.selectedItems,
      search: '',
+      textbox: null,
+      itemsAdded: [],
    };
  },
  computed: {
@@ -248,6 +274,16 @@ export default {

      return filteredItems;
    },
+    hasExactMatch () {
+      const searchTerm = this.search.trim().toLowerCase();
+      if (!searchTerm) return false;
+      if (this.itemsAdded.indexOf(searchTerm) !== -1) return true;
+      if (this.availableToSelect.length === 0) return false;
+      if (this.availableToSelect[0].name.toLowerCase() === searchTerm) {
+        return true;
+      }
+      return false;
+    },
  },
  watch: {
    selected () {
@@ -286,6 +322,7 @@ export default {
      this.closeSelectPopup();
    },
    selectItem (item) {
+      if (!item) return;
      this.selectedItems.push(item.id);
      this.$emit('toggle', item.id);
      this.preventHide = true;
@@ -312,12 +349,51 @@ export default {
        this.closeSelectPopup();
      }
    },
+    setTextbox () {
+      const ref = this.$refs.searchInput;
+      this.textbox = ref ? (ref.$el || ref) : null;
+    },
+    searchEnterHandler (e) {
+      const ac = this._getActiveAutocomplete();
+      if (ac && ac.selected !== null) {
+        e.preventDefault();
+        e.stopPropagation();
+        ac.makeSelection();
+      } else {
+        if (ac) ac.cancel();
+        this.handleSubmit();
+      }
+    },
+    searchEscHandler (e) {
+      const ac = this._getActiveAutocomplete();
+      if (ac && ac.searchActive) {
+        e.preventDefault();
+        e.stopPropagation();
+        ac.cancel();
+      }
+    },
+    selectedAutocomplete (newText, newCaret) {
+      this.search = newText;
+      this.$nextTick(() => {
+        if (this.textbox) {
+          this.textbox.setSelectionRange(newCaret, newCaret);
+          this.textbox.focus();
+        }
+      });
+    },
    handleSubmit () {
      if (!this.addNew) return;
      const { search } = this;
-      this.$emit('addNew', search);
-
-      this.search = '';
+      // If there is a existing tag
+      if (this.hasExactMatch) {
+        this.selectItem(this.availableToSelect[0]);
+        this.search = '';
+      } else {
+        // Creating a new tag as there is no existing tag present
+        this.$emit('addNew', search);
+        this.itemsAdded.push(search.toLowerCase());
+        this.search = '';
+      }
    },
  },
 };
@@ -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"
@@ -70,12 +90,29 @@
          spellcheck="true"
          :disabled="challengeAccessRequired"
          :placeholder="$t('addATitle')"
+          @focus="setActiveField('title')"
+          @keydown="autoCompleteMixinUpdateCarretPosition"
+          @keydown.tab="autoCompleteMixinHandleTab($event)"
+          @keydown.up="autoCompleteMixinSelectPreviousAutocomplete($event)"
+          @keydown.down="autoCompleteMixinSelectNextAutocomplete($event)"
+          @keypress.enter="titleEnterHandler($event)"
+          @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')"
@@ -92,11 +129,27 @@
          </small>
        </div>
        <textarea
+          ref="notesTextarea"
          v-model="task.notes"
          class="form-control input-notes"
          :class="cssClass('input')"
          :placeholder="$t('addNotes')"
+          @focus="setActiveField('notes')"
+          @keydown="autoCompleteMixinUpdateCarretPosition"
+          @keydown.tab="autoCompleteMixinHandleTab($event)"
+          @keydown.up="autoCompleteMixinSelectPreviousAutocomplete($event)"
+          @keydown.down="autoCompleteMixinSelectNextAutocomplete($event)"
+          @keypress.enter="autoCompleteMixinSelectAutocomplete($event)"
+          @keydown.esc="autoCompleteMixinHandleEscape($event)"
        ></textarea>
+        <emoji-auto-complete
+          ref="emojiAutocomplete"
+          :text="activeFieldText"
+          :textbox="textbox"
+          :coords="mixinData.autoComplete.coords"
+          :caret-position="mixinData.autoComplete.caretPosition"
+          @select="selectedAutocomplete"
+        />
      </div>
    </div>
    <div
@@ -712,6 +765,7 @@
    }

    .task-modal-header {
+      position: relative;
      color: $white;
      width: 100%;
      border-top-left-radius: 8px;
@@ -939,6 +993,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) {
@@ -1160,6 +1228,8 @@ import lockableLabel from '@/components/tasks/modal-controls/lockableLabel';
 import selectList from '@/components/ui/selectList';

 import syncTask from '../../mixins/syncTask';
+import emojiAutoComplete from '@/components/chat/emojiAutoComplete';
+import { autoCompleteHelperMixin } from '@/mixins/autoCompleteHelper';

 import positiveIcon from '@/assets/svg/positive.svg?raw';
 import negativeIcon from '@/assets/svg/negative.svg?raw';
@@ -1170,6 +1240,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: {
@@ -1182,15 +1253,18 @@ export default {
    toggleCheckbox,
    lockableLabel,
    selectList,
+    emojiAutoComplete,
  },
  directives: {
    markdown: markdownDirective,
  },
-  mixins: [syncTask],
+  mixins: [syncTask, autoCompleteHelperMixin],
  // purpose is either create or edit, task is the task created or edited
  props: ['task', 'purpose', 'challengeId', 'groupId'],
  data () {
    return {
+      textbox: null,
+      activeField: 'title',
      showAssignedSelect: false,
      newChecklistItem: null,
      icons: Object.freeze({
@@ -1202,6 +1276,7 @@ export default {
        streak: streakIcon,
        calendar: calendarIcon,
        grip: gripIcon,
+        alert: alertIcon,
      }),
      members: [],
      membersNameAndId: [],
@@ -1222,6 +1297,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: {
@@ -1314,6 +1394,10 @@ export default {
    selectedTags () {
      return this.getTagsFor(this.task);
    },
+    activeFieldText () {
+      if (!this.task) return '';
+      return this.activeField === 'title' ? (this.task.text || '') : (this.task.notes || '');
+    },
    showStatAssignment () {
      return this.task.type !== 'reward'
        && !this.groupId
@@ -1366,7 +1450,7 @@ export default {
      this.task.down = !this.task.down;
    },
    weekdaysMin (dayNumber) {
-      return moment.weekdaysMin(dayNumber);
+      return this.$t(`weekdaysMin${dayNumber}`);
    },
    formattedDate (date) {
      return moment(date).format('MM/DD/YYYY');
@@ -1489,6 +1573,35 @@ export default {
    },
    focusInput () {
      this.$refs.inputToFocus.focus();
+      this.setActiveField('title');
+    },
+    setActiveField (field) {
+      this.activeField = field;
+      if (field === 'title') {
+        this.textbox = this.$refs.inputToFocus;
+      } else {
+        this.textbox = this.$refs.notesTextarea;
+      }
+    },
+    titleEnterHandler (e) {
+      const ac = this._getActiveAutocomplete();
+      if (ac && ac.selected !== null) {
+        e.preventDefault();
+        ac.makeSelection();
+      } else if (ac) {
+        ac.cancel();
+      }
+    },
+    selectedAutocomplete (newText, newCaret) {
+      if (this.activeField === 'title') {
+        this.task.text = newText;
+      } else {
+        this.task.notes = newText;
+      }
+      this.$nextTick(() => {
+        this.textbox.setSelectionRange(newCaret, newCaret);
+        this.textbox.focus();
+      });
    },
    async addTag (name) {
      const tagResult = await this.createTag({ name });
@@ -80,9 +80,17 @@
                            v-html="icons.drag"
                          ></div>
                          <input
+                            :ref="'tagInput-' + tagIndex"
                            v-model="tag.name"
                            class="tag-edit-input inline-edit-input form-control"
                            type="text"
+                            @focus="setActiveTag(tagIndex)"
+                            @keydown="autoCompleteMixinUpdateCarretPosition"
+                            @keydown.tab="autoCompleteMixinHandleTab($event)"
+                            @keydown.up="autoCompleteMixinSelectPreviousAutocomplete($event)"
+                            @keydown.down="autoCompleteMixinSelectNextAutocomplete($event)"
+                            @keypress.enter="autoCompleteMixinSelectAutocomplete($event)"
+                            @keydown.esc="autoCompleteMixinHandleEscape($event)"
                          >
                          <div
                            class="input-group-append"
@@ -100,11 +108,18 @@
                        class="col-6 dragSpace"
                      >
                        <input
+                          ref="newTagInput"
                          v-model="newTag"
                          class="new-tag-item edit-tag-item inline-edit-input form-control"
                          type="text"
                          :placeholder="$t('newTag')"
-                          @keydown.enter="addTag($event, tagsType.key)"
+                          @focus="setActiveTag(-1)"
+                          @keydown="autoCompleteMixinUpdateCarretPosition"
+                          @keydown.tab="autoCompleteMixinHandleTab($event)"
+                          @keydown.up="autoCompleteMixinSelectPreviousAutocomplete($event)"
+                          @keydown.down="autoCompleteMixinSelectNextAutocomplete($event)"
+                          @keypress.enter="newTagEnterHandler($event, tagsType.key)"
+                          @keydown.esc="autoCompleteMixinHandleEscape($event)"
                        >
                      </div>
                    </draggable>
@@ -134,6 +149,15 @@
                </div>
              </div>
            </div>
+            <emoji-auto-complete
+              v-if="editingTags"
+              ref="emojiAutocomplete"
+              :text="activeTagText"
+              :textbox="textbox"
+              :coords="mixinData.autoComplete.coords"
+              :caret-position="mixinData.autoComplete.caretPosition"
+              @select="selectedTagAutocomplete"
+            />
            <div class="filter-panel-footer clearfix">
              <template v-if="editingTags === true">
                <div class="text-center">
@@ -405,6 +429,8 @@ import dragIcon from '@/assets/svg/drag_indicator.svg?raw';

 import { mapState, mapActions } from '@/libs/store';
 import brokenTaskModal from './brokenTaskModal';
+import emojiAutoComplete from '@/components/chat/emojiAutoComplete';
+import { autoCompleteHelperMixin } from '@/mixins/autoCompleteHelper';

 export default {
  components: {
@@ -414,10 +440,12 @@ export default {
    spells,
    brokenTaskModal,
    draggable,
+    emojiAutoComplete,
  },
  directives: {
    markdown,
  },
+  mixins: [autoCompleteHelperMixin],
  data () {
    return {
      columns: ['habit', 'daily', 'todo', 'reward'],
@@ -445,10 +473,19 @@ export default {
      newTag: null,
      editingTask: null,
      creatingTask: null,
+      textbox: null,
+      activeTagIndex: -1,
    };
  },
  computed: {
    ...mapState({ user: 'user.data' }),
+    activeTagText () {
+      if (this.activeTagIndex === -1) {
+        return this.newTag || '';
+      }
+      const tag = this.tagsSnap.tags[this.activeTagIndex];
+      return tag ? tag.name || '' : '';
+    },
    tagsByType () {
      const userTags = this.user.tags;
      const tagsByType = {
@@ -514,6 +551,43 @@ export default {
      this.tagsSnap[key].push({ id: uuid(), name: this.newTag });
      this.newTag = null;
    },
+    setActiveTag (index) {
+      this.activeTagIndex = index;
+      if (index === -1) {
+        const refArr = this.$refs.newTagInput;
+        this.textbox = Array.isArray(refArr) ? refArr[0] : refArr;
+      } else {
+        const refArr = this.$refs[`tagInput-${index}`];
+        if (!refArr) {
+          this.textbox = null;
+        } else {
+          this.textbox = Array.isArray(refArr) ? refArr[0] : refArr;
+        }
+      }
+    },
+    newTagEnterHandler (e, key) {
+      const ac = this._getActiveAutocomplete();
+      if (ac && ac.selected !== null) {
+        e.preventDefault();
+        ac.makeSelection();
+      } else {
+        if (ac) ac.cancel();
+        this.addTag(e, key);
+      }
+    },
+    selectedTagAutocomplete (newText, newCaret) {
+      if (this.activeTagIndex === -1) {
+        this.newTag = newText;
+      } else {
+        this.tagsSnap.tags[this.activeTagIndex].name = newText;
+      }
+      this.$nextTick(() => {
+        if (this.textbox) {
+          this.textbox.setSelectionRange(newCaret, newCaret);
+          this.textbox.focus();
+        }
+      });
+    },
    removeTag (index, key) {
      const tagId = this.tagsSnap[key][index].id;
      const indexInSelected = this.selectedTags.indexOf(tagId);
@@ -0,0 +1,92 @@
+<template>
+  <div
+    class="selectable-card"
+    :class="{ selected }"
+    @click="$emit('click')"
+  >
+    <div
+      v-if="selected"
+      class="checkmark-corner"
+    >
+      <div
+        class="svg-icon check-icon"
+        v-html="icons.check"
+      ></div>
+    </div>
+    <slot></slot>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+@import '@/assets/scss/colors.scss';
+
+.selectable-card {
+  position: relative;
+  background: $white;
+  border: 1px solid $gray-400;
+  border-radius: 8px;
+  padding: 16px;
+  cursor: pointer;
+  box-shadow: 0px 1px 2px 0px rgba(26, 24, 29, 0.08);
+
+  &:hover {
+    box-shadow: 0px 3px 6px 0px rgba(26, 24, 29, 0.16), 0px 3px 6px 0px rgba(26, 24, 29, 0.24);
+  }
+
+  &.selected {
+    border: 2px solid $purple-300;
+    padding: 15px;
+    box-shadow: 0px 3px 6px 0px rgba(26, 24, 29, 0.16), 0px 3px 6px 0px rgba(26, 24, 29, 0.24);
+  }
+}
+
+.checkmark-corner {
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 48px;
+  height: 48px;
+  overflow: hidden;
+
+  &::before {
+    content: '';
+    position: absolute;
+    top: 0;
+    left: 0;
+    border-style: solid;
+    border-width: 48px 48px 0 0;
+    border-color: $purple-300 transparent transparent transparent;
+    border-radius: 6px 0 0 0;
+  }
+
+  .check-icon {
+    position: absolute;
+    top: 8px;
+    left: 8px;
+    width: 16px;
+    height: 16px;
+    color: $white;
+  }
+}
+</style>
+
+<script>
+import svgCheck from '@/assets/svg/check.svg?raw';
+
+export default {
+  props: {
+    selected: {
+      type: Boolean,
+      default: false,
+    },
+  },
+  emits: ['click'],
+  data () {
+    return {
+      icons: Object.freeze({
+        check: svgCheck,
+      }),
+    };
+  },
+};
+</script>
@@ -398,14 +398,29 @@
                :placeholder="$t('imageUrl')"
              >
            </div>
-            <div class="form-group">
+            <div class="form-group" style="position: relative;">
              <label>{{ $t('about') }}</label>
              <textarea
+                ref="blurbTextarea"
                v-model="editingProfile.blurb"
                class="form-control"
                rows="5"
                :placeholder="$t('displayBlurbPlaceholder')"
+                @keydown="autoCompleteMixinUpdateCarretPosition"
+                @keydown.tab="autoCompleteMixinHandleTab($event)"
+                @keydown.up="autoCompleteMixinSelectPreviousAutocomplete($event)"
+                @keydown.down="autoCompleteMixinSelectNextAutocomplete($event)"
+                @keypress.enter="autoCompleteMixinSelectAutocomplete($event)"
+                @keydown.esc="autoCompleteMixinHandleEscape($event)"
              ></textarea>
+              <emoji-auto-complete
+                ref="emojiAutocomplete"
+                :text="editingProfile.blurb"
+                :textbox="textbox"
+                :coords="mixinData.autoComplete.coords"
+                :caret-position="mixinData.autoComplete.caretPosition"
+                @select="selectedAutocomplete"
+              />
              <!-- include ../../shared/formatting-help-->
            </div>
          </div>
@@ -1001,6 +1016,8 @@ import mute from '@/assets/svg/mute.svg?raw';
 import shadowMute from '@/assets/svg/shadow-mute.svg?raw';
 import externalLinks from '../../mixins/externalLinks';
 import { userCustomStateMixin } from '../../mixins/userState';
+import emojiAutoComplete from '@/components/chat/emojiAutoComplete';
+import { autoCompleteHelperMixin } from '@/mixins/autoCompleteHelper';
 // @TODO: EMAILS.COMMUNITY_MANAGER_EMAIL
 const COMMUNITY_MANAGER_EMAIL = 'admin@habitica.com';

@@ -1012,8 +1029,9 @@ export default {
    MemberDetails,
    profileStats,
    toggleSwitch,
+    emojiAutoComplete,
  },
-  mixins: [externalLinks, userCustomStateMixin('userLoggedIn')],
+  mixins: [externalLinks, userCustomStateMixin('userLoggedIn'), autoCompleteHelperMixin],
  props: ['userId', 'startingPage'],
  data () {
    return {
@@ -1033,6 +1051,7 @@ export default {
        mute,
        shadowMute,
      }),
+      textbox: null,
      userIdToMessage: '',
      editing: false,
      editingProfile: {
@@ -1121,6 +1140,13 @@ export default {
    userLoggedIn () {
      this.loadUser();
    },
+    editing (val) {
+      if (val) {
+        this.$nextTick(() => {
+          this.textbox = this.$refs.blurbTextarea;
+        });
+      }
+    },
  },
  mounted () {
    this.loadUser();
@@ -1331,6 +1357,13 @@ export default {
      this.$emit('toggled', this.isOpened);
    },

+    selectedAutocomplete (newText, newCaret) {
+      this.editingProfile.blurb = newText;
+      this.$nextTick(() => {
+        this.textbox.setSelectionRange(newCaret, newCaret);
+        this.textbox.focus();
+      });
+    },
    reportPlayer () {
      this.$root.$emit('habitica::report-profile', {
        memberId: this.user._id,
@@ -1340,7 +1373,7 @@ export default {
    },

    openAdminPanel () {
-      this.$router.push(`/admin-panel/${this.hero._id}`);
+      this.$router.push(`/admin/panel/${this.hero._id}`);
    },
  },
 };
@@ -43,7 +43,7 @@
                <strong>{{ $t('equipment') }}:</strong>
                <span :class="{ 'positive-stat': statsComputed.gearBonus[stat] !== 0 }">
                  {{ statsComputed.gearBonus[stat] !== 0 ? '+' : '' }}{{
-                    statsComputed.gearBonus[stat]
+                    statsComputed.gearBonus[stat] + statsComputed.classBonus[stat]
                  }}
                </span>
              </li>
@@ -246,7 +246,9 @@
              :class="{white: user.preferences.background}"
              style="overflow:hidden"
            >
-              <Sprite :image-name="'icon_background_' + user.preferences.background" />
+              <Sprite
+                v-if="user.preferences.background && user.preferences.background !== ''"
+                :image-name="'icon_background_' + user.preferences.background" />
            </div>
            <b-popover
              v-if="label !== 'skip'
@@ -6,7 +6,7 @@ import amplitude from 'amplitude-js';
 import Vue from 'vue';
 import getStore from '@/store';

-const AMPLITUDE_KEY = import.meta.env.AMPLITUDE_KEY;
+const { AMPLITUDE_KEY } = import.meta.env;
 const REQUIRED_FIELDS = ['eventCategory', 'eventAction'];

 let analyticsLoading = false;
@@ -1,28 +1,10 @@
 // Vue plugin to globally expose a '$t' method that calls common/i18n.t.
 // Can be anywhere inside vue as 'this.$t' or '$t' in templates.
-
-import moment from 'moment';
 import i18n from '@/../../common/script/i18n';

 function loadLocale (i18nData) {
  // Load i18n strings
  i18n.strings = i18nData.strings;
-
-  // Load Moment.js locale
-  const { language } = i18nData;
-
-  if (language && i18nData.momentLang && language.momentLangCode) {
-    // Make moment available under `window` so that the locale can be set
-    window.moment = moment;
-
-    // Execute the script and set the locale
-    const head = document.getElementsByTagName('head')[0];
-    const script = document.createElement('script');
-    script.type = 'text/javascript';
-    script.text = i18nData.momentLang;
-    head.appendChild(script);
-    moment.updateLocale(language.momentLangCode);
-  }
 }

 export default {
@@ -11,7 +11,6 @@ import {
  NavbarPlugin,
  CollapsePlugin,
 } from 'bootstrap-vue';
-import Fragment from 'vue-fragment';
 import AppComponent from './app';
 import { setUpLogging } from '@/libs/logging';
 import router from './router/index';
@@ -44,7 +43,6 @@ Vue.use(FormRadioPlugin);
 Vue.use(TooltipPlugin);
 Vue.use(NavbarPlugin);
 Vue.use(CollapsePlugin);
-Vue.use(Fragment.Plugin);

 setUpLogging();
 const store = getStore();
@@ -15,46 +15,60 @@ export const autoCompleteHelperMixin = {
    };
  },
  methods: {
+    _getActiveAutocomplete () {
+      if (this.$refs.autocomplete && this.$refs.autocomplete.searchActive) {
+        return this.$refs.autocomplete;
+      }
+      if (this.$refs.emojiAutocomplete && this.$refs.emojiAutocomplete.searchActive) {
+        return this.$refs.emojiAutocomplete;
+      }
+      return null;
+    },
+
    autoCompleteMixinHandleTab (e) {
-      if (this.$refs.autocomplete.searchActive) {
+      const ac = this._getActiveAutocomplete();
+      if (ac) {
        e.preventDefault();
        if (e.shiftKey) {
-          this.$refs.autocomplete.selectPrevious();
+          ac.selectPrevious();
        } else {
-          this.$refs.autocomplete.selectNext();
+          ac.selectNext();
        }
      }
    },

    autoCompleteMixinHandleEscape (e) {
-      if (this.$refs.autocomplete.searchActive) {
+      const ac = this._getActiveAutocomplete();
+      if (ac) {
        e.preventDefault();
-        this.$refs.autocomplete.cancel();
+        ac.cancel();
      }
    },

    autoCompleteMixinSelectNextAutocomplete (e) {
-      if (this.$refs.autocomplete.searchActive) {
+      const ac = this._getActiveAutocomplete();
+      if (ac) {
        e.preventDefault();
-        this.$refs.autocomplete.selectNext();
+        ac.selectNext();
      }
    },

    autoCompleteMixinSelectPreviousAutocomplete (e) {
-      if (this.$refs.autocomplete.searchActive) {
+      const ac = this._getActiveAutocomplete();
+      if (ac) {
        e.preventDefault();
-        this.$refs.autocomplete.selectPrevious();
+        ac.selectPrevious();
      }
    },

    autoCompleteMixinSelectAutocomplete (e) {
-      if (this.$refs.autocomplete.searchActive) {
-        if (this.$refs.autocomplete.selected !== null) {
+      const ac = this._getActiveAutocomplete();
+      if (ac) {
+        if (ac.selected !== null) {
          e.preventDefault();
-          this.$refs.autocomplete.makeSelection();
+          ac.makeSelection();
        } else {
-          // no autocomplete selected, newline instead
-          this.$refs.autocomplete.cancel();
+          ac.cancel();
        }
      }
    },
@@ -1,56 +1,14 @@
-import includes from 'lodash/includes';
-
 export default {
  methods: {
-    foolPet (pet, prank) {
-      const SPECIAL_PETS = [
-        'Bear-Veteran',
-        'BearCub-Polar',
-        'Cactus-Veteran',
-        'Dragon-Hydra',
-        'Dragon-Veteran',
-        'Fox-Veteran',
-        'Gryphatrice-Jubilant',
-        'Gryphon-Gryphatrice',
-        'Gryphon-RoyalPurple',
-        'Hippogriff-Hopeful',
-        'Jackalope-RoyalPurple',
-        'JackOLantern-Base',
-        'JackOLantern-Ghost',
-        'JackOLantern-Glow',
-        'JackOLantern-RoyalPurple',
-        'Lion-Veteran',
-        'MagicalBee-Base',
-        'Mammoth-Base',
-        'MantisShrimp-Base',
-        'Orca-Base',
-        'Phoenix-Base',
-        'Tiger-Veteran',
-        'Turkey-Base',
-        'Turkey-Gilded',
-        'Wolf-Cerberus',
-        'Wolf-Veteran',
-      ];
-      const BASE_PETS = [
-        'BearCub',
-        'Cactus',
-        'Dragon',
-        'FlyingPig',
-        'Fox',
-        'LionCub',
-        'PandaCub',
-        'TigerCub',
-        'Wolf',
-      ];
-      if (!pet) return `Pet-TigerCub-${prank}`;
-      if (SPECIAL_PETS.indexOf(pet) !== -1) {
-        return `Pet-Dragon-${prank}`;
+    foolPet (pet, substitutions) {
+      if (!pet || pet === 'Pet-') return substitutions.noPet;
+      if (substitutions[pet]) return substitutions[pet];
+      for (const key in substitutions) {
+        if (pet.startsWith(key)) {
+          return substitutions[key];
+        }
      }
-      const species = pet.slice(0, pet.indexOf('-'));
-      if (includes(BASE_PETS, species)) {
-        return `Pet-${species}-${prank}`;
-      }
-      return `Pet-BearCub-${prank}`;
+      return substitutions.default;
    },
  },
 };
@@ -6,9 +6,8 @@ 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.STRIPE_PUB_KEY;
+const { STRIPE_PUB_KEY } = import.meta.env;

 let stripeInstance = null;

@@ -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}`);
@@ -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 {
@@ -153,9 +153,23 @@
              :placeholder="$t('needsTextPlaceholder')"
              :maxlength="MAX_MESSAGE_LENGTH"
              :class="{'has-content': newMessage.trim() !== '', 'disabled': newMessageDisabled}"
+              @keydown="autoCompleteMixinUpdateCarretPosition"
              @keyup.ctrl.enter="sendPrivateMessage()"
+              @keydown.tab="autoCompleteMixinHandleTab($event)"
+              @keydown.up="autoCompleteMixinSelectPreviousAutocomplete($event)"
+              @keydown.down="autoCompleteMixinSelectNextAutocomplete($event)"
+              @keypress.enter="autoCompleteMixinSelectAutocomplete($event)"
+              @keydown.esc="autoCompleteMixinHandleEscape($event)"
            >
            </textarea>
+            <emoji-auto-complete
+              ref="emojiAutocomplete"
+              :text="newMessage"
+              :textbox="textbox"
+              :coords="mixinData.autoComplete.coords"
+              :caret-position="mixinData.autoComplete.caretPosition"
+              @select="selectedAutocomplete"
+            />
          </div>
          <div
            class="sub-new-message-row d-flex"
@@ -540,6 +554,7 @@ h3 {
 }

 .new-message-row {
+  position: relative;
  width: 100%;
  padding-left: 1.5rem;
  padding-top: 1.5rem;
@@ -676,6 +691,8 @@ import PmNewMessageStarted from './pm-new-message-started.vue';
 import StartNewConversationInputHeader from './start-new-conversation-input-header.vue';
 import positiveIcon from '@/assets/svg/positive.svg?raw';
 import NotificationMixins from '@/mixins/notifications';
+import emojiAutoComplete from '@/components/chat/emojiAutoComplete';
+import { autoCompleteHelperMixin } from '@/mixins/autoCompleteHelper';

 // extract to a shared path
 const CONVERSATIONS_PER_PAGE = 10;
@@ -700,13 +717,14 @@ export default defineComponent({
    toggleSwitch,
    userLink,
    faceAvatar,
+    emojiAutoComplete,
  },
  filters: {
    timeAgo (value) {
      return moment(new Date(value)).fromNow();
    },
  },
-  mixins: [styleHelper, NotificationMixins],
+  mixins: [styleHelper, NotificationMixins, autoCompleteHelperMixin],
  beforeRouteEnter (to, from, next) {
    next(vm => {
      const data = vm.$store.state.privateMessageOptions;
@@ -751,6 +769,7 @@ export default defineComponent({
      /** @type {Record<string, PrivateMessages.PrivateMessageEntry[]>} */
      messagesByConversation: {}, // cache {uuid: []}

+      textbox: null,
      newMessage: '',
      messages: [],
      messagesLoading: false,
@@ -963,6 +982,15 @@ export default defineComponent({
      }
    },
  },
+  watch: {
+    shouldShowInputPanel (val) {
+      if (val) {
+        this.$nextTick(() => {
+          this.textbox = this.$refs.textarea;
+        });
+      }
+    },
+  },
  async mounted () {
    this.$store.dispatch('common:setTitle', {
      section: this.$t('messages'),
@@ -1224,6 +1252,13 @@ export default defineComponent({
    triggerStartNewConversationState () {
      this.showStartNewConversationInput = true;
    },
+    selectedAutocomplete (newText, newCaret) {
+      this.newMessage = newText;
+      this.$nextTick(() => {
+        this.textbox.setSelectionRange(newCaret, newCaret);
+        this.textbox.focus();
+      });
+    },
    async startConversationByUsername (targetUserName) {
      // check if the target user exists in current conversations, select that conversation
      /** @type {PrivateMessages.ConversationSummaryMessageEntry} */
@@ -1,5 +1,5 @@
 <template>
-  <fragment>
+  <div class="d-content">
    <tr
      v-if="!mixinData.inlineSettingMixin.modalVisible"
    >
@@ -90,7 +90,7 @@
        />
      </td>
    </tr>
-  </fragment>
+  </div>
 </template>

 <style lang="scss" scoped>
@@ -1,5 +1,5 @@
 <template>
-  <fragment v-if="allowedToChangeClass">
+  <div class="d-content" v-if="allowedToChangeClass">
    <tr
      v-if="!mixinData.inlineSettingMixin.modalVisible"
    >
@@ -71,7 +71,7 @@
        </div>
      </td>
    </tr>
-  </fragment>
+  </div>
 </template>

 <style lang="scss" scoped>
@@ -1,5 +1,5 @@
 <template>
-  <fragment>
+  <div class="d-content">
    <tr
      v-if="!mixinData.inlineSettingMixin.modalVisible"
    >
@@ -55,7 +55,7 @@
        />
      </td>
    </tr>
-  </fragment>
+  </div>
 </template>

 <style lang="scss" scoped>
@@ -1,5 +1,5 @@
 <template>
-  <fragment>
+  <div class="d-content">
    <tr
      v-if="!mixinData.inlineSettingMixin.modalVisible"
    >
@@ -77,7 +77,7 @@
        </div>
      </td>
    </tr>
-  </fragment>
+  </div>
 </template>

 <style lang="scss" scoped>
@@ -1,5 +1,5 @@
 <template>
-  <fragment>
+  <div class="d-content">
    <tr
      v-if="!mixinData.inlineSettingMixin.modalVisible"
    >
@@ -94,7 +94,7 @@
        </div>
      </td>
    </tr>
-  </fragment>
+  </div>
 </template>

 <style lang="scss" scoped>
@@ -1,5 +1,5 @@
 <template>
-  <fragment>
+  <div class="d-content">
    <tr
      v-if="!mixinData.inlineSettingMixin.modalVisible"
    >
@@ -78,7 +78,7 @@
        </div>
      </td>
    </tr>
-  </fragment>
+  </div>
 </template>

 <style lang="scss" scoped>
@@ -1,5 +1,5 @@
 <template>
-  <fragment>
+  <div class="d-content">
    <tr
      v-if="!mixinData.inlineSettingMixin.modalVisible"
    >
@@ -83,7 +83,7 @@
        />
      </td>
    </tr>
-  </fragment>
+  </div>
 </template>

 <style lang="scss" scoped>
--- a/Show More
+++ b/Show More