chore(core/models): truncate the rest of the embed fields

feat(services/autumn): add accept-language header
closes #358
2026-07-06 03:06:04 +00:00 · 2024-10-02 11:35:37 +01:00 · 2024-10-02 11:32:55 +01:00 · 2024-10-02 11:31:55 +01:00 · 2024-10-01 21:18:55 +01:00 · 2024-10-01 21:11:08 +01:00
108 changed files with 7244 additions and 1177 deletions
--- a/.env.example
+++ b/.env.example
@@ -1,107 +0,0 @@
-# MongoDB URI
-MONGODB=mongodb://localhost
-AUTUMN_MONGO_URI=mongodb://database
-REDIS_URI=redis://localhost/
-
-# URL to where the Revolt app is publicly accessible
-REVOLT_APP_URL=http://local.revolt.chat:5000
-
-# URL to where the API is publicly accessible
-REVOLT_PUBLIC_URL=http://local.revolt.chat:8000
-VITE_API_URL=http://local.revolt.chat:8000
-
-# URL to where the WebSocket server is publicly accessible
-REVOLT_EXTERNAL_WS_URL=ws://local.revolt.chat:9000
-
-# URL to where Autumn is publicly available
-AUTUMN_PUBLIC_URL=http://local.revolt.chat:3000
-
-# URL to where January is publicly available
-JANUARY_PUBLIC_URL=http://local.revolt.chat:7000
-
-# URL to where Vortex is publicly available
-# VOSO_PUBLIC_URL=https://voso.revolt.chat
-
-
-##
-## hCaptcha Settings
-##
-
-# If you are sure that you don't want to use hCaptcha, set to 1.
-REVOLT_UNSAFE_NO_CAPTCHA=1
-
-# hCaptcha API key
-# REVOLT_HCAPTCHA_KEY=0x0000000000000000000000000000000000000000
-
-# hCaptcha site key
-# REVOLT_HCAPTCHA_SITEKEY=10000000-ffff-ffff-ffff-000000000001
-
-
-##
-## Email Settings
-##
-
-# If you are sure that you don't want to use email verification, set to 1.
-REVOLT_UNSAFE_NO_EMAIL=1
-
-# SMTP host
-# REVOLT_SMTP_HOST=smtp.example.com
-
-# SMTP username
-# REVOLT_SMTP_USERNAME=noreply@example.com
-
-# SMTP password
-# REVOLT_SMTP_PASSWORD=CHANGEME
-
-# SMTP From header
-# REVOLT_SMTP_FROM=Revolt <noreply@example.com>
-
-
-##
-## Application Settings
-##
-
-# Whether to enable staging only features
-REVOLT_IS_STAGING=1
-
-# Whether to only allow users to sign up if they have an invite code
-REVOLT_INVITE_ONLY=0
-
-# Maximum number of people that can be in a group chat
-REVOLT_MAX_GROUP_SIZE=150
-
-# VAPID keys for push notifications
-# Generate using this guide: https://gitlab.insrt.uk/revolt/delta/-/wikis/vapid
-# --> Please replace these keys before going into production! <--
-REVOLT_VAPID_PRIVATE_KEY=LS0tLS1CRUdJTiBFQyBQUklWQVRFIEtFWS0tLS0tCk1IY0NBUUVFSUJSUWpyTWxLRnBiVWhsUHpUbERvcEliYk1yeVNrNXpKYzVYVzIxSjJDS3hvQW9HQ0NxR1NNNDkKQXdFSG9VUURRZ0FFWnkrQkg2TGJQZ2hEa3pEempXOG0rUXVPM3pCajRXT1phdkR6ZU00c0pqbmFwd1psTFE0WAp1ZDh2TzVodU94QWhMQlU3WWRldVovWHlBdFpWZmNyQi9BPT0KLS0tLS1FTkQgRUMgUFJJVkFURSBLRVktLS0tLQo=
-REVOLT_VAPID_PUBLIC_KEY=BGcvgR-i2z4IQ5Mw841vJvkLjt8wY-FjmWrw83jOLCY52qcGZS0OF7nfLzuYbjsQISwVO2HXrmf18gLWVX3Kwfw=
-
-
-##
-## Vortex configuration
-##
-
-# VOSO_MANAGE_TOKEN=CHANGEME
-
-
-##
-## Autumn configuration
-##
-
-# S3 Region
-AUTUMN_S3_REGION=minio
-
-# S3 Endpoint
-AUTUMN_S3_ENDPOINT=http://minio:9000
-
-# MinIO Root User
-MINIO_ROOT_USER=minioautumn
-
-# MinIO Root Password
-MINIO_ROOT_PASSWORD=minioautumn
-
-# AWS Access Key ID
-AWS_ACCESS_KEY_ID=minioautumn
-
-# AWS Secret Key
-AWS_SECRET_ACCESS_KEY=minioautumn
--- a/.github/workflows/docker.yaml
+++ b/.github/workflows/docker.yaml
@@ -61,7 +61,7 @@ jobs:
    if: github.event_name != 'pull_request'
    strategy:
      matrix:
-        project: [delta, bonfire]
+        project: [delta, bonfire, autumn, january]
    name: Build ${{ matrix.project }} image
    steps:
      # Configure build environment
@@ -98,6 +98,14 @@ jobs:
              "bonfire": {
                "path": "crates/bonfire",
                "tag": "${{ github.repository_owner }}/bonfire"
+              },
+              "autumn": {
+                "path": "crates/services/autumn",
+                "tag": "${{ github.repository_owner }}/autumn"
+              },
+              "january": {
+                "path": "crates/services/january",
+                "tag": "${{ github.repository_owner }}/january"
              }
            }
          export_to: output
--- a/.github/workflows/rust.yaml
+++ b/.github/workflows/rust.yaml
@@ -41,11 +41,7 @@ jobs:

      - name: Run services in background
        run: |
-          docker compose -f docker-compose.db.yml up -d
-
-      - name: Copy .env.example
-        run: |
-          cp .env.example .env
+          docker compose -f compose.yml up -d

      - name: Run cargo test
        env:
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,5 @@
 Rocket.toml
-Revolt.toml
+Revolt.*.toml

 target
 .data
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -1,6 +1,5 @@
 {
  "editor.formatOnSave": true,
  "rust-analyzer.checkOnSave.command": "clippy",
-  "nixEnvSelector.suggestion": false,
-  "nixEnvSelector.nixFile": "${workspaceRoot}/default.nix"
+  "nixEnvSelector.suggestion": false
 }
--- a/Cargo.lock
+++ b/Cargo.lock
--- a/3
+++ b/3
@@ -1,5 +1,5 @@
 # Build Stage
-FROM --platform="${BUILDPLATFORM}" rust:1.70.0-slim
+FROM --platform="${BUILDPLATFORM}" rust:1.77.2-slim-bookworm
 USER 0:0
 WORKDIR /home/rust/src

@@ -28,6 +28,7 @@ COPY crates/core/permissions/Cargo.toml ./crates/core/permissions/
 COPY crates/core/presence/Cargo.toml ./crates/core/presence/
 COPY crates/core/result/Cargo.toml ./crates/core/result/
 COPY crates/services/autumn/Cargo.toml ./crates/services/autumn/
+COPY crates/services/january/Cargo.toml ./crates/services/january/
 RUN sh /tmp/build-image-layer.sh deps

 # Build all apps
--- a/Dockerfile.useCurrentArch
+++ b/Dockerfile.useCurrentArch
@@ -1,5 +1,5 @@
 # Build Stage
-FROM rust:1.70.0-slim
+FROM rust:1.77.2-slim-bookworm
 USER 0:0
 WORKDIR /home/rust/src

@@ -24,6 +24,7 @@ COPY crates/core/permissions/Cargo.toml ./crates/core/permissions/
 COPY crates/core/presence/Cargo.toml ./crates/core/presence/
 COPY crates/core/result/Cargo.toml ./crates/core/result/
 COPY crates/services/autumn/Cargo.toml ./crates/services/autumn/
+COPY crates/services/january/Cargo.toml ./crates/services/january/
 RUN sh /tmp/build-image-layer.sh deps

 # Build all apps
