fix: minio wants the default region

Signed-off-by: Infiland <ljubica.citydesign@gmail.com>

.github/workflows/docker-cleanup.yaml

@@ -1,46 +0,0 @@
-name: Docker PR Image Cleanup
-
-on:
-  pull_request:
-    types:
-      - closed
-
-permissions:
-  contents: read
-  packages: write
-
-concurrency:
-  group: docker-cleanup-${{ github.event.pull_request.number }}
-  cancel-in-progress: false
-
-jobs:
-  cleanup:
-    runs-on: ubuntu-latest
-    if: ${{ !github.event.pull_request.head.repo.fork }}
-    strategy:
-      fail-fast: false
-      matrix:
-        package:
-          - base
-          - api
-          - events
-          - file-server
-          - proxy
-          - gifbox
-          - crond
-          - pushd
-          - voice-ingress
-    steps:
-      - env:
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          ORG: stoatchat
-          PACKAGE: ${{ matrix.package }}
-          TAG: pr-${{ github.event.pull_request.number }}
-        run: |
-          set -euo pipefail
-          gh api --paginate \
-            "/orgs/${ORG}/packages/container/${PACKAGE}/versions" \
-            --jq ".[] | select(.metadata.container.tags | index(\"${TAG}\")) | .id" \
-          | while read -r id; do
-              gh api -X DELETE "/orgs/${ORG}/packages/container/${PACKAGE}/versions/${id}"
-            done

.github/workflows/docker.yaml

@@ -5,6 +5,8 @@ on:
     tags:
       - "*"
   pull_request:
+    paths:
+      - "Dockerfile"
   workflow_dispatch:
 
 permissions:
@@ -17,9 +19,9 @@ concurrency:
 
 jobs:
   base:
-    name: Test base image build (fork)
+    name: Test base image build
     runs-on: arc-runner-set
-    if: github.event_name == 'pull_request' && github.event.pull_request.head.repo.fork
+    if: github.event_name == 'pull_request'
     steps:
       # Configure build environment
       - name: Checkout
@@ -40,7 +42,7 @@ jobs:
 
   publish:
     runs-on: arc-runner-set
-    if: ${{ github.event_name != 'pull_request' || !github.event.pull_request.head.repo.fork }}
+    if: github.event_name != 'pull_request'
     name: Publish Docker images
     steps:
       # Configure build environment
@@ -57,15 +59,6 @@ jobs:
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Determine base image tag
-        id: base
-        run: |
-          if [ "${{ github.event_name }}" = "pull_request" ]; then
-            echo "tag=pr-${{ github.event.number }}" >> "$GITHUB_OUTPUT"
-          else
-            echo "tag=latest" >> "$GITHUB_OUTPUT"
-          fi
-
       # Build the image
       - name: Build base image
         uses: docker/build-push-action@v4
@@ -73,9 +66,7 @@ jobs:
           context: .
           push: true
           platforms: linux/amd64,linux/arm64
-          tags: ghcr.io/${{ github.repository_owner }}/base:${{ steps.base.outputs.tag }}
+          tags: ghcr.io/${{ github.repository_owner }}/base:latest
-          cache-from: type=gha,scope=buildx-base-multi-arch
-          cache-to: type=gha,scope=buildx-base-multi-arch,mode=max
 
       # stoatchat/api
       - name: Docker meta
@@ -93,7 +84,7 @@ jobs:
           file: crates/delta/Dockerfile
           tags: ${{ steps.meta-delta.outputs.tags }}
           build-args: |
-            BASE_IMAGE=ghcr.io/${{ github.repository_owner }}/base:${{ steps.base.outputs.tag }}
+            BASE_IMAGE=ghcr.io/${{ github.repository_owner }}/base:latest
           labels: ${{ steps.meta-delta.outputs.labels }}
 
       # stoatchat/events
@@ -112,7 +103,7 @@ jobs:
           file: crates/bonfire/Dockerfile
           tags: ${{ steps.meta-bonfire.outputs.tags }}
           build-args: |
-            BASE_IMAGE=ghcr.io/${{ github.repository_owner }}/base:${{ steps.base.outputs.tag }}
+            BASE_IMAGE=ghcr.io/${{ github.repository_owner }}/base:latest
           labels: ${{ steps.meta-bonfire.outputs.labels }}
 
       # stoatchat/file-server
@@ -131,7 +122,7 @@ jobs:
           file: crates/services/autumn/Dockerfile
           tags: ${{ steps.meta-autumn.outputs.tags }}
           build-args: |
-            BASE_IMAGE=ghcr.io/${{ github.repository_owner }}/base:${{ steps.base.outputs.tag }}
+            BASE_IMAGE=ghcr.io/${{ github.repository_owner }}/base:latest
           labels: ${{ steps.meta-autumn.outputs.labels }}
 
       # stoatchat/proxy
@@ -150,7 +141,7 @@ jobs:
           file: crates/services/january/Dockerfile
           tags: ${{ steps.meta-january.outputs.tags }}
           build-args: |
-            BASE_IMAGE=ghcr.io/${{ github.repository_owner }}/base:${{ steps.base.outputs.tag }}
+            BASE_IMAGE=ghcr.io/${{ github.repository_owner }}/base:latest
           labels: ${{ steps.meta-january.outputs.labels }}
 
       # stoatchat/gifbox
@@ -169,7 +160,7 @@ jobs:
           file: crates/services/gifbox/Dockerfile
           tags: ${{ steps.meta-gifbox.outputs.tags }}
           build-args: |
-            BASE_IMAGE=ghcr.io/${{ github.repository_owner }}/base:${{ steps.base.outputs.tag }}
+            BASE_IMAGE=ghcr.io/${{ github.repository_owner }}/base:latest
           labels: ${{ steps.meta-gifbox.outputs.labels }}
 
       # stoatchat/crond
@@ -188,7 +179,7 @@ jobs:
           file: crates/daemons/crond/Dockerfile
           tags: ${{ steps.meta-crond.outputs.tags }}
           build-args: |
-            BASE_IMAGE=ghcr.io/${{ github.repository_owner }}/base:${{ steps.base.outputs.tag }}
+            BASE_IMAGE=ghcr.io/${{ github.repository_owner }}/base:latest
           labels: ${{ steps.meta-crond.outputs.labels }}
 
       # stoatchat/pushd
@@ -207,7 +198,7 @@ jobs:
           file: crates/daemons/pushd/Dockerfile
           tags: ${{ steps.meta-pushd.outputs.tags }}
           build-args: |
-            BASE_IMAGE=ghcr.io/${{ github.repository_owner }}/base:${{ steps.base.outputs.tag }}
+            BASE_IMAGE=ghcr.io/${{ github.repository_owner }}/base:latest
           labels: ${{ steps.meta-pushd.outputs.labels }}
 
       # stoatchat/voice-ingress
@@ -226,5 +217,5 @@ jobs:
           file: crates/daemons/voice-ingress/Dockerfile
           tags: ${{ steps.meta-voice-ingress.outputs.tags }}
           build-args: |
-            BASE_IMAGE=ghcr.io/${{ github.repository_owner }}/base:${{ steps.base.outputs.tag }}
+            BASE_IMAGE=ghcr.io/${{ github.repository_owner }}/base:latest
           labels: ${{ steps.meta-voice-ingress.outputs.labels }}

.github/workflows/publish-crates.yml

@@ -21,6 +21,4 @@ jobs:
           github-token: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Publish
-        env:
-          CARGO_REGISTRY_TOKEN: ${{ secrets.CARGO_REGISTRY_TOKEN }}
         run: mise publish --workspace

.github/workflows/renovate.yml

@@ -1,30 +0,0 @@
-# DO NOT EDIT DIRECTLY IN REPOSITORY
-# Managed in Terraform templates
-
-name: Renovate
-on:
-  workflow_dispatch:
-  schedule:
-    - cron: '0/15 * * * *'
-jobs:
-  renovate:
-    runs-on: ubuntu-latest
-    steps:
-      - id: app-token
-        uses: actions/create-github-app-token@v2
-        with:
-          app-id: ${{ secrets.GH_STOAT_RELEASE_APP_ID }}
-          private-key: ${{ secrets.GH_STOAT_RELEASE_APP_PRIVATE_KEY }}
-
-      - name: Setup Mise
-        uses: immich-app/devtools/actions/use-mise@7b8610a904d57da241e4ddba17fa62b62b15aed4 # use-mise-action-v2.0.2
-        with:
-          github_token: ${{ steps.app-token.outputs.token }}
-
-      - name: Self-hosted Renovate
-        uses: renovatebot/github-action@v46.1.14
-        with:
-          token: '${{ steps.app-token.outputs.token }}'
-        env:
-          RENOVATE_PLATFORM_COMMIT: 'enabled'
-          RENOVATE_REPOSITORIES: '${{ github.repository }}'

.github/workflows/rust.yaml

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

.release-please-manifest.json

@@ -1,3 +1,3 @@
 {
-    ".": "0.13.7"
+    ".": "0.12.1"
 }

CHANGELOG.md

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

Cargo.toml

@@ -65,7 +65,6 @@ encoding_rs = "0.8.34"
 
 # Mail
 lettre = "0.10.0-alpha.4"
-handlebars = "4.3.0"
 
 # HTTP Requests
 reqwest = "0.13.2"
@@ -156,7 +155,11 @@ opentelemetry_sdk = { version = "0.31.0", features = ["logs"] }
 opentelemetry-otlp = { version = "0.31.0", features = ["logs"] }
 opentelemetry-appender-tracing = "0.31.1"
 
+# Authifier
+authifier = "1.0.16"
+
 # RabbitMQ
+amqprs = "1.7.0"
 lapin = "4.7.1"
 
 # Voice
@@ -183,23 +186,19 @@ url = "2.2.2"
 impl_ops = "0.1.1"
 lazy_static = "1.5.0"
 mime = "0.3.17"
-totp-lite = "2.0.0"
-rust-argon2 = "1.0.0"
-base32 = "0.4.0"
-sha1 = "0.10.6"
 futures-lite = "2.6.1"
 
 # Build Dependencies
 vergen = "7.5.0"
 
 # Local packages
-revolt-coalesced = { version = "0.13.7", path = "crates/core/coalesced" }
+revolt-coalesced = { version = "0.12.0", path = "crates/core/coalesced" }
-revolt-config = { version = "0.13.7", path = "crates/core/config" }
+revolt-config = { version = "0.12.0", path = "crates/core/config" }
-revolt-database = { version = "0.13.7", path = "crates/core/database" }
+revolt-database = { version = "0.12.0", path = "crates/core/database" }
-revolt-files = { version = "0.13.7", path = "crates/core/files" }
+revolt-files = { version = "0.12.0", path = "crates/core/files" }
-revolt-models = { version = "0.13.7", path = "crates/core/models" }
+revolt-models = { version = "0.12.0", path = "crates/core/models" }
-revolt-parser = { version = "0.13.7", path = "crates/core/parser" }
+revolt-parser = { version = "0.12.0", path = "crates/core/parser" }
-revolt-permissions = { version = "0.13.7", path = "crates/core/permissions" }
+revolt-permissions = { version = "0.12.0", path = "crates/core/permissions" }
-revolt-presence = { version = "0.13.7", path = "crates/core/presence" }
+revolt-presence = { version = "0.12.0", path = "crates/core/presence" }
-revolt-ratelimits = { version = "0.13.7", path = "crates/core/ratelimits" }
+revolt-ratelimits = { version = "0.12.0", path = "crates/core/ratelimits" }
-revolt-result = { version = "0.13.7", path = "crates/core/result" }
+revolt-result = { version = "0.12.0", path = "crates/core/result" }

Revolt.toml

@@ -61,7 +61,7 @@ secret = "ZjCofRlfm6GGtjlifmNpCDkcQbEIIVC0"
 # S3 protocol endpoint
 endpoint = "http://127.0.0.1:14009"
 # S3 region name
-region = "minio"
+region = "us-east-1"
 # S3 protocol key ID
 access_key_id = "minioautumn"
 # S3 protocol access key

compose.yml

@@ -34,7 +34,6 @@ services:
     environment:
       MINIO_ROOT_USER: minioautumn
       MINIO_ROOT_PASSWORD: minioautumn
-      MINIO_REGION: minio
     volumes:
       - ./.data/minio:/data
     ports:

crates/bonfire/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "revolt-bonfire"
-version = "0.13.7"
+version = "0.12.1"
 license = "AGPL-3.0-or-later"
 edition = "2021"
 publish = false
@@ -34,6 +34,7 @@ async-tungstenite = { workspace = true, features = ["async-std-runtime"] }
 async-std = { workspace = true }
 
 # core
+authifier = { workspace = true }
 revolt-result = { workspace = true }
 revolt-models = { workspace = true }
 revolt-config = { workspace = true }

crates/bonfire/src/events/impl.rs

@@ -1,7 +1,6 @@
 use std::collections::{HashMap, HashSet};
 
 use futures::future::join_all;
