add key prefix

add space
use bullmq directly to schedule jobs
2026-04-04 21:12:01 -05:00 · 2026-03-25 11:51:51 +01:00 · 2026-03-25 11:48:03 +01:00 · 2026-03-25 11:37:02 +01:00 · 2026-03-25 11:35:35 +01:00 · 2026-03-23 19:31:12 -05:00
37 changed files with 664 additions and 410 deletions
--- a/2
+++ b/2
--- a/package-lock.json
+++ b/package-lock.json
@@ -24,6 +24,7 @@
        "bcrypt": "^5.1.1",
        "body-parser": "^1.20.3",
        "bootstrap": "^4.6.2",
+        "bullmq": "^5.71.1",
        "compression": "^1.8.1",
        "cookie-session": "^2.1.1",
        "coupon-code": "^0.4.5",
@@ -48,6 +49,7 @@
        "heapdump": "^0.3.15",
        "helmet": "^4.6.0",
        "in-app-purchase": "^1.11.3",
+        "ioredis": "^5.10.1",
        "js2xmlparser": "^5.0.0",
        "jsonwebtoken": "^9.0.2",
        "jwks-rsa": "^2.1.5",
@@ -71,7 +73,6 @@
        "pp-ipn": "^1.1.0",
        "ps-tree": "^1.0.0",
        "rate-limiter-flexible": "^2.4.2",
-        "redis": "^3.1.2",
        "remove-markdown": "^0.5.0",
        "rimraf": "^3.0.2",
        "short-uuid": "^4.2.2",
@@ -2824,6 +2825,12 @@
      "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-2.0.2.tgz",
      "integrity": "sha512-6EwiSjwWYP7pTckG6I5eyFANjPhmPjUX9JRLUSfNPC7FX7zK9gyZAfUEaECL6ALTpGX5AjnBq3C9XmVWPitNpw=="
    },
+    "node_modules/@ioredis/commands": {
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/@ioredis/commands/-/commands-1.5.1.tgz",
+      "integrity": "sha512-JH8ZL/ywcJyR9MmJ5BNqZllXNZQqQbnVZOqpPQqE1vHiFgAw4NHbvE0FOduNU8IX9babitBT46571OnPTT0Zcw==",
+      "license": "MIT"
+    },
    "node_modules/@istanbuljs/load-nyc-config": {
      "version": "1.1.0",
      "resolved": "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz",
@@ -3060,6 +3067,84 @@
        "sparse-bitfield": "^3.0.3"
      }
    },
+    "node_modules/@msgpackr-extract/msgpackr-extract-darwin-arm64": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-darwin-arm64/-/msgpackr-extract-darwin-arm64-3.0.3.tgz",
+      "integrity": "sha512-QZHtlVgbAdy2zAqNA9Gu1UpIuI8Xvsd1v8ic6B2pZmeFnFcMWiPLfWXh7TVw4eGEZ/C9TH281KwhVoeQUKbyjw==",
+      "cpu": [
+        "arm64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ]
+    },
+    "node_modules/@msgpackr-extract/msgpackr-extract-darwin-x64": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-darwin-x64/-/msgpackr-extract-darwin-x64-3.0.3.tgz",
+      "integrity": "sha512-mdzd3AVzYKuUmiWOQ8GNhl64/IoFGol569zNRdkLReh6LRLHOXxU4U8eq0JwaD8iFHdVGqSy4IjFL4reoWCDFw==",
+      "cpu": [
+        "x64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ]
+    },
+    "node_modules/@msgpackr-extract/msgpackr-extract-linux-arm": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-linux-arm/-/msgpackr-extract-linux-arm-3.0.3.tgz",
+      "integrity": "sha512-fg0uy/dG/nZEXfYilKoRe7yALaNmHoYeIoJuJ7KJ+YyU2bvY8vPv27f7UKhGRpY6euFYqEVhxCFZgAUNQBM3nw==",
+      "cpu": [
+        "arm"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@msgpackr-extract/msgpackr-extract-linux-arm64": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-linux-arm64/-/msgpackr-extract-linux-arm64-3.0.3.tgz",
+      "integrity": "sha512-YxQL+ax0XqBJDZiKimS2XQaf+2wDGVa1enVRGzEvLLVFeqa5kx2bWbtcSXgsxjQB7nRqqIGFIcLteF/sHeVtQg==",
+      "cpu": [
+        "arm64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@msgpackr-extract/msgpackr-extract-linux-x64": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-linux-x64/-/msgpackr-extract-linux-x64-3.0.3.tgz",
+      "integrity": "sha512-cvwNfbP07pKUfq1uH+S6KJ7dT9K8WOE4ZiAcsrSes+UY55E/0jLYc+vq+DO7jlmqRb5zAggExKm0H7O/CBaesg==",
+      "cpu": [
+        "x64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@msgpackr-extract/msgpackr-extract-win32-x64": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-win32-x64/-/msgpackr-extract-win32-x64-3.0.3.tgz",
+      "integrity": "sha512-x0fWaQtYp4E6sktbsdAqnehxDgEc/VwM7uLsRCYWaiGu0ykYdZPiS8zCWdnjHwyiumousxfBm4SO31eXqwEZhQ==",
+      "cpu": [
+        "x64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ]
+    },
    "node_modules/@nodelib/fs.scandir": {
      "version": "2.1.5",
      "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
@@ -6603,6 +6688,52 @@
        "url": "https://github.com/sponsors/sindresorhus"
      }
    },
+    "node_modules/bullmq": {
+      "version": "5.71.1",
+      "resolved": "https://registry.npmjs.org/bullmq/-/bullmq-5.71.1.tgz",
+      "integrity": "sha512-kOBfdcsHmO6wwmIjpersoVdYQ7jkjTgky4Yop0loc7QwSdgxliSzD69U9ijZuRrkyCJwz5p5eqxeGeQkJ0YGZQ==",
+      "license": "MIT",
+      "dependencies": {
+        "cron-parser": "4.9.0",
+        "ioredis": "5.10.1",
+        "msgpackr": "1.11.5",
+        "node-abort-controller": "3.1.1",
+        "semver": "7.7.4",
+        "tslib": "2.8.1",
+        "uuid": "11.1.0"
+      }
+    },
+    "node_modules/bullmq/node_modules/semver": {
+      "version": "7.7.4",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.4.tgz",
+      "integrity": "sha512-vFKC2IEtQnVhpT78h1Yp8wzwrf8CM+MzKMHGJZfBtzhZNycRFnXsHk6E5TxIkkMsgNS7mdX3AGB7x2QM2di4lA==",
+      "license": "ISC",
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/bullmq/node_modules/tslib": {
+      "version": "2.8.1",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
+      "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
+      "license": "0BSD"
+    },
+    "node_modules/bullmq/node_modules/uuid": {
+      "version": "11.1.0",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-11.1.0.tgz",
+      "integrity": "sha512-0/A9rDy9P7cJ+8w1c9WD9V//9Wj15Ce2MPz8Ri6032usz+NfePxx5AcN3bN+r6ZL6jEo066/yNYB3tn4pQEx+A==",
+      "funding": [
+        "https://github.com/sponsors/broofa",
+        "https://github.com/sponsors/ctavan"
+      ],
+      "license": "MIT",
+      "bin": {
+        "uuid": "dist/esm/bin/uuid"
+      }
+    },
    "node_modules/bytes": {
      "version": "3.1.2",
      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
@@ -7083,6 +7214,15 @@
        "safe-buffer": "~5.1.0"
      }
    },
+    "node_modules/cluster-key-slot": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/cluster-key-slot/-/cluster-key-slot-1.1.2.tgz",
+      "integrity": "sha512-RMr0FhtfXemyinomL4hrWcYJxmX6deFdCxpJzhDttxgO1+bcCnkk+9drydLVDmAMG7NE6aN/fl4F7ucU/90gAA==",
+      "license": "Apache-2.0",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
    "node_modules/coa": {
      "version": "2.0.2",
      "resolved": "https://registry.npmjs.org/coa/-/coa-2.0.2.tgz",
@@ -7606,6 +7746,18 @@
        "node": "*"
      }
    },
+    "node_modules/cron-parser": {
+      "version": "4.9.0",
+      "resolved": "https://registry.npmjs.org/cron-parser/-/cron-parser-4.9.0.tgz",
+      "integrity": "sha512-p0SaNjrHOnQeR8/VnfGbmg9te2kfyYSQ7Sc/j/6DtPL3JQvKxmjO9TSjNFpujqV3vEYYBvNNvXSxzyksBWAx1Q==",
+      "license": "MIT",
+      "dependencies": {
+        "luxon": "^3.2.1"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      }
+    },
    "node_modules/cross-spawn": {
      "version": "7.0.5",
      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.5.tgz",
@@ -8144,6 +8296,7 @@
      "version": "1.5.1",
      "resolved": "https://registry.npmjs.org/denque/-/denque-1.5.1.tgz",
      "integrity": "sha512-XwE+iZ4D6ZUB7mfYRMb5wByE8L74HCn30FBN7sWnXksWc1LO1bPDl67pBR9o/kC4z/xSNAwkMYcGgqDV3BE3Hw==",
+      "dev": true,
      "engines": {
        "node": ">=0.10"
      }
@@ -13453,6 +13606,39 @@
        "node": ">=0.10.0"
      }
    },
+    "node_modules/ioredis": {
+      "version": "5.10.1",
+      "resolved": "https://registry.npmjs.org/ioredis/-/ioredis-5.10.1.tgz",
+      "integrity": "sha512-HuEDBTI70aYdx1v6U97SbNx9F1+svQKBDo30o0b9fw055LMepzpOOd0Ccg9Q6tbqmBSJaMuY0fB7yw9/vjBYCA==",
+      "license": "MIT",
+      "dependencies": {
+        "@ioredis/commands": "1.5.1",
+        "cluster-key-slot": "^1.1.0",
+        "debug": "^4.3.4",
+        "denque": "^2.1.0",
+        "lodash.defaults": "^4.2.0",
+        "lodash.isarguments": "^3.1.0",
+        "redis-errors": "^1.2.0",
+        "redis-parser": "^3.0.0",
+        "standard-as-callback": "^2.1.0"
+      },
+      "engines": {
+        "node": ">=12.22.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/ioredis"
+      }
+    },
+    "node_modules/ioredis/node_modules/denque": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/denque/-/denque-2.1.0.tgz",
+      "integrity": "sha512-HVQE3AAb/pxF8fQAoiqpvg9i3evqug3hoiwakOyZAwJm+6vZehbkYXZ0l4JxS+I3QxM97v5aaRNhj8v5oBhekw==",
+      "license": "Apache-2.0",
+      "engines": {
+        "node": ">=0.10"
+      }
+    },
    "node_modules/iota-array": {
      "version": "1.0.0",
      "resolved": "https://registry.npmjs.org/iota-array/-/iota-array-1.0.0.tgz",
@@ -14642,6 +14828,12 @@
      "resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz",
      "integrity": "sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow=="
    },