--- a/README.md
+++ b/README.md
@@ -1,24 +1,42 @@
-# Revolt Backend
+<div align="center">
+<h1>
+  Revolt Backend
+  
+  [![Stars](https://img.shields.io/github/stars/revoltchat/backend?style=flat-square&logoColor=white)](https://github.com/revoltchat/backend/stargazers)
+  [![Forks](https://img.shields.io/github/forks/revoltchat/backend?style=flat-square&logoColor=white)](https://github.com/revoltchat/backend/network/members)
+  [![Pull Requests](https://img.shields.io/github/issues-pr/revoltchat/backend?style=flat-square&logoColor=white)](https://github.com/revoltchat/backend/pulls)
+  [![Issues](https://img.shields.io/github/issues/revoltchat/backend?style=flat-square&logoColor=white)](https://github.com/revoltchat/backend/issues)
+  [![Contributors](https://img.shields.io/github/contributors/revoltchat/backend?style=flat-square&logoColor=white)](https://github.com/revoltchat/backend/graphs/contributors)
+  [![License](https://img.shields.io/github/license/revoltchat/backend?style=flat-square&logoColor=white)](https://github.com/revoltchat/backend/blob/main/LICENSE)
+</h1>
+The services and libraries that power the Revolt service.<br/>
+<br/>

-This is a monorepo for the Revolt backend.
+| Crate              | Path                                               | Description                              |                                                                                                                                                                                                                                                                                                           |
+| ------------------ | -------------------------------------------------- | ---------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| `core/config`      | [crates/core/config](crates/core/config)           | Core: Configuration                      | ![Crates.io Version](https://img.shields.io/crates/v/revolt-config) ![Crates.io Version](https://img.shields.io/crates/msrv/revolt-config) ![Crates.io Version](https://img.shields.io/crates/size/revolt-config) ![Crates.io License](https://img.shields.io/crates/l/revolt-config)                     |
+| `core/database`    | [crates/core/database](crates/core/database)       | Core: Database Implementation            | ![Crates.io Version](https://img.shields.io/crates/v/revolt-database) ![Crates.io Version](https://img.shields.io/crates/msrv/revolt-database) ![Crates.io Version](https://img.shields.io/crates/size/revolt-database) ![Crates.io License](https://img.shields.io/crates/l/revolt-database)             |
+| `core/files`       | [crates/core/files](crates/core/files)             | Core: S3 and encryption subroutines      | ![Crates.io Version](https://img.shields.io/crates/v/revolt-files) ![Crates.io Version](https://img.shields.io/crates/msrv/revolt-files) ![Crates.io Version](https://img.shields.io/crates/size/revolt-files) ![Crates.io License](https://img.shields.io/crates/l/revolt-files)                         |
+| `core/models`      | [crates/core/models](crates/core/models)           | Core: API Models                         | ![Crates.io Version](https://img.shields.io/crates/v/revolt-models) ![Crates.io Version](https://img.shields.io/crates/msrv/revolt-models) ![Crates.io Version](https://img.shields.io/crates/size/revolt-models) ![Crates.io License](https://img.shields.io/crates/l/revolt-models)                     |
+| `core/permissions` | [crates/core/permissions](crates/core/permissions) | Core: Permission Logic                   | ![Crates.io Version](https://img.shields.io/crates/v/revolt-permissions) ![Crates.io Version](https://img.shields.io/crates/msrv/revolt-permissions) ![Crates.io Version](https://img.shields.io/crates/size/revolt-permissions) ![Crates.io License](https://img.shields.io/crates/l/revolt-permissions) |
+| `core/presence`    | [crates/core/presence](crates/core/presence)       | Core: User Presence                      | ![Crates.io Version](https://img.shields.io/crates/v/revolt-presence) ![Crates.io Version](https://img.shields.io/crates/msrv/revolt-presence) ![Crates.io Version](https://img.shields.io/crates/size/revolt-presence) ![Crates.io License](https://img.shields.io/crates/l/revolt-presence)             |
+| `core/result`      | [crates/core/result](crates/core/result)           | Core: Result and Error types             | ![Crates.io Version](https://img.shields.io/crates/v/revolt-result) ![Crates.io Version](https://img.shields.io/crates/msrv/revolt-result) ![Crates.io Version](https://img.shields.io/crates/size/revolt-result) ![Crates.io License](https://img.shields.io/crates/l/revolt-result)                     |
+| `delta`            | [crates/delta](crates/delta)                       | REST API server                          | ![License](https://img.shields.io/badge/license-AGPL--3.0--or--later-blue)                                                                                                                                                                                                                                |
+| `bonfire`          | [crates/bonfire](crates/bonfire)                   | WebSocket events server                  | ![License](https://img.shields.io/badge/license-AGPL--3.0--or--later-blue)                                                                                                                                                                                                                                |
+| `services/january` | [crates/services/january](crates/services/january) | Proxy server                             | ![License](https://img.shields.io/badge/license-AGPL--3.0--or--later-blue)                                                                                                                                                                                                                                |
+| `services/autumn`  | [crates/services/autumn](crates/services/autumn)   | File server                              | ![License](https://img.shields.io/badge/license-AGPL--3.0--or--later-blue)                                                                                                                                                                                                                                |
+| `bindings/node`    | [crates/bindings/node](crates/bindings/node)       | Node.js bindings for the Revolt software | ![License](https://img.shields.io/badge/license-AGPL--3.0--or--later-blue)                                                                                                                                                                                                                                |

-| Crate              | Path                                               | Description                   |
-| ------------------ | -------------------------------------------------- | ----------------------------- |
-| `core/config`      | [crates/core/config](crates/core/config)           | Core: Configuration           |
-| `core/database`    | [crates/core/database](crates/core/database)       | Core: Database Implementation |
-| `core/models`      | [crates/core/models](crates/core/models)           | Core: API Models              |
-| `core/permissions` | [crates/core/permissions](crates/core/permissions) | Core: Permission Logic        |
-| `core/presence`    | [crates/core/presence](crates/core/presence)       | Core: User Presence           |
-| `core/result`      | [crates/core/result](crates/core/result)           | Core: Result and Error types  |
-| `delta`            | [crates/delta](crates/delta)                       | REST API server               |
-| `bonfire`          | [crates/bonfire](crates/bonfire)                   | WebSocket events server       |
-
-Note: `january`, `autumn`, and `vortex` are yet to be moved into this monorepo.
+</div>
+<br/>

 ## Minimum Supported Rust Version

 Rust 1.76 or higher.

+> [!CAUTION]
+> The events server has a significant performance regression between Rust 1.77.2 and 1.78.0 onwards, see [issue #341](https://github.com/revoltchat/backend/issues/341).
+
 ## Development Guide

 Before contributing, make yourself familiar with [our contribution guidelines](https://developers.revolt.chat/contrib.html) and the [technical documentation for this project](https://revoltchat.github.io/backend/).
@@ -33,6 +51,20 @@ Before getting started, you'll want to install:
 > A **default.nix** is available for Nix users!
 > Just run `nix-shell` and continue.

+As a heads-up, the development environment uses the following ports:
+
+| Service                   |      Port      |
+| ------------------------- | :------------: |
+| MongoDB                   |     14017      |
+| Redis                     |     14079      |
+| MinIO                     |     14009      |
+| Maildev                   | 14025<br>14080 |
+| Revolt Web App            |     14701      |
+| `crates/delta`            |     14702      |
+| `crates/bonfire`          |     14703      |
+| `crates/services/autumn`  |     14704      |
+| `crates/services/january` |     14705      |
+
 Now you can clone and build the project:

 ```bash
@@ -41,34 +73,21 @@ cd revolt-backend
 cargo build
 ```

-If you want to run the API and event servers:
+A default configuration `Revolt.toml` is present in this project that is suited for development.

-```bash
-# create environment file (will be deprecated in future)
-cp .env.example .env
+If you'd like to change anything, create a `Revolt.overrides.toml` file and specify relevant variables.

-# (optionally) copy the default configuration file
-cp crates/core/config/Revolt.toml Revolt.toml
-# configure as necessary...
-```
-
-You may want to copy the following configuration:
-
-```toml
-# Revolt.toml
-[database]
-mongodb = "mongodb://localhost"
-redis = "redis://localhost"
-
-[hosts]
-app = "http://local.revolt.chat"
-api = "http://local.revolt.chat:8000"
-events = "ws://local.revolt.chat:9000"
-autumn = "http://local.revolt.chat:3000"
-january = "http://local.revolt.chat:7000"
-voso_legacy = ""
-voso_legacy_ws = ""
-```
+> [!TIP]
+> Use Sentry to catch unexpected service errors:
+>
+> ```toml
+> # Revolt.overrides.toml
+> [sentry]
+> api = "https://abc@your.sentry/1"
+> events = "https://abc@your.sentry/1"
+> files = "https://abc@your.sentry/1"
+> proxy = "https://abc@your.sentry/1"
+> ```

 Then continue:

@@ -80,6 +99,10 @@ docker compose up -d
 cargo run --bin revolt-delta
 # run the events server
 cargo run --bin revolt-bonfire
+# run the file server
+cargo run --bin revolt-autumn
+# run th proxy server
+cargo run --bin revolt-january

 # hint:
 # mold -run <cargo build, cargo run, etc...>
@@ -96,10 +119,13 @@ git clone --recursive https://github.com/revoltchat/revite
 cd revite
 yarn
 yarn build:deps
-yarn dev --port 3001
+echo "VITE_API_URL=http://local.revolt.chat:14702" > .env.local
+yarn dev --port 14701
 ```

-Then go to https://local.revolt.chat:3001
+Then go to http://local.revolt.chat:14701 to create an account/login.
+
+When signing up, go to http://localhost:14080 to find confirmation/password reset emails.

 ## Deployment Guide

--- a/Revolt.toml
+++ b/Revolt.toml
@@ -0,0 +1,49 @@
+# ⚠️ This configuration is intended for development environment.
+# If you'd like to override anything, create a Revolt.override.toml
+
+[database]
+# MongoDB connection URL
+# Defaults to the container name specified in self-hosted
+mongodb = "mongodb://127.0.0.1:14017"
+# Redis connection URL
+# Defaults to the container name specified in self-hosted
+redis = "redis://127.0.0.1:14079/"
+
+[hosts]
+# Web locations of various services
+# Defaults assume all services are reverse-proxied
+# See https://github.com/revoltchat/self-hosted/blob/master/Caddyfile
+#
+# Remember to change these to https/wss where appropriate in production!
+app = "http://local.revolt.chat:14701"
+api = "http://local.revolt.chat:14702"
+events = "ws://local.revolt.chat:14703"
+autumn = "http://local.revolt.chat:14704"
+january = "http://local.revolt.chat:14705"
+voso_legacy = ""
+voso_legacy_ws = ""
+
+[api]
+
+[api.smtp]
+# Email server configuration for verification
+# Defaults to no email verification (host field is empty)
+host = "localhost"
+username = "smtp"
+password = "smtp"
+from_address = "development@revolt.chat"
+reply_to = "support@revolt.chat"
+port = 14025
+use_tls = false
+
+[files.s3]
+# S3 protocol endpoint
+endpoint = "http://127.0.0.1:14009"
+# S3 region name
+region = "minio"
+# S3 protocol key ID
+access_key_id = "minioautumn"
+# S3 protocol access key
+secret_access_key = "minioautumn"
+# Bucket to upload to by default
+default_bucket = "revolt-uploads"
--- a/compose.yml
+++ b/compose.yml
@@ -0,0 +1,56 @@
+services:
+  # Redis
+  redis:
+    image: eqalpha/keydb
+    ports:
+      - "14079:6379"
+
+  # MongoDB
+  database:
+    image: mongo
+    ports:
+      - "14017:27017"
+    volumes:
+      - ./.data/db:/data/db
+
+  # MinIO
+  minio:
+    image: minio/minio
+    command: server /data
+    environment:
+      MINIO_ROOT_USER: minioautumn
+      MINIO_ROOT_PASSWORD: minioautumn
+    volumes:
+      - ./.data/minio:/data
+    ports:
+      - "14009:9000"
+      - "14010:9001"
+    restart: always
+
+  # Create buckets for minio.
+  createbuckets:
+    image: minio/mc
+    depends_on:
+      - minio
+    environment:
+      MINIO_ROOT_USER: minioautumn
+      MINIO_ROOT_PASSWORD: minioautumn
+    entrypoint: >
+      /bin/sh -c "
+      /usr/bin/mc config host add minio http://minio:9000 $MINIO_ROOT_USER $MINIO_ROOT_PASSWORD;
+      while ! /usr/bin/mc ready minio; do echo 'Waiting minio...' && sleep 1; done;
+      /usr/bin/mc mb minio/revolt-uploads;
+      exit 0;
+      "
+
+  # Mock SMTP server
+  maildev:
+    image: soulteary/maildev
+    ports:
+      - "14025:25"
+      - "14080:8080"
+    environment:
+      MAILDEV_SMTP_PORT: 25
+      MAILDEV_WEB_PORT: 8080
+      MAILDEV_INCOMING_USER: smtp
+      MAILDEV_INCOMING_PASS: smtp
--- a/crates/bindings/node/Cargo.toml
+++ b/crates/bindings/node/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "revolt-nodejs-bindings"
-version = "0.7.16"
+version = "0.7.17"
 description = "Node.js bindings for the Revolt software"
 authors = ["Paul Makles <me@insrt.uk>"]
 license = "MIT"
@@ -20,5 +20,6 @@ serde = { version = "1", features = ["derive"] }

 async-std = "1.12.0"

-revolt-result = { version = "0.7.16", path = "../../core/result" }
-revolt-database = { version = "0.7.16", path = "../../core/database" }
+revolt-config = { version = "0.7.17", path = "../../core/config" }
+revolt-result = { version = "0.7.17", path = "../../core/result" }
+revolt-database = { version = "0.7.17", path = "../../core/database" }
--- a/crates/bindings/node/index.d.ts
+++ b/crates/bindings/node/index.d.ts
@@ -18,6 +18,12 @@ export declare interface Err {
  location: string;
 }

+/**
+ * Initialises background tasks and logging, must be called before anything else!
+ * Can be called multiple times!
+ */
+export declare function init();
+
 /**
 * Gets a new handle to the Revolt database
 * @returns {Database} Handle
@@ -64,3 +70,15 @@ export declare function proc_channels_create_dm(
  userA: string,
  userB: string
 ): Promise<Channel & { error: Err }>;
+
+/**
+ * Suspend a user
+ * @param {string} user User
+ * @param {number} duration Duration (in days), set to 0 for indefinite
+ * @param {string} reason Pipe-separated list of reasons (e.g. reason1|reason2|reason3)
+ */
+export declare function proc_users_suspend(
+  user: OpaqueUser,
+  duration: number,
+  reason: string
+): Promise<{ error: Err }>;
--- a/crates/bindings/node/package.json
+++ b/crates/bindings/node/package.json
@@ -1,6 +1,6 @@
 {
  "name": "revolt-nodejs-bindings",
-  "version": "0.7.15",
+  "version": "0.7.15-rev0.0.3",
  "description": "Node.js bindings for the Revolt software",
  "main": "index.node",
  "scripts": {
--- a/crates/bindings/node/src/lib.rs
+++ b/crates/bindings/node/src/lib.rs
@@ -1,9 +1,35 @@
 #[macro_use]
 extern crate serde;

+use std::sync::OnceLock;
+
 use neon::prelude::*;
 use revolt_database::{Database, DatabaseInfo};

+fn js_init(mut cx: FunctionContext) -> JsResult<JsUndefined> {
+    static INIT: OnceLock<()> = OnceLock::new();
+    if INIT.get().is_none() {
+        INIT.get_or_init(|| {
+            async_std::task::block_on(async {
+                revolt_config::configure!(api);
+
+                match DatabaseInfo::Auto.connect().await {
+                    Ok(db) => {
+                        let authifier_db = db.clone().to_authifier().await.database;
+                        revolt_database::tasks::start_workers(db, authifier_db);
+                        Ok(())
+                    }
+                    Err(err) => Err(err),
+                }
+            })
+            .or_else(|err| cx.throw_error(err))
+            .unwrap();
+        });
+    }
+
+    Ok(cx.undefined())
+}
+
 struct DatabaseBinding(Database, Channel);
 impl Finalize for DatabaseBinding {}
 impl DatabaseBinding {
@@ -136,6 +162,9 @@ macro_rules! shim {

 #[neon::main]
 fn main(mut cx: ModuleContext) -> NeonResult<()> {
+    // initialise required background stuff
+    cx.export_function("init", js_init)?;
+
    // database & model stuff
    cx.export_function("database", js_database)?;
    cx.export_function("model_data", js_data)?;
@@ -178,10 +207,12 @@ fn main(mut cx: ModuleContext) -> NeonResult<()> {
    shim!(
        cx,
        proc_users_suspend,
-        ,
+        duration JsNumber 1
+        reason JsString 2,
        user User 0,
        |db| async move {
-            user.suspend(&db).await
+            let duration = duration as usize;
+            user.suspend(&db, if duration == 0 { None } else { Some(duration) }, Some(reason.split('|').map(|x| x.to_owned()).collect())).await
        },
        &user,
    );
--- a/crates/bonfire/Cargo.toml
+++ b/crates/bonfire/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "revolt-bonfire"
-version = "0.7.16"
+version = "0.7.17"
 license = "AGPL-3.0-or-later"
 edition = "2021"

@@ -41,7 +41,7 @@ revolt-result = { path = "../core/result" }
 revolt-models = { path = "../core/models" }
 revolt-config = { path = "../core/config" }
 revolt-database = { path = "../core/database" }
-revolt-permissions = { version = "0.7.16", path = "../core/permissions" }
+revolt-permissions = { version = "0.7.17", path = "../core/permissions" }
 revolt-presence = { path = "../core/presence", features = ["redis-is-patched"] }

 # redis
--- a/crates/bonfire/Dockerfile
+++ b/crates/bonfire/Dockerfile
@@ -2,10 +2,9 @@
 FROM ghcr.io/revoltchat/base:latest AS builder

 # Bundle Stage
-FROM debian:bullseye-slim
-RUN apt-get update && \
-    apt-get install -y ca-certificates && \
-    apt-get clean
+FROM gcr.io/distroless/cc-debian12:nonroot
 COPY --from=builder /home/rust/src/target/release/revolt-bonfire ./
-EXPOSE 9000
+
+EXPOSE 14703
+USER nonroot
 CMD ["./revolt-bonfire"]
--- a/crates/bonfire/src/main.rs
+++ b/crates/bonfire/src/main.rs
@@ -22,8 +22,8 @@ async fn main() {
    clear_region(None).await;

    // Setup a TCP listener to accept WebSocket connections on.
-    // By default, we bind to port 9000 on all interfaces.
-    let bind = env::var("HOST").unwrap_or_else(|_| "0.0.0.0:9000".into());
+    // By default, we bind to port 14703 on all interfaces.
+    let bind = env::var("HOST").unwrap_or_else(|_| "0.0.0.0:14703".into());
    info!("Listening on host {bind}");
    let try_socket = TcpListener::bind(bind).await;
    let listener = try_socket.expect("Failed to bind");
--- a/crates/bonfire/src/websocket.rs
+++ b/crates/bonfire/src/websocket.rs
@@ -14,6 +14,7 @@ use futures::{
    FutureExt, SinkExt, StreamExt, TryStreamExt,
 };
 use redis_kiss::{PayloadType, REDIS_PAYLOAD_TYPE, REDIS_URI};
+use revolt_config::report_internal_error;
 use revolt_database::{
    events::{client::EventV1, server::ClientMessage},
    Database, User, UserHint,
@@ -99,27 +100,21 @@ pub async fn client(db: &'static Database, stream: TcpStream, addr: SocketAddr)
    let user_id = state.cache.user_id.clone();

    // Notify socket we have authenticated.
-    if let Err(err) = write.send(config.encode(&EventV1::Authenticated)).await {
-        error!("Failed to write: {err:?}");
-        sentry::capture_error(&err);
+    if report_internal_error!(write.send(config.encode(&EventV1::Authenticated)).await).is_err() {
        return;
    }

    // Download required data to local cache and send Ready payload.
-    let ready_payload = match state
-        .generate_ready_payload(db, config.get_ready_payload_fields())
-        .await
-    {
+    let ready_payload = match report_internal_error!(
+        state
+            .generate_ready_payload(db, config.get_ready_payload_fields())
+            .await
+    ) {
        Ok(ready_payload) => ready_payload,
-        Err(err) => {
-            sentry::capture_error(&err);
-            return;
-        }
+        Err(_) => return,
    };

-    if let Err(err) = write.send(config.encode(&ready_payload)).await {
-        error!("Failed to write: {err:?}");
-        sentry::capture_error(&err);
+    if report_internal_error!(write.send(config.encode(&ready_payload)).await).is_err() {
        return;
    }

@@ -214,21 +209,16 @@ async fn listener(
    write: &Mutex<WsWriter>,
 ) {
    let redis_config = RedisConfig::from_url(&REDIS_URI).unwrap();
-    let subscriber = match fred::types::Builder::from_config(redis_config).build_subscriber_client()
-    {
+    let subscriber = match report_internal_error!(
+        fred::types::Builder::from_config(redis_config).build_subscriber_client()
+    ) {
        Ok(subscriber) => subscriber,
-        Err(err) => {
-            error!("Failed to build a subscriber: {err:?}");
-            sentry::capture_error(&err);
-            return;
-        }
+        Err(_) => return,
    };

-    if let Err(err) = subscriber.init().await {
-        error!("Failed to init subscriber: {err:?}");
-        sentry::capture_error(&err);
+    if report_internal_error!(subscriber.init().await).is_err() {
        return;
-    };
+    }

    // Handle Redis connection dropping
    let (clean_up_s, clean_up_r) = async_channel::bounded(1);
@@ -249,17 +239,13 @@ async fn listener(
        // Check for state changes for subscriptions.
        match state.apply_state().await {
            SubscriptionStateChange::Reset => {
-                if let Err(err) = subscriber.unsubscribe_all().await {
-                    error!("Unsubscribe all failed: {err:?}");
-                    sentry::capture_error(&err);
+                if report_internal_error!(subscriber.unsubscribe_all().await).is_err() {
                    break 'out;
                }

                let subscribed = state.subscribed.read().await;
                for id in subscribed.iter() {
-                    if let Err(err) = subscriber.subscribe(id).await {
-                        error!("Subscribe failed: {err:?}");
-                        sentry::capture_error(&err);
+                    if report_internal_error!(subscriber.subscribe(id).await).is_err() {
                        break 'out;
                    }
                }
@@ -272,9 +258,7 @@ async fn listener(
                    #[cfg(debug_assertions)]
                    info!("{addr:?} unsubscribing from {id}");

-                    if let Err(err) = subscriber.unsubscribe(id).await {
-                        error!("Unsubscribe failed: {err:?}");
-                        sentry::capture_error(&err);
+                    if report_internal_error!(subscriber.unsubscribe(id).await).is_err() {
                        break 'out;
                    }
                }
@@ -283,9 +267,7 @@ async fn listener(
                    #[cfg(debug_assertions)]
                    info!("{addr:?} subscribing to {id}");

-                    if let Err(err) = subscriber.subscribe(id).await {
-                        error!("Subscribe failed: {err:?}");
-                        sentry::capture_error(&err);
+                    if report_internal_error!(subscriber.subscribe(id).await).is_err() {
                        break 'out;
                    }
                }
@@ -310,13 +292,9 @@ async fn listener(
            _ = t2 => {},
            message = t1 => {
                // Handle incoming events.
-                let message = match message {
+                let message = match report_internal_error!(message) {
                    Ok(message) => message,
-                    Err(e) => {
-                        error!("Error while consuming pub/sub messages: {e:?}");
-                        sentry::capture_error(&e);
-                        break 'out;
-                    }
+                    Err(_) => break 'out
                };

                let event = match *REDIS_PAYLOAD_TYPE {
@@ -393,10 +371,7 @@ async fn listener(
        }
    }

-    if let Err(err) = subscriber.quit().await {
-        error!("{}", err);
-        sentry::capture_error(&err);
-    }
+    report_internal_error!(subscriber.quit().await).ok();
 }

 #[allow(clippy::too_many_arguments)]
--- a/crates/core/config/Cargo.toml
+++ b/crates/core/config/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "revolt-config"
-version = "0.7.16"
+version = "0.7.17"
 edition = "2021"
 license = "MIT"
 authors = ["Paul Makles <me@insrt.uk>"]
@@ -9,6 +9,7 @@ description = "Revolt Backend: Configuration"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

 [features]
+report-macros = ["revolt-result"]
 test = ["async-std"]
 default = ["test"]

@@ -32,3 +33,6 @@ pretty_env_logger = "0.4.0"

 # Sentry
 sentry = "0.31.5"
+
+# Core
+revolt-result = { version = "0.7.17", path = "../result", optional = true }
--- a/crates/core/config/Revolt.toml
+++ b/crates/core/config/Revolt.toml
@@ -34,9 +34,9 @@ host = ""
 username = ""
 password = ""
 from_address = "noreply@example.com"
-reply_to = "noreply@example.com"
-port = 587
-use_tls = true
+# reply_to = "noreply@example.com"
+# port = 587
+# use_tls = true

 [api.vapid]
 # Generate your own keys:
@@ -88,8 +88,28 @@ max_concurrent_connections = 50
 # Encryption key for stored files
 # Generate your own key using `openssl rand -base64 32`
 encryption_key = "qcuMA+ssxhMyKaNAKBGFfryfFtUH8NDlamQyDwGW6fU="
+# Quality used for lossy WebP previews (set to 100 for lossless)
+webp_quality = 80.0
+# Mime types that cannot be uploaded or served
+#
+# Example for Windows executables and Android installation files:
+# ["application/vnd.microsoft.portable-executable", "application/vnd.android.package-archive"]
+blocked_mime_types = []
+# ClamAV service
+# hostname:port
+clamd_host = ""
+# Mime types that should be virus scanned
+#
+# Leave empty to scan all file types
+scan_mime_types = [
+    "application/vnd.microsoft.portable-executable",
+    "application/vnd.android.package-archive",
+    "application/zip",
+]

 [files.limit]
+# Minimum file size (in bytes)
+min_file_size = 1
 # Minimum image resolution
 min_resolution = [1, 1]
 # Maximum MP of images
@@ -118,13 +138,13 @@ emojis = [128, 128]
 # - default_bucket matches the name of the bucket you've created

 # S3 protocol endpoint
-endpoint = ""
+endpoint = "http://minio:9000"
 # S3 region name
-region = ""
+region = "minio"
 # S3 protocol key ID
-access_key_id = ""
+access_key_id = "minioautumn"
 # S3 protocol access key
-secret_access_key = ""
+secret_access_key = "minioautumn"
 # Bucket to upload to by default
 default_bucket = "revolt-uploads"

@@ -143,44 +163,70 @@ server_emoji = 100
 server_roles = 200
 server_channels = 200

-# How many days since creation a user is considered new
-new_user_days = 3
+# How many hours since creation a user is considered new
+new_user_hours = 72

 # Maximum permissible body size in bytes for uploads
 # (should be greater than any one file upload limit)
 body_limit_size = 20_000_000

 [features.limits.new_user]
+# Limits imposed on new users
+
+# Number of outgoing friend requests permitted at any time
 outgoing_friend_requests = 5

+# Maximum number of owned bots
 bots = 2
-message_length = 2000
-message_attachments = 5
-servers = 100

-attachment_size = 20_000_000
-avatar_size = 4_000_000
-background_size = 6_000_000
-icon_size = 2_500_000
-banner_size = 6_000_000
-emoji_size = 500_000
+# Message content length
+message_length = 2000
+
+# Number of attachments that can be included
+message_attachments = 5
+
+# Maximum number of servers the user can create/join
+servers = 50
+
+[features.limits.new_user.file_upload_size_limit]
+# Maximum file size limits (in bytes)
+attachments = 20_000_000
+avatars = 4_000_000
+backgrounds = 6_000_000
+icons = 2_500_000
+banners = 6_000_000
+emojis = 500_000

 [features.limits.default]
+# Limits imposed on users by default
+
+# Number of outgoing friend requests permitted at any time
 outgoing_friend_requests = 10

+# Maximum number of owned bots
 bots = 5
+
+# Message content length
 message_length = 2000
+
+# Number of attachments that can be included
 message_attachments = 5
+
+# Maximum number of servers the user can create/join
 servers = 100

-attachment_size = 20_000_000
-avatar_size = 4_000_000
-background_size = 6_000_000
-icon_size = 2_500_000
-banner_size = 6_000_000
-emoji_size = 500_000
+[features.limits.default.file_upload_size_limit]
+# Maximum file size limits (in bytes)
+attachments = 20_000_000
+avatars = 4_000_000
+backgrounds = 6_000_000
+icons = 2_500_000
+banners = 6_000_000
+emojis = 500_000

 [sentry]
 # Configuration for Sentry error reporting
 api = ""
 events = ""
+files = ""
+proxy = ""
--- a/crates/core/config/src/lib.rs
+++ b/crates/core/config/src/lib.rs
@@ -6,11 +6,49 @@ use futures_locks::RwLock;
 use once_cell::sync::Lazy;
 use serde::Deserialize;

-pub use sentry::capture_error;
+pub use sentry::{capture_error, capture_message, Level};

-#[cfg(not(debug_assertions))]
-use std::env;
+#[cfg(feature = "report-macros")]
+#[macro_export]
+macro_rules! report_error {
+    ( $expr: expr, $error: ident $( $tt:tt )? ) => {
+        $expr
+            .inspect_err(|err| {
+                $crate::capture_message(
+                    &format!("{err:?} ({}:{}:{})", file!(), line!(), column!()),
+                    $crate::Level::Error,
+                );
+            })
+            .map_err(|_| ::revolt_result::create_error!($error))
+    };
+}

+#[cfg(feature = "report-macros")]
+#[macro_export]
+macro_rules! report_internal_error {
+    ( $expr: expr ) => {
+        $expr
+            .inspect_err(|err| {
+                $crate::capture_message(
+                    &format!("{err:?} ({}:{}:{})", file!(), line!(), column!()),
+                    $crate::Level::Error,
+                );
+            })
+            .map_err(|_| ::revolt_result::create_error!(InternalError))
+    };
+}
+
+/// Paths to search for configuration
+static CONFIG_SEARCH_PATHS: [&str; 3] = [
+    // current working directory
+    "Revolt.toml",
+    // current working directory - overrides file
+    "Revolt.overrides.toml",
+    // root directory, for Docker containers
+    "/Revolt.toml",
+];
+
+/// Configuration builder
 static CONFIG_BUILDER: Lazy<RwLock<Config>> = Lazy::new(|| {
    RwLock::new({
        let mut builder = Config::builder().add_source(File::from_str(
@@ -23,16 +61,18 @@ static CONFIG_BUILDER: Lazy<RwLock<Config>> = Lazy::new(|| {
                include_str!("../Revolt.test.toml"),
                FileFormat::Toml,
            ));
-        } else if std::path::Path::new("Revolt.toml").exists() {
-            builder = builder.add_source(File::new("Revolt.toml", FileFormat::Toml));
+        }
+
+        for path in CONFIG_SEARCH_PATHS {
+            if std::path::Path::new(path).exists() {
+                builder = builder.add_source(File::new(path, FileFormat::Toml));
+            }
        }

        builder.build().unwrap()
    })
 });

-// https://gifbox.me/view/gT5mqxYKCZv-twilight-meow
-
 #[derive(Deserialize, Debug, Clone)]
 pub struct Database {
    pub mongodb: String,
@@ -124,6 +164,36 @@ pub struct Api {
    pub workers: ApiWorkers,
 }

+#[derive(Deserialize, Debug, Clone)]
+pub struct FilesLimit {
+    pub min_file_size: usize,
+    pub min_resolution: [usize; 2],
+    pub max_mega_pixels: usize,
+    pub max_pixel_side: usize,
+}
+
+#[derive(Deserialize, Debug, Clone)]
+pub struct FilesS3 {
+    pub endpoint: String,
+    pub region: String,
+    pub access_key_id: String,
+    pub secret_access_key: String,
+    pub default_bucket: String,
+}
+
+#[derive(Deserialize, Debug, Clone)]
+pub struct Files {
+    pub encryption_key: String,
+    pub webp_quality: f32,
+    pub blocked_mime_types: Vec<String>,
+    pub clamd_host: String,
+    pub scan_mime_types: Vec<String>,
+
+    pub limit: FilesLimit,
+    pub preview: HashMap<String, [usize; 2]>,
+    pub s3: FilesS3,
+}
+
 #[derive(Deserialize, Debug, Clone)]
 pub struct GlobalLimits {
    pub group_size: usize,
@@ -134,7 +204,7 @@ pub struct GlobalLimits {
    pub server_roles: usize,
    pub server_channels: usize,

-    pub new_user_days: usize,
+    pub new_user_hours: usize,

    pub body_limit_size: usize,
 }
@@ -148,12 +218,7 @@ pub struct FeaturesLimits {
    pub message_attachments: usize,
    pub servers: usize,

-    pub attachment_size: usize,
-    pub avatar_size: usize,
-    pub background_size: usize,
-    pub icon_size: usize,
-    pub banner_size: usize,
-    pub emoji_size: usize,
+    pub file_upload_size_limit: HashMap<String, usize>,
 }

 #[derive(Deserialize, Debug, Clone)]
@@ -177,6 +242,8 @@ pub struct Features {
 pub struct Sentry {
    pub api: String,
    pub events: String,
+    pub files: String,
+    pub proxy: String,
 }

 #[derive(Deserialize, Debug, Clone)]
@@ -184,6 +251,7 @@ pub struct Settings {
    pub database: Database,
    pub hosts: Hosts,
    pub api: Api,
+    pub files: Files,
    pub features: Features,
    pub sentry: Sentry,
 }
@@ -191,22 +259,10 @@ pub struct Settings {
 impl Settings {
    pub fn preflight_checks(&self) {
        if self.api.smtp.host.is_empty() {
-            #[cfg(not(debug_assertions))]
-            if !env::var("REVOLT_UNSAFE_NO_EMAIL").map_or(false, |v| v == *"1") {
-                panic!("Running in production without email is not recommended, set REVOLT_UNSAFE_NO_EMAIL=1 to override.");
-            }
-
-            #[cfg(debug_assertions)]
            log::warn!("No SMTP settings specified! Remember to configure email.");
        }

        if self.api.security.captcha.hcaptcha_key.is_empty() {
-            #[cfg(not(debug_assertions))]
-            if !env::var("REVOLT_UNSAFE_NO_CAPTCHA").map_or(false, |v| v == *"1") {
-                panic!("Running in production without CAPTCHA is not recommended, set REVOLT_UNSAFE_NO_CAPTCHA=1 to override.");
-            }
-
-            #[cfg(debug_assertions)]
            log::warn!("No Captcha key specified! Remember to add hCaptcha key.");
        }
    }
@@ -240,6 +296,12 @@ pub async fn setup_logging(release: &'static str, dsn: String) -> Option<sentry:
        std::env::set_var("ROCKET_ADDRESS", "0.0.0.0");
    }

+    if std::env::var("REDIS_URL").is_err() {
+        // Configure redis-kiss library
+        let config = config().await;
+        std::env::set_var("REDIS_URI", config.database.redis);
+    }
+
    pretty_env_logger::init();
    log::info!("Starting {release}");

--- a/crates/core/database/Cargo.toml
+++ b/crates/core/database/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "revolt-database"
-version = "0.7.16"
+version = "0.7.17"
 edition = "2021"
 license = "AGPL-3.0-or-later"
 authors = ["Paul Makles <me@insrt.uk>"]
@@ -16,6 +16,7 @@ mongodb = ["dep:mongodb", "bson"]
 tasks = ["isahc", "linkify", "url-escape"]
 async-std-runtime = ["async-std"]
 rocket-impl = ["rocket", "schemars", "revolt_okapi", "revolt_rocket_okapi"]
+axum-impl = ["axum"]
 redis-is-patched = ["revolt-presence/redis-is-patched"]

 # Default Features
@@ -23,13 +24,15 @@ default = ["mongodb", "async-std-runtime", "tasks"]

 [dependencies]
 # Core
-revolt-config = { version = "0.7.16", path = "../config" }
-revolt-result = { version = "0.7.16", path = "../result" }
-revolt-models = { version = "0.7.16", path = "../models", features = [
+revolt-config = { version = "0.7.17", path = "../config", features = [
+    "report-macros",
+] }
+revolt-result = { version = "0.7.17", path = "../result" }
+revolt-models = { version = "0.7.17", path = "../models", features = [
    "validator",
 ] }
-revolt-presence = { version = "0.7.16", path = "../presence" }
-revolt-permissions = { version = "0.7.16", path = "../permissions", features = [
+revolt-presence = { version = "0.7.17", path = "../presence" }
+revolt-permissions = { version = "0.7.17", path = "../permissions", features = [
    "serde",
    "bson",
 ] }
@@ -76,6 +79,9 @@ async-recursion = "1.0.4"
 # Async
 async-std = { version = "1.8.0", features = ["attributes"], optional = true }

+# Axum Impl
+axum = { version = "0.7.5", optional = true }
+
 # Rocket Impl
 schemars = { version = "0.8.8", optional = true }
 rocket = { version = "0.5.0-rc.2", default-features = false, features = [
--- a/crates/core/database/src/drivers/mod.rs
+++ b/crates/core/database/src/drivers/mod.rs
@@ -1,6 +1,14 @@
 mod mongodb;
 mod reference;

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

@@ -87,3 +95,87 @@ 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 {
+            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@revolt.chat".into()),
+                        ),
+                        port: config.api.smtp.port,
+                        use_tls: config.api.smtp.use_tls,
+                    },
+                    expiry: Default::default(),
+                    templates: Templates {
+                        verify: Template {
+                            title: "Verify your Revolt 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 Revolt password.".into(),
+                            text: include_str!("../../templates/reset.txt").into(),
+                            url: format!("{}/login/reset/", config.hosts.app),
+                            html: Some(include_str!("../../templates/reset.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 {
+                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(),
+                Database::MongoDb(MongoDb(client, _)) => authifier::Database::MongoDb(
+                    authifier::database::MongoDb(client.database("revolt")),
+                ),
+            },
+            config: auth_config,
+            event_channel: Some(crate::tasks::authifier_relay::sender()),
+        }
+    }
+}
--- a/crates/core/database/src/drivers/reference.rs
+++ b/crates/core/database/src/drivers/reference.rs
@@ -3,7 +3,7 @@ use std::{collections::HashMap, sync::Arc};
 use futures::lock::Mutex;

 use crate::{
-    Bot, Channel, ChannelCompositeKey, ChannelUnread, Emoji, File, Invite, Member,
+    Bot, Channel, ChannelCompositeKey, ChannelUnread, Emoji, File, FileHash, Invite, Member,
    MemberCompositeKey, Message, RatelimitEvent, Report, Server, ServerBan, Snapshot, User,
    UserSettings, Webhook,
 };
@@ -18,6 +18,7 @@ database_derived!(
        pub channel_unreads: Arc<Mutex<HashMap<ChannelCompositeKey, ChannelUnread>>>,
        pub channel_webhooks: Arc<Mutex<HashMap<String, Webhook>>>,
        pub emojis: Arc<Mutex<HashMap<String, Emoji>>>,
+        pub file_hashes: Arc<Mutex<HashMap<String, FileHash>>>,
        pub files: Arc<Mutex<HashMap<String, File>>>,
        pub messages: Arc<Mutex<HashMap<String, Message>>>,
        pub ratelimit_events: Arc<Mutex<HashMap<String, RatelimitEvent>>>,
--- a/crates/core/database/src/lib.rs
+++ b/crates/core/database/src/lib.rs
@@ -16,6 +16,8 @@ extern crate revolt_optional_struct;
 #[macro_use]
 extern crate revolt_result;

+pub use iso8601_timestamp;
+
 #[cfg(feature = "mongodb")]
 pub use mongodb;

@@ -91,4 +93,4 @@ pub fn if_false(t: &bool) -> bool {
 /// Utility function to check if an option doesnt contain true
 pub fn if_option_false(t: &Option<bool>) -> bool {
    t != &Some(true)
-}
+}
--- a/crates/core/database/src/models/admin_migrations/ops/mongodb/init.rs
+++ b/crates/core/database/src/models/admin_migrations/ops/mongodb/init.rs
@@ -56,6 +56,10 @@ pub async fn create_database(db: &MongoDb) {
        .await
        .expect("Failed to create attachments collection.");

+    db.create_collection("attachment_hashes", None)
+        .await
+        .expect("Failed to create attachment_hashes collection.");
+
    db.create_collection("user_settings", None)
        .await
        .expect("Failed to create user_settings collection.");
@@ -209,6 +213,46 @@ pub async fn create_database(db: &MongoDb) {
    .await
    .expect("Failed to create server_members index.");

+    db.run_command(
+        doc! {
+            "createIndexes": "attachments",
+            "indexes": [
+                {
+                    "key": {
+                        "hash": 1_i32
+                    },
+                    "name": "hash"
+                },
+                {
+                    "key": {
+                        "used_for.id": 1_i32
+                    },
+                    "name": "used_for_id"
+                }
+            ]
+        },
+        None,
+    )
+    .await
+    .expect("Failed to create attachments index.");
+
+    db.run_command(
+        doc! {
+            "createIndexes": "attachment_hashes",
+            "indexes": [
+                {
+                    "key": {
+                        "processed_hash": 1_i32
+                    },
+                    "name": "processed_hash"
+                }
+            ]
+        },
+        None,
+    )
+    .await
+    .expect("Failed to create attachment_hashes index.");
+
    db.collection("migrations")
        .insert_one(
            doc! {
--- a/crates/core/database/src/models/admin_migrations/ops/mongodb/scripts.rs
+++ b/crates/core/database/src/models/admin_migrations/ops/mongodb/scripts.rs
@@ -5,7 +5,7 @@ use crate::{
        bson::{doc, from_bson, from_document, to_document, Bson, DateTime, Document},
        options::FindOptions,
    },
-    Invite, MongoDb, DISCRIMINATOR_SEARCH_SPACE,
+    AbstractChannels, AbstractServers, Channel, Invite, MongoDb, DISCRIMINATOR_SEARCH_SPACE,
 };
 use bson::oid::ObjectId;
 use futures::StreamExt;
@@ -20,7 +20,7 @@ struct MigrationInfo {
    revision: i32,
 }

-pub const LATEST_REVISION: i32 = 28;
+pub const LATEST_REVISION: i32 = 30;

 pub async fn migrate_database(db: &MongoDb) {
    let migrations = db.col::<Document>("migrations");
@@ -1094,6 +1094,121 @@ pub async fn run_migrations(db: &MongoDb, revision: i32) -> i32 {
            .expect("Failed to create message index.");
    }

+    if revision <= 28 {
+        info!("Running migration [revision 28 / 10-09-2024]: Add support for new Autumn.");
+
+        db.db()
+            .create_collection("attachment_hashes", None)
+            .await
+            .ok();
+
+        db.db()
+            .run_command(
+                doc! {
+                    "createIndexes": "attachments",
+                    "indexes": [
+                        {
+                            "key": {
+                                "hash": 1_i32
+                            },
+                            "name": "hash"
+                        }
+                    ]
+                },
+                None,
+            )
+            .await
+            .expect("Failed to create attachments index.");
+
+        db.db()
+            .run_command(
+                doc! {
+                    "createIndexes": "attachment_hashes",
+                    "indexes": [
+                        {
+                            "key": {
+                                "processed_hash": 1_i32
+                            },
+                            "name": "processed_hash"
+                        }
+                    ]
+                },
+                None,
+            )
+            .await
+            .expect("Failed to create attachment_hashes index.");
+    }
+
+    if revision <= 29 {
+        info!("Running migration [revision 29 / 29-09-2024]: Add creator_id to webhooks.");
+
+        #[derive(serde::Serialize, serde::Deserialize)]
+        struct WebhookShell {
+            _id: String,
+            channel_id: String,
+        }
+
+        let invites = db
+            .db()
+            .collection::<WebhookShell>("channel_webhooks")
+            .find(doc! {}, None)
+            .await
+            .expect("webhooks")
+            .filter_map(|s| async { s.ok() })
+            .collect::<Vec<WebhookShell>>()
+            .await;
+
+        for invite in invites {
+            let channel = db.fetch_channel(&invite.channel_id).await.expect("channel");
+            let creator_id = match channel {
+                Channel::Group { owner, .. } => owner,
+                Channel::TextChannel { server, .. } | Channel::VoiceChannel { server, .. } => {
+                    let server = db.fetch_server(&server).await.expect("server");
+                    server.owner
+                }
+                _ => unreachable!("not server or group channel!"),
+            };
+
+            db.db()
+                .collection::<Document>("channel_webhooks")
+                .update_one(
+                    doc! {
+                        "_id": invite._id,
+                    },
+                    doc! {
+                        "$set" : {
+                            "creator_id": creator_id
+                        }
+                    },
+                    None,
+                )
+                .await
+                .expect("update webhook");
+        }
+    }
+
+    if revision <= 30 {
+        info!("Running migration [revision 30 / 29-09-2024]: Add index for used_for.id to attachments.");
+
+        db.db()
+            .run_command(
+                doc! {
+                    "createIndexes": "attachments",
+                    "indexes": [
+                        {
+                            "key": {
+                                "used_for.id": 1_i32
+                            },
+                            "name": "used_for_id"
+                        }
+                    ]
+                },
+                None,
+            )
+            .await
+            .expect("Failed to create attachments index.");
+    }
+
    // Need to migrate fields on attachments, change `user_id`, `object_id`, etc to `parent`.

    // Reminder to update LATEST_REVISION when adding new migrations.
--- a/crates/core/database/src/models/channel_webhooks/model.rs
+++ b/crates/core/database/src/models/channel_webhooks/model.rs
@@ -17,6 +17,9 @@ auto_derived_partial!(
        #[serde(skip_serializing_if = "Option::is_none")]
        pub avatar: Option<File>,

+        /// User that created this webhook
+        pub creator_id: String,
+
        /// The channel this webhook belongs to
        pub channel_id: String,

@@ -43,6 +46,7 @@ impl Default for Webhook {
            id: Default::default(),
            name: Default::default(),
            avatar: None,
+            creator_id: Default::default(),
            channel_id: Default::default(),
            permissions: Default::default(),
            token: Default::default(),
@@ -70,7 +74,7 @@ impl Webhook {
        if self.token.as_deref() == Some(token) {
            Ok(())
        } else {
-            Err(create_error!(InvalidCredentials))
+            Err(create_error!(NotAuthenticated))
        }
    }

--- a/crates/core/database/src/models/channels/ops/mongodb.rs
+++ b/crates/core/database/src/models/channels/ops/mongodb.rs
@@ -261,7 +261,7 @@ impl AbstractChannels for MongoDb {

        // Delete associated attachments
        self.delete_many_attachments(doc! {
-            "object_id": &id
+            "used_for.id": &id
        })
        .await?;

--- a/crates/core/database/src/models/file_hashes/mod.rs
+++ b/crates/core/database/src/models/file_hashes/mod.rs
@@ -0,0 +1,5 @@
+mod model;
+mod ops;
+
+pub use model::*;
+pub use ops::*;
--- a/crates/core/database/src/models/file_hashes/model.rs
+++ b/crates/core/database/src/models/file_hashes/model.rs
@@ -0,0 +1,92 @@
+use iso8601_timestamp::Timestamp;
+
+use crate::File;
+
+auto_derived_partial!(
+    /// File hash
+    pub struct FileHash {
+        /// Sha256 hash of the file
+        #[serde(rename = "_id")]
+        pub id: String,
+        /// Sha256 hash of file after it has been processed
+        pub processed_hash: String,
+
+        /// When this file was created in system
+        pub created_at: Timestamp,
+
+        /// The bucket this file is stored in
+        pub bucket_id: String,
+        /// The path at which this file exists in
+        pub path: String,
+        /// Cryptographic nonce used to encrypt this file
+        pub iv: String,
+
+        /// Parsed metadata of this file
+        pub metadata: Metadata,
+        /// Raw content type of this file
+        pub content_type: String,
+        /// Size of this file (in bytes)
+        pub size: isize,
+    },
+    "PartialFile"
+);
+
+auto_derived!(
+    /// Metadata associated with a file
+    #[serde(tag = "type")]
+    #[derive(Default)]
+    pub enum Metadata {
+        /// File is just a generic uncategorised file
+        #[default]
+        File,
+        /// File contains textual data and should be displayed as such
+        Text,
+        /// File is an image with specific dimensions
+        Image {
+            width: isize,
+            height: isize,
+            // animated: bool // TODO: https://docs.rs/image/latest/image/trait.AnimationDecoder.html
+        },
+        /// File is a video with specific dimensions
+        Video { width: isize, height: isize },
+        /// File is audio
+        Audio,
+    }
+);
+
+impl FileHash {
+    /// Create a file from a file hash
+    pub fn into_file(
+        &self,
+        id: String,
+        tag: String,
+        filename: String,
+        uploader_id: String,
+    ) -> File {
+        File {
+            id,
+            tag,
+            filename,
+            hash: Some(self.id.clone()),
+
+            uploaded_at: Some(Timestamp::now_utc()),
+            uploader_id: Some(uploader_id),
+
+            used_for: None,
+
+            deleted: None,
+            reported: None,
+
+            // TODO: remove this data
+            metadata: self.metadata.clone(),
+            content_type: self.content_type.clone(),
+            size: self.size,
+
+            // TODO: superseded by "used_for"
+            message_id: None,
+            object_id: None,
+            server_id: None,
+            user_id: None,
+        }
+    }
+}
--- a/crates/core/database/src/models/file_hashes/ops.rs
+++ b/crates/core/database/src/models/file_hashes/ops.rs
@@ -0,0 +1,18 @@
+use revolt_result::Result;
+
+use crate::FileHash;
+
+mod mongodb;
+mod reference;
+
+#[async_trait]
+pub trait AbstractAttachmentHashes: Sync + Send {
+    /// Insert a new attachment hash into the database.
+    async fn insert_attachment_hash(&self, hash: &FileHash) -> Result<()>;
+
+    /// Fetch an attachment hash entry by sha256 hash.
+    async fn fetch_attachment_hash(&self, hash: &str) -> Result<FileHash>;
+
+    /// Update an attachment hash nonce value.
+    async fn set_attachment_hash_nonce(&self, hash: &str, nonce: &str) -> Result<()>;
+}
--- a/crates/core/database/src/models/file_hashes/ops/mongodb.rs
+++ b/crates/core/database/src/models/file_hashes/ops/mongodb.rs
@@ -0,0 +1,51 @@
+use revolt_result::Result;
+
+use crate::FileHash;
+use crate::MongoDb;
+
+use super::AbstractAttachmentHashes;
+
+static COL: &str = "attachment_hashes";
+
+#[async_trait]
+impl AbstractAttachmentHashes for MongoDb {
+    /// Insert a new attachment hash into the database.
+    async fn insert_attachment_hash(&self, hash: &FileHash) -> Result<()> {
+        query!(self, insert_one, COL, &hash).map(|_| ())
+    }
+
+    /// Fetch an attachment hash entry by sha256 hash.
+    async fn fetch_attachment_hash(&self, hash: &str) -> Result<FileHash> {
+        query!(
+            self,
+            find_one,
+            COL,
+            doc! {
+                "$or": [
+                    {"_id": hash},
+                    {"processed_hash": hash}
+                ]
+            }
+        )?
+        .ok_or_else(|| create_error!(NotFound))
+    }
+
+    /// Update an attachment hash nonce value.
+    async fn set_attachment_hash_nonce(&self, hash: &str, nonce: &str) -> Result<()> {
+        self.col::<FileHash>(COL)
+            .update_one(
+                doc! {
+                    "_id": hash
+                },
+                doc! {
+                    "$set": {
+                        "iv": nonce
+                    }
+                },
+                None,
+            )
+            .await
+            .map(|_| ())
+            .map_err(|_| create_database_error!("update_one", COL))
+    }
+}
--- a/crates/core/database/src/models/file_hashes/ops/reference.rs
+++ b/crates/core/database/src/models/file_hashes/ops/reference.rs
@@ -0,0 +1,41 @@
+use revolt_result::Result;
+
+use crate::FileHash;
+use crate::ReferenceDb;
+
+use super::AbstractAttachmentHashes;
+
+#[async_trait]
+impl AbstractAttachmentHashes for ReferenceDb {
+    /// Insert a new attachment hash into the database.
+    async fn insert_attachment_hash(&self, hash: &FileHash) -> Result<()> {
+        let mut hashes = self.file_hashes.lock().await;
+        if hashes.contains_key(&hash.id) {
+            Err(create_database_error!("insert", "attachment"))
+        } else {
+            hashes.insert(hash.id.to_string(), hash.clone());
+            Ok(())
+        }
+    }
+
+    /// Fetch an attachment hash entry by sha256 hash.
+    async fn fetch_attachment_hash(&self, hash_value: &str) -> Result<FileHash> {
+        let hashes = self.file_hashes.lock().await;
+        hashes
+            .values()
+            .cloned()
+            .find(|hash| hash.id == hash_value || hash.processed_hash == hash_value)
+            .ok_or(create_error!(NotFound))
+    }
+
+    /// Update an attachment hash nonce value.
+    async fn set_attachment_hash_nonce(&self, hash: &str, nonce: &str) -> Result<()> {
+        let mut hashes = self.file_hashes.lock().await;
+        if let Some(file) = hashes.get_mut(hash) {
+            file.iv = nonce.to_owned();
+            Ok(())
+        } else {
+            Err(create_error!(NotFound))
+        }
+    }
+}
--- a/crates/core/database/src/models/files/model.rs
+++ b/crates/core/database/src/models/files/model.rs
@@ -1,5 +1,6 @@
-use crate::Database;
+use crate::{Database, FileHash, Metadata};

+use iso8601_timestamp::Timestamp;
 use revolt_result::Result;

 auto_derived_partial!(
@@ -12,12 +13,18 @@ auto_derived_partial!(
        pub tag: String,
        /// Original filename
        pub filename: String,
-        /// Parsed metadata of this file
-        pub metadata: Metadata,
-        /// Raw content type of this file
-        pub content_type: String,
-        /// Size of this file (in bytes)
-        pub size: isize,
+        /// Hash of this file
+        pub hash: Option<String>, // these are Option<>s to not break file uploads on legacy Autumn
+
+        /// When this file was uploaded
+        pub uploaded_at: Option<Timestamp>, // these are Option<>s to not break file uploads on legacy Autumn
+        /// ID of user who uploaded this file
+        #[serde(skip_serializing_if = "Option::is_none")]
+        pub uploader_id: Option<String>, // these are Option<>s to not break file uploads on legacy Autumn
+
+        /// What the file was used for
+        #[serde(skip_serializing_if = "Option::is_none")]
+        pub used_for: Option<FileUsedFor>,

        /// Whether this file was deleted
        #[serde(skip_serializing_if = "Option::is_none")]
@@ -26,6 +33,14 @@ auto_derived_partial!(
        #[serde(skip_serializing_if = "Option::is_none")]
        pub reported: Option<bool>,

+        // !!! DEPRECATED:
+        /// Parsed metadata of this file
+        pub metadata: Metadata,
+        /// Raw content type of this file
+        pub content_type: String,
+        /// Size of this file (in bytes)
+        pub size: isize,
+
        // TODO: migrate this mess to having:
        // - author_id
        // - parent: Parent { Message(id), User(id), etc }
@@ -44,64 +59,184 @@ auto_derived_partial!(
 );

 auto_derived!(
-    /// Metadata associated with a file
-    #[serde(tag = "type")]
-    #[derive(Default)]
-    pub enum Metadata {
-        /// File is just a generic uncategorised file
-        #[default]
-        File,
-        /// File contains textual data and should be displayed as such
-        Text,
-        /// File is an image with specific dimensions
-        Image { width: isize, height: isize },
-        /// File is a video with specific dimensions
-        Video { width: isize, height: isize },
-        /// File is audio
-        Audio,
+    /// Type of object file was used for
+    pub enum FileUsedForType {
+        Message,
+        ServerBanner,
+        Emoji,
+        UserAvatar,
+        WebhookAvatar,
+        UserProfileBackground,
+        LegacyGroupIcon,
+        ChannelIcon,
+        ServerIcon,
+    }
+
+    /// Information about what the file was used for
+    pub struct FileUsedFor {
+        /// Type of the object
+        #[serde(rename = "type")]
+        pub object_type: FileUsedForType,
+        /// ID of the object
+        pub id: String,
    }
 );

 impl File {
+    /// Get the hash entry for this file
+    pub async fn as_hash(&self, db: &Database) -> Result<FileHash> {
+        db.fetch_attachment_hash(self.hash.as_ref().unwrap()).await
+    }
+
    /// Use a file for a message attachment
-    pub async fn use_attachment(db: &Database, id: &str, parent: &str) -> Result<File> {
-        db.find_and_use_attachment(id, "attachments", "message", parent)
-            .await
+    pub async fn use_attachment(
+        db: &Database,
+        id: &str,
+        parent: &str,
+        uploader_id: &str,
+    ) -> Result<File> {
+        db.find_and_use_attachment(
+            id,
+            "attachments",
+            FileUsedFor {
+                id: parent.to_owned(),
+                object_type: FileUsedForType::Message,
+            },
+            uploader_id.to_owned(),
+        )
+        .await
    }

    /// Use a file for a user profile background
-    pub async fn use_background(db: &Database, id: &str, parent: &str) -> Result<File> {
-        db.find_and_use_attachment(id, "backgrounds", "user", parent)
-            .await
+    pub async fn use_background(
+        db: &Database,
+        id: &str,
+        parent: &str,
+        uploader_id: &str,
+    ) -> Result<File> {
+        db.find_and_use_attachment(
+            id,
+            "backgrounds",
+            FileUsedFor {
+                id: parent.to_owned(),
+                object_type: FileUsedForType::UserProfileBackground,
+            },
+            uploader_id.to_owned(),
+        )
+        .await
    }

    /// Use a file for a user avatar
-    pub async fn use_avatar(db: &Database, id: &str, parent: &str) -> Result<File> {
-        db.find_and_use_attachment(id, "avatars", "user", parent)
-            .await
+    pub async fn use_user_avatar(
+        db: &Database,
+        id: &str,
+        parent: &str,
+        uploader_id: &str,
+    ) -> Result<File> {
+        db.find_and_use_attachment(
+            id,
+            "avatars",
+            FileUsedFor {
+                id: parent.to_owned(),
+                object_type: FileUsedForType::UserAvatar,
+            },
+            uploader_id.to_owned(),
+        )
+        .await
    }

-    /// Use a file for an icon
-    pub async fn use_icon(db: &Database, id: &str, parent: &str) -> Result<File> {
-        db.find_and_use_attachment(id, "icons", "object", parent)
-            .await
+    /// Use a file for a webhook avatar
+    pub async fn use_webhook_avatar(
+        db: &Database,
+        id: &str,
+        parent: &str,
+        uploader_id: &str,
+    ) -> Result<File> {
+        db.find_and_use_attachment(
+            id,
+            "avatars",
+            FileUsedFor {
+                id: parent.to_owned(),
+                object_type: FileUsedForType::WebhookAvatar,
+            },
+            uploader_id.to_owned(),
+        )
+        .await
    }

    /// Use a file for a server icon
-    pub async fn use_server_icon(db: &Database, id: &str, parent: &str) -> Result<File> {
-        db.find_and_use_attachment(id, "icons", "object", parent)
-            .await
+    pub async fn use_server_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::ServerIcon,
+            },
+            uploader_id.to_owned(),
+        )
+        .await
+    }
+
+    /// Use a file for a channel icon
+    pub async fn use_channel_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::ChannelIcon,
+            },
+            uploader_id.to_owned(),
+        )
+        .await
    }

    /// Use a file for a server banner
-    pub async fn use_banner(db: &Database, id: &str, parent: &str) -> Result<File> {
-        db.find_and_use_attachment(id, "banners", "server", parent)
-            .await
+    pub async fn use_server_banner(
+        db: &Database,
+        id: &str,
+        parent: &str,
+        uploader_id: &str,
+    ) -> Result<File> {
+        db.find_and_use_attachment(
+            id,
+            "banners",
+            FileUsedFor {
+                id: parent.to_owned(),
+                object_type: FileUsedForType::ServerBanner,
+            },
+            uploader_id.to_owned(),
+        )
+        .await
    }

    /// Use a file for an emoji
-    pub async fn use_emoji(db: &Database, id: &str, parent: &str) -> Result<File> {
-        db.find_and_use_attachment(id, "emojis", "object", parent)
-            .await
+    pub async fn use_emoji(
+        db: &Database,
+        id: &str,
+        parent: &str,
+        uploader_id: &str,
+    ) -> Result<File> {
+        db.find_and_use_attachment(
+            id,
+            "emojis",
+            FileUsedFor {
+                id: parent.to_owned(),
+                object_type: FileUsedForType::Emoji,
+            },
+            uploader_id.to_owned(),
+        )
+        .await
    }
 }
--- a/crates/core/database/src/models/files/ops.rs
+++ b/crates/core/database/src/models/files/ops.rs
@@ -2,6 +2,8 @@ use revolt_result::Result;

 use crate::File;

+use super::FileUsedFor;
+
 mod mongodb;
 mod reference;

@@ -10,13 +12,16 @@ pub trait AbstractAttachments: Sync + Send {
    /// Insert attachment into database.
    async fn insert_attachment(&self, attachment: &File) -> Result<()>;

+    /// Fetch an attachment by its id.
+    async fn fetch_attachment(&self, tag: &str, file_id: &str) -> Result<File>;
+
    /// Find an attachment by its details and mark it as used by a given parent.
    async fn find_and_use_attachment(
        &self,
        id: &str,
        tag: &str,
-        parent_type: &str,
-        parent_id: &str,
+        used_for: FileUsedFor,
+        uploader_id: String,
    ) -> Result<File>;

    /// Mark an attachment as having been reported.
--- a/crates/core/database/src/models/files/ops/mongodb.rs
+++ b/crates/core/database/src/models/files/ops/mongodb.rs
@@ -1,7 +1,10 @@
+use bson::to_document;
 use bson::Document;
+use revolt_config::report_internal_error;
 use revolt_result::Result;

 use crate::File;
+use crate::FileUsedFor;
 use crate::MongoDb;

 use super::AbstractAttachments;
@@ -15,15 +18,28 @@ impl AbstractAttachments for MongoDb {
        query!(self, insert_one, COL, &attachment).map(|_| ())
    }

+    /// Fetch an attachment by its id.
+    async fn fetch_attachment(&self, tag: &str, file_id: &str) -> Result<File> {
+        query!(
+            self,
+            find_one,
+            COL,
+            doc! {
+                "_id": file_id,
+                "tag": tag
+            }
+        )?
+        .ok_or_else(|| create_error!(NotFound))
+    }
+
    /// Find an attachment by its details and mark it as used by a given parent.
    async fn find_and_use_attachment(
        &self,
        id: &str,
        tag: &str,
-        parent_type: &str,
-        parent_id: &str,
+        used_for: FileUsedFor,
+        uploader_id: String,
    ) -> Result<File> {
-        let key = format!("{parent_type}_id");
        let file = query!(
            self,
            find_one,
@@ -31,7 +47,7 @@ impl AbstractAttachments for MongoDb {
            doc! {
                "_id": id,
                "tag": tag,
-                &key: {
+                "used_for": {
                    "$exists": false
                }
            }
@@ -45,7 +61,8 @@ impl AbstractAttachments for MongoDb {
                },
                doc! {
                    "$set": {
-                        key: parent_id
+                        "used_for": report_internal_error!(to_document(&used_for))?,
+                        "uploader_id": uploader_id
                    }
                },
                None,
--- a/crates/core/database/src/models/files/ops/reference.rs
+++ b/crates/core/database/src/models/files/ops/reference.rs
@@ -1,6 +1,7 @@
 use revolt_result::Result;

 use crate::File;
+use crate::FileUsedFor;
 use crate::ReferenceDb;

 use super::AbstractAttachments;
@@ -18,24 +19,33 @@ impl AbstractAttachments for ReferenceDb {
        }
    }

+    /// Fetch an attachment by its id.
+    async fn fetch_attachment(&self, tag: &str, file_id: &str) -> Result<File> {
+        let files = self.files.lock().await;
+        if let Some(file) = files.get(file_id) {
+            if file.tag == tag {
+                Ok(file.clone())
+            } else {
+                Err(create_error!(NotFound))
+            }
+        } else {
+            Err(create_error!(NotFound))
+        }
+    }
+
    /// Find an attachment by its details and mark it as used by a given parent.
    async fn find_and_use_attachment(
        &self,
        id: &str,
        tag: &str,
-        parent_type: &str,
-        parent_id: &str,
+        used_for: FileUsedFor,
+        uploader_id: String,
    ) -> Result<File> {
        let mut files = self.files.lock().await;
        if let Some(file) = files.get_mut(id) {
            if file.tag == tag {
-                match parent_type {
-                    "message" => file.message_id = Some(parent_id.to_owned()),
-                    "user" => file.user_id = Some(parent_id.to_owned()),
-                    "object" => file.object_id = Some(parent_id.to_owned()),
-                    "server" => file.server_id = Some(parent_id.to_owned()),
-                    _ => unreachable!(),
-                }
+                file.uploader_id = Some(uploader_id);
+                file.used_for = Some(used_for);

                Ok(file.clone())
            } else {
--- a/crates/core/database/src/models/messages/model.rs
+++ b/crates/core/database/src/models/messages/model.rs
@@ -370,10 +370,8 @@ impl Message {
        }

        for attachment_id in data.attachments.as_deref().unwrap_or_default() {
-            attachments.push(
-                db.find_and_use_attachment(attachment_id, "attachments", "message", &message_id)
-                    .await?,
-            );
+            attachments
+                .push(File::use_attachment(db, attachment_id, &message_id, author.id()).await?);
        }

        if !attachments.is_empty() {
@@ -499,10 +497,7 @@ impl Message {
        })?;

        let media = if let Some(id) = embed.media {
-            Some(
-                db.find_and_use_attachment(&id, "attachments", "message", &self.id)
-                    .await?,
-            )
+            Some(File::use_attachment(db, &id, &self.id, &self.author).await?)
        } else {
            None
        };
@@ -661,7 +656,7 @@ impl Message {
    ) -> Result<()> {
        let media: Option<v0::File> = if let Some(id) = embed.media {
            Some(
-                db.find_and_use_attachment(&id, "attachments", "message", &self.id)
+                File::use_attachment(db, &id, &self.id, &self.author)
                    .await?
                    .into(),
            )
--- a/crates/core/database/src/models/mod.rs
+++ b/crates/core/database/src/models/mod.rs
@@ -5,6 +5,7 @@ mod channel_unreads;
 mod channel_webhooks;
 mod channels;
 mod emojis;
+mod file_hashes;
 mod files;
 mod messages;
 mod ratelimit_events;
@@ -23,6 +24,7 @@ pub use channel_unreads::*;
 pub use channel_webhooks::*;
 pub use channels::*;
 pub use emojis::*;
+pub use file_hashes::*;
 pub use files::*;
 pub use messages::*;
 pub use ratelimit_events::*;
@@ -46,6 +48,7 @@ pub trait AbstractDatabase:
    + channel_unreads::AbstractChannelUnreads
    + channel_webhooks::AbstractWebhooks
    + emojis::AbstractEmojis
+    + file_hashes::AbstractAttachmentHashes
    + files::AbstractAttachments
    + messages::AbstractMessages
    + ratelimit_events::AbstractRatelimitEvents
--- a/crates/core/database/src/models/servers/ops/mongodb.rs
+++ b/crates/core/database/src/models/servers/ops/mongodb.rs
@@ -260,7 +260,7 @@ impl MongoDb {

        // Update many attachments with parent id.
        self.delete_many_attachments(doc! {
-            "object_id": &server_id
+            "used_for.id": &server_id
        })
        .await?;

--- a/crates/core/database/src/models/users/axum.rs
+++ b/crates/core/database/src/models/users/axum.rs
@@ -0,0 +1,24 @@
+use axum::{extract::FromRequestParts, http::request::Parts};
+
+use revolt_result::{create_error, Error, Result};
+
+use crate::{Database, User};
+
+#[async_trait::async_trait]
+impl FromRequestParts<Database> for User {
+    type Rejection = Error;
+
+    async fn from_request_parts(parts: &mut Parts, db: &Database) -> Result<User> {
+        if let Some(Ok(bot_token)) = parts.headers.get("x-bot-token").map(|v| v.to_str()) {
+            let bot = db.fetch_bot_by_token(bot_token).await?;
+            db.fetch_user(&bot.id).await
+        } else if let Some(Ok(session_token)) =
+            parts.headers.get("x-session-token").map(|v| v.to_str())
+        {
+            let session = db.fetch_session_by_token(session_token).await?;
+            db.fetch_user(&session.user_id).await
+        } else {
+            Err(create_error!(NotAuthenticated))
+        }
+    }
+}
--- a/crates/core/database/src/models/users/mod.rs
+++ b/crates/core/database/src/models/users/mod.rs
@@ -1,3 +1,5 @@
+#[cfg(feature = "axum-impl")]
+mod axum;
 mod model;
 mod ops;
 #[cfg(feature = "rocket-impl")]
@@ -5,6 +7,8 @@ mod rocket;
 #[cfg(feature = "rocket-impl")]
 mod schema;

+#[cfg(feature = "axum-impl")]
+pub use self::axum::*;
 #[cfg(feature = "rocket-impl")]
 pub use self::rocket::*;
 #[cfg(feature = "rocket-impl")]
--- a/crates/core/database/src/models/users/model.rs
+++ b/crates/core/database/src/models/users/model.rs
@@ -2,12 +2,15 @@ use std::{collections::HashSet, str::FromStr, time::Duration};

 use crate::{events::client::EventV1, Database, File, RatelimitEvent};

+use authifier::config::{EmailVerificationConfig, Template};
+use iso8601_timestamp::Timestamp;
 use once_cell::sync::Lazy;
 use rand::seq::SliceRandom;
 use revolt_config::{config, FeaturesLimits};
-use revolt_models::v0;
+use revolt_models::v0::{self, UserFlags};
 use revolt_presence::filter_online;
 use revolt_result::{create_error, Result};
+use serde_json::json;
 use ulid::Ulid;

 auto_derived_partial!(
@@ -49,6 +52,10 @@ auto_derived_partial!(
        /// Bot information
        #[serde(skip_serializing_if = "Option::is_none")]
        pub bot: Option<BotInformation>,
+
+        /// Time until user is unsuspended
+        #[serde(skip_serializing_if = "Option::is_none")]
+        pub suspended_until: Option<Timestamp>,
    },
    "PartialUser"
 );
@@ -62,6 +69,10 @@ auto_derived!(
        ProfileContent,
        ProfileBackground,
        DisplayName,
+
+        // internal fields
+        Suspension,
+        None,
    }

    /// User's relationship with another user (or themselves)
@@ -165,6 +176,7 @@ impl Default for User {
            flags: Default::default(),
            privileged: Default::default(),
            bot: Default::default(),
+            suspended_until: Default::default(),
        }
    }
 }
@@ -206,7 +218,7 @@ impl User {
            .datetime()
            .elapsed()
            .expect("time went backwards")
-            <= Duration::from_secs(86400u64 * config.features.limits.global.new_user_days as u64)
+            <= Duration::from_secs(3600u64 * config.features.limits.global.new_user_hours as u64)
        {
            config.features.limits.new_user
        } else {
@@ -659,17 +671,106 @@ impl User {
                }
            }
            FieldsUser::DisplayName => self.display_name = None,
+            FieldsUser::Suspension => self.suspended_until = None,
+            FieldsUser::None => {}
        }
    }

    /// Suspend the user
-    pub async fn suspend(&mut self, db: &Database) -> Result<()> {
-        // Remove sessions (logout all)
-        // Mark user as suspended
-        // Disable account
+    ///
+    /// - If a duration is specified, the user will be automatically unsuspended after the given time.
+    /// - If a reason is specified, an email will be sent.
+    pub async fn suspend(
+        &mut self,
+        db: &Database,
+        duration_days: Option<usize>,
+        reason: Option<Vec<String>>,
+    ) -> Result<()> {
+        let authifier = db.clone().to_authifier().await;
+        let mut account = authifier
+            .database
+            .find_account(&self.id)
+            .await
+            .map_err(|_| create_error!(InternalError))?;
+
+        account
+            .disable(&authifier)
+            .await
+            .map_err(|_| create_error!(InternalError))?;
+
+        account
+            .delete_all_sessions(&authifier, None)
+            .await
+            .map_err(|_| create_error!(InternalError))?;
+
+        self.update(
+            db,
+            PartialUser {
+                flags: Some(UserFlags::SuspendedUntil as i32),
+                suspended_until: duration_days.and_then(|dur| {
+                    Timestamp::now_utc().checked_add(iso8601_timestamp::Duration::days(dur as i64))
+                }),
+                ..Default::default()
+            },
+            vec![],
+        )
+        .await?;
+
+        if let Some(reason) = reason {
+            if let EmailVerificationConfig::Enabled { smtp, .. } =
+                authifier.config.email_verification
+            {
+                smtp.send_email(
+                    account.email.clone(),
+                    // 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(", "),
+                        "duration": duration_days,
+                        "duration_display": if duration_days.is_some() {
+                            "block"
+                        } else {
+                            "none"
+                        }
+                    }),
+                )
+                .map_err(|_| create_error!(InternalError))?;
+            }
+        }
+
        Ok(())
    }

+    /// Unsuspend the user
+    pub async fn unsuspend(&mut self, db: &Database) -> Result<()> {
+        self.update(
+            db,
+            PartialUser {
+                flags: Some(0),
+                suspended_until: None,
+                ..Default::default()
+            },
+            vec![],
+        )
+        .await?;
+
+        unimplemented!()
+    }
+
+    /// Permanently ban the user
+    ///
+    /// - If a reason is specified, an email will be sent.
+    pub async fn ban(&mut self, _db: &Database, _reason: Option<String>) -> Result<()> {
+        // Send ban email (if reason provided)
+        unimplemented!()
+    }
+
    /// Mark as deleted
    pub async fn mark_deleted(&mut self, db: &Database) -> Result<()> {
        self.update(
@@ -685,6 +786,7 @@ impl User {
                FieldsUser::StatusPresence,
                FieldsUser::ProfileContent,
                FieldsUser::ProfileBackground,
+                FieldsUser::Suspension,
            ],
        )
        .await
--- a/crates/core/database/src/models/users/ops/mongodb.rs
+++ b/crates/core/database/src/models/users/ops/mongodb.rs
@@ -346,6 +346,8 @@ impl IntoDocumentPath for FieldsUser {
            FieldsUser::StatusPresence => "status.presence",
            FieldsUser::StatusText => "status.text",
            FieldsUser::DisplayName => "display_name",
+            FieldsUser::Suspension => "suspended_until",
+            FieldsUser::None => "none",
        })
    }
 }
--- a/crates/core/database/src/tasks/apple_notifications.rs
+++ b/crates/core/database/src/tasks/apple_notifications.rs
@@ -20,6 +20,7 @@ use crate::Database;

 /// Payload information, before assembly
 #[derive(Debug)]
+#[allow(non_snake_case)]
 pub struct ApnPayload {
    message: Message,
    url: String,
@@ -29,6 +30,7 @@ pub struct ApnPayload {
 }

 #[derive(Serialize, Debug)]
+#[allow(non_snake_case)]
 struct Payload<'a> {
    aps: APS<'a>,
    #[serde(skip_serializing)]
--- 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
@@ -9,19 +9,21 @@ const WORKER_COUNT: usize = 5;

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

 /// Spawn background workers
-pub async fn start_workers(db: Database, authifier_db: authifier::Database) {
+pub fn start_workers(db: Database, authifier_db: authifier::Database) {
+    task::spawn(authifier_relay::worker());
    task::spawn(apple_notifications::worker(db.clone()));

    for _ in 0..WORKER_COUNT {
        task::spawn(ack::worker(db.clone(), authifier_db.clone()));
        task::spawn(last_message_id::worker(db.clone()));
        task::spawn(process_embeds::worker(db.clone()));
-        task::spawn(web_push::worker(authifier_db.clone()));
+        task::spawn(web_push::worker(db.clone(), authifier_db.clone()));
    }
 }

--- a/crates/core/database/src/tasks/web_push.rs
+++ b/crates/core/database/src/tasks/web_push.rs
@@ -3,7 +3,7 @@ use std::{
    time::Duration,
 };

-use authifier::Database;
+use authifier::Database as AuthifierDatabase;
 use base64::{
    engine::{self},
    Engine as _,
@@ -11,7 +11,7 @@ use base64::{
 use deadqueue::limited::Queue;
 use fcm_v1::auth::{Authenticator, ServiceAccountKey};
 use once_cell::sync::Lazy;
-use revolt_config::config;
+use revolt_config::{config, report_internal_error};
 use revolt_models::v0::PushNotification;
 use revolt_presence::filter_online;
 use serde_json::json;
@@ -20,6 +20,8 @@ use web_push::{
    WebPushClient, WebPushMessageBuilder,
 };

+use crate::Database;
+
 use super::apple_notifications;

 /// Task information
@@ -54,7 +56,7 @@ pub async fn queue(recipients: Vec<String>, payload: PushNotification) {
 }

 /// Start a new worker
-pub async fn worker(db: Database) {
+pub async fn worker(db: Database, authifier_db: AuthifierDatabase) {
    let config = config().await;

    let web_push_client = IsahcWebPushClient::new().unwrap();
@@ -89,48 +91,38 @@ pub async fn worker(db: Database) {
    loop {
        let task = Q.pop().await;

-        if let Ok(sessions) = db.find_sessions_with_subscription(&task.recipients).await {
+        if let Ok(sessions) = authifier_db
+            .find_sessions_with_subscription(&task.recipients)
+            .await
+        {
            for session in sessions {
                if let Some(sub) = session.subscription {
                    if sub.endpoint == "fcm" {
                        // Use Firebase Cloud Messaging
                        if let Some(client) = &fcm_client {
-                            let PushNotification {
-                                author,
-                                icon,
-                                image,
-                                body,
-                                tag: _,
-                                timestamp,
-                                url: _,
-                                message,
-                            } = &task.payload;
-
                            let message = fcm_v1::message::Message {
                                token: Some(sub.auth),
-                                data: Some(HashMap::from([
-                                    (
-                                        "author".to_owned(),
-                                        serde_json::Value::String(author.clone()),
-                                    ),
-                                    ("icon".to_owned(), serde_json::Value::String(icon.clone())),
-                                    (
-                                        "image".to_owned(),
-                                        if let Some(image) = image {
-                                            serde_json::Value::String(image.clone())
-                                        } else {
-                                            serde_json::Value::Null
-                                        },
-                                    ),
-                                    ("body".to_owned(), serde_json::Value::String(body.clone())),
-                                    ("timestamp".to_owned(), json!(timestamp)),
-                                    ("message".to_owned(), json!(&message)),
-                                ])),
+                                data: Some(HashMap::from([(
+                                    "payload".to_owned(),
+                                    serde_json::Value::String(json!(&task.payload).to_string()),
+                                )])),
                                ..Default::default()
                            };

                            if let Err(err) = client.send(&message).await {
                                error!("Failed to send FCM notification! {:?}", err);
+
+                                if let fcm_v1::Error::FCM(fcm_error) = err {
+                                    if fcm_error.contains("404 (Not Found)") {
+                                        println!("Unregistering {:?}", session.id);
+
+                                        report_internal_error!(
+                                            db.remove_push_subscription_by_session_id(&session.id)
+                                                .await
+                                        )
+                                        .ok();
+                                    }
+                                }
                            } else {
                                info!("Sent FCM notification to {:?}.", session.id);
                            }
--- a/crates/core/database/src/util/bridge/v0.rs
+++ b/crates/core/database/src/util/bridge/v0.rs
@@ -1,7 +1,7 @@
 use revolt_models::v0::*;
 use revolt_permissions::{calculate_user_permissions, UserPermission};

-use crate::{util::permissions::DatabasePermissionQuery, Database};
+use crate::{util::permissions::DatabasePermissionQuery, Database, FileUsedFor};

 impl crate::Bot {
    pub fn into_public_bot(self, user: crate::User) -> PublicBot {
@@ -108,6 +108,7 @@ impl From<crate::Webhook> for Webhook {
            id: value.id,
            name: value.name,
            avatar: value.avatar.map(|file| file.into()),
+            creator_id: value.creator_id,
            channel_id: value.channel_id,
            token: value.token,
            permissions: value.permissions,
@@ -121,6 +122,7 @@ impl From<crate::PartialWebhook> for PartialWebhook {
            id: value.id,
            name: value.name,
            avatar: value.avatar.map(|file| file.into()),
+            creator_id: value.creator_id,
            channel_id: value.channel_id,
            token: value.token,
            permissions: value.permissions,
@@ -419,6 +421,10 @@ impl From<File> for crate::File {
            user_id: value.user_id,
            server_id: value.server_id,
            object_id: value.object_id,
+            hash: None,
+            uploaded_at: None,
+            uploader_id: None,
+            used_for: None,
        }
    }
 }
@@ -1171,6 +1177,7 @@ impl From<User> for crate::User {
            flags: Some(value.flags as i32),
            privileged: value.privileged,
            bot: value.bot.map(Into::into),
+            suspended_until: None,
        }
    }
 }
@@ -1209,6 +1216,8 @@ impl From<FieldsUser> for crate::FieldsUser {
            FieldsUser::StatusPresence => crate::FieldsUser::StatusPresence,
            FieldsUser::StatusText => crate::FieldsUser::StatusText,
            FieldsUser::DisplayName => crate::FieldsUser::DisplayName,
+
+            FieldsUser::Internal => crate::FieldsUser::None,
        }
    }
 }
@@ -1222,6 +1231,9 @@ impl From<crate::FieldsUser> for FieldsUser {
            crate::FieldsUser::StatusPresence => FieldsUser::StatusPresence,
            crate::FieldsUser::StatusText => FieldsUser::StatusText,
            crate::FieldsUser::DisplayName => FieldsUser::DisplayName,
+
+            crate::FieldsUser::Suspension => FieldsUser::Internal,
+            crate::FieldsUser::None => FieldsUser::Internal,
        }
    }
 }
@@ -1338,4 +1350,4 @@ impl From<FieldsMessage> for crate::FieldsMessage {
            FieldsMessage::Pinned => crate::FieldsMessage::Pinned,
        }
    }
-}
+}
--- a/crates/core/database/templates/deletion.html
+++ b/crates/core/database/templates/deletion.html
@@ -0,0 +1,554 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html>
+  <head>
+    <!-- Compiled with Bootstrap Email version: 1.3.1 -->
+    <meta http-equiv="x-ua-compatible" content="ie=edge" />
+    <meta name="x-apple-disable-message-reformatting" />
+    <meta name="viewport" content="width=device-width, initial-scale=1" />
+    <meta
+      name="format-detection"
+      content="telephone=no, date=no, address=no, email=no"
+    />
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <style type="text/css">
+      body,
+      table,
+      td {
+        font-family: Helvetica, Arial, sans-serif !important;
+      }
+      .ExternalClass {
+        width: 100%;
+      }
+      .ExternalClass,
+      .ExternalClass p,
+      .ExternalClass span,
+      .ExternalClass font,
+      .ExternalClass td,
+      .ExternalClass div {
+        line-height: 150%;
+      }
+      a {
+        text-decoration: none;
+      }
+      * {
+        color: inherit;
+      }
+      a[x-apple-data-detectors],
+      u + #body a,
+      #MessageViewBody a {
+        color: inherit;
+        text-decoration: none;
+        font-size: inherit;
+        font-family: inherit;
+        font-weight: inherit;
+        line-height: inherit;
+      }
+      img {
+        -ms-interpolation-mode: bicubic;
+      }
+      table:not([class^="s-"]) {
+        font-family: Helvetica, Arial, sans-serif;
+        mso-table-lspace: 0pt;
+        mso-table-rspace: 0pt;
+        border-spacing: 0px;
+        border-collapse: collapse;
+      }
+      table:not([class^="s-"]) td {
+        border-spacing: 0px;
+        border-collapse: collapse;
+      }
+      @media screen and (max-width: 600px) {
+        .w-full,
+        .w-full > tbody > tr > td {
+          width: 100% !important;
+        }
+        .w-24,
+        .w-24 > tbody > tr > td {
+          width: 96px !important;
+        }
+        .p-lg-10:not(table),
+        .p-lg-10:not(.btn) > tbody > tr > td,
+        .p-lg-10.btn td a {
+          padding: 0 !important;
+        }
+        .p-3:not(table),
+        .p-3:not(.btn) > tbody > tr > td,
+        .p-3.btn td a {
+          padding: 12px !important;
+        }
+        .p-6:not(table),
+        .p-6:not(.btn) > tbody > tr > td,
+        .p-6.btn td a {
+          padding: 24px !important;
+        }
+        *[class*="s-lg-"] > tbody > tr > td {
+          font-size: 0 !important;
+          line-height: 0 !important;
+          height: 0 !important;
+        }
+        .s-4 > tbody > tr > td {
+          font-size: 16px !important;
+          line-height: 16px !important;
+          height: 16px !important;
+        }
+        .s-6 > tbody > tr > td {
+          font-size: 24px !important;
+          line-height: 24px !important;
+          height: 24px !important;
+        }
+        .s-10 > tbody > tr > td {
+          font-size: 40px !important;
+          line-height: 40px !important;
+          height: 40px !important;
+        }
+      }
+    </style>
+  </head>
+  <body
+    class="bg-light"
+    style="
+      outline: 0;
+      width: 100%;
+      min-width: 100%;
+      height: 100%;
+      -webkit-text-size-adjust: 100%;
+      -ms-text-size-adjust: 100%;
+      font-family: Helvetica, Arial, sans-serif;
+      line-height: 24px;
+      font-weight: normal;
+      font-size: 16px;
+      -moz-box-sizing: border-box;
+      -webkit-box-sizing: border-box;
+      box-sizing: border-box;
+      color: #000000;
+      margin: 0;
+      padding: 0;
+      border-width: 0;
+    "
+    bgcolor="#f7fafc"
+  >
+    <table
+      class="bg-light body"
+      valign="top"
+      role="presentation"
+      border="0"
+      cellpadding="0"
+      cellspacing="0"
+      style="
+        outline: 0;
+        width: 100%;
+        min-width: 100%;
+        height: 100%;
+        -webkit-text-size-adjust: 100%;
+        -ms-text-size-adjust: 100%;
+        font-family: Helvetica, Arial, sans-serif;
+        line-height: 24px;
+        font-weight: normal;
+        font-size: 16px;
+        -moz-box-sizing: border-box;
+        -webkit-box-sizing: border-box;
+        box-sizing: border-box;
+        color: #000000;
+        margin: 0;
+        padding: 0;
+        border-width: 0;
+      "
+      bgcolor="#f7fafc"
+    >
+      <tbody>
+        <tr>
+          <td
+            valign="top"
+            style="line-height: 24px; font-size: 16px; margin: 0"
+            align="left"
+            bgcolor="#f7fafc"
+          >
+            <table
+              class="container"
+              role="presentation"
+              border="0"
+              cellpadding="0"
+              cellspacing="0"
+              style="width: 100%"
+            >
+              <tbody>
+                <tr>
+                  <td
+                    align="center"
+                    style="
+                      line-height: 24px;
+                      font-size: 16px;
+                      margin: 0;
+                      padding: 0 16px;
+                    "
+                  >
+                    <!--[if (gte mso 9)|(IE)]>
+                      <table align="center" role="presentation">
+                        <tbody>
+                          <tr>
+                            <td width="600">
+                    <![endif]-->
+                    <table
+                      align="center"
+                      role="presentation"
+                      border="0"
+                      cellpadding="0"
+                      cellspacing="0"
+                      style="width: 100%; max-width: 600px; margin: 0 auto"
+                    >
+                      <tbody>
+                        <tr>
+                          <td
+                            style="
+                              line-height: 24px;
+                              font-size: 16px;
+                              margin: 0;
+                            "
+                            align="left"
+                          >
+                            <table
+                              class="s-10 w-full"
+                              role="presentation"
+                              border="0"
+                              cellpadding="0"
+                              cellspacing="0"
+                              style="width: 100%"
+                              width="100%"
+                            >
+                              <tbody>
+                                <tr>
+                                  <td
+                                    style="
+                                      line-height: 40px;
+                                      font-size: 40px;
+                                      width: 100%;
+                                      height: 40px;
+                                      margin: 0;
+                                    "
+                                    align="left"
+                                    width="100%"
+                                    height="40"
+                                  >
+                                    &#160;
+                                  </td>
+                                </tr>
+                              </tbody>
+                            </table>
+                            <table
+                              class="ax-center"
+                              role="presentation"
+                              align="center"
+                              border="0"
+                              cellpadding="0"
+                              cellspacing="0"
+                              style="margin: 0 auto"
+                            >
+                              <tbody>
+                                <tr>
+                                  <td
+                                    style="
+                                      line-height: 24px;
+                                      font-size: 16px;
+                                      margin: 0;
+                                    "
+                                    align="left"
+                                  >
+                                    <img
+                                      alt="Revolt Logo"
+                                      class="w-24"
+                                      src="https://app.revolt.chat/assets/logo_round.png"
+                                      style="
+                                        height: auto;
+                                        line-height: 100%;
+                                        outline: none;
+                                        text-decoration: none;
+                                        display: block;
+                                        width: 96px;
+                                        border-style: none;
+                                        border-width: 0;
+                                      "
+                                      width="96"
+                                    />
+                                  </td>
+                                </tr>
+                              </tbody>
+                            </table>
+                            <table
+                              class="s-10 w-full"
+                              role="presentation"
+                              border="0"
+                              cellpadding="0"
+                              cellspacing="0"
+                              style="width: 100%"
+                              width="100%"
+                            >
+                              <tbody>
+                                <tr>
+                                  <td
+                                    style="
+                                      line-height: 40px;
+                                      font-size: 40px;
+                                      width: 100%;
+                                      height: 40px;
+                                      margin: 0;
+                                    "
+                                    align="left"
+                                    width="100%"
+                                    height="40"
+                                  >
+                                    &#160;
+                                  </td>
+                                </tr>
+                              </tbody>
+                            </table>
+                            <table
+                              class="card p-6 p-lg-10 space-y-4"
+                              role="presentation"
+                              border="0"
+                              cellpadding="0"
+                              cellspacing="0"
+                              style="
+                                border-radius: 6px;
+                                border-collapse: separate !important;
+                                width: 100%;
+                                overflow: hidden;
+                                border: 1px solid #e2e8f0;
+                              "
+                              bgcolor="#ffffff"
+                            >
+                              <tbody>
+                                <tr>
+                                  <td
+                                    style="
+                                      line-height: 24px;
+                                      font-size: 16px;
+                                      width: 100%;
+                                      margin: 0;
+                                      padding: 40px;
+                                    "
+                                    align="left"
+                                    bgcolor="#ffffff"
+                                  >
+                                    <h1
+                                      class="h3 fw-700"
+                                      style="
+                                        padding-top: 0;
+                                        padding-bottom: 0;
+                                        font-weight: 700 !important;
+                                        vertical-align: baseline;
+                                        font-size: 28px;
+                                        line-height: 33.6px;
+                                        margin: 0;
+                                      "
+                                      align="left"
+                                    >
+                                      Account Deletion
+                                    </h1>
+                                    <table
+                                      class="s-4 w-full"
+                                      role="presentation"
+                                      border="0"
+                                      cellpadding="0"
+                                      cellspacing="0"
+                                      style="width: 100%"
+                                      width="100%"
+                                    >
+                                      <tbody>
+                                        <tr>
+                                          <td
+                                            style="
+                                              line-height: 16px;
+                                              font-size: 16px;
+                                              width: 100%;
+                                              height: 16px;
+                                              margin: 0;
+                                            "
+                                            align="left"
+                                            width="100%"
+                                            height="16"
+                                          >
+                                            &#160;
+                                          </td>
+                                        </tr>
+                                      </tbody>
+                                    </table>
+                                    <p
+                                      class=""
+                                      style="
+                                        line-height: 24px;
+                                        font-size: 16px;
+                                        width: 100%;
+                                        margin: 0;
+                                      "
+                                      align="left"
+                                    >
+                                      You requested to have your account
+                                      deleted, if you did not perform this
+                                      action please take measures to secure your
+                                      account immediately.
+                                    </p>
+                                    <table
+                                      class="s-4 w-full"
+                                      role="presentation"
+                                      border="0"
+                                      cellpadding="0"
+                                      cellspacing="0"
+                                      style="width: 100%"
+                                      width="100%"
+                                    >
+                                      <tbody>
+                                        <tr>
+                                          <td
+                                            style="
+                                              line-height: 16px;
+                                              font-size: 16px;
+                                              width: 100%;
+                                              height: 16px;
+                                              margin: 0;
+                                            "
+                                            align="left"
+                                            width="100%"
+                                            height="16"
+                                          >
+                                            &#160;
+                                          </td>
+                                        </tr>
+                                      </tbody>
+                                    </table>
+                                    <table
+                                      class="btn btn-primary p-3 fw-700"
+                                      role="presentation"
+                                      border="0"
+                                      cellpadding="0"
+                                      cellspacing="0"
+                                      style="
+                                        border-radius: 6px;
+                                        border-collapse: separate !important;
+                                        font-weight: 700 !important;
+                                      "
+                                    >
+                                      <tbody>
+                                        <tr>
+                                          <td
+                                            style="
+                                              line-height: 24px;
+                                              font-size: 16px;
+                                              border-radius: 6px;
+                                              font-weight: 700 !important;
+                                              margin: 0;
+                                            "
+                                            align="center"
+                                            bgcolor="#0d6efd"
+                                          >
+                                            <a
+                                              href="{{url}}"
+                                              style="
+                                                color: #ffffff;
+                                                font-size: 16px;
+                                                font-family: Helvetica, Arial,
+                                                  sans-serif;
+                                                text-decoration: none;
+                                                border-radius: 6px;
+                                                line-height: 20px;
+                                                display: block;
+                                                font-weight: 700 !important;
+                                                white-space: nowrap;
+                                                background-color: #0d6efd;
+                                                padding: 12px;
+                                                border: 1px solid #0d6efd;
+                                              "
+                                              >Confirm</a
+                                            >
+                                          </td>
+                                        </tr>
+                                      </tbody>
+                                    </table>
+                                  </td>
+                                </tr>
+                              </tbody>
+                            </table>
+                            <table
+                              class="s-6 w-full"
+                              role="presentation"
+                              border="0"
+                              cellpadding="0"
+                              cellspacing="0"
+                              style="width: 100%"
+                              width="100%"
+                            >
+                              <tbody>
+                                <tr>
+                                  <td
+                                    style="
+                                      line-height: 24px;
+                                      font-size: 24px;
+                                      width: 100%;
+                                      height: 24px;
+                                      margin: 0;
+                                    "
+                                    align="left"
+                                    width="100%"
+                                    height="24"
+                                  >
+                                    &#160;
+                                  </td>
+                                </tr>
+                              </tbody>
+                            </table>
+                            <div
+                              class="text-muted text-center"
+                              style="color: #718096"
+                              align="center"
+                            >
+                              This email is intended for {{email}}<br />
+                              Sent from Revolt<br />
+                              Made in Europe
+                            </div>
+                            <table
+                              class="s-6 w-full"
+                              role="presentation"
+                              border="0"
+                              cellpadding="0"
+                              cellspacing="0"
+                              style="width: 100%"
+                              width="100%"
+                            >
+                              <tbody>
+                                <tr>
+                                  <td
+                                    style="
+                                      line-height: 24px;
+                                      font-size: 24px;
+                                      width: 100%;
+                                      height: 24px;
+                                      margin: 0;
+                                    "
+                                    align="left"
+                                    width="100%"
+                                    height="24"
+                                  >
+                                    &#160;
+                                  </td>
+                                </tr>
+                              </tbody>
+                            </table>
+                          </td>
+                        </tr>
+                      </tbody>
+                    </table>
+                    <!--[if (gte mso 9)|(IE)]>
+                    </td>
+                  </tr>
+                </tbody>
+              </table>
+                    <![endif]-->
+                  </td>
+                </tr>
+              </tbody>
+            </table>
+          </td>
+        </tr>
+      </tbody>
+    </table>
+  </body>
+</html>
--- a/crates/core/database/templates/deletion.original.html
+++ b/crates/core/database/templates/deletion.original.html
@@ -23,7 +23,7 @@
      <div class="text-muted text-center my-6">
        This email is intended for {{email}}<br />
        Sent from Revolt<br />
-        Made in the EU
+        Made in Europe
      </div>
    </div>
  </body>
--- a/crates/core/database/templates/deletion.txt
+++ b/crates/core/database/templates/deletion.txt
@@ -4,4 +4,4 @@ Please navigate to: {{url}}

 This email is intended for {{email}}
 Sent by Revolt
-Made in the EU
+Made in Europe
--- a/crates/core/database/templates/reset.html
+++ b/crates/core/database/templates/reset.html
@@ -0,0 +1,552 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html>
+  <head>
+    <!-- Compiled with Bootstrap Email version: 1.3.1 -->
+    <meta http-equiv="x-ua-compatible" content="ie=edge" />
+    <meta name="x-apple-disable-message-reformatting" />
+    <meta name="viewport" content="width=device-width, initial-scale=1" />
+    <meta
+      name="format-detection"
+      content="telephone=no, date=no, address=no, email=no"
+    />
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <style type="text/css">
+      body,
+      table,
+      td {
+        font-family: Helvetica, Arial, sans-serif !important;
+      }
+      .ExternalClass {
+        width: 100%;
+      }
+      .ExternalClass,
+      .ExternalClass p,
+      .ExternalClass span,
+      .ExternalClass font,
+      .ExternalClass td,
+      .ExternalClass div {
+        line-height: 150%;
+      }
+      a {
+        text-decoration: none;
+      }
+      * {
+        color: inherit;
+      }
+      a[x-apple-data-detectors],
+      u + #body a,
+      #MessageViewBody a {
+        color: inherit;
+        text-decoration: none;
+        font-size: inherit;
+        font-family: inherit;
+        font-weight: inherit;
+        line-height: inherit;
+      }
+      img {
+        -ms-interpolation-mode: bicubic;
+      }
+      table:not([class^="s-"]) {
+        font-family: Helvetica, Arial, sans-serif;
+        mso-table-lspace: 0pt;
+        mso-table-rspace: 0pt;
+        border-spacing: 0px;
+        border-collapse: collapse;
+      }
+      table:not([class^="s-"]) td {
+        border-spacing: 0px;
+        border-collapse: collapse;
+      }
+      @media screen and (max-width: 600px) {
+        .w-full,
+        .w-full > tbody > tr > td {
+          width: 100% !important;
+        }
+        .w-24,
+        .w-24 > tbody > tr > td {
+          width: 96px !important;
+        }
+        .p-lg-10:not(table),
+        .p-lg-10:not(.btn) > tbody > tr > td,
+        .p-lg-10.btn td a {
+          padding: 0 !important;
+        }
+        .p-3:not(table),
+        .p-3:not(.btn) > tbody > tr > td,
+        .p-3.btn td a {
+          padding: 12px !important;
+        }
+        .p-6:not(table),
+        .p-6:not(.btn) > tbody > tr > td,
+        .p-6.btn td a {
+          padding: 24px !important;
+        }
+        *[class*="s-lg-"] > tbody > tr > td {
+          font-size: 0 !important;
+          line-height: 0 !important;
+          height: 0 !important;
+        }
+        .s-4 > tbody > tr > td {
+          font-size: 16px !important;
+          line-height: 16px !important;
+          height: 16px !important;
+        }
+        .s-6 > tbody > tr > td {
+          font-size: 24px !important;
+          line-height: 24px !important;
+          height: 24px !important;
+        }
+        .s-10 > tbody > tr > td {
+          font-size: 40px !important;
+          line-height: 40px !important;
+          height: 40px !important;
+        }
+      }
+    </style>
+  </head>
+  <body
+    class="bg-light"
+    style="
+      outline: 0;
+      width: 100%;
+      min-width: 100%;
+      height: 100%;
+      -webkit-text-size-adjust: 100%;
+      -ms-text-size-adjust: 100%;
+      font-family: Helvetica, Arial, sans-serif;
+      line-height: 24px;
+      font-weight: normal;
+      font-size: 16px;
+      -moz-box-sizing: border-box;
+      -webkit-box-sizing: border-box;
+      box-sizing: border-box;
+      color: #000000;
+      margin: 0;
+      padding: 0;
+      border-width: 0;
+    "
+    bgcolor="#f7fafc"
+  >
+    <table
+      class="bg-light body"
+      valign="top"
+      role="presentation"
+      border="0"
+      cellpadding="0"
+      cellspacing="0"
+      style="
+        outline: 0;
+        width: 100%;
+        min-width: 100%;
+        height: 100%;
+        -webkit-text-size-adjust: 100%;
+        -ms-text-size-adjust: 100%;
+        font-family: Helvetica, Arial, sans-serif;
+        line-height: 24px;
+        font-weight: normal;
+        font-size: 16px;
+        -moz-box-sizing: border-box;
+        -webkit-box-sizing: border-box;
+        box-sizing: border-box;
+        color: #000000;
+        margin: 0;
+        padding: 0;
+        border-width: 0;
+      "
+      bgcolor="#f7fafc"
+    >
+      <tbody>
+        <tr>
+          <td
+            valign="top"
+            style="line-height: 24px; font-size: 16px; margin: 0"
+            align="left"
+            bgcolor="#f7fafc"
+          >
+            <table
+              class="container"
+              role="presentation"
+              border="0"
+              cellpadding="0"
+              cellspacing="0"
+              style="width: 100%"
+            >
+              <tbody>
+                <tr>
+                  <td
+                    align="center"
+                    style="
+                      line-height: 24px;
+                      font-size: 16px;
+                      margin: 0;
+                      padding: 0 16px;
+                    "
+                  >
+                    <!--[if (gte mso 9)|(IE)]>
+                      <table align="center" role="presentation">
+                        <tbody>
+                          <tr>
+                            <td width="600">
+                    <![endif]-->
+                    <table
+                      align="center"
+                      role="presentation"
+                      border="0"
+                      cellpadding="0"
+                      cellspacing="0"
+                      style="width: 100%; max-width: 600px; margin: 0 auto"
+                    >
+                      <tbody>
+                        <tr>
+                          <td
+                            style="
+                              line-height: 24px;
+                              font-size: 16px;
+                              margin: 0;
+                            "
+                            align="left"
+                          >
+                            <table
+                              class="s-10 w-full"
+                              role="presentation"
+                              border="0"
+                              cellpadding="0"
+                              cellspacing="0"
+                              style="width: 100%"
+                              width="100%"
+                            >
+                              <tbody>
+                                <tr>
+                                  <td
+                                    style="
+                                      line-height: 40px;
+                                      font-size: 40px;
+                                      width: 100%;
+                                      height: 40px;
+                                      margin: 0;
+                                    "
+                                    align="left"
+                                    width="100%"
+                                    height="40"
+                                  >
+                                    &#160;
+                                  </td>
+                                </tr>
+                              </tbody>
+                            </table>
+                            <table
+                              class="ax-center"
+                              role="presentation"
+                              align="center"
+                              border="0"
+                              cellpadding="0"
+                              cellspacing="0"
+                              style="margin: 0 auto"
+                            >
+                              <tbody>
+                                <tr>
+                                  <td
+                                    style="
+                                      line-height: 24px;
+                                      font-size: 16px;
+                                      margin: 0;
+                                    "
+                                    align="left"
+                                  >
+                                    <img
+                                      alt="Revolt Logo"
+                                      class="w-24"
+                                      src="https://app.revolt.chat/assets/logo_round.png"
+                                      style="
+                                        height: auto;
+                                        line-height: 100%;
+                                        outline: none;
+                                        text-decoration: none;
+                                        display: block;
+                                        width: 96px;
+                                        border-style: none;
+                                        border-width: 0;
+                                      "
+                                      width="96"
+                                    />
+                                  </td>
+                                </tr>
+                              </tbody>
+                            </table>
+                            <table
+                              class="s-10 w-full"
+                              role="presentation"
+                              border="0"
+                              cellpadding="0"
+                              cellspacing="0"
+                              style="width: 100%"
+                              width="100%"
+                            >
+                              <tbody>
+                                <tr>
+                                  <td
+                                    style="
+                                      line-height: 40px;
+                                      font-size: 40px;
+                                      width: 100%;
+                                      height: 40px;
+                                      margin: 0;
+                                    "
+                                    align="left"
+                                    width="100%"
+                                    height="40"
+                                  >
+                                    &#160;
+                                  </td>
+                                </tr>
+                              </tbody>
+                            </table>
+                            <table
+                              class="card p-6 p-lg-10 space-y-4"
+                              role="presentation"
+                              border="0"
+                              cellpadding="0"
+                              cellspacing="0"
+                              style="
+                                border-radius: 6px;
+                                border-collapse: separate !important;
+                                width: 100%;
+                                overflow: hidden;
+                                border: 1px solid #e2e8f0;
+                              "
+                              bgcolor="#ffffff"
+                            >
+                              <tbody>
+                                <tr>
+                                  <td
+                                    style="
+                                      line-height: 24px;
+                                      font-size: 16px;
+                                      width: 100%;
+                                      margin: 0;
+                                      padding: 40px;
+                                    "
+                                    align="left"
+                                    bgcolor="#ffffff"
+                                  >
+                                    <h1
+                                      class="h3 fw-700"
+                                      style="
+                                        padding-top: 0;
+                                        padding-bottom: 0;
+                                        font-weight: 700 !important;
+                                        vertical-align: baseline;
+                                        font-size: 28px;
+                                        line-height: 33.6px;
+                                        margin: 0;
+                                      "
+                                      align="left"
+                                    >
+                                      Password Reset
+                                    </h1>
+                                    <table
+                                      class="s-4 w-full"
+                                      role="presentation"
+                                      border="0"
+                                      cellpadding="0"
+                                      cellspacing="0"
+                                      style="width: 100%"
+                                      width="100%"
+                                    >
+                                      <tbody>
+                                        <tr>
+                                          <td
+                                            style="
+                                              line-height: 16px;
+                                              font-size: 16px;
+                                              width: 100%;
+                                              height: 16px;
+                                              margin: 0;
+                                            "
+                                            align="left"
+                                            width="100%"
+                                            height="16"
+                                          >
+                                            &#160;
+                                          </td>
+                                        </tr>
+                                      </tbody>
+                                    </table>
+                                    <p
+                                      class=""
+                                      style="
+                                        line-height: 24px;
+                                        font-size: 16px;
+                                        width: 100%;
+                                        margin: 0;
+                                      "
+                                      align="left"
+                                    >
+                                      You requested a password reset, click
+                                      below to continue.
+                                    </p>
+                                    <table
+                                      class="s-4 w-full"
+                                      role="presentation"
+                                      border="0"
+                                      cellpadding="0"
+                                      cellspacing="0"
+                                      style="width: 100%"
+                                      width="100%"
+                                    >
+                                      <tbody>
+                                        <tr>
+                                          <td
+                                            style="
+                                              line-height: 16px;
+                                              font-size: 16px;
+                                              width: 100%;
+                                              height: 16px;
+                                              margin: 0;
+                                            "
+                                            align="left"
+                                            width="100%"
+                                            height="16"
+                                          >
+                                            &#160;
+                                          </td>
+                                        </tr>
+                                      </tbody>
+                                    </table>
+                                    <table
+                                      class="btn btn-primary p-3 fw-700"
+                                      role="presentation"
+                                      border="0"
+                                      cellpadding="0"
+                                      cellspacing="0"
+                                      style="
+                                        border-radius: 6px;
+                                        border-collapse: separate !important;
+                                        font-weight: 700 !important;
+                                      "
+                                    >
+                                      <tbody>
+                                        <tr>
+                                          <td
+                                            style="
+                                              line-height: 24px;
+                                              font-size: 16px;
+                                              border-radius: 6px;
+                                              font-weight: 700 !important;
+                                              margin: 0;
+                                            "
+                                            align="center"
+                                            bgcolor="#0d6efd"
+                                          >
+                                            <a
+                                              href="{{url}}"
+                                              style="
+                                                color: #ffffff;
+                                                font-size: 16px;
+                                                font-family: Helvetica, Arial,
+                                                  sans-serif;
+                                                text-decoration: none;
+                                                border-radius: 6px;
+                                                line-height: 20px;
+                                                display: block;
+                                                font-weight: 700 !important;
+                                                white-space: nowrap;
+                                                background-color: #0d6efd;
+                                                padding: 12px;
+                                                border: 1px solid #0d6efd;
+                                              "
+                                              >Reset</a
+                                            >
+                                          </td>
+                                        </tr>
+                                      </tbody>
+                                    </table>
+                                  </td>
+                                </tr>
+                              </tbody>
+                            </table>
+                            <table
+                              class="s-6 w-full"
+                              role="presentation"
+                              border="0"
+                              cellpadding="0"
+                              cellspacing="0"
+                              style="width: 100%"
+                              width="100%"
+                            >
+                              <tbody>
+                                <tr>
+                                  <td
+                                    style="
+                                      line-height: 24px;
+                                      font-size: 24px;
+                                      width: 100%;
+                                      height: 24px;
+                                      margin: 0;
+                                    "
+                                    align="left"
+                                    width="100%"
+                                    height="24"
+                                  >
+                                    &#160;
+                                  </td>
+                                </tr>
+                              </tbody>
+                            </table>
+                            <div
+                              class="text-muted text-center"
+                              style="color: #718096"
+                              align="center"
+                            >
+                              This email is intended for {{email}}<br />
+                              Sent from Revolt<br />
+                              Made in Europe
+                            </div>
+                            <table
+                              class="s-6 w-full"
+                              role="presentation"
+                              border="0"
+                              cellpadding="0"
+                              cellspacing="0"
+                              style="width: 100%"
+                              width="100%"
+                            >
+                              <tbody>
+                                <tr>
+                                  <td
+                                    style="
+                                      line-height: 24px;
+                                      font-size: 24px;
+                                      width: 100%;
+                                      height: 24px;
+                                      margin: 0;
+                                    "
+                                    align="left"
+                                    width="100%"
+                                    height="24"
+                                  >
+                                    &#160;
+                                  </td>
+                                </tr>
+                              </tbody>
+                            </table>
+                          </td>
+                        </tr>
+                      </tbody>
+                    </table>
+                    <!--[if (gte mso 9)|(IE)]>
+                    </td>
+                  </tr>
+                </tbody>
+              </table>
+                    <![endif]-->
+                  </td>
+                </tr>
+              </tbody>
+            </table>
+          </td>
+        </tr>
+      </tbody>
+    </table>
+  </body>
+</html>
--- a/crates/core/database/templates/reset.original.html
+++ b/crates/core/database/templates/reset.original.html
@@ -19,7 +19,7 @@
      <div class="text-muted text-center my-6">
        This email is intended for {{email}}<br />
        Sent from Revolt<br />
-        Made in the EU
+        Made in Europe
      </div>
    </div>
  </body>
--- a/crates/core/database/templates/reset.txt
+++ b/crates/core/database/templates/reset.txt
@@ -4,4 +4,4 @@ Please navigate to: {{url}}

 This email is intended for {{email}}
 Sent by Revolt
-Made in the EU
+Made in Europe
--- a/crates/core/database/templates/suspension.html
+++ b/crates/core/database/templates/suspension.html
@@ -0,0 +1,625 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html>
+  <head>
+    <!-- Compiled with Bootstrap Email version: 1.5.1 -->
+    <meta http-equiv="x-ua-compatible" content="ie=edge" />
+    <meta name="x-apple-disable-message-reformatting" />
+    <meta name="viewport" content="width=device-width, initial-scale=1" />
+    <meta
+      name="format-detection"
+      content="telephone=no, date=no, address=no, email=no"
+    />
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <style type="text/css">
+      body,
+      table,
+      td {
+        font-family: Helvetica, Arial, sans-serif !important;
+      }
+      .ExternalClass {
+        width: 100%;
+      }
+      .ExternalClass,
+      .ExternalClass p,
+      .ExternalClass span,
+      .ExternalClass font,
+      .ExternalClass td,
+      .ExternalClass div {
+        line-height: 150%;
+      }
+      a {
+        text-decoration: none;
+      }
+      * {
+        color: inherit;
+      }
+      a[x-apple-data-detectors],
+      u + #body a,
+      #MessageViewBody a {
+        color: inherit;
+        text-decoration: none;
+        font-size: inherit;
+        font-family: inherit;
+        font-weight: inherit;
+        line-height: inherit;
+      }
+      img {
+        -ms-interpolation-mode: bicubic;
+      }
+      table:not([class^="s-"]) {
+        font-family: Helvetica, Arial, sans-serif;
+        mso-table-lspace: 0pt;
+        mso-table-rspace: 0pt;
+        border-spacing: 0px;
+        border-collapse: collapse;
+      }
+      table:not([class^="s-"]) td {
+        border-spacing: 0px;
+        border-collapse: collapse;
+      }
+      @media screen and (max-width: 600px) {
+        .w-full,
+        .w-full > tbody > tr > td {
+          width: 100% !important;
+        }
+        .w-24,
+        .w-24 > tbody > tr > td {
+          width: 96px !important;
+        }
+        .p-lg-10:not(table),
+        .p-lg-10:not(.btn) > tbody > tr > td,
+        .p-lg-10.btn td a {
+          padding: 0 !important;
+        }
+        .p-6:not(table),
+        .p-6:not(.btn) > tbody > tr > td,
+        .p-6.btn td a {
+          padding: 24px !important;
+        }
+        *[class*="s-lg-"] > tbody > tr > td {
+          font-size: 0 !important;
+          line-height: 0 !important;
+          height: 0 !important;
+        }
+        .s-4 > tbody > tr > td {
+          font-size: 16px !important;
+          line-height: 16px !important;
+          height: 16px !important;
+        }
+        .s-6 > tbody > tr > td {
+          font-size: 24px !important;
+          line-height: 24px !important;
+          height: 24px !important;
+        }
+        .s-10 > tbody > tr > td {
+          font-size: 40px !important;
+          line-height: 40px !important;
+          height: 40px !important;
+        }
+      }
+    </style>
+  </head>
+  <body
+    class="bg-light"
+    style="
+      outline: 0;
+      width: 100%;
+      min-width: 100%;
+      height: 100%;
+      -webkit-text-size-adjust: 100%;
+      -ms-text-size-adjust: 100%;
+      font-family: Helvetica, Arial, sans-serif;
+      line-height: 24px;
+      font-weight: normal;
+      font-size: 16px;
+      -moz-box-sizing: border-box;
+      -webkit-box-sizing: border-box;
+      box-sizing: border-box;
+      color: #000000;
+      margin: 0;
+      padding: 0;
+      border-width: 0;
+    "
+    bgcolor="#f7fafc"
+  >
+    <table
+      class="bg-light body"
+      valign="top"
+      role="presentation"
+      border="0"
+      cellpadding="0"
+      cellspacing="0"
+      style="
+        outline: 0;
+        width: 100%;
+        min-width: 100%;
+        height: 100%;
+        -webkit-text-size-adjust: 100%;
+        -ms-text-size-adjust: 100%;
+        font-family: Helvetica, Arial, sans-serif;
+        line-height: 24px;
+        font-weight: normal;
+        font-size: 16px;
+        -moz-box-sizing: border-box;
+        -webkit-box-sizing: border-box;
+        box-sizing: border-box;
+        color: #000000;
+        margin: 0;
+        padding: 0;
+        border-width: 0;
+      "
+      bgcolor="#f7fafc"
+    >
+      <tbody>
+        <tr>
+          <td
+            valign="top"
+            style="line-height: 24px; font-size: 16px; margin: 0"
+            align="left"
+            bgcolor="#f7fafc"
+          >
+            <table
+              class="container"
+              role="presentation"
+              border="0"
+              cellpadding="0"
+              cellspacing="0"
+              style="width: 100%"
+            >
+              <tbody>
+                <tr>
+                  <td
+                    align="center"
+                    style="
+                      line-height: 24px;
+                      font-size: 16px;
+                      margin: 0;
+                      padding: 0 16px;
+                    "
+                  >
+                    <!--[if (gte mso 9)|(IE)]>
+                      <table align="center" role="presentation">
+                        <tbody>
+                          <tr>
+                            <td width="600">
+                    <![endif]-->
+                    <table
+                      align="center"
+                      role="presentation"
+                      border="0"
+                      cellpadding="0"
+                      cellspacing="0"
+                      style="width: 100%; max-width: 600px; margin: 0 auto"
+                    >
+                      <tbody>
+                        <tr>
+                          <td
+                            style="
+                              line-height: 24px;
+                              font-size: 16px;
+                              margin: 0;
+                            "
+                            align="left"
+                          >
+                            <table
+                              class="s-10 w-full"
+                              role="presentation"
+                              border="0"
+                              cellpadding="0"
+                              cellspacing="0"
+                              style="width: 100%"
+                              width="100%"
+                            >
+                              <tbody>
+                                <tr>
+                                  <td
+                                    style="
+                                      line-height: 40px;
+                                      font-size: 40px;
+                                      width: 100%;
+                                      height: 40px;
+                                      margin: 0;
+                                    "
+                                    align="left"
+                                    width="100%"
+                                    height="40"
+                                  >
+                                    &#160;
+                                  </td>
+                                </tr>
+                              </tbody>
+                            </table>
+                            <table
+                              class="ax-center"
+                              role="presentation"
+                              align="center"
+                              border="0"
+                              cellpadding="0"
+                              cellspacing="0"
+                              style="margin: 0 auto"
+                            >
+                              <tbody>
+                                <tr>
+                                  <td
+                                    style="
+                                      line-height: 24px;
+                                      font-size: 16px;
+                                      margin: 0;
+                                    "
+                                    align="left"
+                                  >
+                                    <img
+                                      alt="Revolt Logo"
+                                      class="w-24"
+                                      src="https://app.revolt.chat/assets/logo_round.png"
+                                      style="
+                                        height: auto;
+                                        line-height: 100%;
+                                        outline: none;
+                                        text-decoration: none;
+                                        display: block;
+                                        width: 96px;
+                                        border-style: none;
+                                        border-width: 0;
+                                      "
+                                      width="96"
+                                    />
+                                  </td>
+                                </tr>
+                              </tbody>
+                            </table>
+                            <table
+                              class="s-10 w-full"
+                              role="presentation"
+                              border="0"
+                              cellpadding="0"
+                              cellspacing="0"
+                              style="width: 100%"
+                              width="100%"
+                            >
+                              <tbody>
+                                <tr>
+                                  <td
+                                    style="
+                                      line-height: 40px;
+                                      font-size: 40px;
+                                      width: 100%;
+                                      height: 40px;
+                                      margin: 0;
+                                    "
+                                    align="left"
+                                    width="100%"
+                                    height="40"
+                                  >
+                                    &#160;
+                                  </td>
+                                </tr>
+                              </tbody>
+                            </table>
+                            <table
+                              class="card p-6 p-lg-10 space-y-4"
+                              role="presentation"
+                              border="0"
+                              cellpadding="0"
+                              cellspacing="0"
+                              style="
+                                border-radius: 6px;
+                                border-collapse: separate !important;
+                                width: 100%;
+                                overflow: hidden;
+                                border: 1px solid #e2e8f0;
+                              "
+                              bgcolor="#ffffff"
+                            >
+                              <tbody>
+                                <tr>
+                                  <td
+                                    style="
+                                      line-height: 24px;
+                                      font-size: 16px;
+                                      width: 100%;
+                                      margin: 0;
+                                      padding: 40px;
+                                    "
+                                    align="left"
+                                    bgcolor="#ffffff"
+                                  >
+                                    <h1
+                                      class="h3 fw-700"
+                                      style="
+                                        padding-top: 0;
+                                        padding-bottom: 0;
+                                        font-weight: 700 !important;
+                                        vertical-align: baseline;
+                                        font-size: 28px;
+                                        line-height: 33.6px;
+                                        margin: 0;
+                                      "
+                                      align="left"
+                                    >
+                                      Account Suspended
+                                    </h1>
+                                    <table
+                                      class="s-4 w-full"
+                                      role="presentation"
+                                      border="0"
+                                      cellpadding="0"
+                                      cellspacing="0"
+                                      style="width: 100%"
+                                      width="100%"
+                                    >
+                                      <tbody>
+                                        <tr>
+                                          <td
+                                            style="
+                                              line-height: 16px;
+                                              font-size: 16px;
+                                              width: 100%;
+                                              height: 16px;
+                                              margin: 0;
+                                            "
+                                            align="left"
+                                            width="100%"
+                                            height="16"
+                                          >
+                                            &#160;
+                                          </td>
+                                        </tr>
+                                      </tbody>
+                                    </table>
+                                    <p
+                                      class=""
+                                      style="
+                                        line-height: 24px;
+                                        font-size: 16px;
+                                        width: 100%;
+                                        margin: 0;
+                                      "
+                                      align="left"
+                                    >
+                                      Your account has been suspended, for one
+                                      or more reasons:
+                                    </p>
+                                    <table
+                                      class="s-4 w-full"
+                                      role="presentation"
+                                      border="0"
+                                      cellpadding="0"
+                                      cellspacing="0"
+                                      style="width: 100%"
+                                      width="100%"
+                                    >
+                                      <tbody>
+                                        <tr>
+                                          <td
+                                            style="
+                                              line-height: 16px;
+                                              font-size: 16px;
+                                              width: 100%;
+                                              height: 16px;
+                                              margin: 0;
+                                            "
+                                            align="left"
+                                            width="100%"
+                                            height="16"
+                                          >
+                                            &#160;
+                                          </td>
+                                        </tr>
+                                      </tbody>
+                                    </table>
+                                    <ul class="">
+                                      {{list}}
+                                    </ul>
+                                    <table
+                                      class="s-4 w-full"
+                                      role="presentation"
+                                      border="0"
+                                      cellpadding="0"
+                                      cellspacing="0"
+                                      style="width: 100%"
+                                      width="100%"
+                                    >
+                                      <tbody>
+                                        <tr>
+                                          <td
+                                            style="
+                                              line-height: 16px;
+                                              font-size: 16px;
+                                              width: 100%;
+                                              height: 16px;
+                                              margin: 0;
+                                            "
+                                            align="left"
+                                            width="100%"
+                                            height="16"
+                                          >
+                                            &#160;
+                                          </td>
+                                        </tr>
+                                      </tbody>
+                                    </table>
+                                    <p
+                                      style="display: {{duration_display}}; line-height: 24px; font-size: 16px; width: 100%; margin: 0;"
+                                      class=""
+                                      align="left"
+                                    >
+                                      You will be able to use your account again
+                                      in {{duration}} days.
+                                    </p>
+                                    <table
+                                      class="s-4 w-full"
+                                      role="presentation"
+                                      border="0"
+                                      cellpadding="0"
+                                      cellspacing="0"
+                                      style="width: 100%"
+                                      width="100%"
+                                    >
+                                      <tbody>
+                                        <tr>
+                                          <td
+                                            style="
+                                              line-height: 16px;
+                                              font-size: 16px;
+                                              width: 100%;
+                                              height: 16px;
+                                              margin: 0;
+                                            "
+                                            align="left"
+                                            width="100%"
+                                            height="16"
+                                          >
+                                            &#160;
+                                          </td>
+                                        </tr>
+                                      </tbody>
+                                    </table>
+                                    <p
+                                      class=""
+                                      style="
+                                        line-height: 24px;
+                                        font-size: 16px;
+                                        width: 100%;
+                                        margin: 0;
+                                      "
+                                      align="left"
+                                    >
+                                      Further violations may result in a
+                                      permanent ban depending on severity,
+                                      please abide by the
+                                      <a
+                                        href="https://revolt.chat/aup"
+                                        style="color: #0d6efd"
+                                        >Acceptable Usage Policy</a
+                                      >.
+                                    </p>
+                                    <table
+                                      class="s-4 w-full"
+                                      role="presentation"
+                                      border="0"
+                                      cellpadding="0"
+                                      cellspacing="0"
+                                      style="width: 100%"
+                                      width="100%"
+                                    >
+                                      <tbody>
+                                        <tr>
+                                          <td
+                                            style="
+                                              line-height: 16px;
+                                              font-size: 16px;
+                                              width: 100%;
+                                              height: 16px;
+                                              margin: 0;
+                                            "
+                                            align="left"
+                                            width="100%"
+                                            height="16"
+                                          >
+                                            &#160;
+                                          </td>
+                                        </tr>
+                                      </tbody>
+                                    </table>
+                                    <p
+                                      style="
+                                        line-height: 24px;
+                                        font-size: 16px;
+                                        width: 100%;
+                                        margin: 0;
+                                      "
+                                      align="left"
+                                    >
+                                      Ban evasion is prohibited and will be
+                                      dealt with accordingly.
+                                    </p>
+                                  </td>
+                                </tr>
+                              </tbody>
+                            </table>
+                            <table
+                              class="s-6 w-full"
+                              role="presentation"
+                              border="0"
+                              cellpadding="0"
+                              cellspacing="0"
+                              style="width: 100%"
+                              width="100%"
+                            >
+                              <tbody>
+                                <tr>
+                                  <td
+                                    style="
+                                      line-height: 24px;
+                                      font-size: 24px;
+                                      width: 100%;
+                                      height: 24px;
+                                      margin: 0;
+                                    "
+                                    align="left"
+                                    width="100%"
+                                    height="24"
+                                  >
+                                    &#160;
+                                  </td>
+                                </tr>
+                              </tbody>
+                            </table>
+                            <div
+                              class="text-muted text-center"
+                              style="color: #718096"
+                              align="center"
+                            >
+                              This email is intended for {{email}}<br />
+                              Sent from Revolt<br />
+                              Made in Europe
+                            </div>
+                            <table
+                              class="s-6 w-full"
+                              role="presentation"
+                              border="0"
+                              cellpadding="0"
+                              cellspacing="0"
+                              style="width: 100%"
+                              width="100%"
+                            >
+                              <tbody>
+                                <tr>
+                                  <td
+                                    style="
+                                      line-height: 24px;
+                                      font-size: 24px;
+                                      width: 100%;
+                                      height: 24px;
+                                      margin: 0;
+                                    "
+                                    align="left"
+                                    width="100%"
+                                    height="24"
+                                  >
+                                    &#160;
+                                  </td>
+                                </tr>
+                              </tbody>
+                            </table>
+                          </td>
+                        </tr>
+                      </tbody>
+                    </table>
+                    <!--[if (gte mso 9)|(IE)]>
+                    </td>
+                  </tr>
+                </tbody>
+              </table>
+                    <![endif]-->
+                  </td>
+                </tr>
+              </tbody>
+            </table>
+          </td>
+        </tr>
+      </tbody>
+    </table>
+  </body>
+</html>
--- a/crates/core/database/templates/suspension.original.html
+++ b/crates/core/database/templates/suspension.original.html
@@ -0,0 +1,38 @@
+<html>
+  <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <style>
+      /* Add custom classes and styles that you want inlined here */
+    </style>
+  </head>
+  <body class="bg-light">
+    <div class="container">
+      <img
+        alt="Revolt Logo"
+        class="ax-center my-10 w-24"
+        src="https://app.revolt.chat/assets/logo_round.png"
+      />
+      <div class="card p-6 p-lg-10 space-y-4">
+        <h1 class="h3 fw-700">Account Suspended</h1>
+        <p>Your account has been suspended, for one or more reasons:</p>
+        <ul>
+          {{list}}
+        </ul>
+        <p style="display:{{duration_display}}">
+          You will be able to use your account again in {{duration}} days.
+        </p>
+        <p>
+          Further violations may result in a permanent ban depending on
+          severity, please abide by the
+          <a href="https://revolt.chat/aup">Acceptable Usage Policy</a>.
+        </p>
+        <p>Ban evasion is prohibited and will be dealt with accordingly.</p>
+      </div>
+      <div class="text-muted text-center my-6">
+        This email is intended for {{email}}<br />
+        Sent from Revolt<br />
+        Made in Europe
+      </div>
+    </div>
+  </body>
+</html>
--- a/crates/core/database/templates/suspension.txt
+++ b/crates/core/database/templates/suspension.txt
@@ -0,0 +1,12 @@
+Your account has been suspended, for one or more reasons:
+{{list}}
+
+You will be able to use your account again in {{duration}} days.
+
+Further violations may result in a permanent ban depending on severity, please abide by the Acceptable Usage Policy (https://revolt.chat/aup).
+
+Ban evasion is prohibited and will be dealt with accordingly.
+
+This email is intended for {{email}}
+Sent by Revolt
+Made in Europe
--- a/crates/core/database/templates/verify.html
+++ b/crates/core/database/templates/verify.html
@@ -0,0 +1,552 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html>
+  <head>
+    <!-- Compiled with Bootstrap Email version: 1.3.1 -->
+    <meta http-equiv="x-ua-compatible" content="ie=edge" />
+    <meta name="x-apple-disable-message-reformatting" />
+    <meta name="viewport" content="width=device-width, initial-scale=1" />
+    <meta
+      name="format-detection"
+      content="telephone=no, date=no, address=no, email=no"
+    />
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <style type="text/css">
+      body,
+      table,
+      td {
+        font-family: Helvetica, Arial, sans-serif !important;
+      }
+      .ExternalClass {
+        width: 100%;
+      }
+      .ExternalClass,
+      .ExternalClass p,
+      .ExternalClass span,
+      .ExternalClass font,
+      .ExternalClass td,
+      .ExternalClass div {
+        line-height: 150%;
+      }
+      a {
+        text-decoration: none;
+      }
+      * {
+        color: inherit;
+      }
+      a[x-apple-data-detectors],
+      u + #body a,
+      #MessageViewBody a {
+        color: inherit;
+        text-decoration: none;
+        font-size: inherit;
+        font-family: inherit;
+        font-weight: inherit;
+        line-height: inherit;
+      }
+      img {
+        -ms-interpolation-mode: bicubic;
+      }
+      table:not([class^="s-"]) {
+        font-family: Helvetica, Arial, sans-serif;
+        mso-table-lspace: 0pt;
+        mso-table-rspace: 0pt;
+        border-spacing: 0px;
+        border-collapse: collapse;
+      }
+      table:not([class^="s-"]) td {
+        border-spacing: 0px;
+        border-collapse: collapse;
+      }
+      @media screen and (max-width: 600px) {
+        .w-full,
+        .w-full > tbody > tr > td {
+          width: 100% !important;
+        }
+        .w-24,
+        .w-24 > tbody > tr > td {
+          width: 96px !important;
+        }
+        .p-lg-10:not(table),
+        .p-lg-10:not(.btn) > tbody > tr > td,
+        .p-lg-10.btn td a {
+          padding: 0 !important;
+        }
+        .p-3:not(table),
+        .p-3:not(.btn) > tbody > tr > td,
+        .p-3.btn td a {
+          padding: 12px !important;
+        }
+        .p-6:not(table),
+        .p-6:not(.btn) > tbody > tr > td,
+        .p-6.btn td a {
+          padding: 24px !important;
+        }
+        *[class*="s-lg-"] > tbody > tr > td {
+          font-size: 0 !important;
+          line-height: 0 !important;
+          height: 0 !important;
+        }
+        .s-4 > tbody > tr > td {
+          font-size: 16px !important;
+          line-height: 16px !important;
+          height: 16px !important;
+        }
+        .s-6 > tbody > tr > td {
+          font-size: 24px !important;
+          line-height: 24px !important;
+          height: 24px !important;
+        }
+        .s-10 > tbody > tr > td {
+          font-size: 40px !important;
+          line-height: 40px !important;
+          height: 40px !important;
+        }
+      }
+    </style>
+  </head>
+  <body
+    class="bg-light"
+    style="
+      outline: 0;
+      width: 100%;
+      min-width: 100%;
+      height: 100%;
+      -webkit-text-size-adjust: 100%;
+      -ms-text-size-adjust: 100%;
+      font-family: Helvetica, Arial, sans-serif;
+      line-height: 24px;
+      font-weight: normal;
+      font-size: 16px;
+      -moz-box-sizing: border-box;
+      -webkit-box-sizing: border-box;
+      box-sizing: border-box;
+      color: #000000;
+      margin: 0;
+      padding: 0;
+      border-width: 0;
+    "
+    bgcolor="#f7fafc"
+  >
+    <table
+      class="bg-light body"
+      valign="top"
+      role="presentation"
+      border="0"
+      cellpadding="0"
+      cellspacing="0"
+      style="
+        outline: 0;
+        width: 100%;
+        min-width: 100%;
+        height: 100%;
+        -webkit-text-size-adjust: 100%;
+        -ms-text-size-adjust: 100%;
+        font-family: Helvetica, Arial, sans-serif;
+        line-height: 24px;
+        font-weight: normal;
+        font-size: 16px;
+        -moz-box-sizing: border-box;
+        -webkit-box-sizing: border-box;
+        box-sizing: border-box;
+        color: #000000;
+        margin: 0;
+        padding: 0;
+        border-width: 0;
+      "
+      bgcolor="#f7fafc"
+    >
+      <tbody>
+        <tr>
+          <td
+            valign="top"
+            style="line-height: 24px; font-size: 16px; margin: 0"
+            align="left"
+            bgcolor="#f7fafc"
+          >
+            <table
+              class="container"
+              role="presentation"
+              border="0"
+              cellpadding="0"
+              cellspacing="0"
+              style="width: 100%"
+            >
+              <tbody>
+                <tr>
+                  <td
+                    align="center"
+                    style="
+                      line-height: 24px;
+                      font-size: 16px;
+                      margin: 0;
+                      padding: 0 16px;
+                    "
+                  >
+                    <!--[if (gte mso 9)|(IE)]>
+                      <table align="center" role="presentation">
+                        <tbody>
+                          <tr>
+                            <td width="600">
+                    <![endif]-->
+                    <table
+                      align="center"
+                      role="presentation"
+                      border="0"
+                      cellpadding="0"
+                      cellspacing="0"
+                      style="width: 100%; max-width: 600px; margin: 0 auto"
+                    >
+                      <tbody>
+                        <tr>
+                          <td
+                            style="
+                              line-height: 24px;
+                              font-size: 16px;
+                              margin: 0;
+                            "
+                            align="left"
+                          >
+                            <table
+                              class="s-10 w-full"
+                              role="presentation"
+                              border="0"
+                              cellpadding="0"
+                              cellspacing="0"
+                              style="width: 100%"
+                              width="100%"
+                            >
+                              <tbody>
+                                <tr>
+                                  <td
+                                    style="
+                                      line-height: 40px;
+                                      font-size: 40px;
+                                      width: 100%;
+                                      height: 40px;
+                                      margin: 0;
+                                    "
+                                    align="left"
+                                    width="100%"
+                                    height="40"
+                                  >
+                                    &#160;
+                                  </td>
+                                </tr>
+                              </tbody>
+                            </table>
+                            <table
+                              class="ax-center"
+                              role="presentation"
+                              align="center"
+                              border="0"
+                              cellpadding="0"
+                              cellspacing="0"
+                              style="margin: 0 auto"
+                            >
+                              <tbody>
+                                <tr>
+                                  <td
+                                    style="
+                                      line-height: 24px;
+                                      font-size: 16px;
+                                      margin: 0;
+                                    "
+                                    align="left"
+                                  >
+                                    <img
+                                      alt="Revolt Logo"
+                                      class="w-24"
+                                      src="https://app.revolt.chat/assets/logo_round.png"
+                                      style="
+                                        height: auto;
+                                        line-height: 100%;
+                                        outline: none;
+                                        text-decoration: none;
+                                        display: block;
+                                        width: 96px;
+                                        border-style: none;
+                                        border-width: 0;
+                                      "
+                                      width="96"
+                                    />
+                                  </td>
+                                </tr>
+                              </tbody>
+                            </table>
+                            <table
+                              class="s-10 w-full"
+                              role="presentation"
+                              border="0"
+                              cellpadding="0"
+                              cellspacing="0"
+                              style="width: 100%"
+                              width="100%"
+                            >
+                              <tbody>
+                                <tr>
+                                  <td
+                                    style="
+                                      line-height: 40px;
+                                      font-size: 40px;
+                                      width: 100%;
+                                      height: 40px;
+                                      margin: 0;
+                                    "
+                                    align="left"
+                                    width="100%"
+                                    height="40"
+                                  >
+                                    &#160;
+                                  </td>
+                                </tr>
+                              </tbody>
+                            </table>
+                            <table
+                              class="card p-6 p-lg-10 space-y-4"
+                              role="presentation"
+                              border="0"
+                              cellpadding="0"
+                              cellspacing="0"
+                              style="
+                                border-radius: 6px;
+                                border-collapse: separate !important;
+                                width: 100%;
+                                overflow: hidden;
+                                border: 1px solid #e2e8f0;
+                              "
+                              bgcolor="#ffffff"
+                            >
+                              <tbody>
+                                <tr>
+                                  <td
+                                    style="
+                                      line-height: 24px;
+                                      font-size: 16px;
+                                      width: 100%;
+                                      margin: 0;
+                                      padding: 40px;
+                                    "
+                                    align="left"
+                                    bgcolor="#ffffff"
+                                  >
+                                    <h1
+                                      class="h3 fw-700"
+                                      style="
+                                        padding-top: 0;
+                                        padding-bottom: 0;
+                                        font-weight: 700 !important;
+                                        vertical-align: baseline;
+                                        font-size: 28px;
+                                        line-height: 33.6px;
+                                        margin: 0;
+                                      "
+                                      align="left"
+                                    >
+                                      Almost there!
+                                    </h1>
+                                    <table
+                                      class="s-4 w-full"
+                                      role="presentation"
+                                      border="0"
+                                      cellpadding="0"
+                                      cellspacing="0"
+                                      style="width: 100%"
+                                      width="100%"
+                                    >
+                                      <tbody>
+                                        <tr>
+                                          <td
+                                            style="
+                                              line-height: 16px;
+                                              font-size: 16px;
+                                              width: 100%;
+                                              height: 16px;
+                                              margin: 0;
+                                            "
+                                            align="left"
+                                            width="100%"
+                                            height="16"
+                                          >
+                                            &#160;
+                                          </td>
+                                        </tr>
+                                      </tbody>
+                                    </table>
+                                    <p
+                                      class=""
+                                      style="
+                                        line-height: 24px;
+                                        font-size: 16px;
+                                        width: 100%;
+                                        margin: 0;
+                                      "
+                                      align="left"
+                                    >
+                                      To complete your sign up, we just need to
+                                      verify your email.
+                                    </p>
+                                    <table
+                                      class="s-4 w-full"
+                                      role="presentation"
+                                      border="0"
+                                      cellpadding="0"
+                                      cellspacing="0"
+                                      style="width: 100%"
+                                      width="100%"
+                                    >
+                                      <tbody>
+                                        <tr>
+                                          <td
+                                            style="
+                                              line-height: 16px;
+                                              font-size: 16px;
+                                              width: 100%;
+                                              height: 16px;
+                                              margin: 0;
+                                            "
+                                            align="left"
+                                            width="100%"
+                                            height="16"
+                                          >
+                                            &#160;
+                                          </td>
+                                        </tr>
+                                      </tbody>
+                                    </table>
+                                    <table
+                                      class="btn btn-primary p-3 fw-700"
+                                      role="presentation"
+                                      border="0"
+                                      cellpadding="0"
+                                      cellspacing="0"
+                                      style="
+                                        border-radius: 6px;
+                                        border-collapse: separate !important;
+                                        font-weight: 700 !important;
+                                      "
+                                    >
+                                      <tbody>
+                                        <tr>
+                                          <td
+                                            style="
+                                              line-height: 24px;
+                                              font-size: 16px;
+                                              border-radius: 6px;
+                                              font-weight: 700 !important;
+                                              margin: 0;
+                                            "
+                                            align="center"
+                                            bgcolor="#0d6efd"
+                                          >
+                                            <a
+                                              href="{{url}}"
+                                              style="
+                                                color: #ffffff;
+                                                font-size: 16px;
+                                                font-family: Helvetica, Arial,
+                                                  sans-serif;
+                                                text-decoration: none;
+                                                border-radius: 6px;
+                                                line-height: 20px;
+                                                display: block;
+                                                font-weight: 700 !important;
+                                                white-space: nowrap;
+                                                background-color: #0d6efd;
+                                                padding: 12px;
+                                                border: 1px solid #0d6efd;
+                                              "
+                                              >Confirm</a
+                                            >
+                                          </td>
+                                        </tr>
+                                      </tbody>
+                                    </table>
+                                  </td>
+                                </tr>
+                              </tbody>
+                            </table>
+                            <table
+                              class="s-6 w-full"
+                              role="presentation"
+                              border="0"
+                              cellpadding="0"
+                              cellspacing="0"
+                              style="width: 100%"
+                              width="100%"
+                            >
+                              <tbody>
+                                <tr>
+                                  <td
+                                    style="
+                                      line-height: 24px;
+                                      font-size: 24px;
+                                      width: 100%;
+                                      height: 24px;
+                                      margin: 0;
+                                    "
+                                    align="left"
+                                    width="100%"
+                                    height="24"
+                                  >
+                                    &#160;
+                                  </td>
+                                </tr>
+                              </tbody>
+                            </table>
+                            <div
+                              class="text-muted text-center"
+                              style="color: #718096"
+                              align="center"
+                            >
+                              This email is intended for {{email}}<br />
+                              Sent from Revolt<br />
+                              Made in Europe
+                            </div>
+                            <table
+                              class="s-6 w-full"
+                              role="presentation"
+                              border="0"
+                              cellpadding="0"
+                              cellspacing="0"
+                              style="width: 100%"
+                              width="100%"
+                            >
+                              <tbody>
+                                <tr>
+                                  <td
+                                    style="
+                                      line-height: 24px;
+                                      font-size: 24px;
+                                      width: 100%;
+                                      height: 24px;
+                                      margin: 0;
+                                    "
+                                    align="left"
+                                    width="100%"
+                                    height="24"
+                                  >
+                                    &#160;
+                                  </td>
+                                </tr>
+                              </tbody>
+                            </table>
+                          </td>
+                        </tr>
+                      </tbody>
+                    </table>
+                    <!--[if (gte mso 9)|(IE)]>
+                    </td>
+                  </tr>
+                </tbody>
+              </table>
+                    <![endif]-->
+                  </td>
+                </tr>
+              </tbody>
+            </table>
+          </td>
+        </tr>
+      </tbody>
+    </table>
+  </body>
+</html>
--- a/crates/core/database/templates/verify.original.html
+++ b/crates/core/database/templates/verify.original.html
@@ -20,7 +20,7 @@
      <div class="text-muted text-center my-6">
        This email is intended for {{email}}<br />
        Sent from Revolt<br />
-        Made in the EU
+        Made in Europe
      </div>
    </div>
  </body>
--- a/crates/core/database/templates/verify.txt
+++ b/crates/core/database/templates/verify.txt
@@ -5,4 +5,4 @@ Please navigate to: {{url}}

 This email is intended for {{email}}
 Sent by Revolt
-Made in the EU
+Made in Europe
--- a/crates/core/files/Cargo.toml
+++ b/crates/core/files/Cargo.toml
@@ -1,13 +1,33 @@
 [package]
 name = "revolt-files"
-version = "0.7.16"
+version = "0.7.17"
 edition = "2021"
 license = "AGPL-3.0-or-later"
 authors = ["Paul Makles <me@insrt.uk>"]
 description = "Revolt Backend: S3 and encryption subroutines"

 [dependencies]
+tracing = "0.1"
+
+ffprobe = "0.4.0"
+imagesize = "0.13.0"
+tempfile = "3.12.0"
+
+base64 = "0.22.1"
 aes-gcm = "0.10.3"
+typenum = "1.17.0"

 aws-config = "1.5.5"
 aws-sdk-s3 = { version = "1.46.0", features = ["behavior-version-latest"] }
+
+revolt-config = { version = "0.7.17", path = "../config", features = [
+    "report-macros",
+] }
+revolt-result = { version = "0.7.17", path = "../result" }
+
+# image processing
+jxl-oxide = "0.8.1"
+image = { version = "0.25.2" }
+
+# encoding
+webp = "0.3.0"
--- a/crates/core/files/src/lib.rs
+++ b/crates/core/files/src/lib.rs
@@ -1,3 +1,210 @@
-// pub fn
+use std::io::{BufRead, Read, Seek, Write};

-pub fn decrypt(data: &mut [u8]) {}
+use aes_gcm::{
+    aead::{AeadCore, AeadMutInPlace, OsRng},
+    Aes256Gcm, Key, KeyInit, Nonce,
+};
+use image::DynamicImage;
+use revolt_config::{config, report_internal_error, FilesS3};
+use revolt_result::{create_error, Result};
+
+use aws_sdk_s3::{
+    config::{Credentials, Region},
+    Client, Config,
+};
+
+use base64::prelude::*;
+use tempfile::NamedTempFile;
+
+/// Size of the authentication tag in the buffer
+pub const AUTHENTICATION_TAG_SIZE_BYTES: usize = 16;
+
+/// Create an S3 client
+pub fn create_client(s3_config: FilesS3) -> Client {
+    let provider_name = "my-creds";
+    let creds = Credentials::new(
+        s3_config.access_key_id,
+        s3_config.secret_access_key,
+        None,
+        None,
+        provider_name,
+    );
+
+    let config = Config::builder()
+        .region(Region::new(s3_config.region))
+        .endpoint_url(s3_config.endpoint)
+        .credentials_provider(creds)
+        .build();
+
+    Client::from_conf(config)
+}
+
+/// Create an AES-256-GCM cipher
+pub fn create_cipher(key: &str) -> Aes256Gcm {
+    let key = &BASE64_STANDARD.decode(key).expect("valid base64 string")[..];
+    let key: &Key<Aes256Gcm> = key.into();
+    Aes256Gcm::new(key)
+}
+
+/// Fetch a file from S3 (and decrypt it)
+pub async fn fetch_from_s3(bucket_id: &str, path: &str, nonce: &str) -> Result<Vec<u8>> {
+    let config = config().await;
+    let client = create_client(config.files.s3);
+
+    // Send a request for the file
+    let mut obj =
+        report_internal_error!(client.get_object().bucket(bucket_id).key(path).send().await)?;
+
+    // Read the file from remote
+    let mut buf = vec![];
+    while let Some(bytes) = obj.body.next().await {
+        let data = report_internal_error!(bytes)?;
+        report_internal_error!(buf.write_all(&data))?;
+        // is there a more efficient way to do this?
+        // we just want the Vec<u8>
+    }
+
+    // File is not encrypted
+    if nonce.is_empty() {
+        return Ok(buf);
+    }
+
+    // Recover nonce as bytes
+    let nonce = &BASE64_STANDARD.decode(nonce).unwrap()[..];
+    let nonce: &Nonce<typenum::consts::U12> = nonce.into();
+
+    // Decrypt the file
+    create_cipher(&config.files.encryption_key)
+        .decrypt_in_place(nonce, b"", &mut buf)
+        .map_err(|_| create_error!(InternalError))?;
+
+    Ok(buf)
+}
+
+/// Encrypt and upload a file to S3 (returning its nonce/IV)
+pub async fn upload_to_s3(bucket_id: &str, path: &str, buf: &[u8]) -> Result<String> {
+    let config = config().await;
+    let client = create_client(config.files.s3);
+
+    // Generate a nonce
+    let nonce = Aes256Gcm::generate_nonce(&mut OsRng);
+
+    // Extend the buffer for in-place encryption
+    let mut buf = [buf, &[0; AUTHENTICATION_TAG_SIZE_BYTES]].concat();
+
+    // Encrypt the file in place
+    create_cipher(&config.files.encryption_key)
+        .encrypt_in_place(&nonce, b"", &mut buf)
+        .map_err(|_| create_error!(InternalError))?;
+
+    // Upload the file to remote
+    report_internal_error!(
+        client
+            .put_object()
+            .bucket(bucket_id)
+            .key(path)
+            .body(buf.into())
+            .send()
+            .await
+    )?;
+
+    Ok(BASE64_STANDARD.encode(nonce))
+}
+
+/// Determine size of image at temp file
+pub fn image_size(f: &NamedTempFile) -> Option<(usize, usize)> {
+    if let Ok(size) = imagesize::size(f.path())
+        .inspect_err(|err| tracing::error!("Failed to generate image size! {err:?}"))
+    {
+        Some((size.width, size.height))
+    } else {
+        None
+    }
+}
+
+/// Determine size of image with buffer
+pub fn image_size_vec(v: &[u8]) -> Option<(usize, usize)> {
+    if let Ok(size) = imagesize::blob_size(v)
+        .inspect_err(|err| tracing::error!("Failed to generate image size! {err:?}"))
+    {
+        Some((size.width, size.height))
+    } else {
+        None
+    }
+}
+
+/// Determine size of video at temp file
+pub fn video_size(f: &NamedTempFile) -> Option<(i64, i64)> {
+    if let Ok(data) = ffprobe::ffprobe(f.path())
+        .inspect_err(|err| tracing::error!("Failed to ffprobe file! {err:?}"))
+    {
+        // Use first valid stream
+        for stream in data.streams {
+            if let (Some(w), Some(h)) = (stream.width, stream.height) {
+                return Some((w, h));
+            }
+        }
+
+        None
+    } else {
+        None
+    }
+}
+
+/// Decode image from reader
+pub fn decode_image<R: Read + BufRead + Seek>(
+    reader: &mut R,
+    is_jxl: bool,
+) -> Result<DynamicImage> {
+    if is_jxl {
+        Err(create_error!(LabelMe))
+    } else {
+        // Check if we can read using image-rs crate
+        report_internal_error!(report_internal_error!(
+            image::ImageReader::new(reader).with_guessed_format()
+        )?
+        .decode())
+    }
+}
+
+/// Check whether given reader has a valid image
+pub fn is_valid_image<R: Read + BufRead + Seek>(reader: &mut R, is_jxl: bool) -> bool {
+    if is_jxl {
+        // Check if we can read using jxl-oxide crate
+        jxl_oxide::JxlImage::builder()
+            .read(reader)
+            .inspect_err(|err| tracing::error!("Failed to read JXL! {err:?}"))
+            .is_ok()
+    } else {
+        !matches!(
+            // Check if we can read using image-rs crate
+            image::ImageReader::new(reader)
+                .with_guessed_format()
+                .inspect_err(|err| tracing::error!("Failed to read image! {err:?}"))
+                .map(|f| f.decode()),
+            Err(_) | Ok(Err(_))
+        )
+    }
+}
+
+/// Create thumbnail from given image
+pub async fn create_thumbnail(image: DynamicImage, tag: &str) -> Vec<u8> {
+    // Load configuration
+    let config = config().await;
+    let [w, h] = config.files.preview.get(tag).unwrap();
+
+    // Create thumbnail
+    //.resize(width as u32, height as u32, image::imageops::FilterType::Gaussian)
+    // resize is about 2.5x slower,
+    // thumbnail doesn't have terrible quality
+    // so we use thumbnail
+    let image = image.thumbnail(image.width().min(*w as u32), image.height().min(*h as u32));
+
+    // Encode it into WEBP
+    let encoder = webp::Encoder::from_image(&image).expect("Could not create encoder.");
+    if config.files.webp_quality != 100.0 {
+        encoder.encode(config.files.webp_quality).to_vec()
+    } else {
+        encoder.encode_lossless().to_vec()
+    }
+}
--- a/crates/core/models/Cargo.toml
+++ b/crates/core/models/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "revolt-models"
-version = "0.7.16"
+version = "0.7.17"
 edition = "2021"
 license = "MIT"
 authors = ["Paul Makles <me@insrt.uk>"]
@@ -11,16 +11,17 @@ description = "Revolt Backend: API Models"
 [features]
 serde = ["dep:serde", "revolt-permissions/serde", "indexmap/serde"]
 schemas = ["dep:schemars", "revolt-permissions/schemas"]
+utoipa = ["dep:utoipa"]
 validator = ["dep:validator"]
 rocket = ["dep:rocket"]
-partials = ["dep:revolt_optional_struct", "serde", "schemas"]
+partials = ["dep:revolt_optional_struct", "serde", "schemas", "utoipa"]

 default = ["serde", "partials", "rocket"]

 [dependencies]
 # Core
-revolt-config = { version = "0.7.16", path = "../config" }
-revolt-permissions = { version = "0.7.16", path = "../permissions" }
+revolt-config = { version = "0.7.17", path = "../config" }
+revolt-permissions = { version = "0.7.17", path = "../permissions" }

 # Utility
 regex = "1"
@@ -37,6 +38,7 @@ iso8601-timestamp = { version = "0.2.11", features = ["schema", "bson"] }

 # Spec Generation
 schemars = { version = "0.8.8", optional = true, features = ["indexmap1"] }
+utoipa = { version = "4.2.3", optional = true }

 # Validation
 validator = { version = "0.16.0", optional = true, features = ["derive"] }
--- a/crates/core/models/src/lib.rs
+++ b/crates/core/models/src/lib.rs
@@ -6,6 +6,10 @@ extern crate serde;
 #[macro_use]
 extern crate schemars;

+#[cfg(feature = "utoipa")]
+#[macro_use]
+extern crate utoipa;
+
 #[cfg(feature = "partials")]
 #[macro_use]
 extern crate revolt_optional_struct;
@@ -18,6 +22,7 @@ macro_rules! auto_derived {
        $(
            #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
            #[cfg_attr(feature = "schemas", derive(JsonSchema))]
+            #[cfg_attr(feature = "utoipa", derive(ToSchema))]
            #[derive(Debug, Clone, Eq, PartialEq)]
            $item
        )+
--- a/crates/core/models/src/v0/channel_webhooks.rs
+++ b/crates/core/models/src/v0/channel_webhooks.rs
@@ -16,6 +16,9 @@ auto_derived_partial!(
        #[cfg_attr(feature = "serde", serde(skip_serializing_if = "Option::is_none"))]
        pub avatar: Option<File>,

+        /// User that created this webhook
+        pub creator_id: String,
+
        /// The channel this webhook belongs to
        pub channel_id: String,

--- a/crates/core/models/src/v0/embeds.rs
+++ b/crates/core/models/src/v0/embeds.rs
@@ -14,9 +14,9 @@ auto_derived!(
        /// URL to the original image
        pub url: String,
        /// Width of the image
-        pub width: isize,
+        pub width: usize,
        /// Height of the image
-        pub height: isize,
+        pub height: usize,
        /// Positioning and size
        pub size: ImageSize,
    }
@@ -26,9 +26,9 @@ auto_derived!(
        /// URL to the original video
        pub url: String,
        /// Width of the video
-        pub width: isize,
+        pub width: usize,
        /// Height of the video
-        pub height: isize,
+        pub height: usize,
    }

    /// Type of remote Twitch content
@@ -86,7 +86,7 @@ auto_derived!(
        },
        AppleMusic {
            album_id: String,
-            
+
            #[serde(skip_serializing_if = "Option::is_none")]
            track_id: Option<String>,
        },
@@ -119,8 +119,6 @@ auto_derived!(
        #[serde(skip_serializing_if = "Option::is_none")]
        pub video: Option<Video>,

-        // #[serde(skip_serializing_if = "Option::is_none")]
-        // opengraph_type: Option<String>,
        /// Site name
        #[serde(skip_serializing_if = "Option::is_none")]
        pub site_name: Option<String>,
@@ -156,11 +154,56 @@ auto_derived!(

    /// Embed
    #[serde(tag = "type")]
+    #[derive(Default)]
    pub enum Embed {
        Website(WebsiteMetadata),
        Image(Image),
        Video(Video),
        Text(Text),
+        #[default]
        None,
    }
 );
+
+impl WebsiteMetadata {
+    /// Truncate strings in metadata
+    pub fn truncate(&mut self) {
+        if let Some(s) = self.url.as_mut() {
+            s.truncate(256);
+        }
+
+        if let Some(s) = self.original_url.as_mut() {
+            s.truncate(256);
+        }
+
+        if let Some(s) = self.title.as_mut() {
+            s.truncate(100);
+        }
+
+        if let Some(s) = self.description.as_mut() {
+            s.truncate(1000);
+        }
+
+        if let Some(s) = self.site_name.as_mut() {
+            s.truncate(32);
+        }
+
+        if let Some(s) = self.icon_url.as_mut() {
+            s.truncate(256);
+        }
+
+        if let Some(s) = self.colour.as_mut() {
+            s.truncate(32);
+        }
+    }
+
+    /// Check if this is considered "empty"
+    pub fn is_empty(&self) -> bool {
+        (self.title.is_none() || self.title.as_ref().is_some_and(|f| f.is_empty()))
+            && (self.description.is_none()
+                || self.description.as_ref().is_some_and(|f| f.is_empty()))
+            && self.special.is_none()
+            && self.video.is_none()
+            && self.image.is_none()
+    }
+}
--- a/crates/core/models/src/v0/users.rs
+++ b/crates/core/models/src/v0/users.rs
@@ -88,6 +88,9 @@ auto_derived!(
        ProfileContent,
        ProfileBackground,
        DisplayName,
+
+        /// Internal field, ignore this.
+        Internal,
    }

    /// User's relationship with another user (or themselves)
@@ -190,7 +193,7 @@ auto_derived!(
    #[repr(u32)]
    pub enum UserFlags {
        /// User has been suspended from the platform
-        Suspended = 1,
+        SuspendedUntil = 1,
        /// User has deleted their account
        Deleted = 2,
        /// User was banned off the platform
--- a/crates/core/permissions/Cargo.toml
+++ b/crates/core/permissions/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "revolt-permissions"
-version = "0.7.16"
+version = "0.7.17"
 edition = "2021"
 license = "MIT"
 authors = ["Paul Makles <me@insrt.uk>"]
@@ -21,7 +21,7 @@ async-std = { version = "1.8.0", features = ["attributes"] }

 [dependencies]
 # Core
-revolt-result = { version = "0.7.16", path = "../result" }
+revolt-result = { version = "0.7.17", path = "../result" }

 # Utility
 auto_ops = "0.3.0"
--- a/crates/core/presence/Cargo.toml
+++ b/crates/core/presence/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "revolt-presence"
-version = "0.7.16"
+version = "0.7.17"
 edition = "2021"
 license = "AGPL-3.0-or-later"
 authors = ["Paul Makles <me@insrt.uk>"]
--- a/crates/core/result/Cargo.toml
+++ b/crates/core/result/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "revolt-result"
-version = "0.7.16"
+version = "0.7.17"
 edition = "2021"
 license = "MIT"
 authors = ["Paul Makles <me@insrt.uk>"]
@@ -11,7 +11,9 @@ description = "Revolt Backend: Result and Error types"
 [features]
 serde = ["dep:serde"]
 schemas = ["dep:schemars"]
+utoipa = ["dep:utoipa"]
 rocket = ["dep:rocket", "dep:serde_json"]
+axum = ["dep:axum", "dep:serde_json"]
 okapi = ["dep:revolt_rocket_okapi", "dep:revolt_okapi", "schemas"]

 default = ["serde"]
@@ -23,8 +25,12 @@ serde = { version = "1", features = ["derive"], optional = true }

 # Spec Generation
 schemars = { version = "0.8.8", optional = true }
+utoipa = { version = "4.2.3", optional = true }

 # Rocket
 rocket = { optional = true, version = "0.5.0-rc.2", default-features = false }
 revolt_rocket_okapi = { version = "0.9.1", optional = true }
 revolt_okapi = { version = "0.9.1", optional = true }
+
+# Axum
+axum = { version = "0.7.5", optional = true }
--- a/crates/core/result/src/axum.rs
+++ b/crates/core/result/src/axum.rs
@@ -0,0 +1,85 @@
+use axum::{http::StatusCode, response::IntoResponse, Json};
+
+use crate::{Error, ErrorType};
+
+/// HTTP response builder for Error enum
+impl IntoResponse for Error {
+    fn into_response(self) -> axum::response::Response {
+        let status = match self.error_type {
+            ErrorType::LabelMe => StatusCode::INTERNAL_SERVER_ERROR,
+
+            ErrorType::AlreadyOnboarded => StatusCode::FORBIDDEN,
+
+            ErrorType::UnknownUser => StatusCode::NOT_FOUND,
+            ErrorType::InvalidUsername => StatusCode::BAD_REQUEST,
+            ErrorType::UsernameTaken => StatusCode::CONFLICT,
+            ErrorType::DiscriminatorChangeRatelimited => StatusCode::TOO_MANY_REQUESTS,
+            ErrorType::AlreadyFriends => StatusCode::CONFLICT,
+            ErrorType::AlreadySentRequest => StatusCode::CONFLICT,
+            ErrorType::Blocked => StatusCode::CONFLICT,
+            ErrorType::BlockedByOther => StatusCode::FORBIDDEN,
+            ErrorType::NotFriends => StatusCode::FORBIDDEN,
+            ErrorType::TooManyPendingFriendRequests { .. } => StatusCode::BAD_REQUEST,
+
+            ErrorType::UnknownChannel => StatusCode::NOT_FOUND,
+            ErrorType::UnknownMessage => StatusCode::NOT_FOUND,
+            ErrorType::UnknownAttachment => StatusCode::BAD_REQUEST,
+            ErrorType::CannotEditMessage => StatusCode::FORBIDDEN,
+            ErrorType::CannotJoinCall => StatusCode::BAD_REQUEST,
+            ErrorType::TooManyAttachments { .. } => StatusCode::BAD_REQUEST,
+            ErrorType::TooManyReplies { .. } => StatusCode::BAD_REQUEST,
+            ErrorType::EmptyMessage => StatusCode::UNPROCESSABLE_ENTITY,
+            ErrorType::PayloadTooLarge => StatusCode::UNPROCESSABLE_ENTITY,
+            ErrorType::CannotRemoveYourself => StatusCode::BAD_REQUEST,
+            ErrorType::GroupTooLarge { .. } => StatusCode::FORBIDDEN,
+            ErrorType::AlreadyInGroup => StatusCode::CONFLICT,
+            ErrorType::NotInGroup => StatusCode::NOT_FOUND,
+            ErrorType::AlreadyPinned => StatusCode::BAD_REQUEST,
+            ErrorType::NotPinned => StatusCode::BAD_REQUEST,
+
+            ErrorType::UnknownServer => StatusCode::NOT_FOUND,
+            ErrorType::InvalidRole => StatusCode::NOT_FOUND,
+            ErrorType::Banned => StatusCode::FORBIDDEN,
+            ErrorType::AlreadyInServer => StatusCode::CONFLICT,
+
+            ErrorType::TooManyServers { .. } => StatusCode::BAD_REQUEST,
+            ErrorType::TooManyEmbeds { .. } => StatusCode::BAD_REQUEST,
+            ErrorType::TooManyEmoji { .. } => StatusCode::BAD_REQUEST,
+            ErrorType::TooManyChannels { .. } => StatusCode::BAD_REQUEST,
+            ErrorType::TooManyRoles { .. } => StatusCode::BAD_REQUEST,
+
+            ErrorType::ReachedMaximumBots => StatusCode::BAD_REQUEST,
+            ErrorType::IsBot => StatusCode::BAD_REQUEST,
+            ErrorType::BotIsPrivate => StatusCode::FORBIDDEN,
+
+            ErrorType::CannotReportYourself => StatusCode::BAD_REQUEST,
+
+            ErrorType::MissingPermission { .. } => StatusCode::FORBIDDEN,
+            ErrorType::MissingUserPermission { .. } => StatusCode::FORBIDDEN,
+            ErrorType::NotElevated => StatusCode::FORBIDDEN,
+            ErrorType::NotPrivileged => StatusCode::FORBIDDEN,
+            ErrorType::CannotGiveMissingPermissions => StatusCode::FORBIDDEN,
+            ErrorType::NotOwner => StatusCode::FORBIDDEN,
+
+            ErrorType::DatabaseError { .. } => StatusCode::INTERNAL_SERVER_ERROR,
+            ErrorType::InternalError => StatusCode::INTERNAL_SERVER_ERROR,
+            ErrorType::InvalidOperation => StatusCode::BAD_REQUEST,
+            ErrorType::InvalidCredentials => StatusCode::UNAUTHORIZED,
+            ErrorType::InvalidProperty => StatusCode::BAD_REQUEST,
+            ErrorType::InvalidSession => StatusCode::UNAUTHORIZED,
+            ErrorType::NotAuthenticated => StatusCode::UNAUTHORIZED,
+            ErrorType::DuplicateNonce => StatusCode::CONFLICT,
+            ErrorType::VosoUnavailable => StatusCode::BAD_REQUEST,
+            ErrorType::NotFound => StatusCode::NOT_FOUND,
+            ErrorType::NoEffect => StatusCode::OK,
+            ErrorType::FailedValidation { .. } => StatusCode::BAD_REQUEST,
+
+            ErrorType::ProxyError => StatusCode::BAD_REQUEST,
+            ErrorType::FileTooSmall => StatusCode::UNPROCESSABLE_ENTITY,
+            ErrorType::FileTooLarge { .. } => StatusCode::UNPROCESSABLE_ENTITY,
+            ErrorType::FileTypeNotAllowed => StatusCode::BAD_REQUEST,
+        };
+
+        (status, Json(&self)).into_response()
+    }
+}
--- a/crates/core/result/src/lib.rs
+++ b/crates/core/result/src/lib.rs
@@ -8,9 +8,16 @@ extern crate serde;
 #[macro_use]
 extern crate schemars;

+#[cfg(feature = "utoipa")]
+#[macro_use]
+extern crate utoipa;
+
 #[cfg(feature = "rocket")]
 pub mod rocket;

+#[cfg(feature = "axum")]
+pub mod axum;
+
 #[cfg(feature = "okapi")]
 pub mod okapi;

@@ -20,6 +27,7 @@ pub type Result<T, E = Error> = std::result::Result<T, E>;
 /// Error information
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
 #[cfg_attr(feature = "schemas", derive(JsonSchema))]
+#[cfg_attr(feature = "utoipa", derive(ToSchema))]
 #[derive(Debug, Clone)]
 pub struct Error {
    /// Type of error and additional information
@@ -42,6 +50,7 @@ impl std::error::Error for Error {}
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
 #[cfg_attr(feature = "serde", serde(tag = "type"))]
 #[cfg_attr(feature = "schemas", derive(JsonSchema))]
+#[cfg_attr(feature = "utoipa", derive(ToSchema))]
 #[derive(Debug, Clone)]
 pub enum ErrorType {
    /// This error was not labeled :(
@@ -138,6 +147,7 @@ pub enum ErrorType {
    InvalidCredentials,
    InvalidProperty,
    InvalidSession,
+    NotAuthenticated,
    DuplicateNonce,
    NotFound,
    NoEffect,
@@ -145,6 +155,14 @@ pub enum ErrorType {
        error: String,
    },

+    // ? Micro-service errors
+    ProxyError,
+    FileTooSmall,
+    FileTooLarge {
+        max: usize,
+    },
+    FileTypeNotAllowed,
+
    // ? Legacy errors
    VosoUnavailable,
 }
--- a/crates/core/result/src/rocket.rs
+++ b/crates/core/result/src/rocket.rs
@@ -73,11 +73,17 @@ impl<'r> Responder<'r, 'static> for Error {
            ErrorType::InvalidCredentials => Status::Unauthorized,
            ErrorType::InvalidProperty => Status::BadRequest,
            ErrorType::InvalidSession => Status::Unauthorized,
+            ErrorType::NotAuthenticated => Status::Unauthorized,
            ErrorType::DuplicateNonce => Status::Conflict,
            ErrorType::VosoUnavailable => Status::BadRequest,
            ErrorType::NotFound => Status::NotFound,
            ErrorType::NoEffect => Status::Ok,
            ErrorType::FailedValidation { .. } => Status::BadRequest,
+
+            ErrorType::ProxyError => Status::BadRequest,
+            ErrorType::FileTooSmall => Status::UnprocessableEntity,
+            ErrorType::FileTooLarge { .. } => Status::UnprocessableEntity,
+            ErrorType::FileTypeNotAllowed => Status::BadRequest,
        };

        // Serialize the error data structure into JSON.
--- a/crates/delta/Cargo.toml
+++ b/crates/delta/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "revolt-delta"
-version = "0.7.16"
+version = "0.7.17"
 license = "AGPL-3.0-or-later"
 authors = ["Paul Makles <paulmakles@gmail.com>"]
 edition = "2018"
--- a/crates/delta/Dockerfile
+++ b/crates/delta/Dockerfile
@@ -2,13 +2,10 @@
 FROM ghcr.io/revoltchat/base:latest AS builder

 # Bundle Stage
-FROM debian:bullseye-slim
-RUN apt-get update && \
-    apt-get install -y ca-certificates && \
-    apt-get clean
+FROM gcr.io/distroless/cc-debian12:nonroot
 COPY --from=builder /home/rust/src/target/release/revolt-delta ./

 EXPOSE 8000
 ENV ROCKET_ADDRESS 0.0.0.0
-ENV ROCKET_PORT 8000
+USER nonroot
 CMD ["./revolt-delta"]
--- a/crates/delta/src/main.rs
+++ b/crates/delta/src/main.rs
@@ -10,7 +10,6 @@ pub mod util;

 use revolt_config::config;
 use revolt_database::events::client::EventV1;
-use revolt_database::{Database, MongoDb};
 use rocket::{Build, Rocket};
 use rocket_cors::{AllowedOrigins, CorsOptions};
 use rocket_prometheus::PrometheusMetrics;
@@ -18,11 +17,7 @@ use std::net::Ipv4Addr;
 use std::str::FromStr;

 use async_std::channel::unbounded;
-use authifier::config::{
-    Captcha, Config as AuthifierConfig, EmailVerificationConfig, ResolveIp, SMTPSettings, Shield,
-    Template, Templates,
-};
-use authifier::{Authifier, AuthifierEvent};
+use authifier::AuthifierEvent;
 use rocket::data::ToByteUnit;

 pub async fn web() -> Rocket<Build> {
@@ -40,16 +35,7 @@ pub async fn web() -> Rocket<Build> {
    let (sender, receiver) = unbounded();

    // Setup Authifier
-    let authifier = Authifier {
-        database: match db.clone() {
-            Database::Reference(_) => Default::default(),
-            Database::MongoDb(MongoDb(client, _)) => authifier::Database::MongoDb(
-                authifier::database::MongoDb(client.database("revolt")),
-            ),
-        },
-        config: authifier_config().await,
-        event_channel: Some(sender),
-    };
+    let authifier = db.clone().to_authifier().await;

    // Launch a listener for Authifier events
    async_std::task::spawn(async move {
@@ -68,10 +54,7 @@ pub async fn web() -> Rocket<Build> {
    });

    // Launch background task workers
-    async_std::task::spawn(revolt_database::tasks::start_workers(
-        db.clone(),
-        authifier.database.clone(),
-    ));
+    revolt_database::tasks::start_workers(db.clone(), authifier.database.clone());

    // Configure CORS
    let cors = CorsOptions {
@@ -114,82 +97,11 @@ pub async fn web() -> Rocket<Build> {
        .configure(rocket::Config {
            limits: rocket::data::Limits::default().limit("string", 5.megabytes()),
            address: Ipv4Addr::new(0, 0, 0, 0).into(),
+            port: 14702,
            ..Default::default()
        })
 }

-pub async fn authifier_config() -> AuthifierConfig {
-    let config = config().await;
-
-    let mut auth_config = AuthifierConfig {
-        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@revolt.chat".into()),
-                    ),
-                    port: config.api.smtp.port,
-                    use_tls: config.api.smtp.use_tls,
-                },
-                expiry: Default::default(),
-                templates: Templates {
-                    verify: Template {
-                        title: "Verify your Revolt 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 Revolt password.".into(),
-                        text: include_str!("templates/reset.txt").into(),
-                        url: format!("{}/login/reset/", config.hosts.app),
-                        html: Some(include_str!("templates/reset.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 {
-            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;
-    }
-
-    auth_config
-}
-
 #[launch]
 async fn rocket() -> _ {
    // Configure logging and environment
--- a/crates/delta/src/routes/channels/channel_edit.rs
+++ b/crates/delta/src/routes/channels/channel_edit.rs
@@ -124,7 +124,7 @@ pub async fn edit(
            }

            if let Some(icon_id) = data.icon {
-                partial.icon = Some(File::use_icon(db, &icon_id, id).await?);
+                partial.icon = Some(File::use_channel_icon(db, &icon_id, id, &user.id).await?);
                *icon = partial.icon.clone();
            }

--- a/crates/delta/src/routes/channels/webhook_create.rs
+++ b/crates/delta/src/routes/channels/webhook_create.rs
@@ -1,6 +1,6 @@
 use revolt_database::{
    util::{permissions::DatabasePermissionQuery, reference::Reference},
-    Channel, Database, User, Webhook,
+    Channel, Database, File, User, Webhook,
 };
 use revolt_models::v0;
 use revolt_permissions::{
@@ -43,10 +43,7 @@ pub async fn create_webhook(
    let webhook_id = Ulid::new().to_string();

    let avatar = match &data.avatar {
-        Some(id) => Some(
-            db.find_and_use_attachment(id, "avatars", "user", &webhook_id)
-                .await?,
-        ),
+        Some(id) => Some(File::use_webhook_avatar(db, id, &webhook_id, &user.id).await?),
        None => None,
    };

@@ -54,6 +51,7 @@ pub async fn create_webhook(
        id: webhook_id,
        name: data.name,
        avatar,
+        creator_id: user.id,
        channel_id: channel.id().to_string(),
        permissions: *DEFAULT_WEBHOOK_PERMISSIONS,
        token: Some(nanoid::nanoid!(64)),
--- a/crates/delta/src/routes/customisation/emoji_create.rs
+++ b/crates/delta/src/routes/customisation/emoji_create.rs
@@ -55,7 +55,7 @@ pub async fn create_emoji(
    };

    // Find the relevant attachment
-    let attachment = File::use_emoji(db, &id, &id).await?;
+    let attachment = File::use_emoji(db, &id, &id, &user.id).await?;

    // Create the emoji object
    let emoji = Emoji {
--- a/crates/delta/src/routes/servers/member_edit.rs
+++ b/crates/delta/src/routes/servers/member_edit.rs
@@ -142,7 +142,7 @@ pub async fn edit(

    // 2. Apply new avatar
    if let Some(avatar) = avatar {
-        partial.avatar = Some(File::use_avatar(db, &avatar, &user.id).await?);
+        partial.avatar = Some(File::use_user_avatar(db, &avatar, &user.id, &user.id).await?);
    }

    member
--- a/crates/delta/src/routes/servers/server_edit.rs
+++ b/crates/delta/src/routes/servers/server_edit.rs
@@ -138,13 +138,13 @@ pub async fn edit(

    // 3. Apply new icon
    if let Some(icon) = icon {
-        partial.icon = Some(File::use_server_icon(db, &icon, &server.id).await?);
+        partial.icon = Some(File::use_server_icon(db, &icon, &server.id, &user.id).await?);
        server.icon = partial.icon.clone();
    }

    // 4. Apply new banner
    if let Some(banner) = banner {
-        partial.banner = Some(File::use_banner(db, &banner, &server.id).await?);
+        partial.banner = Some(File::use_server_banner(db, &banner, &server.id, &user.id).await?);
        server.banner = partial.banner.clone();
    }

--- a/crates/delta/src/routes/users/edit_user.rs
+++ b/crates/delta/src/routes/users/edit_user.rs
@@ -89,7 +89,7 @@ pub async fn edit(

    // 2. Apply new avatar
    if let Some(avatar) = data.avatar {
-        partial.avatar = Some(File::use_avatar(db, &avatar, &user.id).await?);
+        partial.avatar = Some(File::use_user_avatar(db, &avatar, &user.id, &user.id).await?);
    }

    // 3. Apply new status
@@ -114,7 +114,8 @@ pub async fn edit(
        }

        if let Some(background) = profile.background {
-            new_profile.background = Some(File::use_background(db, &background, &user.id).await?);
+            new_profile.background =
+                Some(File::use_background(db, &background, &user.id, &user.id).await?);
        }

        partial.profile = Some(new_profile);
--- a/crates/delta/src/routes/webhooks/webhook_edit.rs
+++ b/crates/delta/src/routes/webhooks/webhook_edit.rs
@@ -1,6 +1,6 @@
 use revolt_database::{
    util::{permissions::DatabasePermissionQuery, reference::Reference},
-    Database, PartialWebhook, User,
+    Database, File, PartialWebhook, User,
 };
 use revolt_models::v0::{DataEditWebhook, Webhook};
 use revolt_permissions::{calculate_channel_permissions, ChannelPermission};
@@ -52,10 +52,7 @@ pub async fn webhook_edit(
    };

    if let Some(avatar) = avatar {
-        let file = db
-            .find_and_use_attachment(&avatar, "avatars", "user", &webhook.id)
-            .await?;
-
+        let file = File::use_webhook_avatar(db, &avatar, &webhook.id, &webhook.creator_id).await?;
        partial.avatar = Some(file)
    }

--- a/crates/delta/src/routes/webhooks/webhook_edit_token.rs
+++ b/crates/delta/src/routes/webhooks/webhook_edit_token.rs
@@ -1,5 +1,5 @@
 use revolt_database::util::reference::Reference;
-use revolt_database::{Database, PartialWebhook};
+use revolt_database::{Database, File, PartialWebhook};
 use revolt_models::v0::{DataEditWebhook, Webhook};
 use revolt_models::validator::Validate;
 use revolt_result::{create_error, Result};
@@ -34,7 +34,7 @@ pub async fn webhook_edit_token(
        name,
        avatar,
        permissions,
-        remove
+        remove,
    } = data;

    let mut partial = PartialWebhook {
@@ -44,10 +44,7 @@ pub async fn webhook_edit_token(
    };

    if let Some(avatar) = avatar {
-        let file = db
-            .find_and_use_attachment(&avatar, "avatars", "user", &webhook.id)
-            .await?;
-
+        let file = File::use_webhook_avatar(db, &avatar, &webhook.id, &webhook.creator_id).await?;
        partial.avatar = Some(file)
    }

--- a/crates/delta/src/templates/deletion.html
+++ b/crates/delta/src/templates/deletion.html
@@ -1,138 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html>
-  <head>
-    <!-- Compiled with Bootstrap Email version: 1.3.1 --><meta http-equiv="x-ua-compatible" content="ie=edge">
-    <meta name="x-apple-disable-message-reformatting">
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <meta name="format-detection" content="telephone=no, date=no, address=no, email=no">
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-    <style type="text/css">
-      body,table,td{font-family:Helvetica,Arial,sans-serif !important}.ExternalClass{width:100%}.ExternalClass,.ExternalClass p,.ExternalClass span,.ExternalClass font,.ExternalClass td,.ExternalClass div{line-height:150%}a{text-decoration:none}*{color:inherit}a[x-apple-data-detectors],u+#body a,#MessageViewBody a{color:inherit;text-decoration:none;font-size:inherit;font-family:inherit;font-weight:inherit;line-height:inherit}img{-ms-interpolation-mode:bicubic}table:not([class^=s-]){font-family:Helvetica,Arial,sans-serif;mso-table-lspace:0pt;mso-table-rspace:0pt;border-spacing:0px;border-collapse:collapse}table:not([class^=s-]) td{border-spacing:0px;border-collapse:collapse}@media screen and (max-width: 600px){.w-full,.w-full>tbody>tr>td{width:100% !important}.w-24,.w-24>tbody>tr>td{width:96px !important}.p-lg-10:not(table),.p-lg-10:not(.btn)>tbody>tr>td,.p-lg-10.btn td a{padding:0 !important}.p-3:not(table),.p-3:not(.btn)>tbody>tr>td,.p-3.btn td a{padding:12px !important}.p-6:not(table),.p-6:not(.btn)>tbody>tr>td,.p-6.btn td a{padding:24px !important}*[class*=s-lg-]>tbody>tr>td{font-size:0 !important;line-height:0 !important;height:0 !important}.s-4>tbody>tr>td{font-size:16px !important;line-height:16px !important;height:16px !important}.s-6>tbody>tr>td{font-size:24px !important;line-height:24px !important;height:24px !important}.s-10>tbody>tr>td{font-size:40px !important;line-height:40px !important;height:40px !important}}
-    </style>
-  </head>
-  <body class="bg-light" style="outline: 0; width: 100%; min-width: 100%; height: 100%; -webkit-text-size-adjust: 100%; -ms-text-size-adjust: 100%; font-family: Helvetica, Arial, sans-serif; line-height: 24px; font-weight: normal; font-size: 16px; -moz-box-sizing: border-box; -webkit-box-sizing: border-box; box-sizing: border-box; color: #000000; margin: 0; padding: 0; border-width: 0;" bgcolor="#f7fafc">
-    <table class="bg-light body" valign="top" role="presentation" border="0" cellpadding="0" cellspacing="0" style="outline: 0; width: 100%; min-width: 100%; height: 100%; -webkit-text-size-adjust: 100%; -ms-text-size-adjust: 100%; font-family: Helvetica, Arial, sans-serif; line-height: 24px; font-weight: normal; font-size: 16px; -moz-box-sizing: border-box; -webkit-box-sizing: border-box; box-sizing: border-box; color: #000000; margin: 0; padding: 0; border-width: 0;" bgcolor="#f7fafc">
-      <tbody>
-        <tr>
-          <td valign="top" style="line-height: 24px; font-size: 16px; margin: 0;" align="left" bgcolor="#f7fafc">
-            <table class="container" role="presentation" border="0" cellpadding="0" cellspacing="0" style="width: 100%;">
-              <tbody>
-                <tr>
-                  <td align="center" style="line-height: 24px; font-size: 16px; margin: 0; padding: 0 16px;">
-                    <!--[if (gte mso 9)|(IE)]>
-                      <table align="center" role="presentation">
-                        <tbody>
-                          <tr>
-                            <td width="600">
-                    <![endif]-->
-                    <table align="center" role="presentation" border="0" cellpadding="0" cellspacing="0" style="width: 100%; max-width: 600px; margin: 0 auto;">
-                      <tbody>
-                        <tr>
-                          <td style="line-height: 24px; font-size: 16px; margin: 0;" align="left">
-                            <table class="s-10 w-full" role="presentation" border="0" cellpadding="0" cellspacing="0" style="width: 100%;" width="100%">
-                              <tbody>
-                                <tr>
-                                  <td style="line-height: 40px; font-size: 40px; width: 100%; height: 40px; margin: 0;" align="left" width="100%" height="40">
-                                    &#160;
-                                  </td>
-                                </tr>
-                              </tbody>
-                            </table>
-                            <table class="ax-center" role="presentation" align="center" border="0" cellpadding="0" cellspacing="0" style="margin: 0 auto;">
-                              <tbody>
-                                <tr>
-                                  <td style="line-height: 24px; font-size: 16px; margin: 0;" align="left">
-                                    <img alt="Revolt Logo" class="w-24" src="https://app.revolt.chat/assets/logo_round.png" style="height: auto; line-height: 100%; outline: none; text-decoration: none; display: block; width: 96px; border-style: none; border-width: 0;" width="96">
-                                  </td>
-                                </tr>
-                              </tbody>
-                            </table>
-                            <table class="s-10 w-full" role="presentation" border="0" cellpadding="0" cellspacing="0" style="width: 100%;" width="100%">
-                              <tbody>
-                                <tr>
-                                  <td style="line-height: 40px; font-size: 40px; width: 100%; height: 40px; margin: 0;" align="left" width="100%" height="40">
-                                    &#160;
-                                  </td>
-                                </tr>
-                              </tbody>
-                            </table>
-                            <table class="card p-6 p-lg-10 space-y-4" role="presentation" border="0" cellpadding="0" cellspacing="0" style="border-radius: 6px; border-collapse: separate !important; width: 100%; overflow: hidden; border: 1px solid #e2e8f0;" bgcolor="#ffffff">
-                              <tbody>
-                                <tr>
-                                  <td style="line-height: 24px; font-size: 16px; width: 100%; margin: 0; padding: 40px;" align="left" bgcolor="#ffffff">
-                                    <h1 class="h3 fw-700" style="padding-top: 0; padding-bottom: 0; font-weight: 700 !important; vertical-align: baseline; font-size: 28px; line-height: 33.6px; margin: 0;" align="left">Account Deletion</h1>
-                                    <table class="s-4 w-full" role="presentation" border="0" cellpadding="0" cellspacing="0" style="width: 100%;" width="100%">
-                                      <tbody>
-                                        <tr>
-                                          <td style="line-height: 16px; font-size: 16px; width: 100%; height: 16px; margin: 0;" align="left" width="100%" height="16">
-                                            &#160;
-                                          </td>
-                                        </tr>
-                                      </tbody>
-                                    </table>
-                                    <p class="" style="line-height: 24px; font-size: 16px; width: 100%; margin: 0;" align="left">You requested to have your account deleted, if you did not perform this action please take measures to secure your account immediately.</p>
-                                    <table class="s-4 w-full" role="presentation" border="0" cellpadding="0" cellspacing="0" style="width: 100%;" width="100%">
-                                      <tbody>
-                                        <tr>
-                                          <td style="line-height: 16px; font-size: 16px; width: 100%; height: 16px; margin: 0;" align="left" width="100%" height="16">
-                                            &#160;
-                                          </td>
-                                        </tr>
-                                      </tbody>
-                                    </table>
-                                    <table class="btn btn-primary p-3 fw-700" role="presentation" border="0" cellpadding="0" cellspacing="0" style="border-radius: 6px; border-collapse: separate !important; font-weight: 700 !important;">
-                                      <tbody>
-                                        <tr>
-                                          <td style="line-height: 24px; font-size: 16px; border-radius: 6px; font-weight: 700 !important; margin: 0;" align="center" bgcolor="#0d6efd">
-                                            <a href="{{url}}" style="color: #ffffff; font-size: 16px; font-family: Helvetica, Arial, sans-serif; text-decoration: none; border-radius: 6px; line-height: 20px; display: block; font-weight: 700 !important; white-space: nowrap; background-color: #0d6efd; padding: 12px; border: 1px solid #0d6efd;">Confirm</a>
-                                          </td>
-                                        </tr>
-                                      </tbody>
-                                    </table>
-                                  </td>
-                                </tr>
-                              </tbody>
-                            </table>
-                            <table class="s-6 w-full" role="presentation" border="0" cellpadding="0" cellspacing="0" style="width: 100%;" width="100%">
-                              <tbody>
-                                <tr>
-                                  <td style="line-height: 24px; font-size: 24px; width: 100%; height: 24px; margin: 0;" align="left" width="100%" height="24">
-                                    &#160;
-                                  </td>
-                                </tr>
-                              </tbody>
-                            </table>
-                            <div class="text-muted text-center" style="color: #718096;" align="center">
-                              This email is intended for {{email}}<br>
-                              Sent from Revolt<br>
-                              Made in the EU
-                            </div>
-                            <table class="s-6 w-full" role="presentation" border="0" cellpadding="0" cellspacing="0" style="width: 100%;" width="100%">
-                              <tbody>
-                                <tr>
-                                  <td style="line-height: 24px; font-size: 24px; width: 100%; height: 24px; margin: 0;" align="left" width="100%" height="24">
-                                    &#160;
-                                  </td>
-                                </tr>
-                              </tbody>
-                            </table>
-                          </td>
-                        </tr>
-                      </tbody>
-                    </table>
-                    <!--[if (gte mso 9)|(IE)]>
-                    </td>
-                  </tr>
-                </tbody>
-              </table>
-                    <![endif]-->
-                  </td>
-                </tr>
-              </tbody>
-            </table>
-          </td>
-        </tr>
-      </tbody>
-    </table>
-  </body>
-</html>
--- a/crates/delta/src/templates/reset.html
+++ b/crates/delta/src/templates/reset.html
@@ -1,138 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html>
-  <head>
-    <!-- Compiled with Bootstrap Email version: 1.3.1 --><meta http-equiv="x-ua-compatible" content="ie=edge">
-    <meta name="x-apple-disable-message-reformatting">
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <meta name="format-detection" content="telephone=no, date=no, address=no, email=no">
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-    <style type="text/css">
-      body,table,td{font-family:Helvetica,Arial,sans-serif !important}.ExternalClass{width:100%}.ExternalClass,.ExternalClass p,.ExternalClass span,.ExternalClass font,.ExternalClass td,.ExternalClass div{line-height:150%}a{text-decoration:none}*{color:inherit}a[x-apple-data-detectors],u+#body a,#MessageViewBody a{color:inherit;text-decoration:none;font-size:inherit;font-family:inherit;font-weight:inherit;line-height:inherit}img{-ms-interpolation-mode:bicubic}table:not([class^=s-]){font-family:Helvetica,Arial,sans-serif;mso-table-lspace:0pt;mso-table-rspace:0pt;border-spacing:0px;border-collapse:collapse}table:not([class^=s-]) td{border-spacing:0px;border-collapse:collapse}@media screen and (max-width: 600px){.w-full,.w-full>tbody>tr>td{width:100% !important}.w-24,.w-24>tbody>tr>td{width:96px !important}.p-lg-10:not(table),.p-lg-10:not(.btn)>tbody>tr>td,.p-lg-10.btn td a{padding:0 !important}.p-3:not(table),.p-3:not(.btn)>tbody>tr>td,.p-3.btn td a{padding:12px !important}.p-6:not(table),.p-6:not(.btn)>tbody>tr>td,.p-6.btn td a{padding:24px !important}*[class*=s-lg-]>tbody>tr>td{font-size:0 !important;line-height:0 !important;height:0 !important}.s-4>tbody>tr>td{font-size:16px !important;line-height:16px !important;height:16px !important}.s-6>tbody>tr>td{font-size:24px !important;line-height:24px !important;height:24px !important}.s-10>tbody>tr>td{font-size:40px !important;line-height:40px !important;height:40px !important}}
-    </style>
-  </head>
-  <body class="bg-light" style="outline: 0; width: 100%; min-width: 100%; height: 100%; -webkit-text-size-adjust: 100%; -ms-text-size-adjust: 100%; font-family: Helvetica, Arial, sans-serif; line-height: 24px; font-weight: normal; font-size: 16px; -moz-box-sizing: border-box; -webkit-box-sizing: border-box; box-sizing: border-box; color: #000000; margin: 0; padding: 0; border-width: 0;" bgcolor="#f7fafc">
-    <table class="bg-light body" valign="top" role="presentation" border="0" cellpadding="0" cellspacing="0" style="outline: 0; width: 100%; min-width: 100%; height: 100%; -webkit-text-size-adjust: 100%; -ms-text-size-adjust: 100%; font-family: Helvetica, Arial, sans-serif; line-height: 24px; font-weight: normal; font-size: 16px; -moz-box-sizing: border-box; -webkit-box-sizing: border-box; box-sizing: border-box; color: #000000; margin: 0; padding: 0; border-width: 0;" bgcolor="#f7fafc">
-      <tbody>
-        <tr>
-          <td valign="top" style="line-height: 24px; font-size: 16px; margin: 0;" align="left" bgcolor="#f7fafc">
-            <table class="container" role="presentation" border="0" cellpadding="0" cellspacing="0" style="width: 100%;">
-              <tbody>
-                <tr>
-                  <td align="center" style="line-height: 24px; font-size: 16px; margin: 0; padding: 0 16px;">
-                    <!--[if (gte mso 9)|(IE)]>
-                      <table align="center" role="presentation">
-                        <tbody>
-                          <tr>
-                            <td width="600">
-                    <![endif]-->
-                    <table align="center" role="presentation" border="0" cellpadding="0" cellspacing="0" style="width: 100%; max-width: 600px; margin: 0 auto;">
-                      <tbody>
-                        <tr>
-                          <td style="line-height: 24px; font-size: 16px; margin: 0;" align="left">
-                            <table class="s-10 w-full" role="presentation" border="0" cellpadding="0" cellspacing="0" style="width: 100%;" width="100%">
-                              <tbody>
-                                <tr>
-                                  <td style="line-height: 40px; font-size: 40px; width: 100%; height: 40px; margin: 0;" align="left" width="100%" height="40">
-                                    &#160;
-                                  </td>
-                                </tr>
-                              </tbody>
-                            </table>
-                            <table class="ax-center" role="presentation" align="center" border="0" cellpadding="0" cellspacing="0" style="margin: 0 auto;">
-                              <tbody>
-                                <tr>
-                                  <td style="line-height: 24px; font-size: 16px; margin: 0;" align="left">
-                                    <img alt="Revolt Logo" class="w-24" src="https://app.revolt.chat/assets/logo_round.png" style="height: auto; line-height: 100%; outline: none; text-decoration: none; display: block; width: 96px; border-style: none; border-width: 0;" width="96">
-                                  </td>
-                                </tr>
-                              </tbody>
-                            </table>
-                            <table class="s-10 w-full" role="presentation" border="0" cellpadding="0" cellspacing="0" style="width: 100%;" width="100%">
-                              <tbody>
-                                <tr>
-                                  <td style="line-height: 40px; font-size: 40px; width: 100%; height: 40px; margin: 0;" align="left" width="100%" height="40">
-                                    &#160;
-                                  </td>
-                                </tr>
-                              </tbody>
-                            </table>
-                            <table class="card p-6 p-lg-10 space-y-4" role="presentation" border="0" cellpadding="0" cellspacing="0" style="border-radius: 6px; border-collapse: separate !important; width: 100%; overflow: hidden; border: 1px solid #e2e8f0;" bgcolor="#ffffff">
-                              <tbody>
-                                <tr>
-                                  <td style="line-height: 24px; font-size: 16px; width: 100%; margin: 0; padding: 40px;" align="left" bgcolor="#ffffff">
-                                    <h1 class="h3 fw-700" style="padding-top: 0; padding-bottom: 0; font-weight: 700 !important; vertical-align: baseline; font-size: 28px; line-height: 33.6px; margin: 0;" align="left">Password Reset</h1>
-                                    <table class="s-4 w-full" role="presentation" border="0" cellpadding="0" cellspacing="0" style="width: 100%;" width="100%">
-                                      <tbody>
-                                        <tr>
-                                          <td style="line-height: 16px; font-size: 16px; width: 100%; height: 16px; margin: 0;" align="left" width="100%" height="16">
-                                            &#160;
-                                          </td>
-                                        </tr>
-                                      </tbody>
-                                    </table>
-                                    <p class="" style="line-height: 24px; font-size: 16px; width: 100%; margin: 0;" align="left">You requested a password reset, click below to continue.</p>
-                                    <table class="s-4 w-full" role="presentation" border="0" cellpadding="0" cellspacing="0" style="width: 100%;" width="100%">
-                                      <tbody>
-                                        <tr>
-                                          <td style="line-height: 16px; font-size: 16px; width: 100%; height: 16px; margin: 0;" align="left" width="100%" height="16">
-                                            &#160;
-                                          </td>
-                                        </tr>
-                                      </tbody>
-                                    </table>
-                                    <table class="btn btn-primary p-3 fw-700" role="presentation" border="0" cellpadding="0" cellspacing="0" style="border-radius: 6px; border-collapse: separate !important; font-weight: 700 !important;">
-                                      <tbody>
-                                        <tr>
-                                          <td style="line-height: 24px; font-size: 16px; border-radius: 6px; font-weight: 700 !important; margin: 0;" align="center" bgcolor="#0d6efd">
-                                            <a href="{{url}}" style="color: #ffffff; font-size: 16px; font-family: Helvetica, Arial, sans-serif; text-decoration: none; border-radius: 6px; line-height: 20px; display: block; font-weight: 700 !important; white-space: nowrap; background-color: #0d6efd; padding: 12px; border: 1px solid #0d6efd;">Reset</a>
-                                          </td>
-                                        </tr>
-                                      </tbody>
-                                    </table>
-                                  </td>
-                                </tr>
-                              </tbody>
-                            </table>
-                            <table class="s-6 w-full" role="presentation" border="0" cellpadding="0" cellspacing="0" style="width: 100%;" width="100%">
-                              <tbody>
-                                <tr>
-                                  <td style="line-height: 24px; font-size: 24px; width: 100%; height: 24px; margin: 0;" align="left" width="100%" height="24">
-                                    &#160;
-                                  </td>
-                                </tr>
-                              </tbody>
-                            </table>
-                            <div class="text-muted text-center" style="color: #718096;" align="center">
-                              This email is intended for {{email}}<br>
-                              Sent from Revolt<br>
-                              Made in the EU
-                            </div>
-                            <table class="s-6 w-full" role="presentation" border="0" cellpadding="0" cellspacing="0" style="width: 100%;" width="100%">
-                              <tbody>
-                                <tr>
-                                  <td style="line-height: 24px; font-size: 24px; width: 100%; height: 24px; margin: 0;" align="left" width="100%" height="24">
-                                    &#160;
-                                  </td>
-                                </tr>
-                              </tbody>
-                            </table>
-                          </td>
-                        </tr>
-                      </tbody>
-                    </table>
-                    <!--[if (gte mso 9)|(IE)]>
-                    </td>
-                  </tr>
-                </tbody>
-              </table>
-                    <![endif]-->
-                  </td>
-                </tr>
-              </tbody>
-            </table>
-          </td>
-        </tr>
-      </tbody>
-    </table>
-  </body>
-</html>
--- a/crates/delta/src/templates/verify.html
+++ b/crates/delta/src/templates/verify.html
@@ -1,138 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html>
-  <head>
-    <!-- Compiled with Bootstrap Email version: 1.3.1 --><meta http-equiv="x-ua-compatible" content="ie=edge">
-    <meta name="x-apple-disable-message-reformatting">
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <meta name="format-detection" content="telephone=no, date=no, address=no, email=no">
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-    <style type="text/css">
-      body,table,td{font-family:Helvetica,Arial,sans-serif !important}.ExternalClass{width:100%}.ExternalClass,.ExternalClass p,.ExternalClass span,.ExternalClass font,.ExternalClass td,.ExternalClass div{line-height:150%}a{text-decoration:none}*{color:inherit}a[x-apple-data-detectors],u+#body a,#MessageViewBody a{color:inherit;text-decoration:none;font-size:inherit;font-family:inherit;font-weight:inherit;line-height:inherit}img{-ms-interpolation-mode:bicubic}table:not([class^=s-]){font-family:Helvetica,Arial,sans-serif;mso-table-lspace:0pt;mso-table-rspace:0pt;border-spacing:0px;border-collapse:collapse}table:not([class^=s-]) td{border-spacing:0px;border-collapse:collapse}@media screen and (max-width: 600px){.w-full,.w-full>tbody>tr>td{width:100% !important}.w-24,.w-24>tbody>tr>td{width:96px !important}.p-lg-10:not(table),.p-lg-10:not(.btn)>tbody>tr>td,.p-lg-10.btn td a{padding:0 !important}.p-3:not(table),.p-3:not(.btn)>tbody>tr>td,.p-3.btn td a{padding:12px !important}.p-6:not(table),.p-6:not(.btn)>tbody>tr>td,.p-6.btn td a{padding:24px !important}*[class*=s-lg-]>tbody>tr>td{font-size:0 !important;line-height:0 !important;height:0 !important}.s-4>tbody>tr>td{font-size:16px !important;line-height:16px !important;height:16px !important}.s-6>tbody>tr>td{font-size:24px !important;line-height:24px !important;height:24px !important}.s-10>tbody>tr>td{font-size:40px !important;line-height:40px !important;height:40px !important}}
-    </style>
-  </head>
-  <body class="bg-light" style="outline: 0; width: 100%; min-width: 100%; height: 100%; -webkit-text-size-adjust: 100%; -ms-text-size-adjust: 100%; font-family: Helvetica, Arial, sans-serif; line-height: 24px; font-weight: normal; font-size: 16px; -moz-box-sizing: border-box; -webkit-box-sizing: border-box; box-sizing: border-box; color: #000000; margin: 0; padding: 0; border-width: 0;" bgcolor="#f7fafc">
-    <table class="bg-light body" valign="top" role="presentation" border="0" cellpadding="0" cellspacing="0" style="outline: 0; width: 100%; min-width: 100%; height: 100%; -webkit-text-size-adjust: 100%; -ms-text-size-adjust: 100%; font-family: Helvetica, Arial, sans-serif; line-height: 24px; font-weight: normal; font-size: 16px; -moz-box-sizing: border-box; -webkit-box-sizing: border-box; box-sizing: border-box; color: #000000; margin: 0; padding: 0; border-width: 0;" bgcolor="#f7fafc">
-      <tbody>
-        <tr>
-          <td valign="top" style="line-height: 24px; font-size: 16px; margin: 0;" align="left" bgcolor="#f7fafc">
-            <table class="container" role="presentation" border="0" cellpadding="0" cellspacing="0" style="width: 100%;">
-              <tbody>
-                <tr>
-                  <td align="center" style="line-height: 24px; font-size: 16px; margin: 0; padding: 0 16px;">
-                    <!--[if (gte mso 9)|(IE)]>
-                      <table align="center" role="presentation">
-                        <tbody>
-                          <tr>
-                            <td width="600">
-                    <![endif]-->
-                    <table align="center" role="presentation" border="0" cellpadding="0" cellspacing="0" style="width: 100%; max-width: 600px; margin: 0 auto;">
-                      <tbody>
-                        <tr>
-                          <td style="line-height: 24px; font-size: 16px; margin: 0;" align="left">
-                            <table class="s-10 w-full" role="presentation" border="0" cellpadding="0" cellspacing="0" style="width: 100%;" width="100%">
-                              <tbody>
-                                <tr>
-                                  <td style="line-height: 40px; font-size: 40px; width: 100%; height: 40px; margin: 0;" align="left" width="100%" height="40">
-                                    &#160;
-                                  </td>
-                                </tr>
-                              </tbody>
-                            </table>
-                            <table class="ax-center" role="presentation" align="center" border="0" cellpadding="0" cellspacing="0" style="margin: 0 auto;">
-                              <tbody>
-                                <tr>
-                                  <td style="line-height: 24px; font-size: 16px; margin: 0;" align="left">
-                                    <img alt="Revolt Logo" class="w-24" src="https://app.revolt.chat/assets/logo_round.png" style="height: auto; line-height: 100%; outline: none; text-decoration: none; display: block; width: 96px; border-style: none; border-width: 0;" width="96">
-                                  </td>
-                                </tr>
-                              </tbody>
-                            </table>
-                            <table class="s-10 w-full" role="presentation" border="0" cellpadding="0" cellspacing="0" style="width: 100%;" width="100%">
-                              <tbody>
-                                <tr>
-                                  <td style="line-height: 40px; font-size: 40px; width: 100%; height: 40px; margin: 0;" align="left" width="100%" height="40">
-                                    &#160;
-                                  </td>
-                                </tr>
-                              </tbody>
-                            </table>
-                            <table class="card p-6 p-lg-10 space-y-4" role="presentation" border="0" cellpadding="0" cellspacing="0" style="border-radius: 6px; border-collapse: separate !important; width: 100%; overflow: hidden; border: 1px solid #e2e8f0;" bgcolor="#ffffff">
-                              <tbody>
-                                <tr>
-                                  <td style="line-height: 24px; font-size: 16px; width: 100%; margin: 0; padding: 40px;" align="left" bgcolor="#ffffff">
-                                    <h1 class="h3 fw-700" style="padding-top: 0; padding-bottom: 0; font-weight: 700 !important; vertical-align: baseline; font-size: 28px; line-height: 33.6px; margin: 0;" align="left">Almost there!</h1>
-                                    <table class="s-4 w-full" role="presentation" border="0" cellpadding="0" cellspacing="0" style="width: 100%;" width="100%">
-                                      <tbody>
-                                        <tr>
-                                          <td style="line-height: 16px; font-size: 16px; width: 100%; height: 16px; margin: 0;" align="left" width="100%" height="16">
-                                            &#160;
-                                          </td>
-                                        </tr>
-                                      </tbody>
-                                    </table>
-                                    <p class="" style="line-height: 24px; font-size: 16px; width: 100%; margin: 0;" align="left">To complete your sign up, we just need to verify your email.</p>
-                                    <table class="s-4 w-full" role="presentation" border="0" cellpadding="0" cellspacing="0" style="width: 100%;" width="100%">
-                                      <tbody>
-                                        <tr>
-                                          <td style="line-height: 16px; font-size: 16px; width: 100%; height: 16px; margin: 0;" align="left" width="100%" height="16">
-                                            &#160;
-                                          </td>
-                                        </tr>
-                                      </tbody>
-                                    </table>
-                                    <table class="btn btn-primary p-3 fw-700" role="presentation" border="0" cellpadding="0" cellspacing="0" style="border-radius: 6px; border-collapse: separate !important; font-weight: 700 !important;">
-                                      <tbody>
-                                        <tr>
-                                          <td style="line-height: 24px; font-size: 16px; border-radius: 6px; font-weight: 700 !important; margin: 0;" align="center" bgcolor="#0d6efd">
-                                            <a href="{{url}}" style="color: #ffffff; font-size: 16px; font-family: Helvetica, Arial, sans-serif; text-decoration: none; border-radius: 6px; line-height: 20px; display: block; font-weight: 700 !important; white-space: nowrap; background-color: #0d6efd; padding: 12px; border: 1px solid #0d6efd;">Confirm</a>
-                                          </td>
-                                        </tr>
-                                      </tbody>
-                                    </table>
-                                  </td>
-                                </tr>
-                              </tbody>
-                            </table>
-                            <table class="s-6 w-full" role="presentation" border="0" cellpadding="0" cellspacing="0" style="width: 100%;" width="100%">
-                              <tbody>
-                                <tr>
-                                  <td style="line-height: 24px; font-size: 24px; width: 100%; height: 24px; margin: 0;" align="left" width="100%" height="24">
-                                    &#160;
-                                  </td>
-                                </tr>
-                              </tbody>
-                            </table>
-                            <div class="text-muted text-center" style="color: #718096;" align="center">
-                              This email is intended for {{email}}<br>
-                              Sent from Revolt<br>
-                              Made in the EU
-                            </div>
-                            <table class="s-6 w-full" role="presentation" border="0" cellpadding="0" cellspacing="0" style="width: 100%;" width="100%">
-                              <tbody>
-                                <tr>
-                                  <td style="line-height: 24px; font-size: 24px; width: 100%; height: 24px; margin: 0;" align="left" width="100%" height="24">
-                                    &#160;
-                                  </td>
-                                </tr>
-                              </tbody>
-                            </table>
-                          </td>
-                        </tr>
-                      </tbody>
-                    </table>
-                    <!--[if (gte mso 9)|(IE)]>
-                    </td>
-                  </tr>
-                </tbody>
-              </table>
-                    <![endif]-->
-                  </td>
-                </tr>
-              </tbody>
-            </table>
-          </td>
-        </tr>
-      </tbody>
-    </table>
-  </body>
-</html>
--- a/crates/services/autumn/Cargo.toml
+++ b/crates/services/autumn/Cargo.toml
@@ -1,22 +1,64 @@
 [package]
 name = "revolt-autumn"
-version = "0.7.14"
+version = "0.7.17"
 edition = "2021"

 [dependencies]
-serde = { version = "1.0", features = ["derive"] }
-serde_json = "1.0.68"
+# ID generation
+ulid = "1.1.3"
+nanoid = "0.4.0"

+# Media processing
+webp = "0.3.0"
+sha2 = "0.10.8"
+jxl-oxide = "0.8.1"
+kamadak-exif = "0.5.4"
+# revolt_little_exif = "0.4.0"
+image = { version = "0.25.2" } # avif encode requires dav1d system library: features = ["avif-native"]
+
+# File processing
+revolt_clamav-client = { version = "0.1.5" }
+simdutf8 = { version = "0.1.4", features = ["aarch64_neon"] }
+
+# Content type processing
+infer = "0.16.0"
+ffprobe = "0.4.0"
+imagesize = "0.13.0"
+
+# Utility
+lazy_static = "1.5.0"
+moka = { version = "0.12.8", features = ["future"] }
+
+# Serialisation
+strum_macros = "0.26.4"
+serde_json = "1.0.68"
+serde = { version = "1.0", features = ["derive"] }
+
+# Async runtime
 tokio = { version = "1.0", features = ["full"] }

+# Logging
 tracing = "0.1"
 tracing-subscriber = { version = "0.3", features = ["env-filter"] }

-revolt-config = { version = "0.7.16", path = "../../core/config" }
+# Core crates
+revolt-files = { version = "0.7.17", path = "../../core/files" }
+revolt-config = { version = "0.7.17", path = "../../core/config" }
+revolt-database = { version = "0.7.17", path = "../../core/database", features = [
+    "axum-impl",
+] }
+revolt-result = { version = "0.7.17", path = "../../core/result", features = [
+    "utoipa",
+    "axum",
+] }

+# Axum / web server
 tempfile = "3.12.0"
+axum-macros = "0.4.1"
 axum_typed_multipart = "0.12.1"
 axum = { version = "0.7.5", features = ["multipart"] }
+tower-http = { version = "0.5.2", features = ["cors"] }

+# OpenAPI & documentation generation
 utoipa-scalar = { version = "0.1.0", features = ["axum"] }
 utoipa = { version = "4.2.3", features = ["axum_extras", "ulid"] }
--- a/crates/services/autumn/Dockerfile
+++ b/crates/services/autumn/Dockerfile
@@ -0,0 +1,12 @@
+# Build Stage
+FROM ghcr.io/revoltchat/base:latest AS builder
+
+# Bundle Stage
+FROM gcr.io/distroless/cc-debian12:nonroot
+COPY --from=builder /home/rust/src/target/release/revolt-autumn ./
+COPY --from=mwader/static-ffmpeg:7.0.2 /ffmpeg /usr/local/bin/
+COPY --from=mwader/static-ffmpeg:7.0.2 /ffprobe /usr/local/bin/
+
+EXPOSE 14704
+USER nonroot
+CMD ["./revolt-autumn"]
--- a/crates/services/autumn/src/api.rs
+++ b/crates/services/autumn/src/api.rs
@@ -1,26 +1,75 @@
+use std::{
+    io::{Cursor, Read},
+    time::Duration,
+};
+
 use axum::{
-    extract::{DefaultBodyLimit, Multipart, Path},
-    http::StatusCode,
-    response::{IntoResponse, Response},
+    extract::{DefaultBodyLimit, Path, State},
+    http::{header, Method},
+    response::{IntoResponse, Redirect, Response},
    routing::{get, post},
    Json, Router,
 };
 use axum_typed_multipart::{FieldData, TryFromMultipart, TypedMultipart};
-use revolt_config::config;
+use image::ImageReader;
+use lazy_static::lazy_static;
+use revolt_config::{config, report_internal_error};
+use revolt_database::{iso8601_timestamp::Timestamp, Database, FileHash, Metadata, User};
+use revolt_files::{
+    create_thumbnail, decode_image, fetch_from_s3, upload_to_s3, AUTHENTICATION_TAG_SIZE_BYTES,
+};
+use revolt_result::{create_error, Result};
 use serde::{Deserialize, Serialize};
+use sha2::Digest;
+use tempfile::NamedTempFile;
+use tokio::time::Instant;
+use tower_http::cors::{AllowHeaders, Any, CorsLayer};
 use utoipa::ToSchema;

-use tempfile::NamedTempFile;
+use crate::{exif::strip_metadata, metadata::generate_metadata, mime_type::determine_mime_type};

-pub async fn router() -> Router {
+/// Build the API router
+pub async fn router() -> Router<Database> {
    let config = config().await;

-    Router::new().route("/", get(root)).route(
-        "/:tag",
-        post(upload_file).layer(DefaultBodyLimit::max(
-            config.features.limits.global.body_limit_size,
-        )),
-    )
+    let cors = CorsLayer::new()
+        .allow_methods([Method::POST])
+        .allow_headers(AllowHeaders::mirror_request())
+        .allow_origin(Any);
+
+    Router::new()
+        .route("/", get(root))
+        .route(
+            "/:tag",
+            post(upload_file)
+                .options(options)
+                .layer(DefaultBodyLimit::max(
+                    config.features.limits.global.body_limit_size,
+                )),
+        )
+        .route("/:tag/:file_id", get(fetch_preview))
+        .route("/:tag/:file_id/:file_name", get(fetch_file))
+        .layer(cors)
+}
+
+lazy_static! {
+    /// Short-lived file cache to allow us to populate different CDN regions without increasing bandwidth to S3 provider
+    /// Uploads will also be stored here to prevent immediately queued downloads from doing the entire round-trip
+    static ref S3_CACHE: moka::future::Cache<String, Result<Vec<u8>>> = moka::future::Cache::builder()
+        .max_capacity(10_000) // TODO config
+        .time_to_live(Duration::from_secs(60)) // TODO config
+        .build();
+}
+
+/// Retrieve hash information and file data by given hash
+async fn retrieve_file_by_hash(hash: &FileHash) -> Result<Vec<u8>> {
+    if let Some(data) = S3_CACHE.get(&hash.id).await {
+        data
+    } else {
+        let data = fetch_from_s3(&hash.bucket_id, &hash.path, &hash.iv).await;
+        S3_CACHE.insert(hash.id.to_owned(), data.clone()).await;
+        data
+    }
 }

 /// Successful root response
@@ -48,8 +97,11 @@ async fn root() -> Json<RootResponse> {
    })
 }

+/// Empty handler for OPTIONS routes
+async fn options() {}
+
 /// Available tags to upload to
-#[derive(Deserialize, Debug, ToSchema)]
+#[derive(Clone, Deserialize, Debug, ToSchema, strum_macros::IntoStaticStr)]
 #[allow(non_camel_case_types)]
 pub enum Tag {
    attachments,
@@ -73,7 +125,7 @@ pub struct UploadPayload {
 #[derive(Serialize, Debug, ToSchema)]
 pub struct UploadResponse {
    /// ID to attach uploaded file to object
-    id: &'static str,
+    id: String,
 }

 /// Upload a file
@@ -98,16 +150,158 @@ pub struct UploadResponse {
        ("tag" = Tag, Path, description = "Tag to upload to (e.g. attachments, icons, ...)")
    ),
    request_body(content_type = "multipart/form-data", content = UploadPayload),
+    security(
+        ("session_token" = []),
+        ("bot_token" = [])
+    )
 )]
 async fn upload_file(
+    State(db): State<Database>,
+    user: User,
    Path(tag): Path<Tag>,
-    TypedMultipart(UploadPayload { file }): TypedMultipart<UploadPayload>,
-) -> axum::response::Result<Json<UploadResponse>> {
-    Ok(Json(UploadResponse { id: "aaa" }))
+    TypedMultipart(UploadPayload { mut file }): TypedMultipart<UploadPayload>,
+) -> Result<Json<UploadResponse>> {
+    // Fetch configuration
+    let config = config().await;
+
+    // Keep track of processing time
+    let now = Instant::now();
+
+    // Extract the filename, or give it a generic name
+    let filename = file.metadata.file_name.unwrap_or("unnamed-file".to_owned());
+
+    // Load file to memory
+    let mut buf = Vec::<u8>::new();
+    report_internal_error!(file.contents.read_to_end(&mut buf))?;
+
+    // Take note of original file size
+    let original_file_size = buf.len();
+
+    // Ensure the file is not empty
+    if original_file_size < config.files.limit.min_file_size {
+        return Err(create_error!(FileTooSmall));
+    }
+
+    // Get user's file upload limits
+    let limits = user.limits().await;
+    let size_limit = *limits
+        .file_upload_size_limit
+        .get(tag.clone().into())
+        .expect("size limit");
+
+    if original_file_size > size_limit {
+        return Err(create_error!(FileTooLarge { max: size_limit }));
+    }
+
+    // Generate sha256 hash
+    let original_hash = {
+        let mut hasher = sha2::Sha256::new();
+        hasher.update(&buf);
+        hasher.finalize()
+    };
+
+    // Generate an ID for this file
+    let id = if matches!(tag, Tag::emojis) {
+        ulid::Ulid::new().to_string()
+    } else {
+        nanoid::nanoid!(42)
+    };
+
+    // Find an existing hash and use that if possible
+    if let Ok(file_hash) = db
+        .fetch_attachment_hash(&format!("{original_hash:02x}"))
+        .await
+    {
+        let tag: &'static str = tag.into();
+        db.insert_attachment(&file_hash.into_file(id.clone(), tag.to_owned(), filename, user.id))
+            .await?;
+
+        return Ok(Json(UploadResponse { id }));
+    }
+
+    // Determine the mime type for the file
+    let mime_type = determine_mime_type(&mut file.contents, &buf, &filename);
+
+    // Check blocklist for mime type
+    if config
+        .files
+        .blocked_mime_types
+        .iter()
+        .any(|m| m == mime_type)
+    {
+        return Err(create_error!(FileTypeNotAllowed));
+    }
+
+    // Determine metadata for the file
+    let metadata = generate_metadata(&file.contents, mime_type);
+
+    // Strip metadata
+    let (buf, metadata) = strip_metadata(file.contents, buf, metadata, mime_type).await?;
+
+    // Virus scan files if ClamAV is configured
+    if matches!(metadata, Metadata::File)
+        && (config.files.scan_mime_types.is_empty()
+            || config.files.scan_mime_types.iter().any(|v| v == mime_type))
+        && crate::clamav::is_malware(&buf).await?
+    {
+        return Err(create_error!(InternalError));
+    }
+
+    // Print file information for debug purposes
+    let new_file_size = buf.len() + AUTHENTICATION_TAG_SIZE_BYTES;
+    let processed_hash = {
+        let mut hasher = sha2::Sha256::new();
+        hasher.update(&buf);
+        hasher.finalize()
+    };
+    let process_ratio = new_file_size as f32 / original_file_size as f32;
+    let time_to_process = Instant::now() - now;
+
+    tracing::info!("Received file {filename}\nOriginal hash: {original_hash:02x}\nOriginal size: {original_file_size} bytes\nMime type: {mime_type}\nMetadata: {metadata:?}\nProcessed file size: {new_file_size} bytes ({:.2}%).\nProcessed hash: {processed_hash:02x}\nProcessing took {time_to_process:?}", process_ratio * 100.0);
+
+    // Create hash entry in database
+    let file_hash = FileHash {
+        id: format!("{original_hash:02x}"),
+        processed_hash: format!("{processed_hash:02x}"),
+
+        created_at: Timestamp::now_utc(),
+
+        bucket_id: config.files.s3.default_bucket,
+        path: format!("{original_hash:02x}"),
+        iv: String::new(), // indicates file is not uploaded yet
+
+        metadata,
+        content_type: mime_type.to_owned(),
+        size: new_file_size as isize,
+    };
+
+    db.insert_attachment_hash(&file_hash).await?;
+
+    // Upload the file to S3 and commit nonce to database
+    let upload_start = Instant::now();
+    let nonce = upload_to_s3(&file_hash.bucket_id, &file_hash.id, &buf).await?;
+    db.set_attachment_hash_nonce(&file_hash.id, &nonce).await?;
+
+    // Debug information
+    let time_to_upload = Instant::now() - upload_start;
+    tracing::info!("Took {time_to_upload:?} to upload {new_file_size} bytes to S3.");
+
+    // Finally, create the file and return its ID
+    let tag: &'static str = tag.into();
+    db.insert_attachment(&file_hash.into_file(id.clone(), tag.to_owned(), filename, user.id))
+        .await?;
+
+    Ok(Json(UploadResponse { id }))
 }

+/// Header value used for cache control
+pub static CACHE_CONTROL: &str = "public, max-age=604800, must-revalidate";
+
 /// Fetch preview of file
 ///
+/// This route will only return image content.
+/// For all other file types, please use the fetch route (you will receive a redirect if you try to use this route anyways!).
+///
 /// Depending on the given tag, the file will be re-processed to fit the criteria:
 ///
 /// | Tag | Image Resolution <sup>†</sup> |
@@ -132,18 +326,56 @@ async fn upload_file(
    ),
 )]
 async fn fetch_preview(
-    Path(tag): Path<Tag>,
-    Path(file_id): Path<String>,
-) -> axum::response::Result<Response> {
-    todo!()
+    State(db): State<Database>,
+    Path((tag, file_id)): Path<(Tag, String)>,
+) -> Result<Response> {
+    let tag: &'static str = tag.into();
+    let file = db.fetch_attachment(tag, &file_id).await?;
+
+    // Ignore deleted files
+    if file.deleted.is_some_and(|v| v) {
+        return Err(create_error!(NotFound));
+    }
+
+    // Ignore files that haven't been attached
+    if file.used_for.is_none() {
+        return Err(create_error!(NotFound));
+    }
+
+    let hash = file.as_hash(&db).await?;
+
+    // Only process image files
+    if !matches!(hash.metadata, Metadata::Image { .. }) {
+        return Ok(
+            Redirect::permanent(&format!("/{tag}/{file_id}/{}", file.filename)).into_response(),
+        );
+    }
+
+    // Original image data
+    let data = retrieve_file_by_hash(&hash).await?;
+
+    // Read image and create thumbnail
+    let data = create_thumbnail(decode_image(&mut Cursor::new(data), false)?, tag).await;
+
+    Ok((
+        [
+            (header::CONTENT_TYPE, "image/webp"),
+            (header::CONTENT_DISPOSITION, "inline"),
+            (header::CACHE_CONTROL, CACHE_CONTROL),
+        ],
+        data,
+    )
+        .into_response())
 }

 /// Fetch original file
+///
+/// Content disposition header will be set to 'attachment' to prevent browser from rendering anything.
 #[utoipa::path(
    get,
    path = "/{tag}/{file_id}/{file_name}",
    responses(
-        (status = 200, description = "Generated preview", body = Vec<u8>)
+        (status = 200, description = "Original file", body = Vec<u8>)
    ),
    params(
        ("tag" = Tag, Path, description = "Tag to fetch from (e.g. attachments, icons, ...)"),
@@ -152,9 +384,36 @@ async fn fetch_preview(
    ),
 )]
 async fn fetch_file(
-    Path(tag): Path<Tag>,
-    Path(file_id): Path<String>,
-    Path(file_name): Path<String>,
-) -> axum::response::Result<Response> {
-    todo!()
+    State(db): State<Database>,
+    Path((tag, file_id, file_name)): Path<(Tag, String, String)>,
+) -> Result<Response> {
+    let file = db.fetch_attachment(tag.into(), &file_id).await?;
+
+    // Ignore deleted files
+    if file.deleted.is_some_and(|v| v) {
+        return Err(create_error!(NotFound));
+    }
+
+    // Ignore files that haven't been attached
+    if file.used_for.is_none() {
+        return Err(create_error!(NotFound));
+    }
+
+    // Ensure filename is correct
+    if file_name != file.filename {
+        return Err(create_error!(NotFound));
+    }
+
+    let hash = file.as_hash(&db).await?;
+    retrieve_file_by_hash(&hash).await.map(|data| {
+        (
+            [
+                (header::CONTENT_TYPE, hash.content_type),
+                (header::CONTENT_DISPOSITION, "attachment".to_owned()),
+                (header::CACHE_CONTROL, CACHE_CONTROL.to_owned()),
+            ],
+            data,
+        )
+            .into_response()
+    })
 }
--- a/crates/services/autumn/src/clamav.rs
+++ b/crates/services/autumn/src/clamav.rs
@@ -0,0 +1,49 @@
+use std::time::Duration;
+
+use revolt_config::{config, report_internal_error};
+use revolt_result::Result;
+
+/// Initialise ClamAV
+pub async fn init() {
+    let config = config().await;
+
+    if !config.files.clamd_host.is_empty() {
+        tracing::info!("Waiting for clamd to be ready...");
+
+        loop {
+            let clamd_available =
+                match revolt_clamav_client::ping_tcp(config.files.clamd_host.clone()) {
+                    Ok(ping_response) => ping_response == b"PONG\0",
+                    Err(_) => false,
+                };
+
+            if clamd_available {
+                tracing::info!("clamd is ready, virus protection enabled!");
+                break;
+            } else {
+                tracing::error!(
+                    "Could not ping clamd host at {}, retrying in 10 seconds...",
+                    config.files.clamd_host
+                );
+
+                std::thread::sleep(Duration::from_secs(10));
+            }
+        }
+    }
+}
+
+/// Scan for malware
+pub async fn is_malware(buf: &[u8]) -> Result<bool> {
+    let config = config().await;
+    if config.files.clamd_host.is_empty() {
+        Ok(false)
+    } else {
+        let scan_response = report_internal_error!(revolt_clamav_client::scan_buffer_tcp(
+            buf,
+            config.files.clamd_host,
+            None
+        ))?;
+
+        report_internal_error!(revolt_clamav_client::clean(&scan_response)).map(|v| !v)
+    }
+}
--- a/crates/services/autumn/src/exif.rs
+++ b/crates/services/autumn/src/exif.rs
@@ -0,0 +1,162 @@
+use std::io::{Cursor, Read};
+
+use exif::Reader;
+use image::{ImageFormat, ImageReader};
+use revolt_config::report_internal_error;
+use revolt_database::Metadata;
+use revolt_result::{create_error, Result};
+use tempfile::NamedTempFile;
+use tokio::process::Command;
+
+/// Strip EXIF data from given file and produce new file and metadata
+pub async fn strip_metadata(
+    file: NamedTempFile,
+    buf: Vec<u8>,
+    metadata: Metadata,
+    mime: &str,
+) -> Result<(Vec<u8>, Metadata)> {
+    match &metadata {
+        Metadata::Image { width, height } => match mime {
+            // little_exif does not appear to parse JPEGs correctly? had 2/2 files fail
+            /* "image/jpeg" | "image/png" => {
+                // use little_exif to strip metadata except for orientation and colour profile
+                // PNGs must also be re-encoded to mitigate CVE-2023-21036
+                let metadata = revolt_little_exif::metadata::Metadata::new_from_path_with_filetype(
+                    file.path(),
+                    match mime {
+                        "image/jpeg" => revolt_little_exif::filetype::FileExtension::JPEG,
+                        "image/png" => revolt_little_exif::filetype::FileExtension::PNG {
+                            as_zTXt_chunk: true,
+                        },
+                        _ => unreachable!(),
+                    },
+                )
+                .unwrap();
+                dbg!(metadata.data());
+            } */
+            // Apply orientation manually & strip all other EXIF data
+            "image/jpeg" | "image/png" | "image/avif" | "image/tiff" => {
+                // Create a reader
+                let mut cursor = Cursor::new(buf);
+
+                // Decode the image
+                let image = report_internal_error!(report_internal_error!(ImageReader::new(
+                    &mut cursor
+                )
+                .with_guessed_format())?
+                .decode());
+
+                // Reset read position
+                cursor.set_position(0);
+
+                // Extract orientation data
+                let exif_reader = Reader::new();
+                let rotation = match exif_reader.read_from_container(&mut cursor) {
+                    Ok(exif) => match exif.get_field(exif::Tag::Orientation, exif::In::PRIMARY) {
+                        Some(orientation) => orientation.value.get_uint(0).unwrap_or_default(),
+                        _ => 0,
+                    },
+                    _ => 0,
+                };
+
+                // Create a buffer to write to
+                let mut bytes: Vec<u8> = Vec::new();
+                let mut writer = Cursor::new(&mut bytes);
+
+                // Apply the EXIF rotation
+                // See https://jdhao.github.io/2019/07/31/image_rotation_exif_info/
+                report_internal_error!(match &rotation {
+                    2 => image?.fliph(),
+                    3 => image?.rotate180(),
+                    4 => image?.rotate180().fliph(),
+                    5 => image?.rotate90().fliph(),
+                    6 => image?.rotate90(),
+                    7 => image?.rotate270().fliph(),
+                    8 => image?.rotate270(),
+                    _ => image?,
+                }
+                .write_to(
+                    &mut writer,
+                    match mime {
+                        "image/jpeg" => ImageFormat::Jpeg,
+                        "image/png" => ImageFormat::Png,
+                        "image/avif" => ImageFormat::Avif,
+                        "image/tiff" => ImageFormat::Tiff,
+                        _ => todo!(),
+                    },
+                ))?;
+
+                // Calculate dimensions after rotation.
+                let (width, height) = match &rotation {
+                    2 | 4 | 5 | 7 => (*height, *width),
+                    _ => (*width, *height),
+                };
+
+                Ok((bytes, Metadata::Image { width, height }))
+            }
+            // JXLs store EXIF data but we don't have the ability to write them
+            "image/jxl" => Ok((buf, metadata)),
+            // All other images that cannot store EXIF data
+            _ => Ok((buf, metadata)),
+        },
+        // Use ffmpeg to copy video stream and probe new metadata
+        Metadata::Video { .. } => match mime {
+            // Strip EXIF data by copying video stream
+            "video/mp4" | "video/webm" | "video/quicktime" => {
+                // Pick the correct file format for ffmpeg
+                let ext = match mime {
+                    "video/mp4" => "mp4",
+                    "video/webm" => "webm",
+                    "video/quicktime" => "mov",
+                    _ => unreachable!(),
+                };
+
+                // Temporary output file
+                let mut out_file = report_internal_error!(NamedTempFile::new())?;
+
+                // Process the file with ffmpeg
+                report_internal_error!(
+                    Command::new("ffmpeg")
+                        .args([
+                            // Overwrite the temporary file
+                            "-y",
+                            // Read original uploaded file
+                            "-i",
+                            file.path().to_str().ok_or(create_error!(InternalError))?,
+                            // Strip any metadata
+                            "-map_metadata",
+                            "-1",
+                            // Copy video / audio data to new file
+                            "-c:v",
+                            "copy",
+                            "-c:a",
+                            "copy",
+                            // Select correct file format
+                            "-f",
+                            ext,
+                            // Save to new temporary file
+                            out_file
+                                .path()
+                                .to_str()
+                                .ok_or(create_error!(InternalError))?,
+                        ])
+                        .output()
+                        .await
+                )?;
+
+                // Probe the file again
+                let metadata = crate::metadata::generate_metadata(&out_file, mime);
+
+                // Read the file from disk
+                let mut buf = Vec::<u8>::new();
+                report_internal_error!(out_file.read_to_end(&mut buf))?;
+
+                Ok((buf, metadata))
+            }
+            // Assume all other video formats cannot store EXIF data
+            _ => Ok((buf, metadata)),
+        },
+        // all other file types don't store EXIF data
+        _ => Ok((buf, metadata)),
+    }
+}
--- a/crates/services/autumn/src/main.rs
+++ b/crates/services/autumn/src/main.rs
@@ -2,6 +2,7 @@ use std::net::{Ipv4Addr, SocketAddr};

 use axum::Router;

+use revolt_database::DatabaseInfo;
 use tokio::net::TcpListener;
 use utoipa::{
    openapi::security::{ApiKey, ApiKeyValue, SecurityScheme},
@@ -10,11 +11,18 @@ use utoipa::{
 use utoipa_scalar::{Scalar, Servable as ScalarServable};

 mod api;
+pub mod clamav;
+pub mod exif;
+pub mod metadata;
+pub mod mime_type;

 #[tokio::main]
 async fn main() -> Result<(), std::io::Error> {
    // Configure logging and environment
-    revolt_config::configure!(api);
+    revolt_config::configure!(files);
+
+    // Wait for ClamAV
+    clamav::init().await;

    // Configure API schema
    #[derive(OpenApi)]
@@ -28,6 +36,8 @@ async fn main() -> Result<(), std::io::Error> {
        ),
        components(
            schemas(
+                revolt_result::Error,
+                revolt_result::ErrorType,
                api::RootResponse,
                api::Tag,
                api::UploadPayload,
@@ -46,20 +56,28 @@ async fn main() -> Result<(), std::io::Error> {
        fn modify(&self, openapi: &mut utoipa::openapi::OpenApi) {
            if let Some(components) = openapi.components.as_mut() {
                components.add_security_scheme(
-                    "api_key",
-                    SecurityScheme::ApiKey(ApiKey::Header(ApiKeyValue::new("todo_apikey"))),
-                )
+                    "bot_token",
+                    SecurityScheme::ApiKey(ApiKey::Header(ApiKeyValue::new("X-Bot-Token"))),
+                );
+                components.add_security_scheme(
+                    "session_token",
+                    SecurityScheme::ApiKey(ApiKey::Header(ApiKeyValue::new("X-Session-Token"))),
+                );
            }
        }
    }

+    // Connect to the database
+    let db = DatabaseInfo::Auto.connect().await.unwrap();
+
    // Configure Axum and router
    let app = Router::new()
        .merge(Scalar::with_url("/scalar", ApiDoc::openapi()))
-        .nest("/", api::router().await);
+        .nest("/", api::router().await)
+        .with_state(db);

    // Configure TCP listener and bind
-    let address = SocketAddr::from((Ipv4Addr::UNSPECIFIED, 3000));
+    let address = SocketAddr::from((Ipv4Addr::UNSPECIFIED, 14704));
    let listener = TcpListener::bind(&address).await?;
    axum::serve(listener, app.into_make_service()).await
 }
--- a/crates/services/autumn/src/metadata.rs
+++ b/crates/services/autumn/src/metadata.rs
@@ -0,0 +1,76 @@
+use std::io::Cursor;
+
+use revolt_database::Metadata;
+use revolt_files::{image_size, video_size};
+use tempfile::NamedTempFile;
+
+/// Intersection of what infer can detect and what image-rs supports
+///
+/// Note: imagesize crate also supports all of these, so we use that for quick size probing.
+static SUPPORTED_IMAGE_MIME: [&str; 9] = [
+    "image/avif",
+    "image/bmp",
+    "image/gif",
+    "image/vnd.microsoft.icon",
+    "image/jpeg",
+    "image/jxl", // not supported by image-rs but we shim it
+    "image/png",
+    "image/tiff",
+    "image/webp",
+];
+
+/// Generate metadata from file, using mime type as a hint
+pub fn generate_metadata(f: &NamedTempFile, mime_type: &str) -> Metadata {
+    if SUPPORTED_IMAGE_MIME.contains(&mime_type) {
+        image_size(f)
+            .map(|(width, height)| Metadata::Image {
+                width: width as isize,
+                height: height as isize,
+            })
+            .unwrap_or_default()
+    } else if mime_type.starts_with("video/") {
+        video_size(f)
+            .map(|(width, height)| Metadata::Video {
+                width: width as isize,
+                height: height as isize,
+            })
+            .unwrap_or_default()
+    } else if mime_type.starts_with("audio/") {
+        Metadata::Audio
+    } else if mime_type == "plain/text" {
+        Metadata::Text
+    } else {
+        Metadata::File
+    }
+}
+
+/// Subroutine to ensure data isn't corrupted
+pub fn validate_from_metadata(
+    reader: Cursor<Vec<u8>>,
+    metadata: Metadata,
+    mime_type: &str,
+) -> Metadata {
+    if let Metadata::Image { .. } = &metadata {
+        if mime_type == "image/jxl" {
+            // Check if we can read using jxl-oxide crate
+            if jxl_oxide::JxlImage::builder()
+                .read(reader)
+                .inspect_err(|err| tracing::error!("Failed to read JXL! {err:?}"))
+                .is_err()
+            {
+                return Metadata::File;
+            }
+        } else if matches!(
+            // Check if we can read using image-rs crate
+            image::ImageReader::new(reader)
+                .with_guessed_format()
+                .inspect_err(|err| tracing::error!("Failed to read image! {err:?}"))
+                .map(|f| f.decode()),
+            Err(_) | Ok(Err(_))
+        ) {
+            return Metadata::File;
+        }
+    }
+
+    metadata
+}
--- a/crates/services/autumn/src/mime_type.rs
+++ b/crates/services/autumn/src/mime_type.rs
@@ -0,0 +1,26 @@
+use tempfile::NamedTempFile;
+
+/// Determine the mime type of the given temporary file and filename
+pub fn determine_mime_type(f: &mut NamedTempFile, buf: &[u8], file_name: &str) -> &'static str {
+    // Force certain extensions into particular mime types
+    if file_name.to_lowercase().ends_with(".apk") {
+        return "application/vnd.android.package-archive";
+    } else if file_name.to_lowercase().ends_with(".exe") {
+        return "application/vnd.microsoft.portable-executable";
+    }
+
+    // Use magic signatures to determine mime type
+    let kind = infer::get_from_path(f.path()).expect("file read successfully");
+    let mime_type = if let Some(kind) = kind {
+        kind.mime_type()
+    } else {
+        "application/octet-stream"
+    };
+
+    // See if the file is actually just plain Unicode/ASCII text
+    if mime_type == "application/octet-stream" && simdutf8::basic::from_utf8(buf).is_ok() {
+        return "plain/text";
+    }
+
+    mime_type
+}
--- a/crates/services/january/Cargo.toml
+++ b/crates/services/january/Cargo.toml
@@ -0,0 +1,48 @@
+[package]
+name = "revolt-january"
+version = "0.7.17"
+edition = "2021"
+
+[dependencies]
+# Utility
+mime = "0.3.17"
+regex = "1.11.0"
+tempfile = "3.13.0"
+lazy_static = "1.5.0"
+moka = { version = "0.12.8", features = ["future"] }
+
+# Web scraping
+scraper = "0.20.0"
+encoding_rs = "0.8.34"
+
+# Serialisation
+serde = { version = "1.0", features = ["derive"] }
+serde_json = "1.0.68"
+
+# Async runtime
+async-recursion = "1.1.1"
+tokio = { version = "1.0", features = ["full"] }
+
+# Web requests
+reqwest = { version = "0.12", features = ["json"] }
+
+# Logging
+tracing = "0.1"
+tracing-subscriber = { version = "0.3", features = ["env-filter"] }
+
+# Core crates
+revolt-config = { version = "0.7.17", path = "../../core/config" }
+revolt-models = { version = "0.7.17", path = "../../core/models" }
+revolt-result = { version = "0.7.17", path = "../../core/result", features = [
+    "utoipa",
+    "axum",
+] }
+revolt-files = { version = "0.7.17", path = "../../core/files" }
+
+# Axum / web server
+axum = { version = "0.7.5" }
+axum-extra = { version = "0.9", features = ["typed-header"] }
+
+# OpenAPI & documentation generation
+utoipa-scalar = { version = "0.1.0", features = ["axum"] }
+utoipa = { version = "4.2.3", features = ["axum_extras", "ulid"] }
--- a/crates/services/january/Dockerfile
+++ b/crates/services/january/Dockerfile
@@ -0,0 +1,12 @@
+# Build Stage
+FROM ghcr.io/revoltchat/base:latest AS builder
+
+# Bundle Stage
+FROM gcr.io/distroless/cc-debian12:nonroot
+COPY --from=builder /home/rust/src/target/release/revolt-january ./
+COPY --from=mwader/static-ffmpeg:7.0.2 /ffmpeg /usr/local/bin/
+COPY --from=mwader/static-ffmpeg:7.0.2 /ffprobe /usr/local/bin/
+
+EXPOSE 14705
+USER nonroot
+CMD ["./revolt-january"]
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Paul Makles	25fc692dc1	chore(core/models): truncate the rest of the embed fields	2024-10-02 11:35:37 +01:00
Paul Makles	530d68fe89	feat(services/autumn): add accept-language header closes #358	2024-10-02 11:32:55 +01:00
Paul Makles	afd8c906ba	fix(services/january): YouTube fallback	2024-10-02 11:31:55 +01:00
Paul Makles	c596dd5458	chore: bump all versions	2024-10-01 21:18:55 +01:00
Paul Makles	ed78b253ff	feat(services/january): website embed generation	2024-10-01 21:11:08 +01:00
Paul Makles	66c84e0ad9	feat(services/january): image/video embeds	2024-10-01 19:13:48 +01:00
Paul Makles	21335b3297	feat(services/january): proxy images/videos	2024-10-01 19:02:39 +01:00
Paul Makles	8fc791f81a	ci: remove .env file entry	2024-09-29 17:18:41 +01:00
Paul Makles	1689ee5ddc	ci: use compose.yml file instead of deleted file	2024-09-29 17:08:42 +01:00
Paul Makles	7a061bb3c6	ci: add january to build list	2024-09-29 17:05:20 +01:00
Paul Makles	6c3b8eaa92	chore(core/files): do not decrypt file if nonce unavailable	2024-09-29 17:03:02 +01:00
Paul Makles	5e1b2e165f	ci: add autumn to build list	2024-09-29 15:10:23 +01:00
Paul Makles	e270b5df6a	chore: correct ports in Dockerfile	2024-09-29 15:10:12 +01:00
Paul Makles	cbf9e81256	fix: delete attachments by `used_for.id` and add corresponding index	2024-09-29 15:05:56 +01:00
Paul Makles	3080ec1f5a	refactor: capture errors with line numbers refactor: update file api	2024-09-29 14:37:08 +01:00
Paul Makles	4fd66b2719	refactor(core/result): add NotAuthenticated error which is distinct from InvalidCredentials	2024-09-29 12:02:10 +01:00
Paul Makles	916f47e2f5	feat(services/autumn): cors support	2024-09-29 12:01:32 +01:00
Paul Makles	a3c5b1bf87	chore: releasing beta build of autumn	2024-09-11 14:42:00 +01:00
Paul Makles	ace6c30ba5	feat(services/autumn): file uploads feat(services/autumn): deduplicate uploads feat(services/autumn): ClamAV support	2024-09-11 14:29:52 +01:00
Paul Makles	f4104612b2	chore: strip all the duplicate stuff from dev Revolt.toml	2024-09-10 16:54:07 +01:00
Paul Makles	6209bc7152	feat(services/autumn): authenticate the user on upload feat(services/autumn): file size limits on upload chore: add database migrations for new autumn things	2024-09-10 16:53:58 +01:00
Paul Makles	1a6a8a809b	feat(core/database): axum implementation for User	2024-09-10 16:53:02 +01:00
Paul Makles	5485781e7c	docs: update README with more badges	2024-09-10 15:15:53 +01:00
Paul Makles	8b21825ffe	docs: update README	2024-09-09 14:24:22 +01:00
Paul Makles	530ff4f9c7	docs: this will be the developer experience ever (deprecate .env file ✨) fix: port is wrong for maildev	2024-09-09 14:19:31 +01:00
Paul Makles	2eb596fe99	chore: pin crate versions to "MaxSRV"	2024-09-09 13:05:43 +01:00
Paul Makles	0bbb9e7072	docs: start work on default development configuration	2024-09-09 12:49:38 +01:00
Paul Makles	2433fa661a	chore: lock Rust version to 1.77.2 (related to #341 )	2024-09-09 12:49:09 +01:00
Paul Makles	70bdeecf77	feat(services/autumn): strip exif data for images/videos feat(services/autumn): hash files and log information	2024-09-06 15:10:36 +01:00
Paul Makles	24dc96f80f	feat(services/autumn): work towards upload API	2024-09-01 16:42:28 +01:00
Paul Makles	ebbbb5e174	feat(services/autumn): download and preview files	2024-09-01 13:58:11 +01:00
Paul Makles	78757ac7f1	fix: spelling issue	2024-08-31 17:16:23 +01:00
Paul Makles	01368960f3	feat(core/database, bindings/node): suspend user	2024-08-31 17:10:47 +01:00
Paul Makles	ae1d5d07e3	docs: Brexit	2024-08-31 16:04:59 +01:00
Paul Makles	5ad72abca7	refactor: move authifier config to database package	2024-08-31 16:04:40 +01:00
Paul Makles	c1b92ef56e	feat: scaffold services/january	2024-08-30 19:48:58 +01:00
Paul Makles	acbc1b8956	feat(core/database): clear expired FCM tokens	2024-08-30 15:51:20 +01:00
Paul Makles	bce24c8b1b	chore(scripts): add push to publish-debug-image.sh [skip ci]	2024-08-30 15:34:53 +01:00
Paul Makles	31262315e7	chore(fcm): just send the whole payload as a json string	2024-08-30 15:32:39 +01:00
Paul Makles	d8acaa1107	chore: strip information from fcm notification for testing	2024-08-30 12:46:37 +01:00
Paul Makles	730039eda6	chore: switch to distroless Docker runtime images fix: match Debian releases for build closes #297 Co-authored-by: MaticPoh <85814976+MaticPoh@users.noreply.github.com>	2024-08-30 12:06:05 +01:00
Paul Makles	79e1388000	fix: use MSRV for dockerfile	2024-08-29 20:27:47 +01:00