-use redis_kiss::AsyncCommands;
 use revolt_database::{
     events::client::{EventV1, ReadyPayloadFields},
     util::permissions::DatabasePermissionQuery,

crates/bonfire/src/websocket.rs

@@ -1,6 +1,7 @@
 use std::{collections::HashSet, net::SocketAddr, sync::Arc};
 
 use async_tungstenite::WebSocketStream;
+use authifier::AuthifierEvent;
 use fred::{
     error::RedisErrorKind,
     interfaces::{ClientLike, EventInterface, PubsubInterface},
@@ -12,7 +13,7 @@ use futures::{
     stream::{SplitSink, SplitStream},
     FutureExt, SinkExt, StreamExt, TryStreamExt,
 };
-use redis_kiss::{get_connection, AsyncCommands, PayloadType, REDIS_PAYLOAD_TYPE, REDIS_URI};
+use redis_kiss::{PayloadType, REDIS_PAYLOAD_TYPE, REDIS_URI};
 use revolt_config::report_internal_error;
 use revolt_database::{
     events::{client::EventV1, server::ClientMessage},
@@ -31,7 +32,6 @@ use sentry::Level;
 
 use crate::config::{ProtocolConfiguration, WebsocketHandshakeCallback};
 use crate::events::state::{State, SubscriptionStateChange};
-use revolt_models::v0;
 
 type WsReader = SplitStream<WebSocketStream<TcpStream>>;
 type WsWriter = SplitSink<WebSocketStream<TcpStream>, async_tungstenite::tungstenite::Message>;
@@ -128,14 +128,6 @@ pub async fn client(db: &'static Database, stream: TcpStream, addr: SocketAddr)
         return;
     }
 
-    let slowmodes = fetch_user_slowmodes(&user_id).await.unwrap_or_default();
-    if !slowmodes.is_empty() {
-        let event = EventV1::UserSlowmodes { slowmodes };
-        if report_internal_error!(write.send(config.encode(&event)).await).is_err() {
-            return;
-        }
-    }
-
     // Create presence session.
     let (first_session, session_id) = create_session(&user_id, 0).await;
 
@@ -354,20 +346,22 @@ async fn listener(
                     break 'out;
                 };
 
-                if let EventV1::DeleteSession { session_id, .. } = &event {
+                if let EventV1::Auth(auth) = &event {
-                    if &state.session_id == session_id {
+                    if let AuthifierEvent::DeleteSession { session_id, .. } = auth {
-                        event = EventV1::Logout;
+                        if &state.session_id == session_id {
-                    }
+                            event = EventV1::Logout;
-                } else if let EventV1::DeleteAllSessions {
+                        }
-                    exclude_session_id, ..
+                    } else if let AuthifierEvent::DeleteAllSessions {
-                } = &event
+                        exclude_session_id, ..
-                {
+                    } = auth
-                    if let Some(excluded) = exclude_session_id {
+                    {
-                        if &state.session_id != excluded {
+                        if let Some(excluded) = exclude_session_id {
+                            if &state.session_id != excluded {
+                                event = EventV1::Logout;
+                            }
+                        } else {
                             event = EventV1::Logout;
                         }
-                    } else {
-                        event = EventV1::Logout;
                     }
                 } else {
                     let should_send = state.handle_incoming_event_v1(db, &mut event).await;
@@ -533,43 +527,4 @@ async fn worker(
             }
         }
     }
-}
+}
-
-async fn fetch_user_slowmodes(user_id: &str) -> Option<Vec<v0::ChannelSlowmode>> {
-    let mut conn = get_connection().await.ok()?.into_inner();
-    let idx_key = format!("slowmode_idx:{}", user_id);
-
-    let channel_ids: Vec<String> = conn.smembers(&idx_key).await.unwrap_or_default();
-    if channel_ids.is_empty() {
-        return Some(vec![]);
-    }
-
-    // Bulk fetch all TTLs in one round trip
-    let mut pipe = redis_kiss::redis::pipe();
-    for channel_id in &channel_ids {
-        pipe.ttl(format!("slowmode:{}:{}", user_id, channel_id));
-    }
-    let ttls: Vec<i64> = pipe.query_async(&mut conn).await.unwrap_or_default();
-
-    // Partition into alive/expired in one pass
-    let mut slowmodes = vec![];
-    let mut expired = vec![];
-    for (channel_id, ttl) in channel_ids.iter().zip(ttls.iter()) {
-        if *ttl > 0 {
-            slowmodes.push(v0::ChannelSlowmode {
-                channel_id: channel_id.clone(),
-                duration: *ttl as u64,
-                retry_after: *ttl as u64,
-            });
-        } else {
-            expired.push(channel_id.as_str());
-        }
-    }
-
-    // Bulk remove all expired members in one SREM call
-    if !expired.is_empty() {
-        conn.srem::<_, _, ()>(&idx_key, expired).await.ok();
-    }
-
-    Some(slowmodes)
-}

crates/core/coalesced/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "revolt-coalesced"
-version = "0.13.7"
+version = "0.12.1"
 edition = "2021"
 license = "MIT"
 authors = ["Paul Makles <me@insrt.uk>", "Zomatree <me@zomatree.live>"]

crates/core/config/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "revolt-config"
-version = "0.13.7"
+version = "0.12.1"
 edition = "2021"
 license = "MIT"
 authors = ["Paul Makles <me@insrt.uk>"]
@@ -14,12 +14,13 @@ anyhow = ["dep:sentry-anyhow"]
 report-macros = ["revolt-result"]
 sentry = ["dep:sentry"]
 test = ["async-std"]
-default = ["sentry"]
+default = ["test", "sentry"]
 
 [dependencies]
 # Utility
 config = { workspace = true }
 cached = { workspace = true }
+once_cell = { workspace = true }
 
 # Serde
 serde = { workspace = true }

crates/core/config/Revolt.test.toml

@@ -1,5 +1,3 @@
-environment = "test"
-
 [database]
 mongodb = "mongodb://localhost"
 redis = "redis://localhost/"
@@ -12,12 +10,3 @@ password = "rabbitpass"
 
 [features]
 webhooks_enabled = true
-
-[api.smtp]
-host = "localhost"
-username = "smtp"
-password = "smtp"
-from_address = "development@stoat.chat"
-reply_to = "support@stoat.chat"
-port = 14025
-use_tls = false

crates/core/config/Revolt.toml

@@ -1,6 +1,5 @@
 production = false
 disable_events_dont_use = false
-environment = "dev"
 
 [database]
 # MongoDB connection URL
@@ -31,7 +30,7 @@ host = "rabbit"
 port = 5672
 username = "rabbituser"
 password = "rabbitpass"
-default_exchange = "revolt.default"
+default_exchange = "revolt"
 
 [rabbit.queues]
 acks = "internal.ack"
@@ -54,10 +53,6 @@ from_address = "noreply@example.com"
 # port = 587
 # use_tls = true
 
-[api.smtp.expiry]
-expire_verification = 604800  # 3600 * 24 * 7
-expire_password_reset = 86400  # 3600 * 24
-expire_account_deletion = 86400  # 3600 * 24
 
 [api.security]
 # Authifier Shield API key
@@ -76,10 +71,6 @@ tenor_key = ""
 hcaptcha_key = ""
 hcaptcha_sitekey = ""
 
-[api.security.shield]
-host = ""
-key = ""
-
 [api.workers]
 # Maximum concurrent connections (to proxy server)
 max_concurrent_connections = 50

crates/core/config/src/lib.rs

@@ -1,10 +1,9 @@
-#[cfg(feature = "test")]
+use std::{collections::HashMap, path::Path};
-use std::sync::OnceLock;
-use std::{collections::HashMap, path::Path, sync::LazyLock};
 
 use cached::proc_macro::cached;
 use config::{Config, Environment, File, FileFormat};
 use futures_locks::RwLock;
+use once_cell::sync::Lazy;
 use serde::Deserialize;
 
 #[cfg(feature = "sentry")]
@@ -67,28 +66,13 @@ static CONFIG_SEARCH_PATHS: [&str; 3] = [
 static TEST_OVERRIDE_PATH: &str = "Revolt.test-overrides.toml";
 
 /// Configuration builder
-static CONFIG_BUILDER: LazyLock<RwLock<Config>> = LazyLock::new(|| {
+static CONFIG_BUILDER: Lazy<RwLock<Config>> = Lazy::new(|| {
     RwLock::new({
         let mut builder = Config::builder().add_source(File::from_str(
             include_str!("../Revolt.toml"),
             FileFormat::Toml,
         ));
 
-        let cwd = std::env::current_dir().unwrap();
-        let mut cwd: Option<&Path> = Some(&cwd);
-
-        while let Some(path) = cwd {
-            for config_path in CONFIG_SEARCH_PATHS {
-                let config_path = path.join(config_path);
-                if config_path.exists() {
-                    builder = builder
-                        .add_source(File::new(config_path.to_str().unwrap(), FileFormat::Toml));
-                }
-            }
-
-            cwd = path.parent();
-        }
-
         if std::env::var("TEST_DB").is_ok() {
             builder = builder.add_source(File::from_str(
                 include_str!("../Revolt.test.toml"),
@@ -110,6 +94,21 @@ static CONFIG_BUILDER: LazyLock<RwLock<Config>> = LazyLock::new(|| {
             }
         }
 
+        let cwd = std::env::current_dir().unwrap();
+        let mut cwd: Option<&Path> = Some(&cwd);
+
+        while let Some(path) = cwd {
+            for config_path in CONFIG_SEARCH_PATHS {
+                let config_path = path.join(config_path);
+                if config_path.exists() {
+                    builder = builder
+                        .add_source(File::new(config_path.to_str().unwrap(), FileFormat::Toml));
+                }
+            }
+
+            cwd = path.parent();
+        }
+
         builder = builder.add_source(Environment::with_prefix("REVOLT").separator("__"));
 
         builder.build().unwrap()
@@ -163,18 +162,6 @@ pub struct ApiSmtp {
     pub port: Option<i32>,
     pub use_tls: Option<bool>,
     pub use_starttls: Option<bool>,
-    pub expiry: EmailExpiry,
-}
-
-/// Email expiration config
-#[derive(Deserialize, Debug, Clone)]
-pub struct EmailExpiry {
-    /// How long email verification codes should last for (in seconds)
-    pub expire_verification: i64,
-    /// How long password reset codes should last for (in seconds)
-    pub expire_password_reset: i64,
-    /// How long account deletion codes should last for (in seconds)
-    pub expire_account_deletion: i64,
 }
 
 #[derive(Deserialize, Debug, Clone)]
@@ -214,15 +201,9 @@ pub struct ApiSecurityCaptcha {
     pub hcaptcha_sitekey: String,
 }
 
-#[derive(Deserialize, Debug, Clone)]
-pub struct ApiSecurityShield {
-    pub host: String,
-    pub key: String,
-}
-
 #[derive(Deserialize, Debug, Clone)]
 pub struct ApiSecurity {
-    pub shield: ApiSecurityShield,
+    pub authifier_shield_key: String,
     pub voso_legacy_token: String,
     pub captcha: ApiSecurityCaptcha,
     pub trust_cloudflare: bool,
@@ -468,7 +449,6 @@ pub struct Settings {
     pub features: Features,
     pub sentry: Sentry,
     pub production: bool,
-    pub environment: String,
     pub disable_events_dont_use: bool,
 }
 
@@ -495,7 +475,8 @@ pub async fn read() -> Config {
     CONFIG_BUILDER.read().await.clone()
 }
 
-pub async fn config_no_cache() -> Settings {
+#[cached(time = 30)]
+pub async fn config() -> Settings {
     let mut config = read().await.try_deserialize::<Settings>().unwrap();
 
     // inject REDIS_URI for redis-kiss library
@@ -513,34 +494,6 @@ pub async fn config_no_cache() -> Settings {
     config
 }
 
-#[cached(time = 30)]
-pub async fn config() -> Settings {
-    #[cfg(feature = "test")]
-    if let Some(overwrites) = CONFIG_OVERWRITES.get() {
-        return overwrites.clone();
-    }
-
-    config_no_cache().await
-}
-
-#[cfg(feature = "test")]
-static CONFIG_OVERWRITES: OnceLock<Settings> = OnceLock::new();
-
-/// Modify the config values for a test, this can only be called once
-///
-/// This will also fail if two or more tests are running in the same process and both try to modify the config,
-/// This could happen if tests where run under `cargo test` instead of `nextest`.
-#[cfg(feature = "test")]
-pub async fn overwrite_config(f: impl FnOnce(&mut Settings)) {
-    let mut config = config_no_cache().await;
-
-    f(&mut config);
-
-    CONFIG_OVERWRITES.set(config).expect(
-        "Cannot overwrite config multiple times, make sure you are running tests through nextest.",
-    );
-}
-
 /// Configure logging and common Rust variables
 #[cfg(feature = "sentry")]
 pub async fn setup_logging(release: &'static str, dsn: String) -> Option<sentry::ClientInitGuard> {

crates/core/database/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "revolt-database"
-version = "0.13.7"
+version = "0.12.1"
 edition = "2021"
 license = "AGPL-3.0-or-later"
 authors = ["Paul Makles <me@insrt.uk>"]
@@ -11,18 +11,19 @@ repository = "https://github.com/stoatchat/stoatchat"
 
 [features]
 # Databases
-mongodb = ["dep:mongodb", "bson"]
+mongodb = ["dep:mongodb", "bson", "authifier/database-mongodb"]
 
 # ... Other
 tasks = ["isahc", "linkify", "url-escape"]
-async-std-runtime = ["async-std"]
+async-std-runtime = ["async-std", "authifier/async-std-runtime"]
 rocket-impl = [
     "rocket",
     "schemars",
     "revolt_okapi",
     "revolt_rocket_okapi",
+    "authifier/rocket_impl",
 ]
-axum-impl = ["axum", "revolt-result/axum", "utoipa"]
+axum-impl = ["axum", "revolt-result/axum"]
 redis-is-patched = ["revolt-presence/redis-is-patched"]
 voice = ["livekit-api", "livekit-protocol", "livekit-runtime"]
 
@@ -54,8 +55,6 @@ linkify = { workspace = true, optional = true }
 url-escape = { workspace = true, optional = true }
 validator = { workspace = true, features = ["derive"] }
 isahc = { workspace = true, features = ["json"], optional = true }
-base32 = { workspace = true }
-sha1 = { workspace = true }
 
 # Serialisation
 serde_json = { workspace = true }
@@ -85,7 +84,6 @@ async-std = { workspace = true, features = ["attributes"], optional = true }
 
 # Axum Impl
 axum = { workspace = true, optional = true }
-utoipa = { workspace = true, features = ["axum_extras"], optional = true }
 
 # Rocket Impl
 schemars = { workspace = true, optional = true }
@@ -93,21 +91,13 @@ rocket = { workspace = true, features = ["json"], optional = true }
 revolt_okapi = { workspace = true, optional = true }
 revolt_rocket_okapi = { workspace = true, optional = true }
 
+# Authifier
+authifier = { workspace = true }
+
 # RabbitMQ
-lapin = { workspace = true, features = ["tokio"] }
+amqprs = { workspace = true }
 
 # Voice
-livekit-api = { workspace = true, features = ["rustls-tls-native-roots"], optional = true }
+livekit-api = { workspace = true, optional = true }
 livekit-protocol = { workspace = true, optional = true }
 livekit-runtime = { workspace = true, features = ["tokio"], optional = true }
-
-# Security
-totp-lite = { workspace = true }
-rust-argon2 = { workspace = true }
-
-# Email
-lettre = { workspace = true }
-handlebars = { workspace = true }
-
-# Web Requests
-reqwest = { workspace = true, features = ["json", "form"] }

crates/core/database/assets/revolt_source_list.txt

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

crates/core/database/src/amqp/amqp.rs

@@ -1,77 +1,98 @@
 use std::collections::HashSet;
-use std::sync::Arc;
 
 use crate::events::rabbit::*;
 use crate::User;
-use lapin::{
+use amqprs::channel::{
-    options::BasicPublishOptions,
+    BasicPublishArguments, ExchangeDeclareArguments, ExchangeType, QueueBindArguments,
-    protocol::basic::AMQPProperties,
+    QueueDeclareArguments,
-    types::{AMQPValue, FieldTable},
-    Channel, Connection, ConnectionProperties, Error as AMQPError,
 };
+use amqprs::connection::OpenConnectionArguments;
+use amqprs::{channel::Channel, connection::Connection, error::Error as AMQPError};
+use amqprs::{BasicProperties, FieldTable};
 use revolt_models::v0::PushNotification;
 use revolt_presence::filter_online;
-use revolt_result::Result;
 
 use serde_json::to_string;
 
 #[derive(Clone)]
 pub struct AMQP {
-    friend_request_accepted: Arc<Channel>,
-    friend_request_received: Arc<Channel>,
-    generic_message: Arc<Channel>,
-    message_sent: Arc<Channel>,
-    mass_mention_message_sent: Arc<Channel>,
-    ack_notification_message: Arc<Channel>,
-    dm_call_updated: Arc<Channel>,
-    process_ack: Arc<Channel>,
     #[allow(unused)]
-    connection: Arc<Connection>,
+    connection: Connection,
+    channel: Channel,
 }
 
 impl AMQP {
-    pub async fn new(connection: Arc<Connection>) -> Self {
+    pub fn new(connection: Connection, channel: Channel) -> AMQP {
-        Self {
+        AMQP {
-            friend_request_accepted: Self::create_channel(&connection).await,
-            friend_request_received: Self::create_channel(&connection).await,
-            generic_message: Self::create_channel(&connection).await,
-            message_sent: Self::create_channel(&connection).await,
-            mass_mention_message_sent: Self::create_channel(&connection).await,
-            ack_notification_message: Self::create_channel(&connection).await,
-            dm_call_updated: Self::create_channel(&connection).await,
-            process_ack: Self::create_channel(&connection).await,
             connection,
+            channel,
         }
     }
 
-    pub async fn new_auto() -> Self {
+    pub async fn new_auto() -> AMQP {
         let config = revolt_config::config().await;
 
-        let connection = Arc::new(
+        let connection = Connection::open(&OpenConnectionArguments::new(
-            Connection::connect(
+            &config.rabbit.host,
-                &format!(
+            config.rabbit.port,
-                    "amqp://{}:{}@{}:{}",
+            &config.rabbit.username,
-                    &config.rabbit.username,
+            &config.rabbit.password,
-                    &config.rabbit.password,
+        ))
-                    &config.rabbit.host,
+        .await
-                    &config.rabbit.port,
+        .expect("Failed to connect to RabbitMQ");
-                ),
+
-                ConnectionProperties::default(),
+        let channel = connection
+            .open_channel(None)
+            .await
+            .expect("Failed to open RabbitMQ channel");
+
+        channel
+            .exchange_declare(
+                ExchangeDeclareArguments::new(&config.pushd.exchange, "direct")
+                    .durable(true)
+                    .finish(),
             )
             .await
-            .expect("Failed to connect to RabbitMQ"),
+            .expect("Failed to declare exchange");
-        );
 
-        Self::new(connection).await
+        AMQP::new(connection, channel)
     }
 
-    async fn create_channel(connection: &Connection) -> Arc<Channel> {
+    pub async fn configure_channels(&self) -> revolt_result::Result<()> {
-        Arc::new(
+        let config = revolt_config::config().await;
-            connection
+
-                .create_channel()
+        self.channel
-                .await
+            .exchange_declare(
-                .expect("Failed to create channel"),
+                ExchangeDeclareArguments::new(
-        )
+                    &config.rabbit.default_exchange,
+                    &ExchangeType::Topic.to_string(),
+                )
+                .durable(true)
+                .finish(),
+            )
+            .await
+            .expect("Failed to declare exchange");
+
+        // Configure acks channel & routing
+        self.channel
+            .queue_declare(
+                QueueDeclareArguments::new(&config.rabbit.queues.acks)
+                    .durable(true)
+                    .no_wait(true)
+                    .finish(),
+            )
+            .await
+            .expect("Failed to bind queue");
+
+        self.channel
+            .queue_bind(QueueBindArguments::new(
+                &config.rabbit.queues.acks,
+                &config.rabbit.default_exchange,
+                &config.rabbit.queues.acks,
+            ))
+            .await
+            .expect("Failed to bind channel");
+        Ok(())
     }
 
     pub async fn friend_request_accepted(
@@ -91,20 +112,19 @@ impl AMQP {
             config.pushd.get_fr_accepted_routing_key(),
             payload
         );
-
+        self.channel
-        self.friend_request_accepted
             .basic_publish(
-                config.pushd.exchange.clone().into(),
+                BasicProperties::default()
-                config.pushd.get_fr_accepted_routing_key().into(),
+                    .with_content_type("application/json")
-                BasicPublishOptions::default(),
+                    .with_persistence(true)
-                payload.as_bytes(),
+                    .finish(),
-                AMQPProperties::default()
+                payload.into(),
-                    .with_content_type("application/json".into())
+                BasicPublishArguments::new(
-                    .with_delivery_mode(2),
+                    &config.pushd.exchange,
+                    &config.pushd.get_fr_accepted_routing_key(),
+                ),
             )
-            .await?;
+            .await
-
-        Ok(())
     }
 
     pub async fn friend_request_received(
@@ -125,19 +145,19 @@ impl AMQP {
             payload
         );
 
-        self.friend_request_received
+        self.channel
             .basic_publish(
-                config.pushd.exchange.clone().into(),
+                BasicProperties::default()
-                config.pushd.get_fr_received_routing_key().into(),
+                    .with_content_type("application/json")
-                BasicPublishOptions::default(),
+                    .with_persistence(true)
-                payload.as_bytes(),
+                    .finish(),
-                AMQPProperties::default()
+                payload.into(),
-                    .with_content_type("application/json".into())
+                BasicPublishArguments::new(
-                    .with_delivery_mode(2),
+                    &config.pushd.exchange,
+                    &config.pushd.get_fr_received_routing_key(),
+                ),
             )
-            .await?;
+            .await
-
-        Ok(())
     }
 
     pub async fn generic_message(
@@ -162,19 +182,19 @@ impl AMQP {
             payload
         );
 
-        self.generic_message
+        self.channel
             .basic_publish(
-                config.pushd.exchange.clone().into(),
+                BasicProperties::default()
-                config.pushd.get_generic_routing_key().into(),
+                    .with_content_type("application/json")
-                BasicPublishOptions::default(),
+                    .with_persistence(true)
-                payload.as_bytes(),
+                    .finish(),
-                AMQPProperties::default()
+                payload.into(),
-                    .with_content_type("application/json".into())
+                BasicPublishArguments::new(
-                    .with_delivery_mode(2),
+                    &config.pushd.exchange,
+                    &config.pushd.get_generic_routing_key(),
+                ),
             )
-            .await?;
+            .await
-
-        Ok(())
     }
 
     pub async fn message_sent(
@@ -205,19 +225,19 @@ impl AMQP {
             payload
         );
 
-        self.message_sent
+        self.channel
             .basic_publish(
-                config.pushd.exchange.clone().into(),
+                BasicProperties::default()
-                config.pushd.get_message_routing_key().into(),
+                    .with_content_type("application/json")
-                BasicPublishOptions::default(),
+                    .with_persistence(true)
-                payload.as_bytes(),
+                    .finish(),
-                AMQPProperties::default()
+                payload.into(),
-                    .with_content_type("application/json".into())
+                BasicPublishArguments::new(
-                    .with_delivery_mode(2),
+                    &config.pushd.exchange,
+                    &config.pushd.get_message_routing_key(),
+                ),
             )
-            .await?;
+            .await
-
-        Ok(())
     }
 
     pub async fn mass_mention_message_sent(
@@ -240,19 +260,16 @@ impl AMQP {
             routing_key, payload
         );
 
-        self.mass_mention_message_sent
+        self.channel
             .basic_publish(
-                config.pushd.exchange.clone().into(),
+                BasicProperties::default()
-                routing_key.into(),
+                    .with_content_type("application/json")
-                BasicPublishOptions::default(),
+                    .with_persistence(true)
-                payload.as_bytes(),
+                    .finish(),
-                AMQPProperties::default()
+                payload.into(),
-                    .with_content_type("application/json".into())
+                BasicPublishArguments::new(&config.pushd.exchange, routing_key.as_str()),
-                    .with_delivery_mode(2),
             )
-            .await?;
+            .await
-
-        Ok(())
     }
 
     /// # Sends an ack to pushd to update badges on iPhones.
@@ -277,25 +294,23 @@ impl AMQP {
             config.pushd.ack_queue, payload
         );
 
-        let mut headers = FieldTable::default();
+        let mut headers = FieldTable::new();
         headers.insert(
-            "x-deduplication-header".into(),
+            "x-deduplication-header".try_into().unwrap(),
-            AMQPValue::LongString(format!("{}-{}", &user_id, &channel_id).into()),
+            format!("{}-{}", &user_id, &channel_id).into(),
         );
 
-        self.ack_notification_message
+        self.channel
             .basic_publish(
-                config.pushd.exchange.clone().into(),
+                BasicProperties::default()
-                config.pushd.ack_queue.into(),
+                    .with_content_type("application/json")
-                BasicPublishOptions::default(),
+                    .with_persistence(true)
-                payload.as_bytes(),
+                    //.with_headers(headers)
-                AMQPProperties::default()
+                    .finish(),
-                    .with_content_type("application/json".into())
+                payload.into(),
-                    .with_delivery_mode(2),
+                BasicPublishArguments::new(&config.pushd.exchange, &config.pushd.ack_queue),
             )
-            .await?;
+            .await
-
-        Ok(())
     }
 
     /// # DM Call Update
@@ -329,19 +344,19 @@ impl AMQP {
             payload
         );
 
-        self.dm_call_updated
+        self.channel
             .basic_publish(
-                config.pushd.exchange.clone().into(),
+                BasicProperties::default()
-                config.pushd.get_dm_call_routing_key().into(),
+                    .with_content_type("application/json")
-                BasicPublishOptions::default(),
+                    .with_persistence(true)
-                payload.as_bytes(),
+                    .finish(),
-                AMQPProperties::default()
+                payload.into(),
-                    .with_content_type("application/json".into())
+                BasicPublishArguments::new(
-                    .with_delivery_mode(2),
+                    &config.pushd.exchange,
+                    &config.pushd.get_dm_call_routing_key(),
+                ),
             )
-            .await?;
+            .await
-
-        Ok(())
     }
 
     /// # Send an ack to crond for processing
@@ -365,18 +380,19 @@ impl AMQP {
             config.rabbit.default_exchange, config.rabbit.queues.acks, payload
         );
 
-        self.process_ack
+        self.channel
             .basic_publish(
-                config.rabbit.default_exchange.clone().into(),
+                BasicProperties::default()
-                config.rabbit.queues.acks.into(),
+                    .with_content_type("application/json")
-                BasicPublishOptions::default(),
+                    .with_persistence(true)
-                payload.as_bytes(),
+                    //.with_headers(headers)
-                AMQPProperties::default()
+                    .finish(),
-                    .with_content_type("application/json".into())
+                payload.into(),
-                    .with_delivery_mode(2),
+                BasicPublishArguments::new(
+                    &config.rabbit.default_exchange,
+                    &config.rabbit.queues.acks,
+                ),
             )
-            .await?;
+            .await
-
-        Ok(())
     }
 }

crates/core/database/src/drivers/mod.rs

@@ -2,7 +2,16 @@
 mod mongodb;
 mod reference;
 
-
+use authifier::config::Captcha;
+use authifier::config::EmailVerificationConfig;
+use authifier::config::PasswordScanning;
+use authifier::config::ResolveIp;
+use authifier::config::SMTPSettings;
+use authifier::config::Shield;
+use authifier::config::Template;
+use authifier::config::Templates;
+use authifier::config::EmailExpiryConfig;
+use authifier::Authifier;
 use rand::Rng;
 use revolt_config::config;
 
@@ -103,3 +112,143 @@ impl DatabaseInfo {
         }
     }
 }
+
+impl Database {
+    /// Create an Authifier reference
+    pub async fn to_authifier(self) -> Authifier {
+        let config = config().await;
+
+        let mut auth_config = authifier::Config {
+            password_scanning: if config.api.security.easypwned.is_empty() {
+                Default::default()
+            } else {
+                PasswordScanning::EasyPwned {
+                    endpoint: config.api.security.easypwned,
+                }
+            },
+            email_verification: if !config.api.smtp.host.is_empty() {
+                EmailVerificationConfig::Enabled {
+                    smtp: SMTPSettings {
+                        from: config.api.smtp.from_address,
+                        host: config.api.smtp.host,
+                        username: config.api.smtp.username,
+                        password: config.api.smtp.password,
+                        reply_to: Some(
+                            config
+                                .api
+                                .smtp
+                                .reply_to
+                                .unwrap_or("support@stoat.chat".into()),
+                        ),
+                        port: config.api.smtp.port,
+                        use_tls: config.api.smtp.use_tls,
+                        use_starttls: config.api.smtp.use_starttls,
+                    },
+                    expiry: EmailExpiryConfig {
+                        expire_verification: 3600 * 24 * 7,
+                        expire_password_reset: 3600 * 24,
+                        expire_account_deletion: 3600 * 24,
+                    },
+                    templates: if config.production {
+                        Templates {
+                            verify: Template {
+                                title: "Verify your Stoat account.".into(),
+                                text: include_str!("../../templates/verify.txt").into(),
+                                url: format!("{}/login/verify/", config.hosts.app),
+                                html: Some(include_str!("../../templates/verify.html").into()),
+                            },
+                            reset: Template {
+                                title: "Reset your Stoat password.".into(),
+                                text: include_str!("../../templates/reset.txt").into(),
+                                url: format!("{}/login/reset/", config.hosts.app),
+                                html: Some(include_str!("../../templates/reset.html").into()),
+                            },
+                            reset_existing: Template {
+                                title: "You already have a Stoat account, reset your password."
+                                    .into(),
+                                text: include_str!("../../templates/reset-existing.txt").into(),
+                                url: format!("{}/login/reset/", config.hosts.app),
+                                html: Some(
+                                    include_str!("../../templates/reset-existing.html").into(),
+                                ),
+                            },
+                            deletion: Template {
+                                title: "Confirm account deletion.".into(),
+                                text: include_str!("../../templates/deletion.txt").into(),
+                                url: format!("{}/delete/", config.hosts.app),
+                                html: Some(include_str!("../../templates/deletion.html").into()),
+                            },
+                            welcome: None,
+                        }
+                    } else {
+                        Templates {
+                            verify: Template {
+                                title: "Verify your account.".into(),
+                                text: include_str!("../../templates/verify.whitelabel.txt").into(),
+                                url: format!("{}/login/verify/", config.hosts.app),
+                                html: None,
+                            },
+                            reset: Template {
+                                title: "Reset your password.".into(),
+                                text: include_str!("../../templates/reset.whitelabel.txt").into(),
+                                url: format!("{}/login/reset/", config.hosts.app),
+                                html: None,
+                            },
+                            reset_existing: Template {
+                                title: "Reset your password.".into(),
+                                text: include_str!("../../templates/reset.whitelabel.txt").into(),
+                                url: format!("{}/login/reset/", config.hosts.app),
+                                html: None,
+                            },
+                            deletion: Template {
+                                title: "Confirm account deletion.".into(),
+                                text: include_str!("../../templates/deletion.whitelabel.txt")
+                                    .into(),
+                                url: format!("{}/delete/", config.hosts.app),
+                                html: None,
+                            },
+                            welcome: None,
+                        }
+                    },
+                }
+            } else {
+                EmailVerificationConfig::Disabled
+            },
+            ..Default::default()
+        };
+
+        auth_config.invite_only = config.api.registration.invite_only;
+
+        if !config.api.security.captcha.hcaptcha_key.is_empty() {
+            auth_config.captcha = Captcha::HCaptcha {
+                secret: config.api.security.captcha.hcaptcha_key,
+            };
+        }
+
+        if !config.api.security.authifier_shield_key.is_empty() {
+            auth_config.shield = Shield::Enabled {
+                api_key: config.api.security.authifier_shield_key,
+                strict: false,
+            };
+        }
+
+        if config.api.security.trust_cloudflare {
+            auth_config.resolve_ip = ResolveIp::Cloudflare;
+        }
+
+        Authifier {
+            database: match self {
+                Database::Reference(_) => Default::default(),
+                #[cfg(feature = "mongodb")]
+                Database::MongoDb(MongoDb(client, _)) => authifier::Database::MongoDb(
+                    authifier::database::MongoDb(client.database("revolt")),
+                ),
+            },
+            config: auth_config,
+            #[cfg(feature = "tasks")]
+            event_channel: Some(crate::tasks::authifier_relay::sender()),
+            #[cfg(not(feature = "tasks"))]
+            event_channel: None,
+        }
+    }
+}

crates/core/database/src/drivers/reference.rs

@@ -5,7 +5,7 @@ use futures::lock::Mutex;
 use crate::{
     Bot, Channel, ChannelCompositeKey, ChannelUnread, Emoji, File, FileHash, Invite, Member,
     MemberCompositeKey, Message, PolicyChange, RatelimitEvent, Report, Server, ServerBan, Snapshot,
-    User, UserSettings, Webhook, Account, AccountInvite, Session, MFATicket
+    User, UserSettings, Webhook,
 };
 
 database_derived!(
@@ -30,9 +30,5 @@ database_derived!(
         pub servers: Arc<Mutex<HashMap<String, Server>>>,
         pub safety_reports: Arc<Mutex<HashMap<String, Report>>>,
         pub safety_snapshots: Arc<Mutex<HashMap<String, Snapshot>>>,
-        pub accounts: Arc<Mutex<HashMap<String, Account>>>,
-        pub account_invites: Arc<Mutex<HashMap<String, AccountInvite>>>,
-        pub sessions: Arc<Mutex<HashMap<String, Session>>>,
-        pub tickets: Arc<Mutex<HashMap<String, MFATicket>>>,
     }
 );

crates/core/database/src/events/client.rs

@@ -1,16 +1,12 @@
+use authifier::AuthifierEvent;
 use revolt_result::Error;
 use serde::{Deserialize, Serialize};
 
 use revolt_models::v0::{
-    AppendMessage, Channel, ChannelSlowmode, ChannelUnread, ChannelVoiceState, Emoji,
+    AppendMessage, Channel, ChannelUnread, ChannelVoiceState, Emoji, FieldsChannel, FieldsMember, FieldsMessage, FieldsRole, FieldsServer, FieldsUser, FieldsWebhook, Member, MemberCompositeKey, Message, PartialChannel, PartialEmoji, PartialMember, PartialMessage, PartialRole, PartialServer, PartialUser, PartialUserVoiceState, PartialWebhook, PolicyChange, RemovalIntention, Report, Server, User, UserSettings, UserVoiceState, Webhook
-    FieldsChannel, FieldsMember, FieldsMessage, FieldsRole, FieldsServer, FieldsUser,
-    FieldsWebhook, Member, MemberCompositeKey, Message, PartialChannel, PartialEmoji,
-    PartialMember, PartialMessage, PartialRole, PartialServer, PartialUser, PartialUserVoiceState,
-    PartialWebhook, PolicyChange, RemovalIntention, Report, Server, User, UserSettings,
-    UserVoiceState, Webhook,
 };
 
-use crate::{Account, Database, Session};
+use crate::Database;
 
 /// Ping Packet
 #[derive(Serialize, Deserialize, Debug, Clone)]
@@ -55,13 +51,9 @@ impl Default for ReadyPayloadFields {
 #[serde(tag = "type")]
 pub enum EventV1 {
     /// Multiple events
-    Bulk {
+    Bulk { v: Vec<EventV1> },
-        v: Vec<EventV1>,
-    },
     /// Error event
-    Error {
+    Error { data: Error },
-        data: Error,
-    },
 
     /// Successfully authenticated
     Authenticated,
@@ -92,9 +84,7 @@ pub enum EventV1 {
     },
 
     /// Ping response
-    Pong {
+    Pong { data: Ping },
-        data: Ping,
-    },
     /// New message
     Message(Message),
 
@@ -115,10 +105,7 @@ pub enum EventV1 {
     },
 
     /// Delete message
-    MessageDelete {
+    MessageDelete { id: String, channel: String },
-        id: String,
-        channel: String,
-    },
 
     /// New reaction to a message
     MessageReact {
@@ -144,10 +131,7 @@ pub enum EventV1 {
     },
 
     /// Bulk delete messages
-    BulkMessageDelete {
+    BulkMessageDelete { channel: String, ids: Vec<String> },
-        channel: String,
-        ids: Vec<String>,
-    },
 
     /// New server
     ServerCreate {
@@ -155,7 +139,7 @@ pub enum EventV1 {
         server: Server,
         channels: Vec<Channel>,
         emojis: Vec<Emoji>,
-        voice_states: Vec<ChannelVoiceState>,
+        voice_states: Vec<ChannelVoiceState>
     },
 
     /// Update existing server
@@ -167,9 +151,7 @@ pub enum EventV1 {
     },
 
     /// Delete server
-    ServerDelete {
+    ServerDelete { id: String },
-        id: String,
-    },
 
     /// Update existing server member
     ServerMemberUpdate {
@@ -205,16 +187,10 @@ pub enum EventV1 {
     },
 
     /// Server role deleted
-    ServerRoleDelete {
+    ServerRoleDelete { id: String, role_id: String },
-        id: String,
-        role_id: String,
-    },
 
     /// Server roles ranks updated
-    ServerRoleRanksUpdate {
+    ServerRoleRanksUpdate { id: String, ranks: Vec<String> },
-        id: String,
-        ranks: Vec<String>,
-    },
 
     /// Update existing user
     UserUpdate {
@@ -226,15 +202,9 @@ pub enum EventV1 {
     },
 
     /// Relationship with another user changed
-    UserRelationship {
+    UserRelationship { id: String, user: User },
-        id: String,
-        user: User,
-    },
     /// Settings updated remotely
-    UserSettingsUpdate {
+    UserSettingsUpdate { id: String, update: UserSettings },
-        id: String,
-        update: UserSettings,
-    },
 
     /// User has been platform banned or deleted their account
     ///
@@ -245,10 +215,7 @@ pub enum EventV1 {
     /// - Server Memberships
     ///
     /// User flags are specified to explain why a wipe is occurring though not all reasons will necessarily ever appear.
-    UserPlatformWipe {
+    UserPlatformWipe { user_id: String, flags: i32 },
-        user_id: String,
-        flags: i32,
-    },
     /// New emoji
     EmojiCreate(Emoji),
 
@@ -259,9 +226,7 @@ pub enum EventV1 {
     },
 
     /// Delete emoji
-    EmojiDelete {
+    EmojiDelete { id: String },
-        id: String,
-    },
 
     /// New report
     ReportCreate(Report),
@@ -277,33 +242,19 @@ pub enum EventV1 {
     },
 
     /// Delete channel
-    ChannelDelete {
+    ChannelDelete { id: String },
-        id: String,
-    },
 
     /// User joins a group
-    ChannelGroupJoin {
+    ChannelGroupJoin { id: String, user: String },
-        id: String,
-        user: String,
-    },
 
     /// User leaves a group
-    ChannelGroupLeave {
+    ChannelGroupLeave { id: String, user: String },
-        id: String,
-        user: String,
-    },
 
     /// User started typing in a channel
-    ChannelStartTyping {
+    ChannelStartTyping { id: String, user: String },
-        id: String,
-        user: String,
-    },
 
     /// User stopped typing in a channel
-    ChannelStopTyping {
+    ChannelStopTyping { id: String, user: String },
-        id: String,
-        user: String,
-    },
 
     /// User acknowledged message in channel
     ChannelAck {
@@ -323,25 +274,10 @@ pub enum EventV1 {
     },
 
     /// Delete webhook
-    WebhookDelete {
+    WebhookDelete { id: String },
-        id: String,
-    },
 
     /// Auth events
-    CreateAccount {
+    Auth(AuthifierEvent),
-        account: Account,
-    },
-    CreateSession {
-        session: Session,
-    },
-    DeleteSession {
-        user_id: String,
-        session_id: String,
-    },
-    DeleteAllSessions {
-        user_id: String,
-        exclude_session_id: Option<String>,
-    },
 
     /// Voice events
     VoiceChannelJoin {
@@ -356,7 +292,7 @@ pub enum EventV1 {
         user: String,
         from: String,
         to: String,
-        state: UserVoiceState,
+        state: UserVoiceState
     },
     UserVoiceStateUpdate {
         id: String,
@@ -368,11 +304,7 @@ pub enum EventV1 {
         from: String,
         to: String,
         token: String,
-    },
+    }
-    /// User's active slowmodes
-    UserSlowmodes {
-        slowmodes: Vec<ChannelSlowmode>,
-    },
 }
 
 impl EventV1 {

crates/core/database/src/lib.rs

@@ -95,7 +95,7 @@ macro_rules! database_test {
         db.drop_database().await;
 
         #[allow(clippy::redundant_closure_call)]
-        (|$db: $crate::Database| $test)(db.clone()).await;
+        std::boxed::Box::pin((|$db: $crate::Database| $test)(db.clone())).await;
 
         db.drop_database().await
     };

crates/core/database/src/models/account_invites/mod.rs

@@ -1,5 +0,0 @@
-mod model;
-mod ops;
-
-pub use model::*;
-pub use ops::*;

crates/core/database/src/models/account_invites/model.rs

@@ -1,25 +0,0 @@
-use crate::{if_false, Database};
-use revolt_result::Result;
-
-auto_derived_partial!(
-    /// Account invite ticket
-    pub struct AccountInvite {
-        /// Invite code
-        #[serde(rename = "_id")]
-        pub id: String,
-        /// Whether this invite ticket has been used
-        #[serde(skip_serializing_if = "if_false", default)]
-        pub used: bool,
-        /// User ID that this invite was claimed by
-        #[serde(skip_serializing_if = "Option::is_none")]
-        pub claimed_by: Option<String>,
-    },
-    "PartialAccountInvite"
-);
-
-impl AccountInvite {
-    /// Save model
-    pub async fn save(&self, db: &Database) -> Result<()> {
-        db.save_account_invite(self).await
-    }
-}

crates/core/database/src/models/account_invites/ops.rs

@@ -1,16 +0,0 @@
-use revolt_result::Result;
-
-use crate::AccountInvite;
-
-#[cfg(feature = "mongodb")]
-mod mongodb;
-mod reference;
-
-#[async_trait]
-pub trait AbstractAccountInvites: Sync + Send {
-    /// Find invite by id
-    async fn fetch_account_invite(&self, id: &str) -> Result<AccountInvite>;
-
-    /// Save invite
-    async fn save_account_invite(&self, invite: &AccountInvite) -> Result<()>;
-}

crates/core/database/src/models/account_invites/ops/mongodb.rs

@@ -1,31 +0,0 @@
-use crate::{AbstractAccountInvites, AccountInvite, MongoDb};
-use bson::to_document;
-use mongodb::options::UpdateOptions;
-use revolt_result::Result;
-
-const COL: &str = "account_invites";
-
-#[async_trait]
-impl AbstractAccountInvites for MongoDb {
-    /// Find invite by id
-    async fn fetch_account_invite(&self, id: &str) -> Result<AccountInvite> {
-        query!(self, find_one_by_id, COL, id)?.ok_or_else(|| create_error!(InvalidInvite))
-    }
-
-    /// Save invite
-    async fn save_account_invite(&self, invite: &AccountInvite) -> Result<()> {
-        self.col::<AccountInvite>(COL)
-            .update_one(
-                doc! {
-                    "_id": &invite.id
-                },
-                doc! {
-                    "$set": to_document(invite).map_err(|_| create_database_error!("to_document", COL))?,
-                },
-            )
-            .with_options(UpdateOptions::builder().upsert(true).build())
-            .await
-            .map_err(|_| create_database_error!("upsert_one", COL))
-            .map(|_| ())
-    }
-}

crates/core/database/src/models/account_invites/ops/reference.rs

@@ -1,21 +0,0 @@
-use crate::{AbstractAccountInvites, AccountInvite, ReferenceDb};
-use revolt_result::Result;
-
-#[async_trait]
-impl AbstractAccountInvites for ReferenceDb {
-    /// Find invite by id
-    async fn fetch_account_invite(&self, id: &str) -> Result<AccountInvite> {
-        let invites = self.account_invites.lock().await;
-        invites
-            .get(id)
-            .cloned()
-            .ok_or_else(|| create_error!(InvalidInvite))
-    }
-
-    /// Save invite
-    async fn save_account_invite(&self, invite: &AccountInvite) -> Result<()> {
-        let mut invites = self.account_invites.lock().await;
-        invites.insert(invite.id.to_string(), invite.clone());
-        Ok(())
-    }
-}

crates/core/database/src/models/accounts/axum.rs

@@ -1,22 +0,0 @@
-use axum::{extract::{FromRef, FromRequestParts}, http::request::Parts};
-
-use revolt_result::{Error, Result};
-
-use crate::{Account, Database, Session};
-
-#[async_trait]
-impl<S> FromRequestParts<S> for Account
-where
-    Database: FromRef<S>,
-    S: Send + Sync
-{
-    type Rejection = Error;
-
-    async fn from_request_parts(parts: &mut Parts, state: &S) -> Result<Self> {
-        let db = Database::from_ref(state);
-
-        let session = Session::from_request_parts(parts, state).await?;
-
-        db.fetch_account(&session.user_id).await
-    }
-}

crates/core/database/src/models/accounts/mod.rs

@@ -1,11 +0,0 @@
-#[cfg(feature = "axum-impl")]
-mod axum;
-mod model;
-mod ops;
-#[cfg(feature = "rocket-impl")]
-mod rocket;
-#[cfg(feature = "rocket-impl")]
-mod schema;
-
-pub use model::*;
-pub use ops::*;

crates/core/database/src/models/accounts/model.rs

@@ -1,656 +0,0 @@
-use iso8601_timestamp::{Duration, Timestamp};
-
-use nanoid::nanoid;
-use revolt_config::config;
-use revolt_result::Result;
-use serde_json::json;
-
-use crate::{
-    events::client::EventV1,
-    util::{
-        email::{email_templates, normalise_email, send_email},
-        password::hash_password,
-    },
-    Database, MFATicket, Session,
-};
-use revolt_models::v0;
-
-auto_derived_partial!(
-    /// Account model
-    pub struct Account {
-        /// Unique Id
-        #[serde(rename = "_id")]
-        pub id: String,
-
-        /// User's email
-        pub email: String,
-
-        /// Normalised email
-        ///
-        /// (see https://github.com/insertish/authifier/#how-does-authifier-work)
-        pub email_normalised: String,
-
-        /// Argon2 hashed password
-        pub password: String,
-
-        /// Whether the account is disabled
-        #[serde(default)]
-        pub disabled: bool,
-
-        /// Email verification status
-        pub verification: EmailVerification,
-
-        /// Password reset information
-        pub password_reset: Option<PasswordReset>,
-
-        /// Account deletion information
-        pub deletion: Option<DeletionInfo>,
-
-        /// Account lockout
-        pub lockout: Option<Lockout>,
-
-        /// Multi-factor authentication information
-        pub mfa: MultiFactorAuthentication,
-    },
-    "PartialAccount"
-);
-
-auto_derived!(
-    /// Email verification status
-    #[serde(tag = "status")]
-    pub enum EmailVerification {
-        /// Account is verified
-        Verified,
-        /// Pending email verification
-        Pending { token: String, expiry: Timestamp },
-        /// Moving to a new email
-        Moving {
-            new_email: String,
-            token: String,
-            expiry: Timestamp,
-        },
-    }
-
-    /// Password reset information
-    pub struct PasswordReset {
-        /// Token required to change password
-        pub token: String,
-        /// Time at which this token expires
-        pub expiry: Timestamp,
-    }
-
-    /// Account deletion information
-    #[serde(tag = "status")]
-    pub enum DeletionInfo {
-        /// The user must confirm deletion by email
-        WaitingForVerification { token: String, expiry: Timestamp },
-        /// The account is scheduled for deletion
-        Scheduled { after: Timestamp },
-        /// This account was deleted
-        Deleted,
-    }
-
-    /// Lockout information
-    pub struct Lockout {
-        /// Attempt counter
-        pub attempts: i32,
-        /// Time at which this lockout expires
-        pub expiry: Option<Timestamp>,
-    }
-
-    /// MFA configuration
-    #[derive(Default)]
-    pub struct MultiFactorAuthentication {
-        /// Allow password-less email OTP login
-        /// (1-Factor)
-        // #[serde(skip_serializing_if = "is_false", default)]
-        // pub enable_email_otp: bool,
-
-        /// Allow trusted handover
-        /// (1-Factor)
-        // #[serde(skip_serializing_if = "is_false", default)]
-        // pub enable_trusted_handover: bool,
-
-        /// Allow email MFA
-        /// (2-Factor)
-        // #[serde(skip_serializing_if = "is_false", default)]
-        // pub enable_email_mfa: bool,
-
-        /// TOTP MFA token, enabled if present
-        /// (2-Factor)
-        #[serde(skip_serializing_if = "Totp::is_empty", default)]
-        pub totp_token: Totp,
-
-        /// Security Key MFA token, enabled if present
-        /// (2-Factor)
-        // #[serde(skip_serializing_if = "Option::is_none")]
-        // pub security_key_token: Option<String>,
-
-        /// Recovery codes
-        #[serde(skip_serializing_if = "Vec::is_empty", default)]
-        pub recovery_codes: Vec<String>,
-    }
-
-    /// MFA method
-    #[derive(Hash)]
-    pub enum MFAMethod {
-        Password,
-        Recovery,
-        Totp,
-    }
-
-    #[derive(Default)]
-    #[serde(tag = "status")]
-    pub enum Totp {
-        /// Disabled
-        #[default]
-        Disabled,
-        /// Waiting for user activation
-        Pending { secret: String },
-        /// Required on account
-        Enabled { secret: String },
-    }
-);
-
-impl MultiFactorAuthentication {
-    // Check whether MFA is in-use
-    pub fn is_active(&self) -> bool {
-        matches!(self.totp_token, Totp::Enabled { .. })
-    }
-
-    // Check whether there are still usable recovery codes
-    pub fn has_recovery(&self) -> bool {
-        !self.recovery_codes.is_empty()
-    }
-
-    // Get available MFA methods
-    pub fn get_methods(&self) -> Vec<MFAMethod> {
-        if let Totp::Enabled { .. } = self.totp_token {
-            let mut methods = vec![MFAMethod::Totp];
-
-            if self.has_recovery() {
-                methods.push(MFAMethod::Recovery);
-            }
-
-            methods
-        } else {
-            vec![MFAMethod::Password]
-        }
-    }
-
-    // Generate new recovery codes
-    pub fn generate_recovery_codes(&mut self) {
-        static ALPHABET: [char; 32] = [
-            '1', '2', '3', '4', '5', '6', '7', '8', '9', '0', 'a', 'b', 'c', 'd', 'e', 'f', 'g',
-            'h', 'j', 'k', 'm', 'n', 'p', 'q', 'r', 's', 't', 'v', 'w', 'x', 'y', 'z',
-        ];
-
-        let mut codes = vec![];
-        for _ in 1..=10 {
-            codes.push(format!(
-                "{}-{}",
-                nanoid!(5, &ALPHABET),
-                nanoid!(5, &ALPHABET)
-            ));
-        }
-
-        self.recovery_codes = codes;
-    }
-
-    // Generate new TOTP secret
-    pub fn generate_new_totp_secret(&mut self) -> Result<String> {
-        if let Totp::Enabled { .. } = self.totp_token {
-            return Err(create_error!(OperationFailed));
-        }
-
-        let secret: [u8; 10] = rand::random();
-        let secret = base32::encode(base32::Alphabet::RFC4648 { padding: false }, &secret);
-
-        self.totp_token = Totp::Pending {
-            secret: secret.clone(),
-        };
-
-        Ok(secret)
-    }
-
-    /// Enable TOTP using a given MFA response
-    pub fn enable_totp(&mut self, response: v0::MFAResponse) -> Result<()> {
-        if let v0::MFAResponse::Totp { totp_code } = response {
-            let code = self.totp_token.generate_code()?;
-
-            if code == totp_code {
-                let mut totp = Totp::Disabled;
-                std::mem::swap(&mut totp, &mut self.totp_token);
-
-                if let Totp::Pending { secret } = totp {
-                    self.totp_token = Totp::Enabled { secret };
-
-                    Ok(())
-                } else {
-                    Err(create_error!(OperationFailed))
-                }
-            } else {
-                Err(create_error!(InvalidToken))
-            }
-        } else {
-            Err(create_error!(InvalidToken))
-        }
-    }
-}
-
-impl Totp {
-    /// Whether TOTP information is empty
-    pub fn is_empty(&self) -> bool {
-        matches!(self, Totp::Disabled)
-    }
-
-    /// Whether TOTP is disabled
-    pub fn is_disabled(&self) -> bool {
-        !matches!(self, Totp::Enabled { .. })
-    }
-
-    // Generate a TOTP code from secret
-    pub fn generate_code(&self) -> Result<String> {
-        if let Totp::Enabled { secret } | Totp::Pending { secret } = &self {
-            let seconds: u64 = std::time::SystemTime::now()
-                .duration_since(std::time::UNIX_EPOCH)
-                .unwrap()
-                .as_secs();
-
-            Ok(totp_lite::totp_custom::<totp_lite::Sha1>(
-                totp_lite::DEFAULT_STEP,
-                6,
-                &base32::decode(base32::Alphabet::RFC4648 { padding: false }, secret)
-                    .expect("valid base32 secret"),
-                seconds,
-            ))
-        } else {
-            Err(create_error!(OperationFailed))
-        }
-    }
-}
-
-impl Account {
-    /// Save model
-    pub async fn save(&self, db: &Database) -> Result<()> {
-        db.save_account(self).await
-    }
-
-    /// Create a new account
-    pub async fn new(
-        db: &Database,
-        email: String,
-        plaintext_password: String,
-        verify_email: bool,
-    ) -> Result<Account> {
-        // Get a normalised representation of the user's email
-        let email_normalised = normalise_email(email.clone());
-
-        // Try to find an existing account
-        if let Some(mut account) = db
-            .fetch_account_by_normalised_email(&email_normalised)
-            .await?
-        {
-            // Resend account verification or send password reset
-            if let EmailVerification::Pending { .. } = &account.verification {
-                account.start_email_verification(db).await?;
-            } else {
-                account.start_password_reset(db, true).await?;
-            }
-
-            Ok(account)
-        } else {
-            // Hash the user's password
-            let password = hash_password(plaintext_password)?;
-
-            // Create a new account
-            let mut account = Account {
-                id: ulid::Ulid::new().to_string(),
-
-                email,
-                email_normalised,
-                password,
-
-                disabled: false,
-                verification: EmailVerification::Verified,
-                password_reset: None,
-                deletion: None,
-                lockout: None,
-
-                mfa: Default::default(),
-            };
-
-            // Send email verification
-            if verify_email {
-                account.start_email_verification(db).await?;
-            } else {
-                account.save(db).await?;
-            }
-
-            // Create and push event
-            EventV1::CreateAccount {
-                account: account.clone(),
-            }
-            .global()
-            .await;
-
-            Ok(account)
-        }
-    }
-
-    /// Create a new session
-    pub async fn create_session(&self, db: &Database, name: String) -> Result<Session> {
-        let config = config().await;
-
-        let session = Session {
-            id: ulid::Ulid::new().to_string(),
-            token: nanoid!(64),
-
-            user_id: self.id.clone(),
-            name,
-
-            last_seen: Timestamp::now_utc(),
-
-            origin: Some(config.environment),
-            subscription: None,
-        };
-
-        // Save to database
-        db.save_session(&session).await?;
-
-        // Create and push event
-        EventV1::CreateSession {
-            session: session.clone(),
-        }
-        .global()
-        .await;
-
-        Ok(session)
-    }
-
-    /// Send account verification email
-    pub async fn start_email_verification(&mut self, db: &Database) -> Result<()> {
-        let config = config().await;
-
-        if !config.api.smtp.host.is_empty() {
-            let templates = email_templates().await;
-
-            let token = nanoid!(32);
-            let url = format!("{}{}", templates.verify.url, token);
-
-            send_email(
-                &config.api.smtp,
-                self.email.clone(),
-                &templates.verify,
-                json!({
-                    "email": self.email.clone(),
-                    "url": url
-                }),
-            )?;
-
-            self.verification = EmailVerification::Pending {
-                token,
-                expiry: Timestamp::now_utc()
-                    .checked_add(Duration::seconds(
-                        config.api.smtp.expiry.expire_verification,
-                    ))
-                    .unwrap(),
-            };
-        } else {
-            self.verification = EmailVerification::Verified;
-        }
-
-        self.save(db).await
-    }
-
-    /// Send account verification to new email
-    pub async fn start_email_move(&mut self, db: &Database, new_email: String) -> Result<()> {
-        // This method should and will never be called on an unverified account,
-        // but just validate this just in case.
-        if let EmailVerification::Pending { .. } = self.verification {
-            return Err(create_error!(UnverifiedAccount));
-        }
-
-        let config = config().await;
-
-        if !config.api.smtp.host.is_empty() {
-            let templates = email_templates().await;
-
-            let token = nanoid!(32);
-            let url = format!("{}{}", templates.verify.url, token);
-
-            send_email(
-                &config.api.smtp,
-                new_email.clone(),
-                &templates.verify,
-                json!({
-                    "email": self.email.clone(),
-                    "url": url
-                }),
-            )?;
-
-            self.verification = EmailVerification::Moving {
-                new_email,
-                token,
-                expiry: Timestamp::now_utc()
-                    .checked_add(Duration::seconds(
-                        config.api.smtp.expiry.expire_verification,
-                    ))
-                    .unwrap(),
-            };
-        } else {
-            self.email_normalised = normalise_email(new_email.clone());
-            self.email = new_email;
-        }
-
-        self.save(db).await
-    }
-
-    /// Send password reset email
-    pub async fn start_password_reset(
-        &mut self,
-        db: &Database,
-        existing_account: bool,
-    ) -> Result<()> {
-        let config = config().await;
-
-        if !config.api.smtp.host.is_empty() {
-            let templates = email_templates().await;
-
-            let template = if existing_account {
-                &templates.reset_existing
-            } else {
-                &templates.reset
-            };
-
-            let token = nanoid!(32);
-            let url = format!("{}{}", template.url, token);
-
-            send_email(
-                &config.api.smtp,
-                self.email.clone(),
-                template,
-                json!({
-                    "email": self.email.clone(),
-                    "url": url
-                }),
-            )?;
-
-            self.password_reset = Some(PasswordReset {
-                token,
-                expiry: Timestamp::now_utc()
-                    .checked_add(Duration::seconds(
-                        config.api.smtp.expiry.expire_password_reset,
-                    ))
-                    .unwrap(),
-            });
-        } else {
-            return Err(create_error!(OperationFailed));
-        }
-
-        self.save(db).await
-    }
-
-    /// Begin account deletion process by sending confirmation email
-    ///
-    /// If email verification is not on, the account will be marked for deletion instantly
-    pub async fn start_account_deletion(&mut self, db: &Database) -> Result<()> {
-        let config = config().await;
-
-        if !config.api.smtp.host.is_empty() {
-            let templates = email_templates().await;
-
-            let token = nanoid!(32);
-            let url = format!("{}{}", templates.deletion.url, token);
-
-            send_email(
-                &config.api.smtp,
-                self.email.clone(),
-                &templates.deletion,
-                json!({
-                    "email": self.email.clone(),
-                    "url": url
-                }),
-            )?;
-
-            self.deletion = Some(DeletionInfo::WaitingForVerification {
-                token,
-                expiry: Timestamp::now_utc()
-                    .checked_add(Duration::seconds(
-                        config.api.smtp.expiry.expire_password_reset,
-                    ))
-                    .unwrap(),
-            });
-
-            self.save(db).await
-        } else {
-            self.schedule_deletion(db).await
-        }
-    }
-
-    /// Verify a user's password is correct
-    pub fn verify_password(&self, plaintext_password: &str) -> Result<()> {
-        argon2::verify_encoded(&self.password, plaintext_password.as_bytes())
-            .map(|v| {
-                if v {
-                    Ok(())
-                } else {
-                    Err(create_error!(InvalidCredentials))
-                }
-            })
-            // To prevent user enumeration, we should ignore
-            // the error and pretend the password is wrong.
-            .map_err(|_| create_error!(InvalidCredentials))?
-    }
-
-    /// Validate an MFA response
-    pub async fn consume_mfa_response(
-        &mut self,
-        db: &Database,
-        response: v0::MFAResponse,
-        ticket: Option<MFATicket>,
-    ) -> Result<()> {
-        let allowed_methods = self.mfa.get_methods();
-
-        match response {
-            v0::MFAResponse::Password { password } => {
-                if allowed_methods.contains(&MFAMethod::Password) {
-                    self.verify_password(&password)
-                } else {
-                    Err(create_error!(DisallowedMFAMethod))
-                }
-            }
-            v0::MFAResponse::Totp { totp_code } => {
-                if allowed_methods.contains(&MFAMethod::Totp) {
-                    if let Totp::Enabled { .. } = &self.mfa.totp_token {
-                        // Use TOTP code at generation if applicable
-                        if let Some(ticket) = ticket {
-                            if let Some(code) = ticket.last_totp_code {
-                                if code == totp_code {
-                                    return Ok(());
-                                }
-                            }
-                        }
-
-                        // Otherwise read current TOTP token
-                        if self.mfa.totp_token.generate_code()? == totp_code {
-                            Ok(())
-                        } else {
-                            Err(create_error!(InvalidToken))
-                        }
-                    } else {
-                        unreachable!()
-                    }
-                } else {
-                    Err(create_error!(DisallowedMFAMethod))
-                }
-            }
-            v0::MFAResponse::Recovery { recovery_code } => {
-                if allowed_methods.contains(&MFAMethod::Recovery) {
-                    if let Some(index) = self
-                        .mfa
-                        .recovery_codes
-                        .iter()
-                        .position(|x| x == &recovery_code)
-                    {
-                        self.mfa.recovery_codes.remove(index);
-                        self.save(db).await
-                    } else {
-                        Err(create_error!(InvalidToken))
-                    }
-                } else {
-                    Err(create_error!(DisallowedMFAMethod))
-                }
-            }
-        }
-    }
-
-    /// Delete all sessions for an account
-    pub async fn delete_all_sessions(
-        &self,
-        db: &Database,
-        exclude_session_id: Option<String>,
-    ) -> Result<()> {
-        db.delete_all_sessions(&self.id, exclude_session_id.clone())
-            .await?;
-
-        // Create and push event
-        EventV1::DeleteAllSessions {
-            user_id: self.id.clone(),
-            exclude_session_id,
-        }
-        .private(self.id.clone())
-        .await;
-
-        Ok(())
-    }
-
-    /// Disable an account
-    pub async fn disable(&mut self, db: &Database) -> Result<()> {
-        self.disabled = true;
-        self.delete_all_sessions(db, None).await?;
-        self.save(db).await
-    }
-
-    /// Schedule an account for deletion
-    pub async fn schedule_deletion(&mut self, db: &Database) -> Result<()> {
-        self.deletion = Some(DeletionInfo::Scheduled {
-            after: Timestamp::now_utc()
-                .checked_add(Duration::weeks(1))
-                .unwrap(),
-        });
-
-        self.disable(db).await
-    }
-
-    /// Removes all information from the account and marks it as fully deleted
-    pub async fn mark_deleted(&mut self, db: &Database) -> Result<()> {
-        self.email = format!("Deleted User {}", &self.id);
-        self.email_normalised = format!("Deleted User {}", &self.id);
-        self.deletion = Some(DeletionInfo::Deleted);
-
-        self.save(db).await?;
-
-        Ok(())
-    }
-}

crates/core/database/src/models/accounts/ops.rs

@@ -1,34 +0,0 @@
-use revolt_result::Result;
-
-use crate::Account;
-
-#[cfg(feature = "mongodb")]
-mod mongodb;
-mod reference;
-
-#[async_trait]
-pub trait AbstractAccounts: Sync + Send {
-    /// Find account by id
-    async fn fetch_account(&self, id: &str) -> Result<Account>;
-
-    /// Find account by normalised email
-    async fn fetch_account_by_normalised_email(
-        &self,
-        normalised_email: &str,
-    ) -> Result<Option<Account>>;
-
-    /// Find account with active pending email verification
-    async fn fetch_account_with_email_verification(&self, token: &str) -> Result<Account>;
-
-    /// Find account with active password reset
-    async fn fetch_account_with_password_reset(&self, token: &str) -> Result<Account>;
-
-    /// Find account with active deletion token
-    async fn fetch_account_with_deletion_token(&self, token: &str) -> Result<Account>;
-
-    /// Find accounts which are due to be deleted
-    async fn fetch_accounts_due_for_deletion(&self) -> Result<Vec<Account>>;
-
-    // Save account
-    async fn save_account(&self, account: &Account) -> Result<()>;
-}

crates/core/database/src/models/accounts/ops/mongodb.rs

@@ -1,118 +0,0 @@
-use crate::{AbstractAccounts, Account, MongoDb};
-use bson::{to_bson, to_document};
-use iso8601_timestamp::Timestamp;
-use mongodb::options::{Collation, CollationStrength, FindOneOptions, UpdateOptions};
-use revolt_result::Result;
-
-const COL: &str = "accounts";
-
-#[async_trait]
-impl AbstractAccounts for MongoDb {
-    /// Find account by id
-    async fn fetch_account(&self, id: &str) -> Result<Account> {
-        query!(self, find_one_by_id, COL, id)?.ok_or_else(|| create_error!(UnknownUser))
-    }
-
-    /// Find account by normalised email
-    async fn fetch_account_by_normalised_email(
-        &self,
-        normalised_email: &str,
-    ) -> Result<Option<Account>> {
-        query!(
-            self,
-            find_one_with_options,
-            COL,
-            doc! {
-                "email_normalised": normalised_email
-            },
-            FindOneOptions::builder()
-                .collation(
-                    Collation::builder()
-                        .locale("en")
-                        .strength(CollationStrength::Secondary)
-                        .build(),
-                )
-                .build()
-        )
-    }
-
-    /// Find account with active pending email verification
-    async fn fetch_account_with_email_verification(&self, token: &str) -> Result<Account> {
-        query!(
-            self,
-            find_one,
-            COL,
-            doc! {
-                "verification.token": token,
-                "verification.expiry": {
-                    "$gte": to_bson(&Timestamp::now_utc()).unwrap()
-                }
-            }
-        )?
-        .ok_or_else(|| create_error!(InvalidToken))
-    }
-
-    /// Find account with active password reset
-    async fn fetch_account_with_password_reset(&self, token: &str) -> Result<Account> {
-        query!(
-            self,
-            find_one,
-            COL,
-            doc! {
-                "password_reset.token": token,
-                "password_reset.expiry": {
-                    "$gte": to_bson(&Timestamp::now_utc()).unwrap()
-                }
-            }
-        )?
-        .ok_or_else(|| create_error!(InvalidToken))
-    }
-
-    /// Find account with active deletion token
-    async fn fetch_account_with_deletion_token(&self, token: &str) -> Result<Account> {
-        query!(
-            self,
-            find_one,
-            COL,
-            doc! {
-                "deletion.token": token,
-                "deletion.expiry": {
-                    "$gte": to_bson(&Timestamp::now_utc()).unwrap()
-                }
-            }
-        )?
-        .ok_or_else(|| create_error!(InvalidToken))
-    }
-
-    /// Find accounts which are due to be deleted
-    async fn fetch_accounts_due_for_deletion(&self) -> Result<Vec<Account>> {
-        query!(
-            self,
-            find,
-            COL,
-            doc! {
-                "deletion.status": "Scheduled",
-                "deletion.after": {
-                    "$lte": to_bson(&Timestamp::now_utc()).unwrap()
-                }
-            }
-        )
-    }
-
-    // Save account
-    async fn save_account(&self, account: &Account) -> Result<()> {
-        self.col::<Account>(COL)
-            .update_one(
-                doc! {
-                    "_id": &account.id
-                },
-                doc! {
-                    "$set": to_document(account).map_err(|_| create_database_error!("to_document", COL))?
-                },
-            )
-            .with_options(UpdateOptions::builder().upsert(true).build())
-            .await
-            .map_err(|_| create_database_error!("find_one", COL))
-            .map(|_| ())
-    }
-}

crates/core/database/src/models/accounts/ops/reference.rs

@@ -1,99 +0,0 @@
-use crate::{AbstractAccounts, Account, DeletionInfo, EmailVerification, ReferenceDb};
-use iso8601_timestamp::Timestamp;
-use revolt_result::Result;
-
-#[async_trait]
-impl AbstractAccounts for ReferenceDb {
-    /// Find account by id
-    async fn fetch_account(&self, id: &str) -> Result<Account> {
-        let accounts = self.accounts.lock().await;
-        accounts
-            .get(id)
-            .cloned()
-            .ok_or_else(|| create_error!(UnknownUser))
-    }
-
-    /// Find account by normalised email
-    async fn fetch_account_by_normalised_email(
-        &self,
-        normalised_email: &str,
-    ) -> Result<Option<Account>> {
-        let accounts = self.accounts.lock().await;
-        Ok(accounts
-            .values()
-            .find(|account| account.email_normalised == normalised_email)
-            .cloned())
-    }
-
-    /// Find account with active pending email verification
-    async fn fetch_account_with_email_verification(&self, token_to_match: &str) -> Result<Account> {
-        let accounts = self.accounts.lock().await;
-        accounts
-            .values()
-            .find(|account| match &account.verification {
-                EmailVerification::Pending { token, .. }
-                | EmailVerification::Moving { token, .. } => token == token_to_match,
-                _ => false,
-            })
-            .cloned()
-            .ok_or_else(|| create_error!(InvalidToken))
-    }
-
-    /// Find account with active password reset
-    async fn fetch_account_with_password_reset(&self, token: &str) -> Result<Account> {
-        let accounts = self.accounts.lock().await;
-        accounts
-            .values()
-            .find(|account| {
-                if let Some(reset) = &account.password_reset {
-                    reset.token == token
-                } else {
-                    false
-                }
-            })
-            .cloned()
-            .ok_or_else(|| create_error!(InvalidToken))
-    }
-
-    /// Find account with active deletion token
-    async fn fetch_account_with_deletion_token(&self, token_to_match: &str) -> Result<Account> {
-        let accounts = self.accounts.lock().await;
-        accounts
-            .values()
-            .find(|account| {
-                if let Some(DeletionInfo::WaitingForVerification { token, .. }) = &account.deletion
-                {
-                    token == token_to_match
-                } else {
-                    false
-                }
-            })
-            .cloned()
-            .ok_or_else(|| create_error!(InvalidToken))
-    }
-
-    /// Find accounts which are due to be deleted
-    async fn fetch_accounts_due_for_deletion(&self) -> Result<Vec<Account>> {
-        let now = Timestamp::now_utc();
-        let accounts = self.accounts.lock().await;
-
-        Ok(accounts
-            .values()
-            .filter(|account| {
-                if let Some(DeletionInfo::Scheduled { after }) = &account.deletion {
-                    after <= &now
-                } else {
-                    false
-                }
-            })
-            .cloned()
-            .collect())
-    }
-
-    // Save account
-    async fn save_account(&self, account: &Account) -> Result<()> {
-        let mut accounts = self.accounts.lock().await;
-        accounts.insert(account.id.to_string(), account.clone());
-        Ok(())
-    }
-}

crates/core/database/src/models/accounts/rocket.rs

@@ -1,32 +0,0 @@
-use crate::{Account, Database, Session};
-use revolt_result::Error;
-use rocket::{
-    http::Status,
-    request::{FromRequest, Outcome},
-    Request,
-};
-
-#[rocket::async_trait]
-impl<'r> FromRequest<'r> for Account {
-    type Error = Error;
-
-    async fn from_request(request: &'r Request<'_>) -> Outcome<Self, Self::Error> {
-        match request.guard::<Session>().await {
-            Outcome::Success(session) => {
-                if let Ok(account) = request
-                    .rocket()
-                    .state::<Database>()
-                    .expect("`Database`")
-                    .fetch_account(&session.user_id)
-                    .await
-                {
-                    Outcome::Success(account)
-                } else {
-                    Outcome::Error((Status::InternalServerError, create_error!(InternalError)))
-                }
-            }
-            Outcome::Forward(_) => unreachable!(),
-            Outcome::Error(err) => Outcome::Error(err),
-        }
-    }
-}

crates/core/database/src/models/accounts/schema.rs

@@ -1,32 +0,0 @@
-use revolt_okapi::openapi3::{SecurityScheme, SecuritySchemeData};
-use revolt_rocket_okapi::{
-    gen::OpenApiGenerator,
-    request::{OpenApiFromRequest, RequestHeaderInput},
-};
-
-use crate::Account;
-
-
-impl<'r> OpenApiFromRequest<'r> for Account {
-    fn from_request_input(
-        _gen: &mut OpenApiGenerator,
-        _name: String,
-        _required: bool,
-    ) -> revolt_rocket_okapi::Result<RequestHeaderInput> {
-        let mut requirements = schemars::Map::new();
-        requirements.insert("Session Token".to_owned(), vec![]);
-
-        Ok(RequestHeaderInput::Security(
-            "Session Token".to_owned(),
-            SecurityScheme {
-                data: SecuritySchemeData::ApiKey {
-                    name: "x-session-token".to_owned(),
-                    location: "header".to_owned(),
-                },
-                description: Some("Used to authenticate as a user.".to_owned()),
-                extensions: schemars::Map::new(),
-            },
-            requirements,
-        ))
-    }
-}

crates/core/database/src/models/admin_migrations/ops/mongodb/init.rs

@@ -98,18 +98,6 @@ pub async fn create_database(db: &MongoDb) {
         .await
         .expect("Failed to create pubsub collection.");
 
-    db.create_collection("sessions")
-        .await
-        .expect("Failed to create sessions collection.");
-
-    db.create_collection("account_invites")
-        .await
-        .expect("Failed to create account_invites collection.");
-
-    db.create_collection("mfa_tickets")
-        .await
-        .expect("Failed to create mfa_tickets collection.");
-
     db.run_command(doc! {
         "createIndexes": "users",
         "indexes": [
@@ -275,89 +263,5 @@ pub async fn create_database(db: &MongoDb) {
     .await
     .expect("Failed to create ratelimit_events index.");
 
-    db.run_command(doc! {
-        "createIndexes": "accounts",
-        "indexes": [
-            {
-                "key": {
-                    "email": 1
-                },
-                "name": "email",
-                "unique": true,
-                "collation": {
-                    "locale": "en",
-                    "strength": 2
-                }
-            },
-            {
-                "key": {
-                    "email_normalised": 1
-                },
-                "name": "email_normalised",
-                "unique": true,
-                "collation": {
-                    "locale": "en",
-                    "strength": 2
-                }
-            },
-            {
-                "key": {
-                    "verification.token": 1
-                },
-                "name": "email_verification"
-            },
-            {
-                "key": {
-                    "password_reset.token": 1
-                },
-                "name": "password_reset"
-            },
-            {
-                "key": {
-                    "deletion.token": 1
-                },
-                "name": "account_deletion"
-            }
-        ]
-    })
-    .await
-    .unwrap();
-
-    db.run_command(doc! {
-        "createIndexes": "sessions",
-        "indexes": [
-            {
-                "key": {
-                    "token": 1
-                },
-                "name": "token",
-                "unique": true
-            },
-            {
-                "key": {
-                    "user_id": 1
-                },
-                "name": "user_id"
-            }
-        ]
-    })
-    .await
-    .unwrap();
-
-    db.run_command(doc! {
-        "createIndexes": "mfa_tickets",
-        "indexes": [
-            {
-                "key": {
-                    "token": 1
-                },
-                "name": "token",
-                "unique": true
-            }
-        ]
-    })
-    .await
-    .unwrap();
-
     info!("Created database.");
 }

crates/core/database/src/models/admin_migrations/ops/mongodb/scripts.rs

@@ -17,7 +17,6 @@ use iso8601_timestamp::Timestamp;
 use rand::seq::SliceRandom;
 use revolt_permissions::{ChannelPermission, DEFAULT_WEBHOOK_PERMISSIONS};
 use serde::{Deserialize, Serialize};
-use ulid::Ulid;
 use unicode_segmentation::UnicodeSegmentation;
 
 #[derive(Serialize, Deserialize)]
@@ -26,7 +25,7 @@ struct MigrationInfo {
     revision: i32,
 }
 
-pub const LATEST_REVISION: i32 = 51; // MUST BE +1 to last migration
+pub const LATEST_REVISION: i32 = 50; // MUST BE +1 to last migration
 
 pub async fn migrate_database(db: &MongoDb) {
     let migrations = db.col::<Document>("migrations");
@@ -574,145 +573,20 @@ pub async fn run_migrations(db: &MongoDb, revision: i32) -> i32 {
     if revision <= 15 {
         info!("Running migration [revision 15 / 04-06-2022]: Migrate Authifier to latest version.");
 
-        if !db
+        let db = authifier::Database::MongoDb(authifier::database::MongoDb(db.db()));
-            .db()
+        db.run_migration(authifier::Migration::M2022_06_03EnsureUpToSpec)
-            .collection::<Document>("mfa_tickets")
-            .list_index_names()
             .await
-            .unwrap_or_default()
+            .unwrap();
-            .contains(&"token".to_owned())
-        {
-            // Make sure all collections exist
-            let list = db.db().list_collection_names().await.unwrap();
-            let collections = ["accounts", "sessions", "invites", "mfa_tickets"];
-
-            for name in collections {
-                if !list.contains(&name.to_string()) {
-                    db.db().create_collection(name).await.unwrap();
-                }
-            }
-
-            // Setup index for `accounts`
-            let col = db.db().collection::<Document>("accounts");
-            col.drop_indexes().await.unwrap();
-
-            db.db()
-                .run_command(doc! {
-                    "createIndexes": "accounts",
-                    "indexes": [
-                        {
-                            "key": {
-                                "email": 1
-                            },
-                            "name": "email",
-                            "unique": true,
-                            "collation": {
-                                "locale": "en",
-                                "strength": 2
-                            }
-                        },
-                        {
-                            "key": {
-                                "email_normalised": 1
-                            },
-                            "name": "email_normalised",
-                            "unique": true,
-                            "collation": {
-                                "locale": "en",
-                                "strength": 2
-                            }
-                        },
-                        {
-                            "key": {
-                                "verification.token": 1
-                            },
-                            "name": "email_verification"
-                        },
-                        {
-                            "key": {
-                                "password_reset.token": 1
-                            },
-                            "name": "password_reset"
-                        }
-                    ]
-                })
-                .await
-                .unwrap();
-
-            // Setup index for `sessions`
-            let col = db.db().collection::<Document>("sessions");
-            col.drop_indexes().await.unwrap();
-
-            db.db()
-                .run_command(doc! {
-                    "createIndexes": "sessions",
-                    "indexes": [
-                        {
-                            "key": {
-                                "token": 1
-                            },
-                            "name": "token",
-                            "unique": true
-                        },
-                        {
-                            "key": {
-                                "user_id": 1
-                            },
-                            "name": "user_id"
-                        }
-                    ]
-                })
-                .await
-                .unwrap();
-
-            // Setup index for `mfa_tickets`
-            let col = db.db().collection::<Document>("mfa_tickets");
-            col.drop_indexes().await.unwrap();
-
-            db.db()
-                .run_command(doc! {
-                    "createIndexes": "mfa_tickets",
-                    "indexes": [
-                        {
-                            "key": {
-                                "token": 1
-                            },
-                            "name": "token",
-                            "unique": true
-                        }
-                    ]
-                })
-                .await
-                .unwrap();
-        }
     }
 
     if revision <= 16 {
         info!("Running migration [revision 16 / 07-07-2022]: Add `emojis` collection and Authifier migration.");
 
-        if !db
+        let authifier_db = authifier::Database::MongoDb(authifier::database::MongoDb(db.db()));
-            .db()
+        authifier_db
-            .collection::<Document>("accounts")
+            .run_migration(authifier::Migration::M2022_06_09AddIndexForDeletion)
-            .list_index_names()
             .await
-            .expect("list of index names")
+            .unwrap();
-            .contains(&"account_deletion".to_owned())
-        {
-            db.db()
-                .run_command(doc! {
-                    "createIndexes": "accounts",
-                    "indexes": [
-                        {
-                            "key": {
-                                "deletion.token": 1
-                            },
-                            "name": "account_deletion"
-                        }
-                    ]
-                })
-                .await
-                .unwrap();
-        }
 
         db.db()
             .create_collection("emojis")
@@ -1211,7 +1085,7 @@ pub async fn run_migrations(db: &MongoDb, revision: i32) -> i32 {
         enum Channel {
             Group { owner: String },
             TextChannel { server: String },
-            VoiceChannel { server: String },
+            VoiceChannel { server: String }
         }
 
         let webhooks = db
@@ -1225,12 +1099,7 @@ pub async fn run_migrations(db: &MongoDb, revision: i32) -> i32 {
             .await;
 
         for webhook in webhooks {
-            match db
+            match db.col::<Channel>("channels").find_one(doc! { "_id": &webhook.channel_id }).await.unwrap() {
-                .col::<Channel>("channels")
-                .find_one(doc! { "_id": &webhook.channel_id })
-                .await
-                .unwrap()
-            {
                 Some(channel) => {
                     let creator_id = match channel {
                         Channel::Group { owner, .. } => owner,
@@ -1272,51 +1141,10 @@ pub async fn run_migrations(db: &MongoDb, revision: i32) -> i32 {
             "Running migration [revision 32 / 12-05-2025]: (Authifier) Add last_seen to sessions."
         );
 
-        loop {
+        let db = authifier::Database::MongoDb(authifier::database::MongoDb(db.db()));
-            #[derive(Deserialize)]
+        db.run_migration(authifier::Migration::M2025_02_20AddLastSeenToSession)
-            struct SessionId {
+            .await
-                _id: String,
+            .unwrap();
-            }
-
-            let sessions: Vec<SessionId> = db
-                .db()
-                .collection("sessions")
-                .find(doc! {
-                    "$or": [
-                        { "last_seen": { "$exists": false } },
-                        { "last_seen": "1970-01-01T00:00:00.000Z" }
-                    ]
-                })
-                .limit(50_000) // about 400 batches for 2 million
-                .await
-                .expect("Failed to create cursor for sessions!")
-                .map(|doc| doc.expect("id and username"))
-                .collect()
-                .await;
-
-            if sessions.is_empty() {
-                break;
-            }
-
-            for session in sessions {
-                let timestamp = iso8601_timestamp::Timestamp::from(Ulid::from_string(&session._id).unwrap().datetime());
-
-                db.db()
-                    .collection::<Document>("sessions")
-                    .update_one(
-                        doc! {
-                            "_id": &session._id.to_string(),
-                        },
-                        doc! {
-                            "$set": {
-                                "last_seen": timestamp.format().to_string()
-                            }
-                        },
-                    )
-                    .await
-                    .expect("Failed to update a session.");
-            }
-        }
     }
 
     if revision <= 40 {
@@ -1412,7 +1240,7 @@ pub async fn run_migrations(db: &MongoDb, revision: i32) -> i32 {
                         "channel_type": "TextChannel",
                         "voice": {}
                     }
-                },
+                }
             )
             .await
             .expect("Failed to update voice channels");
@@ -1464,7 +1292,10 @@ pub async fn run_migrations(db: &MongoDb, revision: i32) -> i32 {
             let mut doc = doc! {};
 
             for id in server.roles.keys() {
-                doc.insert(format!("roles.{id}._id"), id);
+                doc.insert(
+                    format!("roles.{id}._id"),
+                    id,
+                );
             }
 
             db.db()
@@ -1475,21 +1306,6 @@ pub async fn run_migrations(db: &MongoDb, revision: i32) -> i32 {
         }
     };
 
-    if revision <= 50 {
-        info!("Running migration [revision 50 / 13-04-2026]: Rename invites collection to account_invites");
-
-        db.db()
-            .client()
-            .database("admin")
-            .run_command(doc! {
-                "renameCollection": "revolt.invites",
-                "to": "revolt.account_invites",
-                "dropTarget": true
-            })
-            .await
-            .unwrap();
-    }
-
     // Reminder to update LATEST_REVISION when adding new migrations.
     LATEST_REVISION.max(revision)
 }

crates/core/database/src/models/channels/model.rs

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

crates/core/database/src/models/channels/ops.rs

@@ -1,4 +1,4 @@
-use crate::{Channel, FieldsChannel, PartialChannel, revolt_result::Result, util::ChunkedDatabaseGenerator};
+use crate::{revolt_result::Result, Channel, FieldsChannel, PartialChannel};
 use revolt_permissions::OverrideField;
 
 #[cfg(feature = "mongodb")]
@@ -19,9 +19,6 @@ pub trait AbstractChannels: Sync + Send {
     /// Fetch all direct messages for a user
     async fn find_direct_messages(&self, user_id: &str) -> Result<Vec<Channel>>;
 
-    // Fetch all group dms for a user
-    async fn find_group_message_channels(&self, user_id: &str) -> Result<ChunkedDatabaseGenerator<Channel>>;
-
     // Fetch saved messages channel
     async fn find_saved_messages_channel(&self, user_id: &str) -> Result<Channel>;
 
@@ -50,9 +47,6 @@ pub trait AbstractChannels: Sync + Send {
     // Remove a user from a group
     async fn remove_user_from_group(&self, channel_id: &str, user_id: &str) -> Result<()>;
 
-    // Remove a user from all specified groups
-    async fn remove_user_from_groups(&self, channel_ids: Vec<String>, user_id: &str) -> Result<()>;
-
     // Delete a channel
     async fn delete_channel(&self, channel_id: &Channel) -> Result<()>;
 }

crates/core/database/src/models/channels/ops/mongodb.rs

@@ -1,8 +1,7 @@
 use super::AbstractChannels;
-use crate::{AbstractServers, Channel, FieldsChannel, IntoDocumentPath, MongoDb, PartialChannel, util::ChunkedDatabaseGenerator};
+use crate::{AbstractServers, Channel, FieldsChannel, IntoDocumentPath, MongoDb, PartialChannel};
 use bson::{Bson, Document};
 use futures::StreamExt;
-use mongodb::options::ReadConcern;
 use revolt_permissions::OverrideField;
 use revolt_result::Result;
 
@@ -70,32 +69,6 @@ impl AbstractChannels for MongoDb {
         )
     }
 
-    // Fetch all group dms for a user
-    async fn find_group_message_channels(&self, user_id: &str) -> Result<ChunkedDatabaseGenerator<Channel>> {
-        let mut session = self
-            .start_session()
-            .await
-            .map_err(|_| create_database_error!("start_session", COL))?;
-
-        session
-            .start_transaction()
-            .read_concern(ReadConcern::snapshot())
-            .await
-            .map_err(|_| create_database_error!("start_transaction", COL))?;
-
-        let cursor = self.col(COL)
-            .find(doc! {
-                "channel_type": "Group",
-                "recipients": user_id
-            })
-            .session(&mut session)
-            .batch_size(100)
-            .await
-            .map_err(|_| create_database_error!("find", COL))?;
-
-        Ok(ChunkedDatabaseGenerator::new_mongo(session, cursor))
-    }
-
     // Fetch saved messages channel
     async fn find_saved_messages_channel(&self, user_id: &str) -> Result<Channel> {
         query!(
@@ -207,29 +180,13 @@ impl AbstractChannels for MongoDb {
             .map_err(|_| create_database_error!("update_one", "channels"))
     }
 
-    // Remove a user from all specified groups
-    async fn remove_user_from_groups(&self, channel_ids: Vec<String>, user_id: &str) -> Result<()> {
-        self.col::<Document>(COL)
-            .update_many(
-                doc! {
-                    "_id": { "$in": channel_ids },
-                },
-                doc! {
-                    "$pull": {
-                        "recipients": user_id
-                    }
-                },
-            )
-            .await
-            .map(|_| ())
-            .map_err(|_| create_database_error!("update_many", COL))
-    }
-
     // Delete a channel
     async fn delete_channel(&self, channel: &Channel) -> Result<()> {
         let id = channel.id().to_string();
         let server_id = match channel {
-            Channel::TextChannel { server, .. } => Some(server),
+            Channel::TextChannel { server, .. } => {
+                Some(server)
+            }
             _ => None,
         };
 

crates/core/database/src/models/channels/ops/reference.rs

@@ -2,7 +2,6 @@ use std::collections::hash_map::Entry;
 
 use super::AbstractChannels;
 use crate::ReferenceDb;
-use crate::util::ChunkedDatabaseGenerator;
 use crate::{Channel, FieldsChannel, PartialChannel};
 use revolt_permissions::OverrideField;
 use revolt_result::Result;
@@ -52,23 +51,6 @@ impl AbstractChannels for ReferenceDb {
             .collect())
     }
 
-    // Fetch all group dms for a user
-    async fn find_group_message_channels(&self, user_id: &str) -> Result<ChunkedDatabaseGenerator<Channel>> {
-        let channels = self.channels.lock().await;
-        let groups = channels
-            .values()
-            .filter(|channel| match channel {
-                Channel::Group { recipients, .. } => {
-                    recipients.iter().any(|recipient| recipient == user_id)
-                }
-                _ => false,
-            })
-            .cloned()
-            .collect();
-
-        Ok(ChunkedDatabaseGenerator::new_reference(groups))
-    }
-
     // Fetch saved messages channel
     async fn find_saved_messages_channel(&self, user_id: &str) -> Result<Channel> {
         let channels = self.channels.lock().await;
@@ -149,9 +131,9 @@ impl AbstractChannels for ReferenceDb {
     // Remove a user from a group
     async fn remove_user_from_group(&self, channel: &str, user: &str) -> Result<()> {
         let mut channels = self.channels.lock().await;
-        if let Some(Channel::Group { recipients, .. }) = channels.get_mut(channel) {
+        if let Some(channel_data) = channels.get_mut(channel) {
-            if let Some(index) = recipients.iter().position(|recipient| recipient == user) {
+            if channel_data.users()?.contains(&String::from(user)) {
-                recipients.remove(index);
+                channel_data.users()?.retain(|x| x != user);
                 return Ok(());
             } else {
                 return Err(create_error!(NotFound));
@@ -160,19 +142,6 @@ impl AbstractChannels for ReferenceDb {
         Err(create_error!(NotFound))
     }
 
-    // Remove a user from all specified groups
-    async fn remove_user_from_groups(&self, channel_ids: Vec<String>, user_id: &str) -> Result<()> {
-        let mut channels = self.channels.lock().await;
-
-        for channel_id in channel_ids {
-            if let Some(Channel::Group { recipients, .. }) = channels.get_mut(&channel_id) {
-                recipients.retain(|recipient| recipient != user_id);
-            }
-        };
-
-        Ok(())
-    }
-
     // Delete a channel
     async fn delete_channel(&self, channel: &Channel) -> Result<()> {
         let mut channels = self.channels.lock().await;

crates/core/database/src/models/emojis/model.rs

@@ -12,7 +12,7 @@ use crate::Database;
 static PERMISSIBLE_EMOJIS: Lazy<HashSet<String>> = Lazy::new(|| {
     include_str!("unicode_emoji.txt")
         .split('\n')
-        .map(|x| x.replace('\u{FE0F}', ""))
+        .map(|x| x.into())
         .collect()
 });
 
@@ -108,8 +108,7 @@ impl Emoji {
             db.fetch_emoji(emoji).await?;
             Ok(true)
         } else {
-            let sanitized_emoji = emoji.replace('\u{FE0F}', "");
+            Ok(PERMISSIBLE_EMOJIS.contains(emoji))
-            Ok(PERMISSIBLE_EMOJIS.contains(&sanitized_emoji))
         }
     }
 }

crates/core/database/src/models/emojis/unicode_emoji.txt

@@ -1,3 +1,4 @@
+
 *️⃣
 0️⃣
 1️⃣
@@ -241,7 +242,6 @@
 🆘
 🆙
 🆚
-🇦
 🇦🇨
 🇦🇩
 🇦🇪
@@ -259,7 +259,6 @@
 🇦🇼
 🇦🇽
 🇦🇿
-🇧
 🇧🇦
 🇧🇧
 🇧🇩
@@ -281,7 +280,6 @@
 🇧🇼
 🇧🇾
 🇧🇿
-🇨
 🇨🇦
 🇨🇨
 🇨🇩
@@ -303,7 +301,6 @@
 🇨🇽
 🇨🇾
 🇨🇿
-🇩
 🇩🇪
 🇩🇬
 🇩🇯
@@ -311,7 +308,6 @@
 🇩🇲
 🇩🇴
 🇩🇿
-🇪
 🇪🇦
 🇪🇨
 🇪🇪
@@ -321,14 +317,12 @@
 🇪🇸
 🇪🇹
 🇪🇺
-🇫
 🇫🇮
 🇫🇯
 🇫🇰
 🇫🇲
 🇫🇴
 🇫🇷
-🇬
 🇬🇦
 🇬🇧
 🇬🇩
@@ -348,14 +342,12 @@
 🇬🇺
 🇬🇼
 🇬🇾
-🇭
 🇭🇰
 🇭🇲
 🇭🇳
 🇭🇷
 🇭🇹
 🇭🇺
-🇮
 🇮🇨
 🇮🇩
 🇮🇪
@@ -367,12 +359,10 @@
 🇮🇷
 🇮🇸
 🇮🇹
-🇯
 🇯🇪
 🇯🇲
 🇯🇴
 🇯🇵
-🇰
 🇰🇪
 🇰🇬
 🇰🇭
@@ -384,7 +374,6 @@
 🇰🇼
 🇰🇾
 🇰🇿
-🇱
 🇱🇦
 🇱🇧
 🇱🇨
@@ -396,7 +385,6 @@
 🇱🇺
 🇱🇻
 🇱🇾
-🇲
 🇲🇦
 🇲🇨
 🇲🇩
@@ -420,7 +408,6 @@
 🇲🇽
 🇲🇾
 🇲🇿
-🇳
 🇳🇦
 🇳🇨
 🇳🇪
@@ -433,9 +420,7 @@
 🇳🇷
 🇳🇺
 🇳🇿
-🇴
 🇴🇲
-🇵
 🇵🇦
 🇵🇪
 🇵🇫
@@ -450,15 +435,12 @@
 🇵🇹
 🇵🇼
 🇵🇾
-🇶
 🇶🇦
-🇷
 🇷🇪
 🇷🇴
 🇷🇸
 🇷🇺
 🇷🇼
-🇸
 🇸🇦
 🇸🇧
 🇸🇨
@@ -480,7 +462,6 @@
 🇸🇽
 🇸🇾
 🇸🇿
-🇹
 🇹🇦
 🇹🇨
 🇹🇩
@@ -498,7 +479,6 @@
 🇹🇻
 🇹🇼
 🇹🇿
-🇺
 🇺🇦
 🇺🇬
 🇺🇲
@@ -506,7 +486,6 @@
 🇺🇸
 🇺🇾
 🇺🇿
-🇻
 🇻🇦
 🇻🇨
 🇻🇪
@@ -514,15 +493,11 @@
 🇻🇮
 🇻🇳
 🇻🇺
-🇼
 🇼🇫
 🇼🇸
-🇽
 🇽🇰
-🇾
 🇾🇪
 🇾🇹
-🇿
 🇿🇦
 🇿🇲
 🇿🇼

crates/core/database/src/models/messages/ops.rs

@@ -50,6 +50,4 @@ pub trait AbstractMessages: Sync + Send {
         author: &str,
         since: SystemTime
     ) -> Result<HashMap<String, Vec<String>>>;
-
-    async fn delete_messages_by_user(&self, user_id: &str) -> Result<()>;
 }

crates/core/database/src/models/messages/ops/mongodb.rs

@@ -416,12 +416,6 @@ impl AbstractMessages for MongoDb {
 
         Ok(deleted_messages)
     }
-
-    async fn delete_messages_by_user(&self, user_id: &str) -> Result<()> {
-        self.delete_bulk_messages(doc! {
-            "author": user_id,
-        }).await
-    }
 }
 
 impl IntoDocumentPath for FieldsMessage {

crates/core/database/src/models/messages/ops/reference.rs

@@ -1,13 +1,10 @@
-use crate::{
+use std::collections::HashMap;
-    AppendMessage, FieldsMessage, Message, MessageQuery,
-    PartialMessage, ReferenceDb,
-};
 use futures::future::try_join_all;
 use indexmap::IndexSet;
 use revolt_result::Result;
-use std::collections::HashMap;
 use std::time::SystemTime;
 use ulid::Ulid;
+use crate::{AppendMessage, FieldsMessage, Message, MessageQuery, PartialMessage, ReferenceDb};
 
 use super::AbstractMessages;
 
@@ -63,7 +60,7 @@ impl AbstractMessages for ReferenceDb {
 
                 if let Some(pinned) = query.filter.pinned {
                     if message.pinned.unwrap_or_default() == pinned {
-                        return false;
+                        return false
                     }
                 }
 
@@ -194,12 +191,7 @@ impl AbstractMessages for ReferenceDb {
     }
 
     /// Update a given message with new information
-    async fn update_message(
+    async fn update_message(&self, id: &str, message: &PartialMessage, remove: Vec<FieldsMessage>) -> Result<()> {
-        &self,
-        id: &str,
-        message: &PartialMessage,
-        remove: Vec<FieldsMessage>,
-    ) -> Result<()> {
         let mut messages = self.messages.lock().await;
         if let Some(message_data) = messages.get_mut(id) {
             message_data.apply_options(message.to_owned());
@@ -302,7 +294,7 @@ impl AbstractMessages for ReferenceDb {
         &self,
         channels: &[String],
         author: &str,
-        since: SystemTime,
+        since: SystemTime
     ) -> Result<HashMap<String, Vec<String>>> {
         let threshold_ulid = Ulid::from_datetime(since).to_string();
         let mut deleted_messages: HashMap<String, Vec<String>> = HashMap::new();
@@ -343,23 +335,16 @@ impl AbstractMessages for ReferenceDb {
         }
 
         // Delete the messages
-        self.messages.lock().await.retain(|id, message| {
+        self.messages
-            let should_keep = !(message.author == author
+            .lock()
-                && channels.contains(&message.channel)
+            .await
-                && id.as_str() >= threshold_ulid.as_str());
+            .retain(|id, message| {
-            should_keep
+                let should_keep = !(message.author == author
-        });
+                    && channels.contains(&message.channel)
+                    && id.as_str() >= threshold_ulid.as_str());
+                should_keep
+            });
 
         Ok(deleted_messages)
     }
-
-    async fn delete_messages_by_user(&self, user_id: &str) -> Result<()> {
-        let mut messages = self.messages.lock().await;
-
-        messages.retain(|_, message| message.author != user_id);
-
-        // TODO: remove attachments as well
-
-        Ok(())
-    }
 }

crates/core/database/src/models/mfa_tickets/axum.rs

@@ -1,67 +0,0 @@
-use axum::{
-    extract::{FromRef, FromRequestParts},
-    http::request::Parts,
-};
-
-use revolt_result::{Error, Result};
-
-use crate::{Database, MFATicket, UnvalidatedTicket, ValidatedTicket};
-
-#[async_trait]
-impl<S> FromRequestParts<S> for MFATicket
-where
-    Database: FromRef<S>,
-    S: Send + Sync,
-{
-    type Rejection = Error;
-
-    async fn from_request_parts(parts: &mut Parts, state: &S) -> Result<Self> {
-        let db = Database::from_ref(state);
-
-        if let Some(Ok(token)) = parts.headers.get("x-mfa-ticket").map(|v| v.to_str()) {
-            db.fetch_ticket_by_token(token).await
-        } else {
-            Err(create_error!(MissingHeaders))
-        }
-    }
-}
-
-#[async_trait]
-impl<S> FromRequestParts<S> for ValidatedTicket
-where
-    Database: FromRef<S>,
-    S: Send + Sync,
-{
-    type Rejection = Error;
-
-    async fn from_request_parts(parts: &mut Parts, state: &S) -> Result<Self> {
-        let db = Database::from_ref(state);
-
-        let ticket = MFATicket::from_request_parts(parts, state).await?;
-
-        if ticket.validated && ticket.claim(&db).await.is_ok() {
-            Ok(ValidatedTicket(ticket))
-        } else {
-            Err(create_error!(InvalidToken))
-        }
-    }
-}
-
-#[async_trait]
-impl<S> FromRequestParts<S> for UnvalidatedTicket
-where
-    Database: FromRef<S>,
-    S: Send + Sync,
-{
-    type Rejection = Error;
-
-    async fn from_request_parts(parts: &mut Parts, state: &S) -> Result<Self> {
-        let ticket = MFATicket::from_request_parts(parts, state).await?;
-
-        if !ticket.validated {
-            Ok(UnvalidatedTicket(ticket))
-        } else {
-            Err(create_error!(InvalidToken))
-        }
-    }
-}

crates/core/database/src/models/mfa_tickets/mod.rs

@@ -1,11 +0,0 @@
-#[cfg(feature = "axum-impl")]
-mod axum;
-mod model;
-mod ops;
-#[cfg(feature = "rocket-impl")]
-mod rocket;
-#[cfg(feature = "rocket-impl")]
-mod schema;
-
-pub use model::*;
-pub use ops::*;

crates/core/database/src/models/mfa_tickets/model.rs

@@ -1,105 +0,0 @@
-use iso8601_timestamp::{Duration, Timestamp};
-use std::ops::Deref;
-
-use nanoid::nanoid;
-use revolt_result::Result;
-
-use crate::{Database, MultiFactorAuthentication};
-
-auto_derived_partial!(
-    /// Multi-factor auth ticket
-    pub struct MFATicket {
-        /// Unique Id
-        #[serde(rename = "_id")]
-        pub id: String,
-
-        /// Account Id
-        pub account_id: String,
-
-        /// Unique Token
-        pub token: String,
-
-        /// Whether this ticket has been validated
-        /// (can be used for account actions)
-        pub validated: bool,
-
-        /// Whether this ticket is authorised
-        /// (can be used to log a user in)
-        pub authorised: bool,
-
-        /// TOTP code at time of ticket creation
-        pub last_totp_code: Option<String>,
-    },
-    "PartialMFATicket"
-);
-
-/// Ticket which is guaranteed to be valid for use
-///
-/// If used in a Rocket guard, it will be consumed on match
-#[derive(Debug, Serialize, Deserialize)]
-pub struct ValidatedTicket(pub MFATicket);
-
-/// Ticket which is guaranteed to not be valid for use
-#[derive(Debug, Serialize, Deserialize)]
-pub struct UnvalidatedTicket(pub MFATicket);
-
-impl MFATicket {
-    /// Create a new MFA ticket
-    pub fn new(account_id: String, validated: bool) -> MFATicket {
-        MFATicket {
-            id: ulid::Ulid::new().to_string(),
-            account_id,
-            token: nanoid!(64),
-            validated,
-            authorised: false,
-            last_totp_code: None,
-        }
-    }
-
-    /// Populate an MFA ticket with valid MFA codes
-    pub async fn populate(&mut self, mfa: &MultiFactorAuthentication) {
-        self.last_totp_code = mfa.totp_token.generate_code().ok();
-    }
-
-    /// Save model
-    pub async fn save(&self, db: &Database) -> Result<()> {
-        db.save_ticket(self).await
-    }
-
-    /// Check if this MFA ticket has expired
-    pub fn is_expired(&self) -> bool {
-        let now = Timestamp::now_utc();
-
-        let datetime: Timestamp = ulid::Ulid::from_string(&self.id)
-            .expect("Valid `ulid`")
-            .datetime()
-            .into();
-
-        now > (datetime.checked_add(Duration::minutes(5)).unwrap())
-    }
-
-    /// Claim and remove this MFA ticket
-    pub async fn claim(&self, db: &Database) -> Result<()> {
-        if self.is_expired() {
-            return Err(create_error!(InvalidToken));
-        }
-
-        db.delete_ticket(&self.id).await
-    }
-}
-
-impl Deref for ValidatedTicket {
-    type Target = MFATicket;
-
-    fn deref(&self) -> &Self::Target {
-        &self.0
-    }
-}
-
-impl Deref for UnvalidatedTicket {
-    type Target = MFATicket;
-
-    fn deref(&self) -> &Self::Target {
-        &self.0
-    }
-}

crates/core/database/src/models/mfa_tickets/ops.rs

@@ -1,22 +0,0 @@
-use revolt_result::Result;
-
-use crate::MFATicket;
-
-#[cfg(feature = "mongodb")]
-mod mongodb;
-mod reference;
-
-#[async_trait]
-pub trait AbstractMFATickets: Sync + Send {
-    /// Find ticket by token
-    async fn fetch_ticket_by_token(&self, token: &str) -> Result<MFATicket>;
-
-    /// Save ticket
-    async fn save_ticket(&self, ticket: &MFATicket) -> Result<()>;
-
-    /// Delete ticket
-    async fn delete_ticket(&self, id: &str) -> Result<()>;
-
-    /// Delete all expired tickets
-    async fn delete_expired_tickets(&self) -> Result<usize>;
-}

crates/core/database/src/models/mfa_tickets/ops/mongodb.rs

@@ -1,67 +0,0 @@
-use std::time::{Duration, SystemTime};
-
-use crate::{AbstractMFATickets, MFATicket, MongoDb};
-use bson::{to_document, Document};
-use iso8601_timestamp::Timestamp;
-use mongodb::options::UpdateOptions;
-use revolt_result::Result;
-use ulid::Ulid;
-
-const COL: &str = "mfa_tickets";
-
-#[async_trait]
-impl AbstractMFATickets for MongoDb {
-    /// Find ticket by token
-    ///
-    /// Ticket is only valid for 5 minute
-    async fn fetch_ticket_by_token(&self, token: &str) -> Result<MFATicket> {
-        let ticket: MFATicket = query!(self, find_one, COL, doc! { "token": token })?
-            .ok_or_else(|| create_error!(InvalidToken))?;
-
-        if let Ok(ulid) = Ulid::from_string(&ticket.id) {
-            if Timestamp::from(ulid.datetime() + Duration::from_mins(5)) > Timestamp::now_utc() {
-                Ok(ticket)
-            } else {
-                Err(create_error!(InvalidToken))
-            }
-        } else {
-            Err(create_error!(InvalidToken))
-        }
-    }
-
-    /// Save ticket
-    async fn save_ticket(&self, ticket: &MFATicket) -> Result<()> {
-        self.col::<MFATicket>(COL)
-            .update_one(
-                doc! {
-                    "_id": &ticket.id
-                },
-                doc! {
-                    "$set": to_document(ticket).map_err(|_| create_database_error!("to_document", COL))?,
-                },
-            )
-            .with_options(UpdateOptions::builder().upsert(true).build())
-            .await
-            .map_err(|_| create_database_error!("upsert_one", COL))
-            .map(|_| ())
-    }
-
-    /// Delete ticket
-    async fn delete_ticket(&self, id: &str) -> Result<()> {
-        query!(self, delete_one_by_id, COL, id).map(|_| ())
-    }
-
-    /// Delete all expired tickets
-    async fn delete_expired_tickets(&self) -> Result<usize> {
-        let threshhold =
-            Ulid::from_datetime(SystemTime::now() - Duration::from_mins(5)).to_string();
-
-        self.col::<Document>(COL)
-            .delete_many(doc! {
-                "_id": { "$lt": threshhold }
-            })
-            .await
-            .map_err(|_| create_database_error!("delete_many", COL))
-            .map(|result| result.deleted_count as usize)
-    }
-}

crates/core/database/src/models/mfa_tickets/ops/reference.rs

@@ -1,57 +0,0 @@
-use std::time::{Duration, SystemTime};
-
-use crate::{AbstractMFATickets, MFATicket, ReferenceDb};
-use iso8601_timestamp::Timestamp;
-use revolt_result::Result;
-use ulid::Ulid;
-
-#[async_trait]
-impl AbstractMFATickets for ReferenceDb {
-    /// Find ticket by token
-    async fn fetch_ticket_by_token(&self, token: &str) -> Result<MFATicket> {
-        let tickets = self.tickets.lock().await;
-        let ticket = tickets
-            .values()
-            .find(|ticket| ticket.token == token)
-            .ok_or_else(|| create_error!(InvalidToken))?;
-
-        if let Ok(ulid) = Ulid::from_string(&ticket.id) {
-            if Timestamp::from(ulid.datetime() + Duration::from_mins(5)) > Timestamp::now_utc() {
-                Ok(ticket.clone())
-            } else {
-                Err(create_error!(InvalidToken))
-            }
-        } else {
-            Err(create_error!(InvalidToken))
-        }
-    }
-
-    /// Save ticket
-    async fn save_ticket(&self, ticket: &MFATicket) -> Result<()> {
-        let mut tickets = self.tickets.lock().await;
-        tickets.insert(ticket.id.to_string(), ticket.clone());
-        Ok(())
-    }
-
-    /// Delete ticket
-    async fn delete_ticket(&self, id: &str) -> Result<()> {
-        let mut tickets = self.tickets.lock().await;
-        if tickets.remove(id).is_some() {
-            Ok(())
-        } else {
-            Err(create_error!(InvalidToken))
-        }
-    }
-
-    /// Delete all expired tickets
-    async fn delete_expired_tickets(&self) -> Result<usize> {
-        let threshhold =
-            Ulid::from_datetime(SystemTime::now() - Duration::from_mins(5)).to_string();
-        let mut tickets = self.tickets.lock().await;
-
-        let before = tickets.len();
-        tickets.retain(|_, ticket| ticket.id >= threshhold);
-
-        Ok(before - tickets.len())
-    }
-}

crates/core/database/src/models/mfa_tickets/rocket.rs

@@ -1,81 +0,0 @@
-use crate::{Database, MFATicket, UnvalidatedTicket, ValidatedTicket};
-use revolt_result::Error;
-use rocket::{
-    http::Status,
-    outcome::Outcome,
-    request::{self, FromRequest},
-    Request,
-};
-
-#[rocket::async_trait]
-impl<'r> FromRequest<'r> for MFATicket {
-    type Error = Error;
-
-    #[allow(clippy::collapsible_match)]
-    async fn from_request(request: &'r Request<'_>) -> request::Outcome<Self, Self::Error> {
-        if let Some(header_mfa_ticket) = request.headers().get("x-mfa-ticket").next() {
-            if let Ok(ticket) = request
-                .rocket()
-                .state::<Database>()
-                .expect("`Database`")
-                .fetch_ticket_by_token(header_mfa_ticket)
-                .await
-            {
-                Outcome::Success(ticket)
-            } else {
-                Outcome::Error((Status::Unauthorized, create_error!(InvalidToken)))
-            }
-        } else {
-            Outcome::Error((Status::Unauthorized, create_error!(MissingHeaders)))
-        }
-    }
-}
-
-#[rocket::async_trait]
-impl<'r> FromRequest<'r> for ValidatedTicket {
-    type Error = Error;
-
-    #[allow(clippy::collapsible_match)]
-    async fn from_request(request: &'r Request<'_>) -> request::Outcome<Self, Self::Error> {
-        match request.guard::<MFATicket>().await {
-            Outcome::Success(ticket) => {
-                if ticket.validated {
-                    let db = request
-                        .rocket()
-                        .state::<Database>()
-                        .expect("`Database`");
-
-                    if ticket.claim(db).await.is_ok() {
-                        Outcome::Success(ValidatedTicket(ticket))
-                    } else {
-                        Outcome::Error((Status::Forbidden, create_error!(InvalidToken)))
-                    }
-                } else {
-                    Outcome::Forward(Status::Unauthorized)
-                }
-            }
-            Outcome::Forward(f) => Outcome::Forward(f),
-            Outcome::Error(err) => Outcome::Error(err),
-        }
-    }
-}
-
-#[rocket::async_trait]
-impl<'r> FromRequest<'r> for UnvalidatedTicket {
-    type Error = Error;
-
-    #[allow(clippy::collapsible_match)]
-    async fn from_request(request: &'r Request<'_>) -> request::Outcome<Self, Self::Error> {
-        match request.guard::<MFATicket>().await {
-            Outcome::Success(ticket) => {
-                if !ticket.validated {
-                    Outcome::Success(UnvalidatedTicket(ticket))
-                } else {
-                    Outcome::Error((Status::Forbidden, create_error!(InvalidToken)))
-                }
-            }
-            Outcome::Forward(f) => Outcome::Forward(f),
-            Outcome::Error(err) => Outcome::Error(err),
-        }
-    }
-}

crates/core/database/src/models/mfa_tickets/schema.rs

@@ -1,80 +0,0 @@
-use revolt_okapi::openapi3::{SecurityScheme, SecuritySchemeData};
-use revolt_rocket_okapi::{
-    gen::OpenApiGenerator,
-    request::{OpenApiFromRequest, RequestHeaderInput},
-};
-
-use crate::{MFATicket, ValidatedTicket, UnvalidatedTicket};
-
-
-impl<'r> OpenApiFromRequest<'r> for MFATicket {
-    fn from_request_input(
-        _gen: &mut OpenApiGenerator,
-        _name: String,
-        _required: bool,
-    ) -> revolt_rocket_okapi::Result<RequestHeaderInput> {
-        let mut requirements = schemars::Map::new();
-        requirements.insert("MFA Ticket".to_owned(), vec![]);
-
-        Ok(RequestHeaderInput::Security(
-            "MFA Ticket".to_owned(),
-            SecurityScheme {
-                data: SecuritySchemeData::ApiKey {
-                    name: "x-mfa-ticket".to_owned(),
-                    location: "header".to_owned(),
-                },
-                description: Some("Used to authorise a request.".to_owned()),
-                extensions: schemars::Map::new(),
-            },
-            requirements,
-        ))
-    }
-}
-
-impl<'r> OpenApiFromRequest<'r> for ValidatedTicket {
-    fn from_request_input(
-        _gen: &mut OpenApiGenerator,
-        _name: String,
-        _required: bool,
-    ) -> revolt_rocket_okapi::Result<RequestHeaderInput> {
-        let mut requirements = schemars::Map::new();
-        requirements.insert("Valid MFA Ticket".to_owned(), vec![]);
-
-        Ok(RequestHeaderInput::Security(
-            "Valid MFA Ticket".to_owned(),
-            SecurityScheme {
-                data: SecuritySchemeData::ApiKey {
-                    name: "x-mfa-ticket".to_owned(),
-                    location: "header".to_owned(),
-                },
-                description: Some("Used to authorise a request.".to_owned()),
-                extensions: schemars::Map::new(),
-            },
-            requirements,
-        ))
-    }
-}
-
-impl<'r> OpenApiFromRequest<'r> for UnvalidatedTicket {
-    fn from_request_input(
-        _gen: &mut OpenApiGenerator,
-        _name: String,
-        _required: bool,
-    ) -> revolt_rocket_okapi::Result<RequestHeaderInput> {
-        let mut requirements = schemars::Map::new();
-        requirements.insert("Unvalidated MFA Ticket".to_owned(), vec![]);
-
-        Ok(RequestHeaderInput::Security(
-            "Unvalidated MFA Ticket".to_owned(),
-            SecurityScheme {
-                data: SecuritySchemeData::ApiKey {
-                    name: "x-mfa-ticket".to_owned(),
-                    location: "header".to_owned(),
-                },
-                description: Some("Used to authorise a request.".to_owned()),
-                extensions: schemars::Map::new(),
-            },
-            requirements,
-        ))
-    }
-}

crates/core/database/src/models/mod.rs

@@ -17,10 +17,6 @@ mod server_members;
 mod servers;
 mod user_settings;
 mod users;
-mod accounts;
-mod account_invites;
-mod sessions;
-mod mfa_tickets;
 
 pub use admin_migrations::*;
 pub use bots::*;
@@ -41,10 +37,6 @@ pub use server_members::*;
 pub use servers::*;
 pub use user_settings::*;
 pub use users::*;
-pub use accounts::*;
-pub use account_invites::*;
-pub use sessions::*;
-pub use mfa_tickets::*;
 
 use crate::{Database, ReferenceDb};
 
@@ -73,10 +65,6 @@ pub trait AbstractDatabase:
     + servers::AbstractServers
     + user_settings::AbstractUserSettings
     + users::AbstractUsers
-    + accounts::AbstractAccounts
-    + account_invites::AbstractAccountInvites
-    + sessions::AbstractSessions
-    + mfa_tickets::AbstractMFATickets
 {
 }
 

crates/core/database/src/models/server_members/model.rs

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

crates/core/database/src/models/server_members/ops.rs

@@ -129,7 +129,4 @@ pub trait AbstractServerMembers: Sync + Send {
 
     /// Fetch all members who have been marked for deletion.
     async fn remove_dangling_members(&self) -> Result<()>;
-
-    /// Removes a user from every server they are in
-    async fn clear_memberships(&self, user_id: &str) -> Result<()>;
 }

crates/core/database/src/models/server_members/ops/mongodb.rs

@@ -326,17 +326,6 @@ impl AbstractServerMembers for MongoDb {
             .map(|_| ())
             .map_err(|_| create_database_error!("count_documents", COL))
     }
-
-    /// Removes a user from every server they are in
-    ///
-    /// **This should only be used for account deletion.**
-    async fn clear_memberships(&self, user_id: &str) -> Result<()> {
-        self.col::<Member>(COL)
-            .delete_many(doc! { "_id.user": user_id })
-            .await
-            .map(|_| ())
-            .map_err(|_| create_database_error!("delete_many", COL))
-    }
 }
 
 impl IntoDocumentPath for FieldsMember {
@@ -345,7 +334,6 @@ impl IntoDocumentPath for FieldsMember {
             FieldsMember::JoinedAt => Some("joined_at"),
             FieldsMember::Avatar => Some("avatar"),
             FieldsMember::Nickname => Some("nickname"),
-            FieldsMember::Pronouns => Some("pronouns"),
             FieldsMember::Roles => Some("roles"),
             FieldsMember::Timeout => Some("timeout"),
             FieldsMember::CanPublish => Some("can_publish"),

crates/core/database/src/models/server_members/ops/reference.rs

@@ -200,13 +200,4 @@ impl AbstractServerMembers for ReferenceDb {
     async fn remove_dangling_members(&self) -> Result<()> {
         todo!()
     }
-
-    /// Removes a user from every server they are in
-    async fn clear_memberships(&self, user_id: &str) -> Result<()> {
-        let mut server_members = self.server_members.lock().await;
-
-        server_members.retain(|_, v| v.id.user != user_id);
-
-        Ok(())
-    }
 }

crates/core/database/src/models/servers/ops.rs

@@ -17,8 +17,6 @@ pub trait AbstractServers: Sync + Send {
     /// Fetch a servers by their ids
     async fn fetch_servers<'a>(&self, ids: &'a [String]) -> Result<Vec<Server>>;
 
-    async fn fetch_owned_servers(&self, user_id: &str) -> Result<Vec<Server>>;
-
     /// Update a server with new information
     async fn update_server(
         &self,

crates/core/database/src/models/servers/ops/mongodb.rs

@@ -43,17 +43,6 @@ impl AbstractServers for MongoDb {
             .await)
     }
 
-    async fn fetch_owned_servers(&self, user_id: &str) -> Result<Vec<Server>> {
-        query!(
-            self,
-            find,
-            COL,
-            doc! {
-                "owner": user_id
-            }
-        )
-    }
-
     /// Update a server with new information
     async fn update_server(
         &self,

crates/core/database/src/models/servers/ops/reference.rs

@@ -40,16 +40,6 @@ impl AbstractServers for ReferenceDb {
             .collect()
     }
 
-    async fn fetch_owned_servers(&self, user_id: &str) -> Result<Vec<Server>> {
-        let servers = self.servers.lock().await;
-
-        Ok(servers
-            .values()
-            .filter(|server| server.owner == user_id)
-            .cloned()
-            .collect())
-    }
-
     /// Update a server with new information
     async fn update_server(
         &self,

crates/core/database/src/models/sessions/axum.rs

@@ -1,24 +0,0 @@
-use axum::{extract::{FromRef, FromRequestParts}, http::request::Parts};
-
-use revolt_result::{create_error, Error, Result};
-
-use crate::{Database, Session};
-
-#[async_trait]
-impl<S> FromRequestParts<S> for Session
-where
-    Database: FromRef<S>,
-    S: Send + Sync
-{
-    type Rejection = Error;
-
-    async fn from_request_parts(parts: &mut Parts, state: &S) -> Result<Self> {
-        let db = Database::from_ref(state);
-
-        if let Some(Ok(token)) = parts.headers.get("x-session-token").map(|v| v.to_str()) {
-            db.fetch_session_by_token(token).await
-        } else {
-            Err(create_error!(MissingHeaders))
-        }
-    }
-}

crates/core/database/src/models/sessions/mod.rs

@@ -1,11 +0,0 @@
-#[cfg(feature = "axum-impl")]
-mod axum;
-mod model;
-mod ops;
-#[cfg(feature = "rocket-impl")]
-mod rocket;
-#[cfg(feature = "rocket-impl")]
-mod schema;
-
-pub use model::*;
-pub use ops::*;

crates/core/database/src/models/sessions/model.rs

@@ -1,68 +0,0 @@
-use iso8601_timestamp::Timestamp;
-
-use crate::{events::client::EventV1, Database};
-use revolt_result::Result;
-
-auto_derived_partial!(
-    /// Session information
-    pub struct Session {
-        /// Unique Id
-        #[serde(rename = "_id")]
-        pub id: String,
-
-        /// User Id
-        pub user_id: String,
-
-        /// Session token
-        pub token: String,
-
-        /// Display name
-        pub name: String,
-
-        /// When the session was last logged in
-        pub last_seen: Timestamp,
-
-        /// Where the session originated from
-        ///
-        /// This could be used to differentiate sessions that come from staging/test vs prod, etc.
-        #[serde(skip_serializing_if = "Option::is_none")]
-        pub origin: Option<String>,
-
-        /// Web Push subscription
-        #[serde(skip_serializing_if = "Option::is_none")]
-        pub subscription: Option<WebPushSubscription>,
-    },
-    "PartialSession"
-);
-
-auto_derived!(
-    /// Web Push subscription
-    pub struct WebPushSubscription {
-        pub endpoint: String,
-        pub p256dh: String,
-        pub auth: String,
-    }
-);
-
-impl Session {
-    /// Save model
-    pub async fn save(&self, db: &Database) -> Result<()> {
-        db.save_session(self).await
-    }
-
-    /// Delete session
-    pub async fn delete(self, db: &Database) -> Result<()> {
-        // Delete from database
-        db.delete_session(&self.id).await?;
-
-        // Create and push event
-        EventV1::DeleteSession {
-            user_id: self.user_id.clone(),
-            session_id: self.id,
-        }
-        .private(self.user_id)
-        .await;
-
-        Ok(())
-    }
-}

crates/core/database/src/models/sessions/ops.rs

@@ -1,37 +0,0 @@
-use iso8601_timestamp::Timestamp;
-use revolt_result::Result;
-
-use crate::Session;
-
-#[cfg(feature = "mongodb")]
-mod mongodb;
-mod reference;
-
-#[async_trait]
-pub trait AbstractSessions: Sync + Send {
-    /// Find session by id
-    async fn fetch_session(&self, id: &str) -> Result<Session>;
-
-    /// Find sessions by user id
-    async fn fetch_sessions(&self, user_id: &str) -> Result<Vec<Session>>;
-
-    /// Find sessions by user ids
-    async fn fetch_sessions_with_subscription(&self, user_ids: &[String]) -> Result<Vec<Session>>;
-
-    /// Find session by token
-    async fn fetch_session_by_token(&self, token: &str) -> Result<Session>;
-
-    /// Save session
-    async fn save_session(&self, session: &Session) -> Result<()>;
-
-    /// Delete session
-    async fn delete_session(&self, id: &str) -> Result<()>;
-
-    /// Delete session
-    async fn delete_all_sessions(&self, user_id: &str, ignore: Option<String>) -> Result<()>;
-
-    /// Remove push subscription for a session by session id
-    async fn remove_push_subscription_by_session_id(&self, session_id: &str) -> Result<()>;
-
-    async fn update_session_last_seen(&self, session_id: &str, when: Timestamp) -> Result<()>;
-}

crates/core/database/src/models/sessions/ops/mongodb.rs

@@ -1,142 +0,0 @@
-use crate::{AbstractSessions, MongoDb, Session};
-use bson::{to_bson, to_document};
-use iso8601_timestamp::Timestamp;
-use mongodb::options::UpdateOptions;
-use revolt_result::Result;
-
-const COL: &str = "sessions";
-
-#[async_trait]
-impl AbstractSessions for MongoDb {
-    /// Find session by id
-    async fn fetch_session(&self, id: &str) -> Result<Session> {
-        query!(self, find_one_by_id, COL, id)?.ok_or_else(|| create_error!(UnknownUser))
-    }
-
-    /// Find sessions by user id
-    async fn fetch_sessions(&self, user_id: &str) -> Result<Vec<Session>> {
-        query!(
-            self,
-            find,
-            COL,
-            doc! {
-                "user_id": user_id
-            }
-        )
-    }
-
-    /// Find sessions by user ids
-    async fn fetch_sessions_with_subscription(&self, user_ids: &[String]) -> Result<Vec<Session>> {
-        query!(
-            self,
-            find,
-            COL,
-            doc! {
-                "user_id": {
-                    "$in": user_ids
-                },
-                "subscription": {
-                    "$exists": true
-                }
-            }
-        )
-    }
-
-    /// Fetch a session from the database by token
-    async fn fetch_session_by_token(&self, token: &str) -> Result<Session> {
-        query!(
-            self,
-            find_one,
-            COL,
-            doc! {
-                "token": token
-            }
-        )?
-        .ok_or_else(|| create_error!(InvalidSession))
-    }
-
-    /// Save session
-    async fn save_session(&self, session: &Session) -> Result<()> {
-        self.col::<Session>(COL)
-            .update_one(
-                doc! {
-                    "_id": &session.id
-                },
-                doc! {
-                    "$set": to_document(session).map_err(|_| create_database_error!("to_document", COL))?,
-                },
-            )
-            .with_options(UpdateOptions::builder().upsert(true).build())
-            .await
-            .map_err(|_| create_database_error!("upsert_one", COL))
-            .map(|_| ())
-    }
-
-    /// Delete session
-    async fn delete_session(&self, id: &str) -> Result<()> {
-        self.col::<Session>(COL)
-            .delete_one(doc! {
-                "_id": id
-            })
-            .await
-            .map_err(|_| create_database_error!("delete_one", COL))
-            .map(|_| ())
-    }
-
-    /// Delete session
-    async fn delete_all_sessions(&self, user_id: &str, ignore: Option<String>) -> Result<()> {
-        let mut query = doc! {
-            "user_id": user_id
-        };
-
-        if let Some(id) = ignore {
-            query.insert(
-                "_id",
-                doc! {
-                    "$ne": id
-                },
-            );
-        }
-
-        self.col::<Session>(COL)
-            .delete_many(query)
-            .await
-            .map_err(|_| create_database_error!("delete_one", COL))
-            .map(|_| ())
-    }
-
-    /// Remove push subscription for a session by session id
-    async fn remove_push_subscription_by_session_id(&self, session_id: &str) -> Result<()> {
-        self.col::<Session>(COL)
-            .update_one(
-                doc! {
-                    "_id": session_id
-                },
-                doc! {
-                    "$unset": {
-                        "subscription": 1
-                    }
-                },
-            )
-            .await
-            .map(|_| ())
-            .map_err(|_| create_database_error!("update_one", COL))
-    }
-
-    async fn update_session_last_seen(&self, session_id: &str, when: Timestamp) -> Result<()> {
-        self.col::<Session>(COL)
-            .update_one(
-                doc! {
-                    "_id": session_id
-                },
-                doc! {
-                    "$set": {
-                        "last_seen": to_bson(&when).unwrap()
-                    }
-                },
-            )
-            .await
-            .map(|_| ())
-            .map_err(|_| create_database_error!("update_one", COL))
-    }
-}

crates/core/database/src/models/sessions/ops/reference.rs

@@ -1,101 +0,0 @@
-use crate::{AbstractSessions, ReferenceDb, Session};
-use iso8601_timestamp::Timestamp;
-use revolt_result::Result;
-
-#[async_trait]
-impl AbstractSessions for ReferenceDb {
-    /// Find session by id
-    async fn fetch_session(&self, id: &str) -> Result<Session> {
-        let sessions = self.sessions.lock().await;
-        sessions
-            .get(id)
-            .cloned()
-            .ok_or_else(|| create_error!(UnknownUser))
-    }
-
-    /// Find sessions by user id
-    async fn fetch_sessions(&self, user_id: &str) -> Result<Vec<Session>> {
-        let sessions = self.sessions.lock().await;
-        Ok(sessions
-            .values()
-            .filter(|session| session.user_id == user_id)
-            .cloned()
-            .collect())
-    }
-
-    /// Find sessions by user ids
-    async fn fetch_sessions_with_subscription(&self, user_ids: &[String]) -> Result<Vec<Session>> {
-        let sessions = self.sessions.lock().await;
-        Ok(sessions
-            .values()
-            .filter(|session| session.subscription.is_some() && user_ids.contains(&session.user_id))
-            .cloned()
-            .collect())
-    }
-
-    /// Find session by token
-    async fn fetch_session_by_token(&self, token: &str) -> Result<Session> {
-        let sessions = self.sessions.lock().await;
-        sessions
-            .values()
-            .find(|session| session.token == token)
-            .cloned()
-            .ok_or_else(|| create_error!(InvalidSession))
-    }
-
-    /// Save session
-    async fn save_session(&self, session: &Session) -> Result<()> {
-        let mut sessions = self.sessions.lock().await;
-        sessions.insert(session.id.to_string(), session.clone());
-        Ok(())
-    }
-
-    /// Delete session
-    async fn delete_session(&self, id: &str) -> Result<()> {
-        let mut sessions = self.sessions.lock().await;
-        if sessions.remove(id).is_some() {
-            Ok(())
-        } else {
-            Err(create_error!(InvalidSession))
-        }
-    }
-
-    /// Delete session
-    async fn delete_all_sessions(&self, user_id: &str, ignore: Option<String>) -> Result<()> {
-        let mut sessions = self.sessions.lock().await;
-        sessions.retain(|_, session| {
-            if session.user_id == user_id {
-                if let Some(ignore) = &ignore {
-                    ignore == &session.id
-                } else {
-                    false
-                }
-            } else {
-                true
-            }
-        });
-
-        Ok(())
-    }
-
-    /// Remove push subscription for a session by session id
-    async fn remove_push_subscription_by_session_id(&self, session_id: &str) -> Result<()> {
-        let mut sessions = self.sessions.lock().await;
-
-        if let Some(session) = sessions.get_mut(session_id) {
-            session.subscription = None;
-        };
-
-        Ok(())
-    }
-
-    async fn update_session_last_seen(&self, session_id: &str, when: Timestamp) -> Result<()> {
-        let mut sessions = self.sessions.lock().await;
-
-        if let Some(session) = sessions.get_mut(session_id) {
-            session.last_seen = when;
-        };
-
-        Ok(())
-    }
-}

crates/core/database/src/models/sessions/rocket.rs

@@ -1,30 +0,0 @@
-use crate::{Database, Session};
-use revolt_result::Error;
-use rocket::{
-    http::Status,
-    request::{FromRequest, Outcome},
-    Request,
-};
-
-#[rocket::async_trait]
-impl<'r> FromRequest<'r> for Session {
-    type Error = Error;
-
-    async fn from_request(request: &'r Request<'_>) -> Outcome<Self, Self::Error> {
-        if let Some(token) = request.headers().get("x-session-token").next() {
-            if let Ok(session) = request
-                .rocket()
-                .state::<Database>()
-                .expect("`Database`")
-                .fetch_session_by_token(token)
-                .await
-            {
-                Outcome::Success(session)
-            } else {
-                Outcome::Error((Status::Unauthorized, create_error!(InvalidSession)))
-            }
-        } else {
-            Outcome::Error((Status::Unauthorized, create_error!(MissingHeaders)))
-        }
-    }
-}

crates/core/database/src/models/sessions/schema.rs

@@ -1,32 +0,0 @@
-use revolt_okapi::openapi3::{SecurityScheme, SecuritySchemeData};
-use revolt_rocket_okapi::{
-    gen::OpenApiGenerator,
-    request::{OpenApiFromRequest, RequestHeaderInput},
-};
-
-use crate::Session;
-
-
-impl<'r> OpenApiFromRequest<'r> for Session {
-    fn from_request_input(
-        _gen: &mut OpenApiGenerator,
-        _name: String,
-        _required: bool,
-    ) -> revolt_rocket_okapi::Result<RequestHeaderInput> {
-        let mut requirements = schemars::Map::new();
-        requirements.insert("Session Token".to_owned(), vec![]);
-
-        Ok(RequestHeaderInput::Security(
-            "Session Token".to_owned(),
-            SecurityScheme {
-                data: SecuritySchemeData::ApiKey {
-                    name: "x-session-token".to_owned(),
-                    location: "header".to_owned(),
-                },
-                description: Some("Used to authenticate as a user.".to_owned()),
-                extensions: schemars::Map::new(),
-            },
-            requirements,
-        ))
-    }
-}

crates/core/database/src/models/users/model.rs

@@ -1,11 +1,8 @@
 use std::{collections::HashSet, str::FromStr, time::Duration};
 
-use crate::{
+use crate::{events::client::EventV1, Database, File, RatelimitEvent, AMQP};
-    events::client::EventV1,
-    util::email::{email_templates, send_email},
-    Database, File, RatelimitEvent, AMQP,
-};
 
+use authifier::config::{EmailVerificationConfig, Template};
 use futures::future::join_all;
 use iso8601_timestamp::Timestamp;
 use once_cell::sync::Lazy;
@@ -31,9 +28,6 @@ auto_derived_partial!(
         /// Display name
         #[serde(skip_serializing_if = "Option::is_none")]
         pub display_name: Option<String>,
-        /// User's pronouns
-        #[serde(skip_serializing_if = "Option::is_none", default)]
-        pub pronouns: Option<String>,
         #[serde(skip_serializing_if = "Option::is_none")]
         /// Avatar attachment
         pub avatar: Option<File>,
@@ -79,7 +73,6 @@ auto_derived!(
         ProfileContent,
         ProfileBackground,
         DisplayName,
-        Pronouns,
 
         // internal fields
         Suspension,
@@ -186,7 +179,6 @@ impl Default for User {
             username: Default::default(),
             discriminator: Default::default(),
             display_name: Default::default(),
-            pronouns: Default::default(),
             avatar: Default::default(),
             relations: Default::default(),
             badges: Default::default(),
@@ -711,7 +703,6 @@ impl User {
                 }
             }
             FieldsUser::DisplayName => self.display_name = None,
-            FieldsUser::Pronouns => self.pronouns = None,
             FieldsUser::Suspension => self.suspended_until = None,
             FieldsUser::None => {}
         }
@@ -727,11 +718,22 @@ impl User {
         duration_days: Option<usize>,
         reason: Option<Vec<String>>,
     ) -> Result<()> {
-        let mut account = db.fetch_account(&self.id).await?;
+        let authifier = db.clone().to_authifier().await;
+        let mut account = authifier
+            .database
+            .find_account(&self.id)
+            .await
+            .map_err(|_| create_error!(InternalError))?;
 
-        account.disable(db).await?;
+        account
+            .disable(&authifier)
+            .await
+            .map_err(|_| create_error!(InternalError))?;
 
-        account.delete_all_sessions(db, None).await?;
+        account
+            .delete_all_sessions(&authifier, None)
+            .await
+            .map_err(|_| create_error!(InternalError))?;
 
         self.update(
             db,
@@ -747,15 +749,18 @@ impl User {
         .await?;
 
         if let Some(reason) = reason {
-            let config = config().await;
+            if let EmailVerificationConfig::Enabled { smtp, .. } =
-
+                authifier.config.email_verification
-            if !config.api.smtp.host.is_empty() {
+            {
-                let templates = email_templates().await;
+                smtp.send_email(
-
-                send_email(
-                    &config.api.smtp,
                     account.email.clone(),
-                    &templates.suspension,
+                    // maybe move this to common area?
+                    &Template {
+                        title: "Account Suspension".to_string(),
+                        html: Some(include_str!("../../../templates/suspension.html").to_owned()),
+                        text: include_str!("../../../templates/suspension.txt").to_owned(),
+                        url: Default::default(),
+                    },
                     json!({
                         "email": account.email,
                         "list": reason.join(", "),
@@ -804,9 +809,7 @@ impl User {
             db,
             PartialUser {
                 username: Some(format!("Deleted User {}", self.id)),
-                discriminator: Some("0000".to_string()),
                 flags: Some(2),
-                relations: Some(Vec::new()),
                 ..Default::default()
             },
             vec![
@@ -834,56 +837,6 @@ impl User {
 
         badges
     }
-
-    /// Removes all relationships which include the user
-    pub async fn clear_relationships(&self, db: &Database) -> Result<()> {
-        let user_ids = self
-            .relations
-            .iter()
-            .flatten()
-            .map(|relation| relation.id.clone())
-            .collect();
-
-        db.clear_user_relationships(&self.id, user_ids).await
-    }
-
-    /// Removes user from all joined groups
-    pub async fn remove_from_all_groups(&self, db: &Database) -> Result<()> {
-        let mut generator = db.find_group_message_channels(&self.id).await?;
-
-        while let Some(groups) = generator.next_n(100).await? {
-            let ids = groups
-                .into_iter()
-                .map(|channel| channel.id().to_string())
-                .collect();
-
-            db.remove_user_from_groups(ids, &self.id).await?;
-        }
-
-        Ok(())
-    }
-
-    /// Deletes the user along with:
-    /// - deletes owned bots, servers and messages
-    /// - removes user from all groups
-    /// - clears relationships
-    pub async fn delete(&mut self, db: &Database) -> Result<()> {
-        for bot in db.fetch_bots_by_user(&self.id).await? {
-            bot.delete(db).await?;
-        }
-
-        for server in db.fetch_owned_servers(&self.id).await? {
-            server.delete(db).await?;
-        }
-
-        self.remove_from_all_groups(db).await?;
-        db.clear_memberships(&self.id).await?;
-        self.clear_relationships(db).await?;
-        db.delete_messages_by_user(&self.id).await?;
-        self.mark_deleted(db).await?;
-
-        Ok(())
-    }
 }
 
 #[cfg(test)]

crates/core/database/src/models/users/ops.rs

@@ -1,3 +1,5 @@
+use authifier::models::Session;
+use iso8601_timestamp::Timestamp;
 use revolt_result::Result;
 
 use crate::{FieldsUser, PartialUser, RelationshipStatus, User};
@@ -17,6 +19,9 @@ pub trait AbstractUsers: Sync + Send {
     /// Fetch a user from the database by their username
     async fn fetch_user_by_username(&self, username: &str, discriminator: &str) -> Result<User>;
 
+    /// Fetch a session from the database by token
+    async fn fetch_session_by_token(&self, token: &str) -> Result<Session>;
+
     /// Fetch multiple users by their ids
     async fn fetch_users<'a>(&self, ids: &'a [String]) -> Result<Vec<User>>;
 
@@ -56,6 +61,8 @@ pub trait AbstractUsers: Sync + Send {
     /// Delete a user by their id
     async fn delete_user(&self, id: &str) -> Result<()>;
 
-    /// Removes all relationships with the user from the list of users
+    /// Remove push subscription for a session by session id (TODO: remove)
-    async fn clear_user_relationships(&self, target_id: &str, user_ids: Vec<String>) -> Result<()>;
+    async fn remove_push_subscription_by_session_id(&self, session_id: &str) -> Result<()>;
+
+    async fn update_session_last_seen(&self, session_id: &str, when: Timestamp) -> Result<()>;
 }

crates/core/database/src/models/users/ops/mongodb.rs

@@ -1,5 +1,7 @@
 use ::mongodb::options::{Collation, CollationStrength, FindOneOptions, FindOptions};
+use authifier::models::Session;
 use futures::StreamExt;
+use iso8601_timestamp::Timestamp;
 use revolt_result::Result;
 
 use crate::DocumentId;
@@ -45,6 +47,17 @@ impl AbstractUsers for MongoDb {
         .ok_or_else(|| create_error!(NotFound))
     }
 
+    /// Fetch a session from the database by token
+    async fn fetch_session_by_token(&self, token: &str) -> Result<Session> {
+        self.col::<Session>("sessions")
+            .find_one(doc! {
+                "token": token
+            })
+            .await
+            .map_err(|_| create_database_error!("find_one", "sessions"))?
+            .ok_or_else(|| create_error!(InvalidSession))
+    }
+
     /// Fetch multiple users by their ids
     async fn fetch_users<'a>(&self, ids: &'a [String]) -> Result<Vec<User>> {
         Ok(self
@@ -308,22 +321,41 @@ impl AbstractUsers for MongoDb {
         query!(self, delete_one_by_id, COL, id).map(|_| ())
     }
 
-    /// Removes all relationships with the user from the list of users
+    /// Remove push subscription for a session by session id (TODO: remove)
-    async fn clear_user_relationships(&self, target_id: &str, user_ids: Vec<String>) -> Result<()> {
+    async fn remove_push_subscription_by_session_id(&self, session_id: &str) -> Result<()> {
-        self.col::<User>(COL)
+        self.col::<User>("sessions")
-            .update_many(
+            .update_one(
-                doc! { "_id": { "$in": user_ids } },
                 doc! {
-                    "$pull": {
+                    "_id": session_id
-                        "relations": {
+                },
-                            "_id": target_id.to_string()
+                doc! {
-                        }
+                    "$unset": {
+                        "subscription": 1
                     }
                 },
             )
             .await
             .map(|_| ())
-            .map_err(|_| create_database_error!("bulk_write", COL))
+            .map_err(|_| create_database_error!("update_one", "sessions"))
+    }
+
+    async fn update_session_last_seen(&self, session_id: &str, when: Timestamp) -> Result<()> {
+        let formatted: &str = &when.format();
+
+        self.col::<Session>("sessions")
+            .update_one(
+                doc! {
+                    "_id": session_id
+                },
+                doc! {
+                    "$set": {
+                        "last_seen": formatted
+                    }
+                },
+            )
+            .await
+            .map(|_| ())
+            .map_err(|_| create_database_error!("update_one", "sessions"))
     }
 }
 
@@ -336,7 +368,6 @@ impl IntoDocumentPath for FieldsUser {
             FieldsUser::StatusPresence => "status.presence",
             FieldsUser::StatusText => "status.text",
             FieldsUser::DisplayName => "display_name",
-            FieldsUser::Pronouns => "pronouns",
             FieldsUser::Suspension => "suspended_until",
             FieldsUser::None => "none",
         })

crates/core/database/src/models/users/ops/reference.rs

@@ -1,3 +1,5 @@
+use authifier::models::Session;
+use iso8601_timestamp::Timestamp;
 use revolt_result::Result;
 
 use crate::{FieldsUser, PartialUser, RelationshipStatus, User};
@@ -40,6 +42,11 @@ impl AbstractUsers for ReferenceDb {
             .ok_or_else(|| create_error!(NotFound))
     }
 
+    /// Fetch a session from the database by token
+    async fn fetch_session_by_token(&self, _token: &str) -> Result<Session> {
+        todo!()
+    }
+
     /// Fetch multiple users by their ids
     async fn fetch_users<'a>(&self, ids: &'a [String]) -> Result<Vec<User>> {
         let users = self.users.lock().await;
@@ -158,22 +165,12 @@ impl AbstractUsers for ReferenceDb {
         }
     }
 
-    /// Removes all relationships with the user from the list of users
+    /// Remove push subscription for a session by session id (TODO: remove)
-    async fn clear_user_relationships(
+    async fn remove_push_subscription_by_session_id(&self, _session_id: &str) -> Result<()> {
-        &self,
+        todo!()
-        target_id: &str,
+    }
-        user_ids: Vec<String>,
-    ) -> Result<()> {
-        let mut users = self.users.lock().await;
 
-        for user_id in user_ids {
+    async fn update_session_last_seen(&self, _session_id: &str, _when: Timestamp) -> Result<()> {
-            if let Some(user) = users.get_mut(&user_id) {
+        todo!()
-                if let Some(relations) = &mut user.relations {
-                    relations.retain(|relation| relation.id != target_id);
-                }
-            }
-        }
-
-        Ok(())
     }
 }

crates/core/database/src/models/users/rocket.rs

@@ -1,12 +1,12 @@
+use authifier::models::Session;
 use rocket::http::Status;
 use rocket::request::{self, FromRequest, Outcome, Request};
-use revolt_result::Error;
 
-use crate::{Database, Session, User};
+use crate::{Database, User};
 
 #[rocket::async_trait]
 impl<'r> FromRequest<'r> for User {
-    type Error = Error;
+    type Error = authifier::Error;
 
     async fn from_request(request: &'r Request<'_>) -> request::Outcome<Self, Self::Error> {
         let user: &Option<User> = request
@@ -38,7 +38,7 @@ impl<'r> FromRequest<'r> for User {
         if let Some(user) = user {
             Outcome::Success(user.clone())
         } else {
-            Outcome::Error((Status::Unauthorized, create_error!(InvalidSession)))
+            Outcome::Error((Status::Unauthorized, authifier::Error::InvalidSession))
         }
     }
 }

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
+            }
+        }
+    }
+}

crates/core/database/src/tasks/mod.rs

@@ -8,11 +8,14 @@ use std::time::Instant;
 const WORKER_COUNT: usize = 5;
 
 pub mod ack;
+pub mod authifier_relay;
 pub mod last_message_id;
 pub mod process_embeds;
 
 /// Spawn background workers
 pub fn start_workers(db: Database, amqp: AMQP) {
+    task::spawn(authifier_relay::worker());
+
     for _ in 0..WORKER_COUNT {
         task::spawn(ack::worker(db.clone(), amqp.clone()));
         task::spawn(last_message_id::worker(db.clone()));

crates/core/database/src/util/bridge/v0.rs

@@ -631,7 +631,6 @@ impl From<crate::Member> for Member {
             id: value.id.into(),
             joined_at: value.joined_at,
             nickname: value.nickname,
-            pronouns: value.pronouns,
             avatar: value.avatar.map(|f| f.into()),
             roles: value.roles,
             timeout: value.timeout,
@@ -647,7 +646,6 @@ impl From<Member> for crate::Member {
             id: value.id.into(),
             joined_at: value.joined_at,
             nickname: value.nickname,
-            pronouns: value.pronouns,
             avatar: value.avatar.map(|f| f.into()),
             roles: value.roles,
             timeout: value.timeout,
@@ -663,7 +661,6 @@ impl From<crate::PartialMember> for PartialMember {
             id: value.id.map(|id| id.into()),
             joined_at: value.joined_at,
             nickname: value.nickname,
-            pronouns: value.pronouns,
             avatar: value.avatar.map(|f| f.into()),
             roles: value.roles,
             timeout: value.timeout,
@@ -679,7 +676,6 @@ impl From<PartialMember> for crate::PartialMember {
             id: value.id.map(|id| id.into()),
             joined_at: value.joined_at,
             nickname: value.nickname,
-            pronouns: value.pronouns,
             avatar: value.avatar.map(|f| f.into()),
             roles: value.roles,
             timeout: value.timeout,
@@ -712,7 +708,6 @@ impl From<crate::FieldsMember> for FieldsMember {
         match value {
             crate::FieldsMember::Avatar => FieldsMember::Avatar,
             crate::FieldsMember::Nickname => FieldsMember::Nickname,
-            crate::FieldsMember::Pronouns => FieldsMember::Pronouns,
             crate::FieldsMember::Roles => FieldsMember::Roles,
             crate::FieldsMember::Timeout => FieldsMember::Timeout,
             crate::FieldsMember::CanReceive => FieldsMember::CanReceive,
@@ -728,7 +723,6 @@ impl From<FieldsMember> for crate::FieldsMember {
         match value {
             FieldsMember::Avatar => crate::FieldsMember::Avatar,
             FieldsMember::Nickname => crate::FieldsMember::Nickname,
-            FieldsMember::Pronouns => crate::FieldsMember::Pronouns,
             FieldsMember::Roles => crate::FieldsMember::Roles,
             FieldsMember::Timeout => crate::FieldsMember::Timeout,
             FieldsMember::CanReceive => crate::FieldsMember::CanReceive,
@@ -1038,7 +1032,6 @@ impl crate::User {
             username: self.username,
             discriminator: self.discriminator,
             display_name: self.display_name,
-            pronouns: self.pronouns,
             avatar: self.avatar.map(|file| file.into()),
             relations: if let Some(crate::User { id, .. }) = perspective {
                 if id == &self.id {
@@ -1115,7 +1108,6 @@ impl crate::User {
             username: self.username,
             discriminator: self.discriminator,
             display_name: self.display_name,
-            pronouns: self.pronouns,
             avatar: self.avatar.map(|file| file.into()),
             relations: vec![],
             badges,
@@ -1149,7 +1141,6 @@ impl crate::User {
             username: self.username,
             discriminator: self.discriminator,
             display_name: self.display_name,
-            pronouns: self.pronouns,
             avatar: self.avatar.map(|file| file.into()),
             relations: vec![],
             badges,
@@ -1177,7 +1168,6 @@ impl crate::User {
             username: self.username,
             discriminator: self.discriminator,
             display_name: self.display_name,
-            pronouns: self.pronouns,
             avatar: self.avatar.map(|file| file.into()),
             relations: self
                 .relations
@@ -1221,7 +1211,6 @@ impl From<User> for crate::User {
             username: value.username,
             discriminator: value.discriminator,
             display_name: value.display_name,
-            pronouns: value.pronouns,
             avatar: value.avatar.map(Into::into),
             relations: None,
             badges: Some(value.badges as i32),
@@ -1242,7 +1231,6 @@ impl From<crate::PartialUser> for PartialUser {
             username: value.username,
             discriminator: value.discriminator,
             display_name: value.display_name,
-            pronouns: value.pronouns,
             avatar: value.avatar.map(|file| file.into()),
             relations: value.relations.map(|relationships| {
                 relationships
@@ -1271,7 +1259,6 @@ impl From<FieldsUser> for crate::FieldsUser {
             FieldsUser::StatusPresence => crate::FieldsUser::StatusPresence,
             FieldsUser::StatusText => crate::FieldsUser::StatusText,
             FieldsUser::DisplayName => crate::FieldsUser::DisplayName,
-            FieldsUser::Pronouns => crate::FieldsUser::Pronouns,
 
             FieldsUser::Internal => crate::FieldsUser::None,
         }
@@ -1287,7 +1274,6 @@ impl From<crate::FieldsUser> for FieldsUser {
             crate::FieldsUser::StatusPresence => FieldsUser::StatusPresence,
             crate::FieldsUser::StatusText => FieldsUser::StatusText,
             crate::FieldsUser::DisplayName => FieldsUser::DisplayName,
-            crate::FieldsUser::Pronouns => FieldsUser::Pronouns,
 
             crate::FieldsUser::Suspension => FieldsUser::Internal,
             crate::FieldsUser::None => FieldsUser::Internal,
@@ -1436,92 +1422,3 @@ impl From<crate::VoiceInformation> for VoiceInformation {
         }
     }
 }
-
-impl From<crate::Account> for AccountInfo {
-    fn from(item: crate::Account) -> Self {
-        AccountInfo {
-            id: item.id,
-            email: item.email,
-        }
-    }
-}
-
-impl From<crate::MFATicket> for MFATicket {
-    fn from(value: crate::MFATicket) -> Self {
-        MFATicket {
-            id: value.id,
-            account_id: value.account_id,
-            token: value.token,
-            validated: value.validated,
-            authorised: value.authorised,
-            last_totp_code: value.last_totp_code,
-        }
-    }
-}
-
-impl From<crate::MultiFactorAuthentication> for MultiFactorStatus {
-    fn from(item: crate::MultiFactorAuthentication) -> Self {
-        MultiFactorStatus {
-            // email_otp: item.enable_email_otp,
-            // trusted_handover: item.enable_trusted_handover,
-            // email_mfa: item.enable_email_mfa,
-            totp_mfa: !item.totp_token.is_disabled(),
-            // security_key_mfa: item.security_key_token.is_some(),
-            recovery_active: !item.recovery_codes.is_empty(),
-            ..Default::default()
-        }
-    }
-}
-
-impl From<crate::MFAMethod> for MFAMethod {
-    fn from(value: crate::MFAMethod) -> Self {
-        match value {
-            crate::MFAMethod::Password => MFAMethod::Password,
-            crate::MFAMethod::Recovery => MFAMethod::Recovery,
-            crate::MFAMethod::Totp => MFAMethod::Totp,
-        }
-    }
-}
-
-impl From<crate::Session> for SessionInfo {
-    fn from(item: crate::Session) -> Self {
-        SessionInfo {
-            id: item.id,
-            name: item.name,
-        }
-    }
-}
-
-impl From<crate::Session> for Session {
-    fn from(value: crate::Session) -> Self {
-        Session {
-            id: value.id,
-            user_id: value.user_id,
-            token: value.token,
-            name: value.name,
-            last_seen: value.last_seen,
-            origin: value.origin,
-            subscription: value.subscription.map(Into::into),
-        }
-    }
-}
-
-impl From<crate::WebPushSubscription> for WebPushSubscription {
-    fn from(value: crate::WebPushSubscription) -> Self {
-        WebPushSubscription {
-            endpoint: value.endpoint,
-            p256dh: value.p256dh,
-            auth: value.auth,
-        }
-    }
-}
-
-impl From<WebPushSubscription> for crate::WebPushSubscription {
-    fn from(value: WebPushSubscription) -> Self {
-        crate::WebPushSubscription {
-            endpoint: value.endpoint,
-            p256dh: value.p256dh,
-            auth: value.auth,
-        }
-    }
-}

crates/core/database/src/util/captcha.rs

@@ -1,42 +0,0 @@
-use reqwest::Client;
-use revolt_config::config;
-use revolt_result::Result;
-use std::sync::LazyLock;
-
-static CLIENT: LazyLock<Client> = LazyLock::new(Client::new);
-
-#[derive(Serialize, Deserialize)]
-struct CaptchaResponse {
-    success: bool,
-}
-
-pub async fn check_captcha(token: Option<&str>) -> Result<()> {
-    let config = config().await;
-
-    if !config.api.security.captcha.hcaptcha_key.is_empty() {
-        let Some(token) = token else {
-            return Err(create_error!(CaptchaFailed));
-        };
-
-        let response = CLIENT
-            .post("https://hcaptcha.com/siteverify")
-            .form(&[
-                ("secret", config.api.security.captcha.hcaptcha_key.as_str()),
-                ("response", token),
-            ])
-            .send()
-            .await
-            .map_err(|_| create_error!(CaptchaFailed))?
-            .json::<CaptchaResponse>()
-            .await
-            .map_err(|_| create_error!(CaptchaFailed))?;
-
-        if response.success {
-            Ok(())
-        } else {
-            Err(create_error!(CaptchaFailed))
-        }
-    } else {
-        Ok(())
-    }
-}

crates/core/database/src/util/chunked.rs

@@ -1,63 +0,0 @@
-#[cfg(feature = "mongodb")]
-use ::mongodb::{ClientSession, SessionCursor};
-use revolt_result::{Result, ToRevoltError};
-use serde::Deserialize;
-
-#[derive(Debug)]
-#[allow(clippy::large_enum_variant)]
-pub enum ChunkedDatabaseGenerator<T> {
-    #[cfg(feature = "mongodb")]
-    MongoDb {
-        session: ClientSession,
-        cursor: SessionCursor<T>,
-    },
-
-    Reference {
-        offset: usize,
-        data: Vec<T>,
-    },
-}
-
-impl<T: for<'d> Deserialize<'d> + Clone> ChunkedDatabaseGenerator<T> {
-    #[cfg(feature = "mongodb")]
-    pub fn new_mongo(session: ClientSession, cursor: SessionCursor<T>) -> Self {
-        Self::MongoDb { session, cursor }
-    }
-
-    pub fn new_reference(data: Vec<T>) -> Self {
-        Self::Reference { offset: 0, data }
-    }
-
-    pub async fn next(&mut self) -> Result<Option<T>> {
-        match self {
-            #[cfg(feature = "mongodb")]
-            Self::MongoDb { session, cursor } => {
-                cursor.next(session).await.transpose().to_internal_error()
-            }
-            Self::Reference { offset, data } => {
-                if let Some(value) = data.get(*offset) {
-                    *offset += 1;
-                    Ok(Some(value.clone()))
-                } else {
-                    Ok(None)
-                }
-            }
-        }
-    }
-
-    pub async fn next_n(&mut self, n: usize) -> Result<Option<Vec<T>>> {
-        let mut docs = Vec::new();
-
-        while docs.len() < n {
-            if let Some(doc) = self.next().await? {
-                docs.push(doc);
-            } else if docs.is_empty() {
-                return Ok(None);
-            } else {
-                break;
-            }
-        }
-
-        Ok(Some(docs))
-    }
-}

crates/core/database/src/util/email.rs

@@ -1,271 +0,0 @@
-use std::{collections::HashSet, sync::LazyLock};
-
-use lettre::{
-    transport::smtp::{authentication::Credentials, client::Tls},
-    SmtpTransport,
-};
-use regex::Regex;
-use revolt_config::{config, ApiSmtp};
-use revolt_result::Result;
-
-static SPLIT: LazyLock<Regex> = LazyLock::new(|| Regex::new("([^@]+)(@.+)").unwrap());
-static SYMBOL_RE: LazyLock<Regex> = LazyLock::new(|| Regex::new("\\+.+|\\.").unwrap());
-static HANDLEBARS: LazyLock<handlebars::Handlebars<'static>> =
-    LazyLock::new(handlebars::Handlebars::new);
-static REVOLT_SOURCE_LIST: LazyLock<HashSet<String>> = LazyLock::new(|| {
-    include_str!("../../assets/revolt_source_list.txt")
-        .split('\n')
-        .map(|x| x.into())
-        .collect()
-});
-
-/// Strip special characters and aliases from emails
-pub fn normalise_email(original: String) -> String {
-    let split = SPLIT.captures(&original).unwrap();
-    let mut clean = SYMBOL_RE
-        .replace_all(split.get(1).unwrap().as_str(), "")
-        .to_string();
-
-    clean.push_str(split.get(2).unwrap().as_str());
-    clean.to_lowercase()
-}
-
-/// Email template
-#[derive(Clone)]
-pub struct Template {
-    /// Title of the email
-    pub title: String,
-    /// Plain text version of this email
-    pub text: String,
-    /// HTML version of this email
-    pub html: Option<String>,
-    /// URL to redirect people to from the email
-    ///
-    /// Use `{{url}}` to fill this field.
-    ///
-    /// Any given URL will be suffixed with a unique token if applicable.
-    ///
-    /// e.g. `https://example.com?t=` becomes `https://example.com?t=UNIQUE_CODE`
-    pub url: String,
-}
-
-/// Email templates
-#[derive(Clone)]
-pub struct Templates {
-    /// Template for email verification
-    pub verify: Template,
-    /// Template for password reset
-    pub reset: Template,
-    /// Template for password reset when the account already exists on creation
-    pub reset_existing: Template,
-    /// Template for account deletion
-    pub deletion: Template,
-    /// Template for suspention
-    pub suspension: Template,
-}
-
-pub async fn email_templates() -> Templates {
-    let config = config().await;
-
-    if std::env::var("TEST_DB").is_ok() {
-        Templates {
-            verify: Template {
-                title: "verify".into(),
-                text: "[[{{url}}]]".into(),
-                url: "".into(),
-                html: None,
-            },
-            reset: Template {
-                title: "reset".into(),
-                text: "[[{{url}}]]".into(),
-                url: "".into(),
-                html: None,
-            },
-            reset_existing: Template {
-                title: "reset_existing".into(),
-                text: "[[{{url}}]]".into(),
-                url: "".into(),
-                html: None,
-            },
-            deletion: Template {
-                title: "deletion".into(),
-                text: "[[{{url}}]]".into(),
-                url: "".into(),
-                html: None,
-            },
-            suspension: Template {
-                title: "suspension".into(),
-                text: "[[dummy]]".into(),
-                url: "".into(),
-                html: None,
-            },
-        }
-    } else if config.production {
-        Templates {
-            verify: Template {
-                title: "Verify your Stoat account.".into(),
-                text: include_str!("../../templates/verify.txt").into(),
-                url: format!("{}/login/verify/", config.hosts.app),
-                html: Some(include_str!("../../templates/verify.html").into()),
-            },
-            reset: Template {
-                title: "Reset your Stoat password.".into(),
-                text: include_str!("../../templates/reset.txt").into(),
-                url: format!("{}/login/reset/", config.hosts.app),
-                html: Some(include_str!("../../templates/reset.html").into()),
-            },
-            reset_existing: Template {
-                title: "You already have a Stoat account, reset your password.".into(),
-                text: include_str!("../../templates/reset-existing.txt").into(),
-                url: format!("{}/login/reset/", config.hosts.app),
-                html: Some(include_str!("../../templates/reset-existing.html").into()),
-            },
-            deletion: Template {
-                title: "Confirm account deletion.".into(),
-                text: include_str!("../../templates/deletion.txt").into(),
-                url: format!("{}/delete/", config.hosts.app),
-                html: Some(include_str!("../../templates/deletion.html").into()),
-            },
-            suspension: 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(),
-            },
-        }
-    } else {
-        Templates {
-            verify: Template {
-                title: "Verify your account.".into(),
-                text: include_str!("../../templates/verify.whitelabel.txt").into(),
-                url: format!("{}/login/verify/", config.hosts.app),
-                html: None,
-            },
-            reset: Template {
-                title: "Reset your password.".into(),
-                text: include_str!("../../templates/reset.whitelabel.txt").into(),
-                url: format!("{}/login/reset/", config.hosts.app),
-                html: None,
-            },
-            reset_existing: Template {
-                title: "Reset your password.".into(),
-                text: include_str!("../../templates/reset.whitelabel.txt").into(),
-                url: format!("{}/login/reset/", config.hosts.app),
-                html: None,
-            },
-            deletion: Template {
-                title: "Confirm account deletion.".into(),
-                text: include_str!("../../templates/deletion.whitelabel.txt").into(),
-                url: format!("{}/delete/", config.hosts.app),
-                html: None,
-            },
-            suspension: Template {
-                title: "Account Suspension".to_string(),
-                text: include_str!("../../templates/suspension.whitelabel.txt").to_owned(),
-                url: Default::default(),
-                html: None,
-            },
-        }
-    }
-}
-
-/// Create SMTP transport
-pub fn create_transport(smtp: &ApiSmtp) -> SmtpTransport {
-    let relay = if smtp.use_starttls == Some(true) {
-        SmtpTransport::starttls_relay(&smtp.host).unwrap()
-    } else {
-        SmtpTransport::relay(&smtp.host).unwrap()
-    };
-
-    let relay = if let Some(port) = smtp.port {
-        relay.port(port.try_into().unwrap())
-    } else {
-        relay
-    };
-
-    let relay = if smtp.use_tls == Some(false) {
-        relay.tls(Tls::None)
-    } else {
-        relay
-    };
-
-    relay
-        .credentials(Credentials::new(
-            smtp.username.clone(),
-            smtp.password.clone(),
-        ))
-        .build()
-}
-
-/// Render an email template
-fn render_template(text: &str, variables: &handlebars::JsonValue) -> Result<String> {
-    HANDLEBARS
-        .render_template(text, variables)
-        .map_err(|_| create_error!(RenderFail))
-}
-
-/// Send an email
-pub fn send_email(
-    smtp: &ApiSmtp,
-    address: String,
-    template: &Template,
-    variables: handlebars::JsonValue,
-) -> Result<()> {
-    let m = lettre::Message::builder()
-        .from(smtp.from_address.parse().expect("valid `smtp_from`"))
-        .to(address.parse().expect("valid `smtp_to`"))
-        .subject(template.title.clone());
-
-    let m = if let Some(reply_to) = &smtp.reply_to {
-        m.reply_to(reply_to.parse().expect("valid `smtp_reply_to`"))
-    } else {
-        m
-    };
-
-    let text = render_template(&template.text, &variables).expect("valid `template`");
-
-    let m = if let Some(html) = &template.html {
-        m.multipart(lettre::message::MultiPart::alternative_plain_html(
-            text,
-            render_template(html, &variables).expect("valid `template`"),
-        ))
-    } else {
-        m.body(text)
-    }
-    .expect("valid `message`");
-
-    use lettre::Transport;
-    let sender = create_transport(smtp);
-
-    match sender.send(&m) {
-        Ok(_) => Ok(()),
-        Err(error) => {
-            error!(
-                "Failed to send email to {}!\nlettre error: {}",
-                address, error
-            );
-
-            revolt_config::capture_error(&error);
-
-            Err(create_error!(EmailFailed))
-        }
-    }
-}
-
-pub fn validate_email(email: &str) -> Result<()> {
-    // Make sure this is an actual email
-    if !validator::validate_email(email) {
-        return Err(create_error!(IncorrectData {
-            with: "email".to_string()
-        }));
-    }
-
-    // Check if the email is blacklisted
-    if let Some(domain) = email.split('@').next_back() {
-        if REVOLT_SOURCE_LIST.contains(&domain.to_string()) {
-            return Err(create_error!(Blacklisted));
-        }
-    }
-
-    Ok(())
-}

crates/core/database/src/util/ip.rs

@@ -1,56 +0,0 @@
-#[cfg(feature = "rocket-impl")]
-pub mod rocket {
-    use revolt_config::config;
-    use rocket::Request;
-
-    pub fn to_ip(request: &'_ Request<'_>) -> String {
-        request
-            .client_ip()
-            .map(|x| x.to_string())
-            .unwrap_or_default()
-    }
-
-    /// Find the actual IP of the client
-    pub async fn to_real_ip(request: &'_ Request<'_>) -> String {
-        if config().await.api.security.trust_cloudflare {
-            request
-                .headers()
-                .get_one("CF-Connecting-IP")
-                .map(|x| x.to_string())
-                .unwrap_or_else(|| to_ip(request))
-        } else {
-            to_ip(request)
-        }
-    }
-}
-
-#[cfg(feature = "axum-impl")]
-pub mod axum {
-    use axum::{
-        extract::ConnectInfo,
-        http::request::Parts,
-    };
-    use revolt_config::config;
-    use std::net::SocketAddr;
-
-    pub fn to_ip(parts: &Parts) -> String {
-        parts
-            .extensions
-            .get::<ConnectInfo<SocketAddr>>()
-            .map(|info| info.ip().to_string())
-            .unwrap_or_default()
-    }
-
-    /// Find the actual IP of the client
-    pub async fn to_real_ip(parts: &Parts) -> String {
-        if config().await.api.security.trust_cloudflare {
-            parts
-                .headers
-                .get("CF-Connecting-IP")
-                .map(|x| x.to_str().unwrap().to_string())
-                .unwrap_or_else(|| to_ip(parts))
-        } else {
-            to_ip(parts)
-        }
-    }
-}

crates/core/database/src/util/mod.rs

@@ -1,17 +1,10 @@
 pub mod acker;
 pub mod bridge;
 pub mod bulk_permissions;
-pub mod captcha;
-pub mod chunked;
-pub mod email;
 mod funcs;
 pub mod idempotency;
-pub mod ip;
-pub mod password;
 pub mod permissions;
 pub mod reference;
-pub mod shield;
 pub mod test_fixtures;
 
 pub use funcs::*;
-pub use chunked::ChunkedDatabaseGenerator;

crates/core/database/src/util/password.rs

@@ -1,72 +0,0 @@
-use reqwest::Client;
-use sha1::Digest;
-use std::{collections::HashSet, sync::LazyLock};
-
-use revolt_config::config;
-use revolt_result::{Result, ToRevoltError};
-
-static CLIENT: LazyLock<Client> = LazyLock::new(Client::new);
-static ARGON_CONFIG: LazyLock<argon2::Config<'static>> = LazyLock::new(argon2::Config::default);
-static TOP_100K_COMPROMISED: LazyLock<HashSet<String>> = LazyLock::new(|| {
-    include_str!("../../assets/pwned100k.txt")
-        .split('\n')
-        .map(|x| x.into())
-        .collect()
-});
-
-#[derive(Deserialize)]
-struct EasyPwnedResult {
-    secure: bool,
-}
-
-/// Hash a password using argon2
-pub fn hash_password(plaintext_password: String) -> Result<String> {
-    argon2::hash_encoded(
-        plaintext_password.as_bytes(),
-        nanoid::nanoid!(24).as_bytes(),
-        &ARGON_CONFIG,
-    )
-    .to_internal_error()
-}
-
-pub async fn assert_safe(password: &str) -> Result<()> {
-    // Make sure the password is long enough.
-    if password.len() < 8 {
-        return Err(create_error!(ShortPassword));
-    }
-
-    let config = config().await;
-
-    if !config.api.security.easypwned.is_empty() {
-        let mut hasher = sha1::Sha1::new();
-        hasher.update(password);
-        let pwd_hash = hasher.finalize();
-
-        let result = match CLIENT
-            .get(format!(
-                "{}/hash/{pwd_hash:#02x}",
-                &config.api.security.easypwned
-            ))
-            .send()
-            .await
-        {
-            Ok(response) => match response.json::<EasyPwnedResult>().await {
-                Ok(result) => Ok(result.secure),
-                Err(e) => Err(e),
-            },
-            Err(e) => Err(e),
-        };
-
-        if let Err(e) = &result {
-            revolt_config::capture_error(e);
-        } else if result.is_ok_and(|b| b) {
-            return Ok(());
-        }
-    };
-
-    if TOP_100K_COMPROMISED.contains(password) {
-        return Err(create_error!(CompromisedPassword));
-    };
-
-    Ok(())
-}

crates/core/database/src/util/shield.rs

@@ -1,118 +0,0 @@
-use reqwest::Client;
-use revolt_config::config;
-use revolt_result::Result;
-use serde::{Deserialize, Serialize};
-use std::{collections::HashMap, sync::LazyLock};
-use crate::util::ip;
-
-static CLIENT: LazyLock<Client> = LazyLock::new(Client::new);
-
-#[derive(Serialize, Deserialize, Default, Debug)]
-pub struct ShieldValidationInput {
-    /// Remote user IP
-    pub ip: Option<String>,
-
-    /// User provided email
-    pub email: Option<String>,
-
-    /// Request headers
-    pub headers: Option<HashMap<String, String>>,
-
-    /// Skip alerts and monitoring for this request
-    pub dry_run: bool,
-}
-
-#[derive(Serialize, Deserialize)]
-pub struct ValidationResult {
-    /// Whether this request was blocked
-    blocked: bool,
-
-    /// Reasons for the request being blocked
-    reasons: Vec<String>,
-}
-
-pub async fn validate_shield(input: ShieldValidationInput) -> Result<()> {
-    let shield = config().await.api.security.shield;
-
-    if !shield.host.is_empty() {
-        if let Ok(response) = CLIENT
-            .post(format!("{}/validate", &shield.host))
-            .json(&input)
-            .header("Authorization", &shield.key)
-            .send()
-            .await
-        {
-            let result = response
-                .json::<ValidationResult>()
-                .await
-                .map_err(|_| create_error!(InternalError))?;
-
-            if result.blocked {
-                return Err(create_error!(BlockedByShield));
-            }
-        }
-    }
-
-    Ok(())
-}
-
-#[cfg(feature = "rocket-impl")]
-#[async_trait]
-impl<'r> rocket::request::FromRequest<'r> for ShieldValidationInput {
-    type Error = revolt_result::Error;
-
-    #[allow(clippy::collapsible_match)]
-    async fn from_request(
-        request: &'r rocket::Request<'_>,
-    ) -> rocket::request::Outcome<Self, Self::Error> {
-        rocket::request::Outcome::Success(ShieldValidationInput {
-            ip: Some(ip::rocket::to_real_ip(request).await),
-            headers: Some(
-                request
-                    .headers()
-                    .iter()
-                    .map(|entry| (entry.name.to_string(), entry.value.to_string()))
-                    .collect(),
-            ),
-            ..Default::default()
-        })
-    }
-}
-
-#[cfg(feature = "rocket-impl")]
-impl<'r> revolt_rocket_okapi::request::OpenApiFromRequest<'r> for ShieldValidationInput {
-    fn from_request_input(
-        _gen: &mut revolt_rocket_okapi::r#gen::OpenApiGenerator,
-        _name: String,
-        _required: bool,
-    ) -> revolt_rocket_okapi::Result<revolt_rocket_okapi::request::RequestHeaderInput> {
-        Ok(revolt_rocket_okapi::request::RequestHeaderInput::None)
-    }
-}
-#[cfg(feature = "axum-impl")]
-#[async_trait]
-impl<S> axum::extract::FromRequestParts<S> for ShieldValidationInput {
-    type Rejection = axum::Json<revolt_result::Error> ;
-
-    async fn from_request_parts(
-        parts: &mut axum::http::request::Parts,
-        _state: &S,
-    ) -> Result<Self, Self::Rejection> {
-        Ok(ShieldValidationInput {
-            ip: Some(ip::axum::to_real_ip(parts).await),
-            headers: Some(
-                parts
-                    .headers
-                    .iter()
-                    .map(|(name, value)| {
-                        (
-                            name.to_string(),
-                            value.to_str().map(|s| s.to_string()).unwrap_or_default(),
-                        )
-                    })
-                    .collect(),
-            ),
-            ..Default::default()
-        })
-    }
-}

crates/core/database/templates/deletion.html

@@ -42,7 +42,7 @@
                               <tbody>
                                 <tr>
                                   <td style="line-height: 24px; font-size: 16px; margin: 0;" align="left">
-                                    <img alt="Stoat Logo" class="w-24" src="https://stoat.chat/favicon-stoat.svg" style="height: auto; line-height: 100%; outline: none; text-decoration: none; display: block; width: 96px; border-style: none; border-width: 0;" width="96">
+                                    <img alt="Stoat Logo" class="w-24" src="https://stoat.chat/favicon.svg" 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>

crates/core/database/templates/deletion.original.html

@@ -9,7 +9,7 @@
 
 <body class="bg-light">
   <div class="container">
-    <img alt="Stoat Logo" class="ax-center my-10 w-24" src="https://stoat.chat/favicon-stoat.svg" />
+    <img alt="Stoat Logo" class="ax-center my-10 w-24" src="https://stoat.chat/favicon.svg" />
     <div class="card p-6 p-lg-10 space-y-4">
       <h1 class="h3 fw-700">Account Deletion</h1>
       <p>

crates/core/database/templates/reset-existing.html

@@ -42,7 +42,7 @@
                               <tbody>
                                 <tr>
                                   <td style="line-height: 24px; font-size: 16px; margin: 0;" align="left">
-                                    <img class="w-24" src="https://stoat.chat/favicon-stoat.svg" alt="Stoat Logo" style="height: auto; line-height: 100%; outline: none; text-decoration: none; display: block; width: 96px; border-style: none; border-width: 0;" width="96">
+                                    <img class="w-24" src="https://stoat.chat/favicon.svg" alt="Stoat Logo" 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>

crates/core/database/templates/reset-existing.original.html

@@ -9,7 +9,7 @@
     <div class="container">
       <img
         class="ax-center my-10 w-24"
-        src="https://stoat.chat/favicon-stoat.svg"
+        src="https://stoat.chat/favicon.svg"
         alt="Stoat Logo"
       />
       <div class="card p-6 p-lg-10 space-y-4">

crates/core/database/templates/reset.html

@@ -42,7 +42,7 @@
                               <tbody>
                                 <tr>
                                   <td style="line-height: 24px; font-size: 16px; margin: 0;" align="left">
-                                    <img class="w-24" src="https://stoat.chat/favicon-stoat.svg" alt="Stoat Logo" style="height: auto; line-height: 100%; outline: none; text-decoration: none; display: block; width: 96px; border-style: none; border-width: 0;" width="96">
+                                    <img class="w-24" src="https://stoat.chat/favicon.svg" alt="Stoat Logo" 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>

crates/core/database/templates/reset.original.html

@@ -9,7 +9,7 @@
 
 <body class="bg-light">
   <div class="container">
-    <img class="ax-center my-10 w-24" src="https://stoat.chat/favicon-stoat.svg" alt="Stoat Logo" />
+    <img class="ax-center my-10 w-24" src="https://stoat.chat/favicon.svg" alt="Stoat Logo" />
     <div class="card p-6 p-lg-10 space-y-4">
       <h1 class="h3 fw-700">Password Reset</h1>
       <p>You requested a password reset, click below to continue.</p>

crates/core/database/templates/suspension.html

@@ -42,7 +42,7 @@
                               <tbody>
                                 <tr>
                                   <td style="line-height: 24px; font-size: 16px; margin: 0;" align="left">
-                                    <img class="w-24" src="https://stoat.chat/favicon-stoat.svg" alt="Stoat Logo" style="height: auto; line-height: 100%; outline: none; text-decoration: none; display: block; width: 96px; border-style: none; border-width: 0;" width="96">
+                                    <img class="w-24" src="https://stoat.chat/favicon.svg" alt="Stoat Logo" 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>

crates/core/database/templates/suspension.original.html

@@ -9,7 +9,7 @@
 
 <body class="bg-light">
   <div class="container">
-    <img class="ax-center my-10 w-24" src="https://stoat.chat/favicon-stoat.svg" alt="Stoat Logo" />
+    <img class="ax-center my-10 w-24" src="https://stoat.chat/favicon.svg" alt="Stoat Logo" />
     <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>

crates/core/database/templates/verify.html

@@ -42,7 +42,7 @@
                               <tbody>
                                 <tr>
                                   <td style="line-height: 24px; font-size: 16px; margin: 0;" align="left">
-                                    <img class="w-24" src="https://stoat.chat/favicon-stoat.svg" alt="Stoat Logo" style="height: auto; line-height: 100%; outline: none; text-decoration: none; display: block; width: 96px; border-style: none; border-width: 0;" width="96">
+                                    <img class="w-24" src="https://stoat.chat/favicon.svg" alt="Stoat Logo" 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>

crates/core/database/templates/verify.original.html

@@ -9,7 +9,7 @@
 
 <body class="bg-light">
   <div class="container">
-    <img class="ax-center my-10 w-24" src="https://stoat.chat/favicon-stoat.svg" alt="Stoat Logo" />
+    <img class="ax-center my-10 w-24" src="https://stoat.chat/favicon.svg" alt="Stoat Logo" />
     <div class="card p-6 p-lg-10 space-y-4">
       <h1 class="h3 fw-700">Almost there!</h1>
       <p>To complete your sign up, we just need to verify your email.</p>