+    "node_modules/lodash.defaults": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-4.2.0.tgz",
+      "integrity": "sha512-qjxPLHd3r5DnsdGacqOMU6pb/avJzdh9tFX2ymgoZE27BmjXrNy/y4LoaiTeAb+O3gL8AfpJGtqfX/ae2leYYQ==",
+      "license": "MIT"
+    },
    "node_modules/lodash.flattendeep": {
      "version": "4.4.0",
      "resolved": "https://registry.npmjs.org/lodash.flattendeep/-/lodash.flattendeep-4.4.0.tgz",
@@ -14658,6 +14850,12 @@
      "resolved": "https://registry.npmjs.org/lodash.includes/-/lodash.includes-4.3.0.tgz",
      "integrity": "sha512-W3Bx6mdkRTGtlJISOvVD/lbqjTlPPUDTMnlXZFnVwi9NKJ6tiAk6LVdlhZMm17VZisqhKcgzpO5Wz91PCt5b0w=="
    },
+    "node_modules/lodash.isarguments": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz",
+      "integrity": "sha512-chi4NHZlZqZD18a0imDHnZPrDeBbTtVN7GXMwuGdRH9qotxAjYs3aVLKc7zNOG9eddR5Ksd8rvFEBc9SsggPpg==",
+      "license": "MIT"
+    },
    "node_modules/lodash.isboolean": {
      "version": "3.0.3",
      "resolved": "https://registry.npmjs.org/lodash.isboolean/-/lodash.isboolean-3.0.3.tgz",
@@ -14847,6 +15045,15 @@
      "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",
      "integrity": "sha512-ncTzHV7NvsQZkYe1DW7cbDLm0YpzHmZF5r/iyP3ZnQtMiJ+pjzisCiMNI+Sj+xQF5pXhSHxSB3uDbsBTzY/c2A=="
    },
+    "node_modules/luxon": {
+      "version": "3.7.2",
+      "resolved": "https://registry.npmjs.org/luxon/-/luxon-3.7.2.tgz",
+      "integrity": "sha512-vtEhXh/gNjI9Yg1u4jX/0YVPMvxzHuGgCm6tC5kZyb08yjGWGnqAjGJvcXbqQR2P3MyMEFnRbpcdFS6PBcLqew==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      }
+    },
    "node_modules/make-dir": {
      "version": "2.1.0",
      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz",
@@ -15865,6 +16072,37 @@
      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
    },
+    "node_modules/msgpackr": {
+      "version": "1.11.5",
+      "resolved": "https://registry.npmjs.org/msgpackr/-/msgpackr-1.11.5.tgz",
+      "integrity": "sha512-UjkUHN0yqp9RWKy0Lplhh+wlpdt9oQBYgULZOiFhV3VclSF1JnSQWZ5r9gORQlNYaUKQoR8itv7g7z1xDDuACA==",
+      "license": "MIT",
+      "optionalDependencies": {
+        "msgpackr-extract": "^3.0.2"
+      }
+    },
+    "node_modules/msgpackr-extract": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/msgpackr-extract/-/msgpackr-extract-3.0.3.tgz",
+      "integrity": "sha512-P0efT1C9jIdVRefqjzOQ9Xml57zpOXnIuS+csaB4MdZbTdmGDLo8XhzBG1N7aO11gKDDkJvBLULeFTo46wwreA==",
+      "hasInstallScript": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "node-gyp-build-optional-packages": "5.2.2"
+      },
+      "bin": {
+        "download-msgpackr-prebuilds": "bin/download-prebuilds.js"
+      },
+      "optionalDependencies": {
+        "@msgpackr-extract/msgpackr-extract-darwin-arm64": "3.0.3",
+        "@msgpackr-extract/msgpackr-extract-darwin-x64": "3.0.3",
+        "@msgpackr-extract/msgpackr-extract-linux-arm": "3.0.3",
+        "@msgpackr-extract/msgpackr-extract-linux-arm64": "3.0.3",
+        "@msgpackr-extract/msgpackr-extract-linux-x64": "3.0.3",
+        "@msgpackr-extract/msgpackr-extract-win32-x64": "3.0.3"
+      }
+    },
    "node_modules/multimatch": {
      "version": "5.0.0",
      "resolved": "https://registry.npmjs.org/multimatch/-/multimatch-5.0.0.tgz",
@@ -16131,6 +16369,12 @@
      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-6.2.1.tgz",
      "integrity": "sha512-JLyh7xT1kizaEvcaXOQwOc2/Yhw6KZOvPf1S8401UyLk86CU79LN3vl7ztXGm/pZ+YjoyAJ4rxmHwbkBXJX+yw=="
    },
+    "node_modules/node-abort-controller": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/node-abort-controller/-/node-abort-controller-3.1.1.tgz",
+      "integrity": "sha512-AGK2yQKIjRuqnc6VkX2Xj5d+QW8xZ87pa1UK6yA6ouUyuxfHuMP6umE5QK7UmTeOAymo+Zx1Fxiuw9rVx8taHQ==",
+      "license": "MIT"
+    },
    "node_modules/node-addon-api": {
      "version": "5.1.0",
      "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-5.1.0.tgz",
@@ -16202,6 +16446,21 @@
        "ms": "^2.1.1"
      }
    },
+    "node_modules/node-gyp-build-optional-packages": {
+      "version": "5.2.2",
+      "resolved": "https://registry.npmjs.org/node-gyp-build-optional-packages/-/node-gyp-build-optional-packages-5.2.2.tgz",
+      "integrity": "sha512-s+w+rBWnpTMwSFbaE0UXsRlg7hU4FjekKU4eyAih5T8nJuNZT1nNsskXpxmeqSK9UzkBl6UgRlnKc8hz8IEqOw==",
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "detect-libc": "^2.0.1"
+      },
+      "bin": {
+        "node-gyp-build-optional-packages": "bin.js",
+        "node-gyp-build-optional-packages-optional": "optional.js",
+        "node-gyp-build-optional-packages-test": "build-test.js"
+      }
+    },
    "node_modules/node-loggly-bulk": {
      "version": "4.0.1",
      "resolved": "https://registry.npmjs.org/node-loggly-bulk/-/node-loggly-bulk-4.0.1.tgz",
@@ -18315,29 +18574,6 @@
        "node": ">=0.10.0"
      }
    },
-    "node_modules/redis": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/redis/-/redis-3.1.2.tgz",
-      "integrity": "sha512-grn5KoZLr/qrRQVwoSkmzdbw6pwF+/rwODtrOr6vuBRiR/f3rjSTGupbF90Zpqm2oenix8Do6RV7pYEkGwlKkw==",
-      "dependencies": {
-        "denque": "^1.5.0",
-        "redis-commands": "^1.7.0",
-        "redis-errors": "^1.2.0",
-        "redis-parser": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/node-redis"
-      }
-    },
-    "node_modules/redis-commands": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/redis-commands/-/redis-commands-1.7.0.tgz",
-      "integrity": "sha512-nJWqw3bTFy21hX/CPKHth6sfhZbdiHP6bTawSgQBlKOVRG7EZkfHbbHwQJnrE4vsQf0CMNE+3gJ4Fmm16vdVlQ=="
-    },
    "node_modules/redis-errors": {
      "version": "1.2.0",
      "resolved": "https://registry.npmjs.org/redis-errors/-/redis-errors-1.2.0.tgz",
@@ -19853,6 +20089,12 @@
        "node": "*"
      }
    },
