Merge branch 'main' into 3-otel

test: correct image size of extra bytes jpeg test
Signed-off-by: izzy <me@insrt.uk>
2026-07-06 19:25:59 +00:00 · 2026-04-01 21:14:44 +01:00 · 2026-01-25 20:22:47 +00:00 · 2026-01-25 19:49:36 +00:00 · 2026-01-25 19:49:08 +00:00 · 2026-01-25 19:49:08 +00:00
241 changed files with 6863 additions and 118328 deletions
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -1,24 +0,0 @@
-<!-- Describe your changes -->
-
-Fixes # (issue)
-
-## How was this PR tested?
-
-<!-- What did you do to test your changes? -->
-
- [ ] Test A
- [ ] Test B
-
-## Checklist:
-
- [ ] I have carefully read [the contributing guidelines](https://developers.stoat.chat/developing/contrib/)
- [ ] I have performed a self-review of my own code
- [ ] I have made corresponding changes to the documentation if applicable
- [ ] I have no unrelated changes in the PR
- [ ] I have confirmed that any new dependencies are strictly necessary
- [ ] I have written tests for new code (if applicable)
- [ ] I have followed naming conventions/patterns in the surrounding code
-
-## Please declare, if any, LLM usage involved in creating this PR
-
-...
--- a/.github/workflows/docker-cleanup.yaml
+++ b/.github/workflows/docker-cleanup.yaml
@@ -1,46 +0,0 @@
-name: Docker PR Image Cleanup
-
-on:
-  pull_request:
-    types:
-      - closed
-
-permissions:
-  contents: read
-  packages: write
-
-concurrency:
-  group: docker-cleanup-${{ github.event.pull_request.number }}
-  cancel-in-progress: false
-
-jobs:
-  cleanup:
-    runs-on: ubuntu-latest
-    if: ${{ !github.event.pull_request.head.repo.fork }}
-    strategy:
-      fail-fast: false
-      matrix:
-        package:
-          - base
-          - api
-          - events
-          - file-server
-          - proxy
-          - gifbox
-          - crond
-          - pushd
-          - voice-ingress
-    steps:
-      - env:
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          ORG: stoatchat
-          PACKAGE: ${{ matrix.package }}
-          TAG: pr-${{ github.event.pull_request.number }}
-        run: |
-          set -euo pipefail
-          gh api --paginate \
-            "/orgs/${ORG}/packages/container/${PACKAGE}/versions" \
-            --jq ".[] | select(.metadata.container.tags | index(\"${TAG}\")) | .id" \
-          | while read -r id; do
-              gh api -X DELETE "/orgs/${ORG}/packages/container/${PACKAGE}/versions/${id}"
-            done
--- a/.github/workflows/docker.yaml
+++ b/.github/workflows/docker.yaml
@@ -5,6 +5,8 @@ on:
    tags:
      - "*"
  pull_request:
+    paths:
+      - "Dockerfile"
  workflow_dispatch:

 permissions:
@@ -17,9 +19,9 @@ concurrency:

 jobs:
  base:
-    name: Test base image build (fork)
+    name: Test base image build
    runs-on: arc-runner-set
-    if: github.event_name == 'pull_request' && github.event.pull_request.head.repo.fork
+    if: github.event_name == 'pull_request'
    steps:
      # Configure build environment
      - name: Checkout
@@ -40,7 +42,7 @@ jobs:

  publish:
    runs-on: arc-runner-set
-    if: ${{ github.event_name != 'pull_request' || !github.event.pull_request.head.repo.fork }}
+    if: github.event_name != 'pull_request'
    name: Publish Docker images
    steps:
      # Configure build environment
@@ -57,15 +59,6 @@ jobs:
          username: ${{ github.actor }}
          password: ${{ secrets.GITHUB_TOKEN }}

-      - name: Determine base image tag
-        id: base
-        run: |
-          if [ "${{ github.event_name }}" = "pull_request" ]; then
-            echo "tag=pr-${{ github.event.number }}" >> "$GITHUB_OUTPUT"
-          else
-            echo "tag=latest" >> "$GITHUB_OUTPUT"
-          fi
-
      # Build the image
      - name: Build base image
        uses: docker/build-push-action@v4
@@ -73,9 +66,7 @@ jobs:
          context: .
          push: true
          platforms: linux/amd64,linux/arm64
-          tags: ghcr.io/${{ github.repository_owner }}/base:${{ steps.base.outputs.tag }}
-          cache-from: type=gha,scope=buildx-base-multi-arch
-          cache-to: type=gha,scope=buildx-base-multi-arch,mode=max
+          tags: ghcr.io/${{ github.repository_owner }}/base:latest

      # stoatchat/api
      - name: Docker meta
@@ -93,7 +84,7 @@ jobs:
          file: crates/delta/Dockerfile
          tags: ${{ steps.meta-delta.outputs.tags }}
          build-args: |
-            BASE_IMAGE=ghcr.io/${{ github.repository_owner }}/base:${{ steps.base.outputs.tag }}
+            BASE_IMAGE=ghcr.io/${{ github.repository_owner }}/base:latest
          labels: ${{ steps.meta-delta.outputs.labels }}

      # stoatchat/events
@@ -112,7 +103,7 @@ jobs:
          file: crates/bonfire/Dockerfile
          tags: ${{ steps.meta-bonfire.outputs.tags }}
          build-args: |
-            BASE_IMAGE=ghcr.io/${{ github.repository_owner }}/base:${{ steps.base.outputs.tag }}
+            BASE_IMAGE=ghcr.io/${{ github.repository_owner }}/base:latest
          labels: ${{ steps.meta-bonfire.outputs.labels }}

      # stoatchat/file-server
@@ -131,7 +122,7 @@ jobs:
          file: crates/services/autumn/Dockerfile
          tags: ${{ steps.meta-autumn.outputs.tags }}
          build-args: |
-            BASE_IMAGE=ghcr.io/${{ github.repository_owner }}/base:${{ steps.base.outputs.tag }}
+            BASE_IMAGE=ghcr.io/${{ github.repository_owner }}/base:latest
          labels: ${{ steps.meta-autumn.outputs.labels }}

      # stoatchat/proxy
@@ -150,7 +141,7 @@ jobs:
          file: crates/services/january/Dockerfile
          tags: ${{ steps.meta-january.outputs.tags }}
          build-args: |
-            BASE_IMAGE=ghcr.io/${{ github.repository_owner }}/base:${{ steps.base.outputs.tag }}
+            BASE_IMAGE=ghcr.io/${{ github.repository_owner }}/base:latest
          labels: ${{ steps.meta-january.outputs.labels }}

      # stoatchat/gifbox
@@ -169,7 +160,7 @@ jobs:
          file: crates/services/gifbox/Dockerfile
          tags: ${{ steps.meta-gifbox.outputs.tags }}
          build-args: |
-            BASE_IMAGE=ghcr.io/${{ github.repository_owner }}/base:${{ steps.base.outputs.tag }}
+            BASE_IMAGE=ghcr.io/${{ github.repository_owner }}/base:latest
          labels: ${{ steps.meta-gifbox.outputs.labels }}

      # stoatchat/crond
@@ -188,7 +179,7 @@ jobs:
          file: crates/daemons/crond/Dockerfile
          tags: ${{ steps.meta-crond.outputs.tags }}
          build-args: |
-            BASE_IMAGE=ghcr.io/${{ github.repository_owner }}/base:${{ steps.base.outputs.tag }}
+            BASE_IMAGE=ghcr.io/${{ github.repository_owner }}/base:latest
          labels: ${{ steps.meta-crond.outputs.labels }}

      # stoatchat/pushd
@@ -207,7 +198,7 @@ jobs:
          file: crates/daemons/pushd/Dockerfile
          tags: ${{ steps.meta-pushd.outputs.tags }}
          build-args: |
-            BASE_IMAGE=ghcr.io/${{ github.repository_owner }}/base:${{ steps.base.outputs.tag }}
+            BASE_IMAGE=ghcr.io/${{ github.repository_owner }}/base:latest
          labels: ${{ steps.meta-pushd.outputs.labels }}

      # stoatchat/voice-ingress
@@ -226,5 +217,5 @@ jobs:
          file: crates/daemons/voice-ingress/Dockerfile
          tags: ${{ steps.meta-voice-ingress.outputs.tags }}
          build-args: |
-            BASE_IMAGE=ghcr.io/${{ github.repository_owner }}/base:${{ steps.base.outputs.tag }}
+            BASE_IMAGE=ghcr.io/${{ github.repository_owner }}/base:latest
          labels: ${{ steps.meta-voice-ingress.outputs.labels }}
--- a/.github/workflows/publish-crates.yml
+++ b/.github/workflows/publish-crates.yml
@@ -21,6 +21,4 @@ jobs:
          github-token: ${{ secrets.GITHUB_TOKEN }}

      - name: Publish
-        env:
-          CARGO_REGISTRY_TOKEN: ${{ secrets.CARGO_REGISTRY_TOKEN }}
        run: mise publish --workspace
--- a/.github/workflows/renovate.yml
+++ b/.github/workflows/renovate.yml
@@ -1,30 +0,0 @@
-# DO NOT EDIT DIRECTLY IN REPOSITORY
-# Managed in Terraform templates
-
-name: Renovate
-on:
-  workflow_dispatch:
-  schedule:
-    - cron: '0/15 * * * *'
-jobs:
-  renovate:
-    runs-on: ubuntu-latest
-    steps:
-      - id: app-token
-        uses: actions/create-github-app-token@v2
-        with:
-          app-id: ${{ secrets.GH_STOAT_RELEASE_APP_ID }}
-          private-key: ${{ secrets.GH_STOAT_RELEASE_APP_PRIVATE_KEY }}
-
-      - name: Setup Mise
-        uses: immich-app/devtools/actions/use-mise@7b8610a904d57da241e4ddba17fa62b62b15aed4 # use-mise-action-v2.0.2
-        with:
-          github_token: ${{ steps.app-token.outputs.token }}
-
-      - name: Self-hosted Renovate
-        uses: renovatebot/github-action@v46.1.14
-        with:
-          token: '${{ steps.app-token.outputs.token }}'
-        env:
-          RENOVATE_PLATFORM_COMMIT: 'enabled'
-          RENOVATE_REPOSITORIES: '${{ github.repository }}'
--- a/.github/workflows/rust.yaml
+++ b/.github/workflows/rust.yaml
@@ -37,7 +37,6 @@ jobs:
      - name: Reference Test
        env:
          TEST_DB: REFERENCE
-        continue-on-error: ${{ github.ref_name == 'main' }}
        run: |
          mise test

@@ -45,7 +44,6 @@ jobs:
        env:
          TEST_DB: MONGODB
          MONGODB: mongodb://localhost
-        continue-on-error: ${{ github.ref_name == 'main' }}
        run: |
          mise test

--- a/.mise/config.toml
+++ b/.mise/config.toml
@@ -16,13 +16,4 @@ idiomatic_version_file_enable_tools = ["rust"]
 [tasks.start]
 description = "Run all services"
 depends = ["docker:start", "build"]
-wait_for = ["docker:start", "build"]
 run = [{ task = "service:*" }]
-
-[env]
-BUILDER = "cargo"
-DOCKER_NETWORK_NAME = "stoatchat_default"
-DATABASE_PORT = "27017"
-RABBIT_PORT = "5672"
-REDIS_PORT = "6379"
-_.file = { path = ".env", tools = true }
--- a/.mise/tasks/build
+++ b/.mise/tasks/build
@@ -2,4 +2,4 @@
 #MISE description="Build project"
 set -e

-${BUILDER} build "$@"
+cargo build "$@"
--- a/.mise/tasks/docker/start
+++ b/.mise/tasks/docker/start
@@ -2,12 +2,4 @@
 #MISE description="Start Docker containers"
 set -e

-docker compose up -d
-
-docker run \
--network=${DOCKER_NETWORK_NAME} \
--name wait \
--rm dokku/wait  -c \
-rabbit:${RABBIT_PORT},\
-database:${DATABASE_PORT},\
-redis:${REDIS_PORT}
+docker compose up -d "$@"
--- a/.mise/tasks/docker/stop
+++ b/.mise/tasks/docker/stop
@@ -2,4 +2,4 @@
 #MISE description="Stop Docker containers"
 set -e

-docker compose down
+docker compose down "$@"
--- a/.release-please-manifest.json
+++ b/.release-please-manifest.json
@@ -1,3 +1,3 @@
 {
-    ".": "0.13.7"
+    ".": "0.12.0"
 }
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,107 +1,5 @@
 # Changelog

-## [0.13.7](https://github.com/stoatchat/stoatchat/compare/v0.13.6...v0.13.7) (2026-05-21)
-
-
-### Bug Fixes
-
-* sanitize emoji input to handle variation selectors ([#774](https://github.com/stoatchat/stoatchat/issues/774)) ([2d308e0](https://github.com/stoatchat/stoatchat/commit/2d308e03d58c19f27b5b4d65dc2a15ef20b56190))
-* update mention count badge for channel acks ([#769](https://github.com/stoatchat/stoatchat/issues/769)) ([0d9ae50](https://github.com/stoatchat/stoatchat/commit/0d9ae508d9d2199f0e408b8ca634d20489be6f61))
-
-## [0.13.6](https://github.com/stoatchat/stoatchat/compare/v0.13.5...v0.13.6) (2026-05-18)
-
-
-### Features
-
-* Update FCM payload for android notifications ([#766](https://github.com/stoatchat/stoatchat/issues/766)) ([acbc087](https://github.com/stoatchat/stoatchat/commit/acbc087982e9aeb05cabc5ab4c9b1291f67490ad))
-* user slowmode events ([#760](https://github.com/stoatchat/stoatchat/issues/760)) ([af0d8aa](https://github.com/stoatchat/stoatchat/commit/af0d8aad14dc68d88159d0e1c714077d362e21e4))
-
-
-### Bug Fixes
-
-* include `minio` region as tests need it ([#761](https://github.com/stoatchat/stoatchat/issues/761)) ([298742d](https://github.com/stoatchat/stoatchat/commit/298742dbad4eafae356f976c56b9db23904b0c3a))
-* set env var for publishing crates ([#768](https://github.com/stoatchat/stoatchat/issues/768)) ([018afaf](https://github.com/stoatchat/stoatchat/commit/018afaf38f6330d92dad2a68b640c0cb3f6b639a))
-* Use proper headers to determine IP when not behind cloudflare ([#764](https://github.com/stoatchat/stoatchat/issues/764)) ([494c8b7](https://github.com/stoatchat/stoatchat/commit/494c8b7cabaae2a51039a7a5b559d5e2e5279554))
-* voice ingress crashing due to new Result in AMQP::new_auto() ([#765](https://github.com/stoatchat/stoatchat/issues/765)) ([2871632](https://github.com/stoatchat/stoatchat/commit/2871632382395cb20cbe0047c542d3ac31ff3f03))
-
-
-### Miscellaneous Chores
-
-* switch to lapin ([#767](https://github.com/stoatchat/stoatchat/issues/767)) ([5b19853](https://github.com/stoatchat/stoatchat/commit/5b1985381ae829a92c80a19e91a414cd9dc4de93))
-
-## [0.13.5](https://github.com/stoatchat/stoatchat/compare/v0.13.4...v0.13.5) (2026-05-17)
-
-
-### Bug Fixes
-
-* dont panic on hash missing when deleting files ([#755](https://github.com/stoatchat/stoatchat/issues/755)) ([c902077](https://github.com/stoatchat/stoatchat/commit/c902077cf51076fee11712eb732dc8a8f786fc4b))
-
-## [0.13.4](https://github.com/stoatchat/stoatchat/compare/v0.13.3...v0.13.4) (2026-05-16)
-
-
-### Bug Fixes
-
-* add TLS feature to livekit-api crate ([#753](https://github.com/stoatchat/stoatchat/issues/753)) ([6cfee1f](https://github.com/stoatchat/stoatchat/commit/6cfee1f601c1e084df7c8f1e7a5e8a560d1dd514))
-
-## [0.13.3](https://github.com/stoatchat/stoatchat/compare/v0.13.2...v0.13.3) (2026-05-15)
-
-
-### Bug Fixes
-
-* don't automatically set up rabbitmq in delta ([#749](https://github.com/stoatchat/stoatchat/issues/749)) ([7647cfc](https://github.com/stoatchat/stoatchat/commit/7647cfc8d93aba99f5faef13eb3d970097540d76))
-* don't declare queues which seem to cause the backend to crash in prod ([7647cfc](https://github.com/stoatchat/stoatchat/commit/7647cfc8d93aba99f5faef13eb3d970097540d76))
-
-## [0.13.2](https://github.com/stoatchat/stoatchat/compare/v0.13.1...v0.13.2) (2026-05-11)
-
-
-### Bug Fixes
-
-* update default exchange to `revolt.default` ([#746](https://github.com/stoatchat/stoatchat/issues/746)) ([fcb8091](https://github.com/stoatchat/stoatchat/commit/fcb8091cd7a00d7f26c798daa33aae4b923b2a8b))
-
-## [0.13.1](https://github.com/stoatchat/stoatchat/compare/v0.13.0...v0.13.1) (2026-05-10)
-
-
-### Bug Fixes
-
-* amqprs startup bug ([#744](https://github.com/stoatchat/stoatchat/issues/744)) ([1100eaf](https://github.com/stoatchat/stoatchat/commit/1100eaf46f849f2509ae01ac497556ca33bde778))
-
-## [0.13.0](https://github.com/stoatchat/stoatchat/compare/v0.12.1...v0.13.0) (2026-05-08)
-
-
-### Features
-
-* add embed support for YouTube Shorts ([#734](https://github.com/stoatchat/stoatchat/issues/734)) ([d46c7f7](https://github.com/stoatchat/stoatchat/commit/d46c7f7f3c04524c0639c3e0a122626f8e0b3bf7))
-* add emoji rename endpoint ([#714](https://github.com/stoatchat/stoatchat/issues/714)) ([23ad135](https://github.com/stoatchat/stoatchat/commit/23ad1359834bb7d07a460b8678d6a6ebffc73eb0))
-* add legal links to root payload ([#733](https://github.com/stoatchat/stoatchat/issues/733)) ([21d8201](https://github.com/stoatchat/stoatchat/commit/21d82018cf84ab0fdd10613d254b9562aea8eea3))
-* add role icon support ([#724](https://github.com/stoatchat/stoatchat/issues/724)) ([841985d](https://github.com/stoatchat/stoatchat/commit/841985d3b994df1c6eefab2fc7ecbd77ab22c493))
-* Add webhook endpoints for editing and deleting messages ([#682](https://github.com/stoatchat/stoatchat/issues/682)) ([6f3441c](https://github.com/stoatchat/stoatchat/commit/6f3441cf4acac2a8e6e1bf07a279a153b80f7956))
-* automatically sanitise usernames on create/update ([#689](https://github.com/stoatchat/stoatchat/issues/689)) ([e937697](https://github.com/stoatchat/stoatchat/commit/e93769786c7669485a659ee471630740d3cea702))
-* blacklist private ip ranges and add january domain blocklist ([#731](https://github.com/stoatchat/stoatchat/issues/731)) ([6b41db9](https://github.com/stoatchat/stoatchat/commit/6b41db984bb491b2e58324309cc70d8c14e0b814))
-* Rewrite acks ([#741](https://github.com/stoatchat/stoatchat/issues/741)) ([ab5bd47](https://github.com/stoatchat/stoatchat/commit/ab5bd47a39ee889de0b5ae6e7b560620853daead))
-
-
-### Bug Fixes
-
-* add new_user_hours to configuration limits ([#729](https://github.com/stoatchat/stoatchat/issues/729)) ([279f5d5](https://github.com/stoatchat/stoatchat/commit/279f5d5fd7af2df55902c706859ec07f569cdb1e))
-* add reconnection policy to Redis subscriber to prevent ghost state ([#708](https://github.com/stoatchat/stoatchat/issues/708)) ([057f2bb](https://github.com/stoatchat/stoatchat/commit/057f2bb8b359f8b942741a30ff54eeb8fbe3e0b1))
-* docker compose file had personal url in it ([#742](https://github.com/stoatchat/stoatchat/issues/742)) ([0719985](https://github.com/stoatchat/stoatchat/commit/0719985ac5636590f91e6f9ec4b68f3eded70c13))
-* don't strip ICC from exif ([#735](https://github.com/stoatchat/stoatchat/issues/735)) ([d76a711](https://github.com/stoatchat/stoatchat/commit/d76a71141f3e508f6308ba52fa28eaeb56fb3438))
-* dont send notification in fcm ([#721](https://github.com/stoatchat/stoatchat/issues/721)) ([89171e9](https://github.com/stoatchat/stoatchat/commit/89171e9bd0f15711157e78c6eec0fe7b480de93a))
-* encode filenames in redirects ([#737](https://github.com/stoatchat/stoatchat/issues/737)) ([9fd7128](https://github.com/stoatchat/stoatchat/commit/9fd7128f800badbd184baf943d4f799e601201e4))
-* january ip redirects & domain resolver ([#738](https://github.com/stoatchat/stoatchat/issues/738)) ([356491e](https://github.com/stoatchat/stoatchat/commit/356491e934b274f9e895df883dd63ef0b3123510))
-* update message length validation to remove upper limit ([#723](https://github.com/stoatchat/stoatchat/issues/723)) ([ed4fd5e](https://github.com/stoatchat/stoatchat/commit/ed4fd5ebfe6d0ea534a0898da4afdc1f4e2cd6c5))
-* use correct response for NoEffect errors ([#732](https://github.com/stoatchat/stoatchat/issues/732)) ([5378cd2](https://github.com/stoatchat/stoatchat/commit/5378cd22b4c7d85f44c31a6af0dda00941b80d5c))
-
-## [0.12.1](https://github.com/stoatchat/stoatchat/compare/v0.12.0...v0.12.1) (2026-04-10)
-
-
-### Bug Fixes
-
-* add migration to update existing files to be animated ([#705](https://github.com/stoatchat/stoatchat/issues/705)) ([f2c056a](https://github.com/stoatchat/stoatchat/commit/f2c056a1515be493b195f3f5db5886c2ddf36700))
-* don't send self dm notifications ([#706](https://github.com/stoatchat/stoatchat/issues/706)) ([f30b729](https://github.com/stoatchat/stoatchat/commit/f30b729ca90d0be6853c57ab4935694e5e59ae56))
-* mise start + missing docker image ([#564](https://github.com/stoatchat/stoatchat/issues/564)) ([fb8fe16](https://github.com/stoatchat/stoatchat/commit/fb8fe1655776791421284a6a093e86f0320c258a))
-* test failure due to wrong assertion ([#707](https://github.com/stoatchat/stoatchat/issues/707)) ([f81e329](https://github.com/stoatchat/stoatchat/commit/f81e3291bdd57af9ceedb2987b111acc7051d69c))
-
 ## [0.12.0](https://github.com/stoatchat/stoatchat/compare/v0.11.5...v0.12.0) (2026-03-28)


--- a/Cargo.lock
+++ b/Cargo.lock
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,5 +1,5 @@
 [workspace]
-resolver = "3"
+resolver = "2"

 members = [
    "crates/delta",
@@ -20,131 +20,24 @@ lto = true
 [workspace.dependencies]
 # Async
 async-trait = "0.1.89"
-tokio = "1.49.0"
-async-channel = "2.3.1"
-futures = "0.3.32"
-async-std = "1.8.0"
-async-tungstenite = "0.17.0"
-futures-locks = "0.7.1"
-async-lock = "2.8.0"
-async-recursion = "1.0.4"
+tokio = { version = "1.49.0", features = ["macros", "rt"] }

 # Error Handling
 anyhow = "1.0.100"
 thiserror = "2.0.18"
-sentry = "0.31.5"
-sentry-anyhow = "0.38.1"

-# Data Validation
-regex = "1.12.3"
-validator = "0.16"
-
-# Data Types
-uuid = "1.19.0"
-ulid = "1.2.1"
-nanoid = "0.4.0"
-typenum = "1.17.0"
-num_enum = "0.6.1"
-bitfield = "0.13.2"
-
-# Time
-chrono = "0.4.15"
-iso8601-timestamp = "0.2.10"
-
-# Data Collections
-lru = "0.16.3"
-indexmap = "2.13.1"
-dashmap = "5.2.0"
-moka = "0.12.8"
-lru_time_cache = "0.11.11"
-deadqueue = "0.2.4"
-
-# Web scraping
-scraper = "0.20.0"
-encoding_rs = "0.8.34"
-
-# Mail
-lettre = "0.10.0-alpha.4"
-handlebars = "4.3.0"
-
-# HTTP Requests
-reqwest = "0.13.2"
-isahc = "1.7"
-
-# Notifications
-fcm_v1 = "0.3.0"
-web-push = "0.10.0"
-revolt_a2 = "0.10"
-
-# Parsing
-logos = "0.15"
-
-# SVG rendering
-usvg = "0.44.0"
-resvg = "0.44.0"
-tiny-skia = "0.11.4"
-
-# Logging
-log = "0.4.29"
-pretty_env_logger = "0.4.0"
-
-# Redis
-redis-kiss = "0.1.4"
-fred = "8.0.1"
-
-# Serialisation
-bincode = "1.3.3"
-serde_json = "1.0.79"
-rmp-serde = "1.0.0"
-serde = { version = "1", features = ["derive"] }
-strum_macros = "0.26.4"
-
-# MongoDB
-bson = { version = "2.1.0" }
-mongodb = { version = "3.1.0" }
-
-# S3
-aws-config = "1.5.5"
-aws-sdk-s3 = "1.46.0"
+# Other Utilities
+uuid = { version = "1.19.0", features = ["v4"] }

 # Axum (HTTP server)
 axum-macros = "0.4.1"
 axum_typed_multipart = "0.12.1"
-axum = "0.7.5"
-axum-extra = "0.9"
-tower-http = "0.5.2"
-
-# Rocket (HTTP server)
-rocket = "0.5.1"
-rocket_empty = "0.1.1"
-revolt_rocket_okapi = "0.10.0"
-rocket_cors = { git = "https://github.com/lawliet89/rocket_cors", rev = "072d90359b23e9b291df6b672c07c93de9c46011" }
-rocket_authifier = "1.0.16"
-rocket_prometheus = "0.10.0-rc.3"
-
-# Spec Generation
-utoipa = "4.2.3"
-revolt_okapi = "0.9.1"
-schemars = "0.8.8"
-utoipa-scalar = "0.1.0"
+axum = { version = "0.7.5", features = ["multipart"] }
+tower-http = { version = "0.5.2", features = ["cors", "trace"] }

 # Image Processing
-jxl-oxide = "0.12.5"
-sha2 = "0.10.8"
-kamadak-exif = "0.5.4"
-webp = "0.3.0"
-image = "0.25.2"  # avif encode requires dav1d system library: features = ["avif-native"]
-thumbhash = "0.1.0"
-lcms2 = "6.1.1" # for color profile processing
-
-# File processing
-revolt_clamav-client = "0.1.5"
-simdutf8 = "0.1.4"
-
-# Content type processing
-infer = "0.16.0"
-ffprobe = "0.4.0"
-imagesize = "0.13.0"
+jxl-oxide = { version = "0.12.5", features = ["image"] }
+image = "0.25.9"

 # OpenTelemetry
 tracing = "0.1.44"
@@ -154,52 +47,4 @@ tracing-subscriber = { version = "0.3.22", features = [
 opentelemetry = { version = "0.31.0", features = ["logs"] }
 opentelemetry_sdk = { version = "0.31.0", features = ["logs"] }
 opentelemetry-otlp = { version = "0.31.0", features = ["logs"] }
-opentelemetry-appender-tracing = "0.31.1"
-
-# RabbitMQ
-lapin = "4.7.1"
-
-# Voice
-livekit-api = "0.4.4"
-livekit-protocol = "0.7.4"
-livekit-runtime = "0.4.0"
-
-# Other Utilities
-once_cell = "1.9.0"
-config = "0.13.3"
-cached = "0.44.0"
-rand = "0.8.5"
-base64 = "0.21.3"
-decancer = "3.3.3"
-linkify = "0.8.1"
-url-escape = "0.1.1"
-revolt_optional_struct = "0.2.0"
-unicode-segmentation = "1.10.1"
-querystring = "1.1.0"
-tempfile = "3.12.0"
-aes-gcm = "0.10.3"
-auto_ops = "0.3.0"
-url = "2.2.2"
-impl_ops = "0.1.1"
-lazy_static = "1.5.0"
-mime = "0.3.17"
-totp-lite = "2.0.0"
-rust-argon2 = "1.0.0"
-base32 = "0.4.0"
-sha1 = "0.10.6"
-futures-lite = "2.6.1"
-
-# Build Dependencies
-vergen = "7.5.0"
-
-# Local packages
-revolt-coalesced = { version = "0.13.7", path = "crates/core/coalesced" }
-revolt-config = { version = "0.13.7", path = "crates/core/config" }
-revolt-database = { version = "0.13.7", path = "crates/core/database" }
-revolt-files = { version = "0.13.7", path = "crates/core/files" }
-revolt-models = { version = "0.13.7", path = "crates/core/models" }
-revolt-parser = { version = "0.13.7", path = "crates/core/parser" }
-revolt-permissions = { version = "0.13.7", path = "crates/core/permissions" }
-revolt-presence = { version = "0.13.7", path = "crates/core/presence" }
-revolt-ratelimits = { version = "0.13.7", path = "crates/core/ratelimits" }
-revolt-result = { version = "0.13.7", path = "crates/core/result" }
+opentelemetry-appender-tracing = { version = "0.31.1" }
--- a/README.md
+++ b/README.md
@@ -76,14 +76,6 @@ mise install
 mise build
 ```

-> [!TIP]
-> You can override `BUILDER` in your `.env` file to run cargo with mold if you installed it:
->
-> ```bash
-> # .env
-> BUILDER = "mold --run cargo"
-> ```
-
 A default configuration `Revolt.toml` is present in this project that is suited for development.

 If you'd like to change anything, create a `Revolt.overrides.toml` file and specify relevant variables.
@@ -118,9 +110,21 @@ If you'd like to change anything, create a `Revolt.overrides.toml` file and spec
 >     ports: !override
 >       - "14072:5672"
 >       - "14672:15672"
+>
+>   victoria-metrics:
+>     ports: !override
+>       - "18428:8428"
+>
+>   victoria-logs:
+>     ports: !override
+>       - "19428:9428"
+>
+>   victoria-traces:
+>     ports: !override
+>       - "14428:10428"
 > ```
 >
-> With the corresponding Revolt configuration:
+> And corresponding Revolt configuration:
 >
 > ```toml
 > #     Revolt.overrides.toml
@@ -132,25 +136,32 @@ If you'd like to change anything, create a `Revolt.overrides.toml` file and spec
 > [rabbit]
 > port = 14072
 > ```
->
-> And mise configuration
->
-> ```bash
-> #.env
-> DATABASE_PORT = "14017"
-> RABBIT_PORT = "14072"
-> REDIS_PORT = "14079"
-> ```

 Then continue:

 ```bash
-cp livekit.example.yml livekit.yml
+# start other necessary services
+docker compose up -d

-mise start
+# run the API server
+cargo run --bin revolt-delta
+# run the events server
+cargo run --bin revolt-bonfire
+# run the file server
+cargo run --bin revolt-autumn
+# run the proxy server
+cargo run --bin revolt-january
+# run the tenor proxy
+cargo run --bin revolt-gifbox
+# run the push daemon (not usually needed in regular development)
+cargo run --bin revolt-pushd
+
+# hint:
+# mold -run <cargo build, cargo run, etc...>
+# mold -run ./scripts/start.sh
 ```

-You can start a web client by doing the following in another terminal:
+You can start a web client by doing the following:

 ```bash
 # if you do not have yarn yet and have a modern Node.js:
@@ -164,9 +175,6 @@ cd stoat-web

 When signing up, go to http://localhost:14080 to find confirmation/password reset emails.

-To stop all services, hit (CTRL + c) in the terminal you ran `mise start` and run `mise docker:stop`
-
-
 ## Deployment Guide

 ### Cutting new crate releases
@@ -202,7 +210,7 @@ If you have bumped the crate versions, proceed to [GitHub releases](https://gith
 First, start the required services:

 ```sh
-docker compose up -d
+docker compose -f docker-compose.db.yml up -d
 ```

 Now run tests for whichever database:
--- a/compose.yml
+++ b/compose.yml
@@ -1,3 +1,5 @@
+name: stoat-backend
+
 services:
  # Redis
  redis:
@@ -8,20 +10,10 @@ services:
  # MongoDB
  database:
    image: mongo
-    command: mongod --replSet rs0
    ports:
      - "27017:27017"
    volumes:
      - ./.data/db:/data/db
-    extra_hosts:
-      - "host.docker.internal:host-gateway"
-    healthcheck:
-      test: echo "try { rs.status() } catch (err) { rs.initiate({_id:'rs0',members:[{_id:0,host:'127.0.0.1:27017'}]}) }" | mongosh --port 27017 --quiet
-      interval: 5s
-      timeout: 30s
-      start_period: 0s
-      start_interval: 1s
-      retries: 30
    ulimits:
      nofile:
        soft: 65536
@@ -29,12 +21,11 @@ services:

  # MinIO
  minio:
-    image: firstfinger/minio:latest
-    #command: server /data
+    image: minio/minio
+    command: server /data
    environment:
      MINIO_ROOT_USER: minioautumn
      MINIO_ROOT_PASSWORD: minioautumn
-      MINIO_REGION: minio
    volumes:
      - ./.data/minio:/data
    ports:
@@ -80,9 +71,29 @@ services:
      MAILDEV_INCOMING_USER: smtp
      MAILDEV_INCOMING_PASS: smtp

+  # LiveKit
  livekit:
    image: ghcr.io/stoatchat/livekit-server:v1.9.13
    command: --config /etc/livekit.yml
    network_mode: "host"
    volumes:
      - ./livekit.yml:/etc/livekit.yml
+
+  # VM
+  victoria-metrics:
+    image: victoriametrics/victoria-metrics:latest
+    ports:
+      - 8428:8428
+
+  # VL
+  victoria-logs:
+    image: docker.io/victoriametrics/victoria-logs:v1.43.1
+    ports:
+      - 9428:9428
+    command: -storageDataPath=victoria-logs-data
+
+  # VT
+  victoria-traces:
+    image: docker.io/victoriametrics/victoria-traces:latest
+    ports:
+      - 10428:10428
--- a/crates/bonfire/Cargo.toml
+++ b/crates/bonfire/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "revolt-bonfire"
-version = "0.13.7"
+version = "0.12.0"
 license = "AGPL-3.0-or-later"
 edition = "2021"
 publish = false
@@ -9,37 +9,42 @@ publish = false

 [dependencies]
 # util
-log = { workspace = true }
-sentry = { workspace = true }
-lru = { workspace = true }
-ulid = { workspace = true }
-once_cell = { workspace = true }
-redis-kiss = { workspace = true }
-lru_time_cache = { workspace = true }
-async-channel = { workspace = true }
+log = "*"
+sentry = "0.31.5"
+lru = "0.7.6"
+ulid = "0.5.0"
+once_cell = "1.9.0"
+redis-kiss = "0.1.4"
+lru_time_cache = "0.11.11"
+async-channel = "2.3.1"

 # parsing
-querystring = { workspace = true }
-regex = { workspace = true }
+querystring = "1.1.0"
+regex = "1.11.1"

 # serde
-bincode = { workspace = true }
-serde_json = { workspace = true }
-rmp-serde = { workspace = true }
-serde = { workspace = true }
+bincode = "1.3.3"
+serde_json = "1.0.79"
+rmp-serde = "1.0.0"
+serde = "1.0.136"

 # async
-futures = { workspace = true }
-async-tungstenite = { workspace = true, features = ["async-std-runtime"] }
-async-std = { workspace = true }
+futures = "0.3.21"
+async-tungstenite = { version = "0.17.0", features = ["async-std-runtime"] }
+async-std = { version = "1.8.0", features = [
+    "tokio1",
+    "tokio02",
+    "attributes",
+] }

 # core
-revolt-result = { workspace = true }
-revolt-models = { workspace = true }
-revolt-config = { workspace = true }
-revolt-database = { workspace = true, features = ["voice"] }
-revolt-permissions = { workspace = true }
-revolt-presence = { workspace = true, features = ["redis-is-patched"] }
+authifier = { version = "1.0.16" }
+revolt-result = { path = "../core/result" }
+revolt-models = { path = "../core/models" }
+revolt-config = { path = "../core/config" }
+revolt-database = { path = "../core/database", features = ["voice"] }
+revolt-permissions = { path = "../core/permissions" }
+revolt-presence = { path = "../core/presence", features = ["redis-is-patched"] }

 # redis
-fred = { workspace = true, features = ["subscriber-client"] }
+fred = { version = "8.0.1", features = ["subscriber-client"] }
--- a/crates/bonfire/src/events/impl.rs
+++ b/crates/bonfire/src/events/impl.rs
@@ -1,7 +1,6 @@
 use std::collections::{HashMap, HashSet};

 use futures::future::join_all;
-use redis_kiss::AsyncCommands;
 use revolt_database::{
    events::client::{EventV1, ReadyPayloadFields},
    util::permissions::DatabasePermissionQuery,
--- a/crates/bonfire/src/events/state.rs
+++ b/crates/bonfire/src/events/state.rs
@@ -1,5 +1,7 @@
 use std::{
-    collections::{HashMap, HashSet}, num::NonZeroUsize, sync::Arc, time::Duration
+    collections::{HashMap, HashSet},
+    sync::Arc,
+    time::Duration,
 };

 use async_std::sync::{Mutex, RwLock};
@@ -55,7 +57,7 @@ impl Default for Cache {
            members: Default::default(),
            servers: Default::default(),

-            seen_events: LruCache::new(NonZeroUsize::new(20).unwrap()),
+            seen_events: LruCache::new(20),
        }
    }
 }
--- a/crates/bonfire/src/websocket.rs
+++ b/crates/bonfire/src/websocket.rs
@@ -1,10 +1,11 @@
 use std::{collections::HashSet, net::SocketAddr, sync::Arc};

 use async_tungstenite::WebSocketStream;
+use authifier::AuthifierEvent;
 use fred::{
    error::RedisErrorKind,
    interfaces::{ClientLike, EventInterface, PubsubInterface},
-    types::{ReconnectPolicy, RedisConfig},
+    types::RedisConfig,
 };
 use futures::{
    channel::oneshot,
@@ -12,7 +13,7 @@ use futures::{
    stream::{SplitSink, SplitStream},
    FutureExt, SinkExt, StreamExt, TryStreamExt,
 };
-use redis_kiss::{get_connection, AsyncCommands, PayloadType, REDIS_PAYLOAD_TYPE, REDIS_URI};
+use redis_kiss::{PayloadType, REDIS_PAYLOAD_TYPE, REDIS_URI};
 use revolt_config::report_internal_error;
 use revolt_database::{
    events::{client::EventV1, server::ClientMessage},
@@ -31,7 +32,6 @@ use sentry::Level;

 use crate::config::{ProtocolConfiguration, WebsocketHandshakeCallback};
 use crate::events::state::{State, SubscriptionStateChange};
-use revolt_models::v0;

 type WsReader = SplitStream<WebSocketStream<TcpStream>>;
 type WsWriter = SplitSink<WebSocketStream<TcpStream>, async_tungstenite::tungstenite::Message>;
@@ -128,14 +128,6 @@ pub async fn client(db: &'static Database, stream: TcpStream, addr: SocketAddr)
        return;
    }

-    let slowmodes = fetch_user_slowmodes(&user_id).await.unwrap_or_default();
-    if !slowmodes.is_empty() {
-        let event = EventV1::UserSlowmodes { slowmodes };
-        if report_internal_error!(write.send(config.encode(&event)).await).is_err() {
-            return;
-        }
-    }
-
    // Create presence session.
    let (first_session, session_id) = create_session(&user_id, 0).await;

@@ -233,9 +225,9 @@ async fn listener(
        .unwrap_or(REDIS_URI.to_string());

    let redis_config = RedisConfig::from_url(&url).unwrap();
-    let mut builder = fred::types::Builder::from_config(redis_config);
-    builder.set_policy(ReconnectPolicy::new_exponential(8, 100, 30_000, 2));
-    let subscriber = match report_internal_error!(builder.build_subscriber_client()) {
+    let subscriber = match report_internal_error!(
+        fred::types::Builder::from_config(redis_config).build_subscriber_client()
+    ) {
        Ok(subscriber) => subscriber,
        Err(_) => return,
    };
@@ -244,21 +236,16 @@ async fn listener(
        return;
    }

-    // Let Fred automatically re-subscribe to tracked channels on reconnect.
-    subscriber.manage_subscriptions();
-
    // Handle Redis connection dropping
    let (clean_up_s, clean_up_r) = async_channel::bounded(1);
    let clean_up_s = Arc::new(Mutex::new(clean_up_s));
    subscriber.on_error(move |err| {
-        warn!("Redis subscriber error: {:?}", err);
        if let RedisErrorKind::Canceled = err.kind() {
            let clean_up_s = clean_up_s.clone();
            spawn(async move {
                clean_up_s.lock().await.send(()).await.ok();
            });
        }
-        // Transient errors (IO, timeout) are handled by the reconnect policy.

        Ok(())
    });
@@ -354,20 +341,22 @@ async fn listener(
                    break 'out;
                };

-                if let EventV1::DeleteSession { session_id, .. } = &event {
-                    if &state.session_id == session_id {
-                        event = EventV1::Logout;
-                    }
-                } else if let EventV1::DeleteAllSessions {
-                    exclude_session_id, ..
-                } = &event
-                {
-                    if let Some(excluded) = exclude_session_id {
-                        if &state.session_id != excluded {
+                if let EventV1::Auth(auth) = &event {
+                    if let AuthifierEvent::DeleteSession { session_id, .. } = auth {
+                        if &state.session_id == session_id {
+                            event = EventV1::Logout;
+                        }
+                    } else if let AuthifierEvent::DeleteAllSessions {
+                        exclude_session_id, ..
+                    } = auth
+                    {
+                        if let Some(excluded) = exclude_session_id {
+                            if &state.session_id != excluded {
+                                event = EventV1::Logout;
+                            }
+                        } else {
                            event = EventV1::Logout;
                        }
-                    } else {
-                        event = EventV1::Logout;
                    }
                } else {
                    let should_send = state.handle_incoming_event_v1(db, &mut event).await;
@@ -534,42 +523,3 @@ async fn worker(
        }
    }
 }
-
-async fn fetch_user_slowmodes(user_id: &str) -> Option<Vec<v0::ChannelSlowmode>> {
-    let mut conn = get_connection().await.ok()?.into_inner();
-    let idx_key = format!("slowmode_idx:{}", user_id);
-
-    let channel_ids: Vec<String> = conn.smembers(&idx_key).await.unwrap_or_default();
-    if channel_ids.is_empty() {
-        return Some(vec![]);
-    }
-
-    // Bulk fetch all TTLs in one round trip
-    let mut pipe = redis_kiss::redis::pipe();
-    for channel_id in &channel_ids {
-        pipe.ttl(format!("slowmode:{}:{}", user_id, channel_id));
-    }
-    let ttls: Vec<i64> = pipe.query_async(&mut conn).await.unwrap_or_default();
-
-    // Partition into alive/expired in one pass
-    let mut slowmodes = vec![];
-    let mut expired = vec![];
-    for (channel_id, ttl) in channel_ids.iter().zip(ttls.iter()) {
-        if *ttl > 0 {
-            slowmodes.push(v0::ChannelSlowmode {
-                channel_id: channel_id.clone(),
-                duration: *ttl as u64,
-                retry_after: *ttl as u64,
-            });
-        } else {
-            expired.push(channel_id.as_str());
-        }
-    }
-
-    // Bulk remove all expired members in one SREM call
-    if !expired.is_empty() {
-        conn.srem::<_, _, ()>(&idx_key, expired).await.ok();
-    }
-
-    Some(slowmodes)
-}
--- a/crates/core/coalesced/Cargo.toml
+++ b/crates/core/coalesced/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "revolt-coalesced"
-version = "0.13.7"
+version = "0.12.0"
 edition = "2021"
 license = "MIT"
 authors = ["Paul Makles <me@insrt.uk>", "Zomatree <me@zomatree.live>"]
@@ -15,12 +15,12 @@ cache = ["dep:lru"]
 default = ["tokio"]

 [dependencies]
-tokio = { workspace = true, features = ["sync"], optional = true }
-indexmap = { workspace = true, optional = true }
-lru = { workspace = true, optional = true }
+tokio = { version = "1.47.0", features = ["sync"], optional = true }
+indexmap = { version = "2.13.0", optional = true }
+lru = { version = "0.16.3", optional = true }

 [dev-dependencies]
-tokio = { workspace = true, features = [
+tokio = { version = "1.47.0", features = [
    "rt",
    "rt-multi-thread",
    "macros",
--- a/crates/core/config/Cargo.toml
+++ b/crates/core/config/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "revolt-config"
-version = "0.13.7"
+version = "0.12.0"
 edition = "2021"
 license = "MIT"
 authors = ["Paul Makles <me@insrt.uk>"]
@@ -14,27 +14,28 @@ anyhow = ["dep:sentry-anyhow"]
 report-macros = ["revolt-result"]
 sentry = ["dep:sentry"]
 test = ["async-std"]
-default = ["sentry"]
+default = ["test", "sentry"]

 [dependencies]
 # Utility
-config = { workspace = true }
-cached = { workspace = true }
+config = "0.13.3"
+cached = "0.44.0"
+once_cell = "1.18.0"

 # Serde
-serde = { workspace = true }
+serde = { version = "1", features = ["derive"] }

 # Async
-futures-locks = { workspace = true }
-async-std = { workspace = true, features = ["attributes"], optional = true }
+futures-locks = "0.7.1"
+async-std = { version = "1.8.0", features = ["attributes"], optional = true }

 # Logging
-log = { workspace = true }
-pretty_env_logger = { workspace = true }
+log = "0.4.14"
+pretty_env_logger = "0.4.0"

 # Sentry
-sentry = { workspace = true, optional = true }
-sentry-anyhow = { workspace = true, optional = true }
+sentry = { version = "0.31.5", optional = true }
+sentry-anyhow = { version = "0.38.1", optional = true }

 # Core
-revolt-result = { workspace = true, optional = true }
+revolt-result = { version = "0.12.0", path = "../result", optional = true }
--- a/crates/core/config/Revolt.test.toml
+++ b/crates/core/config/Revolt.test.toml
@@ -1,5 +1,3 @@
-environment = "test"
-
 [database]
 mongodb = "mongodb://localhost"
 redis = "redis://localhost/"
@@ -12,12 +10,3 @@ password = "rabbitpass"

 [features]
 webhooks_enabled = true
-
-[api.smtp]
-host = "localhost"
-username = "smtp"
-password = "smtp"
-from_address = "development@stoat.chat"
-reply_to = "support@stoat.chat"
-port = 14025
-use_tls = false
--- a/crates/core/config/Revolt.toml
+++ b/crates/core/config/Revolt.toml
@@ -1,6 +1,5 @@
 production = false
 disable_events_dont_use = false
-environment = "dev"

 [database]
 # MongoDB connection URL
@@ -31,10 +30,6 @@ host = "rabbit"
 port = 5672
 username = "rabbituser"
 password = "rabbitpass"
-default_exchange = "revolt.default"
-
-[rabbit.queues]
-acks = "internal.ack"

 [api]

@@ -54,10 +49,6 @@ from_address = "noreply@example.com"
 # port = 587
 # use_tls = true

-[api.smtp.expiry]
-expire_verification = 604800  # 3600 * 24 * 7
-expire_password_reset = 86400  # 3600 * 24
-expire_account_deletion = 86400  # 3600 * 24

 [api.security]
 # Authifier Shield API key
@@ -76,10 +67,6 @@ tenor_key = ""
 hcaptcha_key = ""
 hcaptcha_sitekey = ""

-[api.security.shield]
-host = ""
-key = ""
-
 [api.workers]
 # Maximum concurrent connections (to proxy server)
 max_concurrent_connections = 50
@@ -91,8 +78,6 @@ call_ring_duration = 30
 [api.livekit.nodes]

 [api.users]
-# Minimum allowed length of usernames
-min_username_length = 2

 [pushd]
 # this changes the names of the queues to not overlap 
@@ -145,8 +130,6 @@ pkcs8 = ""
 key_id = ""
 team_id = ""

-[january]
-blocked_domains = []

 [files]
 # Encryption key for stored files
@@ -330,12 +313,6 @@ emojis = 500_000
 # default: 5
 process_message_delay_limit = 5

-[features.legal_links]
-# URLs for legal documents
-terms_of_service = ""
-privacy_policy = ""
-guidelines = ""
-
 [sentry]
 # Configuration for Sentry error reporting
 api = ""
--- a/crates/core/config/src/lib.rs
+++ b/crates/core/config/src/lib.rs
@@ -1,10 +1,9 @@
-#[cfg(feature = "test")]
-use std::sync::OnceLock;
-use std::{collections::HashMap, path::Path, sync::LazyLock};
+use std::{collections::HashMap, path::Path};

 use cached::proc_macro::cached;
 use config::{Config, Environment, File, FileFormat};
 use futures_locks::RwLock;
+use once_cell::sync::Lazy;
 use serde::Deserialize;

 #[cfg(feature = "sentry")]
@@ -67,28 +66,13 @@ static CONFIG_SEARCH_PATHS: [&str; 3] = [
 static TEST_OVERRIDE_PATH: &str = "Revolt.test-overrides.toml";

 /// Configuration builder
-static CONFIG_BUILDER: LazyLock<RwLock<Config>> = LazyLock::new(|| {
+static CONFIG_BUILDER: Lazy<RwLock<Config>> = Lazy::new(|| {
    RwLock::new({
        let mut builder = Config::builder().add_source(File::from_str(
            include_str!("../Revolt.toml"),
            FileFormat::Toml,
        ));

-        let cwd = std::env::current_dir().unwrap();
-        let mut cwd: Option<&Path> = Some(&cwd);
-
-        while let Some(path) = cwd {
-            for config_path in CONFIG_SEARCH_PATHS {
-                let config_path = path.join(config_path);
-                if config_path.exists() {
-                    builder = builder
-                        .add_source(File::new(config_path.to_str().unwrap(), FileFormat::Toml));
-                }
-            }
-
-            cwd = path.parent();
-        }
-
        if std::env::var("TEST_DB").is_ok() {
            builder = builder.add_source(File::from_str(
                include_str!("../Revolt.test.toml"),
@@ -110,6 +94,21 @@ static CONFIG_BUILDER: LazyLock<RwLock<Config>> = LazyLock::new(|| {
            }
        }

+        let cwd = std::env::current_dir().unwrap();
+        let mut cwd: Option<&Path> = Some(&cwd);
+
+        while let Some(path) = cwd {
+            for config_path in CONFIG_SEARCH_PATHS {
+                let config_path = path.join(config_path);
+                if config_path.exists() {
+                    builder = builder
+                        .add_source(File::new(config_path.to_str().unwrap(), FileFormat::Toml));
+                }
+            }
+
+            cwd = path.parent();
+        }
+
        builder = builder.add_source(Environment::with_prefix("REVOLT").separator("__"));

        builder.build().unwrap()
@@ -123,19 +122,12 @@ pub struct Database {
    pub redis_pubsub: Option<String>,
 }

-#[derive(Deserialize, Debug, Clone)]
-pub struct RabbitQueues {
-    pub acks: String,
-}
-
 #[derive(Deserialize, Debug, Clone)]
 pub struct Rabbit {
    pub host: String,
    pub port: u16,
    pub username: String,
    pub password: String,
-    pub default_exchange: String,
-    pub queues: RabbitQueues,
 }

 #[derive(Deserialize, Debug, Clone)]
@@ -163,18 +155,6 @@ pub struct ApiSmtp {
    pub port: Option<i32>,
    pub use_tls: Option<bool>,
    pub use_starttls: Option<bool>,
-    pub expiry: EmailExpiry,
-}
-
-/// Email expiration config
-#[derive(Deserialize, Debug, Clone)]
-pub struct EmailExpiry {
-    /// How long email verification codes should last for (in seconds)
-    pub expire_verification: i64,
-    /// How long password reset codes should last for (in seconds)
-    pub expire_password_reset: i64,
-    /// How long account deletion codes should last for (in seconds)
-    pub expire_account_deletion: i64,
 }

 #[derive(Deserialize, Debug, Clone)]
@@ -214,15 +194,9 @@ pub struct ApiSecurityCaptcha {
    pub hcaptcha_sitekey: String,
 }

-#[derive(Deserialize, Debug, Clone)]
-pub struct ApiSecurityShield {
-    pub host: String,
-    pub key: String,
-}
-
 #[derive(Deserialize, Debug, Clone)]
 pub struct ApiSecurity {
-    pub shield: ApiSecurityShield,
+    pub authifier_shield_key: String,
    pub voso_legacy_token: String,
    pub captcha: ApiSecurityCaptcha,
    pub trust_cloudflare: bool,
@@ -257,7 +231,6 @@ pub struct LiveKitNode {
 #[derive(Deserialize, Debug, Clone)]
 pub struct ApiUsers {
    pub early_adopter_cutoff: Option<u64>,
-    pub min_username_length: usize,
 }

 #[derive(Deserialize, Debug, Clone)]
@@ -328,11 +301,6 @@ impl Pushd {
    }
 }

-#[derive(Deserialize, Debug, Clone)]
-pub struct January {
-    pub blocked_domains: Vec<String>,
-}
-
 #[derive(Deserialize, Debug, Clone)]
 pub struct FilesLimit {
    pub min_file_size: usize,
@@ -408,16 +376,6 @@ pub struct FeaturesLimitsCollection {
    pub roles: HashMap<String, FeaturesLimits>,
 }

-#[derive(Deserialize, Debug, Clone)]
-pub struct LegalLinks {
-    /// Terms of Service URL
-    pub terms_of_service: String,
-    /// Privacy Policy URL
-    pub privacy_policy: String,
-    /// Guidelines URL
-    pub guidelines: String,
-}
-
 #[derive(Deserialize, Debug, Clone)]
 pub struct FeaturesAdvanced {
    #[serde(default)]
@@ -435,7 +393,6 @@ impl Default for FeaturesAdvanced {
 #[derive(Deserialize, Debug, Clone)]
 pub struct Features {
    pub limits: FeaturesLimitsCollection,
-    pub legal_links: LegalLinks,
    pub webhooks_enabled: bool,
    pub mass_mentions_send_notifications: bool,
    pub mass_mentions_enabled: bool,
@@ -463,12 +420,10 @@ pub struct Settings {
    pub hosts: Hosts,
    pub api: Api,
    pub pushd: Pushd,
-    pub january: January,
    pub files: Files,
    pub features: Features,
    pub sentry: Sentry,
    pub production: bool,
-    pub environment: String,
    pub disable_events_dont_use: bool,
 }

@@ -495,7 +450,8 @@ pub async fn read() -> Config {
    CONFIG_BUILDER.read().await.clone()
 }

-pub async fn config_no_cache() -> Settings {
+#[cached(time = 30)]
+pub async fn config() -> Settings {
    let mut config = read().await.try_deserialize::<Settings>().unwrap();

    // inject REDIS_URI for redis-kiss library
@@ -513,34 +469,6 @@ pub async fn config_no_cache() -> Settings {
    config
 }

-#[cached(time = 30)]
-pub async fn config() -> Settings {
-    #[cfg(feature = "test")]
-    if let Some(overwrites) = CONFIG_OVERWRITES.get() {
-        return overwrites.clone();
-    }
-
-    config_no_cache().await
-}
-
-#[cfg(feature = "test")]
-static CONFIG_OVERWRITES: OnceLock<Settings> = OnceLock::new();
-
-/// Modify the config values for a test, this can only be called once
-///
-/// This will also fail if two or more tests are running in the same process and both try to modify the config,
-/// This could happen if tests where run under `cargo test` instead of `nextest`.
-#[cfg(feature = "test")]
-pub async fn overwrite_config(f: impl FnOnce(&mut Settings)) {
-    let mut config = config_no_cache().await;
-
-    f(&mut config);
-
-    CONFIG_OVERWRITES.set(config).expect(
-        "Cannot overwrite config multiple times, make sure you are running tests through nextest.",
-    );
-}
-
 /// Configure logging and common Rust variables
 #[cfg(feature = "sentry")]
 pub async fn setup_logging(release: &'static str, dsn: String) -> Option<sentry::ClientInitGuard> {
@@ -552,7 +480,6 @@ pub async fn setup_logging(release: &'static str, dsn: String) -> Option<sentry:
        std::env::set_var("ROCKET_ADDRESS", "0.0.0.0");
    }

-    pretty_env_logger::init();
    log::info!("Starting {release}");

    if dsn.is_empty() {
--- a/crates/core/database/Cargo.toml
+++ b/crates/core/database/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "revolt-database"
-version = "0.13.7"
+version = "0.12.0"
 edition = "2021"
 license = "AGPL-3.0-or-later"
 authors = ["Paul Makles <me@insrt.uk>"]
@@ -11,18 +11,19 @@ repository = "https://github.com/stoatchat/stoatchat"

 [features]
 # Databases
-mongodb = ["dep:mongodb", "bson"]
+mongodb = ["dep:mongodb", "bson", "authifier/database-mongodb"]

 # ... Other
 tasks = ["isahc", "linkify", "url-escape"]
-async-std-runtime = ["async-std"]
+async-std-runtime = ["async-std", "authifier/async-std-runtime"]
 rocket-impl = [
    "rocket",
    "schemars",
    "revolt_okapi",
    "revolt_rocket_okapi",
+    "authifier/rocket_impl",
 ]
-axum-impl = ["axum", "revolt-result/axum", "utoipa"]
+axum-impl = ["axum", "revolt-result/axum"]
 redis-is-patched = ["revolt-presence/redis-is-patched"]
 voice = ["livekit-api", "livekit-protocol", "livekit-runtime"]

@@ -31,83 +32,80 @@ default = ["mongodb", "async-std-runtime", "tasks"]

 [dependencies]
 # Core
-revolt-config = { workspace = true, features = ["report-macros"] }
-revolt-result = { workspace = true }
-revolt-models = { workspace = true, features = ["validator"] }
-revolt-presence = { workspace = true }
-revolt-permissions = { workspace = true, features = ["serde", "bson"] }
-revolt-parser = { workspace = true }
-revolt-coalesced = { workspace = true }
+revolt-config = { version = "0.12.0", path = "../config", features = [
+    "report-macros",
+] }
+revolt-result = { version = "0.12.0", path = "../result" }
+revolt-models = { version = "0.12.0", path = "../models", features = [
+    "validator",
+] }
+revolt-presence = { version = "0.12.0", path = "../presence" }
+revolt-permissions = { version = "0.12.0", path = "../permissions", features = [
+    "serde",
+    "bson",
+] }
+revolt-parser = { version = "0.12.0", path = "../parser" }

 # Utility
-log = { workspace = true }
-lru = { workspace = true }
-rand = { workspace = true }
-ulid = { workspace = true }
-nanoid = { workspace = true }
-base64 = { workspace = true }
-once_cell = { workspace = true }
-indexmap = { workspace = true }
-decancer = { workspace = true }
-deadqueue = { workspace = true }
-linkify = { workspace = true, optional = true }
-url-escape = { workspace = true, optional = true }
-validator = { workspace = true, features = ["derive"] }
-isahc = { workspace = true, features = ["json"], optional = true }
-base32 = { workspace = true }
-sha1 = { workspace = true }
+log = "0.4"
+lru = "0.11.0"
+rand = "0.8.5"
+ulid = "1.0.0"
+nanoid = "0.4.0"
+base64 = "0.21.3"
+once_cell = "1.17"
+indexmap = "1.9.1"
+decancer = "1.6.2"
+deadqueue = "0.2.4"
+linkify = { optional = true, version = "0.8.1" }
+url-escape = { optional = true, version = "0.1.1" }
+validator = { version = "0.16", features = ["derive"] }
+isahc = { optional = true, version = "1.7", features = ["json"] }

 # Serialisation
-serde_json = { workspace = true }
-revolt_optional_struct = { workspace = true }
-serde = { workspace = true }
-iso8601-timestamp = { workspace = true, features = ["serde", "bson"] }
+serde_json = "1"
+revolt_optional_struct = "0.2.0"
+serde = { version = "1", features = ["derive"] }
+iso8601-timestamp = { version = "0.2.10", features = ["serde", "bson"] }

 # Events
-redis-kiss = { workspace = true }
+redis-kiss = { version = "0.1.4" }

 # Database
-bson = { workspace = true, optional = true }
-mongodb = { workspace = true, optional = true }
+bson = { optional = true, version = "2.1.0" }
+mongodb = { optional = true, version = "3.1.0" }

 # Database Migration
-unicode-segmentation = { workspace = true }
-regex = { workspace = true }
+unicode-segmentation = "1.10.1"
+regex = "1"

 # Async Language Features
-futures = { workspace = true }
-async-lock = { workspace = true }
-async-trait = { workspace = true }
-async-recursion = { workspace = true }
+futures = "0.3.19"
+async-lock = "2.8.0"
+async-trait = "0.1.51"
+async-recursion = "1.0.4"

 # Async
-async-std = { workspace = true, features = ["attributes"], optional = true }
+async-std = { version = "1.8.0", features = ["attributes"], optional = true }

 # Axum Impl
-axum = { workspace = true, optional = true }
-utoipa = { workspace = true, features = ["axum_extras"], optional = true }
+axum = { version = "0.7.5", optional = true }

 # Rocket Impl
-schemars = { workspace = true, optional = true }
-rocket = { workspace = true, features = ["json"], optional = true }
-revolt_okapi = { workspace = true, optional = true }
-revolt_rocket_okapi = { workspace = true, optional = true }
+schemars = { version = "0.8.8", optional = true }
+rocket = { version = "0.5.1", default-features = false, features = [
+    "json",
+], optional = true }
+revolt_okapi = { version = "0.9.1", optional = true }
+revolt_rocket_okapi = { version = "0.10.0", optional = true }
+
+# Authifier
+authifier = { version = "1.0.16" }

 # RabbitMQ
-lapin = { workspace = true, features = ["tokio"] }
+amqprs = { version = "1.7.0" }

 # Voice
-livekit-api = { workspace = true, features = ["rustls-tls-native-roots"], optional = true }
-livekit-protocol = { workspace = true, optional = true }
-livekit-runtime = { workspace = true, features = ["tokio"], optional = true }
-
-# Security
-totp-lite = { workspace = true }
-rust-argon2 = { workspace = true }
-
-# Email
-lettre = { workspace = true }
-handlebars = { workspace = true }
-
-# Web Requests
-reqwest = { workspace = true, features = ["json", "form"] }
+livekit-api = { version = "0.4.4", optional = true }
+livekit-protocol = { version = "0.4.0", optional = true }
+livekit-runtime = { version = "0.3.1", features = ["tokio"], optional = true }
--- a/crates/core/database/assets/pwned100k.txt
+++ b/crates/core/database/assets/pwned100k.txt
--- a/crates/core/database/assets/revolt_source_list.txt
+++ b/crates/core/database/assets/revolt_source_list.txt
@@ -1,555 +0,0 @@
-this is an assorted list of known disposable email providers
-
-#region nobody will ever have an email @example.com so we can safely block it
----
-example.com
-
-#region list provided by michenriksen at https://gist.github.com/michenriksen/8710649
----
-0815.ru
-0wnd.net
-0wnd.org
-10minutemail.co.za
-10minutemail.com
-123-m.com
-1fsdfdsfsdf.tk
-1pad.de
-20minutemail.com
-21cn.com
-2fdgdfgdfgdf.tk
-2prong.com
-30minutemail.com
-33mail.com
-3trtretgfrfe.tk
-4gfdsgfdgfd.tk
-4warding.com
-5ghgfhfghfgh.tk
-6hjgjhgkilkj.tk
-6paq.com
-7tags.com
-9ox.net
-a-bc.net
-agedmail.com
-ama-trade.de
-amilegit.com
-amiri.net
-amiriindustries.com
-anonmails.de
-anonymbox.com
-antichef.com
-antichef.net
-antireg.ru
-antispam.de
-antispammail.de
-armyspy.com
-artman-conception.com
-azmeil.tk
-baxomale.ht.cx
-beefmilk.com
-bigstring.com
-binkmail.com
-bio-muesli.net
-bobmail.info
-bodhi.lawlita.com
-bofthew.com
-bootybay.de
-boun.cr
-bouncr.com
-breakthru.com
-brefmail.com
-bsnow.net
-bspamfree.org
-bugmenot.com
-bund.us
-burstmail.info
-buymoreplays.com
-byom.de
-c2.hu
-casualdx.com
-cek.pm
-centermail.com
-centermail.net
-chammy.info
-childsavetrust.org
-chogmail.com
-choicemail1.com
-clixser.com
-cmail.net
-cmail.org
-coldemail.info
-cool.fr.nf
-courriel.fr.nf
-courrieltemporaire.com
-crapmail.org
-cust.in
-cuvox.de
-d3p.dk
-dacoolest.com
-dandikmail.com
-dayrep.com
-dcemail.com
-deadaddress.com
-deadspam.com
-delikkt.de
-despam.it
-despammed.com
-devnullmail.com
-dfgh.net
-digitalsanctuary.com
-dingbone.com
-disposableaddress.com
-disposableemailaddresses.com
-disposableinbox.com
-dispose.it
-dispostable.com
-dodgeit.com
-dodgit.com
-donemail.ru
-dontreg.com
-dontsendmespam.de
-drdrb.net
-dump-email.info
-dumpandjunk.com
-dumpyemail.com
-e-mail.com
-e-mail.org
-e4ward.com
-easytrashmail.com
-einmalmail.de
-einrot.com
-eintagsmail.de
-emailgo.de
-emailias.com
-emaillime.com
-emailsensei.com
-emailtemporanea.com
-emailtemporanea.net
-emailtemporar.ro
-emailtemporario.com.br
-emailthe.net
-emailtmp.com
-emailwarden.com
-emailx.at.hm
-emailxfer.com
-emeil.in
-emeil.ir
-emz.net
-ero-tube.org
-evopo.com
-explodemail.com
-eyepaste.com
-fakeinbox.com
-fakeinformation.com
-fansworldwide.de
-fantasymail.de
-fightallspam.com
-filzmail.com
-fivemail.de
-fleckens.hu
-frapmail.com
-friendlymail.co.uk
-fuckingduh.com
-fudgerub.com
-fyii.de
-garliclife.com
-gehensiemirnichtaufdensack.de
-get2mail.fr
-getairmail.com
-getmails.eu
-getonemail.com
-giantmail.de
-girlsundertheinfluence.com
-gishpuppy.com
-gmial.com
-goemailgo.com
-gotmail.net
-gotmail.org
-gotti.otherinbox.com
-great-host.in
-greensloth.com
-grr.la
-gsrv.co.uk
-guerillamail.biz
-guerillamail.com
-guerrillamail.biz
-guerrillamail.com
-guerrillamail.de
-guerrillamail.info
-guerrillamail.net
-guerrillamail.org
-guerrillamailblock.com
-gustr.com
-harakirimail.com
-hat-geld.de
-hatespam.org
-herp.in
-hidemail.de
-hidzz.com
-hmamail.com
-hopemail.biz
-ieh-mail.de
-ikbenspamvrij.nl
-imails.info
-inbax.tk
-inbox.si
-inboxalias.com
-inboxclean.com
-inboxclean.org
-instant-mail.de
-ip6.li
-irish2me.com
-iwi.net
-jetable.com
-jetable.fr.nf
-jetable.net
-jetable.org
-jnxjn.com
-jourrapide.com
-jsrsolutions.com
-kasmail.com
-kaspop.com
-killmail.com
-killmail.net
-klassmaster.com
-klzlk.com
-koszmail.pl
-kurzepost.de
-lawlita.com
-letthemeatspam.com
-lhsdv.com
-lifebyfood.com
-link2mail.net
-litedrop.com
-lol.ovpn.to
-lolfreak.net
-lookugly.com
-lortemail.dk
-lr78.com
-lroid.com
-lukop.dk
-m21.cc
-mail-filter.com
-mail-temporaire.fr
-mail.mezimages.net
-mail1a.de
-mail21.cc
-mail2rss.org
-mail333.com
-mailbidon.com
-mailbiz.biz
-mailblocks.com
-mailbucket.org
-mailcat.biz
-mailcatch.com
-mailde.de
-mailde.info
-maildrop.cc
-maileimer.de
-mailexpire.com
-mailfa.tk
-mailforspam.com
-mailfreeonline.com
-mailguard.me
-mailin8r.com
-mailinater.com
-mailinator.com
-mailinator.net
-mailinator.org
-mailinator2.com
-mailincubator.com
-mailismagic.com
-mailme.lv
-mailme24.com
-mailmetrash.com
-mailmoat.com
-mailms.com
-mailnesia.com
-mailnull.com
-mailorg.org
-mailpick.biz
-mailrock.biz
-mailscrap.com
-mailshell.com
-mailsiphon.com
-mailtemp.info
-mailtome.de
-mailtothis.com
-mailtrash.net
-mailtv.net
-mailtv.tv
-mailzilla.com
-makemetheking.com
-manybrain.com
-mbx.cc
-mega.zik.dj
-meinspamschutz.de
-meltmail.com
-messagebeamer.de
-mezimages.net
-ministry-of-silly-walks.de
-mintemail.com
-misterpinball.de
-moncourrier.fr.nf
-monemail.fr.nf
-monmail.fr.nf
-monumentmail.com
-mt2009.com
-mt2014.com
-mycleaninbox.net
-mymail-in.net
-mypacks.net
-mypartyclip.de
-myphantomemail.com
-mysamp.de
-mytempemail.com
-mytempmail.com
-mytrashmail.com
-nabuma.com
-neomailbox.com
-nepwk.com
-nervmich.net
-nervtmich.net
-netmails.com
-netmails.net
-neverbox.com
-nice-4u.com
-nincsmail.hu
-nnh.com
-no-spam.ws
-noblepioneer.com
-nomail.pw
-nomail.xl.cx
-nomail2me.com
-nomorespamemails.com
-nospam.ze.tc
-nospam4.us
-nospamfor.us
-nospammail.net
-notmailinator.com
-nowhere.org
-nowmymail.com
-nurfuerspam.de
-nus.edu.sg
-objectmail.com
-obobbo.com
-odnorazovoe.ru
-oneoffemail.com
-onewaymail.com
-onlatedotcom.info
-online.ms
-ordinaryamerican.net
-otherinbox.com
-ovpn.to
-owlpic.com
-pancakemail.com
-pcusers.otherinbox.com
-pjjkp.com
-plexolan.de
-poczta.onet.pl
-politikerclub.de
-poofy.org
-pookmail.com
-privacy.net
-privatdemail.net
-proxymail.eu
-prtnx.com
-putthisinyourspamdatabase.com
-putthisinyourspamdatabase.com
-quickinbox.com
-rcpt.at
-reallymymail.com
-realtyalerts.ca
-recode.me
-recursor.net
-reliable-mail.com
-rhyta.com
-rmqkr.net
-royal.net
-rtrtr.com
-s0ny.net
-safersignup.de
-safetymail.info
-safetypost.de
-saynotospams.com
-schafmail.de
-schrott-email.de
-secretemail.de
-secure-mail.biz
-senseless-entertainment.com
-services391.com
-sharklasers.com
-shieldemail.com
-shiftmail.com
-shitmail.me
-shitware.nl
-shmeriously.com
-shortmail.net
-sinnlos-mail.de
-slapsfromlastnight.com
-slaskpost.se
-smashmail.de
-smellfear.com
-snakemail.com
-sneakemail.com
-sneakmail.de
-snkmail.com
-sofimail.com
-solvemail.info
-sogetthis.com
-soodonims.com
-spam4.me
-spamail.de
-spamarrest.com
-spambob.net
-spambog.ru
-spambox.us
-spamcannon.com
-spamcannon.net
-spamcon.org
-spamcorptastic.com
-spamcowboy.com
-spamcowboy.net
-spamcowboy.org
-spamday.com
-spamex.com
-spamfree.eu
-spamfree24.com
-spamfree24.de
-spamfree24.org
-spamgoes.in
-spamgourmet.com
-spamgourmet.net
-spamgourmet.org
-spamherelots.com
-spamherelots.com
-spamhereplease.com
-spamhereplease.com
-spamhole.com
-spamify.com
-spaml.de
-spammotel.com
-spamobox.com
-spamslicer.com
-spamspot.com
-spamthis.co.uk
-spamtroll.net
-speed.1s.fr
-spoofmail.de
-stuffmail.de
-super-auswahl.de
-supergreatmail.com
-supermailer.jp
-superrito.com
-superstachel.de
-suremail.info
-talkinator.com
-teewars.org
-teleworm.com
-teleworm.us
-temp-mail.org
-temp-mail.ru
-tempe-mail.com
-tempemail.co.za
-tempemail.com
-tempemail.net
-tempemail.net
-tempinbox.co.uk
-tempinbox.com
-tempmail.eu
-tempmaildemo.com
-tempmailer.com
-tempmailer.de
-tempomail.fr
-temporaryemail.net
-temporaryforwarding.com
-temporaryinbox.com
-temporarymailaddress.com
-tempthe.net
-thankyou2010.com
-thc.st
-thelimestones.com
-thisisnotmyrealemail.com
-thismail.net
-throwawayemailaddress.com
-tilien.com
-tittbit.in
-tizi.com
-tmailinator.com
-toomail.biz
-topranklist.de
-tradermail.info
-trash-mail.at
-trash-mail.com
-trash-mail.de
-trash2009.com
-trashdevil.com
-trashemail.de
-trashmail.at
-trashmail.com
-trashmail.de
-trashmail.me
-trashmail.net
-trashmail.org
-trashymail.com
-trialmail.de
-trillianpro.com
-twinmail.de
-tyldd.com
-uggsrock.com
-umail.net
-uroid.com
-us.af
-venompen.com
-veryrealemail.com
-viditag.com
-viralplays.com
-vpn.st
-vsimcard.com
-vubby.com
-wasteland.rfc822.org
-webemail.me
-weg-werf-email.de
-wegwerf-emails.de
-wegwerfadresse.de
-wegwerfemail.com
-wegwerfemail.de
-wegwerfmail.de
-wegwerfmail.info
-wegwerfmail.net
-wegwerfmail.org
-wh4f.org
-whyspam.me
-willhackforfood.biz
-willselfdestruct.com
-winemaven.info
-wronghead.com
-www.e4ward.com
-www.mailinator.com
-wwwnew.eu
-x.ip6.li
-xagloo.com
-xemaps.com
-xents.com
-xmaily.com
-xoxy.net
-yep.it
-yogamaven.com
-yopmail.com
-yopmail.fr
-yopmail.net
-yourdomain.com
-yuurok.com
-z1p.biz
-za.com
-zehnminuten.de
-zehnminutenmail.de
-zippymail.info
-zoemail.net
-zomg.info
-
-#region public emails provided by mail.tm
----
-trythe.net
-leadwizzer.com
-metalunits.com
-scpulse.com
--- a/crates/core/database/src/amqp/amqp.rs
+++ b/crates/core/database/src/amqp/amqp.rs
@@ -1,77 +1,58 @@
 use std::collections::HashSet;
-use std::sync::Arc;

 use crate::events::rabbit::*;
 use crate::User;
-use lapin::{
-    options::BasicPublishOptions,
-    protocol::basic::AMQPProperties,
-    types::{AMQPValue, FieldTable},
-    Channel, Connection, ConnectionProperties, Error as AMQPError,
-};
+use amqprs::channel::{BasicPublishArguments, ExchangeDeclareArguments};
+use amqprs::connection::OpenConnectionArguments;
+use amqprs::{channel::Channel, connection::Connection, error::Error as AMQPError};
+use amqprs::{BasicProperties, FieldTable};
 use revolt_models::v0::PushNotification;
 use revolt_presence::filter_online;
-use revolt_result::Result;

 use serde_json::to_string;

 #[derive(Clone)]
 pub struct AMQP {
-    friend_request_accepted: Arc<Channel>,
-    friend_request_received: Arc<Channel>,
-    generic_message: Arc<Channel>,
-    message_sent: Arc<Channel>,
-    mass_mention_message_sent: Arc<Channel>,
-    ack_notification_message: Arc<Channel>,
-    dm_call_updated: Arc<Channel>,
-    process_ack: Arc<Channel>,
    #[allow(unused)]
-    connection: Arc<Connection>,
+    connection: Connection,
+    channel: Channel,
 }

 impl AMQP {
-    pub async fn new(connection: Arc<Connection>) -> Self {
-        Self {
-            friend_request_accepted: Self::create_channel(&connection).await,
-            friend_request_received: Self::create_channel(&connection).await,
-            generic_message: Self::create_channel(&connection).await,
-            message_sent: Self::create_channel(&connection).await,
-            mass_mention_message_sent: Self::create_channel(&connection).await,
-            ack_notification_message: Self::create_channel(&connection).await,
-            dm_call_updated: Self::create_channel(&connection).await,
-            process_ack: Self::create_channel(&connection).await,
+    pub fn new(connection: Connection, channel: Channel) -> AMQP {
+        AMQP {
            connection,
+            channel,
        }
    }

-    pub async fn new_auto() -> Self {
+    pub async fn new_auto() -> AMQP {
        let config = revolt_config::config().await;

-        let connection = Arc::new(
-            Connection::connect(
-                &format!(
-                    "amqp://{}:{}@{}:{}",
-                    &config.rabbit.username,
-                    &config.rabbit.password,
-                    &config.rabbit.host,
-                    &config.rabbit.port,
-                ),
-                ConnectionProperties::default(),
+        let connection = Connection::open(&OpenConnectionArguments::new(
+            &config.rabbit.host,
+            config.rabbit.port,
+            &config.rabbit.username,
+            &config.rabbit.password,
+        ))
+        .await
+        .expect("Failed to connect to RabbitMQ");
+
+        let channel = connection
+            .open_channel(None)
+            .await
+            .expect("Failed to open RabbitMQ channel");
+
+        channel
+            .exchange_declare(
+                ExchangeDeclareArguments::new(&config.pushd.exchange, "direct")
+                    .durable(true)
+                    .finish(),
            )
            .await
-            .expect("Failed to connect to RabbitMQ"),
-        );
+            .expect("Failed to declare exchange");

-        Self::new(connection).await
-    }
-
-    async fn create_channel(connection: &Connection) -> Arc<Channel> {
-        Arc::new(
-            connection
-                .create_channel()
-                .await
-                .expect("Failed to create channel"),
-        )
+        AMQP::new(connection, channel)
    }

    pub async fn friend_request_accepted(
@@ -91,20 +72,19 @@ impl AMQP {
            config.pushd.get_fr_accepted_routing_key(),
            payload
        );
-
-        self.friend_request_accepted
+        self.channel
            .basic_publish(
-                config.pushd.exchange.clone().into(),
-                config.pushd.get_fr_accepted_routing_key().into(),
-                BasicPublishOptions::default(),
-                payload.as_bytes(),
-                AMQPProperties::default()
-                    .with_content_type("application/json".into())
-                    .with_delivery_mode(2),
+                BasicProperties::default()
+                    .with_content_type("application/json")
+                    .with_persistence(true)
+                    .finish(),
+                payload.into(),
+                BasicPublishArguments::new(
+                    &config.pushd.exchange,
+                    &config.pushd.get_fr_accepted_routing_key(),
+                ),
            )
-            .await?;
-
-        Ok(())
+            .await
    }

    pub async fn friend_request_received(
@@ -125,19 +105,19 @@ impl AMQP {
            payload
        );

-        self.friend_request_received
+        self.channel
            .basic_publish(
-                config.pushd.exchange.clone().into(),
-                config.pushd.get_fr_received_routing_key().into(),
-                BasicPublishOptions::default(),
-                payload.as_bytes(),
-                AMQPProperties::default()
-                    .with_content_type("application/json".into())
-                    .with_delivery_mode(2),
+                BasicProperties::default()
+                    .with_content_type("application/json")
+                    .with_persistence(true)
+                    .finish(),
+                payload.into(),
+                BasicPublishArguments::new(
+                    &config.pushd.exchange,
+                    &config.pushd.get_fr_received_routing_key(),
+                ),
            )
-            .await?;
-
-        Ok(())
+            .await
    }

    pub async fn generic_message(
@@ -162,19 +142,19 @@ impl AMQP {
            payload
        );

-        self.generic_message
+        self.channel
            .basic_publish(
-                config.pushd.exchange.clone().into(),
-                config.pushd.get_generic_routing_key().into(),
-                BasicPublishOptions::default(),
-                payload.as_bytes(),
-                AMQPProperties::default()
-                    .with_content_type("application/json".into())
-                    .with_delivery_mode(2),
+                BasicProperties::default()
+                    .with_content_type("application/json")
+                    .with_persistence(true)
+                    .finish(),
+                payload.into(),
+                BasicPublishArguments::new(
+                    &config.pushd.exchange,
+                    &config.pushd.get_generic_routing_key(),
+                ),
            )
-            .await?;
-
-        Ok(())
+            .await
    }

    pub async fn message_sent(
@@ -205,19 +185,19 @@ impl AMQP {
            payload
        );

-        self.message_sent
+        self.channel
            .basic_publish(
-                config.pushd.exchange.clone().into(),
-                config.pushd.get_message_routing_key().into(),
-                BasicPublishOptions::default(),
-                payload.as_bytes(),
-                AMQPProperties::default()
-                    .with_content_type("application/json".into())
-                    .with_delivery_mode(2),
+                BasicProperties::default()
+                    .with_content_type("application/json")
+                    .with_persistence(true)
+                    .finish(),
+                payload.into(),
+                BasicPublishArguments::new(
+                    &config.pushd.exchange,
+                    &config.pushd.get_message_routing_key(),
+                ),
            )
-            .await?;
-
-        Ok(())
+            .await
    }

    pub async fn mass_mention_message_sent(
@@ -240,24 +220,19 @@ impl AMQP {
            routing_key, payload
        );

-        self.mass_mention_message_sent
+        self.channel
            .basic_publish(
-                config.pushd.exchange.clone().into(),
-                routing_key.into(),
-                BasicPublishOptions::default(),
-                payload.as_bytes(),
-                AMQPProperties::default()
-                    .with_content_type("application/json".into())
-                    .with_delivery_mode(2),
+                BasicProperties::default()
+                    .with_content_type("application/json")
+                    .with_persistence(true)
+                    .finish(),
+                payload.into(),
+                BasicPublishArguments::new(&config.pushd.exchange, routing_key.as_str()),
            )
-            .await?;
-
-        Ok(())
+            .await
    }

-    /// # Sends an ack to pushd to update badges on iPhones.
-    /// Not to be confused with the process_ack function, which handles sending all acks to crond for processing.
-    pub async fn ack_notification_message(
+    pub async fn ack_message(
        &self,
        user_id: String,
        channel_id: String,
@@ -277,25 +252,23 @@ impl AMQP {
            config.pushd.ack_queue, payload
        );

-        let mut headers = FieldTable::default();
+        let mut headers = FieldTable::new();
        headers.insert(
-            "x-deduplication-header".into(),
-            AMQPValue::LongString(format!("{}-{}", &user_id, &channel_id).into()),
+            "x-deduplication-header".try_into().unwrap(),
+            format!("{}-{}", &user_id, &channel_id).into(),
        );

-        self.ack_notification_message
+        self.channel
            .basic_publish(
-                config.pushd.exchange.clone().into(),
-                config.pushd.ack_queue.into(),
-                BasicPublishOptions::default(),
-                payload.as_bytes(),
-                AMQPProperties::default()
-                    .with_content_type("application/json".into())
-                    .with_delivery_mode(2),
+                BasicProperties::default()
+                    .with_content_type("application/json")
+                    .with_persistence(true)
+                    //.with_headers(headers)
+                    .finish(),
+                payload.into(),
+                BasicPublishArguments::new(&config.pushd.exchange, &config.pushd.ack_queue),
            )
-            .await?;
-
-        Ok(())
+            .await
    }

    /// # DM Call Update
@@ -329,54 +302,18 @@ impl AMQP {
            payload
        );

-        self.dm_call_updated
+        self.channel
            .basic_publish(
-                config.pushd.exchange.clone().into(),
-                config.pushd.get_dm_call_routing_key().into(),
-                BasicPublishOptions::default(),
-                payload.as_bytes(),
-                AMQPProperties::default()
-                    .with_content_type("application/json".into())
-                    .with_delivery_mode(2),
+                BasicProperties::default()
+                    .with_content_type("application/json")
+                    .with_persistence(true)
+                    .finish(),
+                payload.into(),
+                BasicPublishArguments::new(
+                    &config.pushd.exchange,
+                    &config.pushd.get_dm_call_routing_key(),
+                ),
            )
-            .await?;
-
-        Ok(())
-    }
-
-    /// # Send an ack to crond for processing
-    pub async fn process_ack(
-        &self,
-        user_id: &str,
-        channel_id: Option<&str>,
-        server_id: Option<&str>,
-    ) -> Result<(), AMQPError> {
-        let config = revolt_config::config().await;
-
-        let payload = AckEventPayload {
-            user_id: user_id.to_string(),
-            channel_id: channel_id.map(|value| value.to_string()),
-            server_id: server_id.map(|value| value.to_string()),
-        };
-        let payload = to_string(&payload).unwrap();
-
-        info!(
-            "Sending ack processor event on exchange {}, channel {}: {}",
-            config.rabbit.default_exchange, config.rabbit.queues.acks, payload
-        );
-
-        self.process_ack
-            .basic_publish(
-                config.rabbit.default_exchange.clone().into(),
-                config.rabbit.queues.acks.into(),
-                BasicPublishOptions::default(),
-                payload.as_bytes(),
-                AMQPProperties::default()
-                    .with_content_type("application/json".into())
-                    .with_delivery_mode(2),
-            )
-            .await?;
-
-        Ok(())
+            .await
    }
 }
--- a/crates/core/database/src/drivers/mod.rs
+++ b/crates/core/database/src/drivers/mod.rs
@@ -2,7 +2,16 @@
 mod mongodb;
 mod reference;

-
+use authifier::config::Captcha;
+use authifier::config::EmailVerificationConfig;
+use authifier::config::PasswordScanning;
+use authifier::config::ResolveIp;
+use authifier::config::SMTPSettings;
+use authifier::config::Shield;
+use authifier::config::Template;
+use authifier::config::Templates;
+use authifier::config::EmailExpiryConfig;
+use authifier::Authifier;
 use rand::Rng;
 use revolt_config::config;

@@ -103,3 +112,143 @@ impl DatabaseInfo {
        }
    }
 }
+
+impl Database {
+    /// Create an Authifier reference
+    pub async fn to_authifier(self) -> Authifier {
+        let config = config().await;
+
+        let mut auth_config = authifier::Config {
+            password_scanning: if config.api.security.easypwned.is_empty() {
+                Default::default()
+            } else {
+                PasswordScanning::EasyPwned {
+                    endpoint: config.api.security.easypwned,
+                }
+            },
+            email_verification: if !config.api.smtp.host.is_empty() {
+                EmailVerificationConfig::Enabled {
+                    smtp: SMTPSettings {
+                        from: config.api.smtp.from_address,
+                        host: config.api.smtp.host,
+                        username: config.api.smtp.username,
+                        password: config.api.smtp.password,
+                        reply_to: Some(
+                            config
+                                .api
+                                .smtp
+                                .reply_to
+                                .unwrap_or("support@stoat.chat".into()),
+                        ),
+                        port: config.api.smtp.port,
+                        use_tls: config.api.smtp.use_tls,
+                        use_starttls: config.api.smtp.use_starttls,
+                    },
+                    expiry: EmailExpiryConfig {
+                        expire_verification: 3600 * 24 * 7,
+                        expire_password_reset: 3600 * 24,
+                        expire_account_deletion: 3600 * 24,
+                    },
+                    templates: if config.production {
+                        Templates {
+                            verify: Template {
+                                title: "Verify your Stoat account.".into(),
+                                text: include_str!("../../templates/verify.txt").into(),
+                                url: format!("{}/login/verify/", config.hosts.app),
+                                html: Some(include_str!("../../templates/verify.html").into()),
+                            },
+                            reset: Template {
+                                title: "Reset your Stoat password.".into(),
+                                text: include_str!("../../templates/reset.txt").into(),
+                                url: format!("{}/login/reset/", config.hosts.app),
+                                html: Some(include_str!("../../templates/reset.html").into()),
+                            },
+                            reset_existing: Template {
+                                title: "You already have a Stoat account, reset your password."
+                                    .into(),
+                                text: include_str!("../../templates/reset-existing.txt").into(),
+                                url: format!("{}/login/reset/", config.hosts.app),
+                                html: Some(
+                                    include_str!("../../templates/reset-existing.html").into(),
+                                ),
+                            },
+                            deletion: Template {
+                                title: "Confirm account deletion.".into(),
+                                text: include_str!("../../templates/deletion.txt").into(),
+                                url: format!("{}/delete/", config.hosts.app),
+                                html: Some(include_str!("../../templates/deletion.html").into()),
+                            },
+                            welcome: None,
+                        }
+                    } else {
+                        Templates {
+                            verify: Template {
+                                title: "Verify your account.".into(),
+                                text: include_str!("../../templates/verify.whitelabel.txt").into(),
+                                url: format!("{}/login/verify/", config.hosts.app),
+                                html: None,
+                            },
+                            reset: Template {
+                                title: "Reset your password.".into(),
+                                text: include_str!("../../templates/reset.whitelabel.txt").into(),
+                                url: format!("{}/login/reset/", config.hosts.app),
+                                html: None,
+                            },
+                            reset_existing: Template {
+                                title: "Reset your password.".into(),
+                                text: include_str!("../../templates/reset.whitelabel.txt").into(),
+                                url: format!("{}/login/reset/", config.hosts.app),
+                                html: None,
+                            },
+                            deletion: Template {
+                                title: "Confirm account deletion.".into(),
+                                text: include_str!("../../templates/deletion.whitelabel.txt")
+                                    .into(),
+                                url: format!("{}/delete/", config.hosts.app),
+                                html: None,
+                            },
+                            welcome: None,
+                        }
+                    },
+                }
+            } else {
+                EmailVerificationConfig::Disabled
+            },
+            ..Default::default()
+        };
+
+        auth_config.invite_only = config.api.registration.invite_only;
+
+        if !config.api.security.captcha.hcaptcha_key.is_empty() {
+            auth_config.captcha = Captcha::HCaptcha {
+                secret: config.api.security.captcha.hcaptcha_key,
+            };
+        }
+
+        if !config.api.security.authifier_shield_key.is_empty() {
+            auth_config.shield = Shield::Enabled {
+                api_key: config.api.security.authifier_shield_key,
+                strict: false,
+            };
+        }
+
+        if config.api.security.trust_cloudflare {
+            auth_config.resolve_ip = ResolveIp::Cloudflare;
+        }
+
+        Authifier {
+            database: match self {
+                Database::Reference(_) => Default::default(),
+                #[cfg(feature = "mongodb")]
+                Database::MongoDb(MongoDb(client, _)) => authifier::Database::MongoDb(
+                    authifier::database::MongoDb(client.database("revolt")),
+                ),
+            },
+            config: auth_config,
+            #[cfg(feature = "tasks")]
+            event_channel: Some(crate::tasks::authifier_relay::sender()),
+            #[cfg(not(feature = "tasks"))]
+            event_channel: None,
+        }
+    }
+}
--- a/crates/core/database/src/drivers/reference.rs
+++ b/crates/core/database/src/drivers/reference.rs
@@ -5,7 +5,7 @@ use futures::lock::Mutex;
 use crate::{
    Bot, Channel, ChannelCompositeKey, ChannelUnread, Emoji, File, FileHash, Invite, Member,
    MemberCompositeKey, Message, PolicyChange, RatelimitEvent, Report, Server, ServerBan, Snapshot,
-    User, UserSettings, Webhook, Account, AccountInvite, Session, MFATicket
+    User, UserSettings, Webhook,
 };

 database_derived!(
@@ -30,9 +30,5 @@ database_derived!(
        pub servers: Arc<Mutex<HashMap<String, Server>>>,
        pub safety_reports: Arc<Mutex<HashMap<String, Report>>>,
        pub safety_snapshots: Arc<Mutex<HashMap<String, Snapshot>>>,
-        pub accounts: Arc<Mutex<HashMap<String, Account>>>,
-        pub account_invites: Arc<Mutex<HashMap<String, AccountInvite>>>,
-        pub sessions: Arc<Mutex<HashMap<String, Session>>>,
-        pub tickets: Arc<Mutex<HashMap<String, MFATicket>>>,
    }
 );
--- a/crates/core/database/src/events/client.rs
+++ b/crates/core/database/src/events/client.rs
@@ -1,16 +1,12 @@
+use authifier::AuthifierEvent;
 use revolt_result::Error;
 use serde::{Deserialize, Serialize};

 use revolt_models::v0::{
-    AppendMessage, Channel, ChannelSlowmode, ChannelUnread, ChannelVoiceState, Emoji,
-    FieldsChannel, FieldsMember, FieldsMessage, FieldsRole, FieldsServer, FieldsUser,
-    FieldsWebhook, Member, MemberCompositeKey, Message, PartialChannel, PartialEmoji,
-    PartialMember, PartialMessage, PartialRole, PartialServer, PartialUser, PartialUserVoiceState,
-    PartialWebhook, PolicyChange, RemovalIntention, Report, Server, User, UserSettings,
-    UserVoiceState, Webhook,
+    AppendMessage, Channel, ChannelUnread, ChannelVoiceState, Emoji, FieldsChannel, FieldsMember, FieldsMessage, FieldsRole, FieldsServer, FieldsUser, FieldsWebhook, Member, MemberCompositeKey, Message, PartialChannel, PartialMember, PartialMessage, PartialRole, PartialServer, PartialUser, PartialUserVoiceState, PartialWebhook, PolicyChange, RemovalIntention, Report, Server, User, UserSettings, UserVoiceState, Webhook
 };

-use crate::{Account, Database, Session};
+use crate::Database;

 /// Ping Packet
 #[derive(Serialize, Deserialize, Debug, Clone)]
@@ -55,13 +51,9 @@ impl Default for ReadyPayloadFields {
 #[serde(tag = "type")]
 pub enum EventV1 {
    /// Multiple events
-    Bulk {
-        v: Vec<EventV1>,
-    },
+    Bulk { v: Vec<EventV1> },
    /// Error event
-    Error {
-        data: Error,
-    },
+    Error { data: Error },

    /// Successfully authenticated
    Authenticated,
@@ -92,9 +84,7 @@ pub enum EventV1 {
    },

    /// Ping response
-    Pong {
-        data: Ping,
-    },
+    Pong { data: Ping },
    /// New message
    Message(Message),

@@ -115,10 +105,7 @@ pub enum EventV1 {
    },

    /// Delete message
-    MessageDelete {
-        id: String,
-        channel: String,
-    },
+    MessageDelete { id: String, channel: String },

    /// New reaction to a message
    MessageReact {
@@ -144,10 +131,7 @@ pub enum EventV1 {
    },

    /// Bulk delete messages
-    BulkMessageDelete {
-        channel: String,
-        ids: Vec<String>,
-    },
+    BulkMessageDelete { channel: String, ids: Vec<String> },

    /// New server
    ServerCreate {
@@ -155,7 +139,7 @@ pub enum EventV1 {
        server: Server,
        channels: Vec<Channel>,
        emojis: Vec<Emoji>,
-        voice_states: Vec<ChannelVoiceState>,
+        voice_states: Vec<ChannelVoiceState>
    },

    /// Update existing server
@@ -167,9 +151,7 @@ pub enum EventV1 {
    },

    /// Delete server
-    ServerDelete {
-        id: String,
-    },
+    ServerDelete { id: String },

    /// Update existing server member
    ServerMemberUpdate {
@@ -205,16 +187,10 @@ pub enum EventV1 {
    },

    /// Server role deleted
-    ServerRoleDelete {
-        id: String,
-        role_id: String,
-    },
+    ServerRoleDelete { id: String, role_id: String },

    /// Server roles ranks updated
-    ServerRoleRanksUpdate {
-        id: String,
-        ranks: Vec<String>,
-    },
+    ServerRoleRanksUpdate { id: String, ranks: Vec<String> },

    /// Update existing user
    UserUpdate {
@@ -226,15 +202,9 @@ pub enum EventV1 {
    },

    /// Relationship with another user changed
-    UserRelationship {
-        id: String,
-        user: User,
-    },
+    UserRelationship { id: String, user: User },
    /// Settings updated remotely
-    UserSettingsUpdate {
-        id: String,
-        update: UserSettings,
-    },
+    UserSettingsUpdate { id: String, update: UserSettings },

    /// User has been platform banned or deleted their account
    ///
@@ -245,23 +215,12 @@ pub enum EventV1 {
    /// - Server Memberships
    ///
    /// User flags are specified to explain why a wipe is occurring though not all reasons will necessarily ever appear.
-    UserPlatformWipe {
-        user_id: String,
-        flags: i32,
-    },
+    UserPlatformWipe { user_id: String, flags: i32 },
    /// New emoji
    EmojiCreate(Emoji),

-    /// Update existing emoji
-    EmojiUpdate {
-        id: String,
-        data: PartialEmoji,
-    },
-
    /// Delete emoji
-    EmojiDelete {
-        id: String,
-    },
+    EmojiDelete { id: String },

    /// New report
    ReportCreate(Report),
@@ -277,33 +236,19 @@ pub enum EventV1 {
    },

    /// Delete channel
-    ChannelDelete {
-        id: String,
-    },
+    ChannelDelete { id: String },

    /// User joins a group
-    ChannelGroupJoin {
-        id: String,
-        user: String,
-    },
+    ChannelGroupJoin { id: String, user: String },

    /// User leaves a group
-    ChannelGroupLeave {
-        id: String,
-        user: String,
-    },
+    ChannelGroupLeave { id: String, user: String },

    /// User started typing in a channel
-    ChannelStartTyping {
-        id: String,
-        user: String,
-    },
+    ChannelStartTyping { id: String, user: String },

    /// User stopped typing in a channel
-    ChannelStopTyping {
-        id: String,
-        user: String,
-    },
+    ChannelStopTyping { id: String, user: String },

    /// User acknowledged message in channel
    ChannelAck {
@@ -323,25 +268,10 @@ pub enum EventV1 {
    },

    /// Delete webhook
-    WebhookDelete {
-        id: String,
-    },
+    WebhookDelete { id: String },

    /// Auth events
-    CreateAccount {
-        account: Account,
-    },
-    CreateSession {
-        session: Session,
-    },
-    DeleteSession {
-        user_id: String,
-        session_id: String,
-    },
-    DeleteAllSessions {
-        user_id: String,
-        exclude_session_id: Option<String>,
-    },
+    Auth(AuthifierEvent),

    /// Voice events
    VoiceChannelJoin {
@@ -356,7 +286,7 @@ pub enum EventV1 {
        user: String,
        from: String,
        to: String,
-        state: UserVoiceState,
+        state: UserVoiceState
    },
    UserVoiceStateUpdate {
        id: String,
@@ -368,11 +298,7 @@ pub enum EventV1 {
        from: String,
        to: String,
        token: String,
-    },
-    /// User's active slowmodes
-    UserSlowmodes {
-        slowmodes: Vec<ChannelSlowmode>,
-    },
+    }
 }

 impl EventV1 {
--- a/crates/core/database/src/events/rabbit.rs
+++ b/crates/core/database/src/events/rabbit.rs
@@ -78,11 +78,3 @@ pub struct AckPayload {
    pub channel_id: String,
    pub message_id: String,
 }
-
-/// This is not the same as the AckPayload above, as the state for this event is stored in redis to allow for state updates while the event is queued.
-#[derive(Serialize, Deserialize, Debug)]
-pub struct AckEventPayload {
-    pub user_id: String,
-    pub channel_id: Option<String>,
-    pub server_id: Option<String>,
-}
--- a/crates/core/database/src/models/account_invites/mod.rs
+++ b/crates/core/database/src/models/account_invites/mod.rs
@@ -1,5 +0,0 @@
-mod model;
-mod ops;
-
-pub use model::*;
-pub use ops::*;
--- a/crates/core/database/src/models/account_invites/model.rs
+++ b/crates/core/database/src/models/account_invites/model.rs
@@ -1,25 +0,0 @@
-use crate::{if_false, Database};
-use revolt_result::Result;
-
-auto_derived_partial!(
-    /// Account invite ticket
-    pub struct AccountInvite {
-        /// Invite code
-        #[serde(rename = "_id")]
-        pub id: String,
-        /// Whether this invite ticket has been used
-        #[serde(skip_serializing_if = "if_false", default)]
-        pub used: bool,
-        /// User ID that this invite was claimed by
-        #[serde(skip_serializing_if = "Option::is_none")]
-        pub claimed_by: Option<String>,
-    },
-    "PartialAccountInvite"
-);
-
-impl AccountInvite {
-    /// Save model
-    pub async fn save(&self, db: &Database) -> Result<()> {
-        db.save_account_invite(self).await
-    }
-}
--- a/crates/core/database/src/models/account_invites/ops.rs
+++ b/crates/core/database/src/models/account_invites/ops.rs
@@ -1,16 +0,0 @@
-use revolt_result::Result;
-
-use crate::AccountInvite;
-
-#[cfg(feature = "mongodb")]
-mod mongodb;
-mod reference;
-
-#[async_trait]
-pub trait AbstractAccountInvites: Sync + Send {
-    /// Find invite by id
-    async fn fetch_account_invite(&self, id: &str) -> Result<AccountInvite>;
-
-    /// Save invite
-    async fn save_account_invite(&self, invite: &AccountInvite) -> Result<()>;
-}
--- a/crates/core/database/src/models/account_invites/ops/mongodb.rs
+++ b/crates/core/database/src/models/account_invites/ops/mongodb.rs
@@ -1,31 +0,0 @@
-use crate::{AbstractAccountInvites, AccountInvite, MongoDb};
-use bson::to_document;
-use mongodb::options::UpdateOptions;
-use revolt_result::Result;
-
-const COL: &str = "account_invites";
-
-#[async_trait]
-impl AbstractAccountInvites for MongoDb {
-    /// Find invite by id
-    async fn fetch_account_invite(&self, id: &str) -> Result<AccountInvite> {
-        query!(self, find_one_by_id, COL, id)?.ok_or_else(|| create_error!(InvalidInvite))
-    }
-
-    /// Save invite
-    async fn save_account_invite(&self, invite: &AccountInvite) -> Result<()> {
-        self.col::<AccountInvite>(COL)
-            .update_one(
-                doc! {
-                    "_id": &invite.id
-                },
-                doc! {
-                    "$set": to_document(invite).map_err(|_| create_database_error!("to_document", COL))?,
-                },
-            )
-            .with_options(UpdateOptions::builder().upsert(true).build())
-            .await
-            .map_err(|_| create_database_error!("upsert_one", COL))
-            .map(|_| ())
-    }
-}
--- a/crates/core/database/src/models/account_invites/ops/reference.rs
+++ b/crates/core/database/src/models/account_invites/ops/reference.rs
@@ -1,21 +0,0 @@
-use crate::{AbstractAccountInvites, AccountInvite, ReferenceDb};
-use revolt_result::Result;
-
-#[async_trait]
-impl AbstractAccountInvites for ReferenceDb {
-    /// Find invite by id
-    async fn fetch_account_invite(&self, id: &str) -> Result<AccountInvite> {
-        let invites = self.account_invites.lock().await;
-        invites
-            .get(id)
-            .cloned()
-            .ok_or_else(|| create_error!(InvalidInvite))
-    }
-
-    /// Save invite
-    async fn save_account_invite(&self, invite: &AccountInvite) -> Result<()> {
-        let mut invites = self.account_invites.lock().await;
-        invites.insert(invite.id.to_string(), invite.clone());
-        Ok(())
-    }
-}
--- a/crates/core/database/src/models/accounts/axum.rs
+++ b/crates/core/database/src/models/accounts/axum.rs
@@ -1,22 +0,0 @@
-use axum::{extract::{FromRef, FromRequestParts}, http::request::Parts};
-
-use revolt_result::{Error, Result};
-
-use crate::{Account, Database, Session};
-
-#[async_trait]
-impl<S> FromRequestParts<S> for Account
-where
-    Database: FromRef<S>,
-    S: Send + Sync
-{
-    type Rejection = Error;
-
-    async fn from_request_parts(parts: &mut Parts, state: &S) -> Result<Self> {
-        let db = Database::from_ref(state);
-
-        let session = Session::from_request_parts(parts, state).await?;
-
-        db.fetch_account(&session.user_id).await
-    }
-}
--- a/crates/core/database/src/models/accounts/mod.rs
+++ b/crates/core/database/src/models/accounts/mod.rs
@@ -1,11 +0,0 @@
-#[cfg(feature = "axum-impl")]
-mod axum;
-mod model;
-mod ops;
-#[cfg(feature = "rocket-impl")]
-mod rocket;
-#[cfg(feature = "rocket-impl")]
-mod schema;
-
-pub use model::*;
-pub use ops::*;
--- a/crates/core/database/src/models/accounts/model.rs
+++ b/crates/core/database/src/models/accounts/model.rs
@@ -1,656 +0,0 @@
-use iso8601_timestamp::{Duration, Timestamp};
-
-use nanoid::nanoid;
-use revolt_config::config;
-use revolt_result::Result;
-use serde_json::json;
-
-use crate::{
-    events::client::EventV1,
-    util::{
-        email::{email_templates, normalise_email, send_email},
-        password::hash_password,
-    },
-    Database, MFATicket, Session,
-};
-use revolt_models::v0;
-
-auto_derived_partial!(
-    /// Account model
-    pub struct Account {
-        /// Unique Id
-        #[serde(rename = "_id")]
-        pub id: String,
-
-        /// User's email
-        pub email: String,
-
-        /// Normalised email
-        ///
-        /// (see https://github.com/insertish/authifier/#how-does-authifier-work)
-        pub email_normalised: String,
-
-        /// Argon2 hashed password
-        pub password: String,
-
-        /// Whether the account is disabled
-        #[serde(default)]
-        pub disabled: bool,
-
-        /// Email verification status
-        pub verification: EmailVerification,
-
-        /// Password reset information
-        pub password_reset: Option<PasswordReset>,
-
-        /// Account deletion information
-        pub deletion: Option<DeletionInfo>,
-
-        /// Account lockout
-        pub lockout: Option<Lockout>,
-
-        /// Multi-factor authentication information
-        pub mfa: MultiFactorAuthentication,
-    },
-    "PartialAccount"
-);
-
-auto_derived!(
-    /// Email verification status
-    #[serde(tag = "status")]
-    pub enum EmailVerification {
-        /// Account is verified
-        Verified,
-        /// Pending email verification
-        Pending { token: String, expiry: Timestamp },
-        /// Moving to a new email
-        Moving {
-            new_email: String,
-            token: String,
-            expiry: Timestamp,
-        },
-    }
-
-    /// Password reset information
-    pub struct PasswordReset {
-        /// Token required to change password
-        pub token: String,
-        /// Time at which this token expires
-        pub expiry: Timestamp,
-    }
-
-    /// Account deletion information
-    #[serde(tag = "status")]
-    pub enum DeletionInfo {
-        /// The user must confirm deletion by email
-        WaitingForVerification { token: String, expiry: Timestamp },
-        /// The account is scheduled for deletion
-        Scheduled { after: Timestamp },
-        /// This account was deleted
-        Deleted,
-    }
-
-    /// Lockout information
-    pub struct Lockout {
-        /// Attempt counter
-        pub attempts: i32,
-        /// Time at which this lockout expires
-        pub expiry: Option<Timestamp>,
-    }
-
-    /// MFA configuration
-    #[derive(Default)]
-    pub struct MultiFactorAuthentication {
-        /// Allow password-less email OTP login
-        /// (1-Factor)
-        // #[serde(skip_serializing_if = "is_false", default)]
-        // pub enable_email_otp: bool,
-
-        /// Allow trusted handover
-        /// (1-Factor)
-        // #[serde(skip_serializing_if = "is_false", default)]
-        // pub enable_trusted_handover: bool,
-
-        /// Allow email MFA
-        /// (2-Factor)
-        // #[serde(skip_serializing_if = "is_false", default)]
-        // pub enable_email_mfa: bool,
-
-        /// TOTP MFA token, enabled if present
-        /// (2-Factor)
-        #[serde(skip_serializing_if = "Totp::is_empty", default)]
-        pub totp_token: Totp,
-
-        /// Security Key MFA token, enabled if present
-        /// (2-Factor)
-        // #[serde(skip_serializing_if = "Option::is_none")]
-        // pub security_key_token: Option<String>,
-
-        /// Recovery codes
-        #[serde(skip_serializing_if = "Vec::is_empty", default)]
-        pub recovery_codes: Vec<String>,
-    }
-
-    /// MFA method
-    #[derive(Hash)]
-    pub enum MFAMethod {
-        Password,
-        Recovery,
-        Totp,
-    }
-
-    #[derive(Default)]
-    #[serde(tag = "status")]
-    pub enum Totp {
-        /// Disabled
-        #[default]
-        Disabled,
-        /// Waiting for user activation
-        Pending { secret: String },
-        /// Required on account
-        Enabled { secret: String },
-    }
-);
-
-impl MultiFactorAuthentication {
-    // Check whether MFA is in-use
-    pub fn is_active(&self) -> bool {
-        matches!(self.totp_token, Totp::Enabled { .. })
-    }
-
-    // Check whether there are still usable recovery codes
-    pub fn has_recovery(&self) -> bool {
-        !self.recovery_codes.is_empty()
-    }
-
-    // Get available MFA methods
-    pub fn get_methods(&self) -> Vec<MFAMethod> {
-        if let Totp::Enabled { .. } = self.totp_token {
-            let mut methods = vec![MFAMethod::Totp];
-
-            if self.has_recovery() {
-                methods.push(MFAMethod::Recovery);
-            }
-
-            methods
-        } else {
-            vec![MFAMethod::Password]
-        }
-    }
-
-    // Generate new recovery codes
-    pub fn generate_recovery_codes(&mut self) {
-        static ALPHABET: [char; 32] = [
-            '1', '2', '3', '4', '5', '6', '7', '8', '9', '0', 'a', 'b', 'c', 'd', 'e', 'f', 'g',
-            'h', 'j', 'k', 'm', 'n', 'p', 'q', 'r', 's', 't', 'v', 'w', 'x', 'y', 'z',
-        ];
-
-        let mut codes = vec![];
-        for _ in 1..=10 {
-            codes.push(format!(
-                "{}-{}",
-                nanoid!(5, &ALPHABET),
-                nanoid!(5, &ALPHABET)
-            ));
-        }
-
-        self.recovery_codes = codes;
-    }
-
-    // Generate new TOTP secret
-    pub fn generate_new_totp_secret(&mut self) -> Result<String> {
-        if let Totp::Enabled { .. } = self.totp_token {
-            return Err(create_error!(OperationFailed));
-        }
-
-        let secret: [u8; 10] = rand::random();
-        let secret = base32::encode(base32::Alphabet::RFC4648 { padding: false }, &secret);
-
-        self.totp_token = Totp::Pending {
-            secret: secret.clone(),
-        };
-
-        Ok(secret)
-    }
-
-    /// Enable TOTP using a given MFA response
-    pub fn enable_totp(&mut self, response: v0::MFAResponse) -> Result<()> {
-        if let v0::MFAResponse::Totp { totp_code } = response {
-            let code = self.totp_token.generate_code()?;
-
-            if code == totp_code {
-                let mut totp = Totp::Disabled;
-                std::mem::swap(&mut totp, &mut self.totp_token);
-
-                if let Totp::Pending { secret } = totp {
-                    self.totp_token = Totp::Enabled { secret };
-
-                    Ok(())
-                } else {
-                    Err(create_error!(OperationFailed))
-                }
-            } else {
-                Err(create_error!(InvalidToken))
-            }
-        } else {
-            Err(create_error!(InvalidToken))
-        }
-    }
-}
-
-impl Totp {
-    /// Whether TOTP information is empty
-    pub fn is_empty(&self) -> bool {
-        matches!(self, Totp::Disabled)
-    }
-
-    /// Whether TOTP is disabled
-    pub fn is_disabled(&self) -> bool {
-        !matches!(self, Totp::Enabled { .. })
-    }
-
-    // Generate a TOTP code from secret
-    pub fn generate_code(&self) -> Result<String> {
-        if let Totp::Enabled { secret } | Totp::Pending { secret } = &self {
-            let seconds: u64 = std::time::SystemTime::now()
-                .duration_since(std::time::UNIX_EPOCH)
-                .unwrap()
-                .as_secs();
-
-            Ok(totp_lite::totp_custom::<totp_lite::Sha1>(
-                totp_lite::DEFAULT_STEP,
-                6,
-                &base32::decode(base32::Alphabet::RFC4648 { padding: false }, secret)
-                    .expect("valid base32 secret"),
-                seconds,
-            ))
-        } else {
-            Err(create_error!(OperationFailed))
-        }
-    }
-}
-
-impl Account {
-    /// Save model
-    pub async fn save(&self, db: &Database) -> Result<()> {
-        db.save_account(self).await
-    }
-
-    /// Create a new account
-    pub async fn new(
-        db: &Database,
-        email: String,
-        plaintext_password: String,
-        verify_email: bool,
-    ) -> Result<Account> {
-        // Get a normalised representation of the user's email
-        let email_normalised = normalise_email(email.clone());
-
-        // Try to find an existing account
-        if let Some(mut account) = db
-            .fetch_account_by_normalised_email(&email_normalised)
-            .await?
-        {
-            // Resend account verification or send password reset
-            if let EmailVerification::Pending { .. } = &account.verification {
-                account.start_email_verification(db).await?;
-            } else {
-                account.start_password_reset(db, true).await?;
-            }
-
-            Ok(account)
-        } else {
-            // Hash the user's password
-            let password = hash_password(plaintext_password)?;
-
-            // Create a new account
-            let mut account = Account {
-                id: ulid::Ulid::new().to_string(),
-
-                email,
-                email_normalised,
-                password,
-
-                disabled: false,
-                verification: EmailVerification::Verified,
-                password_reset: None,
-                deletion: None,
-                lockout: None,
-
-                mfa: Default::default(),
-            };
-
-            // Send email verification
-            if verify_email {
-                account.start_email_verification(db).await?;
-            } else {
-                account.save(db).await?;
-            }
-
-            // Create and push event
-            EventV1::CreateAccount {
-                account: account.clone(),
-            }
-            .global()
-            .await;
-
-            Ok(account)
-        }
-    }
-
-    /// Create a new session
-    pub async fn create_session(&self, db: &Database, name: String) -> Result<Session> {
-        let config = config().await;
-
-        let session = Session {
-            id: ulid::Ulid::new().to_string(),
-            token: nanoid!(64),
-
-            user_id: self.id.clone(),
-            name,
-
-            last_seen: Timestamp::now_utc(),
-
-            origin: Some(config.environment),
-            subscription: None,
-        };
-
-        // Save to database
-        db.save_session(&session).await?;
-
-        // Create and push event
-        EventV1::CreateSession {
-            session: session.clone(),
-        }
-        .global()
-        .await;
-
-        Ok(session)
-    }
-
-    /// Send account verification email
-    pub async fn start_email_verification(&mut self, db: &Database) -> Result<()> {
-        let config = config().await;
-
-        if !config.api.smtp.host.is_empty() {
-            let templates = email_templates().await;
-
-            let token = nanoid!(32);
-            let url = format!("{}{}", templates.verify.url, token);
-
-            send_email(
-                &config.api.smtp,
-                self.email.clone(),
-                &templates.verify,
-                json!({
-                    "email": self.email.clone(),
-                    "url": url
-                }),
-            )?;
-
-            self.verification = EmailVerification::Pending {
-                token,
-                expiry: Timestamp::now_utc()
-                    .checked_add(Duration::seconds(
-                        config.api.smtp.expiry.expire_verification,
-                    ))
-                    .unwrap(),
-            };
-        } else {
-            self.verification = EmailVerification::Verified;
-        }
-
-        self.save(db).await
-    }
-
-    /// Send account verification to new email
-    pub async fn start_email_move(&mut self, db: &Database, new_email: String) -> Result<()> {
-        // This method should and will never be called on an unverified account,
-        // but just validate this just in case.
-        if let EmailVerification::Pending { .. } = self.verification {
-            return Err(create_error!(UnverifiedAccount));
-        }
-
-        let config = config().await;
-
-        if !config.api.smtp.host.is_empty() {
-            let templates = email_templates().await;
-
-            let token = nanoid!(32);
-            let url = format!("{}{}", templates.verify.url, token);
-
-            send_email(
-                &config.api.smtp,
-                new_email.clone(),
-                &templates.verify,
-                json!({
-                    "email": self.email.clone(),
-                    "url": url
-                }),
-            )?;
-
-            self.verification = EmailVerification::Moving {
-                new_email,
-                token,
-                expiry: Timestamp::now_utc()
-                    .checked_add(Duration::seconds(
-                        config.api.smtp.expiry.expire_verification,
-                    ))
-                    .unwrap(),
-            };
-        } else {
-            self.email_normalised = normalise_email(new_email.clone());
-            self.email = new_email;
-        }
-
-        self.save(db).await
-    }
-
-    /// Send password reset email
-    pub async fn start_password_reset(
-        &mut self,
-        db: &Database,
-        existing_account: bool,
-    ) -> Result<()> {
-        let config = config().await;
-
-        if !config.api.smtp.host.is_empty() {
-            let templates = email_templates().await;
-
-            let template = if existing_account {
-                &templates.reset_existing
-            } else {
-                &templates.reset
-            };
-
-            let token = nanoid!(32);
-            let url = format!("{}{}", template.url, token);
-
-            send_email(
-                &config.api.smtp,
-                self.email.clone(),
-                template,
-                json!({
-                    "email": self.email.clone(),
-                    "url": url
-                }),
-            )?;
-
-            self.password_reset = Some(PasswordReset {
-                token,
-                expiry: Timestamp::now_utc()
-                    .checked_add(Duration::seconds(
-                        config.api.smtp.expiry.expire_password_reset,
-                    ))
-                    .unwrap(),
-            });
-        } else {
-            return Err(create_error!(OperationFailed));
-        }
-
-        self.save(db).await
-    }
-
-    /// Begin account deletion process by sending confirmation email
-    ///
-    /// If email verification is not on, the account will be marked for deletion instantly
-    pub async fn start_account_deletion(&mut self, db: &Database) -> Result<()> {
-        let config = config().await;
-
-        if !config.api.smtp.host.is_empty() {
-            let templates = email_templates().await;
-
-            let token = nanoid!(32);
-            let url = format!("{}{}", templates.deletion.url, token);
-
-            send_email(
-                &config.api.smtp,
-                self.email.clone(),
-                &templates.deletion,
-                json!({
-                    "email": self.email.clone(),
-                    "url": url
-                }),
-            )?;
-
-            self.deletion = Some(DeletionInfo::WaitingForVerification {
-                token,
-                expiry: Timestamp::now_utc()
-                    .checked_add(Duration::seconds(
-                        config.api.smtp.expiry.expire_password_reset,
-                    ))
-                    .unwrap(),
-            });
-
-            self.save(db).await
-        } else {
-            self.schedule_deletion(db).await
-        }
-    }
-
-    /// Verify a user's password is correct
-    pub fn verify_password(&self, plaintext_password: &str) -> Result<()> {
-        argon2::verify_encoded(&self.password, plaintext_password.as_bytes())
-            .map(|v| {
-                if v {
-                    Ok(())
-                } else {
-                    Err(create_error!(InvalidCredentials))
-                }
-            })
-            // To prevent user enumeration, we should ignore
-            // the error and pretend the password is wrong.
-            .map_err(|_| create_error!(InvalidCredentials))?
-    }
-
-    /// Validate an MFA response
-    pub async fn consume_mfa_response(
-        &mut self,
-        db: &Database,
-        response: v0::MFAResponse,
-        ticket: Option<MFATicket>,
-    ) -> Result<()> {
-        let allowed_methods = self.mfa.get_methods();
-
-        match response {
-            v0::MFAResponse::Password { password } => {
-                if allowed_methods.contains(&MFAMethod::Password) {
-                    self.verify_password(&password)
-                } else {
-                    Err(create_error!(DisallowedMFAMethod))
-                }
-            }
-            v0::MFAResponse::Totp { totp_code } => {
-                if allowed_methods.contains(&MFAMethod::Totp) {
-                    if let Totp::Enabled { .. } = &self.mfa.totp_token {
-                        // Use TOTP code at generation if applicable
-                        if let Some(ticket) = ticket {
-                            if let Some(code) = ticket.last_totp_code {
-                                if code == totp_code {
-                                    return Ok(());
-                                }
-                            }
-                        }
-
-                        // Otherwise read current TOTP token
-                        if self.mfa.totp_token.generate_code()? == totp_code {
-                            Ok(())
-                        } else {
-                            Err(create_error!(InvalidToken))
-                        }
-                    } else {
-                        unreachable!()
-                    }
-                } else {
-                    Err(create_error!(DisallowedMFAMethod))
-                }
-            }
-            v0::MFAResponse::Recovery { recovery_code } => {
-                if allowed_methods.contains(&MFAMethod::Recovery) {
-                    if let Some(index) = self
-                        .mfa
-                        .recovery_codes
-                        .iter()
-                        .position(|x| x == &recovery_code)
-                    {
-                        self.mfa.recovery_codes.remove(index);
-                        self.save(db).await
-                    } else {
-                        Err(create_error!(InvalidToken))
-                    }
-                } else {
-                    Err(create_error!(DisallowedMFAMethod))
-                }
-            }
-        }
-    }
-
-    /// Delete all sessions for an account
-    pub async fn delete_all_sessions(
-        &self,
-        db: &Database,
-        exclude_session_id: Option<String>,
-    ) -> Result<()> {
-        db.delete_all_sessions(&self.id, exclude_session_id.clone())
-            .await?;
-
-        // Create and push event
-        EventV1::DeleteAllSessions {
-            user_id: self.id.clone(),
-            exclude_session_id,
-        }
-        .private(self.id.clone())
-        .await;
-
-        Ok(())
-    }
-
-    /// Disable an account
-    pub async fn disable(&mut self, db: &Database) -> Result<()> {
-        self.disabled = true;
-        self.delete_all_sessions(db, None).await?;
-        self.save(db).await
-    }
-
-    /// Schedule an account for deletion
-    pub async fn schedule_deletion(&mut self, db: &Database) -> Result<()> {
-        self.deletion = Some(DeletionInfo::Scheduled {
-            after: Timestamp::now_utc()
-                .checked_add(Duration::weeks(1))
-                .unwrap(),
-        });
-
-        self.disable(db).await
-    }
-
-    /// Removes all information from the account and marks it as fully deleted
-    pub async fn mark_deleted(&mut self, db: &Database) -> Result<()> {
-        self.email = format!("Deleted User {}", &self.id);
-        self.email_normalised = format!("Deleted User {}", &self.id);
-        self.deletion = Some(DeletionInfo::Deleted);
-
-        self.save(db).await?;
-
-        Ok(())
-    }
-}
--- a/crates/core/database/src/models/accounts/ops.rs
+++ b/crates/core/database/src/models/accounts/ops.rs
@@ -1,34 +0,0 @@
-use revolt_result::Result;
-
-use crate::Account;
-
-#[cfg(feature = "mongodb")]
-mod mongodb;
-mod reference;
-
-#[async_trait]
-pub trait AbstractAccounts: Sync + Send {
-    /// Find account by id
-    async fn fetch_account(&self, id: &str) -> Result<Account>;
-
-    /// Find account by normalised email
-    async fn fetch_account_by_normalised_email(
-        &self,
-        normalised_email: &str,
-    ) -> Result<Option<Account>>;
-
-    /// Find account with active pending email verification
-    async fn fetch_account_with_email_verification(&self, token: &str) -> Result<Account>;
-
-    /// Find account with active password reset
-    async fn fetch_account_with_password_reset(&self, token: &str) -> Result<Account>;
-
-    /// Find account with active deletion token
-    async fn fetch_account_with_deletion_token(&self, token: &str) -> Result<Account>;
-
-    /// Find accounts which are due to be deleted
-    async fn fetch_accounts_due_for_deletion(&self) -> Result<Vec<Account>>;
-
-    // Save account
-    async fn save_account(&self, account: &Account) -> Result<()>;
-}
--- a/crates/core/database/src/models/accounts/ops/mongodb.rs
+++ b/crates/core/database/src/models/accounts/ops/mongodb.rs
@@ -1,118 +0,0 @@
-use crate::{AbstractAccounts, Account, MongoDb};
-use bson::{to_bson, to_document};
-use iso8601_timestamp::Timestamp;
-use mongodb::options::{Collation, CollationStrength, FindOneOptions, UpdateOptions};
-use revolt_result::Result;
-
-const COL: &str = "accounts";
-
-#[async_trait]
-impl AbstractAccounts for MongoDb {
-    /// Find account by id
-    async fn fetch_account(&self, id: &str) -> Result<Account> {
-        query!(self, find_one_by_id, COL, id)?.ok_or_else(|| create_error!(UnknownUser))
-    }
-
-    /// Find account by normalised email
-    async fn fetch_account_by_normalised_email(
-        &self,
-        normalised_email: &str,
-    ) -> Result<Option<Account>> {
-        query!(
-            self,
-            find_one_with_options,
-            COL,
-            doc! {
-                "email_normalised": normalised_email
-            },
-            FindOneOptions::builder()
-                .collation(
-                    Collation::builder()
-                        .locale("en")
-                        .strength(CollationStrength::Secondary)
-                        .build(),
-                )
-                .build()
-        )
-    }
-
-    /// Find account with active pending email verification
-    async fn fetch_account_with_email_verification(&self, token: &str) -> Result<Account> {
-        query!(
-            self,
-            find_one,
-            COL,
-            doc! {
-                "verification.token": token,
-                "verification.expiry": {
-                    "$gte": to_bson(&Timestamp::now_utc()).unwrap()
-                }
-            }
-        )?
-        .ok_or_else(|| create_error!(InvalidToken))
-    }
-
-    /// Find account with active password reset
-    async fn fetch_account_with_password_reset(&self, token: &str) -> Result<Account> {
-        query!(
-            self,
-            find_one,
-            COL,
-            doc! {
-                "password_reset.token": token,
-                "password_reset.expiry": {
-                    "$gte": to_bson(&Timestamp::now_utc()).unwrap()
-                }
-            }
-        )?
-        .ok_or_else(|| create_error!(InvalidToken))
-    }
-
-    /// Find account with active deletion token
-    async fn fetch_account_with_deletion_token(&self, token: &str) -> Result<Account> {
-        query!(
-            self,
-            find_one,
-            COL,
-            doc! {
-                "deletion.token": token,
-                "deletion.expiry": {
-                    "$gte": to_bson(&Timestamp::now_utc()).unwrap()
-                }
-            }
-        )?
-        .ok_or_else(|| create_error!(InvalidToken))
-    }
-
-    /// Find accounts which are due to be deleted
-    async fn fetch_accounts_due_for_deletion(&self) -> Result<Vec<Account>> {
-        query!(
-            self,
-            find,
-            COL,
-            doc! {
-                "deletion.status": "Scheduled",
-                "deletion.after": {
-                    "$lte": to_bson(&Timestamp::now_utc()).unwrap()
-                }
-            }
-        )
-    }
-
-    // Save account
-    async fn save_account(&self, account: &Account) -> Result<()> {
-        self.col::<Account>(COL)
-            .update_one(
-                doc! {
-                    "_id": &account.id
-                },
-                doc! {
-                    "$set": to_document(account).map_err(|_| create_database_error!("to_document", COL))?
-                },
-            )
-            .with_options(UpdateOptions::builder().upsert(true).build())
-            .await
-            .map_err(|_| create_database_error!("find_one", COL))
-            .map(|_| ())
-    }
-}
--- a/crates/core/database/src/models/accounts/ops/reference.rs
+++ b/crates/core/database/src/models/accounts/ops/reference.rs
@@ -1,99 +0,0 @@
-use crate::{AbstractAccounts, Account, DeletionInfo, EmailVerification, ReferenceDb};
-use iso8601_timestamp::Timestamp;
-use revolt_result::Result;
-
-#[async_trait]
-impl AbstractAccounts for ReferenceDb {
-    /// Find account by id
-    async fn fetch_account(&self, id: &str) -> Result<Account> {
-        let accounts = self.accounts.lock().await;
-        accounts
-            .get(id)
-            .cloned()
-            .ok_or_else(|| create_error!(UnknownUser))
-    }
-
-    /// Find account by normalised email
-    async fn fetch_account_by_normalised_email(
-        &self,
-        normalised_email: &str,
-    ) -> Result<Option<Account>> {
-        let accounts = self.accounts.lock().await;
-        Ok(accounts
-            .values()
-            .find(|account| account.email_normalised == normalised_email)
-            .cloned())
-    }
-
-    /// Find account with active pending email verification
-    async fn fetch_account_with_email_verification(&self, token_to_match: &str) -> Result<Account> {
-        let accounts = self.accounts.lock().await;
-        accounts
-            .values()
-            .find(|account| match &account.verification {
-                EmailVerification::Pending { token, .. }
-                | EmailVerification::Moving { token, .. } => token == token_to_match,
-                _ => false,
-            })
-            .cloned()
-            .ok_or_else(|| create_error!(InvalidToken))
-    }
-
-    /// Find account with active password reset
-    async fn fetch_account_with_password_reset(&self, token: &str) -> Result<Account> {
-        let accounts = self.accounts.lock().await;
-        accounts
-            .values()
-            .find(|account| {
-                if let Some(reset) = &account.password_reset {
-                    reset.token == token
-                } else {
-                    false
-                }
-            })
-            .cloned()
-            .ok_or_else(|| create_error!(InvalidToken))
-    }
-
-    /// Find account with active deletion token
-    async fn fetch_account_with_deletion_token(&self, token_to_match: &str) -> Result<Account> {
-        let accounts = self.accounts.lock().await;
-        accounts
-            .values()
-            .find(|account| {
-                if let Some(DeletionInfo::WaitingForVerification { token, .. }) = &account.deletion
-                {
-                    token == token_to_match
-                } else {
-                    false
-                }
-            })
-            .cloned()
-            .ok_or_else(|| create_error!(InvalidToken))
-    }
-
-    /// Find accounts which are due to be deleted
-    async fn fetch_accounts_due_for_deletion(&self) -> Result<Vec<Account>> {
-        let now = Timestamp::now_utc();
-        let accounts = self.accounts.lock().await;
-
-        Ok(accounts
-            .values()
-            .filter(|account| {
-                if let Some(DeletionInfo::Scheduled { after }) = &account.deletion {
-                    after <= &now
-                } else {
-                    false
-                }
-            })
-            .cloned()
-            .collect())
-    }
-
-    // Save account
-    async fn save_account(&self, account: &Account) -> Result<()> {
-        let mut accounts = self.accounts.lock().await;
-        accounts.insert(account.id.to_string(), account.clone());
-        Ok(())
-    }
-}
--- a/crates/core/database/src/models/accounts/rocket.rs
+++ b/crates/core/database/src/models/accounts/rocket.rs
@@ -1,32 +0,0 @@
-use crate::{Account, Database, Session};
-use revolt_result::Error;
-use rocket::{
-    http::Status,
-    request::{FromRequest, Outcome},
-    Request,
-};
-
-#[rocket::async_trait]
-impl<'r> FromRequest<'r> for Account {
-    type Error = Error;
-
-    async fn from_request(request: &'r Request<'_>) -> Outcome<Self, Self::Error> {
-        match request.guard::<Session>().await {
-            Outcome::Success(session) => {
-                if let Ok(account) = request
-                    .rocket()
-                    .state::<Database>()
-                    .expect("`Database`")
-                    .fetch_account(&session.user_id)
-                    .await
-                {
-                    Outcome::Success(account)
-                } else {
-                    Outcome::Error((Status::InternalServerError, create_error!(InternalError)))
-                }
-            }
-            Outcome::Forward(_) => unreachable!(),
-            Outcome::Error(err) => Outcome::Error(err),
-        }
-    }
-}
--- a/crates/core/database/src/models/accounts/schema.rs
+++ b/crates/core/database/src/models/accounts/schema.rs
@@ -1,32 +0,0 @@
-use revolt_okapi::openapi3::{SecurityScheme, SecuritySchemeData};
-use revolt_rocket_okapi::{
-    gen::OpenApiGenerator,
-    request::{OpenApiFromRequest, RequestHeaderInput},
-};
-
-use crate::Account;
-
-
-impl<'r> OpenApiFromRequest<'r> for Account {
-    fn from_request_input(
-        _gen: &mut OpenApiGenerator,
-        _name: String,
-        _required: bool,
-    ) -> revolt_rocket_okapi::Result<RequestHeaderInput> {
-        let mut requirements = schemars::Map::new();
-        requirements.insert("Session Token".to_owned(), vec![]);
-
-        Ok(RequestHeaderInput::Security(
-            "Session Token".to_owned(),
-            SecurityScheme {
-                data: SecuritySchemeData::ApiKey {
-                    name: "x-session-token".to_owned(),
-                    location: "header".to_owned(),
-                },
-                description: Some("Used to authenticate as a user.".to_owned()),
-                extensions: schemars::Map::new(),
-            },
-            requirements,
-        ))
-    }
-}
--- a/crates/core/database/src/models/admin_migrations/ops/mongodb/init.rs
+++ b/crates/core/database/src/models/admin_migrations/ops/mongodb/init.rs
@@ -98,18 +98,6 @@ pub async fn create_database(db: &MongoDb) {
        .await
        .expect("Failed to create pubsub collection.");

-    db.create_collection("sessions")
-        .await
-        .expect("Failed to create sessions collection.");
-
-    db.create_collection("account_invites")
-        .await
-        .expect("Failed to create account_invites collection.");
-
-    db.create_collection("mfa_tickets")
-        .await
-        .expect("Failed to create mfa_tickets collection.");
-
    db.run_command(doc! {
        "createIndexes": "users",
        "indexes": [
@@ -275,89 +263,5 @@ pub async fn create_database(db: &MongoDb) {
    .await
    .expect("Failed to create ratelimit_events index.");

-    db.run_command(doc! {
-        "createIndexes": "accounts",
-        "indexes": [
-            {
-                "key": {
-                    "email": 1
-                },
-                "name": "email",
-                "unique": true,
-                "collation": {
-                    "locale": "en",
-                    "strength": 2
-                }
-            },
-            {
-                "key": {
-                    "email_normalised": 1
-                },
-                "name": "email_normalised",
-                "unique": true,
-                "collation": {
-                    "locale": "en",
-                    "strength": 2
-                }
-            },
-            {
-                "key": {
-                    "verification.token": 1
-                },
-                "name": "email_verification"
-            },
-            {
-                "key": {
-                    "password_reset.token": 1
-                },
-                "name": "password_reset"
-            },
-            {
-                "key": {
-                    "deletion.token": 1
-                },
-                "name": "account_deletion"
-            }
-        ]
-    })
-    .await
-    .unwrap();
-
-    db.run_command(doc! {
-        "createIndexes": "sessions",
-        "indexes": [
-            {
-                "key": {
-                    "token": 1
-                },
-                "name": "token",
-                "unique": true
-            },
-            {
-                "key": {
-                    "user_id": 1
-                },
-                "name": "user_id"
-            }
-        ]
-    })
-    .await
-    .unwrap();
-
-    db.run_command(doc! {
-        "createIndexes": "mfa_tickets",
-        "indexes": [
-            {
-                "key": {
-                    "token": 1
-                },
-                "name": "token",
-                "unique": true
-            }
-        ]
-    })
-    .await
-    .unwrap();
-
    info!("Created database.");
 }
--- a/crates/core/database/src/models/admin_migrations/ops/mongodb/scripts.rs
+++ b/crates/core/database/src/models/admin_migrations/ops/mongodb/scripts.rs
@@ -17,7 +17,6 @@ use iso8601_timestamp::Timestamp;
 use rand::seq::SliceRandom;
 use revolt_permissions::{ChannelPermission, DEFAULT_WEBHOOK_PERMISSIONS};
 use serde::{Deserialize, Serialize};
-use ulid::Ulid;
 use unicode_segmentation::UnicodeSegmentation;

 #[derive(Serialize, Deserialize)]
@@ -26,7 +25,7 @@ struct MigrationInfo {
    revision: i32,
 }

-pub const LATEST_REVISION: i32 = 51; // MUST BE +1 to last migration
+pub const LATEST_REVISION: i32 = 50; // MUST BE +1 to last migration

 pub async fn migrate_database(db: &MongoDb) {
    let migrations = db.col::<Document>("migrations");
@@ -574,145 +573,20 @@ pub async fn run_migrations(db: &MongoDb, revision: i32) -> i32 {
    if revision <= 15 {
        info!("Running migration [revision 15 / 04-06-2022]: Migrate Authifier to latest version.");

-        if !db
-            .db()
-            .collection::<Document>("mfa_tickets")
-            .list_index_names()
+        let db = authifier::Database::MongoDb(authifier::database::MongoDb(db.db()));
+        db.run_migration(authifier::Migration::M2022_06_03EnsureUpToSpec)
            .await
-            .unwrap_or_default()
-            .contains(&"token".to_owned())
-        {
-            // Make sure all collections exist
-            let list = db.db().list_collection_names().await.unwrap();
-            let collections = ["accounts", "sessions", "invites", "mfa_tickets"];
-
-            for name in collections {
-                if !list.contains(&name.to_string()) {
-                    db.db().create_collection(name).await.unwrap();
-                }
-            }
-
-            // Setup index for `accounts`
-            let col = db.db().collection::<Document>("accounts");
-            col.drop_indexes().await.unwrap();
-
-            db.db()
-                .run_command(doc! {
-                    "createIndexes": "accounts",
-                    "indexes": [
-                        {
-                            "key": {
-                                "email": 1
-                            },
-                            "name": "email",
-                            "unique": true,
-                            "collation": {
-                                "locale": "en",
-                                "strength": 2
-                            }
-                        },
-                        {
-                            "key": {
-                                "email_normalised": 1
-                            },
-                            "name": "email_normalised",
-                            "unique": true,
-                            "collation": {
-                                "locale": "en",
-                                "strength": 2
-                            }
-                        },
-                        {
-                            "key": {
-                                "verification.token": 1
-                            },
-                            "name": "email_verification"
-                        },
-                        {
-                            "key": {
-                                "password_reset.token": 1
-                            },
-                            "name": "password_reset"
-                        }
-                    ]
-                })
-                .await
-                .unwrap();
-
-            // Setup index for `sessions`
-            let col = db.db().collection::<Document>("sessions");
-            col.drop_indexes().await.unwrap();
-
-            db.db()
-                .run_command(doc! {
-                    "createIndexes": "sessions",
-                    "indexes": [
-                        {
-                            "key": {
-                                "token": 1
-                            },
-                            "name": "token",
-                            "unique": true
-                        },
-                        {
-                            "key": {
-                                "user_id": 1
-                            },
-                            "name": "user_id"
-                        }
-                    ]
-                })
-                .await
-                .unwrap();
-
-            // Setup index for `mfa_tickets`
-            let col = db.db().collection::<Document>("mfa_tickets");
-            col.drop_indexes().await.unwrap();
-
-            db.db()
-                .run_command(doc! {
-                    "createIndexes": "mfa_tickets",
-                    "indexes": [
-                        {
-                            "key": {
-                                "token": 1
-                            },
-                            "name": "token",
-                            "unique": true
-                        }
-                    ]
-                })
-                .await
-                .unwrap();
-        }
+            .unwrap();
    }

    if revision <= 16 {
        info!("Running migration [revision 16 / 07-07-2022]: Add `emojis` collection and Authifier migration.");

-        if !db
-            .db()
-            .collection::<Document>("accounts")
-            .list_index_names()
+        let authifier_db = authifier::Database::MongoDb(authifier::database::MongoDb(db.db()));
+        authifier_db
+            .run_migration(authifier::Migration::M2022_06_09AddIndexForDeletion)
            .await
-            .expect("list of index names")
-            .contains(&"account_deletion".to_owned())
-        {
-            db.db()
-                .run_command(doc! {
-                    "createIndexes": "accounts",
-                    "indexes": [
-                        {
-                            "key": {
-                                "deletion.token": 1
-                            },
-                            "name": "account_deletion"
-                        }
-                    ]
-                })
-                .await
-                .unwrap();
-        }
+            .unwrap();

        db.db()
            .create_collection("emojis")
@@ -1211,7 +1085,7 @@ pub async fn run_migrations(db: &MongoDb, revision: i32) -> i32 {
        enum Channel {
            Group { owner: String },
            TextChannel { server: String },
-            VoiceChannel { server: String },
+            VoiceChannel { server: String }
        }

        let webhooks = db
@@ -1225,12 +1099,7 @@ pub async fn run_migrations(db: &MongoDb, revision: i32) -> i32 {
            .await;

        for webhook in webhooks {
-            match db
-                .col::<Channel>("channels")
-                .find_one(doc! { "_id": &webhook.channel_id })
-                .await
-                .unwrap()
-            {
+            match db.col::<Channel>("channels").find_one(doc! { "_id": &webhook.channel_id }).await.unwrap() {
                Some(channel) => {
                    let creator_id = match channel {
                        Channel::Group { owner, .. } => owner,
@@ -1272,51 +1141,10 @@ pub async fn run_migrations(db: &MongoDb, revision: i32) -> i32 {
            "Running migration [revision 32 / 12-05-2025]: (Authifier) Add last_seen to sessions."
        );

-        loop {
-            #[derive(Deserialize)]
-            struct SessionId {
-                _id: String,
-            }
-
-            let sessions: Vec<SessionId> = db
-                .db()
-                .collection("sessions")
-                .find(doc! {
-                    "$or": [
-                        { "last_seen": { "$exists": false } },
-                        { "last_seen": "1970-01-01T00:00:00.000Z" }
-                    ]
-                })
-                .limit(50_000) // about 400 batches for 2 million
-                .await
-                .expect("Failed to create cursor for sessions!")
-                .map(|doc| doc.expect("id and username"))
-                .collect()
-                .await;
-
-            if sessions.is_empty() {
-                break;
-            }
-
-            for session in sessions {
-                let timestamp = iso8601_timestamp::Timestamp::from(Ulid::from_string(&session._id).unwrap().datetime());
-
-                db.db()
-                    .collection::<Document>("sessions")
-                    .update_one(
-                        doc! {
-                            "_id": &session._id.to_string(),
-                        },
-                        doc! {
-                            "$set": {
-                                "last_seen": timestamp.format().to_string()
-                            }
-                        },
-                    )
-                    .await
-                    .expect("Failed to update a session.");
-            }
-        }
+        let db = authifier::Database::MongoDb(authifier::database::MongoDb(db.db()));
+        db.run_migration(authifier::Migration::M2025_02_20AddLastSeenToSession)
+            .await
+            .unwrap();
    }

    if revision <= 40 {
@@ -1412,7 +1240,7 @@ pub async fn run_migrations(db: &MongoDb, revision: i32) -> i32 {
                        "channel_type": "TextChannel",
                        "voice": {}
                    }
-                },
+                }
            )
            .await
            .expect("Failed to update voice channels");
@@ -1464,7 +1292,10 @@ pub async fn run_migrations(db: &MongoDb, revision: i32) -> i32 {
            let mut doc = doc! {};

            for id in server.roles.keys() {
-                doc.insert(format!("roles.{id}._id"), id);
+                doc.insert(
+                    format!("roles.{id}._id"),
+                    id,
+                );
            }

            db.db()
@@ -1475,27 +1306,6 @@ pub async fn run_migrations(db: &MongoDb, revision: i32) -> i32 {
        }
    };

-    if revision <= 50 {
-        info!("Running migration [revision 50 / 13-04-2026]: Rename invites collection to account_invites");
-
-        let result = db.db()
-            .client()
-            .database("admin")
-            .run_command(doc! {
-            "renameCollection": "revolt.invites",
-            "to": "revolt.account_invites",
-            "dropTarget": true
-        })
-            .await;
-
-        if let Err(e) = result {
-            // NamespaceNotFound (26) = source collection doesn't exist, safe to ignore
-            if !matches!(e.kind.as_ref(), mongodb::error::ErrorKind::Command(ce) if ce.code == 26) {
-                panic!("Failed to rename invites collection: {e}");
-            }
-        }
-    }
-
    // Reminder to update LATEST_REVISION when adding new migrations.
    LATEST_REVISION.max(revision)
 }
--- a/crates/core/database/src/models/channels/model.rs
+++ b/crates/core/database/src/models/channels/model.rs
@@ -1,7 +1,6 @@
 #![allow(deprecated)]
 use std::{borrow::Cow, collections::HashMap};

-use redis_kiss::get_connection;
 use revolt_config::config;
 use revolt_models::v0::{self, MessageAuthor};
 use revolt_permissions::OverrideField;
@@ -213,7 +212,7 @@ impl Channel {
                role_permissions: HashMap::new(),
                nsfw: data.nsfw.unwrap_or(false),
                voice: data.voice.map(|voice| voice.into()),
-                slowmode: None,
+                slowmode: None
            },
            v0::LegacyServerChannelType::Voice => Channel::TextChannel {
                id: id.clone(),
@@ -226,7 +225,7 @@ impl Channel {
                role_permissions: HashMap::new(),
                nsfw: data.nsfw.unwrap_or(false),
                voice: Some(data.voice.unwrap_or_default().into()),
-                slowmode: None,
+                slowmode: None
            },
        };

@@ -408,10 +407,7 @@ impl Channel {
    /// Check whether has a user as a recipient
    pub fn contains_user(&self, user_id: &str) -> bool {
        match self {
-            Channel::Group { recipients, .. } | Channel::DirectMessage { recipients, .. } => {
-                recipients.iter().any(|recipient| recipient == user_id)
-            }
-            Channel::SavedMessages { user, .. } => user == user_id,
+            Channel::Group { recipients, .. } => recipients.contains(&String::from(user_id)),
            _ => false,
        }
    }
@@ -419,9 +415,7 @@ impl Channel {
    /// Get list of recipients
    pub fn users(&self) -> Result<Vec<String>> {
        match self {
-            Channel::Group { recipients, .. } | Channel::DirectMessage { recipients, .. } => {
-                Ok(recipients.to_owned())
-            }
+            Channel::Group { recipients, .. } => Ok(recipients.to_owned()),
            _ => Err(create_error!(NotFound)),
        }
    }
@@ -649,7 +643,7 @@ impl Channel {
    }

    /// Acknowledge a message
-    pub async fn ack(&self, user: &str, message: &str, amqp: &AMQP) -> Result<()> {
+    pub async fn ack(&self, user: &str, message: &str) -> Result<()> {
        EventV1::ChannelAck {
            id: self.id().to_string(),
            user: user.to_string(),
@@ -658,7 +652,17 @@ impl Channel {
        .private(user.to_string())
        .await;

-        crate::util::acker::ack_channel(user, self.id(), message, amqp).await
+        #[cfg(feature = "tasks")]
+        crate::tasks::ack::queue_ack(
+            self.id().to_string(),
+            user.to_string(),
+            crate::tasks::ack::AckEvent::AckMessage {
+                id: message.to_string(),
+            },
+        )
+        .await;
+
+        Ok(())
    }

    /// Remove user from a group
--- a/crates/core/database/src/models/channels/ops.rs
+++ b/crates/core/database/src/models/channels/ops.rs
@@ -1,4 +1,4 @@
-use crate::{Channel, FieldsChannel, PartialChannel, revolt_result::Result, util::ChunkedDatabaseGenerator};
+use crate::{revolt_result::Result, Channel, FieldsChannel, PartialChannel};
 use revolt_permissions::OverrideField;

 #[cfg(feature = "mongodb")]
@@ -19,9 +19,6 @@ pub trait AbstractChannels: Sync + Send {
    /// Fetch all direct messages for a user
    async fn find_direct_messages(&self, user_id: &str) -> Result<Vec<Channel>>;

-    // Fetch all group dms for a user
-    async fn find_group_message_channels(&self, user_id: &str) -> Result<ChunkedDatabaseGenerator<Channel>>;
-
    // Fetch saved messages channel
    async fn find_saved_messages_channel(&self, user_id: &str) -> Result<Channel>;

@@ -50,9 +47,6 @@ pub trait AbstractChannels: Sync + Send {
    // Remove a user from a group
    async fn remove_user_from_group(&self, channel_id: &str, user_id: &str) -> Result<()>;

-    // Remove a user from all specified groups
-    async fn remove_user_from_groups(&self, channel_ids: Vec<String>, user_id: &str) -> Result<()>;
-
    // Delete a channel
    async fn delete_channel(&self, channel_id: &Channel) -> Result<()>;
 }
--- a/crates/core/database/src/models/channels/ops/mongodb.rs
+++ b/crates/core/database/src/models/channels/ops/mongodb.rs
@@ -1,8 +1,7 @@
 use super::AbstractChannels;
-use crate::{AbstractServers, Channel, FieldsChannel, IntoDocumentPath, MongoDb, PartialChannel, util::ChunkedDatabaseGenerator};
+use crate::{AbstractServers, Channel, FieldsChannel, IntoDocumentPath, MongoDb, PartialChannel};
 use bson::{Bson, Document};
 use futures::StreamExt;
-use mongodb::options::ReadConcern;
 use revolt_permissions::OverrideField;
 use revolt_result::Result;

@@ -70,32 +69,6 @@ impl AbstractChannels for MongoDb {
        )
    }

-    // Fetch all group dms for a user
-    async fn find_group_message_channels(&self, user_id: &str) -> Result<ChunkedDatabaseGenerator<Channel>> {
-        let mut session = self
-            .start_session()
-            .await
-            .map_err(|_| create_database_error!("start_session", COL))?;
-
-        session
-            .start_transaction()
-            .read_concern(ReadConcern::snapshot())
-            .await
-            .map_err(|_| create_database_error!("start_transaction", COL))?;
-
-        let cursor = self.col(COL)
-            .find(doc! {
-                "channel_type": "Group",
-                "recipients": user_id
-            })
-            .session(&mut session)
-            .batch_size(100)
-            .await
-            .map_err(|_| create_database_error!("find", COL))?;
-
-        Ok(ChunkedDatabaseGenerator::new_mongo(session, cursor))
-    }
-
    // Fetch saved messages channel
    async fn find_saved_messages_channel(&self, user_id: &str) -> Result<Channel> {
        query!(
@@ -207,29 +180,13 @@ impl AbstractChannels for MongoDb {
            .map_err(|_| create_database_error!("update_one", "channels"))
    }

-    // Remove a user from all specified groups
-    async fn remove_user_from_groups(&self, channel_ids: Vec<String>, user_id: &str) -> Result<()> {
-        self.col::<Document>(COL)
-            .update_many(
-                doc! {
-                    "_id": { "$in": channel_ids },
-                },
-                doc! {
-                    "$pull": {
-                        "recipients": user_id
-                    }
-                },
-            )
-            .await
-            .map(|_| ())
-            .map_err(|_| create_database_error!("update_many", COL))
-    }
-
    // Delete a channel
    async fn delete_channel(&self, channel: &Channel) -> Result<()> {
        let id = channel.id().to_string();
        let server_id = match channel {
-            Channel::TextChannel { server, .. } => Some(server),
+            Channel::TextChannel { server, .. } => {
+                Some(server)
+            }
            _ => None,
        };

--- a/crates/core/database/src/models/channels/ops/reference.rs
+++ b/crates/core/database/src/models/channels/ops/reference.rs
@@ -2,7 +2,6 @@ use std::collections::hash_map::Entry;

 use super::AbstractChannels;
 use crate::ReferenceDb;
-use crate::util::ChunkedDatabaseGenerator;
 use crate::{Channel, FieldsChannel, PartialChannel};
 use revolt_permissions::OverrideField;
 use revolt_result::Result;
@@ -52,23 +51,6 @@ impl AbstractChannels for ReferenceDb {
            .collect())
    }

-    // Fetch all group dms for a user
-    async fn find_group_message_channels(&self, user_id: &str) -> Result<ChunkedDatabaseGenerator<Channel>> {
-        let channels = self.channels.lock().await;
-        let groups = channels
-            .values()
-            .filter(|channel| match channel {
-                Channel::Group { recipients, .. } => {
-                    recipients.iter().any(|recipient| recipient == user_id)
-                }
-                _ => false,
-            })
-            .cloned()
-            .collect();
-
-        Ok(ChunkedDatabaseGenerator::new_reference(groups))
-    }
-
    // Fetch saved messages channel
    async fn find_saved_messages_channel(&self, user_id: &str) -> Result<Channel> {
        let channels = self.channels.lock().await;
@@ -149,9 +131,9 @@ impl AbstractChannels for ReferenceDb {
    // Remove a user from a group
    async fn remove_user_from_group(&self, channel: &str, user: &str) -> Result<()> {
        let mut channels = self.channels.lock().await;
-        if let Some(Channel::Group { recipients, .. }) = channels.get_mut(channel) {
-            if let Some(index) = recipients.iter().position(|recipient| recipient == user) {
-                recipients.remove(index);
+        if let Some(channel_data) = channels.get_mut(channel) {
+            if channel_data.users()?.contains(&String::from(user)) {
+                channel_data.users()?.retain(|x| x != user);
                return Ok(());
            } else {
                return Err(create_error!(NotFound));
@@ -160,19 +142,6 @@ impl AbstractChannels for ReferenceDb {
        Err(create_error!(NotFound))
    }

-    // Remove a user from all specified groups
-    async fn remove_user_from_groups(&self, channel_ids: Vec<String>, user_id: &str) -> Result<()> {
-        let mut channels = self.channels.lock().await;
-
-        for channel_id in channel_ids {
-            if let Some(Channel::Group { recipients, .. }) = channels.get_mut(&channel_id) {
-                recipients.retain(|recipient| recipient != user_id);
-            }
-        };
-
-        Ok(())
-    }
-
    // Delete a channel
    async fn delete_channel(&self, channel: &Channel) -> Result<()> {
        let mut channels = self.channels.lock().await;
--- a/crates/core/database/src/models/emojis/model.rs
+++ b/crates/core/database/src/models/emojis/model.rs
@@ -2,7 +2,6 @@ use std::collections::HashSet;
 use std::str::FromStr;

 use once_cell::sync::Lazy;
-use revolt_models::v0;
 use revolt_result::Result;
 use ulid::Ulid;

@@ -12,7 +11,7 @@ use crate::Database;
 static PERMISSIBLE_EMOJIS: Lazy<HashSet<String>> = Lazy::new(|| {
    include_str!("unicode_emoji.txt")
        .split('\n')
-        .map(|x| x.replace('\u{FE0F}', ""))
+        .map(|x| x.into())
        .collect()
 });

@@ -42,12 +41,6 @@ auto_derived!(
        Server { id: String },
        Detached,
    }
-
-    /// Partial representation of an emoji
-    pub struct PartialEmoji {
-        #[serde(skip_serializing_if = "Option::is_none")]
-        pub name: Option<String>,
-    }
 );

 #[allow(clippy::disallowed_methods)]
@@ -82,34 +75,13 @@ impl Emoji {
        db.detach_emoji(&self).await
    }

-    /// Update an emoji
-    pub async fn update(&mut self, db: &Database, partial: PartialEmoji) -> Result<()> {
-        if let Some(name) = partial.name.clone() {
-            self.name = name;
-        }
-
-        db.update_emoji(&self.id, &partial).await?;
-
-        EventV1::EmojiUpdate {
-            id: self.id.clone(),
-            data: v0::PartialEmoji {
-                name: partial.name.clone(),
-            },
-        }
-        .p(self.parent().to_string())
-        .await;
-
-        Ok(())
-    }
-
    /// Check whether we can use a given emoji
    pub async fn can_use(db: &Database, emoji: &str) -> Result<bool> {
        if Ulid::from_str(emoji).is_ok() {
            db.fetch_emoji(emoji).await?;
            Ok(true)
        } else {
-            let sanitized_emoji = emoji.replace('\u{FE0F}', "");
-            Ok(PERMISSIBLE_EMOJIS.contains(&sanitized_emoji))
+            Ok(PERMISSIBLE_EMOJIS.contains(emoji))
        }
    }
 }
--- a/crates/core/database/src/models/emojis/ops.rs
+++ b/crates/core/database/src/models/emojis/ops.rs
@@ -1,6 +1,6 @@
 use revolt_result::Result;

-use crate::{Emoji, PartialEmoji};
+use crate::Emoji;

 #[cfg(feature = "mongodb")]
 mod mongodb;
@@ -20,9 +20,6 @@ pub trait AbstractEmojis: Sync + Send {
    /// Fetch emoji by their parent ids
    async fn fetch_emoji_by_parent_ids(&self, parent_ids: &[String]) -> Result<Vec<Emoji>>;

-    /// Update emoji with new information
-    async fn update_emoji(&self, emoji_id: &str, partial: &PartialEmoji) -> Result<()>;
-
    /// Detach an emoji by its id
    async fn detach_emoji(&self, emoji: &Emoji) -> Result<()>;
 }
--- a/crates/core/database/src/models/emojis/ops/mongodb.rs
+++ b/crates/core/database/src/models/emojis/ops/mongodb.rs
@@ -1,7 +1,7 @@
 use bson::Document;
 use revolt_result::Result;

-use crate::{Emoji, PartialEmoji};
+use crate::Emoji;
 use crate::MongoDb;

 use super::AbstractEmojis;
@@ -46,11 +46,6 @@ impl AbstractEmojis for MongoDb {
        )
    }

-    /// Update emoji with new information
-    async fn update_emoji(&self, emoji_id: &str, partial: &PartialEmoji) -> Result<()> {
-        query!(self, update_one_by_id, COL, emoji_id, partial, vec![], None).map(|_| ())
-    }
-
    /// Detach an emoji by its id
    async fn detach_emoji(&self, emoji: &Emoji) -> Result<()> {
        self.col::<Document>(COL)
--- a/crates/core/database/src/models/emojis/ops/reference.rs
+++ b/crates/core/database/src/models/emojis/ops/reference.rs
@@ -1,6 +1,6 @@
 use revolt_result::Result;

-use crate::{Emoji, PartialEmoji};
+use crate::Emoji;
 use crate::EmojiParent;
 use crate::ReferenceDb;

@@ -54,19 +54,6 @@ impl AbstractEmojis for ReferenceDb {
            .collect())
    }

-    /// Update emoji with new information
-    async fn update_emoji(&self, emoji_id: &str, partial: &PartialEmoji) -> Result<()> {
-        let mut emojis = self.emojis.lock().await;
-        if let Some(emoji) = emojis.get_mut(emoji_id) {
-            if let Some(name) = partial.name.clone() {
-                emoji.name = name;
-            }
-            Ok(())
-        } else {
-            Err(create_error!(NotFound))
-        }
-    }
-
    /// Detach an emoji by its id
    async fn detach_emoji(&self, emoji: &Emoji) -> Result<()> {
        let mut emojis = self.emojis.lock().await;
--- a/crates/core/database/src/models/emojis/unicode_emoji.txt
+++ b/crates/core/database/src/models/emojis/unicode_emoji.txt
--- a/crates/core/database/src/models/file_hashes/model.rs
+++ b/crates/core/database/src/models/file_hashes/model.rs
@@ -46,7 +46,8 @@ auto_derived!(
            width: isize,
            height: isize,
            thumbhash: Option<Vec<u8>>,
-            animated: Option<bool>,
+            #[serde(default)]
+            animated: bool,
        },
        /// File is a video with specific dimensions
        Video { width: isize, height: isize },
--- a/crates/core/database/src/models/file_hashes/ops.rs
+++ b/crates/core/database/src/models/file_hashes/ops.rs
@@ -17,12 +17,6 @@ pub trait AbstractAttachmentHashes: Sync + Send {
    /// Update an attachment hash nonce value.
    async fn set_attachment_hash_nonce(&self, hash: &str, nonce: &str) -> Result<()>;

-    /// Updates the attachments animated metadata value.
-    ///
-    /// The primary use for this is to update the metadata for existing uploaded files, this
-    /// can only be used for images.
-    async fn set_attachment_hash_animated(&self, hash: &str, animated: bool) -> Result<()>;
-
    /// Delete attachment hash by id.
    async fn delete_attachment_hash(&self, id: &str) -> Result<()>;
 }
--- a/crates/core/database/src/models/file_hashes/ops/mongodb.rs
+++ b/crates/core/database/src/models/file_hashes/ops/mongodb.rs
@@ -48,29 +48,6 @@ impl AbstractAttachmentHashes for MongoDb {
            .map_err(|_| create_database_error!("update_one", COL))
    }

-    /// Updates the attachments animated metadata value.
-    ///
-    /// The primary use for this is to update the metadata for existing uploaded files, this
-    /// can only be used for images.
-    async fn set_attachment_hash_animated(&self, hash: &str, animated: bool) -> Result<()> {
-        self.col::<FileHash>(COL)
-            .update_one(
-                doc! {
-                    "_id": hash,
-                    "metadata.type": "Image",
-                    "metadata.animated": { "$exists": false },
-                },
-                doc! {
-                    "$set": {
-                        "metadata.animated": animated
-                    }
-                },
-            )
-            .await
-            .map(|_| ())
-            .map_err(|_| create_database_error!("update_one", COL))
-    }
-
    /// Delete attachment hash by id.
    async fn delete_attachment_hash(&self, id: &str) -> Result<()> {
        query!(self, delete_one_by_id, COL, id).map(|_| ())
--- a/crates/core/database/src/models/file_hashes/ops/reference.rs
+++ b/crates/core/database/src/models/file_hashes/ops/reference.rs
@@ -1,6 +1,7 @@
 use revolt_result::Result;

-use crate::{FileHash, Metadata, ReferenceDb};
+use crate::FileHash;
+use crate::ReferenceDb;

 use super::AbstractAttachmentHashes;

@@ -38,29 +39,6 @@ impl AbstractAttachmentHashes for ReferenceDb {
        }
    }

-    /// Updates the attachments animated metadata value.
-    ///
-    /// The primary use for this is to update the metadata for existing uploaded files, this
-    /// can only be used for images.
-    async fn set_attachment_hash_animated(&self, hash: &str, animated: bool) -> Result<()> {
-        let mut hashes = self.file_hashes.lock().await;
-        if let Some(FileHash {
-            metadata:
-                Metadata::Image {
-                    animated: Some(animated_metadata),
-                    ..
-                },
-            ..
-        }) = hashes.get_mut(hash)
-        {
-            *animated_metadata = animated;
-
-            Ok(())
-        } else {
-            Err(create_error!(NotFound))
-        }
-    }
-
    /// Delete attachment hash by id.
    async fn delete_attachment_hash(&self, id: &str) -> Result<()> {
        let mut file_hashes = self.file_hashes.lock().await;
--- a/crates/core/database/src/models/files/model.rs
+++ b/crates/core/database/src/models/files/model.rs
@@ -70,7 +70,6 @@ auto_derived!(
        LegacyGroupIcon,
        ChannelIcon,
        ServerIcon,
-        RoleIcon,
    }

    /// Information about what the file was used for
@@ -240,23 +239,4 @@ impl File {
        )
        .await
    }
-
-    /// Use a file for a role icon
-    pub async fn use_role_icon(
-        db: &Database,
-        id: &str,
-        parent: &str,
-        uploader_id: &str,
-    ) -> Result<File> {
-        db.find_and_use_attachment(
-            id,
-            "icons",
-            FileUsedFor {
-                id: parent.to_owned(),
-                object_type: FileUsedForType::RoleIcon,
-            },
-            uploader_id.to_owned(),
-        )
-        .await
-    }
 }
--- a/crates/core/database/src/models/messages/ops.rs
+++ b/crates/core/database/src/models/messages/ops.rs
@@ -50,6 +50,4 @@ pub trait AbstractMessages: Sync + Send {
        author: &str,
        since: SystemTime
    ) -> Result<HashMap<String, Vec<String>>>;
-
-    async fn delete_messages_by_user(&self, user_id: &str) -> Result<()>;
 }
--- a/crates/core/database/src/models/messages/ops/mongodb.rs
+++ b/crates/core/database/src/models/messages/ops/mongodb.rs
@@ -416,12 +416,6 @@ impl AbstractMessages for MongoDb {

        Ok(deleted_messages)
    }
-
-    async fn delete_messages_by_user(&self, user_id: &str) -> Result<()> {
-        self.delete_bulk_messages(doc! {
-            "author": user_id,
-        }).await
-    }
 }

 impl IntoDocumentPath for FieldsMessage {
--- a/crates/core/database/src/models/messages/ops/reference.rs
+++ b/crates/core/database/src/models/messages/ops/reference.rs
@@ -1,13 +1,10 @@
-use crate::{
-    AppendMessage, FieldsMessage, Message, MessageQuery,
-    PartialMessage, ReferenceDb,
-};
+use std::collections::HashMap;
 use futures::future::try_join_all;
 use indexmap::IndexSet;
 use revolt_result::Result;
-use std::collections::HashMap;
 use std::time::SystemTime;
 use ulid::Ulid;
+use crate::{AppendMessage, FieldsMessage, Message, MessageQuery, PartialMessage, ReferenceDb};

 use super::AbstractMessages;

@@ -63,7 +60,7 @@ impl AbstractMessages for ReferenceDb {

                if let Some(pinned) = query.filter.pinned {
                    if message.pinned.unwrap_or_default() == pinned {
-                        return false;
+                        return false
                    }
                }

@@ -194,12 +191,7 @@ impl AbstractMessages for ReferenceDb {
    }

    /// Update a given message with new information
-    async fn update_message(
-        &self,
-        id: &str,
-        message: &PartialMessage,
-        remove: Vec<FieldsMessage>,
-    ) -> Result<()> {
+    async fn update_message(&self, id: &str, message: &PartialMessage, remove: Vec<FieldsMessage>) -> Result<()> {
        let mut messages = self.messages.lock().await;
        if let Some(message_data) = messages.get_mut(id) {
            message_data.apply_options(message.to_owned());
@@ -257,7 +249,7 @@ impl AbstractMessages for ReferenceDb {
        let mut messages = self.messages.lock().await;
        if let Some(message) = messages.get_mut(id) {
            if let Some(users) = message.reactions.get_mut(emoji) {
-                users.swap_remove(&user.to_string());
+                users.remove(&user.to_string());
            }

            Ok(())
@@ -270,7 +262,7 @@ impl AbstractMessages for ReferenceDb {
    async fn clear_reaction(&self, id: &str, emoji: &str) -> Result<()> {
        let mut messages = self.messages.lock().await;
        if let Some(message) = messages.get_mut(id) {
-            message.reactions.swap_remove(emoji);
+            message.reactions.remove(emoji);
            Ok(())
        } else {
            Err(create_error!(NotFound))
@@ -302,7 +294,7 @@ impl AbstractMessages for ReferenceDb {
        &self,
        channels: &[String],
        author: &str,
-        since: SystemTime,
+        since: SystemTime
    ) -> Result<HashMap<String, Vec<String>>> {
        let threshold_ulid = Ulid::from_datetime(since).to_string();
        let mut deleted_messages: HashMap<String, Vec<String>> = HashMap::new();
@@ -343,23 +335,16 @@ impl AbstractMessages for ReferenceDb {
        }

        // Delete the messages
-        self.messages.lock().await.retain(|id, message| {
-            let should_keep = !(message.author == author
-                && channels.contains(&message.channel)
-                && id.as_str() >= threshold_ulid.as_str());
-            should_keep
-        });
+        self.messages
+            .lock()
+            .await
+            .retain(|id, message| {
+                let should_keep = !(message.author == author
+                    && channels.contains(&message.channel)
+                    && id.as_str() >= threshold_ulid.as_str());
+                should_keep
+            });

        Ok(deleted_messages)
    }
-
-    async fn delete_messages_by_user(&self, user_id: &str) -> Result<()> {
-        let mut messages = self.messages.lock().await;
-
-        messages.retain(|_, message| message.author != user_id);
-
-        // TODO: remove attachments as well
-
-        Ok(())
-    }
 }
--- a/crates/core/database/src/models/mfa_tickets/axum.rs
+++ b/crates/core/database/src/models/mfa_tickets/axum.rs
@@ -1,67 +0,0 @@
-use axum::{
-    extract::{FromRef, FromRequestParts},
-    http::request::Parts,
-};
-
-use revolt_result::{Error, Result};
-
-use crate::{Database, MFATicket, UnvalidatedTicket, ValidatedTicket};
-
-#[async_trait]
-impl<S> FromRequestParts<S> for MFATicket
-where
-    Database: FromRef<S>,
-    S: Send + Sync,
-{
-    type Rejection = Error;
-
-    async fn from_request_parts(parts: &mut Parts, state: &S) -> Result<Self> {
-        let db = Database::from_ref(state);
-
-        if let Some(Ok(token)) = parts.headers.get("x-mfa-ticket").map(|v| v.to_str()) {
-            db.fetch_ticket_by_token(token).await
-        } else {
-            Err(create_error!(MissingHeaders))
-        }
-    }
-}
-
-#[async_trait]
-impl<S> FromRequestParts<S> for ValidatedTicket
-where
-    Database: FromRef<S>,
-    S: Send + Sync,
-{
-    type Rejection = Error;
-
-    async fn from_request_parts(parts: &mut Parts, state: &S) -> Result<Self> {
-        let db = Database::from_ref(state);
-
-        let ticket = MFATicket::from_request_parts(parts, state).await?;
-
-        if ticket.validated && ticket.claim(&db).await.is_ok() {
-            Ok(ValidatedTicket(ticket))
-        } else {
-            Err(create_error!(InvalidToken))
-        }
-    }
-}
-
-#[async_trait]
-impl<S> FromRequestParts<S> for UnvalidatedTicket
-where
-    Database: FromRef<S>,
-    S: Send + Sync,
-{
-    type Rejection = Error;
-
-    async fn from_request_parts(parts: &mut Parts, state: &S) -> Result<Self> {
-        let ticket = MFATicket::from_request_parts(parts, state).await?;
-
-        if !ticket.validated {
-            Ok(UnvalidatedTicket(ticket))
-        } else {
-            Err(create_error!(InvalidToken))
-        }
-    }
-}
--- a/crates/core/database/src/models/mfa_tickets/mod.rs
+++ b/crates/core/database/src/models/mfa_tickets/mod.rs
@@ -1,11 +0,0 @@
-#[cfg(feature = "axum-impl")]
-mod axum;
-mod model;
-mod ops;
-#[cfg(feature = "rocket-impl")]
-mod rocket;
-#[cfg(feature = "rocket-impl")]
-mod schema;
-
-pub use model::*;
-pub use ops::*;
--- a/crates/core/database/src/models/mfa_tickets/model.rs
+++ b/crates/core/database/src/models/mfa_tickets/model.rs
@@ -1,105 +0,0 @@
-use iso8601_timestamp::{Duration, Timestamp};
-use std::ops::Deref;
-
-use nanoid::nanoid;
-use revolt_result::Result;
-
-use crate::{Database, MultiFactorAuthentication};
-
-auto_derived_partial!(
-    /// Multi-factor auth ticket
-    pub struct MFATicket {
-        /// Unique Id
-        #[serde(rename = "_id")]
-        pub id: String,
-
-        /// Account Id
-        pub account_id: String,
-
-        /// Unique Token
-        pub token: String,
-
-        /// Whether this ticket has been validated
-        /// (can be used for account actions)
-        pub validated: bool,
-
-        /// Whether this ticket is authorised
-        /// (can be used to log a user in)
-        pub authorised: bool,
-
-        /// TOTP code at time of ticket creation
-        pub last_totp_code: Option<String>,
-    },
-    "PartialMFATicket"
-);
-
-/// Ticket which is guaranteed to be valid for use
-///
-/// If used in a Rocket guard, it will be consumed on match
-#[derive(Debug, Serialize, Deserialize)]
-pub struct ValidatedTicket(pub MFATicket);
-
-/// Ticket which is guaranteed to not be valid for use
-#[derive(Debug, Serialize, Deserialize)]
-pub struct UnvalidatedTicket(pub MFATicket);
-
-impl MFATicket {
-    /// Create a new MFA ticket
-    pub fn new(account_id: String, validated: bool) -> MFATicket {
-        MFATicket {
-            id: ulid::Ulid::new().to_string(),
-            account_id,
-            token: nanoid!(64),
-            validated,
-            authorised: false,
-            last_totp_code: None,
-        }
-    }
-
-    /// Populate an MFA ticket with valid MFA codes
-    pub async fn populate(&mut self, mfa: &MultiFactorAuthentication) {
-        self.last_totp_code = mfa.totp_token.generate_code().ok();
-    }
-
-    /// Save model
-    pub async fn save(&self, db: &Database) -> Result<()> {
-        db.save_ticket(self).await
-    }
-
-    /// Check if this MFA ticket has expired
-    pub fn is_expired(&self) -> bool {
-        let now = Timestamp::now_utc();
-
-        let datetime: Timestamp = ulid::Ulid::from_string(&self.id)
-            .expect("Valid `ulid`")
-            .datetime()
-            .into();
-
-        now > (datetime.checked_add(Duration::minutes(5)).unwrap())
-    }
-
-    /// Claim and remove this MFA ticket
-    pub async fn claim(&self, db: &Database) -> Result<()> {
-        if self.is_expired() {
-            return Err(create_error!(InvalidToken));
-        }
-
-        db.delete_ticket(&self.id).await
-    }
-}
-
-impl Deref for ValidatedTicket {
-    type Target = MFATicket;
-
-    fn deref(&self) -> &Self::Target {
-        &self.0
-    }
-}
-
-impl Deref for UnvalidatedTicket {
-    type Target = MFATicket;
-
-    fn deref(&self) -> &Self::Target {
-        &self.0
-    }
-}
--- a/crates/core/database/src/models/mfa_tickets/ops.rs
+++ b/crates/core/database/src/models/mfa_tickets/ops.rs
@@ -1,22 +0,0 @@
-use revolt_result::Result;
-
-use crate::MFATicket;
-
-#[cfg(feature = "mongodb")]
-mod mongodb;
-mod reference;
-
-#[async_trait]
-pub trait AbstractMFATickets: Sync + Send {
-    /// Find ticket by token
-    async fn fetch_ticket_by_token(&self, token: &str) -> Result<MFATicket>;
-
-    /// Save ticket
-    async fn save_ticket(&self, ticket: &MFATicket) -> Result<()>;
-
-    /// Delete ticket
-    async fn delete_ticket(&self, id: &str) -> Result<()>;
-
-    /// Delete all expired tickets
-    async fn delete_expired_tickets(&self) -> Result<usize>;
-}
--- a/crates/core/database/src/models/mfa_tickets/ops/mongodb.rs
+++ b/crates/core/database/src/models/mfa_tickets/ops/mongodb.rs
@@ -1,67 +0,0 @@
-use std::time::{Duration, SystemTime};
-
-use crate::{AbstractMFATickets, MFATicket, MongoDb};
-use bson::{to_document, Document};
-use iso8601_timestamp::Timestamp;
-use mongodb::options::UpdateOptions;
-use revolt_result::Result;
-use ulid::Ulid;
-
-const COL: &str = "mfa_tickets";
-
-#[async_trait]
-impl AbstractMFATickets for MongoDb {
-    /// Find ticket by token
-    ///
-    /// Ticket is only valid for 5 minute
-    async fn fetch_ticket_by_token(&self, token: &str) -> Result<MFATicket> {
-        let ticket: MFATicket = query!(self, find_one, COL, doc! { "token": token })?
-            .ok_or_else(|| create_error!(InvalidToken))?;
-
-        if let Ok(ulid) = Ulid::from_string(&ticket.id) {
-            if Timestamp::from(ulid.datetime() + Duration::from_mins(5)) > Timestamp::now_utc() {
-                Ok(ticket)
-            } else {
-                Err(create_error!(InvalidToken))
-            }
-        } else {
-            Err(create_error!(InvalidToken))
-        }
-    }
-
-    /// Save ticket
-    async fn save_ticket(&self, ticket: &MFATicket) -> Result<()> {
-        self.col::<MFATicket>(COL)
-            .update_one(
-                doc! {
-                    "_id": &ticket.id
-                },
-                doc! {
-                    "$set": to_document(ticket).map_err(|_| create_database_error!("to_document", COL))?,
-                },
-            )
-            .with_options(UpdateOptions::builder().upsert(true).build())
-            .await
-            .map_err(|_| create_database_error!("upsert_one", COL))
-            .map(|_| ())
-    }
-
-    /// Delete ticket
-    async fn delete_ticket(&self, id: &str) -> Result<()> {
-        query!(self, delete_one_by_id, COL, id).map(|_| ())
-    }
-
-    /// Delete all expired tickets
-    async fn delete_expired_tickets(&self) -> Result<usize> {
-        let threshhold =
-            Ulid::from_datetime(SystemTime::now() - Duration::from_mins(5)).to_string();
-
-        self.col::<Document>(COL)
-            .delete_many(doc! {
-                "_id": { "$lt": threshhold }
-            })
-            .await
-            .map_err(|_| create_database_error!("delete_many", COL))
-            .map(|result| result.deleted_count as usize)
-    }
-}
--- a/crates/core/database/src/models/mfa_tickets/ops/reference.rs
+++ b/crates/core/database/src/models/mfa_tickets/ops/reference.rs
@@ -1,57 +0,0 @@
-use std::time::{Duration, SystemTime};
-
-use crate::{AbstractMFATickets, MFATicket, ReferenceDb};
-use iso8601_timestamp::Timestamp;
-use revolt_result::Result;
-use ulid::Ulid;
-
-#[async_trait]
-impl AbstractMFATickets for ReferenceDb {
-    /// Find ticket by token
-    async fn fetch_ticket_by_token(&self, token: &str) -> Result<MFATicket> {
-        let tickets = self.tickets.lock().await;
-        let ticket = tickets
-            .values()
-            .find(|ticket| ticket.token == token)
-            .ok_or_else(|| create_error!(InvalidToken))?;
-
-        if let Ok(ulid) = Ulid::from_string(&ticket.id) {
-            if Timestamp::from(ulid.datetime() + Duration::from_mins(5)) > Timestamp::now_utc() {
-                Ok(ticket.clone())
-            } else {
-                Err(create_error!(InvalidToken))
-            }
-        } else {
-            Err(create_error!(InvalidToken))
-        }
-    }
-
-    /// Save ticket
-    async fn save_ticket(&self, ticket: &MFATicket) -> Result<()> {
-        let mut tickets = self.tickets.lock().await;
-        tickets.insert(ticket.id.to_string(), ticket.clone());
-        Ok(())
-    }
-
-    /// Delete ticket
-    async fn delete_ticket(&self, id: &str) -> Result<()> {
-        let mut tickets = self.tickets.lock().await;
-        if tickets.remove(id).is_some() {
-            Ok(())
-        } else {
-            Err(create_error!(InvalidToken))
-        }
-    }
-
-    /// Delete all expired tickets
-    async fn delete_expired_tickets(&self) -> Result<usize> {
-        let threshhold =
-            Ulid::from_datetime(SystemTime::now() - Duration::from_mins(5)).to_string();
-        let mut tickets = self.tickets.lock().await;
-
-        let before = tickets.len();
-        tickets.retain(|_, ticket| ticket.id >= threshhold);
-
-        Ok(before - tickets.len())
-    }
-}
--- a/crates/core/database/src/models/mfa_tickets/rocket.rs
+++ b/crates/core/database/src/models/mfa_tickets/rocket.rs
@@ -1,81 +0,0 @@
-use crate::{Database, MFATicket, UnvalidatedTicket, ValidatedTicket};
-use revolt_result::Error;
-use rocket::{
-    http::Status,
-    outcome::Outcome,
-    request::{self, FromRequest},
-    Request,
-};
-
-#[rocket::async_trait]
-impl<'r> FromRequest<'r> for MFATicket {
-    type Error = Error;
-
-    #[allow(clippy::collapsible_match)]
-    async fn from_request(request: &'r Request<'_>) -> request::Outcome<Self, Self::Error> {
-        if let Some(header_mfa_ticket) = request.headers().get("x-mfa-ticket").next() {
-            if let Ok(ticket) = request
-                .rocket()
-                .state::<Database>()
-                .expect("`Database`")
-                .fetch_ticket_by_token(header_mfa_ticket)
-                .await
-            {
-                Outcome::Success(ticket)
-            } else {
-                Outcome::Error((Status::Unauthorized, create_error!(InvalidToken)))
-            }
-        } else {
-            Outcome::Error((Status::Unauthorized, create_error!(MissingHeaders)))
-        }
-    }
-}
-
-#[rocket::async_trait]
-impl<'r> FromRequest<'r> for ValidatedTicket {
-    type Error = Error;
-
-    #[allow(clippy::collapsible_match)]
-    async fn from_request(request: &'r Request<'_>) -> request::Outcome<Self, Self::Error> {
-        match request.guard::<MFATicket>().await {
-            Outcome::Success(ticket) => {
-                if ticket.validated {
-                    let db = request
-                        .rocket()
-                        .state::<Database>()
-                        .expect("`Database`");
-
-                    if ticket.claim(db).await.is_ok() {
-                        Outcome::Success(ValidatedTicket(ticket))
-                    } else {
-                        Outcome::Error((Status::Forbidden, create_error!(InvalidToken)))
-                    }
-                } else {
-                    Outcome::Error((Status::Forbidden, create_error!(InvalidToken)))
-                }
-            }
-            Outcome::Forward(f) => Outcome::Forward(f),
-            Outcome::Error(err) => Outcome::Error(err),
-        }
-    }
-}
-
-#[rocket::async_trait]
-impl<'r> FromRequest<'r> for UnvalidatedTicket {
-    type Error = Error;
-
-    #[allow(clippy::collapsible_match)]
-    async fn from_request(request: &'r Request<'_>) -> request::Outcome<Self, Self::Error> {
-        match request.guard::<MFATicket>().await {
-            Outcome::Success(ticket) => {
-                if !ticket.validated {
-                    Outcome::Success(UnvalidatedTicket(ticket))
-                } else {
-                    Outcome::Error((Status::Forbidden, create_error!(InvalidToken)))
-                }
-            }
-            Outcome::Forward(f) => Outcome::Forward(f),
-            Outcome::Error(err) => Outcome::Error(err),
-        }
-    }
-}
--- a/crates/core/database/src/models/mfa_tickets/schema.rs
+++ b/crates/core/database/src/models/mfa_tickets/schema.rs
@@ -1,80 +0,0 @@
-use revolt_okapi::openapi3::{SecurityScheme, SecuritySchemeData};
-use revolt_rocket_okapi::{
-    gen::OpenApiGenerator,
-    request::{OpenApiFromRequest, RequestHeaderInput},
-};
-
-use crate::{MFATicket, ValidatedTicket, UnvalidatedTicket};
-
-
-impl<'r> OpenApiFromRequest<'r> for MFATicket {
-    fn from_request_input(
-        _gen: &mut OpenApiGenerator,
-        _name: String,
-        _required: bool,
-    ) -> revolt_rocket_okapi::Result<RequestHeaderInput> {
-        let mut requirements = schemars::Map::new();
-        requirements.insert("MFA Ticket".to_owned(), vec![]);
-
-        Ok(RequestHeaderInput::Security(
-            "MFA Ticket".to_owned(),
-            SecurityScheme {
-                data: SecuritySchemeData::ApiKey {
-                    name: "x-mfa-ticket".to_owned(),
-                    location: "header".to_owned(),
-                },
-                description: Some("Used to authorise a request.".to_owned()),
-                extensions: schemars::Map::new(),
-            },
-            requirements,
-        ))
-    }
-}
-
-impl<'r> OpenApiFromRequest<'r> for ValidatedTicket {
-    fn from_request_input(
-        _gen: &mut OpenApiGenerator,
-        _name: String,
-        _required: bool,
-    ) -> revolt_rocket_okapi::Result<RequestHeaderInput> {
-        let mut requirements = schemars::Map::new();
-        requirements.insert("Valid MFA Ticket".to_owned(), vec![]);
-
-        Ok(RequestHeaderInput::Security(
-            "Valid MFA Ticket".to_owned(),
-            SecurityScheme {
-                data: SecuritySchemeData::ApiKey {
-                    name: "x-mfa-ticket".to_owned(),
-                    location: "header".to_owned(),
-                },
-                description: Some("Used to authorise a request.".to_owned()),
-                extensions: schemars::Map::new(),
-            },
-            requirements,
-        ))
-    }
-}
-
-impl<'r> OpenApiFromRequest<'r> for UnvalidatedTicket {
-    fn from_request_input(
-        _gen: &mut OpenApiGenerator,
-        _name: String,
-        _required: bool,
-    ) -> revolt_rocket_okapi::Result<RequestHeaderInput> {
-        let mut requirements = schemars::Map::new();
-        requirements.insert("Unvalidated MFA Ticket".to_owned(), vec![]);
-
-        Ok(RequestHeaderInput::Security(
-            "Unvalidated MFA Ticket".to_owned(),
-            SecurityScheme {
-                data: SecuritySchemeData::ApiKey {
-                    name: "x-mfa-ticket".to_owned(),
-                    location: "header".to_owned(),
-                },
-                description: Some("Used to authorise a request.".to_owned()),
-                extensions: schemars::Map::new(),
-            },
-            requirements,
-        ))
-    }
-}
--- a/crates/core/database/src/models/mod.rs
+++ b/crates/core/database/src/models/mod.rs
@@ -17,10 +17,6 @@ mod server_members;
 mod servers;
 mod user_settings;
 mod users;
-mod accounts;
-mod account_invites;
-mod sessions;
-mod mfa_tickets;

 pub use admin_migrations::*;
 pub use bots::*;
@@ -41,10 +37,6 @@ pub use server_members::*;
 pub use servers::*;
 pub use user_settings::*;
 pub use users::*;
-pub use accounts::*;
-pub use account_invites::*;
-pub use sessions::*;
-pub use mfa_tickets::*;

 use crate::{Database, ReferenceDb};

@@ -73,10 +65,6 @@ pub trait AbstractDatabase:
    + servers::AbstractServers
    + user_settings::AbstractUserSettings
    + users::AbstractUsers
-    + accounts::AbstractAccounts
-    + account_invites::AbstractAccountInvites
-    + sessions::AbstractSessions
-    + mfa_tickets::AbstractMFATickets
 {
 }

--- a/crates/core/database/src/models/server_members/model.rs
+++ b/crates/core/database/src/models/server_members/model.rs
@@ -28,9 +28,6 @@ auto_derived_partial!(
        /// Member's nickname
        #[serde(skip_serializing_if = "Option::is_none")]
        pub nickname: Option<String>,
-        /// Member's pronouns
-        #[serde(skip_serializing_if = "Option::is_none")]
-        pub pronouns: Option<String>,
        /// Avatar attachment
        #[serde(skip_serializing_if = "Option::is_none")]
        pub avatar: Option<File>,
@@ -68,7 +65,6 @@ auto_derived!(
    /// Optional fields on server member object
    pub enum FieldsMember {
        Nickname,
-        Pronouns,
        Avatar,
        Roles,
        Timeout,
@@ -92,7 +88,6 @@ impl Default for Member {
            id: Default::default(),
            joined_at: Timestamp::now_utc(),
            nickname: None,
-            pronouns: None,
            avatar: None,
            roles: vec![],
            timeout: None,
@@ -236,7 +231,6 @@ impl Member {
            FieldsMember::JoinedAt => {}
            FieldsMember::Avatar => self.avatar = None,
            FieldsMember::Nickname => self.nickname = None,
-            FieldsMember::Pronouns => self.pronouns = None,
            FieldsMember::Roles => self.roles.clear(),
            FieldsMember::Timeout => self.timeout = None,
            FieldsMember::CanReceive => self.can_receive = true,
--- a/crates/core/database/src/models/server_members/ops.rs
+++ b/crates/core/database/src/models/server_members/ops.rs
@@ -129,7 +129,4 @@ pub trait AbstractServerMembers: Sync + Send {

    /// Fetch all members who have been marked for deletion.
    async fn remove_dangling_members(&self) -> Result<()>;
-
-    /// Removes a user from every server they are in
-    async fn clear_memberships(&self, user_id: &str) -> Result<()>;
 }
--- a/crates/core/database/src/models/server_members/ops/mongodb.rs
+++ b/crates/core/database/src/models/server_members/ops/mongodb.rs
@@ -326,17 +326,6 @@ impl AbstractServerMembers for MongoDb {
            .map(|_| ())
            .map_err(|_| create_database_error!("count_documents", COL))
    }
-
-    /// Removes a user from every server they are in
-    ///
-    /// **This should only be used for account deletion.**
-    async fn clear_memberships(&self, user_id: &str) -> Result<()> {
-        self.col::<Member>(COL)
-            .delete_many(doc! { "_id.user": user_id })
-            .await
-            .map(|_| ())
-            .map_err(|_| create_database_error!("delete_many", COL))
-    }
 }

 impl IntoDocumentPath for FieldsMember {
@@ -345,7 +334,6 @@ impl IntoDocumentPath for FieldsMember {
            FieldsMember::JoinedAt => Some("joined_at"),
            FieldsMember::Avatar => Some("avatar"),
            FieldsMember::Nickname => Some("nickname"),
-            FieldsMember::Pronouns => Some("pronouns"),
            FieldsMember::Roles => Some("roles"),
            FieldsMember::Timeout => Some("timeout"),
            FieldsMember::CanPublish => Some("can_publish"),
--- a/crates/core/database/src/models/server_members/ops/reference.rs
+++ b/crates/core/database/src/models/server_members/ops/reference.rs
@@ -200,13 +200,4 @@ impl AbstractServerMembers for ReferenceDb {
    async fn remove_dangling_members(&self) -> Result<()> {
        todo!()
    }
-
-    /// Removes a user from every server they are in
-    async fn clear_memberships(&self, user_id: &str) -> Result<()> {
-        let mut server_members = self.server_members.lock().await;
-
-        server_members.retain(|_, v| v.id.user != user_id);
-
-        Ok(())
-    }
 }
--- a/crates/core/database/src/models/servers/model.rs
+++ b/crates/core/database/src/models/servers/model.rs
@@ -86,9 +86,6 @@ auto_derived_partial!(
        /// Ranking of this role
        #[serde(default)]
        pub rank: i64,
-        /// Custom icon attachment
-        #[serde(skip_serializing_if = "Option::is_none")]
-        pub icon: Option<File>,
    },
    "PartialRole"
 );
@@ -132,7 +129,6 @@ auto_derived!(
    /// Optional fields on server object
    pub enum FieldsRole {
        Colour,
-        Icon,
    }
 );

@@ -309,7 +305,6 @@ impl Role {
            colour: self.colour,
            hoist: Some(self.hoist),
            rank: Some(self.rank),
-            icon: self.icon,
        }
    }

@@ -323,7 +318,6 @@ impl Role {
            colour: None,
            hoist: false,
            permissions: Default::default(),
-            icon: None,
        };

        db.insert_role(&server.id, &role).await?;
@@ -373,7 +367,6 @@ impl Role {
    pub fn remove_field(&mut self, field: &FieldsRole) {
        match field {
            FieldsRole::Colour => self.colour = None,
-            FieldsRole::Icon => self.icon = None,
        }
    }

--- a/crates/core/database/src/models/servers/ops.rs
+++ b/crates/core/database/src/models/servers/ops.rs
@@ -17,8 +17,6 @@ pub trait AbstractServers: Sync + Send {
    /// Fetch a servers by their ids
    async fn fetch_servers<'a>(&self, ids: &'a [String]) -> Result<Vec<Server>>;

-    async fn fetch_owned_servers(&self, user_id: &str) -> Result<Vec<Server>>;
-
    /// Update a server with new information
    async fn update_server(
        &self,
--- a/crates/core/database/src/models/servers/ops/mongodb.rs
+++ b/crates/core/database/src/models/servers/ops/mongodb.rs
@@ -43,17 +43,6 @@ impl AbstractServers for MongoDb {
            .await)
    }

-    async fn fetch_owned_servers(&self, user_id: &str) -> Result<Vec<Server>> {
-        query!(
-            self,
-            find,
-            COL,
-            doc! {
-                "owner": user_id
-            }
-        )
-    }
-
    /// Update a server with new information
    async fn update_server(
        &self,
@@ -88,7 +77,7 @@ impl AbstractServers for MongoDb {
                },
                doc! {
                    "$set": {
-                        "roles.".to_owned() + role.id.as_str(): to_document(role)
+                        "roles.".to_owned() + &role.id: to_document(role)
                            .map_err(|_| create_database_error!("to_document", "role"))?
                    }
                },
@@ -183,7 +172,6 @@ impl IntoDocumentPath for FieldsRole {
    fn as_path(&self) -> Option<&'static str> {
        Some(match self {
            FieldsRole::Colour => "colour",
-            FieldsRole::Icon => "icon",
        })
    }
 }
--- a/crates/core/database/src/models/servers/ops/reference.rs
+++ b/crates/core/database/src/models/servers/ops/reference.rs
@@ -40,16 +40,6 @@ impl AbstractServers for ReferenceDb {
            .collect()
    }

-    async fn fetch_owned_servers(&self, user_id: &str) -> Result<Vec<Server>> {
-        let servers = self.servers.lock().await;
-
-        Ok(servers
-            .values()
-            .filter(|server| server.owner == user_id)
-            .cloned()
-            .collect())
-    }
-
    /// Update a server with new information
    async fn update_server(
        &self,
--- a/crates/core/database/src/models/sessions/axum.rs
+++ b/crates/core/database/src/models/sessions/axum.rs
@@ -1,24 +0,0 @@
-use axum::{extract::{FromRef, FromRequestParts}, http::request::Parts};
-
-use revolt_result::{create_error, Error, Result};
-
-use crate::{Database, Session};
-
-#[async_trait]
-impl<S> FromRequestParts<S> for Session
-where
-    Database: FromRef<S>,
-    S: Send + Sync
-{
-    type Rejection = Error;
-
-    async fn from_request_parts(parts: &mut Parts, state: &S) -> Result<Self> {
-        let db = Database::from_ref(state);
-
-        if let Some(Ok(token)) = parts.headers.get("x-session-token").map(|v| v.to_str()) {
-            db.fetch_session_by_token(token).await
-        } else {
-            Err(create_error!(MissingHeaders))
-        }
-    }
-}
--- a/crates/core/database/src/models/sessions/mod.rs
+++ b/crates/core/database/src/models/sessions/mod.rs
@@ -1,11 +0,0 @@
-#[cfg(feature = "axum-impl")]
-mod axum;
-mod model;
-mod ops;
-#[cfg(feature = "rocket-impl")]
-mod rocket;
-#[cfg(feature = "rocket-impl")]
-mod schema;
-
-pub use model::*;
-pub use ops::*;
--- a/crates/core/database/src/models/sessions/model.rs
+++ b/crates/core/database/src/models/sessions/model.rs
@@ -1,68 +0,0 @@
-use iso8601_timestamp::Timestamp;
-
-use crate::{events::client::EventV1, Database};
-use revolt_result::Result;
-
-auto_derived_partial!(
-    /// Session information
-    pub struct Session {
-        /// Unique Id
-        #[serde(rename = "_id")]
-        pub id: String,
-
-        /// User Id
-        pub user_id: String,
-
-        /// Session token
-        pub token: String,
-
-        /// Display name
-        pub name: String,
-
-        /// When the session was last logged in
-        pub last_seen: Timestamp,
-
-        /// Where the session originated from
-        ///
-        /// This could be used to differentiate sessions that come from staging/test vs prod, etc.
-        #[serde(skip_serializing_if = "Option::is_none")]
-        pub origin: Option<String>,
-
-        /// Web Push subscription
-        #[serde(skip_serializing_if = "Option::is_none")]
-        pub subscription: Option<WebPushSubscription>,
-    },
-    "PartialSession"
-);
-
-auto_derived!(
-    /// Web Push subscription
-    pub struct WebPushSubscription {
-        pub endpoint: String,
-        pub p256dh: String,
-        pub auth: String,
-    }
-);
-
-impl Session {
-    /// Save model
-    pub async fn save(&self, db: &Database) -> Result<()> {
-        db.save_session(self).await
-    }
-
-    /// Delete session
-    pub async fn delete(self, db: &Database) -> Result<()> {
-        // Delete from database
-        db.delete_session(&self.id).await?;
-
-        // Create and push event
-        EventV1::DeleteSession {
-            user_id: self.user_id.clone(),
-            session_id: self.id,
-        }
-        .private(self.user_id)
-        .await;
-
-        Ok(())
-    }
-}
--- a/crates/core/database/src/models/sessions/ops.rs
+++ b/crates/core/database/src/models/sessions/ops.rs
@@ -1,37 +0,0 @@
-use iso8601_timestamp::Timestamp;
-use revolt_result::Result;
-
-use crate::Session;
-
-#[cfg(feature = "mongodb")]
-mod mongodb;
-mod reference;
-
-#[async_trait]
-pub trait AbstractSessions: Sync + Send {
-    /// Find session by id
-    async fn fetch_session(&self, id: &str) -> Result<Session>;
-
-    /// Find sessions by user id
-    async fn fetch_sessions(&self, user_id: &str) -> Result<Vec<Session>>;
-
-    /// Find sessions by user ids
-    async fn fetch_sessions_with_subscription(&self, user_ids: &[String]) -> Result<Vec<Session>>;
-
-    /// Find session by token
-    async fn fetch_session_by_token(&self, token: &str) -> Result<Session>;
-
-    /// Save session
-    async fn save_session(&self, session: &Session) -> Result<()>;
-
-    /// Delete session
-    async fn delete_session(&self, id: &str) -> Result<()>;
-
-    /// Delete session
-    async fn delete_all_sessions(&self, user_id: &str, ignore: Option<String>) -> Result<()>;
-
-    /// Remove push subscription for a session by session id
-    async fn remove_push_subscription_by_session_id(&self, session_id: &str) -> Result<()>;
-
-    async fn update_session_last_seen(&self, session_id: &str, when: Timestamp) -> Result<()>;
-}
--- a/crates/core/database/src/models/sessions/ops/mongodb.rs
+++ b/crates/core/database/src/models/sessions/ops/mongodb.rs
@@ -1,142 +0,0 @@
-use crate::{AbstractSessions, MongoDb, Session};
-use bson::{to_bson, to_document};
-use iso8601_timestamp::Timestamp;
-use mongodb::options::UpdateOptions;
-use revolt_result::Result;
-
-const COL: &str = "sessions";
-
-#[async_trait]
-impl AbstractSessions for MongoDb {
-    /// Find session by id
-    async fn fetch_session(&self, id: &str) -> Result<Session> {
-        query!(self, find_one_by_id, COL, id)?.ok_or_else(|| create_error!(UnknownUser))
-    }
-
-    /// Find sessions by user id
-    async fn fetch_sessions(&self, user_id: &str) -> Result<Vec<Session>> {
-        query!(
-            self,
-            find,
-            COL,
-            doc! {
-                "user_id": user_id
-            }
-        )
-    }
-
-    /// Find sessions by user ids
-    async fn fetch_sessions_with_subscription(&self, user_ids: &[String]) -> Result<Vec<Session>> {
-        query!(
-            self,
-            find,
-            COL,
-            doc! {
-                "user_id": {
-                    "$in": user_ids
-                },
-                "subscription": {
-                    "$exists": true
-                }
-            }
-        )
-    }
-
-    /// Fetch a session from the database by token
-    async fn fetch_session_by_token(&self, token: &str) -> Result<Session> {
-        query!(
-            self,
-            find_one,
-            COL,
-            doc! {
-                "token": token
-            }
-        )?
-        .ok_or_else(|| create_error!(InvalidSession))
-    }
-
-    /// Save session
-    async fn save_session(&self, session: &Session) -> Result<()> {
-        self.col::<Session>(COL)
-            .update_one(
-                doc! {
-                    "_id": &session.id
-                },
-                doc! {
-                    "$set": to_document(session).map_err(|_| create_database_error!("to_document", COL))?,
-                },
-            )
-            .with_options(UpdateOptions::builder().upsert(true).build())
-            .await
-            .map_err(|_| create_database_error!("upsert_one", COL))
-            .map(|_| ())
-    }
-
-    /// Delete session
-    async fn delete_session(&self, id: &str) -> Result<()> {
-        self.col::<Session>(COL)
-            .delete_one(doc! {
-                "_id": id
-            })
-            .await
-            .map_err(|_| create_database_error!("delete_one", COL))
-            .map(|_| ())
-    }
-
-    /// Delete session
-    async fn delete_all_sessions(&self, user_id: &str, ignore: Option<String>) -> Result<()> {
-        let mut query = doc! {
-            "user_id": user_id
-        };
-
-        if let Some(id) = ignore {
-            query.insert(
-                "_id",
-                doc! {
-                    "$ne": id
-                },
-            );
-        }
-
-        self.col::<Session>(COL)
-            .delete_many(query)
-            .await
-            .map_err(|_| create_database_error!("delete_one", COL))
-            .map(|_| ())
-    }
-
-    /// Remove push subscription for a session by session id
-    async fn remove_push_subscription_by_session_id(&self, session_id: &str) -> Result<()> {
-        self.col::<Session>(COL)
-            .update_one(
-                doc! {
-                    "_id": session_id
-                },
-                doc! {
-                    "$unset": {
-                        "subscription": 1
-                    }
-                },
-            )
-            .await
-            .map(|_| ())
-            .map_err(|_| create_database_error!("update_one", COL))
-    }
-
-    async fn update_session_last_seen(&self, session_id: &str, when: Timestamp) -> Result<()> {
-        self.col::<Session>(COL)
-            .update_one(
-                doc! {
-                    "_id": session_id
-                },
-                doc! {
-                    "$set": {
-                        "last_seen": to_bson(&when).unwrap()
-                    }
-                },
-            )
-            .await
-            .map(|_| ())
-            .map_err(|_| create_database_error!("update_one", COL))
-    }
-}
--- a/crates/core/database/src/models/sessions/ops/reference.rs
+++ b/crates/core/database/src/models/sessions/ops/reference.rs
@@ -1,101 +0,0 @@
-use crate::{AbstractSessions, ReferenceDb, Session};
-use iso8601_timestamp::Timestamp;
-use revolt_result::Result;
-
-#[async_trait]
-impl AbstractSessions for ReferenceDb {
-    /// Find session by id
-    async fn fetch_session(&self, id: &str) -> Result<Session> {
-        let sessions = self.sessions.lock().await;
-        sessions
-            .get(id)
-            .cloned()
-            .ok_or_else(|| create_error!(UnknownUser))
-    }
-
-    /// Find sessions by user id
-    async fn fetch_sessions(&self, user_id: &str) -> Result<Vec<Session>> {
-        let sessions = self.sessions.lock().await;
-        Ok(sessions
-            .values()
-            .filter(|session| session.user_id == user_id)
-            .cloned()
-            .collect())
-    }
-
-    /// Find sessions by user ids
-    async fn fetch_sessions_with_subscription(&self, user_ids: &[String]) -> Result<Vec<Session>> {
-        let sessions = self.sessions.lock().await;
-        Ok(sessions
-            .values()
-            .filter(|session| session.subscription.is_some() && user_ids.contains(&session.user_id))
-            .cloned()
-            .collect())
-    }
-
-    /// Find session by token
-    async fn fetch_session_by_token(&self, token: &str) -> Result<Session> {
-        let sessions = self.sessions.lock().await;
-        sessions
-            .values()
-            .find(|session| session.token == token)
-            .cloned()
-            .ok_or_else(|| create_error!(InvalidSession))
-    }
-
-    /// Save session
-    async fn save_session(&self, session: &Session) -> Result<()> {
-        let mut sessions = self.sessions.lock().await;
-        sessions.insert(session.id.to_string(), session.clone());
-        Ok(())
-    }
-
-    /// Delete session
-    async fn delete_session(&self, id: &str) -> Result<()> {
-        let mut sessions = self.sessions.lock().await;
-        if sessions.remove(id).is_some() {
-            Ok(())
-        } else {
-            Err(create_error!(InvalidSession))
-        }
-    }
-
-    /// Delete session
-    async fn delete_all_sessions(&self, user_id: &str, ignore: Option<String>) -> Result<()> {
-        let mut sessions = self.sessions.lock().await;
-        sessions.retain(|_, session| {
-            if session.user_id == user_id {
-                if let Some(ignore) = &ignore {
-                    ignore == &session.id
-                } else {
-                    false
-                }
-            } else {
-                true
-            }
-        });
-
-        Ok(())
-    }
-
-    /// Remove push subscription for a session by session id
-    async fn remove_push_subscription_by_session_id(&self, session_id: &str) -> Result<()> {
-        let mut sessions = self.sessions.lock().await;
-
-        if let Some(session) = sessions.get_mut(session_id) {
-            session.subscription = None;
-        };
-
-        Ok(())
-    }
-
-    async fn update_session_last_seen(&self, session_id: &str, when: Timestamp) -> Result<()> {
-        let mut sessions = self.sessions.lock().await;
-
-        if let Some(session) = sessions.get_mut(session_id) {
-            session.last_seen = when;
-        };
-
-        Ok(())
-    }
-}
--- a/crates/core/database/src/models/sessions/rocket.rs
+++ b/crates/core/database/src/models/sessions/rocket.rs
@@ -1,30 +0,0 @@
-use crate::{Database, Session};
-use revolt_result::Error;
-use rocket::{
-    http::Status,
-    request::{FromRequest, Outcome},
-    Request,
-};
-
-#[rocket::async_trait]
-impl<'r> FromRequest<'r> for Session {
-    type Error = Error;
-
-    async fn from_request(request: &'r Request<'_>) -> Outcome<Self, Self::Error> {
-        if let Some(token) = request.headers().get("x-session-token").next() {
-            if let Ok(session) = request
-                .rocket()
-                .state::<Database>()
-                .expect("`Database`")
-                .fetch_session_by_token(token)
-                .await
-            {
-                Outcome::Success(session)
-            } else {
-                Outcome::Error((Status::Unauthorized, create_error!(InvalidSession)))
-            }
-        } else {
-            Outcome::Error((Status::Unauthorized, create_error!(MissingHeaders)))
-        }
-    }
-}
--- a/crates/core/database/src/models/sessions/schema.rs
+++ b/crates/core/database/src/models/sessions/schema.rs
@@ -1,32 +0,0 @@
-use revolt_okapi::openapi3::{SecurityScheme, SecuritySchemeData};
-use revolt_rocket_okapi::{
-    gen::OpenApiGenerator,
-    request::{OpenApiFromRequest, RequestHeaderInput},
-};
-
-use crate::Session;
-
-
-impl<'r> OpenApiFromRequest<'r> for Session {
-    fn from_request_input(
-        _gen: &mut OpenApiGenerator,
-        _name: String,
-        _required: bool,
-    ) -> revolt_rocket_okapi::Result<RequestHeaderInput> {
-        let mut requirements = schemars::Map::new();
-        requirements.insert("Session Token".to_owned(), vec![]);
-
-        Ok(RequestHeaderInput::Security(
-            "Session Token".to_owned(),
-            SecurityScheme {
-                data: SecuritySchemeData::ApiKey {
-                    name: "x-session-token".to_owned(),
-                    location: "header".to_owned(),
-                },
-                description: Some("Used to authenticate as a user.".to_owned()),
-                extensions: schemars::Map::new(),
-            },
-            requirements,
-        ))
-    }
-}
--- a/crates/core/database/src/models/users/model.rs
+++ b/crates/core/database/src/models/users/model.rs
@@ -1,16 +1,12 @@
 use std::{collections::HashSet, str::FromStr, time::Duration};

-use crate::{
-    events::client::EventV1,
-    util::email::{email_templates, send_email},
-    Database, File, RatelimitEvent, AMQP,
-};
+use crate::{events::client::EventV1, Database, File, RatelimitEvent, AMQP};

+use authifier::config::{EmailVerificationConfig, Template};
 use futures::future::join_all;
 use iso8601_timestamp::Timestamp;
 use once_cell::sync::Lazy;
 use rand::seq::SliceRandom;
-use regex::{Regex, RegexBuilder};
 use revolt_config::{config, FeaturesLimits};
 use revolt_models::v0::{self, UserBadges, UserFlags};
 use revolt_presence::filter_online;
@@ -31,9 +27,6 @@ auto_derived_partial!(
        /// Display name
        #[serde(skip_serializing_if = "Option::is_none")]
        pub display_name: Option<String>,
-        /// User's pronouns
-        #[serde(skip_serializing_if = "Option::is_none", default)]
-        pub pronouns: Option<String>,
        #[serde(skip_serializing_if = "Option::is_none")]
        /// Avatar attachment
        pub avatar: Option<File>,
@@ -79,7 +72,6 @@ auto_derived!(
        ProfileContent,
        ProfileBackground,
        DisplayName,
-        Pronouns,

        // internal fields
        Suspension,
@@ -171,13 +163,6 @@ pub static DISCRIMINATOR_SEARCH_SPACE: Lazy<HashSet<String>> = Lazy::new(|| {
    set.into_iter().collect()
 });

-static BLOCKED_USERNAME_PATTERNS: Lazy<Regex> = Lazy::new(|| {
-    RegexBuilder::new("`{3}|(discord|rvlt|guilded|stt)\\.gg|(revolt|stoat)\\.chat|https?:\\/\\/")
-        .case_insensitive(true)
-        .build()
-        .unwrap()
-});
-
 #[allow(clippy::derivable_impls)]
 impl Default for User {
    fn default() -> Self {
@@ -186,7 +171,6 @@ impl Default for User {
            username: Default::default(),
            discriminator: Default::default(),
            display_name: Default::default(),
-            pronouns: Default::default(),
            avatar: Default::default(),
            relations: Default::default(),
            badges: Default::default(),
@@ -214,13 +198,11 @@ impl User {
        I: Into<Option<String>>,
        D: Into<Option<PartialUser>>,
    {
-        let new_username = User::sanitise_username(&username).await?;
-        User::validate_username(&new_username)?;
-
+        let username = User::validate_username(username)?;
        let mut user = User {
            id: account_id.into().unwrap_or_else(|| Ulid::new().to_string()),
-            discriminator: User::find_discriminator(db, &new_username, None).await?,
-            username: new_username.clone(),
+            discriminator: User::find_discriminator(db, &username, None).await?,
+            username,
            last_acknowledged_policy_change: Timestamp::now_utc(),
            ..Default::default()
        };
@@ -296,40 +278,39 @@ impl User {
        }
    }

-    /// Validate a username
-    ///
-    /// This will check if the username is a blocked name or contains a blocked pattern.
-    fn validate_username(username: &str) -> Result<()> {
+    /// Sanitise and validate a username can be used
+    pub fn validate_username(username: String) -> Result<String> {
+        // Copy the username for validation
        let username_lowercase = username.to_lowercase();

-        const BLOCKED_USERNAMES: &[&str] = &["admin", "revolt", "stoat"];
-
-        if BLOCKED_USERNAMES.contains(&username_lowercase.as_str())
-            || BLOCKED_USERNAME_PATTERNS.is_match(username)
-        {
+        // Block homoglyphs
+        if decancer::cure(&username_lowercase).into_str() != username_lowercase {
            return Err(create_error!(InvalidUsername));
        }

-        Ok(())
-    }
+        // Ensure the username itself isn't blocked
+        const BLOCKED_USERNAMES: &[&str] = &["admin", "revolt"];

-    /// Sanitise a username
-    ///
-    /// This will clean up Unicode homoglyphs and pad to the min username length with underscores.
-    async fn sanitise_username(username: &str) -> Result<String> {
-        let options = decancer::Options::default().retain_capitalization();
-        let mut username = decancer::cure(username, options)
-            .map_err(|_| create_error!(InvalidUsername))?
-            .to_string();
+        for username in BLOCKED_USERNAMES {
+            if username_lowercase == *username {
+                return Err(create_error!(InvalidUsername));
+            }
+        }

-        let config = revolt_config::config().await;
-        let username_length_diff = config
-            .api
-            .users
-            .min_username_length
-            .saturating_sub(username.len());
-        if username_length_diff > 0 {
-            username.push_str(&"_".repeat(username_length_diff))
+        // Ensure none of the following substrings show up in the username
+        const BLOCKED_SUBSTRINGS: &[&str] = &[
+            "```",
+            "discord.gg",
+            "rvlt.gg",
+            "guilded.gg",
+            "https://",
+            "http://",
+        ];
+
+        for substr in BLOCKED_SUBSTRINGS {
+            if username_lowercase.contains(substr) {
+                return Err(create_error!(InvalidUsername));
+            }
        }

        Ok(username)
@@ -435,14 +416,12 @@ impl User {

    /// Update a user's username
    pub async fn update_username(&mut self, db: &Database, username: String) -> Result<()> {
-        let new_username = User::sanitise_username(&username).await?;
-        User::validate_username(&new_username)?;
-
-        if self.username.to_lowercase() == new_username.to_lowercase() {
+        let username = User::validate_username(username)?;
+        if self.username.to_lowercase() == username.to_lowercase() {
            self.update(
                db,
                PartialUser {
-                    username: Some(new_username),
+                    username: Some(username),
                    ..Default::default()
                },
                vec![],
@@ -455,12 +434,12 @@ impl User {
                    discriminator: Some(
                        User::find_discriminator(
                            db,
-                            &new_username,
+                            &username,
                            Some((self.discriminator.to_string(), self.id.clone())),
                        )
                        .await?,
                    ),
-                    username: Some(new_username),
+                    username: Some(username),
                    ..Default::default()
                },
                vec![],
@@ -711,7 +690,6 @@ impl User {
                }
            }
            FieldsUser::DisplayName => self.display_name = None,
-            FieldsUser::Pronouns => self.pronouns = None,
            FieldsUser::Suspension => self.suspended_until = None,
            FieldsUser::None => {}
        }
@@ -727,11 +705,22 @@ impl User {
        duration_days: Option<usize>,
        reason: Option<Vec<String>>,
    ) -> Result<()> {
-        let mut account = db.fetch_account(&self.id).await?;
+        let authifier = db.clone().to_authifier().await;
+        let mut account = authifier
+            .database
+            .find_account(&self.id)
+            .await
+            .map_err(|_| create_error!(InternalError))?;

-        account.disable(db).await?;
+        account
+            .disable(&authifier)
+            .await
+            .map_err(|_| create_error!(InternalError))?;

-        account.delete_all_sessions(db, None).await?;
+        account
+            .delete_all_sessions(&authifier, None)
+            .await
+            .map_err(|_| create_error!(InternalError))?;

        self.update(
            db,
@@ -747,15 +736,18 @@ impl User {
        .await?;

        if let Some(reason) = reason {
-            let config = config().await;
-
-            if !config.api.smtp.host.is_empty() {
-                let templates = email_templates().await;
-
-                send_email(
-                    &config.api.smtp,
+            if let EmailVerificationConfig::Enabled { smtp, .. } =
+                authifier.config.email_verification
+            {
+                smtp.send_email(
                    account.email.clone(),
-                    &templates.suspension,
+                    // maybe move this to common area?
+                    &Template {
+                        title: "Account Suspension".to_string(),
+                        html: Some(include_str!("../../../templates/suspension.html").to_owned()),
+                        text: include_str!("../../../templates/suspension.txt").to_owned(),
+                        url: Default::default(),
+                    },
                    json!({
                        "email": account.email,
                        "list": reason.join(", "),
@@ -804,9 +796,7 @@ impl User {
            db,
            PartialUser {
                username: Some(format!("Deleted User {}", self.id)),
-                discriminator: Some("0000".to_string()),
                flags: Some(2),
-                relations: Some(Vec::new()),
                ..Default::default()
            },
            vec![
@@ -834,160 +824,4 @@ impl User {

        badges
    }
-
-    /// Removes all relationships which include the user
-    pub async fn clear_relationships(&self, db: &Database) -> Result<()> {
-        let user_ids = self
-            .relations
-            .iter()
-            .flatten()
-            .map(|relation| relation.id.clone())
-            .collect();
-
-        db.clear_user_relationships(&self.id, user_ids).await
-    }
-
-    /// Removes user from all joined groups
-    pub async fn remove_from_all_groups(&self, db: &Database) -> Result<()> {
-        let mut generator = db.find_group_message_channels(&self.id).await?;
-
-        while let Some(groups) = generator.next_n(100).await? {
-            let ids = groups
-                .into_iter()
-                .map(|channel| channel.id().to_string())
-                .collect();
-
-            db.remove_user_from_groups(ids, &self.id).await?;
-        }
-
-        Ok(())
-    }
-
-    /// Deletes the user along with:
-    /// - deletes owned bots, servers and messages
-    /// - removes user from all groups
-    /// - clears relationships
-    pub async fn delete(&mut self, db: &Database) -> Result<()> {
-        for bot in db.fetch_bots_by_user(&self.id).await? {
-            bot.delete(db).await?;
-        }
-
-        for server in db.fetch_owned_servers(&self.id).await? {
-            server.delete(db).await?;
-        }
-
-        self.remove_from_all_groups(db).await?;
-        db.clear_memberships(&self.id).await?;
-        self.clear_relationships(db).await?;
-        db.delete_messages_by_user(&self.id).await?;
-        self.mark_deleted(db).await?;
-
-        Ok(())
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use crate::User;
-
-    #[test]
-    fn username_validation_blocked_names() {
-        let username_admin = "Admin";
-        let username_revolt = "Revolt";
-        let username_stoat = "Stoat";
-        let username_allowed = "Allowed";
-
-        assert!(User::validate_username(username_admin).is_err());
-        assert!(User::validate_username(username_revolt).is_err());
-        assert!(User::validate_username(username_stoat).is_err());
-        assert!(User::validate_username(username_allowed).is_ok());
-    }
-
-    #[test]
-    fn username_validation_blocked_patterns() {
-        let username_grave = "```_test";
-        let username_discord = "discord.gg_test";
-        let username_rvlt = "rvlt.gg_test";
-        let username_guilded = "guilded.gg_test";
-        let username_stt = "stt.gg_test";
-        let username_revolt = "revolt.chat_test";
-        let username_stoat = "stoat.chat_test";
-        let username_http = "http://_test";
-        let username_https = "https://_test";
-
-        assert!(User::validate_username(username_grave).is_err());
-        assert!(User::validate_username(username_discord).is_err());
-        assert!(User::validate_username(username_rvlt).is_err());
-        assert!(User::validate_username(username_guilded).is_err());
-        assert!(User::validate_username(username_stt).is_err());
-        assert!(User::validate_username(username_revolt).is_err());
-        assert!(User::validate_username(username_stoat).is_err());
-        assert!(User::validate_username(username_http).is_err());
-        assert!(User::validate_username(username_https).is_err());
-    }
-
-    #[async_std::test]
-    async fn username_sanitisation_clean() {
-        let username_clean = "Test";
-
-        let username_clean_sanitised = User::sanitise_username(username_clean).await;
-
-        assert!(username_clean_sanitised.is_ok());
-        assert_eq!(username_clean, username_clean_sanitised.unwrap());
-    }
-
-    #[async_std::test]
-    async fn username_sanitisation_homoglyphs() {
-        let username_homoglyphs = "𝔽𝕌Ňℕｙ";
-
-        let username_homoglyphs_sanitised =
-            User::sanitise_username(username_homoglyphs).await.unwrap();
-
-        assert_ne!(username_homoglyphs, username_homoglyphs_sanitised);
-        assert_eq!("funny", username_homoglyphs_sanitised);
-    }
-
-    #[async_std::test]
-    async fn username_sanitisation_padding() {
-        let username_padding = "a";
-
-        let username = User::sanitise_username(username_padding).await.unwrap();
-
-        assert_eq!("a_", username);
-    }
-
-    #[async_std::test]
-    async fn create_user() {
-        use revolt_result::Result;
-
-        database_test!(|db| async move {
-            let mut created_clean = User::create(&db, "Test".to_string(), None, None)
-                .await
-                .unwrap();
-
-            assert_eq!("Test", created_clean.username);
-
-            created_clean
-                .update_username(&db, "Test2".to_string())
-                .await
-                .unwrap();
-
-            assert_eq!("Test2", created_clean.username);
-
-            let created_invalid_result: Result<_> =
-                User::create(&db, "stoat.chat".to_string(), None, None).await;
-
-            assert!(created_invalid_result.is_err());
-
-            let mut updated_invalid = User::create(&db, "Test".to_string(), None, None)
-                .await
-                .unwrap();
-
-            let updated_invalid_update_result = updated_invalid
-                .update_username(&db, "http://test".to_string())
-                .await;
-
-            assert!(updated_invalid_update_result.is_err());
-        });
-    }
 }
--- a/crates/core/database/src/models/users/ops.rs
+++ b/crates/core/database/src/models/users/ops.rs
@@ -1,3 +1,5 @@
+use authifier::models::Session;
+use iso8601_timestamp::Timestamp;
 use revolt_result::Result;

 use crate::{FieldsUser, PartialUser, RelationshipStatus, User};
@@ -17,6 +19,9 @@ pub trait AbstractUsers: Sync + Send {
    /// Fetch a user from the database by their username
    async fn fetch_user_by_username(&self, username: &str, discriminator: &str) -> Result<User>;

+    /// Fetch a session from the database by token
+    async fn fetch_session_by_token(&self, token: &str) -> Result<Session>;
+
    /// Fetch multiple users by their ids
    async fn fetch_users<'a>(&self, ids: &'a [String]) -> Result<Vec<User>>;

@@ -56,6 +61,8 @@ pub trait AbstractUsers: Sync + Send {
    /// Delete a user by their id
    async fn delete_user(&self, id: &str) -> Result<()>;

-    /// Removes all relationships with the user from the list of users
-    async fn clear_user_relationships(&self, target_id: &str, user_ids: Vec<String>) -> Result<()>;
+    /// Remove push subscription for a session by session id (TODO: remove)
+    async fn remove_push_subscription_by_session_id(&self, session_id: &str) -> Result<()>;
+
+    async fn update_session_last_seen(&self, session_id: &str, when: Timestamp) -> Result<()>;
 }
--- a/crates/core/database/src/models/users/ops/mongodb.rs
+++ b/crates/core/database/src/models/users/ops/mongodb.rs
@@ -1,5 +1,7 @@
 use ::mongodb::options::{Collation, CollationStrength, FindOneOptions, FindOptions};
+use authifier::models::Session;
 use futures::StreamExt;
+use iso8601_timestamp::Timestamp;
 use revolt_result::Result;

 use crate::DocumentId;
@@ -45,6 +47,17 @@ impl AbstractUsers for MongoDb {
        .ok_or_else(|| create_error!(NotFound))
    }

+    /// Fetch a session from the database by token
+    async fn fetch_session_by_token(&self, token: &str) -> Result<Session> {
+        self.col::<Session>("sessions")
+            .find_one(doc! {
+                "token": token
+            })
+            .await
+            .map_err(|_| create_database_error!("find_one", "sessions"))?
+            .ok_or_else(|| create_error!(InvalidSession))
+    }
+
    /// Fetch multiple users by their ids
    async fn fetch_users<'a>(&self, ids: &'a [String]) -> Result<Vec<User>> {
        Ok(self
@@ -308,22 +321,41 @@ impl AbstractUsers for MongoDb {
        query!(self, delete_one_by_id, COL, id).map(|_| ())
    }

-    /// Removes all relationships with the user from the list of users
-    async fn clear_user_relationships(&self, target_id: &str, user_ids: Vec<String>) -> Result<()> {
-        self.col::<User>(COL)
-            .update_many(
-                doc! { "_id": { "$in": user_ids } },
+    /// Remove push subscription for a session by session id (TODO: remove)
+    async fn remove_push_subscription_by_session_id(&self, session_id: &str) -> Result<()> {
+        self.col::<User>("sessions")
+            .update_one(
                doc! {
-                    "$pull": {
-                        "relations": {
-                            "_id": target_id.to_string()
-                        }
+                    "_id": session_id
+                },
+                doc! {
+                    "$unset": {
+                        "subscription": 1
                    }
                },
            )
            .await
            .map(|_| ())
-            .map_err(|_| create_database_error!("bulk_write", COL))
+            .map_err(|_| create_database_error!("update_one", "sessions"))
+    }
+
+    async fn update_session_last_seen(&self, session_id: &str, when: Timestamp) -> Result<()> {
+        let formatted: &str = &when.format();
+
+        self.col::<Session>("sessions")
+            .update_one(
+                doc! {
+                    "_id": session_id
+                },
+                doc! {
+                    "$set": {
+                        "last_seen": formatted
+                    }
+                },
+            )
+            .await
+            .map(|_| ())
+            .map_err(|_| create_database_error!("update_one", "sessions"))
    }
 }

@@ -336,7 +368,6 @@ impl IntoDocumentPath for FieldsUser {
            FieldsUser::StatusPresence => "status.presence",
            FieldsUser::StatusText => "status.text",
            FieldsUser::DisplayName => "display_name",
-            FieldsUser::Pronouns => "pronouns",
            FieldsUser::Suspension => "suspended_until",
            FieldsUser::None => "none",
        })
--- a/crates/core/database/src/models/users/ops/reference.rs
+++ b/crates/core/database/src/models/users/ops/reference.rs
@@ -1,3 +1,5 @@
+use authifier::models::Session;
+use iso8601_timestamp::Timestamp;
 use revolt_result::Result;

 use crate::{FieldsUser, PartialUser, RelationshipStatus, User};
@@ -40,6 +42,11 @@ impl AbstractUsers for ReferenceDb {
            .ok_or_else(|| create_error!(NotFound))
    }

+    /// Fetch a session from the database by token
+    async fn fetch_session_by_token(&self, _token: &str) -> Result<Session> {
+        todo!()
+    }
+
    /// Fetch multiple users by their ids
    async fn fetch_users<'a>(&self, ids: &'a [String]) -> Result<Vec<User>> {
        let users = self.users.lock().await;
@@ -158,22 +165,12 @@ impl AbstractUsers for ReferenceDb {
        }
    }

-    /// Removes all relationships with the user from the list of users
-    async fn clear_user_relationships(
-        &self,
-        target_id: &str,
-        user_ids: Vec<String>,
-    ) -> Result<()> {
-        let mut users = self.users.lock().await;
+    /// Remove push subscription for a session by session id (TODO: remove)
+    async fn remove_push_subscription_by_session_id(&self, _session_id: &str) -> Result<()> {
+        todo!()
+    }

-        for user_id in user_ids {
-            if let Some(user) = users.get_mut(&user_id) {
-                if let Some(relations) = &mut user.relations {
-                    relations.retain(|relation| relation.id != target_id);
-                }
-            }
-        }
-
-        Ok(())
+    async fn update_session_last_seen(&self, _session_id: &str, _when: Timestamp) -> Result<()> {
+        todo!()
    }
 }
--- a/crates/core/database/src/models/users/rocket.rs
+++ b/crates/core/database/src/models/users/rocket.rs
@@ -1,12 +1,12 @@
+use authifier::models::Session;
 use rocket::http::Status;
 use rocket::request::{self, FromRequest, Outcome, Request};
-use revolt_result::Error;

-use crate::{Database, Session, User};
+use crate::{Database, User};

 #[rocket::async_trait]
 impl<'r> FromRequest<'r> for User {
-    type Error = Error;
+    type Error = authifier::Error;

    async fn from_request(request: &'r Request<'_>) -> request::Outcome<Self, Self::Error> {
        let user: &Option<User> = request
@@ -38,7 +38,7 @@ impl<'r> FromRequest<'r> for User {
        if let Some(user) = user {
            Outcome::Success(user.clone())
        } else {
-            Outcome::Error((Status::Unauthorized, create_error!(InvalidSession)))
+            Outcome::Error((Status::Unauthorized, authifier::Error::InvalidSession))
        }
    }
 }
--- a/crates/core/database/src/tasks/ack.rs
+++ b/crates/core/database/src/tasks/ack.rs
@@ -105,11 +105,7 @@ pub async fn handle_ack_event(

                if mentions_acked > 0 {
                    if let Err(err) = amqp
-                        .ack_notification_message(
-                            user.to_string(),
-                            channel.to_string(),
-                            id.to_owned(),
-                        )
+                        .ack_message(user.to_string(), channel.to_string(), id.to_owned())
                        .await
                    {
                        revolt_config::capture_error(&err);
@@ -196,7 +192,9 @@ pub async fn handle_ack_event(
                    .expect("Failed to fetch channel from db");

                if let TextChannel { server, .. } = channel {
-                    if let Err(err) = amqp.mass_mention_message_sent(server, mass_mentions).await {
+                    if let Err(err) =
+                        amqp.mass_mention_message_sent(server, mass_mentions).await
+                    {
                        revolt_config::capture_error(&err);
                    }
                } else {
--- a/crates/core/database/src/tasks/authifier_relay.rs
+++ b/crates/core/database/src/tasks/authifier_relay.rs
@@ -0,0 +1,29 @@
+use async_std::channel::{unbounded, Receiver, Sender};
+use authifier::AuthifierEvent;
+use once_cell::sync::Lazy;
+
+use crate::events::client::EventV1;
+
+static Q: Lazy<(Sender<AuthifierEvent>, Receiver<AuthifierEvent>)> = Lazy::new(unbounded);
+
+/// Get sender
+pub fn sender() -> Sender<AuthifierEvent> {
+    Q.0.clone()
+}
+
+/// Start a new worker
+pub async fn worker() {
+    loop {
+        let event = Q.1.recv().await.unwrap();
+        match &event {
+            AuthifierEvent::CreateSession { .. } | AuthifierEvent::CreateAccount { .. } => {
+                EventV1::Auth(event).global().await
+            }
+            AuthifierEvent::DeleteSession { user_id, .. }
+            | AuthifierEvent::DeleteAllSessions { user_id, .. } => {
+                let id = user_id.to_string();
+                EventV1::Auth(event).private(id).await
+            }
+        }
+    }
+}
--- a/crates/core/database/src/tasks/mod.rs
+++ b/crates/core/database/src/tasks/mod.rs
@@ -8,11 +8,14 @@ use std::time::Instant;
 const WORKER_COUNT: usize = 5;

 pub mod ack;
+pub mod authifier_relay;
 pub mod last_message_id;
 pub mod process_embeds;

 /// Spawn background workers
 pub fn start_workers(db: Database, amqp: AMQP) {
+    task::spawn(authifier_relay::worker());
+
    for _ in 0..WORKER_COUNT {
        task::spawn(ack::worker(db.clone(), amqp.clone()));
        task::spawn(last_message_id::worker(db.clone()));
--- a/crates/core/database/src/util/acker.rs
+++ b/crates/core/database/src/util/acker.rs
@@ -1,77 +0,0 @@
-use redis_kiss::{get_connection, AsyncCommands};
-use revolt_permissions::{calculate_channel_permissions, ChannelPermission};
-use revolt_result::{Result, ToRevoltError};
-
-use crate::{events::client::EventV1, Channel, Database, Server, User, AMQP};
-
-pub async fn ack_channel(user: &str, channel: &str, message: &str, amqp: &AMQP) -> Result<()> {
-    let mut redis = get_connection()
-        .await
-        .map_err(|_| create_error!(InternalError))?;
-
-    let old: Option<String> = redis
-        .getset(format!("acker:{user}+{channel}"), message)
-        .await
-        .to_internal_error()?;
-
-    if old.is_none() || old.unwrap() == message {
-        amqp.process_ack(user, Some(channel), None)
-            .await
-            .to_internal_error()?;
-    }
-
-    Ok(())
-}
-
-pub async fn ack_server(user: &User, server: &Server, db: &Database, amqp: &AMQP) -> Result<()> {
-    let mut redis = get_connection()
-        .await
-        .map_err(|_| create_error!(InternalError))?;
-
-    let channels = db.fetch_channels(&server.channels).await?;
-    let query = crate::util::permissions::DatabasePermissionQuery::new(db, user).server(server);
-
-    for channel in channels {
-        let channel_id = channel.id();
-        let mut q = query.clone().channel(&channel);
-
-        if calculate_channel_permissions(&mut q)
-            .await
-            .has_channel_permission(ChannelPermission::ViewChannel)
-        {
-            let channel_last_msg = match &channel {
-                Channel::TextChannel {
-                    last_message_id, ..
-                } => last_message_id,
-                _ => unreachable!(),
-            }
-            .clone();
-
-            if let Some(channel_last_msg) = channel_last_msg {
-                let old: Option<String> = redis
-                    .getset(
-                        format!("acker:{}+{}", user.id, channel_id),
-                        &channel_last_msg,
-                    )
-                    .await
-                    .to_internal_error()?;
-
-                if old.is_none() || old.unwrap() == channel_last_msg {
-                    amqp.process_ack(&user.id, Some(channel_id), Some(&server.id))
-                        .await
-                        .to_internal_error()?;
-
-                    EventV1::ChannelAck {
-                        id: channel_id.to_string(),
-                        user: user.id.clone(),
-                        message_id: channel_last_msg,
-                    }
-                    .private(user.id.clone())
-                    .await;
-                }
-            }
-        }
-    }
-
-    Ok(())
-}
--- a/crates/core/database/src/util/bridge/v0.rs
+++ b/crates/core/database/src/util/bridge/v0.rs
@@ -190,7 +190,7 @@ impl From<crate::Channel> for Channel {
                role_permissions,
                nsfw,
                voice,
-                slowmode,
+                slowmode
            } => Channel::TextChannel {
                id,
                server,
@@ -202,7 +202,7 @@ impl From<crate::Channel> for Channel {
                role_permissions,
                nsfw,
                voice: voice.map(|voice| voice.into()),
-                slowmode,
+                slowmode
            },
        }
    }
@@ -256,7 +256,7 @@ impl From<Channel> for crate::Channel {
                role_permissions,
                nsfw,
                voice,
-                slowmode,
+                slowmode
            } => crate::Channel::TextChannel {
                id,
                server,
@@ -268,7 +268,7 @@ impl From<Channel> for crate::Channel {
                role_permissions,
                nsfw,
                voice: voice.map(|voice| voice.into()),
-                slowmode,
+                slowmode
            },
        }
    }
@@ -307,7 +307,7 @@ impl From<PartialChannel> for crate::PartialChannel {
            default_permissions: value.default_permissions,
            last_message_id: value.last_message_id,
            voice: value.voice.map(|voice| voice.into()),
-            slowmode: value.slowmode,
+            slowmode: value.slowmode
        }
    }
 }
@@ -631,7 +631,6 @@ impl From<crate::Member> for Member {
            id: value.id.into(),
            joined_at: value.joined_at,
            nickname: value.nickname,
-            pronouns: value.pronouns,
            avatar: value.avatar.map(|f| f.into()),
            roles: value.roles,
            timeout: value.timeout,
@@ -647,7 +646,6 @@ impl From<Member> for crate::Member {
            id: value.id.into(),
            joined_at: value.joined_at,
            nickname: value.nickname,
-            pronouns: value.pronouns,
            avatar: value.avatar.map(|f| f.into()),
            roles: value.roles,
            timeout: value.timeout,
@@ -663,7 +661,6 @@ impl From<crate::PartialMember> for PartialMember {
            id: value.id.map(|id| id.into()),
            joined_at: value.joined_at,
            nickname: value.nickname,
-            pronouns: value.pronouns,
            avatar: value.avatar.map(|f| f.into()),
            roles: value.roles,
            timeout: value.timeout,
@@ -679,7 +676,6 @@ impl From<PartialMember> for crate::PartialMember {
            id: value.id.map(|id| id.into()),
            joined_at: value.joined_at,
            nickname: value.nickname,
-            pronouns: value.pronouns,
            avatar: value.avatar.map(|f| f.into()),
            roles: value.roles,
            timeout: value.timeout,
@@ -712,7 +708,6 @@ impl From<crate::FieldsMember> for FieldsMember {
        match value {
            crate::FieldsMember::Avatar => FieldsMember::Avatar,
            crate::FieldsMember::Nickname => FieldsMember::Nickname,
-            crate::FieldsMember::Pronouns => FieldsMember::Pronouns,
            crate::FieldsMember::Roles => FieldsMember::Roles,
            crate::FieldsMember::Timeout => FieldsMember::Timeout,
            crate::FieldsMember::CanReceive => FieldsMember::CanReceive,
@@ -728,7 +723,6 @@ impl From<FieldsMember> for crate::FieldsMember {
        match value {
            FieldsMember::Avatar => crate::FieldsMember::Avatar,
            FieldsMember::Nickname => crate::FieldsMember::Nickname,
-            FieldsMember::Pronouns => crate::FieldsMember::Pronouns,
            FieldsMember::Roles => crate::FieldsMember::Roles,
            FieldsMember::Timeout => crate::FieldsMember::Timeout,
            FieldsMember::CanReceive => crate::FieldsMember::CanReceive,
@@ -932,7 +926,6 @@ impl From<crate::Role> for Role {
            colour: value.colour,
            hoist: value.hoist,
            rank: value.rank,
-            icon: value.icon.map(|f| f.into()),
        }
    }
 }
@@ -946,7 +939,6 @@ impl From<Role> for crate::Role {
            colour: value.colour,
            hoist: value.hoist,
            rank: value.rank,
-            icon: value.icon.map(|f| f.into()),
        }
    }
 }
@@ -960,7 +952,6 @@ impl From<crate::PartialRole> for PartialRole {
            colour: value.colour,
            hoist: value.hoist,
            rank: value.rank,
-            icon: value.icon.map(|f| f.into()),
        }
    }
 }
@@ -974,7 +965,6 @@ impl From<PartialRole> for crate::PartialRole {
            colour: value.colour,
            hoist: value.hoist,
            rank: value.rank,
-            icon: value.icon.map(|f| f.into()),
        }
    }
 }
@@ -983,7 +973,6 @@ impl From<crate::FieldsRole> for FieldsRole {
    fn from(value: crate::FieldsRole) -> Self {
        match value {
            crate::FieldsRole::Colour => FieldsRole::Colour,
-            crate::FieldsRole::Icon => FieldsRole::Icon,
        }
    }
 }
@@ -992,7 +981,6 @@ impl From<FieldsRole> for crate::FieldsRole {
    fn from(value: FieldsRole) -> Self {
        match value {
            FieldsRole::Colour => crate::FieldsRole::Colour,
-            FieldsRole::Icon => crate::FieldsRole::Icon,
        }
    }
 }
@@ -1038,7 +1026,6 @@ impl crate::User {
            username: self.username,
            discriminator: self.discriminator,
            display_name: self.display_name,
-            pronouns: self.pronouns,
            avatar: self.avatar.map(|file| file.into()),
            relations: if let Some(crate::User { id, .. }) = perspective {
                if id == &self.id {
@@ -1115,7 +1102,6 @@ impl crate::User {
            username: self.username,
            discriminator: self.discriminator,
            display_name: self.display_name,
-            pronouns: self.pronouns,
            avatar: self.avatar.map(|file| file.into()),
            relations: vec![],
            badges,
@@ -1149,7 +1135,6 @@ impl crate::User {
            username: self.username,
            discriminator: self.discriminator,
            display_name: self.display_name,
-            pronouns: self.pronouns,
            avatar: self.avatar.map(|file| file.into()),
            relations: vec![],
            badges,
@@ -1177,7 +1162,6 @@ impl crate::User {
            username: self.username,
            discriminator: self.discriminator,
            display_name: self.display_name,
-            pronouns: self.pronouns,
            avatar: self.avatar.map(|file| file.into()),
            relations: self
                .relations
@@ -1221,7 +1205,6 @@ impl From<User> for crate::User {
            username: value.username,
            discriminator: value.discriminator,
            display_name: value.display_name,
-            pronouns: value.pronouns,
            avatar: value.avatar.map(Into::into),
            relations: None,
            badges: Some(value.badges as i32),
@@ -1242,7 +1225,6 @@ impl From<crate::PartialUser> for PartialUser {
            username: value.username,
            discriminator: value.discriminator,
            display_name: value.display_name,
-            pronouns: value.pronouns,
            avatar: value.avatar.map(|file| file.into()),
            relations: value.relations.map(|relationships| {
                relationships
@@ -1271,7 +1253,6 @@ impl From<FieldsUser> for crate::FieldsUser {
            FieldsUser::StatusPresence => crate::FieldsUser::StatusPresence,
            FieldsUser::StatusText => crate::FieldsUser::StatusText,
            FieldsUser::DisplayName => crate::FieldsUser::DisplayName,
-            FieldsUser::Pronouns => crate::FieldsUser::Pronouns,

            FieldsUser::Internal => crate::FieldsUser::None,
        }
@@ -1287,7 +1268,6 @@ impl From<crate::FieldsUser> for FieldsUser {
            crate::FieldsUser::StatusPresence => FieldsUser::StatusPresence,
            crate::FieldsUser::StatusText => FieldsUser::StatusText,
            crate::FieldsUser::DisplayName => FieldsUser::DisplayName,
-            crate::FieldsUser::Pronouns => FieldsUser::Pronouns,

            crate::FieldsUser::Suspension => FieldsUser::Internal,
            crate::FieldsUser::None => FieldsUser::Internal,
@@ -1436,92 +1416,3 @@ impl From<crate::VoiceInformation> for VoiceInformation {
        }
    }
 }
-
-impl From<crate::Account> for AccountInfo {
-    fn from(item: crate::Account) -> Self {
-        AccountInfo {
-            id: item.id,
-            email: item.email,
-        }
-    }
-}
-
-impl From<crate::MFATicket> for MFATicket {
-    fn from(value: crate::MFATicket) -> Self {
-        MFATicket {
-            id: value.id,
-            account_id: value.account_id,
-            token: value.token,
-            validated: value.validated,
-            authorised: value.authorised,
-            last_totp_code: value.last_totp_code,
-        }
-    }
-}
-
-impl From<crate::MultiFactorAuthentication> for MultiFactorStatus {
-    fn from(item: crate::MultiFactorAuthentication) -> Self {
-        MultiFactorStatus {
-            // email_otp: item.enable_email_otp,
-            // trusted_handover: item.enable_trusted_handover,
-            // email_mfa: item.enable_email_mfa,
-            totp_mfa: !item.totp_token.is_disabled(),
-            // security_key_mfa: item.security_key_token.is_some(),
-            recovery_active: !item.recovery_codes.is_empty(),
-            ..Default::default()
-        }
-    }
-}
-
-impl From<crate::MFAMethod> for MFAMethod {
-    fn from(value: crate::MFAMethod) -> Self {
-        match value {
-            crate::MFAMethod::Password => MFAMethod::Password,
-            crate::MFAMethod::Recovery => MFAMethod::Recovery,
-            crate::MFAMethod::Totp => MFAMethod::Totp,
-        }
-    }
-}
-
-impl From<crate::Session> for SessionInfo {
-    fn from(item: crate::Session) -> Self {
-        SessionInfo {
-            id: item.id,
-            name: item.name,
-        }
-    }
-}
-
-impl From<crate::Session> for Session {
-    fn from(value: crate::Session) -> Self {
-        Session {
-            id: value.id,
-            user_id: value.user_id,
-            token: value.token,
-            name: value.name,
-            last_seen: value.last_seen,
-            origin: value.origin,
-            subscription: value.subscription.map(Into::into),
-        }
-    }
-}
-
-impl From<crate::WebPushSubscription> for WebPushSubscription {
-    fn from(value: crate::WebPushSubscription) -> Self {
-        WebPushSubscription {
-            endpoint: value.endpoint,
-            p256dh: value.p256dh,
-            auth: value.auth,
-        }
-    }
-}
-
-impl From<WebPushSubscription> for crate::WebPushSubscription {
-    fn from(value: WebPushSubscription) -> Self {
-        crate::WebPushSubscription {
-            endpoint: value.endpoint,
-            p256dh: value.p256dh,
-            auth: value.auth,
-        }
-    }
-}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
izzy	25025da70a	Merge branch 'main' into 3-otel	2026-04-01 21:14:44 +01:00
izzy	d1631f6262	test: correct image size of extra bytes jpeg test Signed-off-by: izzy <me@insrt.uk>	2026-01-25 20:22:47 +00:00
izzy	94aaeed758	chore: remove un-used import Signed-off-by: izzy <me@insrt.uk>	2026-01-25 19:49:36 +00:00
izzy	945b7a6ecb	Merge branch '2-refactor-core-files' into 3-otel	2026-01-25 19:49:08 +00:00
izzy	6418da51cd	Merge branch 'main' into 2-refactor-core-files # Conflicts: # Cargo.lock	2026-01-25 19:49:08 +00:00
izzy	74e36c7c2a	Merge branch '2-refactor-core-files' into 3-otel	2026-01-24 23:44:18 +00:00
izzy	239112f935	Merge branch '1-mise-git-town' into 2-refactor-core-files	2026-01-24 23:44:17 +00:00
izzy	5968514231	Merge branch 'main' into 1-mise-git-town	2026-01-24 23:44:16 +00:00
izzy	0c3f76a406	Merge branch '2-refactor-core-files' into 3-otel	2026-01-24 23:36:45 +00:00
izzy	f988b09d9a	Merge branch '1-mise-git-town' into 2-refactor-core-files	2026-01-24 23:36:44 +00:00
izzy	facaf3869f	Merge branch 'main' into 1-mise-git-town	2026-01-24 23:36:42 +00:00
izzy	c96f89aaa9	Merge branch '2-refactor-core-files' into 3-otel	2026-01-24 23:35:50 +00:00
izzy	03d790007d	Merge branch '1-mise-git-town' into 2-refactor-core-files	2026-01-24 23:35:49 +00:00
izzy	270a9ac625	Merge branch 'main' into 1-mise-git-town	2026-01-24 23:35:48 +00:00
izzy	6acc7a3e46	Merge branch '2-refactor-core-files' into 3-otel	2026-01-24 02:18:54 +00:00
izzy	e6a2571303	Merge branch '1-mise-git-town' into 2-refactor-core-files	2026-01-24 02:18:53 +00:00
izzy	ef36df5da1	Merge branch 'main' into 1-mise-git-town	2026-01-24 02:18:51 +00:00
izzy	d552442b43	Merge branch '2-refactor-core-files' into 3-otel	2026-01-24 02:11:10 +00:00
izzy	0fb4981556	Merge branch '1-mise-git-town' into 2-refactor-core-files	2026-01-24 02:11:09 +00:00
izzy	6b00c5aa42	Merge branch 'main' into 1-mise-git-town	2026-01-24 02:11:08 +00:00
izzy	503885d8dc	Merge branch '1-mise-git-town' into 2-refactor-core-files	2026-01-24 02:02:55 +00:00
izzy	e896bec16a	Merge branch 'main' into 1-mise-git-town	2026-01-24 02:02:54 +00:00
izzy	7468ba5b8a	trigger workflow Signed-off-by: izzy <me@insrt.uk>	2026-01-24 02:01:30 +00:00
izzy	d9ca1b8805	trigger workflow	2026-01-24 01:57:27 +00:00
izzy	97511059a4	feat: add otel logging, integrate with tracing	2026-01-24 01:27:32 +00:00
izzy	e896582a5c	feat: repository architecture for files crate w. added tests Signed-off-by: izzy <me@insrt.uk>	2026-01-24 01:25:42 +00:00
izzy	9c2ae59ecf	chore: add `git-town` tool Signed-off-by: izzy <me@insrt.uk>	2026-01-24 01:21:33 +00:00