+    "node_modules/standard-as-callback": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/standard-as-callback/-/standard-as-callback-2.1.0.tgz",
+      "integrity": "sha512-qoRRSyROncaz1z0mvYqIE4lCd9p2R90i6GxW3uZv5ucSu8tU7B5HXUP1gG8pVZsYNVaXjk8ClXHPttLyxAL48A==",
+      "license": "MIT"
+    },
    "node_modules/static-extend": {
      "version": "0.1.2",
      "resolved": "https://registry.npmjs.org/static-extend/-/static-extend-0.1.2.tgz",
--- a/package.json
+++ b/package.json
@@ -19,6 +19,7 @@
    "bcrypt": "^5.1.1",
    "body-parser": "^1.20.3",
    "bootstrap": "^4.6.2",
+    "bullmq": "^5.71.1",
    "compression": "^1.8.1",
    "cookie-session": "^2.1.1",
    "coupon-code": "^0.4.5",
@@ -43,6 +44,7 @@
    "heapdump": "^0.3.15",
    "helmet": "^4.6.0",
    "in-app-purchase": "^1.11.3",
+    "ioredis": "^5.10.1",
    "js2xmlparser": "^5.0.0",
    "jsonwebtoken": "^9.0.2",
    "jwks-rsa": "^2.1.5",
@@ -66,7 +68,6 @@
    "pp-ipn": "^1.1.0",
    "ps-tree": "^1.0.0",
    "rate-limiter-flexible": "^2.4.2",
-    "redis": "^3.1.2",
    "remove-markdown": "^0.5.0",
    "rimraf": "^3.0.2",
    "short-uuid": "^4.2.2",
--- a/test/api/unit/libs/email.test.js
+++ b/test/api/unit/libs/email.test.js
@@ -1,9 +1,9 @@
 /* eslint-disable global-require */
-import got from 'got';
 import nconf from 'nconf';
 import requireAgain from 'require-again';
 import { TAVERN_ID } from '../../../../website/server/models/group';
 import { defer } from '../../../helpers/api-unit.helper';
+import worker from '../../../../website/server/libs/worker';

 function getUser () {
  return {
@@ -127,7 +127,7 @@ describe('emails', () => {
    let sendTxn = null;

    beforeEach(() => {
-      sandbox.stub(got, 'post').returns(defer().promise);
+      sandbox.stub(worker, 'sendJob').returns(defer().promise);

      const nconfGetStub = sandbox.stub(nconf, 'get');
      nconfGetStub.withArgs('IS_PROD').returns(true);
@@ -149,13 +149,12 @@ describe('emails', () => {
      };

      sendTxn(mailingInfo, emailType);
-      expect(got.post).to.be.called;
-      expect(got.post).to.be.calledWith('http://example.com/job', sinon.match({
-        json: {
-          data: {
-            emailType: sinon.match.same(emailType),
-            to: sinon.match(value => Array.isArray(value) && value[0].name === mailingInfo.name, 'matches mailing info array'),
-          },
+      expect(worker.sendJob).to.be.called;
+      expect(worker.sendJob).to.be.calledWith('email', sinon.match({
+        identifier: emailType,
+        data: {
+          emailType: sinon.match.same(emailType),
+          to: sinon.match(value => Array.isArray(value) && value[0].name === mailingInfo.name, 'matches mailing info array'),
        },
      }));
    });
@@ -168,7 +167,7 @@ describe('emails', () => {
      };

      sendTxn(mailingInfo, emailType);
-      expect(got.post).not.to.be.called;
+      expect(worker.sendJob).not.to.be.called;
    });

    it('throws error when mail target is only a string', async () => {
@@ -233,13 +232,12 @@ describe('emails', () => {
      const mailingInfo = getUser();

      sendTxn(mailingInfo, emailType);
-      expect(got.post).to.be.called;
-      expect(got.post).to.be.calledWith('http://example.com/job', sinon.match({
-        json: {
-          data: {
-            emailType: sinon.match.same(emailType),
-            to: sinon.match(val => val[0]._id === mailingInfo._id),
-          },
+      expect(worker.sendJob).to.be.called;
+      expect(worker.sendJob).to.be.calledWith('email', sinon.match({
+        identifier: emailType,
+        data: {
+          emailType: sinon.match.same(emailType),
+          to: sinon.match(val => val[0]._id === mailingInfo._id),
        },
      }));
    });
@@ -253,15 +251,14 @@ describe('emails', () => {
      const variables = [];

      sendTxn(mailingInfo, emailType, variables);
-      expect(got.post).to.be.called;
-      expect(got.post).to.be.calledWith('http://example.com/job', sinon.match({
-        json: {
-          data: {
-            variables: sinon.match(value => value[0].name === 'BASE_URL', 'matches variables'),
-            personalVariables: sinon.match(value => value[0].rcpt === mailingInfo.email
-                && value[0].vars[0].name === 'RECIPIENT_NAME'
+      expect(worker.sendJob).to.be.called;
+      expect(worker.sendJob).to.be.calledWith('email', sinon.match({
+        identifier: emailType,
+        data: {
+          variables: sinon.match(value => value[0].name === 'BASE_URL', 'matches variables'),
+          personalVariables: sinon.match(value => value[0].rcpt === mailingInfo.email
+              && value[0].vars[0].name === 'RECIPIENT_NAME'
                && value[0].vars[1].name === 'RECIPIENT_UNSUB_URL', 'matches personal variables'),
-          },
        },
      }));
    });
--- a/test/api/v3/integration/quests/POST-groups_groupId_quests_force-start.test.js
+++ b/test/api/v3/integration/quests/POST-groups_groupId_quests_force-start.test.js
@@ -193,23 +193,6 @@ describe('POST /groups/:groupId/quests/force-start', () => {
      expect(questingGroup.quest.members[notInPartyUser._id]).to.not.exist;
    });

-    it('removes users who have been deleted from quest.members', async () => {
-      await leader.post(`/groups/${questingGroup._id}/quests/invite/${PET_QUEST}`);
-      await partyMembers[0].post(`/groups/${questingGroup._id}/quests/accept`);
-
-      await partyMembers[0].del('/user', {
-        password: 'password',
-      });
-
-      await leader.post(`/groups/${questingGroup._id}/quests/force-start`);
-
-      await sleep(0.5);
-
-      await questingGroup.sync();
-
-      expect(questingGroup.quest.members[partyMembers[0]._id]).to.not.exist;
-    });
-
    it('removes users who don\'t have true value in quest.members from quest.members', async () => {
      const partyMemberThatRejects = partyMembers[1];
      const partyMemberThatIgnores = partyMembers[2];
--- a/test/api/v3/integration/user/DELETE-user.test.js
+++ b/test/api/v3/integration/user/DELETE-user.test.js
@@ -1,13 +1,7 @@
-import {
-  each,
-  map,
-} from 'lodash';
 import {
  checkExistence,
-  createAndPopulateGroup,
  generateGroup,
  generateUser,
-  generateChallenge,
  translate as t,
 } from '../../../../helpers/api-integration/v3';
 import {
@@ -15,6 +9,7 @@ import {
  sha1Encrypt as sha1EncryptPassword,
 } from '../../../../../website/server/libs/password';
 import * as email from '../../../../../website/server/libs/email';
+import sendJob from '../../../../../website/server/libs/worker';

 const DELETE_CONFIRMATION = 'DELETE';

@@ -47,12 +42,13 @@ describe('DELETE /user', () => {
      });
    });

-    it('deletes the user', async () => {
-      await expect(checkExistence('users', user._id)).to.eventually.eql(true);
+    it('sends deletion job to worker', async () => {
+      const workerStub = sandbox.stub(sendJob, 'sendJob');
      await user.del('/user', {
        password,
      });
-      await expect(checkExistence('users', user._id)).to.eventually.eql(false);
+      expect(workerStub).to.be.calledOnce;
+      workerStub.restore();
    });

    it('returns an error if excessive feedback is supplied', async () => {
@@ -84,53 +80,6 @@ describe('DELETE /user', () => {
      });
    });

-    it('deletes the user\'s tasks', async () => {
-      await user.post('/tasks/user', {
-        text: 'test habit',
-        type: 'habit',
-      });
-      await user.sync();
-
-      // gets the user's tasks ids
-      const ids = [];
-      each(user.tasksOrder, idsForOrder => {
-        ids.push(...idsForOrder);
-      });
-
-      expect(ids.length).to.be.above(0); // make sure the user has some task to delete
-
-      await user.del('/user', {
-        password,
-      });
-
-      await Promise.all(map(ids, id => expect(checkExistence('tasks', id)).to.eventually.eql(false)));
-    });
-
-    it('reduces memberCount in challenges user is linked to', async () => {
-      const populatedGroup = await createAndPopulateGroup({
-        members: 2,
-      });
-
-      const { group } = populatedGroup;
-      const authorizedUser = populatedGroup.members[1];
-
-      const challenge = await generateChallenge(populatedGroup.groupLeader, group);
-      await populatedGroup.groupLeader.post(`/challenges/${challenge._id}/join`);
-      await authorizedUser.post(`/challenges/${challenge._id}/join`);
-
-      await challenge.sync();
-
-      expect(challenge.memberCount).to.eql(2);
-
-      await authorizedUser.del('/user', {
-        password,
-      });
-
-      await challenge.sync();
-
-      expect(challenge.memberCount).to.eql(1);
-    });
-
    it('sends feedback to the admin email', async () => {
      sandbox.spy(email, 'sendTxn');

@@ -158,10 +107,10 @@ describe('DELETE /user', () => {
    });

    it('deletes the user with a legacy sha1 password', async () => {
-      await expect(checkExistence('users', user._id)).to.eventually.eql(true);
      const textPassword = 'mySecretPassword';
      const salt = sha1MakeSalt();
      const sha1HashedPassword = sha1EncryptPassword(textPassword, salt);
+      const workerStub = sandbox.stub(sendJob, 'sendJob');

      await user.updateOne({
        'auth.local.hashed_password': sha1HashedPassword,
@@ -179,7 +128,8 @@ describe('DELETE /user', () => {
      await user.del('/user', {
        password: textPassword,
      });
-      await expect(checkExistence('users', user._id)).to.eventually.eql(false);
+      expect(workerStub).to.be.calledOnce;
+      workerStub.restore();
    });

    context('last member of a party', () => {
@@ -213,11 +163,12 @@ describe('DELETE /user', () => {
    });

    it('deletes a Google user', async () => {
-      await expect(checkExistence('users', user._id)).to.eventually.eql(true);
+      const workerStub = sandbox.stub(sendJob, 'sendJob');
      await user.del('/user', {
        password: DELETE_CONFIRMATION,
      });
-      await expect(checkExistence('users', user._id)).to.eventually.eql(false);
+      expect(workerStub).to.be.calledOnce;
+      workerStub.restore();
    });
  });

@@ -232,12 +183,13 @@ describe('DELETE /user', () => {
      });
    });

-    it('deletes a Apple user', async () => {
-      await expect(checkExistence('users', user._id)).to.eventually.eql(true);
+    it('deletes an Apple user', async () => {
+      const workerStub = sandbox.stub(sendJob, 'sendJob');
      await user.del('/user', {
        password: DELETE_CONFIRMATION,
      });
-      await expect(checkExistence('users', user._id)).to.eventually.eql(false);
+      expect(workerStub).to.be.calledOnce;
+      workerStub.restore();
    });
  });
 });
--- a/test/content/aprilFools.test.js
+++ b/test/content/aprilFools.test.js
@@ -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');
+    });
+  });
+});
--- a/website/client/src/assets/css/sprites.css
+++ b/website/client/src/assets/css/sprites.css
@@ -1,57 +1,3 @@
-.quest_lostMasterclasser4 {
-  background: url("https://habitica-assets.s3.amazonaws.com/mobileApp/images/quest_lostMasterclasser4.gif") no-repeat;
-  width: 219px;
-  height: 219px;
-}
-
-.quest_windup {
-  background: url("https://habitica-assets.s3.amazonaws.com/mobileApp/images/quest_windup.gif") no-repeat;
-  width: 219px;
-  height: 219px;
-}
-
-.quest_solarSystem {
-  background: url("https://habitica-assets.s3.amazonaws.com/mobileApp/images/quest_solarSystem.gif") no-repeat;
-  width: 219px;
-  height: 219px;
-}
-
-.quest_virtualpet {
-  background: url("https://habitica-assets.s3.amazonaws.com/mobileApp/images/quest_virtualpet.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 {
-  width: 68px;
-  height: 68px;
-}
-
-.Pet_HatchingPotion_Dessert {
-  background: url("https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet_HatchingPotion_Dessert.gif") no-repeat;
-}
-
-.Pet_HatchingPotion_Veggie {
-  background: url("https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet_HatchingPotion_Veggie.gif") no-repeat;
-}
-
-.Pet_HatchingPotion_Windup {
-  background: url("https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet_HatchingPotion_Windup.gif") no-repeat;
-}
-
-.Pet_HatchingPotion_VirtualPet {
-  background: url("https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet_HatchingPotion_VirtualPet.gif") no-repeat;
-}
-
-.Pet_HatchingPotion_Fungi {
-  background: url("https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet_HatchingPotion_Fungi.gif") no-repeat;
-}
-
-.Pet_HatchingPotion_Cryptid {
-  background: url("https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet_HatchingPotion_Cryptid.gif") no-repeat;
-}
-
 .Gems {
  display:inline-block;
  margin-right:5px;
@@ -80,6 +26,7 @@
  margin-left: -3px;
  margin-top: -18px;
 }
+
 .slim_armor_special_0, .broad_armor_special_0, .shield_special_0 {
  width: 90px;
  height: 90px;
@@ -87,7 +34,6 @@

 /* Critical */
 .weapon_special_critical {
-  background: url("https://habitica-assets.s3.amazonaws.com/mobileApp/images/weapon_special_critical.gif") no-repeat;
  width: 90px;
  height: 90px;
  margin-left:-12px;
@@ -98,6 +44,7 @@
 .weapon_special_1 {
  margin-left: -12px;
 }
+
 .broad_armor_special_1, .slim_armor_special_1, .head_special_1 {
  width: 90px;
  height: 90px;
@@ -106,36 +53,15 @@
 .back_special_heroicAureole {
  width: 114px;
  height: 90px;
-  background: url("https://habitica-assets.s3.amazonaws.com/mobileApp/images/back_special_heroicAureole.gif") no-repeat;
 }

-.head_special_0 {
-  background: url("https://habitica-assets.s3.amazonaws.com/mobileApp/images/BackerOnly-Equip-ShadeHelmet.gif") no-repeat;
-}
 .head_special_1 {
-  background: url("https://habitica-assets.s3.amazonaws.com/mobileApp/images/ContributorOnly-Equip-CrystalHelmet.gif") no-repeat;
  margin-top: 3px;
 }

-.broad_armor_special_0,.slim_armor_special_0 {
-  background: url("https://habitica-assets.s3.amazonaws.com/mobileApp/images/BackerOnly-Equip-ShadeArmor.gif") no-repeat;
-}
-.broad_armor_special_1,.slim_armor_special_1 {
-  background: url("https://habitica-assets.s3.amazonaws.com/mobileApp/images/ContributorOnly-Equip-CrystalArmor.gif") no-repeat;
-}
-
-.shield_special_0 {
-  background: url("https://habitica-assets.s3.amazonaws.com/mobileApp/images/BackerOnly-Shield-TormentedSkull.gif") no-repeat;
-}
-
-.weapon_special_0 {
-  background: url("https://habitica-assets.s3.amazonaws.com/mobileApp/images/BackerOnly-Weapon-DarkSoulsBlade.gif") no-repeat;
-}
-
 .Pet-Wolf-Cerberus {
  width: 105px;
  height: 72px;
-  background: url("https://habitica-assets.s3.amazonaws.com/mobileApp/images/BackerOnly-Pet-CerberusPup.gif") no-repeat;
 }

 .broad_armor_special_ks2019, .slim_armor_special_ks2019, .eyewear_special_ks2019, .head_special_ks2019, .shield_special_ks2019 {
@@ -143,36 +69,17 @@
  height: 120px;
 }

-.broad_armor_special_ks2019, .slim_armor_special_ks2019 {
-  background: url("https://habitica-assets.s3.amazonaws.com/mobileApp/images/BackerOnly-Equip-MythicGryphonArmor.gif") no-repeat;
-}
-
-.eyewear_special_ks2019 {
-  background: url("https://habitica-assets.s3.amazonaws.com/mobileApp/images/BackerOnly-Equip-MythicGryphonVisor.gif") no-repeat;
-}
-
-.head_special_ks2019 {
-  background: url("https://habitica-assets.s3.amazonaws.com/mobileApp/images/BackerOnly-Equip-MythicGryphonHelm.gif") no-repeat;
-}
-
-.shield_special_ks2019 {
-  background: url("https://habitica-assets.s3.amazonaws.com/mobileApp/images/BackerOnly-Equip-MythicGryphonShield.gif") no-repeat;
-}
-
 .weapon_special_ks2019 {
-  background: url("https://habitica-assets.s3.amazonaws.com/mobileApp/images/BackerOnly-Equip-MythicGryphonGlaive.gif") no-repeat;
  width: 120px;
  height: 120px;
 }

 .Pet-Gryphon-Gryphatrice {
-  background: url("https://habitica-assets.s3.amazonaws.com/mobileApp/images/BackerOnly-Pet-Gryphatrice.gif") no-repeat;
  width: 81px;
  height: 99px;
 }

 .Pet-Gryphatrice-Jubilant {
-  background: url("https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-Gryphatrice-Jubilant.gif") no-repeat;
  width: 81px;
  height: 96px;
 }
@@ -182,39 +89,11 @@
  height: 135px;
 }

-.Mount_Head_Gryphon-Gryphatrice {
-  background: url("https://habitica-assets.s3.amazonaws.com/mobileApp/images/BackerOnly-Mount-Head-Gryphatrice.gif") no-repeat;
-}
-
-.Mount_Body_Gryphon-Gryphatrice {
-  background: url("https://habitica-assets.s3.amazonaws.com/mobileApp/images/BackerOnly-Mount-Body-Gryphatrice.gif") no-repeat;
-}
-
-.Mount_Head_Dragon-Hydra {
-  background: url("https://habitica-assets.s3.amazonaws.com/mobileApp/images/Mount_Head_Dragon-Hydra.gif") no-repeat;
-}
-
-.Mount_Body_Dragon-Hydra {
-  background: url("https://habitica-assets.s3.amazonaws.com/mobileApp/images/Mount_Body_Dragon-Hydra.gif") no-repeat;
-}
-
 .background_airship, .background_clocktower, .background_steamworks {
  width: 141px;
  height: 147px;
 }

-.background_airship {
-  background: url("https://habitica-assets.s3.amazonaws.com/mobileApp/images/background_airship.gif") no-repeat;
-}
-
-.background_clocktower {
-  background: url("https://habitica-assets.s3.amazonaws.com/mobileApp/images/background_clocktower.gif") no-repeat;
-}
-
-.background_steamworks {
-  background: url("https://habitica-assets.s3.amazonaws.com/mobileApp/images/background_steamworks.gif") no-repeat;
-}
-
 [class*="Mount_Head_"],
 [class*="Mount_Body_"] {
  margin-top:18px; /* Sprite accommodates 105x123 box */
--- a/website/client/src/assets/css/sprites/spritesmith-main.css
+++ b/website/client/src/assets/css/sprites/spritesmith-main.css
@@ -1801,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;
@@ -31485,8 +31490,8 @@
  width: 114px;
  height: 90px;
 }
-.slim_armor_armoire_handstandOutfit  {
-  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/slim_armor_armoire_handstandOutfit .png');
+.slim_armor_armoire_handstandOutfit {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/slim_armor_armoire_handstandOutfit.png');
  width: 114px;
  height: 90px;
 }
@@ -53223,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;
@@ -53713,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;
@@ -54503,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;
@@ -54998,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;
@@ -55333,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;
@@ -56113,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;
@@ -56718,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;
@@ -58113,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;
@@ -58758,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;
--- a/website/client/src/components/avatar.vue
+++ b/website/client/src/components/avatar.vue
@@ -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 '';
--- a/website/client/src/components/creatorIntro.vue
+++ b/website/client/src/components/creatorIntro.vue
@@ -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"
--- a/website/client/src/components/inventory/stable/petItem.vue
+++ b/website/client/src/components/inventory/stable/petItem.vue
@@ -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())) {
--- a/website/client/src/mixins/foolPet.js
+++ b/website/client/src/mixins/foolPet.js
@@ -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;
    },
  },
 };
--- a/website/client/src/pages/settings/settingRows/deleteAccount.vue
+++ b/website/client/src/pages/settings/settingRows/deleteAccount.vue
@@ -67,7 +67,7 @@

        <div
          v-once
-          class="feedback"
+          class="feedback mt-3"
          v-html="$t('feedback')"
        >
        </div>
--- a/website/client/src/router/index.js
+++ b/website/client/src/router/index.js
@@ -85,6 +85,13 @@ const router = new VueRouter({
      props: true,
    },
    { name: 'profile', path: '/user/profile' },
+    {
+      name: 'avatar',
+      path: '/avatar',
+      children: [
+        { name: 'backgrounds', path: 'backgrounds' },
+      ],
+    },
    { name: 'stats', path: '/user/stats' },
    { name: 'achievements', path: '/user/achievements' },
    {
@@ -410,6 +417,13 @@ router.beforeEach(async (to, from, next) => {
    router.app.$root.$emit('bv::hide::modal', 'profile');
  }

+  if (to.name === 'backgrounds') {
+    store.state.avatarEditorOptions.editingUser = true;
+    store.state.avatarEditorOptions.startingPage = 'backgrounds';
+    router.app.$root.$emit('bv::show::modal', 'avatar-modal');
+    return null;
+  }
+
  return next();
 });

--- a/website/common/locales/en/backgrounds.json
+++ b/website/common/locales/en/backgrounds.json
@@ -1086,6 +1086,8 @@
  "eventBackgrounds": "Event Backgrounds",
  "backgroundBirthdayBashText": "Birthday Bash",
  "backgroundBirthdayBashNotes": "Habitica's having a birthday party, and everyone's invited!",
+  "backgroundOnAStrangePlanetText": "On a Strange Planet",
+  "backgroundOnAStrangePlanetNotes": "Venture where no Habitican has gone before: On a Strange Planet.",

  "monthlyBackgrounds": "Monthly Backgrounds"
 }
--- a/website/common/locales/en/content.json
+++ b/website/common/locales/en/content.json
@@ -356,6 +356,7 @@
  "hatchingPotionBalloon": "Balloon",
  "hatchingPotionCryptid": "Cryptid",
  "hatchingPotionOpal": "Opal",
+  "hatchingPotionAlien": "Alien",

  "hatchingPotionNotes": "Pour this on an egg, and it will hatch as a <%= potText %> Pet.",
  "premiumPotionUnlimitedNotes": "Not usable on Quest Pet eggs.",
--- a/website/common/locales/en/questsContent.json
+++ b/website/common/locales/en/questsContent.json
@@ -221,7 +221,7 @@
  "questTRexUndeadBoss": "Skeletal Tyrannosaur",
  "questTRexUndeadRageTitle": "Skeleton Healing",
  "questTRexUndeadRageDescription": "This bar fills when you don't complete your Dailies. When it is full, the Skeletal Tyrannosaur will heal 30% of its remaining health!",
-  "questTRexUndeadRageEffect": "`Skeletal Tyrannosaur uses SKELETON HEALING!`\n\nThe monster lets forth an unearthly roar, and some of its damaged bones knit back together!",
+  "questTRexUndeadRageEffect": "Skeletal Tyrannosaur uses SKELETON HEALING!\n\nThe monster lets forth an unearthly roar, and some of its damaged bones knit back together!",

  "questTRexDropTRexEgg": "Tyrannosaur (Egg)",
  "questTRexUnlockText": "Unlocks Tyrannosaur Eggs for purchase in the Market",
@@ -282,7 +282,7 @@
  "questDilatoryDistress2Boss": "Water Skull Swarm",
  "questDilatoryDistress2RageTitle": "Swarm Respawn",
  "questDilatoryDistress2RageDescription": "Swarm Respawn: This bar fills when you don't complete your Dailies. When it is full, the Water Skull Swarm will heal 30% of its remaining health!",
-  "questDilatoryDistress2RageEffect": "`Water Skull Swarm uses SWARM RESPAWN!`\n\nEmboldened by their victories, more skulls pour forth from the crevasse, bolstering the swarm!",
+  "questDilatoryDistress2RageEffect": "Water Skull Swarm uses SWARM RESPAWN!\n\nEmboldened by their victories, more skulls pour forth from the crevasse, bolstering the swarm!",
  "questDilatoryDistress2DropSkeletonPotion": "Skeleton Hatching Potion",
  "questDilatoryDistress2DropCottonCandyBluePotion": "Cotton Candy Blue Hatching Potion",
  "questDilatoryDistress2DropHeadgear": "Fire Coral Circlet (Headgear)",
@@ -398,7 +398,7 @@
  "questAxolotlUnlockText": "Unlocks Axolotl Eggs for purchase in the Market",
  "questAxolotlRageTitle": "Axolotl Regeneration",
  "questAxolotlRageDescription": "This bar fills when you don't complete your Dailies. When it is full, the Magical Axolotl will heal 30% of its remaining health!",
-  "questAxolotlRageEffect": "`Magical Axolotl uses AXOLOTL REGENERATION!`\n\n`A curtain of colorful bubbles obscures the monster for a moment, and when it clears, some of its wounds have vanished!`",
+  "questAxolotlRageEffect": "Magical Axolotl uses AXOLOTL REGENERATION!\n\nA curtain of colorful bubbles obscures the monster for a moment, and when it clears, some of its wounds have vanished!",

  "questTurtleText": "Guide the Turtle",
  "questTurtleNotes": "Help! This giant sea turtle cannot find her way to her nesting beach. She returns there every year to lay her eggs, but this year Inkomplete Bay is filled with toxic Task Flotsam made of red Dailies and unchecked To Do's. \"She's thrashing in a panic!\" @JessicaChase says.<br><br>@UncommonCriminal nods. \"It's because her guiding senses are fogged and confused.\"<br><br>@Scarabsi grabs your arm. \"Can you help clear the Task Flotsam blocking her path? It may be hazardous, but we have to help her!\"",
@@ -435,7 +435,7 @@
  "questTaskwoodsTerror1Boss": "Fire Skull Swarm",
  "questTaskwoodsTerror1RageTitle": "Swarm Respawn",
  "questTaskwoodsTerror1RageDescription": "Swarm Respawn: This bar fills when you don't complete your Dailies. When it is full, the Fire Skull Swarm will heal 30% of its remaining health!",
-  "questTaskwoodsTerror1RageEffect": "`Fire Skull Swarm uses SWARM RESPAWN!`\n\nEmboldened by their victories, more skulls swirl around you in a gout of flame!",
+  "questTaskwoodsTerror1RageEffect": "Fire Skull Swarm uses SWARM RESPAWN!\n\nEmboldened by their victories, more skulls swirl around you in a gout of flame!",
  "questTaskwoodsTerror1DropSkeletonPotion": "Skeleton Hatching Potion",
  "questTaskwoodsTerror1DropRedPotion": "Red Hatching Potion",
  "questTaskwoodsTerror1DropHeadgear": "Pyromancer's Turban (Headgear)",
@@ -507,7 +507,7 @@
  "questStoikalmCalamity1Boss": "Earth Skull Swarm",
  "questStoikalmCalamity1RageTitle": "Swarm Respawn",
  "questStoikalmCalamity1RageDescription": "Swarm Respawn: This bar fills when you don't complete your Dailies. When it is full, the Earth Skull Swarm will heal 30% of its remaining health!",
-  "questStoikalmCalamity1RageEffect": "`Earth Skull Swarm uses SWARM RESPAWN!`\n\nMore skulls break free from the ground, their teeth chattering in the cold!",
+  "questStoikalmCalamity1RageEffect": "Earth Skull Swarm uses SWARM RESPAWN!\n\nMore skulls break free from the ground, their teeth chattering in the cold!",
  "questStoikalmCalamity1DropSkeletonPotion": "Skeleton Hatching Potion",
  "questStoikalmCalamity1DropDesertPotion": "Desert Hatching Potion",
  "questStoikalmCalamity1DropArmor": "Mammoth Rider Armor",
@@ -554,7 +554,7 @@
  "questMayhemMistiflying1Boss": "Air Skull Swarm",
  "questMayhemMistiflying1RageTitle": "Swarm Respawn",
  "questMayhemMistiflying1RageDescription": "Swarm Respawn: This bar fills when you don't complete your Dailies. When it is full, the Air Skull Swarm will heal 30% of its remaining health!",
-  "questMayhemMistiflying1RageEffect": "`Air Skull Swarm uses SWARM RESPAWN!`\n\nEmboldened by their victories, more skulls come whirling out of the clouds!",
+  "questMayhemMistiflying1RageEffect": "Air Skull Swarm uses SWARM RESPAWN!\n\nEmboldened by their victories, more skulls come whirling out of the clouds!",
  "questMayhemMistiflying1DropSkeletonPotion": "Skeleton Hatching Potion",
  "questMayhemMistiflying1DropWhitePotion": "White Hatching Potion",
  "questMayhemMistiflying1DropArmor": "Roguish Rainbow Messenger Robes (Armor)",
@@ -623,7 +623,7 @@
  "questLostMasterclasser3Boss": "Void Skull Swarm",
  "questLostMasterclasser3RageTitle": "Swarm Respawn",
  "questLostMasterclasser3RageDescription": "Swarm Respawn: This bar fills when you don't complete your Dailies. When it is full, the Void Skull Swarm will heal 30% of its remaining health!",
-  "questLostMasterclasser3RageEffect": "`Void Skull Swarm uses SWARM RESPAWN!`\n\nEmboldened by their victories, more skulls scream down from the heavens, bolstering the swarm!",
+  "questLostMasterclasser3RageEffect": "Void Skull Swarm uses SWARM RESPAWN!\n\nEmboldened by their victories, more skulls scream down from the heavens, bolstering the swarm!",
  "questLostMasterclasser3DropBodyAccessory": "Aether Amulet (Body Accessory)",
  "questLostMasterclasser3DropBasePotion": "Base Hatching Potion",
  "questLostMasterclasser3DropGoldenPotion": "Golden Hatching Potion",
@@ -637,7 +637,7 @@
  "questLostMasterclasser4Boss": "Anti'zinnya",
  "questLostMasterclasser4RageTitle": "Siphoning Void",
  "questLostMasterclasser4RageDescription": "Siphoning Void: This bar fills when you don't complete your Dailies. When it is full, Anti'zinnya will remove the party's Mana!",
-  "questLostMasterclasser4RageEffect": "`Anti'zinnya uses SIPHONING VOID!` In a twisted inversion of the Ethereal Surge spell, you feel your magic drain away into the darkness!",
+  "questLostMasterclasser4RageEffect": "Anti'zinnya uses SIPHONING VOID! In a twisted inversion of the Ethereal Surge spell, you feel your magic drain away into the darkness!",
  "questLostMasterclasser4DropBackAccessory": "Aether Cloak (Back Accessory)",
  "questLostMasterclasser4DropWeapon": "Aether Crystals (Two-Handed Weapon)",
  "questLostMasterclasser4DropMount": "Invisible Aether Mount",
@@ -804,7 +804,7 @@
  "questWaffleBoss": "Awful Waffle",
  "questWaffleRageTitle": "Maple Mire",
  "questWaffleRageDescription": "Maple Mire: This bar fills when you don't complete your Dailies. When it is full, the Awful Waffle will subtract from the pending damage that party members have built up!",
-  "questWaffleRageEffect": "`Awful Waffle uses MAPLE MIRE!` Sticky sappy syrup slows your swings and spells! Pending damage reduced.",
+  "questWaffleRageEffect": "Awful Waffle uses MAPLE MIRE! Sticky sappy syrup slows your swings and spells! Pending damage reduced.",
  "questWaffleDropDessertPotion": "Confection Hatching Potion",
  "questWaffleUnlockText": "Unlocks Confection Hatching Potions for purchase in the Market",

@@ -875,7 +875,7 @@
  "questVirtualPetBoss": "Wotchimon",
  "questVirtualPetRageTitle": "The Beepening",
  "questVirtualPetRageDescription": "This bar fills when you don't complete your Dailies. When it is full, the Wotchimon will take away some of your party's pending damage!",
-  "questVirtualPetRageEffect": "`Wotchimon uses Bothersome Beep!` Wotchimon sounds a bothersome beep, and its happiness bar suddenly disappears! Pending damage reduced.",
+  "questVirtualPetRageEffect": "Wotchimon uses Bothersome Beep! Wotchimon sounds a bothersome beep, and its happiness bar suddenly disappears! Pending damage reduced.",
  "questVirtualPetDropVirtualPetPotion": "Virtual Pet Hatching Potion",
  "questVirtualPetUnlockText": "Unlocks Virtual Pet Hatching Potion for purchase in the Market",

@@ -885,7 +885,7 @@
  "questPinkMarbleBoss": "Cupido",
  "questPinkMarbleRageTitle": "Pink Punch",
  "questPinkMarbleRageDescription": "This bar fills when you don't complete your Dailies. When it is full, Cupido will take away some of your party's pending damage!",
-  "questPinkMarbleRageEffect": "`Cupido uses Pink Punch!` That wasn't affectionate at all! Your partymates are taken aback. Pending damage reduced.",
+  "questPinkMarbleRageEffect": "Cupido uses Pink Punch! That wasn't affectionate at all! Your partymates are taken aback. Pending damage reduced.",
  "questPinkMarbleDropPinkMarblePotion": "Pink Marble Hatching Potion",
  "questPinkMarbleUnlockText": "Unlocks Pink Marble Hatching Potions for purchase in the Market.",

@@ -997,5 +997,15 @@
  "questFungiRageDescription": "This bar fills when you don't complete your Dailies. When it's full, the Moody Mushroom will take away some of your party's pending damage",
  "questFungiRageEffect": "A Mist emanates from the Moody Mushroom and surrounds your party, dampening the mood and subduing your magic. The party's MP is reduced!",
  "questFungiDropFungiPotion": "Fungi Hatching Potion",
-  "questFungiUnlockText": "Unlocks Fungi Hatching Potions for purchase in the Market."
+  "questFungiUnlockText": "Unlocks Fungi Hatching Potions for purchase in the Market.",
+
+  "questAlienText": "Invasion of the Motivation Snatchers",
+  "questAlienNotes": "It’s been a strange few days in Habitica. The great flying saucer still hovers near the Flourishing Fields. It hums oddly. Why is it lingering? April Fool’s Day has passed, and the Master of Rogues' time in the spotlight has ended.<br><br>You wander toward the light of the space ship. You may as well check it out and get a few steps in while you’re at it.<br><br>As you get closer you see the April Fool, looking a bit grim. His face appears greenish in the light of the ship’s beam.<br><br>”'Twas my plan to get some potions for everyone, a little gift so all can enjoy their little extraterrestrial pals again! But I just can’t work up the gumption… I do believe I know why,” the Fool says, nodding toward the beam.<br><br>Little symbols are being sucked up into the ship. It’s all your checked off tasks! No wonder your motivation’s been lackluster.<br><br>”Our motivation is being abducted!” you exclaim. “We have to rescue it before it ends up in deep space somewhere!”<br><br>The Fool smiles. “Concentrate your thoughts on the tasks you know you need to finish! I’ll do the rest with a bit of magic.”",
+  "questAlienCompletion": "You’ve managed to wrestle back the stolen motivation with your determination and the Fool’s magic power. As you feel your drive returning, the UFO descends, and a ramp slowly comes out along with a large, green, one-eyed creature. While strange-looking, it doesn’t seem threatening.<br><br>“Looks like we went a little far trying to harvest a little extra encouragement from your fine city,” it says. “Apologies for that, and fantastic work getting it back. The extra aura of your efforts actually charged up the ship’s engine enough to get us home! Please, take these with our thanks.”<br><br>“Ooh potions,” says the Fool, “how delightful, and how convenient for me that you have them all ready to go!”",
+  "questAlienBoss": "Encouragement Thief, the Extraterrestrial",
+  "questAlienRageTitle": "Intergalactic Impediment",
+  "questAlienRageDescription": "This bar fills when you don't complete your Dailies. When it is full, the Extraterrestrial will discourage you by recovering some of its Health!",
+  "questAlienRageEffect": "Encouragement Thief uses Intergalactic Impediment! You've backslid right through hyperspace. Your opponent recovers HP!",
+  "questAlienDropAlienPotion": "Alien Hatching Potion",
+  "questAlienUnlockText": "Unlocks Alien Hatching Potion for purchase in the Market"
 }
--- a/website/common/locales/en/settings.json
+++ b/website/common/locales/en/settings.json
@@ -33,7 +33,7 @@
    "resetAccPop": "Start over, removing all levels, gold, gear, history, and tasks.",
    "deleteAccount": "Delete Account",
    "deleteAccPop": "Cancel and remove your Habitica account.",
-    "feedback": "If you'd like to give us feedback, please enter it below - we'd love to hear your feedback! It will be anonymous unless you choose to enter your contact details. Don't speak English well? No problem! Use the language you prefer.",
+    "feedback": "We'd love to hear your feedback! If you'd like to share any, enter it below. It will be anonymous unless you choose to include your contact details.",
    "feedbackPlaceholder": "Add your feedback",
    "dataExport": "Data Export",
    "saveData": "Here are a few options for saving your data.",
@@ -82,8 +82,8 @@
    "resetText2": "Another option is using an <b>Orb of Rebirth</b>, which will reset everything else while preserving your Tasks and Equipment.",
    "resetTextLocal": "If you're absolutely certain, type your password into the text box below.",
    "resetTextSocial": "If you're absolutely certain, type <b>\"<%= magicWord %>\"</b> into the text box below.",
-    "deleteLocalAccountText": "<b>Are you sure?</b> This will delete your account forever, and it can never be restored! You will need to register a new account to use Habitica again. Banked or spent Gems will not be refunded. If you're absolutely certain, type your password into the text box below.",
-    "deleteSocialAccountText": "<b>Are you sure?</b> This will delete your account forever, and it can never be restored! You will need to register a new account to use Habitica again. Banked or spent Gems will not be refunded. If you're absolutely certain, type <b>\"<%= magicWord %>\"</b> into the text box below.",
+    "deleteLocalAccountText": "<b>Are you sure?</b> This action is permanent. Deleting your account will remove all of your data, and it cannot be recovered. Gems will not be refunded.<br><br>Please allow up to 24 hours for account deletion to complete, and up to 30 days for analytics data to be removed if you opted in. Once complete, you'll be able to register for a new Habitica account using your previous login information.<br><br>To continue, type your password below.",
+    "deleteSocialAccountText": "<b>Are you sure?</b> This action is permanent. Deleting your account will remove all of your data, and it cannot be recovered. Gems will not be refunded.<br><br>Please allow up to 24 hours for account deletion to complete, and up to 30 days for analytics data to be removed if you opted in. Once complete, you'll be able to register for a new Habitica account using your previous login information.<br><br>To continue, type <%= magicWord %> below.",
    "API": "API",
    "APICopied": "API token copied to clipboard.",
    "APITokenTitle": "API Token",
--- a/website/common/script/content/appearance/backgrounds.js
+++ b/website/common/script/content/appearance/backgrounds.js
@@ -696,6 +696,9 @@ const backgrounds = {
    birthday_bash: {
      price: 0,
    },
+    on_a_strange_planet: {
+      price: 0,
+    },
  },
  timeTravelBackgrounds: {
    airship: {
--- a/website/common/script/content/constants/aprilFools.js
+++ b/website/common/script/content/constants/aprilFools.js
@@ -0,0 +1,39 @@
+import eggs from '../eggs';
+import stable from '../stable';
+
+const SWAPS = [
+  'Veggie',
+  'Dessert',
+  'VirtualPet',
+  'TeaShop',
+  'Fungi',
+  'Cryptid',
+  'Alien',
+];
+
+export function getMatchingSwap (date = new Date()) {
+  const year = date.getFullYear();
+  const diff = year - 2020;
+  return SWAPS[diff % SWAPS.length];
+}
+
+export function makeSubstitutionMap (swappedPotion) {
+  const substitutions = {
+    pets: {
+      default: `Pet-Dragon-${swappedPotion}`,
+      noPet: `Pet-Wolf-${swappedPotion}`,
+      noPetIOS: `Pet-TigerCub-${swappedPotion}`,
+      noPetAndroid: `Pet-Cactus-${swappedPotion}`,
+    },
+  };
+  for (const pet of Object.keys(stable.specialPets)) {
+    substitutions.pets[`Pet-${pet}`] = `Pet-Dragon-${swappedPotion}`;
+  }
+  for (const egg of Object.keys(eggs.drops)) {
+    substitutions.pets[`Pet-${egg}-`] = `Pet-${egg}-${swappedPotion}`;
+  }
+  for (const egg of Object.keys(eggs.quests)) {
+    substitutions.pets[`Pet-${egg}-`] = `Pet-BearCub-${swappedPotion}`;
+  }
+  return substitutions;
+}
--- a/website/common/script/content/constants/events.js
+++ b/website/common/script/content/constants/events.js
@@ -1,5 +1,6 @@
 /* eslint-disable key-spacing */
 import moment from 'moment';
+import { getMatchingSwap, makeSubstitutionMap } from './aprilFools';

 // gem block: number of gems
 const gemsPromo = {
@@ -53,7 +54,7 @@ export const REPEATING_EVENTS = {
  aprilFools: {
    start: new Date('1970-04-01T04:00-04:00'),
    end: new Date('1970-04-02T03:59-04:00'),
-    aprilFools: 'Cryptid',
+    spriteSubstitutions: makeSubstitutionMap(getMatchingSwap()),
  },
  aprilFoolsResale: {
    start: new Date('1970-04-03T04:00-04:00'),
@@ -65,6 +66,7 @@ export const REPEATING_EVENTS = {
          'virtualpet',
          'waffle',
          'fungi',
+          'alien',
        ],
      },
      {
--- a/website/common/script/content/constants/gifSprites.js
+++ b/website/common/script/content/constants/gifSprites.js
@@ -15,6 +15,7 @@ export default [
  'Mount_Body_Gryphon-Gryphatrice',
  'Mount_Head_Dragon-Hydra',
  'Mount_Head_Gryphon-Gryphatrice',
+  'Pet_HatchingPotion_Alien',
  'Pet_HatchingPotion_Cryptid',
  'Pet_HatchingPotion_Dessert',
  'Pet_HatchingPotion_Fungi',
@@ -24,6 +25,8 @@ export default [
  'Pet-Gryphatrice-Jubilant',
  'Pet-Gryphon-Gryphatrice',
  'Pet-Wolf-Cerberus',
+  'quest_alien',
+  'quest_lostMasterclasser4',
  'quest_solarSystem',
  'quest_virtualpet',
  'quest_windup',
--- a/website/common/script/content/constants/releaseDates.js
+++ b/website/common/script/content/constants/releaseDates.js
@@ -53,4 +53,5 @@ export const HATCHING_POTIONS_RELEASE_DATES = {
  Cryptid: { year: 2025, month: 4, day: 3 },
  Balloon: { year: 2025, month: 4, day: 21 },
  Opal: { year: 2025, month: 5, day: 14 },
+  Alien: { year: 2026, month: 4, day: 3 },
 };
--- a/website/common/script/content/hatching-potions.js
+++ b/website/common/script/content/hatching-potions.js
@@ -155,6 +155,10 @@ const wacky = {
    canBuy: hasQuestAchievementFunction('fungi'),
  },
  Cryptid: {},
+  Alien: {
+    questPotion: true,
+    canBuy: hasQuestAchievementFunction('alien'),
+  },
 };

 each(drops, (pot, key) => {
--- a/website/common/script/content/quests/seasonal.js
+++ b/website/common/script/content/quests/seasonal.js
@@ -233,6 +233,45 @@ const QUEST_SEASONAL = {
      unlock: t('questFungiUnlockText'),
    },
  },
+  alien: {
+    text: t('questAlienText'),
+    notes: t('questAlienNotes'),
+    completion: t('questAlienCompletion'),
+    value: 4,
+    category: 'hatchingPotion',
+    boss: {
+      name: t('questAlienBoss'),
+      hp: 500,
+      str: 2,
+      rage: {
+        title: t('questAlienRageTitle'),
+        description: t('questAlienRageDescription'),
+        value: 50,
+        healing: 0.3,
+        effect: t('questAlienRageEffect'),
+      },
+    },
+    drop: {
+      items: [
+        {
+          type: 'hatchingPotions',
+          key: 'Alien',
+          text: t('questAlienDropAlienPotion'),
+        }, {
+          type: 'hatchingPotions',
+          key: 'Alien',
+          text: t('questAlienDropAlienPotion'),
+        }, {
+          type: 'hatchingPotions',
+          key: 'Alien',
+          text: t('questAlienDropAlienPotion'),
+        },
+      ],
+      gp: 40,
+      exp: 500,
+      unlock: t('questAlienUnlockText'),
+    },
+  },
 };

 export default QUEST_SEASONAL;
--- a/website/common/script/content/stable.js
+++ b/website/common/script/content/stable.js
@@ -1,6 +1,4 @@
 import each from 'lodash/each';
-import moment from 'moment';
-import { EVENTS } from './constants/events';
 import allEggs from './eggs';
 import allPotions from './hatching-potions';
 import t from './translation';
@@ -193,7 +191,7 @@ function buildInfo () {

  Object.assign(petInfo['Gryphatrice-Jubilant'], {
    canBuy () {
-      return moment().isBetween(EVENTS.birthday10.start, EVENTS.birthday10.end);
+      return false;
    },
    currency: 'gems',
    event: 'birthday10',
--- a/website/server/controllers/api-v3/user.js
+++ b/website/server/controllers/api-v3/user.js
@@ -1,7 +1,6 @@
 import cloneDeep from 'lodash/cloneDeep';
 import forEach from 'lodash/forEach';
 import isFunction from 'lodash/isFunction';
-import pick from 'lodash/pick';
 import nconf from 'nconf';
 import get from 'lodash/get';
 import { authWithHeaders } from '../../middlewares/auth';
@@ -10,10 +9,6 @@ import {
  BadRequest,
  NotAuthorized,
 } from '../../libs/errors';
-import {
-  basicFields as basicGroupFields,
-  model as Group,
-} from '../../models/group';
 import * as Tasks from '../../models/task';
 import * as passwordUtils from '../../libs/password';
 import {
@@ -23,6 +18,7 @@ import {
  getUserInfo,
  sendTxn,
 } from '../../libs/email';
+import worker from '../../libs/worker';
 import * as inboxLib from '../../libs/inbox';
 import * as userLib from '../../libs/user';
 import { model as UserHistory } from '../../models/userHistory';
@@ -299,21 +295,6 @@ api.deleteUser = {
      throw new NotAuthorized(res.t('cannotDeleteActiveAccount'));
    }

-    const types = ['party', 'guilds'];
-    const groupFields = basicGroupFields.concat(' leader memberCount purchased');
-
-    const groupsUserIsMemberOf = await Group.getGroups({ user, types, groupFields });
-
-    const groupLeavePromises = groupsUserIsMemberOf.map(group => group.leave(user, 'remove-all'));
-
-    await Promise.all(groupLeavePromises);
-
-    await Tasks.Task.deleteMany({
-      userId: user._id,
-    }).exec();
-
-    await user.deleteOne();
-
    if (feedback) {
      sendTxn({ email: TECH_ASSISTANCE_EMAIL }, 'admin-feedback', [
        { name: 'PROFILE_NAME', content: user.profile.name },
@@ -325,11 +306,13 @@ api.deleteUser = {
      ]);
    }

-    res.analytics.track('account delete', {
-      user: pick(user, ['preferences', 'registeredThrough']),
-      uuid: user._id,
-      hitType: 'event',
-      category: 'behavior',
+    worker.sendJob('deleteUser', {
+      identifier: user._id,
+      data: {
+        userId: user._id,
+        deleteAccount: true,
+        deleteAmplitude: true,
+      },
    });

    res.respond(200, {});
--- a/website/server/controllers/api-v4/members.js
+++ b/website/server/controllers/api-v4/members.js
@@ -1,4 +1,4 @@
-import { sendJob } from '../../libs/worker';
+import worker from '../../libs/worker';
 import { authWithHeaders } from '../../middlewares/auth';
 import { ensurePermission } from '../../middlewares/ensureAccessRight';
 import { TransactionModel as Transaction } from '../../models/transaction';
@@ -48,7 +48,8 @@ api.deleteMember = {
    req.checkQuery('deleteAmplitude').optional().isIn(['true', 'false']);
    const validationErrors = req.validationErrors();
    if (validationErrors) throw validationErrors;
-    sendJob('delete-user', {
+    await worker.sendJob('deleteUser', {
+      identifier: req.params.memberId,
      data: {
        userId: req.params.memberId,
        deleteAccount: req.query.deleteAccount === 'true',
--- a/website/server/controllers/api-v4/status.js
+++ b/website/server/controllers/api-v4/status.js
@@ -24,7 +24,10 @@ api.getReady = {
  middlewares: [disableCache],
  async handler (req, res) {
    // This allows kubernetes to determine if the server is ready to receive traffic
-    if (!SERVER_STATUS.MONGODB || !SERVER_STATUS.REDIS || !SERVER_STATUS.EXPRESS) {
+    if (!SERVER_STATUS.MONGODB
+      || !SERVER_STATUS.RATE_LIMITER
+      || !SERVER_STATUS.WORKER
+      || !SERVER_STATUS.EXPRESS) {
      res.respond(503, {
        status: 'not ready',
      });
--- a/website/server/libs/email.js
+++ b/website/server/libs/email.js
@@ -2,7 +2,7 @@ import nconf from 'nconf';
 import { TAVERN_ID } from '../models/group'; // eslint-disable-line import/no-cycle
 import { encrypt } from './encryption';
 import common from '../../common';
-import { sendJob } from './worker';
+import worker from './worker';

 const IS_PROD = nconf.get('IS_PROD');
 const BASE_URL = nconf.get('BASE_URL');
@@ -148,7 +148,8 @@ export async function sendTxn (mailingInfoArray, emailType, variables, personalV
  }

  if (IS_PROD && mailingInfoArray.length > 0) {
-    return sendJob('email', {
+    return worker.sendJob('email', {
+      identifier: emailType,
      data: {
        emailType,
        to: mailingInfoArray,
--- a/website/server/libs/redis.js
+++ b/website/server/libs/redis.js
@@ -0,0 +1,22 @@
+import IORedis from 'ioredis';
+
+export default function setupRedis (connectionOptions, config) {
+  const redisConfig = { ...config };
+  if (connectionOptions.username) {
+    redisConfig.username = connectionOptions.username;
+  }
+  if (connectionOptions.password) {
+    redisConfig.password = connectionOptions.password;
+  }
+  if (connectionOptions.db) {
+    redisConfig.db = connectionOptions.db;
+  }
+  let connection;
+  const redisUrl = connectionOptions.url;
+  if (redisUrl) {
+    connection = new IORedis(redisUrl, redisConfig);
+  } else {
+    connection = new IORedis(connectionOptions.port, connectionOptions.host, redisConfig);
+  }
+  return connection;
+}
--- a/website/server/libs/serverStatus.js
+++ b/website/server/libs/serverStatus.js
@@ -1,6 +1,7 @@
 const SERVER_STATUS = {
  MONGODB: false,
-  REDIS: false,
+  RATE_LIMITER: false,
+  WORKER: false,
  EXPRESS: false,
 };

--- a/website/server/libs/worker.js
+++ b/website/server/libs/worker.js
@@ -1,33 +1,49 @@
-import got from 'got';
 import nconf from 'nconf';
-import logger from './logger';
+import { Queue } from 'bullmq';
+import setupRedis from './redis';
+import SERVER_STATUS from './serverStatus';

-const EMAIL_SERVER = {
-  url: nconf.get('EMAIL_SERVER_URL'),
-  auth: {
-    user: nconf.get('EMAIL_SERVER_AUTH_USER'),
-    password: nconf.get('EMAIL_SERVER_AUTH_PASSWORD'),
-  },
-};
+let redisClient;
+const queues = {};

-export function sendJob (type, config) {
-  const { data, options } = config;
-  const usedOptions = {
-    backoff: { delay: 10 * 60 * 1000, type: 'exponential' },
-    ...options,
-  };
+if (nconf.get('WORKER_REDIS_URL')) {
+  redisClient = setupRedis({
+    url: nconf.get('WORKER_REDIS_URL'),
+    username: nconf.get('WORKER_REDIS_USERNAME'),
+    password: nconf.get('WORKER_REDIS_PASSWORD'),
+  });

-  return got.post(`${EMAIL_SERVER.url}/job`, {
-    retry: 5, // retry the http request to the email server 5 times
-    timeout: 60000, // wait up to 60s before timing out
-    username: EMAIL_SERVER.auth.user,
-    password: EMAIL_SERVER.auth.password,
-    json: {
-      type,
-      data,
-      options: usedOptions,
-    },
-  }).json().catch(err => logger.error(err, {
-    extraMessage: 'Error while sending an email.',
-  }));
+  redisClient.on('ready', () => {
+    SERVER_STATUS.WORKER = true;
+  });
+
+  redisClient.on('reconnecting', () => {
+    SERVER_STATUS.WORKER = false;
+  });
+
+  const queueConfig = {
+    connection: redisClient,
+  }
+  if (nconf.get('WORKER_REDIS_KEY_PREFIX')) {
+    queueConfig.prefix = nconf.get('WORKER_REDIS_KEY_PREFIX');
+  }
+
+  queues.email = new Queue('emails', queueConfig);
+  queues.deleteUser = new Queue('DeleteUsers', queueConfig);
+} else {
+  SERVER_STATUS.WORKER = true;
 }
+
+function sendJob (type, config) {
+  if (!queues[type]) {
+    return Promise.reject(new Error(`Queue ${type} does not exist`));
+  }
+  const { identifier, data } = config;
+  return queues[type].add(identifier, data);
+}
+
+export function getRedisClient () {
+  return redisClient;
+}
+
+export default { sendJob };
--- a/website/server/middlewares/rateLimiter.js
+++ b/website/server/middlewares/rateLimiter.js
@@ -1,5 +1,4 @@
 import nconf from 'nconf';
-import redis from 'redis';
 import {
  RateLimiterRedis,
  RateLimiterMemory,
@@ -11,6 +10,7 @@ import {
 import logger from '../libs/logger';
 import { apiError } from '../libs/apiError';
 import SERVER_STATUS from '../libs/serverStatus';
+import setupRedis from '../libs/redis';

 // Middleware to rate limit requests to the API

@@ -19,9 +19,6 @@ import SERVER_STATUS from '../libs/serverStatus';

 const IS_TEST = nconf.get('IS_TEST');
 const RATE_LIMITER_ENABLED = nconf.get('RATE_LIMITER_ENABLED') === 'true';
-const REDIS_HOST = nconf.get('REDIS_HOST');
-const REDIS_PASSWORD = nconf.get('REDIS_PASSWORD');
-const REDIS_PORT = nconf.get('REDIS_PORT');
 const LIVELINESS_PROBE_KEY = nconf.get('LIVELINESS_PROBE_KEY');
 const REGISTRATION_COST = nconf.get('RATE_LIMITER_REGISTRATION_COST') || 5;
 const IP_RATE_LIMIT_COST = nconf.get('RATE_LIMITER_IP_COST') || 5;
@@ -41,19 +38,21 @@ if (RATE_LIMITER_ENABLED) {
      ...rateLimiterOpts,
    });
  } else {
-    redisClient = redis.createClient({
-      host: REDIS_HOST,
-      password: REDIS_PASSWORD,
-      port: REDIS_PORT,
-      enable_offline_queue: false,
+    redisClient = setupRedis({
+      host: nconf.get('REDIS_HOST'),
+      username: nconf.get('REDIS_USERNAME'),
+      password: nconf.get('REDIS_PASSWORD'),
+      port: nconf.get('REDIS_PORT'),
+    }, {
+      enableOfflineQueue: false,
    });

    redisClient.on('ready', () => {
-      SERVER_STATUS.REDIS = true;
+      SERVER_STATUS.RATE_LIMITER = true;
    });

    redisClient.on('reconnecting', () => {
-      SERVER_STATUS.REDIS = false;
+      SERVER_STATUS.RATE_LIMITER = false;
    });

    redisClient.on('error', error => {
@@ -66,7 +65,7 @@ if (RATE_LIMITER_ENABLED) {
    });
  }
 } else {
-  SERVER_STATUS.REDIS = true;
+  SERVER_STATUS.RATE_LIMITER = true;
 }

 function setResponseHeaders (res, rateLimiterRes) {
@@ -83,6 +82,10 @@ function setResponseHeaders (res, rateLimiterRes) {
  res.set(headers);
 }

+export function getRedisClient () {
+  return redisClient;
+}
+
 export default function rateLimiterMiddleware (req, res, next) {
  if (!RATE_LIMITER_ENABLED) return next();
  if (LIVELINESS_PROBE_KEY && req.query.liveliness === LIVELINESS_PROBE_KEY) return next();
--- a/website/server/models/group.js
+++ b/website/server/models/group.js
@@ -1431,6 +1431,7 @@ schema.methods.leave = async function leaveGroup (user, keep = 'keep-all', keepC

    if (members.length === 0) {
      promises.push(group.deleteOne());
+      promises.push(Chat.deleteMany({ groupId: group._id }));
      return Promise.all(promises);
    }
  }
--- a/website/server/server.js
+++ b/website/server/server.js
@@ -2,8 +2,9 @@ import nconf from 'nconf';
 import express from 'express';
 import http from 'http';
 import mongoose from 'mongoose';
-import redis from 'redis';
 import logger from './libs/logger';
+import { getRedisClient as getWorkerRedisClient } from './libs/worker';
+import { getRedisClient as getRateLimiterRedisClient } from './middlewares/rateLimiter';

 // Setup translations
 // Must come before attach middlewares so Mongoose validations can use translations
@@ -31,7 +32,10 @@ process.on('SIGTERM', async () => {
  console.log('SIGTERM signal received: closing HTTP server');
  server.close(async () => {
    await mongoose.disconnect();
-    await redis.quit();
+    const workerRedisClient = getWorkerRedisClient();
+    if (workerRedisClient) await workerRedisClient.quit();
+    const rateLimiterRedisClient = getRateLimiterRedisClient();
+    if (rateLimiterRedisClient) await rateLimiterRedisClient.quit();
    process.exit(0);
  });
 });
Author	SHA1	Message	Date
Phillip Thelen	47c156d9b1	add key prefix	2026-03-25 11:51:51 +01:00
Phillip Thelen	e6418e4356	add space	2026-03-25 11:48:03 +01:00
Phillip Thelen	3c23989e99	use bullmq directly to schedule jobs	2026-03-25 11:37:02 +01:00
Phillip Thelen	2d1f341256	refactor redis setup into own file and use ioredis	2026-03-25 11:35:35 +01:00
Kalista Payne	44adfd611a	fix(lint): no-undef	2026-03-23 19:31:12 -05:00
Kalista Payne	ab50c41287	fix(tests): remove tests These can potentially be tested in the worker's suite? They target functionality that the group leave route handles within the deletion flow	2026-03-23 17:18:01 -05:00
Kalista Payne	c43abe82fe	Revert "fix(deletion): handle group leave logic on app server still" This reverts commit `9db541f4c3`.	2026-03-23 08:51:53 -05:00
Kalista Payne	ac0b4a324f	fix(deletion): remove orphaned chat messages	2026-03-20 11:17:30 -05:00
Kalista Payne	efa0a325a2	fix(text): don't break to new paragraph about Gems	2026-03-20 11:17:30 -05:00
Kalista Payne	bc970d33ac	fix(deletion): update delete/feedback form copy	2026-03-20 11:17:30 -05:00
Kalista Payne	09e432cf32	fix(test): adapt test for worker flow	2026-03-20 11:17:30 -05:00
Kalista Payne	40aa2e214d	fix(import): bracket syntax	2026-03-20 11:17:30 -05:00
Kalista Payne	9f563b741d	fix(lint): unused import	2026-03-20 11:17:30 -05:00
Kalista Payne	9db541f4c3	fix(deletion): handle group leave logic on app server still	2026-03-20 11:17:30 -05:00
Kalista Payne	ce4a20e3d8	WIP(delete): remove business logic from controller	2026-03-20 11:17:30 -05:00
Kalista Payne	cc7683a871	chore(git): update submodule	2026-03-19 18:09:22 -05:00
Kalista Payne	31b2781333	Squashed commit of the following: commit `866f074a15` Author: Kalista Payne <kalista@habitica.com> Date: Wed Mar 18 15:51:18 2026 -0500 fix(quests): remove backticks from text commit `d06fc2825e` Author: Kalista Payne <kalista@habitica.com> Date: Wed Mar 18 13:16:32 2026 -0500 fix(background): add missing data commit `55156c5f80` Author: Kalista Payne <kalista@habitica.com> Date: Wed Mar 18 13:00:43 2026 -0500 fix(lint): max-len commit `db88092acf` Author: Kalista Payne <kalista@habitica.com> Date: Wed Mar 18 12:56:30 2026 -0500 fix(customization): show event backgrounds for AF commit `d6fd1ce7fa` Author: Phillip Thelen <phillip@habitica.com> Date: Tue Mar 17 15:55:53 2026 +0100 set release date commit `b876d8c789` Author: Phillip Thelen <phillip@habitica.com> Date: Tue Mar 17 11:40:17 2026 +0100 Improve swap handling commit `f75a4d0147` Author: Phillip Thelen <phillip@habitica.com> Date: Tue Mar 17 11:22:42 2026 +0100 use correct name for bear sprites commit `195db1b132` Author: Phillip Thelen <phillip@habitica.com> Date: Mon Mar 16 23:01:35 2026 +0100 more fix commit `a42d3f08d7` Author: Phillip Thelen <phillip@habitica.com> Date: Mon Mar 16 18:43:21 2026 +0100 fix test commit `9c06299c34` Author: Phillip Thelen <phillip@habitica.com> Date: Mon Mar 16 09:13:13 2026 +0100 AF tweaks commit `5465e23e67` Author: Kalista Payne <kalista@habitica.com> Date: Wed Mar 11 19:43:01 2026 -0500 fix(sprites): add missing gif redirects commit `5721ecc6f2` Author: Kalista Payne <kalista@habitica.com> Date: Tue Mar 10 16:34:26 2026 -0500 chore(css): run sprites commit `2184ff2e69` Author: Kalista Payne <kalista@habitica.com> Date: Tue Mar 10 10:38:34 2026 -0500 fix(test): date commit `d684a7297c` Author: Kalista Payne <kalista@habitica.com> Date: Tue Mar 10 10:32:04 2026 -0500 fix(test): update for 2026, also more lint commit `82e7947fd7` Author: Kalista Payne <kalista@habitica.com> Date: Tue Mar 10 10:22:05 2026 -0500 fix(event): lint and missing pieces commit `96818b2d77` Author: Kalista Payne <kalista@habitica.com> Date: Mon Mar 9 20:11:22 2026 -0500 feat(event): finished Alien build commit `4c9763b676` Author: Kalista Payne <kalista@habitica.com> Date: Fri Mar 6 16:30:36 2026 -0600 wip(event): April Fools 2026 build commit `2f16a016e6` Author: Phillip Thelen <phillip@habitica.com> Date: Wed Feb 4 14:16:50 2026 +0100 add april fools tests commit `cd1d926c98` Author: Phillip Thelen <phillip@habitica.com> Date: Wed Feb 4 14:09:16 2026 +0100 make april fools cycle through commit `d8a4216c41` Author: Phillip Thelen <phillip@habitica.com> Date: Mon Feb 2 14:41:26 2026 +0100 fix lint commit `8265a15923` Author: Phillip Thelen <phillip@habitica.com> Date: Mon Feb 2 12:34:46 2026 +0100 name key more generic commit `9c7bde8ad5` Author: Phillip Thelen <phillip@habitica.com> Date: Mon Feb 2 12:26:43 2026 +0100 right date for april fools commit `c2b92c6311` Author: Phillip Thelen <phillip@habitica.com> Date: Mon Feb 2 12:26:19 2026 +0100 rework how april fools works	2026-03-19 15:09:32 -05:00