From ad0dcad49748bf8fd0892b4e8edd23175584d64d Mon Sep 17 00:00:00 2001
From: Zomatree <me@zomatree.live>
Date: Tue, 9 Apr 2024 02:18:34 +0100
Subject: [PATCH 01/62] initial livekit support

fix up code

undo changes to compose file

add back .env.example
---
 .gitignore                                    |    2 +
 Cargo.lock                                    | 3223 +++++++++++------
 Cargo.toml                                    |    3 +-
 crates/bonfire/src/events/impl.rs             |   26 +-
 crates/core/config/Revolt.toml                |    1 +
 crates/core/config/src/lib.rs                 |   12 +-
 crates/core/database/src/drivers/mod.rs       |    4 +-
 crates/core/database/src/drivers/mongodb.rs   |    1 +
 crates/core/database/src/drivers/reference.rs |    2 +-
 crates/core/database/src/events/client.rs     |   33 +-
 .../database/src/models/channels/model.rs     |    7 +-
 .../core/database/src/models/users/model.rs   |   10 +
 crates/core/database/src/util/bridge/v0.rs    |    4 +
 crates/core/models/src/v0/channels.rs         |   19 +-
 crates/core/result/src/lib.rs                 |    5 +-
 crates/core/result/src/rocket.rs              |    4 +-
 crates/delta/Cargo.toml                       |    3 +
 crates/delta/src/main.rs                      |    8 +
 .../delta/src/routes/channels/voice_join.rs   |  138 +-
 crates/delta/src/routes/root.rs               |   13 +-
 crates/delta/src/util/test.rs                 |    2 +-
 crates/voice-ingress/.gitignore               |    1 +
 crates/voice-ingress/Cargo.toml               |   44 +
 crates/voice-ingress/Dockerfile               |   11 +
 crates/voice-ingress/src/main.rs              |   75 +
 rust-toolchain.toml                           |    2 +
 26 files changed, 2358 insertions(+), 1295 deletions(-)
 create mode 100644 crates/voice-ingress/.gitignore
 create mode 100644 crates/voice-ingress/Cargo.toml
 create mode 100644 crates/voice-ingress/Dockerfile
 create mode 100644 crates/voice-ingress/src/main.rs
 create mode 100644 rust-toolchain.toml

diff --git a/.gitignore b/.gitignore
index 943bcfead..6293bc546 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,5 @@ target
 
 .vercel
 .DS_Store
+
+livekit.yml
\ No newline at end of file
diff --git a/Cargo.lock b/Cargo.lock
index 98fb375cf..10f7a1c2f 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4,9 +4,9 @@ version = 3
 
 [[package]]
 name = "addr2line"
-version = "0.17.0"
+version = "0.21.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b9ecd88a8c8378ca913a680cd98f0f13ac67383d35993f86c90a70e3f137816b"
+checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb"
 dependencies = [
  "gimli",
 ]
@@ -19,30 +19,30 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
 
 [[package]]
 name = "aead"
-version = "0.4.3"
+version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b613b8e1e3cf911a086f53f03bf286f52fd7a7258e4fa606f0ef220d39d8877"
+checksum = "d122413f284cf2d62fb1b7db97e02edb8cda96d769b16e443a4f6195e35662b0"
 dependencies = [
- "generic-array 0.14.5",
+ "crypto-common",
+ "generic-array 0.14.7",
 ]
 
 [[package]]
 name = "aes"
-version = "0.7.5"
+version = "0.8.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e8b47f52ea9bae42228d07ec09eb676433d7c4ed1ebdf0f1d1c29ed446f1ab8"
+checksum = "b169f7a6d4742236a0a00c541b845991d0ac43e546831af1249753ab4c3aa3a0"
 dependencies = [
  "cfg-if",
  "cipher",
  "cpufeatures",
- "opaque-debug 0.3.0",
 ]
 
 [[package]]
 name = "aes-gcm"
-version = "0.9.4"
+version = "0.10.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df5f85a83a7d8b0442b6aa7b504b8212c1733da07b98aae43d4bc21b2cb3cdf6"
+checksum = "831010a0f742e1209b3bcea8fab6a8e149051ba6099432c8cb2cc117dec3ead1"
 dependencies = [
  "aead",
  "aes",
@@ -54,9 +54,9 @@ dependencies = [
 
 [[package]]
 name = "ahash"
-version = "0.7.6"
+version = "0.7.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47"
+checksum = "891477e0c6a8957309ee5c45a6368af3ae14bb510732d2684ffa19af310920f9"
 dependencies = [
  "getrandom",
  "once_cell",
@@ -65,20 +65,22 @@ dependencies = [
 
 [[package]]
 name = "ahash"
-version = "0.8.3"
+version = "0.8.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2c99f64d1e06488f620f932677e24bc6e2897582980441ae90a671415bd7ec2f"
+checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011"
 dependencies = [
  "cfg-if",
+ "getrandom",
  "once_cell",
  "version_check",
+ "zerocopy",
 ]
 
 [[package]]
 name = "aho-corasick"
-version = "0.7.18"
+version = "1.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e37cfd5e7657ada45f742d6e99ca5788580b5c529dc78faf11ece6dc702656f"
+checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916"
 dependencies = [
  "memchr",
 ]
@@ -90,37 +92,43 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5"
 
 [[package]]
-name = "ansi_term"
-version = "0.12.1"
+name = "android-tzdata"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0"
+
+[[package]]
+name = "android_system_properties"
+version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2"
+checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311"
 dependencies = [
- "winapi",
+ "libc",
 ]
 
 [[package]]
 name = "anyhow"
-version = "1.0.68"
+version = "1.0.81"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2cb2f989d18dd141ab8ae82f64d1a8cdd37e0840f73a406896cf5e99502fab61"
+checksum = "0952808a6c2afd1aa8947271f3a60f1a6763c7b912d210184c5149b5cf147247"
 
 [[package]]
 name = "arc-swap"
-version = "1.6.0"
+version = "1.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bddcadddf5e9015d310179a59bb28c4d4b9920ad0f11e8e14dbadf654890c9a6"
+checksum = "69f7f8c3906b62b754cd5326047894316021dcfe5a194c8ea52bdd94934a3457"
 
 [[package]]
 name = "arrayref"
-version = "0.3.6"
+version = "0.3.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4c527152e37cf757a3f78aae5a06fbeefdb07ccc535c980a3208ee3060dd544"
+checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545"
 
 [[package]]
 name = "arrayvec"
-version = "0.7.2"
+version = "0.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8da52d66c7071e2e3fa2a1e5c6d088fec47b593032b254f5e980de8ea54454d6"
+checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
 
 [[package]]
 name = "async-attributes"
@@ -128,69 +136,102 @@ version = "1.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a3203e79f4dd9bdda415ed03cf14dae5a2bf775c683a00f94e9cd1faf0f596e5"
 dependencies = [
- "quote 1.0.26",
- "syn 1.0.107",
+ "quote 1.0.35",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "async-channel"
+version = "1.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "81953c529336010edd6d8e358f886d9581267795c61b19475b71314bffa46d35"
+dependencies = [
+ "concurrent-queue",
+ "event-listener 2.5.3",
+ "futures-core",
 ]
 
 [[package]]
 name = "async-channel"
-version = "1.6.1"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2114d64672151c0c5eaa5e131ec84a74f06e1e559830dabba01ca30605d66319"
+checksum = "f28243a43d821d11341ab73c80bed182dc015c514b951616cf79bd4af39af0c3"
 dependencies = [
  "concurrent-queue",
- "event-listener",
+ "event-listener 5.3.0",
+ "event-listener-strategy 0.5.1",
  "futures-core",
+ "pin-project-lite 0.2.14",
 ]
 
 [[package]]
 name = "async-executor"
-version = "1.4.1"
+version = "1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "871f9bb5e0a22eeb7e8cf16641feb87c9dc67032ccf8ff49e772eb9941d3a965"
+checksum = "5f98c37cf288e302c16ef6c8472aad1e034c6c84ce5ea7b8101c98eb4a802fee"
 dependencies = [
+ "async-lock 3.3.0",
  "async-task",
  "concurrent-queue",
- "fastrand",
- "futures-lite",
- "once_cell",
+ "fastrand 2.0.2",
+ "futures-lite 2.3.0",
  "slab",
 ]
 
 [[package]]
 name = "async-global-executor"
-version = "2.1.0"
+version = "2.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fd8b508d585e01084059b60f06ade4cb7415cd2e4084b71dd1cb44e7d3fb9880"
+checksum = "05b1b633a2115cd122d73b955eadd9916c18c8f510ec9cd1686404c60ad1c29c"
 dependencies = [
- "async-channel",
+ "async-channel 2.2.0",
  "async-executor",
- "async-io",
- "async-lock",
+ "async-io 2.3.2",
+ "async-lock 3.3.0",
  "blocking",
- "futures-lite",
+ "futures-lite 2.3.0",
  "once_cell",
  "tokio 0.2.25",
- "tokio 1.35.1",
+ "tokio 1.37.0",
 ]
 
 [[package]]
 name = "async-io"
-version = "1.7.0"
+version = "1.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5e18f61464ae81cde0a23e713ae8fd299580c54d697a35820cfd0625b8b0e07"
+checksum = "0fc5b45d93ef0529756f812ca52e44c221b35341892d3dcc34132ac02f3dd2af"
 dependencies = [
+ "async-lock 2.8.0",
+ "autocfg 1.2.0",
+ "cfg-if",
  "concurrent-queue",
- "futures-lite",
- "libc",
+ "futures-lite 1.13.0",
  "log",
- "once_cell",
  "parking",
- "polling",
+ "polling 2.8.0",
+ "rustix 0.37.27",
  "slab",
- "socket2 0.4.4",
+ "socket2 0.4.10",
  "waker-fn",
- "winapi",
+]
+
+[[package]]
+name = "async-io"
+version = "2.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dcccb0f599cfa2f8ace422d3555572f47424da5648a4382a9dd0310ff8210884"
+dependencies = [
+ "async-lock 3.3.0",
+ "cfg-if",
+ "concurrent-queue",
+ "futures-io",
+ "futures-lite 2.3.0",
+ "parking",
+ "polling 3.6.0",
+ "rustix 0.38.32",
+ "slab",
+ "tracing",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -199,35 +240,64 @@ version = "2.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "287272293e9d8c41773cec55e365490fe034813a2f172f502d6ddcf75b2f582b"
 dependencies = [
- "event-listener",
+ "event-listener 2.5.3",
+]
+
+[[package]]
+name = "async-lock"
+version = "3.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d034b430882f8381900d3fe6f0aaa3ad94f2cb4ac519b429692a1bc2dda4ae7b"
+dependencies = [
+ "event-listener 4.0.3",
+ "event-listener-strategy 0.4.0",
+ "pin-project-lite 0.2.14",
 ]
 
 [[package]]
 name = "async-process"
-version = "1.4.0"
+version = "1.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf2c06e30a24e8c78a3987d07f0930edf76ef35e027e7bdb063fccafdad1f60c"
+checksum = "ea6438ba0a08d81529c69b36700fa2f95837bfe3e776ab39cde9c14d9149da88"
 dependencies = [
- "async-io",
+ "async-io 1.13.0",
+ "async-lock 2.8.0",
+ "async-signal",
  "blocking",
  "cfg-if",
- "event-listener",
- "futures-lite",
- "libc",
- "once_cell",
- "signal-hook",
- "winapi",
+ "event-listener 3.1.0",
+ "futures-lite 1.13.0",
+ "rustix 0.38.32",
+ "windows-sys 0.48.0",
 ]
 
 [[package]]
 name = "async-recursion"
-version = "1.0.4"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e97ce7de6cf12de5d7226c73f5ba9811622f4db3a5b91b55c53e987e5f91cba"
+checksum = "30c5ef0ede93efbf733c1a727f3b6b5a1060bbedd5600183e66f6e4be4af0ec5"
 dependencies = [
  "proc-macro2",
- "quote 1.0.26",
- "syn 2.0.15",
+ "quote 1.0.35",
+ "syn 2.0.58",
+]
+
+[[package]]
+name = "async-signal"
+version = "0.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9e47d90f65a225c4527103a8d747001fc56e375203592b25ad103e1ca13124c5"
+dependencies = [
+ "async-io 2.3.2",
+ "async-lock 2.8.0",
+ "atomic-waker",
+ "cfg-if",
+ "futures-core",
+ "futures-io",
+ "rustix 0.38.32",
+ "signal-hook-registry",
+ "slab",
+ "windows-sys 0.48.0",
 ]
 
 [[package]]
@@ -237,22 +307,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "62565bb4402e926b29953c785397c6dc0391b7b446e45008b0049eb43cec6f5d"
 dependencies = [
  "async-attributes",
- "async-channel",
+ "async-channel 1.9.0",
  "async-global-executor",
- "async-io",
- "async-lock",
+ "async-io 1.13.0",
+ "async-lock 2.8.0",
  "async-process",
  "crossbeam-utils",
  "futures-channel",
  "futures-core",
  "futures-io",
- "futures-lite",
+ "futures-lite 1.13.0",
  "gloo-timers",
  "kv-log-macro",
  "log",
  "memchr",
  "once_cell",
- "pin-project-lite 0.2.13",
+ "pin-project-lite 0.2.14",
  "pin-utils",
  "slab",
  "wasm-bindgen-futures",
@@ -269,46 +339,47 @@ dependencies = [
  "futures-io",
  "futures-util",
  "pin-utils",
- "socket2 0.4.4",
+ "socket2 0.4.10",
  "trust-dns-resolver",
 ]
 
 [[package]]
 name = "async-stream"
-version = "0.3.3"
+version = "0.3.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dad5c83079eae9969be7fadefe640a1c566901f05ff91ab221de4b6f68d9507e"
+checksum = "cd56dd203fef61ac097dd65721a419ddccb106b2d2b70ba60a6b529f03961a51"
 dependencies = [
  "async-stream-impl",
  "futures-core",
+ "pin-project-lite 0.2.14",
 ]
 
 [[package]]
 name = "async-stream-impl"
-version = "0.3.3"
+version = "0.3.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "10f203db73a71dfa2fb6dd22763990fa26f3d2625a6da2da900d23b87d26be27"
+checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193"
 dependencies = [
  "proc-macro2",
- "quote 1.0.26",
- "syn 1.0.107",
+ "quote 1.0.35",
+ "syn 2.0.58",
 ]
 
 [[package]]
 name = "async-task"
-version = "4.2.0"
+version = "4.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30696a84d817107fc028e049980e09d5e140e8da8f1caeb17e8e950658a3cea9"
+checksum = "fbb36e985947064623dbd357f727af08ffd077f93d696782f3c56365fa2e2799"
 
 [[package]]
 name = "async-trait"
-version = "0.1.56"
+version = "0.1.79"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96cf8829f67d2eab0b2dfa42c5d0ef737e0724e4a82b01b3e292456202b19716"
+checksum = "a507401cad91ec6a857ed5513a2073c82a9b9048762b885bb98655b306964681"
 dependencies = [
  "proc-macro2",
- "quote 1.0.26",
- "syn 1.0.107",
+ "quote 1.0.35",
+ "syn 2.0.58",
 ]
 
 [[package]]
@@ -321,24 +392,30 @@ dependencies = [
  "futures-io",
  "futures-util",
  "log",
- "pin-project-lite 0.2.13",
+ "pin-project-lite 0.2.14",
  "tungstenite",
 ]
 
 [[package]]
 name = "atomic"
-version = "0.5.1"
+version = "0.5.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c59bdb34bc650a32731b31bd8f0829cc15d24a708ee31559e0bb34f2bc320cba"
+
+[[package]]
+name = "atomic"
+version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b88d82667eca772c4aa12f0f1348b3ae643424c8876448f3f7bd5787032e234c"
+checksum = "8d818003e740b63afc82337e3160717f4f63078720a810b7b903e70a5d1d2994"
 dependencies = [
- "autocfg 1.1.0",
+ "bytemuck",
 ]
 
 [[package]]
 name = "atomic-waker"
-version = "1.0.0"
+version = "1.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "065374052e7df7ee4047b1160cca5e1467a12351a40b3da123c870ba0b8eda2a"
+checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0"
 
 [[package]]
 name = "atty"
@@ -346,7 +423,7 @@ version = "0.2.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
 dependencies = [
- "hermit-abi",
+ "hermit-abi 0.1.19",
  "libc",
  "winapi",
 ]
@@ -364,7 +441,7 @@ dependencies = [
  "chrono",
  "futures",
  "handlebars",
- "iso8601-timestamp 0.1.10",
+ "iso8601-timestamp 0.1.11",
  "lazy_static",
  "lettre",
  "log",
@@ -397,20 +474,20 @@ version = "0.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0dde43e75fd43e8a1bf86103336bc699aa8d17ad1be60c76c0bdfd4828e19b78"
 dependencies = [
- "autocfg 1.1.0",
+ "autocfg 1.2.0",
 ]
 
 [[package]]
 name = "autocfg"
-version = "1.1.0"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
+checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80"
 
 [[package]]
 name = "backtrace"
-version = "0.3.65"
+version = "0.3.71"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "11a17d453482a265fd5f8479f2a3f405566e6ca627837aaddb85af8b1ab8ef61"
+checksum = "26b05800d2e817c8b3b4b54abd461726265fa9789ae34330622f2db9ee696f9d"
 dependencies = [
  "addr2line",
  "cc",
@@ -423,9 +500,9 @@ dependencies = [
 
 [[package]]
 name = "base16ct"
-version = "0.1.1"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "349a06037c7bf932dd7e7d1f653678b2038b9ad46a74102f1fc7bd7872678cce"
+checksum = "4c7f02d4ea65f2c1853089ffd8d2787bdbc63de2f0d29dedbcf8ccdfa0ccd4cf"
 
 [[package]]
 name = "base32"
@@ -435,15 +512,27 @@ checksum = "23ce669cd6c8588f79e15cf450314f9638f967fc5770ff1c7c1deb0925ea7cfa"
 
 [[package]]
 name = "base64"
-version = "0.13.0"
+version = "0.13.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8"
+
+[[package]]
+name = "base64"
+version = "0.20.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0ea22880d78093b0cbe17c89f64a7d457941e65759157ec6cb31a31d652b05e5"
+
+[[package]]
+name = "base64"
+version = "0.21.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd"
+checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567"
 
 [[package]]
 name = "base64"
-version = "0.21.3"
+version = "0.22.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "414dcefbc63d77c526a76b3afcf6fbb9b5e2791c19c3aa2297733208750c6e53"
+checksum = "9475866fec1451be56a3c2400fd081ff546538961565ccb5b7142cbd22bc7a51"
 
 [[package]]
 name = "base64ct"
@@ -485,96 +574,97 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
 [[package]]
-name = "blake2b_simd"
-version = "1.0.0"
+name = "bitflags"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72936ee4afc7f8f736d1c38383b56480b5497b4617b4a77bdbf1d2ababc76127"
-dependencies = [
- "arrayref",
- "arrayvec",
- "constant_time_eq",
-]
+checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
 
 [[package]]
-name = "block-buffer"
-version = "0.7.3"
+name = "bitvec"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0940dc441f31689269e10ac70eb1002a3a1d3ad1390e030043662eb7fe4688b"
+checksum = "1bc2832c24239b0141d5674bb9174f9d68a8b5b3f2753311927c172ca46f7e9c"
 dependencies = [
- "block-padding",
- "byte-tools",
- "byteorder",
- "generic-array 0.12.4",
+ "funty",
+ "radium",
+ "tap",
+ "wyz",
 ]
 
 [[package]]
-name = "block-buffer"
-version = "0.10.2"
+name = "blake2b_simd"
+version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0bf7fe51849ea569fd452f37822f606a5cabb684dc918707a0193fd4664ff324"
+checksum = "23285ad32269793932e830392f2fe2f83e26488fd3ec778883a93c8323735780"
 dependencies = [
- "generic-array 0.14.5",
+ "arrayref",
+ "arrayvec",
+ "constant_time_eq",
 ]
 
 [[package]]
-name = "block-padding"
-version = "0.1.5"
+name = "block-buffer"
+version = "0.10.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa79dedbb091f449f1f39e53edf88d5dbe95f895dae6135a8d7b881fb5af73f5"
+checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71"
 dependencies = [
- "byte-tools",
+ "generic-array 0.14.7",
 ]
 
 [[package]]
 name = "blocking"
-version = "1.2.0"
+version = "1.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c6ccb65d468978a086b69884437ded69a90faab3bbe6e67f242173ea728acccc"
+checksum = "6a37913e8dc4ddcc604f0c6d3bf2887c995153af3611de9e23c352b44c1b9118"
 dependencies = [
- "async-channel",
+ "async-channel 2.2.0",
+ "async-lock 3.3.0",
  "async-task",
- "atomic-waker",
- "fastrand",
- "futures-lite",
- "once_cell",
+ "fastrand 2.0.2",
+ "futures-io",
+ "futures-lite 2.3.0",
+ "piper",
+ "tracing",
 ]
 
 [[package]]
 name = "bson"
-version = "2.2.0"
+version = "2.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f60a2c7c80a7850b56df4b8e98e8e4932c34877b8add4f13e8350499cc1e4572"
+checksum = "4d43b38e074cc0de2957f10947e376a1d88b9c4dbab340b590800cc1b2e066b2"
 dependencies = [
- "ahash 0.7.6",
- "base64 0.13.0",
- "chrono",
+ "ahash 0.8.11",
+ "base64 0.13.1",
+ "bitvec",
  "hex",
- "indexmap",
- "lazy_static",
+ "indexmap 2.2.6",
+ "js-sys",
+ "once_cell",
  "rand 0.8.5",
  "serde",
  "serde_bytes",
  "serde_json",
- "uuid 0.8.2",
+ "time",
+ "uuid",
 ]
 
 [[package]]
 name = "bumpalo"
-version = "3.10.0"
+version = "3.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "37ccbd214614c6783386c1af30caf03192f17891059cecc394b4fb119e363de3"
+checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c"
 
 [[package]]
-name = "byte-tools"
-version = "0.3.1"
+name = "bytemuck"
+version = "1.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3b5ca7a04898ad4bcd41c90c5285445ff5b791899bb1b0abdd2a2aa791211d7"
+checksum = "5d6d68c57235a3a081186990eca2867354726650f42f7516ca50c28d6281fd15"
 
 [[package]]
 name = "byteorder"
-version = "1.4.3"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610"
+checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
 
 [[package]]
 name = "bytes"
@@ -584,9 +674,9 @@ checksum = "0e4cec68f03f32e44924783795810fa50a7035d8c8ebe78580ad7e6c703fba38"
 
 [[package]]
 name = "bytes"
-version = "1.5.0"
+version = "1.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223"
+checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9"
 
 [[package]]
 name = "bytes-utils"
@@ -594,16 +684,10 @@ version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7dafe3a8757b027e2be6e4e5601ed563c55989fcf1546e933c66c8eb3a058d35"
 dependencies = [
- "bytes 1.5.0",
+ "bytes 1.6.0",
  "either",
 ]
 
-[[package]]
-name = "cache-padded"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1db59621ec70f09c5e9b597b220c7a2b43611f4710dc03ceb8748637775692c"
-
 [[package]]
 name = "cached"
 version = "0.44.0"
@@ -618,7 +702,7 @@ dependencies = [
  "instant",
  "once_cell",
  "thiserror",
- "tokio 1.35.1",
+ "tokio 1.37.0",
 ]
 
 [[package]]
@@ -630,15 +714,15 @@ dependencies = [
  "cached_proc_macro_types",
  "darling 0.14.4",
  "proc-macro2",
- "quote 1.0.26",
- "syn 1.0.107",
+ "quote 1.0.35",
+ "syn 1.0.109",
 ]
 
 [[package]]
 name = "cached_proc_macro_types"
-version = "0.1.0"
+version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3a4f925191b4367301851c6d99b09890311d74b0d43f274c0b34c86d308a3663"
+checksum = "ade8366b8bd5ba243f0a58f036cc0ca8a2f069cff1a2351ef1cac6b083e16fc0"
 
 [[package]]
 name = "castaway"
@@ -648,11 +732,12 @@ checksum = "a2698f953def977c68f935bb0dfa959375ad4638570e969e2f1e9f433cbf1af6"
 
 [[package]]
 name = "cc"
-version = "1.0.73"
+version = "1.0.92"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2fff2a6927b3bb87f9595d67196a70493f627687a71d87a0d692242c33f58c11"
+checksum = "2678b2e3449475e95b0aa6f9b506a28e61b3dc8996592b983695e8ebb58a8b41"
 dependencies = [
  "jobserver",
+ "libc",
 ]
 
 [[package]]
@@ -663,26 +748,26 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
 [[package]]
 name = "chrono"
-version = "0.4.19"
+version = "0.4.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "670ad68c9088c2a963aaa298cb369688cf3f9465ce5e2d4ca10e6e0098a1ce73"
+checksum = "8a0d04d43504c61aa6c7531f1871dd0d418d91130162063b789da00fd7057a5e"
 dependencies = [
+ "android-tzdata",
+ "iana-time-zone",
  "js-sys",
- "libc",
- "num-integer",
  "num-traits",
- "time 0.1.44",
  "wasm-bindgen",
- "winapi",
+ "windows-targets 0.52.4",
 ]
 
 [[package]]
 name = "cipher"
-version = "0.3.0"
+version = "0.4.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ee52072ec15386f770805afd189a01c8841be8696bed250fa2f13c4c0d6dfb7"
+checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad"
 dependencies = [
- "generic-array 0.14.5",
+ "crypto-common",
+ "inout",
 ]
 
 [[package]]
@@ -691,49 +776,48 @@ version = "0.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f"
 dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
 ]
 
 [[package]]
 name = "coarsetime"
-version = "0.1.23"
+version = "0.1.34"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a90d114103adbc625300f346d4d09dfb4ab1c4a8df6868435dd903392ecf4354"
+checksum = "13b3839cf01bb7960114be3ccf2340f541b6d0c81f8690b007b2b39f750f7e5d"
 dependencies = [
  "libc",
- "once_cell",
- "wasi 0.11.0+wasi-snapshot-preview1",
+ "wasix",
  "wasm-bindgen",
 ]
 
 [[package]]
 name = "combine"
-version = "4.6.4"
+version = "4.6.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a604e93b79d1808327a6fca85a6f2d69de66461e7620f5a4cbf5fb4d1d7c948"
+checksum = "35ed6e9d84f0b51a7f52daf1c7d71dd136fd7a3f41a8462b8cdb8c78d920fad4"
 dependencies = [
- "bytes 1.5.0",
+ "bytes 1.6.0",
  "futures-core",
  "memchr",
- "pin-project-lite 0.2.13",
- "tokio 1.35.1",
- "tokio-util 0.7.2",
+ "pin-project-lite 0.2.14",
+ "tokio 1.37.0",
+ "tokio-util",
 ]
 
 [[package]]
 name = "concurrent-queue"
-version = "1.2.2"
+version = "2.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30ed07550be01594c6026cff2a1d7fe9c8f683caa798e12b68694ac9e88286a3"
+checksum = "d16048cd947b08fa32c24458a22f5dc5e835264f689f4f5653210c69fd107363"
 dependencies = [
- "cache-padded",
+ "crossbeam-utils",
 ]
 
 [[package]]
 name = "config"
-version = "0.13.3"
+version = "0.13.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d379af7f68bfc21714c6c7dea883544201741d2ce8274bb12fa54f89507f52a7"
+checksum = "23738e11972c7643e4ec947840fc463b6a571afcd3e735bdfce7d03c7a784aca"
 dependencies = [
  "async-trait",
  "json5",
@@ -744,7 +828,7 @@ dependencies = [
  "rust-ini",
  "serde",
  "serde_json",
- "toml",
+ "toml 0.5.11",
  "yaml-rust",
 ]
 
@@ -756,45 +840,65 @@ checksum = "9d6f2aa4d0537bcc1c74df8755072bd31c1ef1a3a1b85a68e8404a8c353b7b8b"
 
 [[package]]
 name = "const-oid"
-version = "0.9.5"
+version = "0.9.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "28c122c3980598d243d63d9a704629a2d748d101f278052ff068be5a4423ab6f"
+checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8"
 
 [[package]]
 name = "constant_time_eq"
-version = "0.1.5"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f7144d30dcf0fafbce74250a3963025d8d52177934239851c917d29f1df280c2"
+
+[[package]]
+name = "convert_case"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc"
+checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e"
 
 [[package]]
 name = "cookie"
-version = "0.16.0"
+version = "0.16.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94d4706de1b0fa5b132270cddffa8585166037822e260a944fe161acd137ca05"
+checksum = "e859cd57d0710d9e06c381b550c06e76992472a8c6d527aecd2fc673dcc231fb"
 dependencies = [
  "aes-gcm",
- "base64 0.13.0",
+ "base64 0.20.0",
  "hkdf",
  "hmac",
  "percent-encoding",
  "rand 0.8.5",
  "sha2",
  "subtle",
- "time 0.3.17",
+ "time",
+ "version_check",
+]
+
+[[package]]
+name = "cookie"
+version = "0.18.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4ddef33a339a91ea89fb53151bd0a4689cfce27055c291dfa69945475d22c747"
+dependencies = [
+ "percent-encoding",
+ "time",
  "version_check",
 ]
 
 [[package]]
 name = "cookie-factory"
-version = "0.3.2"
+version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "396de984970346b0d9e93d1415082923c679e5ae5c3ee3dcbd104f5610af126b"
+checksum = "9885fa71e26b8ab7855e2ec7cae6e9b380edff76cd052e07c683a0319d51b3a2"
+dependencies = [
+ "futures",
+]
 
 [[package]]
 name = "core-foundation"
-version = "0.9.3"
+version = "0.9.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146"
+checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f"
 dependencies = [
  "core-foundation-sys",
  "libc",
@@ -802,15 +906,15 @@ dependencies = [
 
 [[package]]
 name = "core-foundation-sys"
-version = "0.8.3"
+version = "0.8.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc"
+checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f"
 
 [[package]]
 name = "cpufeatures"
-version = "0.2.2"
+version = "0.2.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "59a6001667ab124aebae2a495118e11d30984c3a653e99d86d58971708cf5e4b"
+checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504"
 dependencies = [
  "libc",
 ]
@@ -823,43 +927,39 @@ checksum = "338089f42c427b86394a5ee60ff321da23a5c89c9d89514c829687b26359fcff"
 
 [[package]]
 name = "crossbeam-queue"
-version = "0.3.5"
+version = "0.3.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f25d8400f4a7a5778f0e4e52384a48cbd9b5c495d110786187fc750075277a2"
+checksum = "df0346b5d5e76ac2fe4e327c5fd1118d6be7c51dfb18f9b7922923f287471e35"
 dependencies = [
- "cfg-if",
  "crossbeam-utils",
 ]
 
 [[package]]
 name = "crossbeam-utils"
-version = "0.8.8"
+version = "0.8.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0bf124c720b7686e3c2663cf54062ab0f68a88af2fb6a030e87e30bf721fcb38"
-dependencies = [
- "cfg-if",
- "lazy_static",
-]
+checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345"
 
 [[package]]
 name = "crypto-bigint"
-version = "0.4.9"
+version = "0.5.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ef2b4b23cddf68b89b8f8069890e8c270d54e2d5fe1b143820234805e4cb17ef"
+checksum = "0dc92fb57ca44df6db8059111ab3af99a63d5d0f8375d9972e319a379c6bab76"
 dependencies = [
- "generic-array 0.14.5",
- "rand_core 0.6.3",
+ "generic-array 0.14.7",
+ "rand_core 0.6.4",
  "subtle",
  "zeroize",
 ]
 
 [[package]]
 name = "crypto-common"
-version = "0.1.3"
+version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57952ca27b5e3606ff4dd79b0020231aaf9d6aa76dc05fd30137538c50bd3ce8"
+checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3"
 dependencies = [
- "generic-array 0.14.5",
+ "generic-array 0.14.7",
+ "rand_core 0.6.4",
  "typenum",
 ]
 
@@ -869,45 +969,35 @@ version = "1.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f3b7eb4404b8195a9abb6356f4ac07d8ba267045c8d6d220ac4dc992e6cc75df"
 
-[[package]]
-name = "ctor"
-version = "0.1.22"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f877be4f7c9f246b183111634f75baa039715e3f46ce860677d3b19a69fb229c"
-dependencies = [
- "quote 1.0.26",
- "syn 1.0.107",
-]
-
 [[package]]
 name = "ctr"
-version = "0.8.0"
+version = "0.9.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "049bb91fb4aaf0e3c7efa6cd5ef877dbbbd15b39dad06d9948de4ec8a75761ea"
+checksum = "0369ee1ad671834580515889b80f2ea915f23b8be8d0daa4bbaf2ac5c7590835"
 dependencies = [
  "cipher",
 ]
 
 [[package]]
 name = "curl"
-version = "0.4.44"
+version = "0.4.46"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "509bd11746c7ac09ebd19f0b17782eae80aadee26237658a6b4808afb5c11a22"
+checksum = "1e2161dd6eba090ff1594084e95fd67aeccf04382ffea77999ea94ed42ec67b6"
 dependencies = [
  "curl-sys",
  "libc",
  "openssl-probe",
  "openssl-sys",
  "schannel",
- "socket2 0.4.4",
- "winapi",
+ "socket2 0.5.6",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
 name = "curl-sys"
-version = "0.4.65+curl-8.2.1"
+version = "0.4.72+curl-8.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "961ba061c9ef2fe34bbd12b807152d96f0badd2bebe7b90ce6c8c8b7572a0986"
+checksum = "29cbdc8314c447d11e8fd156dcdd031d9e02a7a976163e396b548c03153bc9ea"
 dependencies = [
  "cc",
  "libc",
@@ -916,7 +1006,7 @@ dependencies = [
  "openssl-sys",
  "pkg-config",
  "vcpkg",
- "winapi",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -948,9 +1038,9 @@ dependencies = [
  "fnv",
  "ident_case",
  "proc-macro2",
- "quote 1.0.26",
+ "quote 1.0.35",
  "strsim",
- "syn 1.0.107",
+ "syn 1.0.109",
 ]
 
 [[package]]
@@ -962,9 +1052,9 @@ dependencies = [
  "fnv",
  "ident_case",
  "proc-macro2",
- "quote 1.0.26",
+ "quote 1.0.35",
  "strsim",
- "syn 1.0.107",
+ "syn 1.0.109",
 ]
 
 [[package]]
@@ -974,8 +1064,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9c972679f83bdf9c42bd905396b6c3588a843a17f0f16dfcfa3e2c5d57441835"
 dependencies = [
  "darling_core 0.13.4",
- "quote 1.0.26",
- "syn 1.0.107",
+ "quote 1.0.35",
+ "syn 1.0.109",
 ]
 
 [[package]]
@@ -985,27 +1075,28 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a4aab4dbc9f7611d8b55048a3a16d2d010c2c8334e46304b40ac1cc14bf3b48e"
 dependencies = [
  "darling_core 0.14.4",
- "quote 1.0.26",
- "syn 1.0.107",
+ "quote 1.0.35",
+ "syn 1.0.109",
 ]
 
 [[package]]
 name = "dashmap"
-version = "5.3.4"
+version = "5.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3495912c9c1ccf2e18976439f4443f3fee0fd61f424ff99fde6a66b15ecb448f"
+checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856"
 dependencies = [
  "cfg-if",
- "hashbrown 0.12.1",
+ "hashbrown 0.14.3",
  "lock_api",
+ "once_cell",
  "parking_lot_core",
 ]
 
 [[package]]
 name = "data-encoding"
-version = "2.3.2"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3ee2393c4a91429dffb4bedf19f4d6abf27d8a732c8ce4980305d782e5426d57"
+checksum = "7e962a19be5cfc3f3bf6dd8f61eb50107f356ad6270fbb3ed41476571db78be5"
 
 [[package]]
 name = "deadqueue"
@@ -1014,7 +1105,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "16a2561fd313df162315935989dceb8c99db4ee1933358270a57a3cfb8c957f3"
 dependencies = [
  "crossbeam-queue",
- "tokio 1.35.1",
+ "tokio 1.37.0",
 ]
 
 [[package]]
@@ -1024,14 +1115,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bef552e6f588e446098f6ba40d89ac146c8c7b64aade83c051ee00bb5d2bc18d"
 dependencies = [
  "serde",
- "uuid 1.4.1",
+ "uuid",
 ]
 
 [[package]]
 name = "decancer"
-version = "1.6.2"
+version = "1.6.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "808127a7de612079ec37bfc1abc48ed77a6015a971a8bd7d4178d79147cbc839"
+checksum = "080b09f6adad25c23d8c47c54e52e59b0dc09d079c4b23e0f147dac440359d0d"
 
 [[package]]
 name = "der"
@@ -1049,8 +1140,19 @@ version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f1a467a65c5e759bce6e65eaf91cc29f466cdc57cb65777bd646872a8a1fd4de"
 dependencies = [
- "const-oid 0.9.5",
- "pem-rfc7468",
+ "const-oid 0.9.6",
+ "pem-rfc7468 0.6.0",
+ "zeroize",
+]
+
+[[package]]
+name = "der"
+version = "0.7.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f55bf8e7b65898637379c1b74eb1551107c8294ed26d855ceb9fd1a09cfc9bc0"
+dependencies = [
+ "const-oid 0.9.6",
+ "pem-rfc7468 0.7.0",
  "zeroize",
 ]
 
@@ -1061,11 +1163,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8aed3b3c608dc56cf36c45fe979d04eda51242e6703d8d0bb03426ef7c41db6a"
 dependencies = [
  "proc-macro2",
- "quote 1.0.26",
- "syn 1.0.107",
+ "quote 1.0.35",
+ "syn 1.0.109",
  "synstructure",
 ]
 
+[[package]]
+name = "deranged"
+version = "0.3.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4"
+dependencies = [
+ "powerfmt",
+]
+
 [[package]]
 name = "derivative"
 version = "2.2.0"
@@ -1073,8 +1184,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b"
 dependencies = [
  "proc-macro2",
- "quote 1.0.26",
- "syn 1.0.107",
+ "quote 1.0.35",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "derive_more"
+version = "0.99.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321"
+dependencies = [
+ "convert_case",
+ "proc-macro2",
+ "quote 1.0.35",
+ "rustc_version 0.4.0",
+ "syn 1.0.109",
 ]
 
 [[package]]
@@ -1094,7 +1218,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "123c73e7a6e51b05c75fe1a1b2f4e241399ea5740ed810b0e3e6cacd9db5e7b2"
 dependencies = [
  "devise_core",
- "quote 1.0.26",
+ "quote 1.0.35",
 ]
 
 [[package]]
@@ -1103,20 +1227,11 @@ version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "841ef46f4787d9097405cac4e70fb8644fc037b526e8c14054247c0263c400d0"
 dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
  "proc-macro2",
- "proc-macro2-diagnostics",
- "quote 1.0.26",
- "syn 1.0.107",
-]
-
-[[package]]
-name = "digest"
-version = "0.8.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f3d0c8c8752312f9713efd397ff63acb9f85585afbf179282e720e7704954dd5"
-dependencies = [
- "generic-array 0.12.4",
+ "proc-macro2-diagnostics 0.9.1",
+ "quote 1.0.35",
+ "syn 1.0.109",
 ]
 
 [[package]]
@@ -1125,8 +1240,8 @@ version = "0.10.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292"
 dependencies = [
- "block-buffer 0.10.2",
- "const-oid 0.9.5",
+ "block-buffer",
+ "const-oid 0.9.6",
  "crypto-common",
  "subtle",
 ]
@@ -1145,29 +1260,31 @@ checksum = "77c90badedccf4105eca100756a0b1289e191f6fcbdadd3cee1d2f614f97da8f"
 
 [[package]]
 name = "dyn-clone"
-version = "1.0.5"
+version = "1.0.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21e50f3adc76d6a43f5ed73b698a87d0760ca74617f60f7c3b879003536fdd28"
+checksum = "0d6ef0072f8a535281e4876be788938b528e9a1d43900b82c2569af7da799125"
 
 [[package]]
 name = "ecdsa"
-version = "0.14.8"
+version = "0.16.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "413301934810f597c1d19ca71c8710e99a3f1ba28a0d2ebc01551a2daeea3c5c"
+checksum = "ee27f32b5c5292967d2d4a9d7f1e0b0aed2c15daded5a60300e4abb9d8020bca"
 dependencies = [
- "der 0.6.1",
+ "der 0.7.9",
+ "digest",
  "elliptic-curve",
  "rfc6979",
- "signature",
+ "signature 2.2.0",
+ "spki 0.7.3",
 ]
 
 [[package]]
 name = "ece"
-version = "2.2.0"
+version = "2.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8dd5463ffecc0677adcd786c4481f73b215714d4757edf2eb37a573c03d00459"
+checksum = "c2ea1d2f2cc974957a4e2575d8e5bb494549bab66338d6320c2789abcfff5746"
 dependencies = [
- "base64 0.13.0",
+ "base64 0.21.7",
  "byteorder",
  "hex",
  "hkdf",
@@ -1181,9 +1298,9 @@ dependencies = [
 
 [[package]]
 name = "ed25519-compact"
-version = "2.0.4"
+version = "2.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a3d382e8464107391c8706b4c14b087808ecb909f6c15c34114bc42e53a9e4c"
+checksum = "e9b3460f44bea8cd47f45a0c70892f1eff856d97cd55358b2f73f663789f6190"
 dependencies = [
  "ct-codecs",
  "getrandom",
@@ -1191,27 +1308,26 @@ dependencies = [
 
 [[package]]
 name = "either"
-version = "1.6.1"
+version = "1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457"
+checksum = "11157ac094ffbdde99aa67b23417ebdd801842852b500e395a45a9c0aac03e4a"
 
 [[package]]
 name = "elliptic-curve"
-version = "0.12.3"
+version = "0.13.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7bb888ab5300a19b8e5bceef25ac745ad065f3c9f7efc6de1b91958110891d3"
+checksum = "b5e6043086bf7973472e0c7dff2142ea0b680d30e18d9cc40f267efbf222bd47"
 dependencies = [
  "base16ct",
  "crypto-bigint",
- "der 0.6.1",
- "digest 0.10.7",
+ "digest",
  "ff",
- "generic-array 0.14.5",
+ "generic-array 0.14.7",
  "group",
  "hkdf",
- "pem-rfc7468",
- "pkcs8",
- "rand_core 0.6.3",
+ "pem-rfc7468 0.7.0",
+ "pkcs8 0.10.2",
+ "rand_core 0.6.4",
  "sec1",
  "subtle",
  "zeroize",
@@ -1219,18 +1335,25 @@ dependencies = [
 
 [[package]]
 name = "email-encoding"
-version = "0.1.0"
+version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6690291166824e467790ac08ba42f241791567e8337bbf00c5a6e87889629f98"
+checksum = "a87260449b06739ee78d6281c68d2a0ff3e3af64a78df63d3a1aeb3c06997c8a"
 dependencies = [
- "base64 0.13.0",
+ "base64 0.22.0",
+ "memchr",
 ]
 
+[[package]]
+name = "email_address"
+version = "0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e2153bd83ebc09db15bcbdc3e2194d901804952e3dc96967e1cd3b0c5c32d112"
+
 [[package]]
 name = "encoding_rs"
-version = "0.8.31"
+version = "0.8.33"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9852635589dc9f9ea1b6fe9f05b50ef208c85c834a562f0c6abb1c475736ec2b"
+checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1"
 dependencies = [
  "cfg-if",
 ]
@@ -1241,30 +1364,30 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "21cdad81446a7f7dc43f6a77409efeb9733d2fa65553efef6018ef257c959b73"
 dependencies = [
- "heck",
+ "heck 0.4.1",
  "proc-macro2",
- "quote 1.0.26",
- "syn 1.0.107",
+ "quote 1.0.35",
+ "syn 1.0.109",
 ]
 
 [[package]]
 name = "enum-iterator"
-version = "1.2.0"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "91a4ec26efacf4aeff80887a175a419493cb6f8b5480d26387eb0bd038976187"
+checksum = "9fd242f399be1da0a5354aa462d57b4ab2b4ee0683cc552f7c007d2d12d36e94"
 dependencies = [
  "enum-iterator-derive",
 ]
 
 [[package]]
 name = "enum-iterator-derive"
-version = "1.1.0"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "828de45d0ca18782232dfb8f3ea9cc428e8ced380eb26a520baaacfc70de39ce"
+checksum = "03cdc46ec28bd728e67540c528013c6a10eb69a02eb31078a1bda695438cbfb8"
 dependencies = [
  "proc-macro2",
- "quote 1.0.26",
- "syn 1.0.107",
+ "quote 1.0.35",
+ "syn 2.0.58",
 ]
 
 [[package]]
@@ -1281,35 +1404,104 @@ dependencies = [
 ]
 
 [[package]]
-name = "erased-serde"
-version = "0.3.20"
+name = "equivalent"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad132dd8d0d0b546348d7d86cb3191aad14b34e5f979781fc005c80d4ac67ffd"
-dependencies = [
+checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
+
+[[package]]
+name = "erased-serde"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6c138974f9d5e7fe373eb04df7cae98833802ae4b11c24ac7039a21d5af4b26c"
+dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "errno"
+version = "0.3.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245"
+dependencies = [
+ "libc",
+ "windows-sys 0.52.0",
+]
+
 [[package]]
 name = "event-listener"
-version = "2.5.2"
+version = "2.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77f3309417938f28bf8228fcff79a4a37103981e3e186d2ccd19c74b38f4eb71"
+checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0"
 
 [[package]]
-name = "fake-simd"
-version = "0.1.2"
+name = "event-listener"
+version = "3.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d93877bcde0eb80ca09131a08d23f0a5c18a620b01db137dba666d18cd9b30c2"
+dependencies = [
+ "concurrent-queue",
+ "parking",
+ "pin-project-lite 0.2.14",
+]
+
+[[package]]
+name = "event-listener"
+version = "4.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "67b215c49b2b248c855fb73579eb1f4f26c38ffdc12973e20e07b91d78d5646e"
+dependencies = [
+ "concurrent-queue",
+ "parking",
+ "pin-project-lite 0.2.14",
+]
+
+[[package]]
+name = "event-listener"
+version = "5.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6d9944b8ca13534cdfb2800775f8dd4902ff3fc75a50101466decadfdf322a24"
+dependencies = [
+ "concurrent-queue",
+ "parking",
+ "pin-project-lite 0.2.14",
+]
+
+[[package]]
+name = "event-listener-strategy"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "958e4d70b6d5e81971bebec42271ec641e7ff4e170a6fa605f2b8a8b65cb97d3"
+dependencies = [
+ "event-listener 4.0.3",
+ "pin-project-lite 0.2.14",
+]
+
+[[package]]
+name = "event-listener-strategy"
+version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e88a8acf291dafb59c2d96e8f59828f3838bb1a70398823ade51a84de6a6deed"
+checksum = "332f51cb23d20b0de8458b86580878211da09bcd4503cb579c225b3d124cabb3"
+dependencies = [
+ "event-listener 5.3.0",
+ "pin-project-lite 0.2.14",
+]
 
 [[package]]
 name = "fastrand"
-version = "1.7.0"
+version = "1.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3fcf0cee53519c866c09b5de1f6c56ff9d647101f81c1964fa632e148896cdf"
+checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be"
 dependencies = [
  "instant",
 ]
 
+[[package]]
+name = "fastrand"
+version = "2.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "658bd65b1cf4c852a3cc96f18a8ce7b5640f6b703f905c7d74532294c2a63984"
+
 [[package]]
 name = "fcm"
 version = "0.9.2"
@@ -1326,24 +1518,24 @@ dependencies = [
 
 [[package]]
 name = "ff"
-version = "0.12.1"
+version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d013fc25338cc558c5c2cfbad646908fb23591e2404481826742b651c9af7160"
+checksum = "ded41244b729663b1e574f1b4fb731469f69f79c17667b5d776b16cda0479449"
 dependencies = [
- "rand_core 0.6.3",
+ "rand_core 0.6.4",
  "subtle",
 ]
 
 [[package]]
 name = "figment"
-version = "0.10.6"
+version = "0.10.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "790b4292c72618abbab50f787a477014fe15634f96291de45672ce46afe122df"
+checksum = "7270677e7067213e04f323b55084586195f18308cd7546cfac9f873344ccceb6"
 dependencies = [
- "atomic",
+ "atomic 0.6.0",
  "pear",
  "serde",
- "toml",
+ "toml 0.8.12",
  "uncased",
  "version_check",
 ]
@@ -1360,6 +1552,18 @@ dependencies = [
  "winapi",
 ]
 
+[[package]]
+name = "finl_unicode"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8fcfdc7a0362c9f4444381a9e697c79d435fe65b52a37466fc2c1184cee9edc6"
+
+[[package]]
+name = "fixedbitset"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80"
+
 [[package]]
 name = "float-cmp"
 version = "0.9.0"
@@ -1401,27 +1605,26 @@ dependencies = [
 
 [[package]]
 name = "fred"
-version = "8.0.1"
+version = "8.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d3b2a2ac060e3266004c552235c241b481e438e2b1ea75715ea1176914ef2868"
+checksum = "4b8e3a1339ed45ad8fde94530c4bdcbd5f371a3c6bd3bf57682923792830aa37"
 dependencies = [
  "arc-swap",
  "async-trait",
- "bytes 1.5.0",
+ "bytes 1.6.0",
  "bytes-utils",
  "crossbeam-queue",
  "float-cmp",
  "futures",
- "lazy_static",
  "log",
  "parking_lot",
  "rand 0.8.5",
  "redis-protocol",
- "semver 1.0.9",
- "socket2 0.5.5",
- "tokio 1.35.1",
+ "semver 1.0.22",
+ "socket2 0.5.6",
+ "tokio 1.37.0",
  "tokio-stream",
- "tokio-util 0.7.2",
+ "tokio-util",
  "url",
  "urlencoding",
 ]
@@ -1432,11 +1635,17 @@ version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba"
 
+[[package]]
+name = "funty"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c"
+
 [[package]]
 name = "futures"
-version = "0.3.21"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f73fe65f54d1e12b726f517d3e2135ca3125a437b6d998caf1962961f7172d9e"
+checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0"
 dependencies = [
  "futures-channel",
  "futures-core",
@@ -1449,9 +1658,9 @@ dependencies = [
 
 [[package]]
 name = "futures-channel"
-version = "0.3.21"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3083ce4b914124575708913bca19bfe887522d6e2e6d0952943f5eac4a74010"
+checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78"
 dependencies = [
  "futures-core",
  "futures-sink",
@@ -1459,15 +1668,15 @@ dependencies = [
 
 [[package]]
 name = "futures-core"
-version = "0.3.21"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c09fd04b7e4073ac7156a9539b57a484a8ea920f79c7c675d05d289ab6110d3"
+checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d"
 
 [[package]]
 name = "futures-executor"
-version = "0.3.21"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9420b90cfa29e327d0429f19be13e7ddb68fa1cccb09d65e5706b8c7a749b8a6"
+checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d"
 dependencies = [
  "futures-core",
  "futures-task",
@@ -1476,25 +1685,38 @@ dependencies = [
 
 [[package]]
 name = "futures-io"
-version = "0.3.21"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fc4045962a5a5e935ee2fdedaa4e08284547402885ab326734432bed5d12966b"
+checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1"
 
 [[package]]
 name = "futures-lite"
-version = "1.12.0"
+version = "1.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7694489acd39452c77daa48516b894c153f192c3578d5a839b62c58099fcbf48"
+checksum = "49a9d51ce47660b1e808d3c990b4709f2f415d928835a17dfd16991515c46bce"
 dependencies = [
- "fastrand",
+ "fastrand 1.9.0",
  "futures-core",
  "futures-io",
  "memchr",
  "parking",
- "pin-project-lite 0.2.13",
+ "pin-project-lite 0.2.14",
  "waker-fn",
 ]
 
+[[package]]
+name = "futures-lite"
+version = "2.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "52527eb5074e35e9339c6b4e8d12600c7128b68fb25dcb9fa9dec18f7c25f3a5"
+dependencies = [
+ "fastrand 2.0.2",
+ "futures-core",
+ "futures-io",
+ "parking",
+ "pin-project-lite 0.2.14",
+]
+
 [[package]]
 name = "futures-locks"
 version = "0.7.1"
@@ -1503,43 +1725,43 @@ checksum = "45ec6fe3675af967e67c5536c0b9d44e34e6c52f86bedc4ea49c5317b8e94d06"
 dependencies = [
  "futures-channel",
  "futures-task",
- "tokio 1.35.1",
+ "tokio 1.37.0",
 ]
 
 [[package]]
 name = "futures-macro"
-version = "0.3.21"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "33c1e13800337f4d4d7a316bf45a567dbcb6ffe087f16424852d97e97a91f512"
+checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac"
 dependencies = [
  "proc-macro2",
- "quote 1.0.26",
- "syn 1.0.107",
+ "quote 1.0.35",
+ "syn 2.0.58",
 ]
 
 [[package]]
 name = "futures-sink"
-version = "0.3.21"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21163e139fa306126e6eedaf49ecdb4588f939600f0b1e770f4205ee4b7fa868"
+checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5"
 
 [[package]]
 name = "futures-task"
-version = "0.3.21"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57c66a976bf5909d801bbef33416c41372779507e7a6b3a5e25e4749c58f776a"
+checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004"
 
 [[package]]
 name = "futures-timer"
-version = "3.0.2"
+version = "3.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e64b03909df88034c26dc1547e8970b91f98bdb65165d6a4e9110d94263dbb2c"
+checksum = "f288b0a4f20f9a56b5d1da57e2227c661b7b16168e2f72365f57b63326e29b24"
 
 [[package]]
 name = "futures-util"
-version = "0.3.21"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d8b7abd5d659d9b90c8cba917f6ec750a74e2dc23902ef9cd4cc8c8b22e6036a"
+checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48"
 dependencies = [
  "futures-channel",
  "futures-core",
@@ -1548,52 +1770,55 @@ dependencies = [
  "futures-sink",
  "futures-task",
  "memchr",
- "pin-project-lite 0.2.13",
+ "pin-project-lite 0.2.14",
  "pin-utils",
  "slab",
 ]
 
 [[package]]
 name = "generator"
-version = "0.7.0"
+version = "0.7.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1d9279ca822891c1a4dae06d185612cf8fc6acfe5dff37781b41297811b12ee"
+checksum = "5cc16584ff22b460a382b7feec54b23d2908d858152e5739a120b949293bd74e"
 dependencies = [
  "cc",
  "libc",
  "log",
  "rustversion",
- "winapi",
+ "windows",
 ]
 
 [[package]]
 name = "generic-array"
-version = "0.12.4"
+version = "0.14.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ffdf9f34f1447443d37393cc6c2b8313aebddcd96906caf34e54c68d8e57d7bd"
+checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a"
 dependencies = [
  "typenum",
+ "version_check",
+ "zeroize",
 ]
 
 [[package]]
 name = "generic-array"
-version = "0.14.5"
+version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fd48d33ec7f05fbfa152300fdad764757cbded343c1aa1cff2fbaf4134851803"
+checksum = "fe739944a5406424e080edccb6add95685130b9f160d5407c639c7df0c5836b0"
 dependencies = [
  "typenum",
- "version_check",
 ]
 
 [[package]]
 name = "getrandom"
-version = "0.2.6"
+version = "0.2.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9be70c98951c83b8d2f8f60d7065fa6d5146873094452a1008da8c2f1e4205ad"
+checksum = "94b22e06ecb0110981051723910cbf0b5f5e09a2062dd7663334ee79a9d1286c"
 dependencies = [
  "cfg-if",
+ "js-sys",
  "libc",
- "wasi 0.10.0+wasi-snapshot-preview1",
+ "wasi",
+ "wasm-bindgen",
 ]
 
 [[package]]
@@ -1604,33 +1829,33 @@ checksum = "e45727250e75cc04ff2846a66397da8ef2b3db8e40e0cef4df67950a07621eb9"
 dependencies = [
  "proc-macro-error",
  "proc-macro2",
- "quote 1.0.26",
- "syn 1.0.107",
+ "quote 1.0.35",
+ "syn 1.0.109",
 ]
 
 [[package]]
 name = "ghash"
-version = "0.4.4"
+version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1583cc1656d7839fd3732b80cf4f38850336cdb9b8ded1cd399ca62958de3c99"
+checksum = "f0d8a4362ccb29cb0b265253fb0a2728f592895ee6854fd9bc13f2ffda266ff1"
 dependencies = [
- "opaque-debug 0.3.0",
+ "opaque-debug",
  "polyval",
 ]
 
 [[package]]
 name = "gimli"
-version = "0.26.1"
+version = "0.28.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78cc372d058dcf6d5ecd98510e7fbc9e5aec4d21de70f65fea8fecebcd881bd4"
+checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253"
 
 [[package]]
 name = "git2"
-version = "0.15.0"
+version = "0.16.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2994bee4a3a6a51eb90c218523be382fd7ea09b16380b9312e9dbe955ff7c7d1"
+checksum = "ccf7f68c2995f392c49fffb4f95ae2c873297830eb25c6bc4c114ce8f4562acc"
 dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
  "libc",
  "libgit2-sys",
  "log",
@@ -1639,15 +1864,15 @@ dependencies = [
 
 [[package]]
 name = "glob"
-version = "0.3.0"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574"
+checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b"
 
 [[package]]
 name = "gloo-timers"
-version = "0.2.4"
+version = "0.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5fb7d06c1c8cc2a29bee7ec961009a0b2caa0793ee4900c2ffb348734ba1c8f9"
+checksum = "9b995a66bb87bebce9a0f4a95aed01daca4872c050bfcb21653361c03bc35e5c"
 dependencies = [
  "futures-channel",
  "futures-core",
@@ -1657,39 +1882,39 @@ dependencies = [
 
 [[package]]
 name = "group"
-version = "0.12.1"
+version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5dfbfb3a6cfbd390d5c9564ab283a0349b9b9fcd46a706c1eb10e0db70bfbac7"
+checksum = "f0f9ef7462f7c099f518d754361858f86d8a07af53ba9af0fe635bbccb151a63"
 dependencies = [
  "ff",
- "rand_core 0.6.3",
+ "rand_core 0.6.4",
  "subtle",
 ]
 
 [[package]]
 name = "h2"
-version = "0.3.13"
+version = "0.3.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "37a82c6d637fc9515a4694bbf1cb2457b79d81ce52b3108bdeea58b07dd34a57"
+checksum = "81fe527a889e1532da5c525686d96d4c2e74cdd345badf8dfef9f6b39dd5f5e8"
 dependencies = [
- "bytes 1.5.0",
+ "bytes 1.6.0",
  "fnv",
  "futures-core",
  "futures-sink",
  "futures-util",
  "http",
- "indexmap",
+ "indexmap 2.2.6",
  "slab",
- "tokio 1.35.1",
- "tokio-util 0.7.2",
+ "tokio 1.37.0",
+ "tokio-util",
  "tracing",
 ]
 
 [[package]]
 name = "handlebars"
-version = "4.3.0"
+version = "4.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d113a9853e5accd30f43003560b5563ffbb007e3f325e8b103fa0d0029c6e6df"
+checksum = "faa67bab9ff362228eb3d00bd024a4965d8231bbb7921167f0cfa66c6626b225"
 dependencies = [
  "log",
  "pest",
@@ -1701,20 +1926,11 @@ dependencies = [
 
 [[package]]
 name = "hashbrown"
-version = "0.11.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e"
-dependencies = [
- "ahash 0.7.6",
-]
-
-[[package]]
-name = "hashbrown"
-version = "0.12.1"
+version = "0.12.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "db0d4cf898abf0081f964436dc980e96670a0f36863e4b83aaacdb65c9d7ccc3"
+checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
 dependencies = [
- "ahash 0.7.6",
+ "ahash 0.7.8",
 ]
 
 [[package]]
@@ -1725,19 +1941,25 @@ checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e"
 
 [[package]]
 name = "hashbrown"
-version = "0.14.0"
+version = "0.14.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a"
+checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604"
 dependencies = [
- "ahash 0.8.3",
+ "ahash 0.8.11",
  "allocator-api2",
 ]
 
 [[package]]
 name = "heck"
-version = "0.4.0"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2540771e65fc8cb83cd6e8a237f70c319bd5c29f78ed1084ba5d50eeac86f7f9"
+checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
+
+[[package]]
+name = "heck"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
 
 [[package]]
 name = "hermit-abi"
@@ -1748,6 +1970,12 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "hermit-abi"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024"
+
 [[package]]
 name = "hex"
 version = "0.4.3"
@@ -1756,9 +1984,9 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
 
 [[package]]
 name = "hkdf"
-version = "0.12.3"
+version = "0.12.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "791a029f6b9fc27657f6f188ec6e5e43f6911f6f878e0dc5501396e09809d437"
+checksum = "7b5f8eb2ad728638ea2c7d47a21db23b7b58a72ed6a38256b8a1849f15fbbdf7"
 dependencies = [
  "hmac",
 ]
@@ -1769,7 +1997,7 @@ version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e"
 dependencies = [
- "digest 0.10.7",
+ "digest",
 ]
 
 [[package]]
@@ -1784,7 +2012,7 @@ version = "1.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3688e69b38018fec1557254f64c8dc2cc8ec502890182f395dbb0aa997aa5735"
 dependencies = [
- "digest 0.10.7",
+ "digest",
 ]
 
 [[package]]
@@ -1793,7 +2021,7 @@ version = "1.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e4ce1f4656bae589a3fab938f9f09bf58645b7ed01a2c5f8a3c238e01a4ef78a"
 dependencies = [
- "digest 0.10.7",
+ "digest",
 ]
 
 [[package]]
@@ -1809,37 +2037,37 @@ dependencies = [
 
 [[package]]
 name = "http"
-version = "0.2.7"
+version = "0.2.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ff8670570af52249509a86f5e3e18a08c60b177071826898fde8997cf5f6bfbb"
+checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1"
 dependencies = [
- "bytes 1.5.0",
+ "bytes 1.6.0",
  "fnv",
  "itoa",
 ]
 
 [[package]]
 name = "http-body"
-version = "0.4.5"
+version = "0.4.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1"
+checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2"
 dependencies = [
- "bytes 1.5.0",
+ "bytes 1.6.0",
  "http",
- "pin-project-lite 0.2.13",
+ "pin-project-lite 0.2.14",
 ]
 
 [[package]]
 name = "httparse"
-version = "1.7.1"
+version = "1.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "496ce29bb5a52785b44e0f7ca2847ae0bb839c9bd28f69acac9b99d461c0c04c"
+checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904"
 
 [[package]]
 name = "httpdate"
-version = "1.0.2"
+version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421"
+checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9"
 
 [[package]]
 name = "humantime"
@@ -1852,11 +2080,11 @@ dependencies = [
 
 [[package]]
 name = "hyper"
-version = "0.14.19"
+version = "0.14.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "42dc3c131584288d375f2d07f822b0cb012d8c6fb899a5b9fdb3cb7eb9b6004f"
+checksum = "bf96e135eb83a2a8ddf766e426a841d8ddd7449d5f00d34ea02b41d2f19eef80"
 dependencies = [
- "bytes 1.5.0",
+ "bytes 1.6.0",
  "futures-channel",
  "futures-core",
  "futures-util",
@@ -1866,9 +2094,9 @@ dependencies = [
  "httparse",
  "httpdate",
  "itoa",
- "pin-project-lite 0.2.13",
- "socket2 0.4.4",
- "tokio 1.35.1",
+ "pin-project-lite 0.2.14",
+ "socket2 0.5.6",
+ "tokio 1.37.0",
  "tower-service",
  "tracing",
  "want",
@@ -1880,13 +2108,36 @@ version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905"
 dependencies = [
- "bytes 1.5.0",
+ "bytes 1.6.0",
  "hyper",
  "native-tls",
- "tokio 1.35.1",
+ "tokio 1.37.0",
  "tokio-native-tls",
 ]
 
+[[package]]
+name = "iana-time-zone"
+version = "0.1.60"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141"
+dependencies = [
+ "android_system_properties",
+ "core-foundation-sys",
+ "iana-time-zone-haiku",
+ "js-sys",
+ "wasm-bindgen",
+ "windows-core",
+]
+
+[[package]]
+name = "iana-time-zone-haiku"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f"
+dependencies = [
+ "cc",
+]
+
 [[package]]
 name = "ident_case"
 version = "1.0.1"
@@ -1904,6 +2155,26 @@ dependencies = [
  "unicode-normalization",
 ]
 
+[[package]]
+name = "idna"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6"
+dependencies = [
+ "unicode-bidi",
+ "unicode-normalization",
+]
+
+[[package]]
+name = "idna"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c"
+dependencies = [
+ "unicode-bidi",
+ "unicode-normalization",
+]
+
 [[package]]
 name = "idna"
 version = "0.5.0"
@@ -1932,17 +2203,36 @@ version = "1.9.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99"
 dependencies = [
- "autocfg 1.1.0",
- "hashbrown 0.12.1",
+ "autocfg 1.2.0",
+ "hashbrown 0.12.3",
  "serde",
 ]
 
+[[package]]
+name = "indexmap"
+version = "2.2.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26"
+dependencies = [
+ "equivalent",
+ "hashbrown 0.14.3",
+]
+
 [[package]]
 name = "inlinable_string"
 version = "0.1.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c8fae54786f62fb2918dcfae3d568594e50eb9b5c25bf04371af6fe7516452fb"
 
+[[package]]
+name = "inout"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5"
+dependencies = [
+ "generic-array 0.14.7",
+]
+
 [[package]]
 name = "instant"
 version = "0.1.12"
@@ -1952,23 +2242,34 @@ dependencies = [
  "cfg-if",
 ]
 
+[[package]]
+name = "io-lifetimes"
+version = "1.0.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2"
+dependencies = [
+ "hermit-abi 0.3.9",
+ "libc",
+ "windows-sys 0.48.0",
+]
+
 [[package]]
 name = "ipconfig"
-version = "0.3.0"
+version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "723519edce41262b05d4143ceb95050e4c614f483e78e9fd9e39a8275a84ad98"
+checksum = "b58db92f96b720de98181bbbe63c831e87005ab460c1bf306eb2622b4707997f"
 dependencies = [
- "socket2 0.4.4",
+ "socket2 0.5.6",
  "widestring",
- "winapi",
- "winreg 0.7.0",
+ "windows-sys 0.48.0",
+ "winreg",
 ]
 
 [[package]]
 name = "ipnet"
-version = "2.5.0"
+version = "2.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "879d54834c8c76457ef4293a689b2a8c59b076067ad77b15efafbb05f92a592b"
+checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3"
 
 [[package]]
 name = "isahc"
@@ -1976,19 +2277,19 @@ version = "1.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "334e04b4d781f436dc315cb1e7515bd96826426345d498149e4bde36b67f8ee9"
 dependencies = [
- "async-channel",
+ "async-channel 1.9.0",
  "castaway",
  "crossbeam-utils",
  "curl",
  "curl-sys",
  "encoding_rs",
- "event-listener",
- "futures-lite",
+ "event-listener 2.5.3",
+ "futures-lite 1.13.0",
  "http",
  "log",
  "mime",
  "once_cell",
- "polling",
+ "polling 2.8.0",
  "serde",
  "serde_json",
  "slab",
@@ -2001,47 +2302,65 @@ dependencies = [
 
 [[package]]
 name = "iso8601-timestamp"
-version = "0.1.10"
+version = "0.1.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "56480a7792bfa284a4c7d1781f711de58e357dbb669c1b1a50c37c1777c9be92"
+checksum = "b088f3296223f11d6bd70998132653b30b6f39e6ab4be055c0bda486fa8d11c7"
 dependencies = [
- "generic-array 0.14.5",
+ "generic-array 0.14.7",
  "serde",
- "time 0.3.17",
+ "time",
 ]
 
 [[package]]
 name = "iso8601-timestamp"
-version = "0.2.11"
+version = "0.2.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3bd7663ae5b511b3d13c7d374dbe73b03da3da8e66b83950390173bc7c7325cc"
+checksum = "24d4e5d712dd664b11e778d1cfc06c79ba2700d6bc1771e44fb7b6a4656b487d"
 dependencies = [
- "generic-array 0.14.5",
+ "generic-array 1.0.0",
  "schemars",
  "serde",
- "time 0.3.17",
+ "time",
+]
+
+[[package]]
+name = "itertools"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57"
+dependencies = [
+ "either",
+]
+
+[[package]]
+name = "itertools"
+version = "0.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569"
+dependencies = [
+ "either",
 ]
 
 [[package]]
 name = "itoa"
-version = "1.0.2"
+version = "1.0.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "112c678d4050afce233f4f2852bb2eb519230b3cf12f33585275537d7e41578d"
+checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b"
 
 [[package]]
 name = "jobserver"
-version = "0.1.25"
+version = "0.1.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "068b1ee6743e4d11fb9c6a1e6064b3693a1b600e7f5f5988047d98b3dc9fb90b"
+checksum = "ab46a6e9526ddef3ae7f787c06f0f2600639ba80ea3eade3d8e670a2230f51d6"
 dependencies = [
  "libc",
 ]
 
 [[package]]
 name = "js-sys"
-version = "0.3.57"
+version = "0.3.69"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "671a26f820db17c2a2750743f1dd03bafd15b98c9f30c7c2628c024c05d73397"
+checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d"
 dependencies = [
  "wasm-bindgen",
 ]
@@ -2057,11 +2376,24 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "jsonwebtoken"
+version = "9.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b9ae10193d25051e74945f1ea2d0b42e03cc3b890f7e4cc5faa44997d808193f"
+dependencies = [
+ "base64 0.21.7",
+ "js-sys",
+ "ring 0.17.8",
+ "serde",
+ "serde_json",
+]
+
 [[package]]
 name = "jwt-simple"
-version = "0.11.2"
+version = "0.11.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "529a00f2d42d7dc349c994e65917c81bf53225831a65361f6c0454124c550f63"
+checksum = "357892bb32159d763abdea50733fadcb9a8e1c319a9aa77592db8555d05af83e"
 dependencies = [
  "anyhow",
  "binstring",
@@ -2078,21 +2410,23 @@ dependencies = [
  "rsa",
  "serde",
  "serde_json",
- "spki",
+ "spki 0.6.0",
  "thiserror",
  "zeroize",
 ]
 
 [[package]]
 name = "k256"
-version = "0.11.6"
+version = "0.13.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72c1e0b51e7ec0a97369623508396067a486bd0cbed95a2659a4b863d28cfc8b"
+checksum = "956ff9b67e26e1a6a866cb758f12c6f8746208489e3e4a4b5580802f2f0a587b"
 dependencies = [
  "cfg-if",
  "ecdsa",
  "elliptic-curve",
+ "once_cell",
  "sha2",
+ "signature 2.2.0",
 ]
 
 [[package]]
@@ -2115,23 +2449,25 @@ dependencies = [
 
 [[package]]
 name = "lettre"
-version = "0.10.0-rc.6"
+version = "0.10.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f6c70001f7ee6c93b6687a06607c7a38f9a7ae460139a496c23da21e95bc289"
+checksum = "76bd09637ae3ec7bd605b8e135e757980b3968430ff2b1a4a94fb7769e50166d"
 dependencies = [
- "base64 0.13.0",
+ "base64 0.21.7",
  "email-encoding",
- "fastrand",
+ "email_address",
+ "fastrand 1.9.0",
  "futures-util",
  "hostname",
  "httpdate",
- "idna 0.2.3",
+ "idna 0.3.0",
  "mime",
  "native-tls",
  "nom",
  "once_cell",
  "quoted_printable",
- "regex",
+ "socket2 0.4.10",
+ "tokio 1.37.0",
 ]
 
 [[package]]
@@ -2142,9 +2478,9 @@ checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd"
 
 [[package]]
 name = "libgit2-sys"
-version = "0.14.1+1.5.0"
+version = "0.14.2+1.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4a07fb2692bc3593bda59de45a502bb3071659f2c515e28c71e728306b038e17"
+checksum = "7f3d95f6b51075fe9810a7ae22c7095f12b98005ab364d8544797a825ce946a4"
 dependencies = [
  "cc",
  "libc",
@@ -2154,15 +2490,15 @@ dependencies = [
 
 [[package]]
 name = "libm"
-version = "0.2.7"
+version = "0.2.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7012b1bbb0719e1097c47611d3898568c546d597c2e74d66f6087edd5233ff4"
+checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058"
 
 [[package]]
 name = "libnghttp2-sys"
-version = "0.1.8+1.55.1"
+version = "0.1.9+1.58.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4fae956c192dadcdb5dace96db71fa0b827333cce7c7b38dc71446f024d8a340"
+checksum = "b57e858af2798e167e709b9d969325b6d8e9d50232fcbc494d7d54f976854a64"
 dependencies = [
  "cc",
  "libc",
@@ -2170,9 +2506,9 @@ dependencies = [
 
 [[package]]
 name = "libz-sys"
-version = "1.1.8"
+version = "1.1.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9702761c3935f8cc2f101793272e202c72b99da8f4224a19ddcf1279a6450bbf"
+checksum = "5e143b5e666b2695d28f6bca6497720813f699c9602dd7f5cac91008b8ada7f9"
 dependencies = [
  "cc",
  "libc",
@@ -2182,9 +2518,9 @@ dependencies = [
 
 [[package]]
 name = "linked-hash-map"
-version = "0.5.4"
+version = "0.5.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7fb9b38af92608140b86b693604b9ffcc5824240a484d1ecd4795bacb2fe88f3"
+checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f"
 
 [[package]]
 name = "linkify"
@@ -2204,23 +2540,72 @@ dependencies = [
  "memchr",
 ]
 
+[[package]]
+name = "linux-raw-sys"
+version = "0.3.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519"
+
+[[package]]
+name = "linux-raw-sys"
+version = "0.4.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c"
+
+[[package]]
+name = "livekit-api"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e20c3fc3de5944ce6b5c8da4084cf828bbae7216671e32e83b767ce61feeb7e0"
+dependencies = [
+ "base64 0.21.7",
+ "jsonwebtoken",
+ "livekit-protocol",
+ "log",
+ "parking_lot",
+ "prost",
+ "reqwest",
+ "scopeguard",
+ "serde",
+ "serde_json",
+ "sha2",
+ "thiserror",
+ "url",
+]
+
+[[package]]
+name = "livekit-protocol"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1a1bd23257110be29d024d8d816adff70df18ea1d22ceb1aab6f3ad4aab0d523"
+dependencies = [
+ "futures-util",
+ "parking_lot",
+ "pbjson",
+ "pbjson-types",
+ "prost",
+ "prost-types",
+ "serde",
+ "thiserror",
+ "tokio 1.37.0",
+]
+
 [[package]]
 name = "lock_api"
-version = "0.4.7"
+version = "0.4.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "327fa5b6a6940e4699ec49a9beae1ea4845c6bab9314e4f84ac68742139d8c53"
+checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45"
 dependencies = [
- "autocfg 1.1.0",
+ "autocfg 1.2.0",
  "scopeguard",
 ]
 
 [[package]]
 name = "log"
-version = "0.4.17"
+version = "0.4.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e"
+checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c"
 dependencies = [
- "cfg-if",
  "value-bag",
 ]
 
@@ -2241,20 +2626,20 @@ dependencies = [
 
 [[package]]
 name = "lru"
-version = "0.7.6"
+version = "0.7.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8015d95cb7b2ddd3c0d32ca38283ceb1eea09b4713ee380bceb942d85a244228"
+checksum = "e999beba7b6e8345721bd280141ed958096a2e4abdf74f67ff4ce49b4b54e47a"
 dependencies = [
- "hashbrown 0.11.2",
+ "hashbrown 0.12.3",
 ]
 
 [[package]]
 name = "lru"
-version = "0.11.0"
+version = "0.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eedb2bdbad7e0634f83989bf596f497b070130daaa398ab22d84c39e266deec5"
+checksum = "a4a83fb7698b3643a0e34f9ae6f2e8f0178c0fd42f8b59d493aa271ff3a5bf21"
 dependencies = [
- "hashbrown 0.14.0",
+ "hashbrown 0.14.3",
 ]
 
 [[package]]
@@ -2266,12 +2651,6 @@ dependencies = [
  "linked-hash-map",
 ]
 
-[[package]]
-name = "maplit"
-version = "1.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3e2e65a1a2e43cfcb47a895c4c8b10d1f4a61097f9f254f183aee60cad9c651d"
-
 [[package]]
 name = "match_cfg"
 version = "0.1.0"
@@ -2284,29 +2663,30 @@ version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558"
 dependencies = [
- "regex-automata",
+ "regex-automata 0.1.10",
 ]
 
 [[package]]
 name = "matches"
-version = "0.1.9"
+version = "0.1.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a3e378b66a060d48947b590737b30a1be76706c8dd7b8ba0f2fe3989c68a853f"
+checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5"
 
 [[package]]
 name = "md-5"
-version = "0.10.1"
+version = "0.10.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "658646b21e0b72f7866c7038ab086d3d5e1cd6271f060fd37defb241949d0582"
+checksum = "d89e7ee0cfbedfc4da3340218492196241d89eefb6dab27de5df917a6d2e78cf"
 dependencies = [
- "digest 0.10.7",
+ "cfg-if",
+ "digest",
 ]
 
 [[package]]
 name = "memchr"
-version = "2.5.0"
+version = "2.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d"
+checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d"
 
 [[package]]
 name = "metrics"
@@ -2314,7 +2694,7 @@ version = "0.18.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2e52eb6380b6d2a10eb3434aec0885374490f5b82c8aaf5cd487a183c98be834"
 dependencies = [
- "ahash 0.7.6",
+ "ahash 0.7.8",
  "metrics-macros",
 ]
 
@@ -2325,15 +2705,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "49e30813093f757be5cf21e50389a24dc7dbb22c49f23b7e8f51d69b508a5ffa"
 dependencies = [
  "proc-macro2",
- "quote 1.0.26",
- "syn 1.0.107",
+ "quote 1.0.35",
+ "syn 1.0.109",
 ]
 
 [[package]]
 name = "mime"
-version = "0.3.16"
+version = "0.3.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d"
+checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a"
 
 [[package]]
 name = "minimal-lexical"
@@ -2343,29 +2723,29 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
 
 [[package]]
 name = "miniz_oxide"
-version = "0.5.3"
+version = "0.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f5c75688da582b8ffc1f1799e9db273f32133c49e048f614d22ec3256773ccc"
+checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7"
 dependencies = [
  "adler",
 ]
 
 [[package]]
 name = "mio"
-version = "0.8.10"
+version = "0.8.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f3d0b296e374a4e6f3c7b0a1f5a51d748a0d34c85e7dc48fc3fa9a87657fe09"
+checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c"
 dependencies = [
  "libc",
- "wasi 0.11.0+wasi-snapshot-preview1",
+ "wasi",
  "windows-sys 0.48.0",
 ]
 
 [[package]]
 name = "mobc"
-version = "0.8.1"
+version = "0.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fc79c4a77e312fee9c7bd4b957c12ad1196db73c4a81e5c0b13f02083c4f7f2f"
+checksum = "90eb49dc5d193287ff80e72a86f34cfb27aae562299d22fea215e06ea1059dd3"
 dependencies = [
  "async-std",
  "async-trait",
@@ -2376,43 +2756,44 @@ dependencies = [
  "log",
  "metrics",
  "thiserror",
- "tokio 1.35.1",
+ "tokio 1.37.0",
  "tracing",
  "tracing-subscriber",
 ]
 
 [[package]]
 name = "mobc-redis"
-version = "0.8.0"
+version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7bd8e2fd6bf7e35263b86662e663a9496a0352ceddd413b6c33313c36d5068fd"
+checksum = "5e90cc63bd181da5c1f826427d26a63ab0ad1927462b2411aaa86e5f6be3d6b1"
 dependencies = [
  "mobc",
- "redis 0.22.3",
+ "redis",
 ]
 
 [[package]]
 name = "mongodb"
-version = "2.2.2"
+version = "2.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "28f3943e379e9dcaaab9dc319c308a8caaf9e7ff083c6838dff740afbba59df7"
+checksum = "16928502631c0db72214720aa479c722397fe5aed6bf1c740a3830b3fe4bfcfe"
 dependencies = [
  "async-std",
  "async-std-resolver",
  "async-trait",
- "base64 0.13.0",
- "bitflags",
+ "base64 0.13.1",
+ "bitflags 1.3.2",
  "bson",
  "chrono",
  "derivative",
+ "derive_more",
  "futures-core",
  "futures-executor",
+ "futures-io",
  "futures-util",
  "hex",
  "hmac",
  "lazy_static",
  "md-5",
- "os_info",
  "pbkdf2",
  "percent-encoding",
  "rand 0.8.5",
@@ -2421,30 +2802,30 @@ dependencies = [
  "rustls-pemfile",
  "serde",
  "serde_with",
- "sha-1 0.10.0",
+ "sha-1",
  "sha2",
- "socket2 0.4.4",
+ "socket2 0.4.10",
  "stringprep",
  "strsim",
  "take_mut",
  "thiserror",
- "tokio 1.35.1",
+ "tokio 1.37.0",
  "tokio-rustls",
- "tokio-util 0.7.2",
+ "tokio-util",
  "trust-dns-proto",
  "trust-dns-resolver",
  "typed-builder",
- "uuid 0.8.2",
+ "uuid",
  "webpki-roots",
 ]
 
 [[package]]
 name = "multer"
-version = "2.0.2"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f8f35e687561d5c1667590911e6698a8cb714a134a7505718a182e7bc9d3836"
+checksum = "01acbdc23469fd8fe07ab135923371d5f5a422fbf9c522158677c8eb15bc51c2"
 dependencies = [
- "bytes 1.5.0",
+ "bytes 1.6.0",
  "encoding_rs",
  "futures-util",
  "http",
@@ -2452,12 +2833,18 @@ dependencies = [
  "log",
  "memchr",
  "mime",
- "spin 0.9.3",
- "tokio 1.35.1",
- "tokio-util 0.6.10",
+ "spin 0.9.8",
+ "tokio 1.37.0",
+ "tokio-util",
  "version_check",
 ]
 
+[[package]]
+name = "multimap"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "defc4c55412d89136f966bbb339008b474350e5e6e78d2714439c386b3137a03"
+
 [[package]]
 name = "nanoid"
 version = "0.4.0"
@@ -2469,9 +2856,9 @@ dependencies = [
 
 [[package]]
 name = "native-tls"
-version = "0.2.10"
+version = "0.2.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fd7e2f3618557f980e0b17e8856252eee3c97fa12c54dff0ca290fb6266ca4a9"
+checksum = "07226173c32f2926027b63cce4bcd8076c3552846cbe7925f3aaffeac0a3b92e"
 dependencies = [
  "lazy_static",
  "libc",
@@ -2487,9 +2874,9 @@ dependencies = [
 
 [[package]]
 name = "nom"
-version = "7.1.1"
+version = "7.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8903e5a29a317527874d0402f867152a3d21c908bb0b933e416c65e301d4c36"
+checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a"
 dependencies = [
  "memchr",
  "minimal-lexical",
@@ -2497,10 +2884,20 @@ dependencies = [
 
 [[package]]
 name = "ntapi"
-version = "0.4.0"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e8a3895c6391c39d7fe7ebc444a87eb2991b2a0bc718fdabd071eec617fc68e4"
+dependencies = [
+ "winapi",
+]
+
+[[package]]
+name = "nu-ansi-term"
+version = "0.46.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc51db7b362b205941f71232e56c625156eb9a929f8cf74a428fd5bc094a4afc"
+checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84"
 dependencies = [
+ "overload",
  "winapi",
 ]
 
@@ -2521,54 +2918,59 @@ dependencies = [
  "zeroize",
 ]
 
+[[package]]
+name = "num-conv"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9"
+
 [[package]]
 name = "num-integer"
-version = "0.1.45"
+version = "0.1.46"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9"
+checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f"
 dependencies = [
- "autocfg 1.1.0",
  "num-traits",
 ]
 
 [[package]]
 name = "num-iter"
-version = "0.1.43"
+version = "0.1.44"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7d03e6c028c5dc5cac6e2dec0efda81fc887605bb3d884578bb6d6bf7514e252"
+checksum = "d869c01cc0c455284163fd0092f1f93835385ccab5a98a0dcc497b2f8bf055a9"
 dependencies = [
- "autocfg 1.1.0",
+ "autocfg 1.2.0",
  "num-integer",
  "num-traits",
 ]
 
 [[package]]
 name = "num-traits"
-version = "0.2.15"
+version = "0.2.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd"
+checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a"
 dependencies = [
- "autocfg 1.1.0",
+ "autocfg 1.2.0",
  "libm",
 ]
 
 [[package]]
 name = "num_cpus"
-version = "1.13.1"
+version = "1.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "19e64526ebdee182341572e50e9ad03965aa510cd94427a4549448f285e957a1"
+checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43"
 dependencies = [
- "hermit-abi",
+ "hermit-abi 0.3.9",
  "libc",
 ]
 
 [[package]]
 name = "num_enum"
-version = "0.5.7"
+version = "0.5.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf5395665662ef45796a4ff5486c5d41d29e0c09640af4c5f17fd94ee2c119c9"
+checksum = "1f646caf906c20226733ed5b1374287eb97e3c2a5c227ce668c1f2ce20ae57c9"
 dependencies = [
- "num_enum_derive 0.5.7",
+ "num_enum_derive 0.5.11",
 ]
 
 [[package]]
@@ -2582,14 +2984,14 @@ dependencies = [
 
 [[package]]
 name = "num_enum_derive"
-version = "0.5.7"
+version = "0.5.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3b0498641e53dd6ac1a4f22547548caa6864cc4933784319cd1775271c5a46ce"
+checksum = "dcbff9bc912032c62bf65ef1d5aea88983b420f4f839db1e9b0c281a25c9c799"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2",
- "quote 1.0.26",
- "syn 1.0.107",
+ "quote 1.0.35",
+ "syn 1.0.109",
 ]
 
 [[package]]
@@ -2600,44 +3002,38 @@ checksum = "96667db765a921f7b295ffee8b60472b686a51d4f21c2ee4ffdb94c7013b65a6"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2",
- "quote 1.0.26",
- "syn 2.0.15",
+ "quote 1.0.35",
+ "syn 2.0.58",
 ]
 
 [[package]]
 name = "object"
-version = "0.28.4"
+version = "0.32.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e42c982f2d955fac81dd7e1d0e1426a7d702acd9c98d19ab01083a6a0328c424"
+checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441"
 dependencies = [
  "memchr",
 ]
 
 [[package]]
 name = "once_cell"
-version = "1.18.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
-
-[[package]]
-name = "opaque-debug"
-version = "0.2.3"
+version = "1.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2839e79665f131bdb5782e51f2c6c9599c133c6098982a54c794358bf432529c"
+checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
 
 [[package]]
 name = "opaque-debug"
-version = "0.3.0"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5"
+checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381"
 
 [[package]]
 name = "openssl"
-version = "0.10.40"
+version = "0.10.64"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fb81a6430ac911acb25fe5ac8f1d2af1b4ea8a4fdfda0f1ee4292af2e2d8eb0e"
+checksum = "95a0481286a310808298130d22dd1fef0fa571e05a8f44ec801801e84b216b1f"
 dependencies = [
- "bitflags",
+ "bitflags 2.5.0",
  "cfg-if",
  "foreign-types",
  "libc",
@@ -2648,13 +3044,13 @@ dependencies = [
 
 [[package]]
 name = "openssl-macros"
-version = "0.1.0"
+version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b501e44f11665960c7e7fcf062c7d96a14ade4aa98116c004b2e37b5be7d736c"
+checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
 dependencies = [
  "proc-macro2",
- "quote 1.0.26",
- "syn 1.0.107",
+ "quote 1.0.35",
+ "syn 2.0.58",
 ]
 
 [[package]]
@@ -2665,11 +3061,10 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
 
 [[package]]
 name = "openssl-sys"
-version = "0.9.73"
+version = "0.9.102"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d5fd19fb3e0a8191c1e34935718976a3e70c112ab9a24af6d7cadccd9d90bc0"
+checksum = "c597637d56fbc83893a35eb0dd04b2b8e7a50c91e64e9493e398b5df4fb45fa2"
 dependencies = [
- "autocfg 1.1.0",
  "cc",
  "libc",
  "pkg-config",
@@ -2683,47 +3078,55 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ccd746e37177e1711c20dd619a1620f34f5c8b569c53590a72dedd5344d8924a"
 dependencies = [
  "dlv-list",
- "hashbrown 0.12.1",
+ "hashbrown 0.12.3",
 ]
 
 [[package]]
 name = "os_info"
-version = "3.7.0"
+version = "3.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "006e42d5b888366f1880eda20371fedde764ed2213dc8496f49622fa0c99cd5e"
+checksum = "ae99c7fa6dd38c7cafe1ec085e804f8f555a2f8659b0dbe03f1f9963a9b51092"
 dependencies = [
  "log",
  "serde",
- "winapi",
+ "windows-sys 0.52.0",
 ]
 
+[[package]]
+name = "overload"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39"
+
 [[package]]
 name = "p256"
-version = "0.11.1"
+version = "0.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "51f44edd08f51e2ade572f141051021c5af22677e42b7dd28a88155151c33594"
+checksum = "c9863ad85fa8f4460f9c48cb909d38a0d689dba1f6f6988a5e3e0d31071bcd4b"
 dependencies = [
  "ecdsa",
  "elliptic-curve",
+ "primeorder",
  "sha2",
 ]
 
 [[package]]
 name = "p384"
-version = "0.11.2"
+version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dfc8c5bf642dde52bb9e87c0ecd8ca5a76faac2eeed98dedb7c717997e1080aa"
+checksum = "70786f51bcc69f6a4c0360e063a4cac5419ef7c5cd5b3c99ad70f3be5ba79209"
 dependencies = [
  "ecdsa",
  "elliptic-curve",
+ "primeorder",
  "sha2",
 ]
 
 [[package]]
 name = "parking"
-version = "2.0.0"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "427c3892f9e783d91cc128285287e70a59e206ca452770ece88a76f7a3eddd72"
+checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae"
 
 [[package]]
 name = "parking_lot"
@@ -2737,22 +3140,22 @@ dependencies = [
 
 [[package]]
 name = "parking_lot_core"
-version = "0.9.3"
+version = "0.9.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09a279cbf25cb0757810394fbc1e359949b59e348145c643a939a525692e6929"
+checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e"
 dependencies = [
  "cfg-if",
  "libc",
  "redox_syscall",
  "smallvec",
- "windows-sys 0.36.1",
+ "windows-targets 0.48.5",
 ]
 
 [[package]]
 name = "paste"
-version = "1.0.7"
+version = "1.0.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c520e05135d6e763148b6426a837e239041653ba7becd2e538c076c738025fc"
+checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c"
 
 [[package]]
 name = "pathdiff"
@@ -2760,36 +3163,73 @@ version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd"
 
+[[package]]
+name = "pbjson"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1030c719b0ec2a2d25a5df729d6cff1acf3cc230bf766f4f97833591f7577b90"
+dependencies = [
+ "base64 0.21.7",
+ "serde",
+]
+
+[[package]]
+name = "pbjson-build"
+version = "0.6.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2580e33f2292d34be285c5bc3dba5259542b083cfad6037b6d70345f24dcb735"
+dependencies = [
+ "heck 0.4.1",
+ "itertools 0.11.0",
+ "prost",
+ "prost-types",
+]
+
+[[package]]
+name = "pbjson-types"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "18f596653ba4ac51bdecbb4ef6773bc7f56042dc13927910de1684ad3d32aa12"
+dependencies = [
+ "bytes 1.6.0",
+ "chrono",
+ "pbjson",
+ "pbjson-build",
+ "prost",
+ "prost-build",
+ "serde",
+]
+
 [[package]]
 name = "pbkdf2"
-version = "0.10.1"
+version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "271779f35b581956db91a3e55737327a03aa051e90b1c47aeb189508533adfd7"
+checksum = "83a0692ec44e4cf1ef28ca317f14f8f07da2d95ec3fa01f86e4467b725e60917"
 dependencies = [
- "digest 0.10.7",
+ "digest",
 ]
 
 [[package]]
 name = "pear"
-version = "0.2.3"
+version = "0.2.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "15e44241c5e4c868e3eaa78b7c1848cadd6344ed4f54d029832d32b415a58702"
+checksum = "bdeeaa00ce488657faba8ebf44ab9361f9365a97bd39ffb8a60663f57ff4b467"
 dependencies = [
  "inlinable_string",
  "pear_codegen",
- "yansi",
+ "yansi 1.0.1",
 ]
 
 [[package]]
 name = "pear_codegen"
-version = "0.2.3"
+version = "0.2.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "82a5ca643c2303ecb740d506539deba189e16f2754040a42901cd8105d0282d0"
+checksum = "4bab5b985dc082b345f812b7df84e1bef27e7207b39e448439ba8bd69c93f147"
 dependencies = [
  "proc-macro2",
- "proc-macro2-diagnostics",
- "quote 1.0.26",
- "syn 1.0.107",
+ "proc-macro2-diagnostics 0.10.1",
+ "quote 1.0.35",
+ "syn 2.0.58",
 ]
 
 [[package]]
@@ -2798,7 +3238,7 @@ version = "0.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fd56cbd21fea48d0c440b41cd69c589faacade08c992d9a54e471b79d0fd13eb"
 dependencies = [
- "base64 0.13.0",
+ "base64 0.13.1",
  "once_cell",
  "regex",
 ]
@@ -2809,7 +3249,7 @@ version = "1.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a8835c273a76a90455d7344889b0964598e3316e2a79ede8e36f16bdcf2228b8"
 dependencies = [
- "base64 0.13.0",
+ "base64 0.13.1",
 ]
 
 [[package]]
@@ -2821,6 +3261,15 @@ dependencies = [
  "base64ct",
 ]
 
+[[package]]
+name = "pem-rfc7468"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "88b39c9bfcfc231068454382784bb460aae594343fb030d46e9f50a645418412"
+dependencies = [
+ "base64ct",
+]
+
 [[package]]
 name = "percent-encoding"
 version = "2.3.1"
@@ -2829,18 +3278,20 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
 
 [[package]]
 name = "pest"
-version = "2.1.3"
+version = "2.7.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "10f4872ae94d7b90ae48754df22fd42ad52ce740b8f370b03da4835417403e53"
+checksum = "311fb059dee1a7b802f036316d790138c613a4e8b180c822e3925a662e9f0c95"
 dependencies = [
+ "memchr",
+ "thiserror",
  "ucd-trie",
 ]
 
 [[package]]
 name = "pest_derive"
-version = "2.1.0"
+version = "2.7.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "833d1ae558dc601e9a60366421196a8d94bc0ac980476d0b67e1d0988d72b2d0"
+checksum = "f73541b156d32197eecda1a4014d7f868fd2bcb3c550d5386087cfba442bf69c"
 dependencies = [
  "pest",
  "pest_generator",
@@ -2848,46 +3299,56 @@ dependencies = [
 
 [[package]]
 name = "pest_generator"
-version = "2.1.3"
+version = "2.7.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "99b8db626e31e5b81787b9783425769681b347011cc59471e33ea46d2ea0cf55"
+checksum = "c35eeed0a3fab112f75165fdc026b3913f4183133f19b49be773ac9ea966e8bd"
 dependencies = [
  "pest",
  "pest_meta",
  "proc-macro2",
- "quote 1.0.26",
- "syn 1.0.107",
+ "quote 1.0.35",
+ "syn 2.0.58",
 ]
 
 [[package]]
 name = "pest_meta"
-version = "2.1.3"
+version = "2.7.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "54be6e404f5317079812fc8f9f5279de376d8856929e21c184ecf6bbd692a11d"
+checksum = "2adbf29bb9776f28caece835398781ab24435585fe0d4dc1374a61db5accedca"
 dependencies = [
- "maplit",
+ "once_cell",
  "pest",
- "sha-1 0.8.2",
+ "sha2",
+]
+
+[[package]]
+name = "petgraph"
+version = "0.6.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9"
+dependencies = [
+ "fixedbitset",
+ "indexmap 2.2.6",
 ]
 
 [[package]]
 name = "pin-project"
-version = "1.0.10"
+version = "1.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "58ad3879ad3baf4e44784bc6a718a8698867bb991f8ce24d1bcbe2cfb4c3a75e"
+checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3"
 dependencies = [
  "pin-project-internal",
 ]
 
 [[package]]
 name = "pin-project-internal"
-version = "1.0.10"
+version = "1.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "744b6f092ba29c3650faf274db506afd39944f48420f6c86b17cfe0ee1cb36bb"
+checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965"
 dependencies = [
  "proc-macro2",
- "quote 1.0.26",
- "syn 1.0.107",
+ "quote 1.0.35",
+ "syn 2.0.58",
 ]
 
 [[package]]
@@ -2898,9 +3359,9 @@ checksum = "257b64915a082f7811703966789728173279bdebb956b143dbcd23f6f970a777"
 
 [[package]]
 name = "pin-project-lite"
-version = "0.2.13"
+version = "0.2.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58"
+checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02"
 
 [[package]]
 name = "pin-utils"
@@ -2908,6 +3369,17 @@ version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
 
+[[package]]
+name = "piper"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "668d31b1c4eba19242f2088b2bf3316b82ca31082a8335764db4e083db7485d4"
+dependencies = [
+ "atomic-waker",
+ "fastrand 2.0.2",
+ "futures-io",
+]
+
 [[package]]
 name = "pkcs1"
 version = "0.4.1"
@@ -2915,8 +3387,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "eff33bdbdfc54cc98a2eca766ebdec3e1b8fb7387523d5c9c9a2891da856f719"
 dependencies = [
  "der 0.6.1",
- "pkcs8",
- "spki",
+ "pkcs8 0.9.0",
+ "spki 0.6.0",
  "zeroize",
 ]
 
@@ -2927,45 +3399,79 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9eca2c590a5f85da82668fa685c09ce2888b9430e83299debf1f34b65fd4a4ba"
 dependencies = [
  "der 0.6.1",
- "spki",
+ "spki 0.6.0",
+]
+
+[[package]]
+name = "pkcs8"
+version = "0.10.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7"
+dependencies = [
+ "der 0.7.9",
+ "spki 0.7.3",
 ]
 
 [[package]]
 name = "pkg-config"
-version = "0.3.25"
+version = "0.3.30"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec"
+
+[[package]]
+name = "polling"
+version = "2.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1df8c4ec4b0627e53bdf214615ad287367e482558cf84b109250b37464dc03ae"
+checksum = "4b2d323e8ca7996b3e23126511a523f7e62924d93ecd5ae73b333815b0eb3dce"
+dependencies = [
+ "autocfg 1.2.0",
+ "bitflags 1.3.2",
+ "cfg-if",
+ "concurrent-queue",
+ "libc",
+ "log",
+ "pin-project-lite 0.2.14",
+ "windows-sys 0.48.0",
+]
 
 [[package]]
 name = "polling"
-version = "2.2.0"
+version = "3.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "685404d509889fade3e86fe3a5803bca2ec09b0c0778d5ada6ec8bf7a8de5259"
+checksum = "e0c976a60b2d7e99d6f229e414670a9b85d13ac305cc6d1e9c134de58c5aaaf6"
 dependencies = [
  "cfg-if",
- "libc",
- "log",
- "wepoll-ffi",
- "winapi",
+ "concurrent-queue",
+ "hermit-abi 0.3.9",
+ "pin-project-lite 0.2.14",
+ "rustix 0.38.32",
+ "tracing",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
 name = "polyval"
-version = "0.5.3"
+version = "0.6.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8419d2b623c7c0896ff2d5d96e2cb4ede590fed28fcc34934f4c33c036e620a1"
+checksum = "9d1fe60d06143b2430aa532c94cfe9e29783047f06c0d7fd359a9a51b729fa25"
 dependencies = [
  "cfg-if",
  "cpufeatures",
- "opaque-debug 0.3.0",
+ "opaque-debug",
  "universal-hash",
 ]
 
+[[package]]
+name = "powerfmt"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391"
+
 [[package]]
 name = "ppv-lite86"
-version = "0.2.16"
+version = "0.2.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb9f9e6e233e5c4a35559a617bf40a4ec447db2e84c20b55a6f83167b7e57872"
+checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"
 
 [[package]]
 name = "pretty_env_logger"
@@ -2977,14 +3483,33 @@ dependencies = [
  "log",
 ]
 
+[[package]]
+name = "prettyplease"
+version = "0.2.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8d3928fb5db768cb86f891ff014f0144589297e3c6a1aba6ed7cecfdace270c7"
+dependencies = [
+ "proc-macro2",
+ "syn 2.0.58",
+]
+
+[[package]]
+name = "primeorder"
+version = "0.13.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "353e1ca18966c16d9deb1c69278edbc5f194139612772bd9537af60ac231e1e6"
+dependencies = [
+ "elliptic-curve",
+]
+
 [[package]]
 name = "proc-macro-crate"
-version = "1.1.3"
+version = "1.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e17d47ce914bf4de440332250b0edd23ce48c005f59fab39d3335866b114f11a"
+checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919"
 dependencies = [
- "thiserror",
- "toml",
+ "once_cell",
+ "toml_edit 0.19.15",
 ]
 
 [[package]]
@@ -2995,8 +3520,8 @@ checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c"
 dependencies = [
  "proc-macro-error-attr",
  "proc-macro2",
- "quote 1.0.26",
- "syn 1.0.107",
+ "quote 1.0.35",
+ "syn 1.0.109",
  "version_check",
 ]
 
@@ -3007,15 +3532,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869"
 dependencies = [
  "proc-macro2",
- "quote 1.0.26",
+ "quote 1.0.35",
  "version_check",
 ]
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.78"
+version = "1.0.79"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae"
+checksum = "e835ff2298f5721608eb1a980ecaee1aef2c132bf95ecc026a11b7bf3c01c02e"
 dependencies = [
  "unicode-ident",
 ]
@@ -3027,10 +3552,23 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4bf29726d67464d49fa6224a1d07936a8c08bb3fba727c7493f6cf1616fdaada"
 dependencies = [
  "proc-macro2",
- "quote 1.0.26",
- "syn 1.0.107",
+ "quote 1.0.35",
+ "syn 1.0.109",
+ "version_check",
+ "yansi 0.5.1",
+]
+
+[[package]]
+name = "proc-macro2-diagnostics"
+version = "0.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "af066a9c399a26e020ada66a034357a868728e72cd426f3adcd35f80d88d88c8"
+dependencies = [
+ "proc-macro2",
+ "quote 1.0.35",
+ "syn 2.0.58",
  "version_check",
- "yansi",
+ "yansi 1.0.1",
 ]
 
 [[package]]
@@ -3047,6 +3585,59 @@ dependencies = [
  "thiserror",
 ]
 
+[[package]]
+name = "prost"
+version = "0.12.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d0f5d036824e4761737860779c906171497f6d55681139d8312388f8fe398922"
+dependencies = [
+ "bytes 1.6.0",
+ "prost-derive",
+]
+
+[[package]]
+name = "prost-build"
+version = "0.12.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "80b776a1b2dc779f5ee0641f8ade0125bc1298dd41a9a0c16d8bd57b42d222b1"
+dependencies = [
+ "bytes 1.6.0",
+ "heck 0.5.0",
+ "itertools 0.12.1",
+ "log",
+ "multimap",
+ "once_cell",
+ "petgraph",
+ "prettyplease",
+ "prost",
+ "prost-types",
+ "regex",
+ "syn 2.0.58",
+ "tempfile",
+]
+
+[[package]]
+name = "prost-derive"
+version = "0.12.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "19de2de2a00075bf566bee3bd4db014b11587e84184d3f7a791bc17f1a8e9e48"
+dependencies = [
+ "anyhow",
+ "itertools 0.12.1",
+ "proc-macro2",
+ "quote 1.0.35",
+ "syn 2.0.58",
+]
+
+[[package]]
+name = "prost-types"
+version = "0.12.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3235c33eb02c1f1e212abdbe34c78b264b038fb58ca612664343271e36e55ffe"
+dependencies = [
+ "prost",
+]
+
 [[package]]
 name = "querystring"
 version = "1.1.0"
@@ -3067,18 +3658,24 @@ checksum = "7a6e920b65c65f10b2ae65c831a81a073a89edd28c7cce89475bff467ab4167a"
 
 [[package]]
 name = "quote"
-version = "1.0.26"
+version = "1.0.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4424af4bf778aae2051a77b60283332f386554255d722233d09fbfc7e30da2fc"
+checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
 dependencies = [
  "proc-macro2",
 ]
 
 [[package]]
 name = "quoted_printable"
-version = "0.4.5"
+version = "0.4.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5a3866219251662ec3b26fc217e3e05bf9c4f84325234dfb96bf0bf840889e49"
+
+[[package]]
+name = "radium"
+version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fee2dce59f7a43418e3382c766554c614e06a552d53a8f07ef499ea4b332c0f"
+checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09"
 
 [[package]]
 name = "rand"
@@ -3107,7 +3704,7 @@ checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
 dependencies = [
  "libc",
  "rand_chacha 0.3.1",
- "rand_core 0.6.3",
+ "rand_core 0.6.4",
 ]
 
 [[package]]
@@ -3127,7 +3724,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
 dependencies = [
  "ppv-lite86",
- "rand_core 0.6.3",
+ "rand_core 0.6.4",
 ]
 
 [[package]]
@@ -3147,9 +3744,9 @@ checksum = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc"
 
 [[package]]
 name = "rand_core"
-version = "0.6.3"
+version = "0.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7"
+checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
 dependencies = [
  "getrandom",
 ]
@@ -3228,41 +3825,21 @@ dependencies = [
 
 [[package]]
 name = "redis"
-version = "0.22.3"
-source = "git+https://github.com/revoltchat/redis-rs?rev=1a41faf356fd21aebba71cea7eb7eb2653e5f0ef#1a41faf356fd21aebba71cea7eb7eb2653e5f0ef"
+version = "0.23.1"
+source = "git+https://github.com/revoltchat/redis-rs?rev=f8ca28ab85da59d2ccde526b4d2fb390eff5a5f9#f8ca28ab85da59d2ccde526b4d2fb390eff5a5f9"
 dependencies = [
  "async-std",
  "async-trait",
- "bytes 1.5.0",
+ "bytes 1.6.0",
  "combine",
  "futures-util",
  "itoa",
  "percent-encoding",
- "pin-project-lite 0.2.13",
+ "pin-project-lite 0.2.14",
  "ryu",
  "sha1_smol",
- "tokio 1.35.1",
- "tokio-util 0.7.2",
- "url",
-]
-
-[[package]]
-name = "redis"
-version = "0.23.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4f49cdc0bb3f412bf8e7d1bd90fe1d9eb10bc5c399ba90973c14662a27b3f8ba"
-dependencies = [
- "async-std",
- "async-trait",
- "bytes 1.5.0",
- "combine",
- "futures-util",
- "itoa",
- "percent-encoding",
- "pin-project-lite 0.2.13",
- "ryu",
- "tokio 1.35.1",
- "tokio-util 0.7.2",
+ "tokio 1.37.0",
+ "tokio-util",
  "url",
 ]
 
@@ -3276,7 +3853,7 @@ dependencies = [
  "lazy_static",
  "mobc",
  "mobc-redis",
- "redis 0.23.3",
+ "redis",
  "rmp-serde",
  "serde",
  "serde_json",
@@ -3288,7 +3865,7 @@ version = "4.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9c31deddf734dc0a39d3112e73490e88b61a05e83e074d211f348404cee4d2c6"
 dependencies = [
- "bytes 1.5.0",
+ "bytes 1.6.0",
  "bytes-utils",
  "cookie-factory",
  "crc16",
@@ -3298,42 +3875,43 @@ dependencies = [
 
 [[package]]
 name = "redox_syscall"
-version = "0.2.13"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62f25bc4c7e55e0b0b7a1d43fb893f4fa1361d0abe38b9ce4f323c2adfe6ef42"
+checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa"
 dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
 ]
 
 [[package]]
 name = "ref-cast"
-version = "1.0.7"
+version = "1.0.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "685d58625b6c2b83e4cc88a27c4bf65adb7b6b16dbdc413e515c9405b47432ab"
+checksum = "c4846d4c50d1721b1a3bef8af76924eef20d5e723647333798c1b519b3a9473f"
 dependencies = [
  "ref-cast-impl",
 ]
 
 [[package]]
 name = "ref-cast-impl"
-version = "1.0.7"
+version = "1.0.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a043824e29c94169374ac5183ac0ed43f5724dc4556b19568007486bd840fa1f"
+checksum = "5fddb4f8d99b0a2ebafc65a87a69a7b9875e4b1ae1f00db265d300ef7f28bccc"
 dependencies = [
  "proc-macro2",
- "quote 1.0.26",
- "syn 1.0.107",
+ "quote 1.0.35",
+ "syn 2.0.58",
 ]
 
 [[package]]
 name = "regex"
-version = "1.5.6"
+version = "1.10.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d83f127d94bdbcda4c8cc2e50f6f84f4b611f69c902699ca385a39c3a75f9ff1"
+checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c"
 dependencies = [
  "aho-corasick",
  "memchr",
- "regex-syntax",
+ "regex-automata 0.4.6",
+ "regex-syntax 0.8.3",
 ]
 
 [[package]]
@@ -3342,32 +3920,40 @@ version = "0.1.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132"
 dependencies = [
- "regex-syntax",
+ "regex-syntax 0.6.29",
+]
+
+[[package]]
+name = "regex-automata"
+version = "0.4.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea"
+dependencies = [
+ "aho-corasick",
+ "memchr",
+ "regex-syntax 0.8.3",
 ]
 
 [[package]]
 name = "regex-syntax"
-version = "0.6.26"
+version = "0.6.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49b3de9ec5dc0a3417da371aab17d729997c15010e7fd24ff707773a33bddb64"
+checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"
 
 [[package]]
-name = "remove_dir_all"
-version = "0.5.3"
+name = "regex-syntax"
+version = "0.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7"
-dependencies = [
- "winapi",
-]
+checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56"
 
 [[package]]
 name = "reqwest"
-version = "0.11.10"
+version = "0.11.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "46a1f7aa4f35e5e8b4160449f51afc758f0ce6454315a9fa7d0d113e958c41eb"
+checksum = "dd67538700a17451e7cba03ac727fb961abb7607553461627b97de0b89cf4a62"
 dependencies = [
- "base64 0.13.0",
- "bytes 1.5.0",
+ "base64 0.21.7",
+ "bytes 1.6.0",
  "encoding_rs",
  "futures-core",
  "futures-util",
@@ -3378,22 +3964,26 @@ dependencies = [
  "hyper-tls",
  "ipnet",
  "js-sys",
- "lazy_static",
  "log",
  "mime",
  "native-tls",
+ "once_cell",
  "percent-encoding",
- "pin-project-lite 0.2.13",
+ "pin-project-lite 0.2.14",
+ "rustls-pemfile",
  "serde",
  "serde_json",
  "serde_urlencoded",
- "tokio 1.35.1",
+ "sync_wrapper",
+ "system-configuration",
+ "tokio 1.37.0",
  "tokio-native-tls",
+ "tower-service",
  "url",
  "wasm-bindgen",
  "wasm-bindgen-futures",
  "web-sys",
- "winreg 0.10.1",
+ "winreg",
 ]
 
 [[package]]
@@ -3416,7 +4006,7 @@ dependencies = [
  "fred",
  "futures",
  "log",
- "lru 0.7.6",
+ "lru 0.7.8",
  "once_cell",
  "querystring",
  "redis-kiss",
@@ -3453,23 +4043,23 @@ dependencies = [
 name = "revolt-database"
 version = "0.7.1"
 dependencies = [
- "async-lock",
+ "async-lock 2.8.0",
  "async-recursion",
  "async-std",
  "async-trait",
  "authifier",
- "base64 0.21.3",
+ "base64 0.21.7",
  "bson",
  "deadqueue",
  "decancer",
  "fcm",
  "futures",
- "indexmap",
+ "indexmap 1.9.3",
  "isahc",
- "iso8601-timestamp 0.2.11",
+ "iso8601-timestamp 0.2.17",
  "linkify 0.8.1",
  "log",
- "lru 0.11.0",
+ "lru 0.11.1",
  "mongodb",
  "nanoid",
  "once_cell",
@@ -3488,10 +4078,10 @@ dependencies = [
  "schemars",
  "serde",
  "serde_json",
- "ulid 1.0.0",
+ "ulid 1.1.2",
  "unicode-segmentation",
  "url-escape",
- "validator 0.16.0",
+ "validator 0.16.1",
  "web-push",
 ]
 
@@ -3499,7 +4089,7 @@ dependencies = [
 name = "revolt-delta"
 version = "0.7.1"
 dependencies = [
- "async-channel",
+ "async-channel 1.9.0",
  "async-std",
  "authifier",
  "bitfield",
@@ -3509,13 +4099,14 @@ dependencies = [
  "env_logger",
  "futures",
  "impl_ops",
- "iso8601-timestamp 0.2.11",
+ "iso8601-timestamp 0.2.17",
  "lettre",
  "linkify 0.6.0",
+ "livekit-api",
  "log",
- "lru 0.7.6",
+ "lru 0.7.8",
  "nanoid",
- "num_enum 0.5.7",
+ "num_enum 0.5.11",
  "once_cell",
  "rand 0.8.5",
  "redis-kiss",
@@ -3537,7 +4128,7 @@ dependencies = [
  "serde_json",
  "ulid 0.4.1",
  "url",
- "validator 0.16.0",
+ "validator 0.16.1",
  "vergen",
 ]
 
@@ -3545,8 +4136,8 @@ dependencies = [
 name = "revolt-models"
 version = "0.7.1"
 dependencies = [
- "indexmap",
- "iso8601-timestamp 0.2.11",
+ "indexmap 1.9.3",
+ "iso8601-timestamp 0.2.17",
  "once_cell",
  "regex",
  "revolt-config",
@@ -3555,7 +4146,7 @@ dependencies = [
  "rocket",
  "schemars",
  "serde",
- "validator 0.16.0",
+ "validator 0.16.1",
 ]
 
 [[package]]
@@ -3596,6 +4187,32 @@ dependencies = [
  "serde_json",
 ]
 
+[[package]]
+name = "revolt-voice-ingress"
+version = "0.7.1"
+dependencies = [
+ "async-std",
+ "futures",
+ "livekit-api",
+ "livekit-protocol",
+ "log",
+ "lru 0.7.8",
+ "redis-kiss",
+ "revolt-config",
+ "revolt-database",
+ "revolt-models",
+ "revolt-permissions",
+ "revolt-presence",
+ "revolt-result",
+ "rmp-serde",
+ "rocket",
+ "rocket_empty",
+ "sentry",
+ "serde",
+ "serde_json",
+ "ulid 0.5.0",
+]
+
 [[package]]
 name = "revolt_okapi"
 version = "0.9.1"
@@ -3642,20 +4259,19 @@ checksum = "cc6620569d8ac8f0a1690fcca13f488503807a60e96ebf729749b59aca1dbef9"
 dependencies = [
  "darling 0.13.4",
  "proc-macro2",
- "quote 1.0.26",
- "rocket_http",
- "syn 1.0.107",
+ "quote 1.0.35",
+ "rocket_http 0.5.0",
+ "syn 1.0.109",
 ]
 
 [[package]]
 name = "rfc6979"
-version = "0.3.1"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7743f17af12fa0b03b803ba12cd6a8d9483a587e89c69445e3909655c0b9fabb"
+checksum = "f8dd2a808d456c4a54e300a23e9f5a67e122c3024119acbfd73e3bf664491cb2"
 dependencies = [
- "crypto-bigint",
  "hmac",
- "zeroize",
+ "subtle",
 ]
 
 [[package]]
@@ -3668,16 +4284,31 @@ dependencies = [
  "libc",
  "once_cell",
  "spin 0.5.2",
- "untrusted",
+ "untrusted 0.7.1",
  "web-sys",
  "winapi",
 ]
 
+[[package]]
+name = "ring"
+version = "0.17.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d"
+dependencies = [
+ "cc",
+ "cfg-if",
+ "getrandom",
+ "libc",
+ "spin 0.9.8",
+ "untrusted 0.9.0",
+ "windows-sys 0.52.0",
+]
+
 [[package]]
 name = "rmp"
-version = "0.8.11"
+version = "0.8.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44519172358fd6d58656c86ab8e7fbc9e1490c3e8f14d35ed78ca0dd07403c9f"
+checksum = "7f9860a6cc38ed1da53456442089b4dfa35e7cedaa326df63017af88385e6b20"
 dependencies = [
  "byteorder",
  "num-traits",
@@ -3686,9 +4317,9 @@ dependencies = [
 
 [[package]]
 name = "rmp-serde"
-version = "1.1.0"
+version = "1.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "25786b0d276110195fa3d6f3f31299900cf71dfbd6c28450f3f58a0e7f7a347e"
+checksum = "bffea85eea980d8a74453e5d02a8d93028f3c34725de143085a844ebe953258a"
 dependencies = [
  "byteorder",
  "rmp",
@@ -3698,40 +4329,39 @@ dependencies = [
 [[package]]
 name = "rocket"
 version = "0.5.0-rc.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "98ead083fce4a405feb349cf09abdf64471c6077f14e0ce59364aa90d4b99317"
+source = "git+https://github.com/rwf2/Rocket/?rev=4dcd928#4dcd92837f3a4626a28d4b25da8e6e560878d004"
 dependencies = [
  "async-stream",
  "async-trait",
- "atomic",
+ "atomic 0.5.3",
  "atty",
  "binascii",
- "bytes 1.5.0",
+ "bytes 1.6.0",
  "either",
  "figment",
  "futures",
- "indexmap",
+ "indexmap 1.9.3",
  "log",
  "memchr",
  "multer",
  "num_cpus",
  "parking_lot",
- "pin-project-lite 0.2.13",
+ "pin-project-lite 0.2.14",
  "rand 0.8.5",
  "ref-cast",
  "rocket_codegen",
- "rocket_http",
+ "rocket_http 0.5.0-rc.2",
  "serde",
  "serde_json",
- "state",
+ "state 0.5.3",
  "tempfile",
- "time 0.3.17",
- "tokio 1.35.1",
+ "time",
+ "tokio 1.37.0",
  "tokio-stream",
- "tokio-util 0.7.2",
+ "tokio-util",
  "ubyte",
  "version_check",
- "yansi",
+ "yansi 0.5.1",
 ]
 
 [[package]]
@@ -3741,7 +4371,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5f89a12311f60e9288833fc3ce6029bce5d5c61870ceef74d4a50668a8b520ad"
 dependencies = [
  "authifier",
- "iso8601-timestamp 0.1.10",
+ "iso8601-timestamp 0.1.11",
  "revolt_okapi",
  "revolt_rocket_okapi",
  "rocket",
@@ -3753,17 +4383,16 @@ dependencies = [
 [[package]]
 name = "rocket_codegen"
 version = "0.5.0-rc.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d6aeb6bb9c61e9cd2c00d70ea267bf36f76a4cc615e5908b349c2f9d93999b47"
+source = "git+https://github.com/rwf2/Rocket/?rev=4dcd928#4dcd92837f3a4626a28d4b25da8e6e560878d004"
 dependencies = [
  "devise",
  "glob",
- "indexmap",
+ "indexmap 1.9.3",
  "proc-macro2",
- "quote 1.0.26",
- "rocket_http",
- "syn 1.0.107",
- "unicode-xid 0.2.3",
+ "quote 1.0.35",
+ "rocket_http 0.5.0-rc.2",
+ "syn 1.0.109",
+ "unicode-xid 0.2.4",
 ]
 
 [[package]]
@@ -3796,27 +4425,52 @@ dependencies = [
 [[package]]
 name = "rocket_http"
 version = "0.5.0-rc.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2ded65d127954de3c12471630bf4b81a2792f065984461e65b91d0fdaafc17a2"
+source = "git+https://github.com/rwf2/Rocket/?rev=4dcd928#4dcd92837f3a4626a28d4b25da8e6e560878d004"
 dependencies = [
- "cookie",
+ "cookie 0.16.2",
  "either",
  "futures",
  "http",
  "hyper",
- "indexmap",
+ "indexmap 1.9.3",
  "log",
  "memchr",
  "pear",
  "percent-encoding",
- "pin-project-lite 0.2.13",
+ "pin-project-lite 0.2.14",
  "ref-cast",
  "serde",
  "smallvec",
  "stable-pattern",
- "state",
- "time 0.3.17",
- "tokio 1.35.1",
+ "state 0.5.3",
+ "time",
+ "tokio 1.37.0",
+ "uncased",
+]
+
+[[package]]
+name = "rocket_http"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "37a1663694d059fe5f943ea5481363e48050acedd241d46deb2e27f71110389e"
+dependencies = [
+ "cookie 0.18.1",
+ "either",
+ "futures",
+ "http",
+ "hyper",
+ "indexmap 2.2.6",
+ "log",
+ "memchr",
+ "pear",
+ "percent-encoding",
+ "pin-project-lite 0.2.14",
+ "ref-cast",
+ "smallvec",
+ "stable-pattern",
+ "state 0.6.0",
+ "time",
+ "tokio 1.37.0",
  "uncased",
 ]
 
@@ -3836,8 +4490,8 @@ version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "88073939a61e5b7680558e6be56b419e208420c2adb92be54921fa6b72283f1a"
 dependencies = [
- "base64 0.13.0",
- "bitflags",
+ "base64 0.13.1",
+ "bitflags 1.3.2",
  "serde",
 ]
 
@@ -3848,15 +4502,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "094052d5470cbcef561cb848a7209968c9f12dfa6d668f4bca048ac5de51099c"
 dependencies = [
  "byteorder",
- "digest 0.10.7",
+ "digest",
  "num-bigint-dig",
  "num-integer",
  "num-iter",
  "num-traits",
  "pkcs1",
- "pkcs8",
- "rand_core 0.6.3",
- "signature",
+ "pkcs8 0.9.0",
+ "rand_core 0.6.4",
+ "signature 1.6.4",
  "smallvec",
  "subtle",
  "zeroize",
@@ -3864,11 +4518,11 @@ dependencies = [
 
 [[package]]
 name = "rust-argon2"
-version = "1.0.0"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b50162d19404029c1ceca6f6980fe40d45c8b369f6f44446fa14bb39573b5bb9"
+checksum = "a5885493fdf0be6cdff808d1533ce878d21cfa49c7086fa00c66355cd9141bfc"
 dependencies = [
- "base64 0.13.0",
+ "base64 0.21.7",
  "blake2b_simd",
  "constant_time_eq",
  "crossbeam-utils",
@@ -3886,9 +4540,9 @@ dependencies = [
 
 [[package]]
 name = "rustc-demangle"
-version = "0.1.21"
+version = "0.1.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ef03e0a2b150c7a90d01faf6254c9c48a41e95fb2a8c2ac1c6f0d2b9aefc342"
+checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76"
 
 [[package]]
 name = "rustc_version"
@@ -3905,7 +4559,7 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366"
 dependencies = [
- "semver 1.0.9",
+ "semver 1.0.22",
 ]
 
 [[package]]
@@ -3918,57 +4572,83 @@ dependencies = [
  "semver 0.9.0",
 ]
 
+[[package]]
+name = "rustix"
+version = "0.37.27"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fea8ca367a3a01fe35e6943c400addf443c0f57670e6ec51196f71a4b8762dd2"
+dependencies = [
+ "bitflags 1.3.2",
+ "errno",
+ "io-lifetimes",
+ "libc",
+ "linux-raw-sys 0.3.8",
+ "windows-sys 0.48.0",
+]
+
+[[package]]
+name = "rustix"
+version = "0.38.32"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "65e04861e65f21776e67888bfbea442b3642beaa0138fdb1dd7a84a52dffdb89"
+dependencies = [
+ "bitflags 2.5.0",
+ "errno",
+ "libc",
+ "linux-raw-sys 0.4.13",
+ "windows-sys 0.52.0",
+]
+
 [[package]]
 name = "rustls"
-version = "0.20.6"
+version = "0.20.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5aab8ee6c7097ed6057f43c187a62418d0c05a4bd5f18b3571db50ee0f9ce033"
+checksum = "1b80e3dec595989ea8510028f30c408a4630db12c9cbb8de34203b89d6577e99"
 dependencies = [
  "log",
- "ring",
+ "ring 0.16.20",
  "sct",
  "webpki",
 ]
 
 [[package]]
 name = "rustls-pemfile"
-version = "0.3.0"
+version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ee86d63972a7c661d1536fefe8c3c8407321c3df668891286de28abcd087360"
+checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c"
 dependencies = [
- "base64 0.13.0",
+ "base64 0.21.7",
 ]
 
 [[package]]
 name = "rustversion"
-version = "1.0.11"
+version = "1.0.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5583e89e108996506031660fe09baa5011b9dd0341b89029313006d1fb508d70"
+checksum = "80af6f9131f277a45a3fba6ce8e2258037bb0477a67e610d3c1fe046ab31de47"
 
 [[package]]
 name = "ryu"
-version = "1.0.10"
+version = "1.0.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f3f6f92acf49d1b98f7a81226834412ada05458b7364277387724a237f062695"
+checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1"
 
 [[package]]
 name = "schannel"
-version = "0.1.20"
+version = "0.1.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "88d6731146462ea25d9244b2ed5fd1d716d25c52e4d54aa4fb0f3c4e9854dbe2"
+checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534"
 dependencies = [
- "lazy_static",
- "windows-sys 0.36.1",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
 name = "schemars"
-version = "0.8.10"
+version = "0.8.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1847b767a3d62d95cbf3d8a9f0e421cf57a0d8aa4f411d4b16525afb0284d4ed"
+checksum = "45a28f4c49489add4ce10783f7911893516f15afe45d015608d41faca6bc4d29"
 dependencies = [
  "dyn-clone",
- "indexmap",
+ "indexmap 1.9.3",
  "schemars_derive",
  "serde",
  "serde_json",
@@ -3976,48 +4656,48 @@ dependencies = [
 
 [[package]]
 name = "schemars_derive"
-version = "0.8.10"
+version = "0.8.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af4d7e1b012cb3d9129567661a63755ea4b8a7386d339dc945ae187e403c6743"
+checksum = "c767fd6fa65d9ccf9cf026122c1b555f2ef9a4f0cea69da4d7dbc3e258d30967"
 dependencies = [
  "proc-macro2",
- "quote 1.0.26",
+ "quote 1.0.35",
  "serde_derive_internals",
- "syn 1.0.107",
+ "syn 1.0.109",
 ]
 
 [[package]]
 name = "scoped-tls"
-version = "1.0.0"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea6a9290e3c9cf0f18145ef7ffa62d68ee0bf5fcd651017e586dc7fd5da448c2"
+checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294"
 
 [[package]]
 name = "scopeguard"
-version = "1.1.0"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
+checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
 
 [[package]]
 name = "sct"
-version = "0.7.0"
+version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4"
+checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414"
 dependencies = [
- "ring",
- "untrusted",
+ "ring 0.17.8",
+ "untrusted 0.9.0",
 ]
 
 [[package]]
 name = "sec1"
-version = "0.3.0"
+version = "0.7.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3be24c1842290c45df0a7bf069e0c268a747ad05a192f2fd7dcfdbc1cba40928"
+checksum = "d3e97a565f76233a6003f9f5c54be1d9c5bdfa3eccfb189469f11ec4901c47dc"
 dependencies = [
  "base16ct",
- "der 0.6.1",
- "generic-array 0.14.5",
- "pkcs8",
+ "der 0.7.9",
+ "generic-array 0.14.7",
+ "pkcs8 0.10.2",
  "subtle",
  "zeroize",
 ]
@@ -4035,11 +4715,11 @@ dependencies = [
 
 [[package]]
 name = "security-framework"
-version = "2.6.1"
+version = "2.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2dc14f172faf8a0194a3aded622712b0de276821addc574fa54fc0a1167e10dc"
+checksum = "770452e37cad93e0a50d5abc3990d2bc351c36d0328f86cefec2f2fb206eaef6"
 dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
  "core-foundation",
  "core-foundation-sys",
  "libc",
@@ -4048,9 +4728,9 @@ dependencies = [
 
 [[package]]
 name = "security-framework-sys"
-version = "2.6.1"
+version = "2.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0160a13a177a45bfb43ce71c01580998474f556ad854dcbca936dd2841a5c556"
+checksum = "41f3cc463c0ef97e11c3461a9d3787412d30e8e7eb907c79180c4a57bf7c04ef"
 dependencies = [
  "core-foundation-sys",
  "libc",
@@ -4067,9 +4747,9 @@ dependencies = [
 
 [[package]]
 name = "semver"
-version = "1.0.9"
+version = "1.0.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8cb243bdfdb5936c8dc3c45762a19d12ab4550cdc753bc247637d4ec35a040fd"
+checksum = "92d43fe69e652f3df9bdc2b85b2854a0825b86e4fb76bc44d945137d053639ca"
 
 [[package]]
 name = "semver-parser"
@@ -4079,9 +4759,9 @@ checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
 
 [[package]]
 name = "sentry"
-version = "0.31.5"
+version = "0.31.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "01b0ad16faa5d12372f914ed40d00bda21a6d1bdcc99264c5e5e1c9495cf3654"
+checksum = "6ce4b57f1b521f674df7a1d200be8ff5d74e3712020ee25b553146657b5377d5"
 dependencies = [
  "httpdate",
  "native-tls",
@@ -4092,15 +4772,15 @@ dependencies = [
  "sentry-debug-images",
  "sentry-panic",
  "sentry-tracing",
- "tokio 1.35.1",
+ "tokio 1.37.0",
  "ureq",
 ]
 
 [[package]]
 name = "sentry-backtrace"
-version = "0.31.5"
+version = "0.31.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "11f2ee8f147bb5f22ac59b5c35754a759b9a6f6722402e2a14750b2a63fc59bd"
+checksum = "58cc8d4e04a73de8f718dc703943666d03f25d3e9e4d0fb271ca0b8c76dfa00e"
 dependencies = [
  "backtrace",
  "once_cell",
@@ -4110,9 +4790,9 @@ dependencies = [
 
 [[package]]
 name = "sentry-contexts"
-version = "0.31.5"
+version = "0.31.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dcd133362c745151eeba0ac61e3ba8350f034e9fe7509877d08059fe1d7720c6"
+checksum = "6436c1bad22cdeb02179ea8ef116ffc217797c028927def303bc593d9320c0d1"
 dependencies = [
  "hostname",
  "libc",
@@ -4124,9 +4804,9 @@ dependencies = [
 
 [[package]]
 name = "sentry-core"
-version = "0.31.5"
+version = "0.31.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7163491708804a74446642ff2c80b3acd668d4b9e9f497f85621f3d250fd012b"
+checksum = "901f761681f97db3db836ef9e094acdd8756c40215326c194201941947164ef1"
 dependencies = [
  "once_cell",
  "rand 0.8.5",
@@ -4137,9 +4817,9 @@ dependencies = [
 
 [[package]]
 name = "sentry-debug-images"
-version = "0.31.5"
+version = "0.31.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a5003d7ff08aa3b2b76994080b183e8cfa06c083e280737c9cee02ca1c70f5e"
+checksum = "afdb263e73d22f39946f6022ed455b7561b22ff5553aca9be3c6a047fa39c328"
 dependencies = [
  "findshlibs",
  "once_cell",
@@ -4148,9 +4828,9 @@ dependencies = [
 
 [[package]]
 name = "sentry-panic"
-version = "0.31.5"
+version = "0.31.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4dfe8371c9b2e126a8b64f6fefa54cef716ff2a50e63b5558a48b899265bccd"
+checksum = "74fbf1c163f8b6a9d05912e1b272afa27c652e8b47ea60cb9a57ad5e481eea99"
 dependencies = [
  "sentry-backtrace",
  "sentry-core",
@@ -4158,9 +4838,9 @@ dependencies = [
 
 [[package]]
 name = "sentry-tracing"
-version = "0.31.5"
+version = "0.31.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5aca8b88978677a27ee1a91beafe4052306c474c06f582321fde72d2e2cc2f7f"
+checksum = "82eabcab0a047040befd44599a1da73d3adb228ff53b5ed9795ae04535577704"
 dependencies = [
  "sentry-backtrace",
  "sentry-core",
@@ -4170,48 +4850,48 @@ dependencies = [
 
 [[package]]
 name = "sentry-types"
-version = "0.31.5"
+version = "0.31.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e7a88e0c1922d19b3efee12a8215f6a8a806e442e665ada71cc222cab72985f"
+checksum = "da956cca56e0101998c8688bc65ce1a96f00673a0e58e663664023d4c7911e82"
 dependencies = [
  "debugid",
- "getrandom",
  "hex",
+ "rand 0.8.5",
  "serde",
  "serde_json",
  "thiserror",
- "time 0.3.17",
+ "time",
  "url",
- "uuid 1.4.1",
+ "uuid",
 ]
 
 [[package]]
 name = "serde"
-version = "1.0.160"
+version = "1.0.197"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb2f3770c8bce3bcda7e149193a069a0f4365bda1fa5cd88e03bca26afc1216c"
+checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_bytes"
-version = "0.11.6"
+version = "0.11.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "212e73464ebcde48d723aa02eb270ba62eff38a9b732df31f33f1b4e145f3a54"
+checksum = "8b8497c313fd43ab992087548117643f6fcd935cbf36f176ffda0aacf9591734"
 dependencies = [
  "serde",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.160"
+version = "1.0.197"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "291a097c63d8497e00160b166a967a4a79c64f3facdd01cbd7502231688d77df"
+checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b"
 dependencies = [
  "proc-macro2",
- "quote 1.0.26",
- "syn 2.0.15",
+ "quote 1.0.35",
+ "syn 2.0.58",
 ]
 
 [[package]]
@@ -4221,22 +4901,31 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "85bf8229e7920a9f636479437026331ce11aa132b4dde37d121944a44d6e5f3c"
 dependencies = [
  "proc-macro2",
- "quote 1.0.26",
- "syn 1.0.107",
+ "quote 1.0.35",
+ "syn 1.0.109",
 ]
 
 [[package]]
 name = "serde_json"
-version = "1.0.96"
+version = "1.0.115"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "057d394a50403bcac12672b2b18fb387ab6d289d957dab67dd201875391e52f1"
+checksum = "12dc5c46daa8e9fdf4f5e71b6cf9a53f2487da0e86e55808e2d35539666497dd"
 dependencies = [
- "indexmap",
+ "indexmap 2.2.6",
  "itoa",
  "ryu",
  "serde",
 ]
 
+[[package]]
+name = "serde_spanned"
+version = "0.6.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1"
+dependencies = [
+ "serde",
+]
+
 [[package]]
 name = "serde_urlencoded"
 version = "0.7.1"
@@ -4267,31 +4956,30 @@ checksum = "e182d6ec6f05393cc0e5ed1bf81ad6db3a8feedf8ee515ecdd369809bcce8082"
 dependencies = [
  "darling 0.13.4",
  "proc-macro2",
- "quote 1.0.26",
- "syn 1.0.107",
+ "quote 1.0.35",
+ "syn 1.0.109",
 ]
 
 [[package]]
 name = "sha-1"
-version = "0.8.2"
+version = "0.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7d94d0bede923b3cea61f3f1ff57ff8cdfd77b400fb8f9998949e0cf04163df"
+checksum = "f5058ada175748e33390e40e872bd0fe59a19f265d0158daa551c5a88a76009c"
 dependencies = [
- "block-buffer 0.7.3",
- "digest 0.8.1",
- "fake-simd",
- "opaque-debug 0.2.3",
+ "cfg-if",
+ "cpufeatures",
+ "digest",
 ]
 
 [[package]]
-name = "sha-1"
-version = "0.10.0"
+name = "sha1"
+version = "0.10.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "028f48d513f9678cda28f6e4064755b3fbb2af6acd672f2c209b62323f7aea0f"
+checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba"
 dependencies = [
  "cfg-if",
  "cpufeatures",
- "digest 0.10.7",
+ "digest",
 ]
 
 [[package]]
@@ -4302,58 +4990,61 @@ checksum = "ae1a47186c03a32177042e55dbc5fd5aee900b8e0069a8d70fba96a9375cd012"
 
 [[package]]
 name = "sha2"
-version = "0.10.2"
+version = "0.10.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "55deaec60f81eefe3cce0dc50bda92d6d8e88f2a27df7c5033b42afeb1ed2676"
+checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8"
 dependencies = [
  "cfg-if",
  "cpufeatures",
- "digest 0.10.7",
+ "digest",
 ]
 
 [[package]]
 name = "sharded-slab"
-version = "0.1.4"
+version = "0.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "900fba806f70c630b0a382d0d825e17a0f19fcd059a2ade1ff237bcddf446b31"
+checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6"
 dependencies = [
  "lazy_static",
 ]
 
 [[package]]
-name = "signal-hook"
-version = "0.3.14"
+name = "signal-hook-registry"
+version = "1.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a253b5e89e2698464fc26b545c9edceb338e18a89effeeecfea192c3025be29d"
+checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1"
 dependencies = [
  "libc",
- "signal-hook-registry",
 ]
 
 [[package]]
-name = "signal-hook-registry"
-version = "1.4.0"
+name = "signature"
+version = "1.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e51e73328dc4ac0c7ccbda3a494dfa03df1de2f46018127f60c693f2648455b0"
+checksum = "74233d3b3b2f6d4b006dc19dee745e73e2a6bfb6f93607cd3b02bd5b00797d7c"
 dependencies = [
- "libc",
+ "digest",
+ "rand_core 0.6.4",
 ]
 
 [[package]]
 name = "signature"
-version = "1.6.4"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "74233d3b3b2f6d4b006dc19dee745e73e2a6bfb6f93607cd3b02bd5b00797d7c"
+checksum = "77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de"
 dependencies = [
- "digest 0.10.7",
- "rand_core 0.6.3",
+ "digest",
+ "rand_core 0.6.4",
 ]
 
 [[package]]
 name = "slab"
-version = "0.4.6"
+version = "0.4.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb703cfe953bccee95685111adeedb76fabe4e97549a58d16f03ea7b9367bb32"
+checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67"
+dependencies = [
+ "autocfg 1.2.0",
+]
 
 [[package]]
 name = "sluice"
@@ -4361,22 +5052,22 @@ version = "0.5.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6d7400c0eff44aa2fcb5e31a5f24ba9716ed90138769e4977a2ba6014ae63eb5"
 dependencies = [
- "async-channel",
+ "async-channel 1.9.0",
  "futures-core",
  "futures-io",
 ]
 
 [[package]]
 name = "smallvec"
-version = "1.11.0"
+version = "1.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9"
+checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "socket2"
-version = "0.4.4"
+version = "0.4.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "66d72b759436ae32898a2af0a14218dbf55efde3feeb170eb623637db85ee1e0"
+checksum = "9f7916fc008ca5542385b89a3d3ce689953c143e9304a9bf8beec1de48994c0d"
 dependencies = [
  "libc",
  "winapi",
@@ -4384,12 +5075,12 @@ dependencies = [
 
 [[package]]
 name = "socket2"
-version = "0.5.5"
+version = "0.5.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9"
+checksum = "05ffd9c0a93b7543e062e759284fcf5f5e3b098501104bfbdde4d404db792871"
 dependencies = [
  "libc",
- "windows-sys 0.48.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -4400,9 +5091,9 @@ checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d"
 
 [[package]]
 name = "spin"
-version = "0.9.3"
+version = "0.9.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c530c2b0d0bf8b69304b39fe2001993e267461948b890cd037d8ad4293fa1a0d"
+checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67"
 
 [[package]]
 name = "spki"
@@ -4411,7 +5102,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "67cf02bbac7a337dc36e4f5a693db6c21e7863f45070f7064577eb4367a3212b"
 dependencies = [
  "base64ct",
- "der 0.6.1",
+ "der 0.6.1",
+]
+
+[[package]]
+name = "spki"
+version = "0.7.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d91ed6c858b01f942cd56b37a94b3e0a1798290327d1236e4d9cf4eaca44d29d"
+dependencies = [
+ "base64ct",
+ "der 0.7.9",
 ]
 
 [[package]]
@@ -4432,12 +5133,22 @@ dependencies = [
  "loom",
 ]
 
+[[package]]
+name = "state"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2b8c4a4445d81357df8b1a650d0d0d6fbbbfe99d064aa5e02f3e4022061476d8"
+dependencies = [
+ "loom",
+]
+
 [[package]]
 name = "stringprep"
-version = "0.1.2"
+version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ee348cb74b87454fff4b551cbf727025810a004f88aeacae7f85b87f4e9a1c1"
+checksum = "bb41d74e231a107a1b4ee36bd1214b11285b77768d2e3824aedafa988fd36ee6"
 dependencies = [
+ "finl_unicode",
  "unicode-bidi",
  "unicode-normalization",
 ]
@@ -4450,9 +5161,9 @@ checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
 
 [[package]]
 name = "subtle"
-version = "2.4.1"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601"
+checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc"
 
 [[package]]
 name = "syn"
@@ -4467,26 +5178,32 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "1.0.107"
+version = "1.0.109"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f4064b5b16e03ae50984a5a8ed5d4f8803e6bc1fd170a3cda91a1be4b18e3f5"
+checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
 dependencies = [
  "proc-macro2",
- "quote 1.0.26",
+ "quote 1.0.35",
  "unicode-ident",
 ]
 
 [[package]]
 name = "syn"
-version = "2.0.15"
+version = "2.0.58"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a34fcf3e8b60f57e6a14301a2e916d323af98b0ea63c599441eec8558660c822"
+checksum = "44cfb93f38070beee36b3fef7d4f5a16f27751d94b187b666a5cc5e9b0d30687"
 dependencies = [
  "proc-macro2",
- "quote 1.0.26",
+ "quote 1.0.35",
  "unicode-ident",
 ]
 
+[[package]]
+name = "sync_wrapper"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160"
+
 [[package]]
 name = "synom"
 version = "0.11.3"
@@ -4503,16 +5220,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f"
 dependencies = [
  "proc-macro2",
- "quote 1.0.26",
- "syn 1.0.107",
- "unicode-xid 0.2.3",
+ "quote 1.0.35",
+ "syn 1.0.109",
+ "unicode-xid 0.2.4",
 ]
 
 [[package]]
 name = "sysinfo"
-version = "0.27.6"
+version = "0.27.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c215311383d25d03753375c53ab9fad8fc0cf46953c409211e065edeabf577ee"
+checksum = "a902e9050fca0a5d6877550b769abd2bd1ce8c04634b941dbe2809735e1a1e33"
 dependencies = [
  "cfg-if",
  "core-foundation-sys",
@@ -4522,82 +5239,100 @@ dependencies = [
  "winapi",
 ]
 
+[[package]]
+name = "system-configuration"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7"
+dependencies = [
+ "bitflags 1.3.2",
+ "core-foundation",
+ "system-configuration-sys",
+]
+
+[[package]]
+name = "system-configuration-sys"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9"
+dependencies = [
+ "core-foundation-sys",
+ "libc",
+]
+
 [[package]]
 name = "take_mut"
 version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f764005d11ee5f36500a149ace24e00e3da98b0158b3e2d53a7495660d3f4d60"
 
+[[package]]
+name = "tap"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369"
+
 [[package]]
 name = "tempfile"
-version = "3.3.0"
+version = "3.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5cdb1ef4eaeeaddc8fbd371e5017057064af0911902ef36b39801f67cc6d79e4"
+checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1"
 dependencies = [
  "cfg-if",
- "fastrand",
- "libc",
- "redox_syscall",
- "remove_dir_all",
- "winapi",
+ "fastrand 2.0.2",
+ "rustix 0.38.32",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
 name = "termcolor"
-version = "1.1.3"
+version = "1.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755"
+checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755"
 dependencies = [
  "winapi-util",
 ]
 
 [[package]]
 name = "thiserror"
-version = "1.0.38"
+version = "1.0.58"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a9cd18aa97d5c45c6603caea1da6628790b37f7a34b6ca89522331c5180fed0"
+checksum = "03468839009160513471e86a034bb2c5c0e4baae3b43f79ffc55c4a5427b3297"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.38"
+version = "1.0.58"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1fb327af4685e4d03fa8cbcf1716380da910eeb2bb8be417e7f9fd3fb164f36f"
+checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7"
 dependencies = [
  "proc-macro2",
- "quote 1.0.26",
- "syn 1.0.107",
+ "quote 1.0.35",
+ "syn 2.0.58",
 ]
 
 [[package]]
 name = "thread_local"
-version = "1.1.4"
+version = "1.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5516c27b78311c50bf42c071425c560ac799b11c30b31f87e3081965fe5e0180"
+checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c"
 dependencies = [
+ "cfg-if",
  "once_cell",
 ]
 
 [[package]]
 name = "time"
-version = "0.1.44"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6db9e6914ab8b1ae1c260a4ae7a49b6c5611b40328a735b21862567685e73255"
-dependencies = [
- "libc",
- "wasi 0.10.0+wasi-snapshot-preview1",
- "winapi",
-]
-
-[[package]]
-name = "time"
-version = "0.3.17"
+version = "0.3.34"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a561bf4617eebd33bca6434b988f39ed798e527f51a1e797d0ee4f61c0a38376"
+checksum = "c8248b6521bb14bc45b4067159b9b6ad792e2d6d754d6c41fb50e29fefe38749"
 dependencies = [
+ "deranged",
  "itoa",
+ "num-conv",
+ "powerfmt",
  "serde",
  "time-core",
  "time-macros",
@@ -4605,16 +5340,17 @@ dependencies = [
 
 [[package]]
 name = "time-core"
-version = "0.1.0"
+version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2e153e1f1acaef8acc537e68b44906d2db6436e2b35ac2c6b42640fff91f00fd"
+checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3"
 
 [[package]]
 name = "time-macros"
-version = "0.2.6"
+version = "0.2.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d967f99f534ca7e495c575c62638eebc2898a8c84c119b89e250477bc4ba16b2"
+checksum = "7ba3a3ef41e6672a2f0f001392bb5dcd3ff0a9992d618ca761a11c3121547774"
 dependencies = [
+ "num-conv",
  "time-core",
 ]
 
@@ -4629,9 +5365,9 @@ dependencies = [
 
 [[package]]
 name = "tinyvec_macros"
-version = "0.1.0"
+version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c"
+checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
 
 [[package]]
 name = "tokio"
@@ -4646,19 +5382,19 @@ dependencies = [
 
 [[package]]
 name = "tokio"
-version = "1.35.1"
+version = "1.37.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c89b4efa943be685f629b149f53829423f8f5531ea21249408e8e2f8671ec104"
+checksum = "1adbebffeca75fcfd058afa480fb6c0b81e165a0323f9c9d39c9697e37c46787"
 dependencies = [
  "backtrace",
- "bytes 1.5.0",
+ "bytes 1.6.0",
  "libc",
  "mio",
  "num_cpus",
  "parking_lot",
- "pin-project-lite 0.2.13",
+ "pin-project-lite 0.2.14",
  "signal-hook-registry",
- "socket2 0.5.5",
+ "socket2 0.5.6",
  "tokio-macros",
  "windows-sys 0.48.0",
 ]
@@ -4670,18 +5406,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b"
 dependencies = [
  "proc-macro2",
- "quote 1.0.26",
- "syn 2.0.15",
+ "quote 1.0.35",
+ "syn 2.0.58",
 ]
 
 [[package]]
 name = "tokio-native-tls"
-version = "0.3.0"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7d995660bd2b7f8c1568414c1126076c13fbb725c40112dc0120b78eb9b717b"
+checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2"
 dependencies = [
  "native-tls",
- "tokio 1.35.1",
+ "tokio 1.37.0",
 ]
 
 [[package]]
@@ -4691,108 +5427,138 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c43ee83903113e03984cb9e5cebe6c04a5116269e900e3ddba8f068a62adda59"
 dependencies = [
  "rustls",
- "tokio 1.35.1",
+ "tokio 1.37.0",
  "webpki",
 ]
 
 [[package]]
 name = "tokio-stream"
-version = "0.1.8"
+version = "0.1.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50145484efff8818b5ccd256697f36863f587da82cf8b409c53adf1e840798e3"
+checksum = "267ac89e0bec6e691e5813911606935d77c476ff49024f98abcea3e7b15e37af"
 dependencies = [
  "futures-core",
- "pin-project-lite 0.2.13",
- "tokio 1.35.1",
+ "pin-project-lite 0.2.14",
+ "tokio 1.37.0",
 ]
 
 [[package]]
 name = "tokio-util"
-version = "0.6.10"
+version = "0.7.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "36943ee01a6d67977dd3f84a5a1d2efeb4ada3a1ae771cadfaa535d9d9fc6507"
+checksum = "5419f34732d9eb6ee4c3578b7989078579b7f039cbbb9ca2c4da015749371e15"
 dependencies = [
- "bytes 1.5.0",
+ "bytes 1.6.0",
  "futures-core",
+ "futures-io",
  "futures-sink",
- "log",
- "pin-project-lite 0.2.13",
- "tokio 1.35.1",
+ "pin-project-lite 0.2.14",
+ "tokio 1.37.0",
+ "tracing",
 ]
 
 [[package]]
-name = "tokio-util"
-version = "0.7.2"
+name = "toml"
+version = "0.5.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f988a1a1adc2fb21f9c12aa96441da33a1728193ae0b95d2be22dbd17fcb4e5c"
+checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234"
 dependencies = [
- "bytes 1.5.0",
- "futures-core",
- "futures-io",
- "futures-sink",
- "pin-project-lite 0.2.13",
- "tokio 1.35.1",
- "tracing",
+ "serde",
 ]
 
 [[package]]
 name = "toml"
-version = "0.5.9"
+version = "0.8.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e9dd1545e8208b4a5af1aa9bbd0b4cf7e9ea08fabc5d0a5c67fcaafa17433aa3"
+dependencies = [
+ "serde",
+ "serde_spanned",
+ "toml_datetime",
+ "toml_edit 0.22.9",
+]
+
+[[package]]
+name = "toml_datetime"
+version = "0.6.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "toml_edit"
+version = "0.19.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d82e1a7758622a465f8cee077614c73484dac5b836c02ff6a40d5d1010324d7"
+checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421"
 dependencies = [
+ "indexmap 2.2.6",
+ "toml_datetime",
+ "winnow 0.5.40",
+]
+
+[[package]]
+name = "toml_edit"
+version = "0.22.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e40bb779c5187258fd7aad0eb68cb8706a0a81fa712fbea808ab43c4b8374c4"
+dependencies = [
+ "indexmap 2.2.6",
  "serde",
+ "serde_spanned",
+ "toml_datetime",
+ "winnow 0.6.5",
 ]
 
 [[package]]
 name = "totp-lite"
-version = "2.0.0"
+version = "2.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5cc496875d9c8fe9a0ce19e3ee8e8808c60376831a439543f0aac71c9dd129fa"
+checksum = "f8e43134db17199f7f721803383ac5854edd0d3d523cc34dba321d6acfbe76c3"
 dependencies = [
- "digest 0.10.7",
+ "digest",
  "hmac",
- "sha-1 0.10.0",
+ "sha1",
  "sha2",
 ]
 
 [[package]]
 name = "tower-service"
-version = "0.3.1"
+version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "360dfd1d6d30e05fda32ace2c8c70e9c0a9da713275777f5a4dbb8a1893930c6"
+checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52"
 
 [[package]]
 name = "tracing"
-version = "0.1.34"
+version = "0.1.40"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d0ecdcb44a79f0fe9844f0c4f33a342cbcbb5117de8001e6ba0dc2351327d09"
+checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef"
 dependencies = [
- "cfg-if",
  "log",
- "pin-project-lite 0.2.13",
+ "pin-project-lite 0.2.14",
  "tracing-attributes",
  "tracing-core",
 ]
 
 [[package]]
 name = "tracing-attributes"
-version = "0.1.21"
+version = "0.1.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc6b8ad3567499f98a1db7a752b07a7c8c7c7c34c332ec00effb2b0027974b7c"
+checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
 dependencies = [
  "proc-macro2",
- "quote 1.0.26",
- "syn 1.0.107",
+ "quote 1.0.35",
+ "syn 2.0.58",
 ]
 
 [[package]]
 name = "tracing-core"
-version = "0.1.26"
+version = "0.1.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f54c8ca710e81886d498c2fd3331b56c93aa248d49de2222ad2742247c60072f"
+checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54"
 dependencies = [
- "lazy_static",
+ "once_cell",
  "valuable",
 ]
 
@@ -4808,24 +5574,24 @@ dependencies = [
 
 [[package]]
 name = "tracing-log"
-version = "0.1.3"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78ddad33d2d10b1ed7eb9d1f518a5674713876e97e5bb9b7345a7984fbb4f922"
+checksum = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3"
 dependencies = [
- "lazy_static",
  "log",
+ "once_cell",
  "tracing-core",
 ]
 
 [[package]]
 name = "tracing-subscriber"
-version = "0.3.11"
+version = "0.3.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4bc28f93baff38037f64e6f43d34cfa1605f27a49c34e8a04c5e78b0babf2596"
+checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b"
 dependencies = [
- "ansi_term",
- "lazy_static",
  "matchers",
+ "nu-ansi-term",
+ "once_cell",
  "regex",
  "sharded-slab",
  "smallvec",
@@ -4856,7 +5622,7 @@ dependencies = [
  "smallvec",
  "thiserror",
  "tinyvec",
- "tokio 1.35.1",
+ "tokio 1.37.0",
  "url",
 ]
 
@@ -4876,30 +5642,30 @@ dependencies = [
  "resolv-conf",
  "smallvec",
  "thiserror",
- "tokio 1.35.1",
+ "tokio 1.37.0",
  "trust-dns-proto",
 ]
 
 [[package]]
 name = "try-lock"
-version = "0.2.3"
+version = "0.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642"
+checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b"
 
 [[package]]
 name = "tungstenite"
-version = "0.17.2"
+version = "0.17.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d96a2dea40e7570482f28eb57afbe42d97551905da6a9400acc5c328d24004f5"
+checksum = "e27992fd6a8c29ee7eef28fc78349aa244134e10ad447ce3b9f0ac0ed0fa4ce0"
 dependencies = [
- "base64 0.13.0",
+ "base64 0.13.1",
  "byteorder",
- "bytes 1.5.0",
+ "bytes 1.6.0",
  "http",
  "httparse",
  "log",
  "rand 0.8.5",
- "sha-1 0.10.0",
+ "sha-1",
  "thiserror",
  "url",
  "utf-8",
@@ -4912,30 +5678,30 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "89851716b67b937e393b3daa8423e67ddfc4bbbf1654bcf05488e95e0828db0c"
 dependencies = [
  "proc-macro2",
- "quote 1.0.26",
- "syn 1.0.107",
+ "quote 1.0.35",
+ "syn 1.0.109",
 ]
 
 [[package]]
 name = "typenum"
-version = "1.15.0"
+version = "1.17.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987"
+checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825"
 
 [[package]]
 name = "ubyte"
-version = "0.10.2"
+version = "0.10.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a58e29f263341a29bb79e14ad7fda5f63b1c7e48929bad4c685d7876b1d04e94"
+checksum = "f720def6ce1ee2fc44d40ac9ed6d3a59c361c80a75a7aa8e75bb9baed31cf2ea"
 dependencies = [
  "serde",
 ]
 
 [[package]]
 name = "ucd-trie"
-version = "0.1.3"
+version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "56dee185309b50d1f11bfedef0fe6d036842e3fb77413abef29f8f8d1c5d4c1c"
+checksum = "ed646292ffc8188ef8ea4d1e0e0150fb15a5c2e12ad9b8fc191ae7a8a7f3c4b9"
 
 [[package]]
 name = "ulid"
@@ -4960,11 +5726,13 @@ dependencies = [
 
 [[package]]
 name = "ulid"
-version = "1.0.0"
+version = "1.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "13a3aaa69b04e5b66cc27309710a569ea23593612387d67daaf102e73aa974fd"
+checksum = "34778c17965aa2a08913b57e1f34db9b4a63f5de31768b55bf20d2795f921259"
 dependencies = [
+ "getrandom",
  "rand 0.8.5",
+ "web-time",
 ]
 
 [[package]]
@@ -4978,9 +5746,9 @@ dependencies = [
 
 [[package]]
 name = "uncased"
-version = "0.9.7"
+version = "0.9.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09b01702b0fd0b3fadcf98e098780badda8742d4f4a7676615cad90e8ac73622"
+checksum = "e1b88fcfe09e89d3866a5c11019378088af2d24c3fbd4f0543f96b479ec90697"
 dependencies = [
  "serde",
  "version_check",
@@ -4988,9 +5756,9 @@ dependencies = [
 
 [[package]]
 name = "unicase"
-version = "2.6.0"
+version = "2.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6"
+checksum = "f7d2d4dafb69621809a81864c9c1b864479e1235c0dd4e199924b9742439ed89"
 dependencies = [
  "version_check",
 ]
@@ -5013,24 +5781,24 @@ checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75"
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.0"
+version = "1.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d22af068fba1eb5edcb4aea19d382b2a3deb4c8f9d475c589b6ada9e0fd493ee"
+checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
 
 [[package]]
 name = "unicode-normalization"
-version = "0.1.22"
+version = "0.1.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921"
+checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5"
 dependencies = [
  "tinyvec",
 ]
 
 [[package]]
 name = "unicode-segmentation"
-version = "1.10.1"
+version = "1.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36"
+checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202"
 
 [[package]]
 name = "unicode-xid"
@@ -5040,17 +5808,17 @@ checksum = "8c1f860d7d29cf02cb2f3f359fd35991af3d30bac52c57d265a3c461074cb4dc"
 
 [[package]]
 name = "unicode-xid"
-version = "0.2.3"
+version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "957e51f3646910546462e67d5f7599b9e4fb8acdd304b087a6494730f9eebf04"
+checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c"
 
 [[package]]
 name = "universal-hash"
-version = "0.4.1"
+version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f214e8f697e925001e66ec2c6e37a4ef93f0f78c2eed7814394e10c62025b05"
+checksum = "fc1de2c688dc15305988b563c3854064043356019f97a4b46276fe734c4f07ea"
 dependencies = [
- "generic-array 0.14.5",
+ "crypto-common",
  "subtle",
 ]
 
@@ -5060,13 +5828,19 @@ version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a"
 
+[[package]]
+name = "untrusted"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1"
+
 [[package]]
 name = "ureq"
-version = "2.7.1"
+version = "2.9.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b11c96ac7ee530603dcdf68ed1557050f374ce55a5a07193ebf8cbc9f8927e9"
+checksum = "11f214ce18d8b2cbe84ed3aa6486ed3f5b285cf8d8fbdbce9f3f767a724adc35"
 dependencies = [
- "base64 0.21.3",
+ "base64 0.21.7",
  "log",
  "native-tls",
  "once_cell",
@@ -5108,19 +5882,9 @@ checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9"
 
 [[package]]
 name = "uuid"
-version = "0.8.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7"
-dependencies = [
- "getrandom",
- "serde",
-]
-
-[[package]]
-name = "uuid"
-version = "1.4.1"
+version = "1.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "79daa5ed5740825c40b389c5e50312b9c86df53fccd33f281df655642b43869d"
+checksum = "a183cf7feeba97b4dd1c0d46788634f6221d87fa961b305bed08c851829efcc0"
 dependencies = [
  "getrandom",
  "serde",
@@ -5143,11 +5907,11 @@ dependencies = [
 
 [[package]]
 name = "validator"
-version = "0.16.0"
+version = "0.16.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32ad5bf234c7d3ad1042e5252b7eddb2c4669ee23f32c7dd0e9b7705f07ef591"
+checksum = "b92f40481c04ff1f4f61f304d61793c7b56ff76ac1469f1beb199b1445b253bd"
 dependencies = [
- "idna 0.2.3",
+ "idna 0.4.0",
  "lazy_static",
  "regex",
  "serde",
@@ -5167,9 +5931,9 @@ dependencies = [
  "lazy_static",
  "proc-macro-error",
  "proc-macro2",
- "quote 1.0.26",
+ "quote 1.0.35",
  "regex",
- "syn 1.0.107",
+ "syn 1.0.109",
  "validator_types",
 ]
 
@@ -5180,7 +5944,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "111abfe30072511849c5910134e8baf8dc05de4c0e5903d681cbd5c9c4d611e3"
 dependencies = [
  "proc-macro2",
- "syn 1.0.107",
+ "syn 1.0.109",
 ]
 
 [[package]]
@@ -5191,13 +5955,9 @@ checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d"
 
 [[package]]
 name = "value-bag"
-version = "1.0.0-alpha.9"
+version = "1.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2209b78d1249f7e6f3293657c9779fe31ced465df091bbd433a1cf88e916ec55"
-dependencies = [
- "ctor",
- "version_check",
-]
+checksum = "74797339c3b98616c009c7c3eb53a0ce41e85c8ec66bd3db96ed132d20cfdee8"
 
 [[package]]
 name = "vcpkg"
@@ -5207,9 +5967,9 @@ checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426"
 
 [[package]]
 name = "vergen"
-version = "7.5.0"
+version = "7.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "571b69f690c855821462709b6f41d42ceccc316fbd17b60bd06d06928cfe6a99"
+checksum = "f21b881cd6636ece9735721cf03c1fe1e774fe258683d084bb2812ab67435749"
 dependencies = [
  "anyhow",
  "cfg-if",
@@ -5220,7 +5980,7 @@ dependencies = [
  "rustversion",
  "sysinfo",
  "thiserror",
- "time 0.3.17",
+ "time",
 ]
 
 [[package]]
@@ -5231,37 +5991,39 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
 [[package]]
 name = "waker-fn"
-version = "1.1.0"
+version = "1.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d5b2c62b4012a3e1eca5a7e077d13b3bf498c4073e33ccd58626607748ceeca"
+checksum = "f3c4517f54858c779bbcbf228f4fca63d121bf85fbecb2dc578cdf4a39395690"
 
 [[package]]
 name = "want"
-version = "0.3.0"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ce8a968cb1cd110d136ff8b819a556d6fb6d919363c61534f6860c7eb172ba0"
+checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e"
 dependencies = [
- "log",
  "try-lock",
 ]
 
 [[package]]
 name = "wasi"
-version = "0.10.0+wasi-snapshot-preview1"
+version = "0.11.0+wasi-snapshot-preview1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f"
+checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
 
 [[package]]
-name = "wasi"
-version = "0.11.0+wasi-snapshot-preview1"
+name = "wasix"
+version = "0.12.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
+checksum = "c1fbb4ef9bbca0c1170e0b00dd28abc9e3b68669821600cad1caaed606583c6d"
+dependencies = [
+ "wasi",
+]
 
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.80"
+version = "0.2.92"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "27370197c907c55e3f1a9fbe26f44e937fe6451368324e009cba39e139dc08ad"
+checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8"
 dependencies = [
  "cfg-if",
  "wasm-bindgen-macro",
@@ -5269,24 +6031,24 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-backend"
-version = "0.2.80"
+version = "0.2.92"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "53e04185bfa3a779273da532f5025e33398409573f348985af9a1cbf3774d3f4"
+checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da"
 dependencies = [
  "bumpalo",
- "lazy_static",
  "log",
+ "once_cell",
  "proc-macro2",
- "quote 1.0.26",
- "syn 1.0.107",
+ "quote 1.0.35",
+ "syn 2.0.58",
  "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-futures"
-version = "0.4.30"
+version = "0.4.42"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f741de44b75e14c35df886aff5f1eb73aa114fa5d4d00dcd37b5e01259bf3b2"
+checksum = "76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0"
 dependencies = [
  "cfg-if",
  "js-sys",
@@ -5296,44 +6058,44 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.80"
+version = "0.2.92"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "17cae7ff784d7e83a2fe7611cfe766ecf034111b49deb850a3dc7699c08251f5"
+checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726"
 dependencies = [
- "quote 1.0.26",
+ "quote 1.0.35",
  "wasm-bindgen-macro-support",
 ]
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.80"
+version = "0.2.92"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "99ec0dc7a4756fffc231aab1b9f2f578d23cd391390ab27f952ae0c9b3ece20b"
+checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7"
 dependencies = [
  "proc-macro2",
- "quote 1.0.26",
- "syn 1.0.107",
+ "quote 1.0.35",
+ "syn 2.0.58",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.80"
+version = "0.2.92"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d554b7f530dee5964d9a9468d95c1f8b8acae4f282807e7d27d4b03099a46744"
+checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96"
 
 [[package]]
 name = "web-push"
-version = "0.10.0"
+version = "0.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30bdf799b4be6f04bfee94807548718de568834c9ea020e73b59af3dac66d72c"
+checksum = "7b5c5c6deab45e8820b77c9c8ae168f1ded4595767c746584bb67b9100f2b71d"
 dependencies = [
  "async-trait",
- "base64 0.13.0",
+ "base64 0.13.1",
  "chrono",
  "ece",
- "futures-lite",
+ "futures-lite 1.13.0",
  "http",
  "isahc",
  "jwt-simple",
@@ -5347,47 +6109,48 @@ dependencies = [
 
 [[package]]
 name = "web-sys"
-version = "0.3.57"
+version = "0.3.69"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b17e741662c70c8bd24ac5c5b18de314a2c26c32bf8346ee1e6f53de919c283"
+checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef"
 dependencies = [
  "js-sys",
  "wasm-bindgen",
 ]
 
 [[package]]
-name = "webpki"
-version = "0.22.0"
+name = "web-time"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f095d78192e208183081cc07bc5515ef55216397af48b873e5edcd72637fa1bd"
+checksum = "5a6580f308b1fad9207618087a65c04e7a10bc77e02c8e84e9b00dd4b12fa0bb"
 dependencies = [
- "ring",
- "untrusted",
+ "js-sys",
+ "wasm-bindgen",
 ]
 
 [[package]]
-name = "webpki-roots"
-version = "0.22.3"
+name = "webpki"
+version = "0.22.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44d8de8415c823c8abd270ad483c6feeac771fad964890779f9a8cb24fbbc1bf"
+checksum = "ed63aea5ce73d0ff405984102c42de94fc55a6b75765d621c65262469b3c9b53"
 dependencies = [
- "webpki",
+ "ring 0.17.8",
+ "untrusted 0.9.0",
 ]
 
 [[package]]
-name = "wepoll-ffi"
-version = "0.1.2"
+name = "webpki-roots"
+version = "0.22.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d743fdedc5c64377b5fc2bc036b01c7fd642205a0d96356034ae3404d49eb7fb"
+checksum = "b6c71e40d7d2c34a5106301fb632274ca37242cd0c9d3e64dbece371a40a2d87"
 dependencies = [
- "cc",
+ "webpki",
 ]
 
 [[package]]
 name = "widestring"
-version = "0.5.1"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "17882f045410753661207383517a6f62ec3dbeb6a4ed2acce01f0728238d1983"
+checksum = "7219d36b6eac893fa81e84ebe06485e7dcbb616177469b142df14f1f4deb1311"
 
 [[package]]
 name = "winapi"
@@ -5407,9 +6170,9 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
 
 [[package]]
 name = "winapi-util"
-version = "0.1.5"
+version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178"
+checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596"
 dependencies = [
  "winapi",
 ]
@@ -5421,16 +6184,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 
 [[package]]
-name = "windows-sys"
-version = "0.36.1"
+name = "windows"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f"
+dependencies = [
+ "windows-targets 0.48.5",
+]
+
+[[package]]
+name = "windows-core"
+version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea04155a16a59f9eab786fe12a4a450e75cdb175f9e0d80da1e17db09f55b8d2"
+checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9"
 dependencies = [
- "windows_aarch64_msvc 0.36.1",
- "windows_i686_gnu 0.36.1",
- "windows_i686_msvc 0.36.1",
- "windows_x86_64_gnu 0.36.1",
- "windows_x86_64_msvc 0.36.1",
+ "windows-targets 0.52.4",
 ]
 
 [[package]]
@@ -5439,7 +6207,16 @@ version = "0.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9"
 dependencies = [
- "windows-targets",
+ "windows-targets 0.48.5",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
+dependencies = [
+ "windows-targets 0.52.4",
 ]
 
 [[package]]
@@ -5448,15 +6225,30 @@ version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c"
 dependencies = [
- "windows_aarch64_gnullvm",
+ "windows_aarch64_gnullvm 0.48.5",
  "windows_aarch64_msvc 0.48.5",
  "windows_i686_gnu 0.48.5",
  "windows_i686_msvc 0.48.5",
  "windows_x86_64_gnu 0.48.5",
- "windows_x86_64_gnullvm",
+ "windows_x86_64_gnullvm 0.48.5",
  "windows_x86_64_msvc 0.48.5",
 ]
 
+[[package]]
+name = "windows-targets"
+version = "0.52.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7dd37b7e5ab9018759f893a1952c9420d060016fc19a472b4bb20d1bdd694d1b"
+dependencies = [
+ "windows_aarch64_gnullvm 0.52.4",
+ "windows_aarch64_msvc 0.52.4",
+ "windows_i686_gnu 0.52.4",
+ "windows_i686_msvc 0.52.4",
+ "windows_x86_64_gnu 0.52.4",
+ "windows_x86_64_gnullvm 0.52.4",
+ "windows_x86_64_msvc 0.52.4",
+]
+
 [[package]]
 name = "windows_aarch64_gnullvm"
 version = "0.48.5"
@@ -5464,10 +6256,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
 
 [[package]]
-name = "windows_aarch64_msvc"
-version = "0.36.1"
+name = "windows_aarch64_gnullvm"
+version = "0.52.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47"
+checksum = "bcf46cf4c365c6f2d1cc93ce535f2c8b244591df96ceee75d8e83deb70a9cac9"
 
 [[package]]
 name = "windows_aarch64_msvc"
@@ -5476,10 +6268,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
 
 [[package]]
-name = "windows_i686_gnu"
-version = "0.36.1"
+name = "windows_aarch64_msvc"
+version = "0.52.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6"
+checksum = "da9f259dd3bcf6990b55bffd094c4f7235817ba4ceebde8e6d11cd0c5633b675"
 
 [[package]]
 name = "windows_i686_gnu"
@@ -5488,10 +6280,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"
 
 [[package]]
-name = "windows_i686_msvc"
-version = "0.36.1"
+name = "windows_i686_gnu"
+version = "0.52.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024"
+checksum = "b474d8268f99e0995f25b9f095bc7434632601028cf86590aea5c8a5cb7801d3"
 
 [[package]]
 name = "windows_i686_msvc"
@@ -5500,10 +6292,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"
 
 [[package]]
-name = "windows_x86_64_gnu"
-version = "0.36.1"
+name = "windows_i686_msvc"
+version = "0.52.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1"
+checksum = "1515e9a29e5bed743cb4415a9ecf5dfca648ce85ee42e15873c3cd8610ff8e02"
 
 [[package]]
 name = "windows_x86_64_gnu"
@@ -5511,6 +6303,12 @@ version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"
 
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.52.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5eee091590e89cc02ad514ffe3ead9eb6b660aedca2183455434b93546371a03"
+
 [[package]]
 name = "windows_x86_64_gnullvm"
 version = "0.48.5"
@@ -5518,10 +6316,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
 
 [[package]]
-name = "windows_x86_64_msvc"
-version = "0.36.1"
+name = "windows_x86_64_gnullvm"
+version = "0.52.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680"
+checksum = "77ca79f2451b49fa9e2af39f0747fe999fcda4f5e241b2898624dca97a1f2177"
 
 [[package]]
 name = "windows_x86_64_msvc"
@@ -5530,21 +6328,46 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
 
 [[package]]
-name = "winreg"
-version = "0.7.0"
+name = "windows_x86_64_msvc"
+version = "0.52.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0120db82e8a1e0b9fb3345a539c478767c0048d842860994d96113d5b667bd69"
+checksum = "32b752e52a2da0ddfbdbcc6fceadfeede4c939ed16d13e648833a61dfb611ed8"
+
+[[package]]
+name = "winnow"
+version = "0.5.40"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876"
 dependencies = [
- "winapi",
+ "memchr",
+]
+
+[[package]]
+name = "winnow"
+version = "0.6.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dffa400e67ed5a4dd237983829e66475f0a4a26938c4b04c21baede6262215b8"
+dependencies = [
+ "memchr",
 ]
 
 [[package]]
 name = "winreg"
-version = "0.10.1"
+version = "0.50.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "80d0f4e272c85def139476380b12f9ac60926689dd2e01d4923222f40580869d"
+checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1"
 dependencies = [
- "winapi",
+ "cfg-if",
+ "windows-sys 0.48.0",
+]
+
+[[package]]
+name = "wyz"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "05f360fc0b24296329c78fda852a1e9ae82de9cf7b27dae4b7f62f118f77b9ed"
+dependencies = [
+ "tap",
 ]
 
 [[package]]
@@ -5562,13 +6385,39 @@ version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec"
 
+[[package]]
+name = "yansi"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cfe53a6657fd280eaa890a3bc59152892ffa3e30101319d168b781ed6529b049"
+
+[[package]]
+name = "zerocopy"
+version = "0.7.32"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be"
+dependencies = [
+ "zerocopy-derive",
+]
+
+[[package]]
+name = "zerocopy-derive"
+version = "0.7.32"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6"
+dependencies = [
+ "proc-macro2",
+ "quote 1.0.35",
+ "syn 2.0.58",
+]
+
 [[package]]
 name = "zeroize"
-version = "1.6.0"
+version = "1.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a0956f1ba7c7909bfb66c2e9e4124ab6f6482560f6628b5aaeba39207c9aad9"
+checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d"
 
 [[patch.unused]]
 name = "redis"
-version = "0.23.1"
-source = "git+https://github.com/revoltchat/redis-rs?rev=f8ca28ab85da59d2ccde526b4d2fb390eff5a5f9#f8ca28ab85da59d2ccde526b4d2fb390eff5a5f9"
+version = "0.22.3"
+source = "git+https://github.com/revoltchat/redis-rs?rev=1a41faf356fd21aebba71cea7eb7eb2653e5f0ef#1a41faf356fd21aebba71cea7eb7eb2653e5f0ef"
diff --git a/Cargo.toml b/Cargo.toml
index b55327166..03eb89cb6 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [workspace]
 resolver = "2"
-members = ["crates/delta", "crates/bonfire", "crates/core/*"]
+members = ["crates/delta", "crates/bonfire", "crates/voice-ingress", "crates/core/*"]
 
 [patch.crates-io]
 # mobc-redis = { git = "https://github.com/insertish/mobc", rev = "8b880bb59f2ba80b4c7bc40c649c113d8857a186" }
@@ -8,3 +8,4 @@ redis22 = { package = "redis", version = "0.22.3", git = "https://github.com/rev
 redis23 = { package = "redis", version = "0.23.1", git = "https://github.com/revoltchat/redis-rs", rev = "f8ca28ab85da59d2ccde526b4d2fb390eff5a5f9" }
 # authifier = { package = "authifier", version = "1.0.8", path = "../authifier/crates/authifier" }
 # rocket_authifier = { package = "rocket_authifier", version = "1.0.8", path = "../authifier/crates/rocket_authifier" }
+rocket = { git = "https://github.com/rwf2/Rocket/", rev = "4dcd928" }
\ No newline at end of file
diff --git a/crates/bonfire/src/events/impl.rs b/crates/bonfire/src/events/impl.rs
index 4880edf0c..d5ed027db 100644
--- a/crates/bonfire/src/events/impl.rs
+++ b/crates/bonfire/src/events/impl.rs
@@ -1,7 +1,7 @@
 use std::collections::HashSet;
 
 use revolt_database::{
-    events::client::EventV1, util::permissions::DatabasePermissionQuery, Channel, Database, Member,
+    events::client::{ChannelVoiceState, EventV1, ReadyServer, UserVoiceState}, util::permissions::DatabasePermissionQuery, Channel, Database, Member,
     MemberCompositeKey, Presence, RelationshipStatus,
 };
 use revolt_models::v0;
@@ -9,6 +9,8 @@ use revolt_permissions::{calculate_channel_permissions, ChannelPermission};
 use revolt_presence::filter_online;
 use revolt_result::Result;
 
+use redis_kiss::{get_connection, AsyncCommands};
+
 use super::state::{Cache, State};
 
 /// Cache Manager
@@ -197,9 +199,29 @@ impl State {
             self.insert_subscription(channel.id().to_string());
         }
 
+        let mut conn = get_connection().await.unwrap();
+        let mut new_servers = Vec::with_capacity(servers.len());
+
+        for server in servers {
+            let mut voice_states = vec![];
+
+            for channel in &server.channels {
+                let members = conn.smembers::<_, Vec<String>>(format!("vc-members-{channel}")).await.unwrap();
+
+                if !members.is_empty() {
+                    voice_states.push(ChannelVoiceState {
+                        id: channel.clone(),
+                        participants: members.into_iter().map(|id| UserVoiceState { id }).collect()
+                    })
+                }
+            }
+
+            new_servers.push(ReadyServer { server: server.into(), voice_states })
+        }
+
         Ok(EventV1::Ready {
             users,
-            servers: servers.into_iter().map(Into::into).collect(),
+            servers: new_servers,
             channels: channels.into_iter().map(Into::into).collect(),
             members: members.into_iter().map(Into::into).collect(),
             emojis: emojis.into_iter().map(Into::into).collect(),
diff --git a/crates/core/config/Revolt.toml b/crates/core/config/Revolt.toml
index 85823e63e..c6c44f7c1 100644
--- a/crates/core/config/Revolt.toml
+++ b/crates/core/config/Revolt.toml
@@ -69,3 +69,4 @@ emoji_size = 500000
 [sentry]
 api = ""
 events = ""
+voice_ingress = ""
\ No newline at end of file
diff --git a/crates/core/config/src/lib.rs b/crates/core/config/src/lib.rs
index 60fe88fb4..df8c2c884 100644
--- a/crates/core/config/src/lib.rs
+++ b/crates/core/config/src/lib.rs
@@ -44,8 +44,7 @@ pub struct Hosts {
     pub events: String,
     pub autumn: String,
     pub january: String,
-    pub voso_legacy: String,
-    pub voso_legacy_ws: String,
+    pub livekit: String
 }
 
 #[derive(Deserialize, Debug, Clone)]
@@ -94,6 +93,13 @@ pub struct ApiWorkers {
     pub max_concurrent_connections: usize,
 }
 
+#[derive(Deserialize, Debug, Clone)]
+pub struct ApiLiveKit {
+    pub url: String,
+    pub key: String,
+    pub secret: String
+}
+
 #[derive(Deserialize, Debug, Clone)]
 pub struct Api {
     pub registration: ApiRegistration,
@@ -102,6 +108,7 @@ pub struct Api {
     pub fcm: ApiFcm,
     pub security: ApiSecurity,
     pub workers: ApiWorkers,
+    pub livekit: ApiLiveKit,
 }
 
 #[derive(Deserialize, Debug, Clone)]
@@ -144,6 +151,7 @@ pub struct Features {
 pub struct Sentry {
     pub api: String,
     pub events: String,
+    pub voice_ingress: String
 }
 
 #[derive(Deserialize, Debug, Clone)]
diff --git a/crates/core/database/src/drivers/mod.rs b/crates/core/database/src/drivers/mod.rs
index 51884c4f2..e209cd48c 100644
--- a/crates/core/database/src/drivers/mod.rs
+++ b/crates/core/database/src/drivers/mod.rs
@@ -22,7 +22,7 @@ pub enum DatabaseInfo {
 }
 
 /// Database
-#[derive(Clone)]
+#[derive(Clone, Debug)]
 pub enum Database {
     /// Mock database
     Reference(ReferenceDb),
@@ -35,7 +35,7 @@ impl DatabaseInfo {
     #[async_recursion]
     pub async fn connect(self) -> Result<Database, String> {
         let config = config().await;
-
+        println!("{config:?}");
         Ok(match self {
             DatabaseInfo::Auto => {
                 if std::env::var("TEST_DB").is_ok() {
diff --git a/crates/core/database/src/drivers/mongodb.rs b/crates/core/database/src/drivers/mongodb.rs
index a4bbe56bd..720f5a471 100644
--- a/crates/core/database/src/drivers/mongodb.rs
+++ b/crates/core/database/src/drivers/mongodb.rs
@@ -12,6 +12,7 @@ use serde::Serialize;
 database_derived!(
     #[cfg(feature = "mongodb")]
     /// MongoDB implementation
+    #[derive(Debug)]
     pub struct MongoDb(pub ::mongodb::Client, pub String);
 );
 
diff --git a/crates/core/database/src/drivers/reference.rs b/crates/core/database/src/drivers/reference.rs
index 90458d247..657aef0aa 100644
--- a/crates/core/database/src/drivers/reference.rs
+++ b/crates/core/database/src/drivers/reference.rs
@@ -10,7 +10,7 @@ use crate::{
 
 database_derived!(
     /// Reference implementation
-    #[derive(Default)]
+    #[derive(Default, Debug)]
     pub struct ReferenceDb {
         pub bots: Arc<Mutex<HashMap<String, Bot>>>,
         pub channels: Arc<Mutex<HashMap<String, Channel>>>,
diff --git a/crates/core/database/src/events/client.rs b/crates/core/database/src/events/client.rs
index 4d3b6c0de..04fb7f1b0 100644
--- a/crates/core/database/src/events/client.rs
+++ b/crates/core/database/src/events/client.rs
@@ -5,7 +5,7 @@ use revolt_models::v0::{
     AppendMessage, Channel, Emoji, FieldsChannel, FieldsMember, FieldsRole, FieldsServer,
     FieldsUser, FieldsWebhook, Member, MemberCompositeKey, Message, PartialChannel, PartialMember,
     PartialMessage, PartialRole, PartialServer, PartialUser, PartialWebhook, Report, Server, User,
-    UserSettings, Webhook,
+    UserSettings, Webhook
 };
 use revolt_result::Error;
 
@@ -39,6 +39,25 @@ pub enum ErrorEvent {
     APIError(Error),
 }
 
+#[derive(Serialize, Deserialize, Debug, Clone)]
+pub struct UserVoiceState {
+    pub id: String
+    // TODO - muted, etc
+}
+
+#[derive(Serialize, Deserialize, Debug, Clone)]
+pub struct ChannelVoiceState {
+    pub id: String,
+    pub participants: Vec<UserVoiceState>
+}
+
+#[derive(Serialize, Deserialize, Debug, Clone)]
+pub struct ReadyServer {
+    #[serde(flatten)]
+    pub server: Server,
+    pub voice_states: Vec<ChannelVoiceState>
+}
+
 /// Protocol Events
 #[derive(Serialize, Deserialize, Debug, Clone)]
 #[serde(tag = "type")]
@@ -51,7 +70,7 @@ pub enum EventV1 {
     /// Basic data to cache
     Ready {
         users: Vec<User>,
-        servers: Vec<Server>,
+        servers: Vec<ReadyServer>,
         channels: Vec<Channel>,
         members: Vec<Member>,
         emojis: Vec<Emoji>,
@@ -225,6 +244,16 @@ pub enum EventV1 {
 
     /// Auth events
     Auth(AuthifierEvent),
+
+    /// Voice events
+    VoiceChannelJoin {
+        id: String,
+        user: String,
+    },
+    VoiceChannelLeave {
+        id: String,
+        user: String,
+    }
 }
 
 impl EventV1 {
diff --git a/crates/core/database/src/models/channels/model.rs b/crates/core/database/src/models/channels/model.rs
index eafd88a6f..2b671c382 100644
--- a/crates/core/database/src/models/channels/model.rs
+++ b/crates/core/database/src/models/channels/model.rs
@@ -1,7 +1,7 @@
 use std::collections::HashMap;
 
 use revolt_config::config;
-use revolt_models::v0::{self, MessageAuthor};
+use revolt_models::v0::{self, MessageAuthor, VoiceInformation};
 use revolt_permissions::OverrideField;
 use revolt_result::Result;
 use serde::{Deserialize, Serialize};
@@ -103,6 +103,10 @@ auto_derived!(
             /// Whether this channel is marked as not safe for work
             #[serde(skip_serializing_if = "crate::if_false", default)]
             nsfw: bool,
+
+            /// Voice Information for when this channel is also a voice channel
+            #[serde(skip_serializing_if = "Option::is_none")]
+            voice: Option<VoiceInformation>
         },
         /// Voice channel belonging to a server
         VoiceChannel {
@@ -219,6 +223,7 @@ impl Channel {
                 default_permissions: None,
                 role_permissions: HashMap::new(),
                 nsfw: data.nsfw.unwrap_or(false),
+                voice: data.voice
             },
             v0::LegacyServerChannelType::Voice => Channel::VoiceChannel {
                 id: id.clone(),
diff --git a/crates/core/database/src/models/users/model.rs b/crates/core/database/src/models/users/model.rs
index f09449d72..624cbefc0 100644
--- a/crates/core/database/src/models/users/model.rs
+++ b/crates/core/database/src/models/users/model.rs
@@ -4,6 +4,7 @@ use crate::{events::client::EventV1, Database, File, RatelimitEvent};
 
 use once_cell::sync::Lazy;
 use rand::seq::SliceRandom;
+use redis_kiss::{get_connection, AsyncCommands};
 use revolt_config::config;
 use revolt_models::v0;
 use revolt_presence::filter_online;
@@ -567,6 +568,15 @@ impl User {
         }
     }
 
+    /// Gets current voice channel
+    pub async fn current_voice_channel(&self) -> Result<Option<String>> {
+        let mut conn = get_connection().await.map_err(|_| create_error!(InternalError))?;
+
+        conn.get::<_, Option<String>>(format!("vc-{}", &self.id))
+            .await
+            .map_err(|_| create_error!(InternalError))
+    }
+
     /// Update user data
     pub async fn update<'a>(
         &mut self,
diff --git a/crates/core/database/src/util/bridge/v0.rs b/crates/core/database/src/util/bridge/v0.rs
index d8e184db6..2d49fd026 100644
--- a/crates/core/database/src/util/bridge/v0.rs
+++ b/crates/core/database/src/util/bridge/v0.rs
@@ -186,6 +186,7 @@ impl From<crate::Channel> for Channel {
                 default_permissions,
                 role_permissions,
                 nsfw,
+                voice
             } => Channel::TextChannel {
                 id,
                 server,
@@ -196,6 +197,7 @@ impl From<crate::Channel> for Channel {
                 default_permissions,
                 role_permissions,
                 nsfw,
+                voice
             },
             crate::Channel::VoiceChannel {
                 id,
@@ -266,6 +268,7 @@ impl From<Channel> for crate::Channel {
                 default_permissions,
                 role_permissions,
                 nsfw,
+                voice
             } => crate::Channel::TextChannel {
                 id,
                 server,
@@ -276,6 +279,7 @@ impl From<Channel> for crate::Channel {
                 default_permissions,
                 role_permissions,
                 nsfw,
+                voice
             },
             Channel::VoiceChannel {
                 id,
diff --git a/crates/core/models/src/v0/channels.rs b/crates/core/models/src/v0/channels.rs
index dfabb2af7..f30c75336 100644
--- a/crates/core/models/src/v0/channels.rs
+++ b/crates/core/models/src/v0/channels.rs
@@ -107,8 +107,12 @@ auto_derived!(
                 serde(skip_serializing_if = "crate::if_false", default)
             )]
             nsfw: bool,
+
+            /// Voice Information for when this channel is also a voice channel
+            #[cfg_attr(feature = "serde", serde(skip_serializing_if = "Option::is_none"))]
+            voice: Option<VoiceInformation>
         },
-        /// Voice channel belonging to a server
+        /// DEPRECATED (use TextChannel { voice }): Voice channel belonging to a server
         VoiceChannel {
             /// Unique Id
             #[cfg_attr(feature = "serde", serde(rename = "_id"))]
@@ -147,6 +151,15 @@ auto_derived!(
         },
     }
 
+    /// Voice information for a channel
+    #[derive(Default)]
+    #[cfg_attr(feature = "validator", derive(validator::Validate))]
+    pub struct VoiceInformation {
+        /// Maximium amount of users allowed in the voice channel at once
+        #[cfg_attr(feature = "validator", validate(range(min = 1)))]
+        pub max_users: Option<u32>
+    }
+
     /// Partial representation of a channel
     #[derive(Default)]
     pub struct PartialChannel {
@@ -260,6 +273,10 @@ auto_derived!(
         /// Whether this channel is age restricted
         #[serde(skip_serializing_if = "Option::is_none")]
         pub nsfw: Option<bool>,
+
+        /// Voice Information for when this channel is also a voice channel
+        #[serde(skip_serializing_if = "Option::is_none")]
+        pub voice: Option<VoiceInformation>
     }
 
     /// New default permissions
diff --git a/crates/core/result/src/lib.rs b/crates/core/result/src/lib.rs
index 5608509df..c8e6c1c9a 100644
--- a/crates/core/result/src/lib.rs
+++ b/crates/core/result/src/lib.rs
@@ -130,8 +130,9 @@ pub enum ErrorType {
         error: String,
     },
 
-    // ? Legacy errors
-    VosoUnavailable,
+    // ? Voice errors
+    LiveKitUnavailable,
+    AlreadyInVoiceChannel
 }
 
 #[macro_export]
diff --git a/crates/core/result/src/rocket.rs b/crates/core/result/src/rocket.rs
index d5ca34934..756da38e4 100644
--- a/crates/core/result/src/rocket.rs
+++ b/crates/core/result/src/rocket.rs
@@ -71,10 +71,12 @@ impl<'r> Responder<'r, 'static> for Error {
             ErrorType::InvalidProperty => Status::BadRequest,
             ErrorType::InvalidSession => Status::Unauthorized,
             ErrorType::DuplicateNonce => Status::Conflict,
-            ErrorType::VosoUnavailable => Status::BadRequest,
             ErrorType::NotFound => Status::NotFound,
             ErrorType::NoEffect => Status::Ok,
             ErrorType::FailedValidation { .. } => Status::BadRequest,
+
+            ErrorType::LiveKitUnavailable => Status::BadRequest,
+            ErrorType::AlreadyInVoiceChannel => Status::BadRequest,
         };
 
         // Serialize the error data structure into JSON.
diff --git a/crates/delta/Cargo.toml b/crates/delta/Cargo.toml
index cc4d0d39d..e5227d042 100644
--- a/crates/delta/Cargo.toml
+++ b/crates/delta/Cargo.toml
@@ -80,5 +80,8 @@ revolt-models = { path = "../core/models", features = [
 revolt-result = { path = "../core/result", features = ["rocket", "okapi"] }
 revolt-permissions = { path = "../core/permissions", features = ["schemas"] }
 
+# voice
+livekit-api = "0.3.2"
+
 [build-dependencies]
 vergen = "7.5.0"
diff --git a/crates/delta/src/main.rs b/crates/delta/src/main.rs
index c5ec08a25..f910e660c 100644
--- a/crates/delta/src/main.rs
+++ b/crates/delta/src/main.rs
@@ -24,6 +24,7 @@ use authifier::config::{
 };
 use authifier::{Authifier, AuthifierEvent};
 use rocket::data::ToByteUnit;
+use livekit_api::services::room::RoomClient;
 
 pub async fn web() -> Rocket<Build> {
     // Get settings
@@ -34,6 +35,7 @@ pub async fn web() -> Rocket<Build> {
 
     // Setup database
     let db = revolt_database::DatabaseInfo::Auto.connect().await.unwrap();
+    log::info!("database_here {db:?}");
     db.migrate_database().await.unwrap();
 
     // Setup Authifier event channel
@@ -97,6 +99,11 @@ pub async fn web() -> Rocket<Build> {
     )
     .into();
 
+
+    log::info!("{:?}", &config.api.livekit);
+
+    let room_client = RoomClient::with_api_key(&config.api.livekit.url, &config.api.livekit.key, &config.api.livekit.secret);
+
     // Configure Rocket
     let rocket = rocket::build();
     let prometheus = PrometheusMetrics::new();
@@ -110,6 +117,7 @@ pub async fn web() -> Rocket<Build> {
         .manage(authifier)
         .manage(db)
         .manage(cors.clone())
+        .manage(room_client)
         .attach(util::ratelimiter::RatelimitFairing)
         .attach(cors)
         .configure(rocket::Config {
diff --git a/crates/delta/src/routes/channels/voice_join.rs b/crates/delta/src/routes/channels/voice_join.rs
index 33f4e05c6..7b252ceda 100644
--- a/crates/delta/src/routes/channels/voice_join.rs
+++ b/crates/delta/src/routes/channels/voice_join.rs
@@ -1,105 +1,75 @@
+use std::borrow::Cow;
+
 use revolt_config::config;
-use revolt_database::{
-    util::{permissions::DatabasePermissionQuery, reference::Reference},
-    Channel, Database, User,
-};
 use revolt_models::v0;
+use revolt_database::{events::client::EventV1, util::{permissions::perms, reference::Reference}, Channel, Database, User};
 use revolt_permissions::{calculate_channel_permissions, ChannelPermission};
 use revolt_result::{create_error, Result};
+
+use livekit_api::{access_token::{AccessToken, VideoGrants}, services::room::{CreateRoomOptions, RoomClient}};
 use rocket::{serde::json::Json, State};
+use serde::{Deserialize, Serialize};
+
+/// # Voice Server Token Response
+#[derive(Serialize, Deserialize, JsonSchema)]
+pub struct CreateVoiceUserResponse {
+    /// Token for authenticating with the voice server
+    token: String,
+}
 
 /// # Join Call
 ///
 /// Asks the voice server for a token to join the call.
 #[openapi(tag = "Voice")]
 #[post("/<target>/join_call")]
-pub async fn call(
-    db: &State<Database>,
-    user: User,
-    target: Reference,
-) -> Result<Json<v0::LegacyCreateVoiceUserResponse>> {
+pub async fn call(db: &State<Database>, rooms: &State<RoomClient>, user: User, target: Reference) -> Result<Json<CreateVoiceUserResponse>> {
     let channel = target.as_channel(db).await?;
-    let mut query = DatabasePermissionQuery::new(db, &user).channel(&channel);
-    calculate_channel_permissions(&mut query)
+
+    let mut permissions = perms(db, &user).channel(&channel);
+
+    calculate_channel_permissions(&mut permissions)
         .await
         .throw_if_lacking_channel_permission(ChannelPermission::Connect)?;
 
-    let config = config().await;
-    if config.api.security.voso_legacy_token.is_empty() {
-        return Err(create_error!(VosoUnavailable));
+    if user.current_voice_channel().await?.is_some() {
+        return Err(create_error!(AlreadyInVoiceChannel))
     }
 
-    match channel {
-        Channel::SavedMessages { .. } | Channel::TextChannel { .. } => {
-            return Err(create_error!(CannotJoinCall))
-        }
-        _ => {}
-    }
+    let config = config().await;
 
-    // To join a call:
-    // - Check if the room exists.
-    // - If not, create it.
-    let client = reqwest::Client::new();
-    let result = client
-        .get(&format!(
-            "{}/room/{}",
-            config.hosts.voso_legacy,
-            channel.id()
-        ))
-        .header(
-            reqwest::header::AUTHORIZATION,
-            config.api.security.voso_legacy_token.clone(),
-        )
-        .send()
-        .await;
+    if config.api.livekit.url.is_empty() {
+        return Err(create_error!(LiveKitUnavailable));
+    };
 
-    match result {
-        Err(_) => return Err(create_error!(VosoUnavailable)),
-        Ok(result) => match result.status() {
-            reqwest::StatusCode::OK => (),
-            reqwest::StatusCode::NOT_FOUND => {
-                if (client
-                    .post(&format!(
-                        "{}/room/{}",
-                        config.hosts.voso_legacy,
-                        channel.id()
-                    ))
-                    .header(
-                        reqwest::header::AUTHORIZATION,
-                        config.api.security.voso_legacy_token.clone(),
-                    )
-                    .send()
-                    .await)
-                    .is_err()
-                {
-                    return Err(create_error!(VosoUnavailable));
-                }
-            }
-            _ => return Err(create_error!(VosoUnavailable)),
-        },
-    }
+    let voice = match &channel {
+        Channel::DirectMessage { .. } | Channel::VoiceChannel { .. } => Cow::Owned(v0::VoiceInformation::default()),
+        Channel::TextChannel { voice: Some(voice), .. } => Cow::Borrowed(voice),
+        _ => return Err(create_error!(CannotJoinCall))
+    };
 
-    // Then create a user for the room.
-    if let Ok(response) = client
-        .post(&format!(
-            "{}/room/{}/user/{}",
-            config.hosts.voso_legacy,
-            channel.id(),
-            user.id
-        ))
-        .header(
-            reqwest::header::AUTHORIZATION,
-            config.api.security.voso_legacy_token,
-        )
-        .send()
-        .await
-    {
-        response
-            .json()
-            .await
-            .map_err(|_| create_error!(InvalidOperation))
-            .map(Json)
-    } else {
-        Err(create_error!(VosoUnavailable))
-    }
+    let token = AccessToken::with_api_key(&config.api.livekit.key, &config.api.livekit.secret)
+        .with_name(&format!("{}#{}", user.username, user.discriminator))
+        .with_identity(&user.id)
+        .with_metadata(&serde_json::to_string(&user).map_err(|_| create_error!(InternalError))?)
+        .with_grants(VideoGrants {
+            room_join: true,
+            room: channel.id().to_string(),
+            ..Default::default()
+        })
+        .to_jwt()
+        .inspect_err(|e| log::error!("{e:?}"))
+        .map_err(|_| create_error!(InternalError))?;
+
+    let room = rooms.create_room(&channel.id(), CreateRoomOptions {
+        max_participants: voice.max_users.unwrap_or(u32::MAX),
+        empty_timeout: 5 * 60,  // 5 minutes
+        ..Default::default()
+    })
+    .await
+    .inspect_err(|e| log::error!("{e:?}"))
+    .map_err(|_| create_error!(InternalError))?;
+
+    log::info!("created room {room:?}");
+
+    Ok(Json(CreateVoiceUserResponse { token }))
 }
diff --git a/crates/delta/src/routes/root.rs b/crates/delta/src/routes/root.rs
index 1e237bff6..d8677f8b4 100644
--- a/crates/delta/src/routes/root.rs
+++ b/crates/delta/src/routes/root.rs
@@ -27,9 +27,7 @@ pub struct VoiceFeature {
     /// Whether voice is enabled
     pub enabled: bool,
     /// URL pointing to the voice API
-    pub url: String,
-    /// URL pointing to the voice WebSocket server
-    pub ws: String,
+    pub url: String
 }
 
 /// # Feature Configuration
@@ -46,7 +44,7 @@ pub struct RevoltFeatures {
     /// Proxy service configuration
     pub january: Feature,
     /// Voice server configuration
-    pub voso: VoiceFeature,
+    pub livekit: VoiceFeature,
 }
 
 /// # Build Information
@@ -106,10 +104,9 @@ pub async fn root() -> Result<Json<RevoltConfig>> {
                 enabled: !config.hosts.january.is_empty(),
                 url: config.hosts.january,
             },
-            voso: VoiceFeature {
-                enabled: !config.hosts.voso_legacy.is_empty(),
-                url: config.hosts.voso_legacy,
-                ws: config.hosts.voso_legacy_ws,
+            livekit: VoiceFeature {
+                enabled: !config.api.livekit.url.is_empty(),
+                url: config.api.livekit.url.to_string(),
             },
         },
         ws: config.hosts.events,
diff --git a/crates/delta/src/util/test.rs b/crates/delta/src/util/test.rs
index 467e945be..681f60767 100644
--- a/crates/delta/src/util/test.rs
+++ b/crates/delta/src/util/test.rs
@@ -100,7 +100,7 @@ impl TestHarness {
         }
 
         let mut stream = self.sub.on_message();
-        while let Some(item) = stream.next().await {
+        while let Some(Ok(item)) = stream.next().await {
             let msg_topic = item.get_channel_name();
             let payload: EventV1 = redis_kiss::decode_payload(&item).unwrap();
 
diff --git a/crates/voice-ingress/.gitignore b/crates/voice-ingress/.gitignore
new file mode 100644
index 000000000..c41cc9e35
--- /dev/null
+++ b/crates/voice-ingress/.gitignore
@@ -0,0 +1 @@
+/target
\ No newline at end of file
diff --git a/crates/voice-ingress/Cargo.toml b/crates/voice-ingress/Cargo.toml
new file mode 100644
index 000000000..b220968f3
--- /dev/null
+++ b/crates/voice-ingress/Cargo.toml
@@ -0,0 +1,44 @@
+[package]
+name = "revolt-voice-ingress"
+version = "0.7.1"
+license = "AGPL-3.0-or-later"
+edition = "2021"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+# util
+log = "*"
+sentry = "0.31.5"
+lru = "0.7.6"
+ulid = "0.5.0"
+redis-kiss = "0.1.4"
+
+# serde
+serde_json = "1.0.79"
+rmp-serde = "1.0.0"
+serde = "1.0.136"
+
+# http
+rocket = { version = "0.5.0-rc.2", features = ["json"] }
+rocket_empty = "0.1.1"
+
+# async
+futures = "0.3.21"
+async-std = { version = "1.8.0", features = [
+    "tokio1",
+    "tokio02",
+    "attributes",
+] }
+
+# core
+revolt-result = { path = "../core/result" }
+revolt-models = { path = "../core/models" }
+revolt-config = { path = "../core/config" }
+revolt-database = { path = "../core/database" }
+revolt-permissions = { version = "0.7.1", path = "../core/permissions" }
+revolt-presence = { path = "../core/presence", features = ["redis-is-patched"] }
+
+# voice
+livekit-api = "0.3.2"
+livekit-protocol = "0.3.2"
\ No newline at end of file
diff --git a/crates/voice-ingress/Dockerfile b/crates/voice-ingress/Dockerfile
new file mode 100644
index 000000000..773069863
--- /dev/null
+++ b/crates/voice-ingress/Dockerfile
@@ -0,0 +1,11 @@
+# Build Stage
+FROM ghcr.io/revoltchat/base:latest AS builder
+
+# Bundle Stage
+FROM debian:bullseye-slim
+RUN apt-get update && \
+    apt-get install -y ca-certificates && \
+    apt-get clean
+COPY --from=builder /home/rust/src/target/release/revolt-voice-ingress ./
+EXPOSE 9000
+CMD ["./revolt-voice-ingress"]
diff --git a/crates/voice-ingress/src/main.rs b/crates/voice-ingress/src/main.rs
new file mode 100644
index 000000000..43edde5c5
--- /dev/null
+++ b/crates/voice-ingress/src/main.rs
@@ -0,0 +1,75 @@
+use std::env;
+
+use redis_kiss::{get_connection, AsyncCommands};
+
+use revolt_database::events::client::EventV1;
+use rocket::{build, post, routes, serde::json::Json, Config};
+use rocket_empty::EmptyResponse;
+use livekit_protocol::WebhookEvent;
+
+use revolt_config::Database;
+use revolt_result::Result;
+
+#[async_std::main]
+async fn main() {
+    revolt_config::configure!(voice_ingress);
+
+    let rocket = build()
+        .manage(get_connection().await.unwrap())
+        .mount("/", routes![ingress])
+        .configure(Config { port: 8500, ..Default::default() })
+        .launch()
+        .await
+        .unwrap();
+}
+
+#[post("/", data="<body>")]
+async fn ingress(body: Json<WebhookEvent>) -> Result<EmptyResponse> {
+    let mut redis = get_connection().await.unwrap();
+
+    log::debug!("received event: {body:?}");
+
+    let channel_id = body
+        .room
+        .as_ref()
+        .map(|r| &r.name);
+
+    let user_id = body
+        .participant
+        .as_ref()
+        .map(|r| &r.identity);
+
+    match body.event.as_str() {
+        "participant_joined" => {
+            let channel_id = channel_id.unwrap();
+            let user_id = user_id.unwrap();
+
+            redis.sadd::<_, _, u64>(format!("vc-members-{}", channel_id), user_id).await.unwrap();
+            redis.set::<_, _, String>(format!("vc-{}", user_id), &channel_id).await.unwrap();
+
+            EventV1::VoiceChannelJoin {
+                id: channel_id.clone(),
+                user: user_id.clone()
+            }
+            .p(channel_id.clone())
+            .await
+        },
+        "participant_left" => {
+            let channel_id = channel_id.unwrap();
+            let user_id = user_id.unwrap();
+
+            redis.srem::<_, _, u64>(format!("vc-members-{}", channel_id), user_id).await.unwrap();
+            redis.del::<_, u64>(format!("vc-{}", user_id)).await.unwrap();
+
+            EventV1::VoiceChannelLeave {
+                id: channel_id.clone(),
+                user: user_id.clone()
+            }
+            .p(channel_id.clone())
+            .await
+        },
+        _ => {}
+    };
+
+    Ok(EmptyResponse)
+}
\ No newline at end of file
diff --git a/rust-toolchain.toml b/rust-toolchain.toml
new file mode 100644
index 000000000..31578d3bf
--- /dev/null
+++ b/rust-toolchain.toml
@@ -0,0 +1,2 @@
+[toolchain]
+channel = "stable"
\ No newline at end of file

From ae87bc0b67e5b55f8b18d9500fb180060afb81ba Mon Sep 17 00:00:00 2001
From: Zomatree <me@zomatree.live>
Date: Tue, 9 Apr 2024 22:36:48 +0100
Subject: [PATCH 02/62] move voice states to global

---
 crates/bonfire/src/events/impl.rs             | 51 +++++++++++--------
 crates/core/database/src/events/client.rs     | 29 ++---------
 crates/core/models/src/v0/channels.rs         | 14 +++--
 crates/core/models/src/v0/users.rs            |  7 +++
 .../delta/src/routes/channels/voice_join.rs   | 14 ++---
 crates/voice-ingress/src/main.rs              |  7 ++-
 6 files changed, 62 insertions(+), 60 deletions(-)

diff --git a/crates/bonfire/src/events/impl.rs b/crates/bonfire/src/events/impl.rs
index d5ed027db..b7e900829 100644
--- a/crates/bonfire/src/events/impl.rs
+++ b/crates/bonfire/src/events/impl.rs
@@ -1,15 +1,15 @@
 use std::collections::HashSet;
 
 use revolt_database::{
-    events::client::{ChannelVoiceState, EventV1, ReadyServer, UserVoiceState}, util::permissions::DatabasePermissionQuery, Channel, Database, Member,
+    events::client::EventV1, util::permissions::DatabasePermissionQuery, Channel, Database, Member,
     MemberCompositeKey, Presence, RelationshipStatus,
 };
 use revolt_models::v0;
 use revolt_permissions::{calculate_channel_permissions, ChannelPermission};
 use revolt_presence::filter_online;
-use revolt_result::Result;
+use revolt_result::{create_error, Result};
 
-use redis_kiss::{get_connection, AsyncCommands};
+use redis_kiss::{get_connection, AsyncCommands, Conn};
 
 use super::state::{Cache, State};
 
@@ -127,11 +127,18 @@ impl State {
         // Filter server channels by permission.
         let channels = self.cache.filter_accessible_channels(db, channels).await;
 
+        let mut voice_states = Vec::new();
+        let mut conn = get_connection().await.unwrap();
+
         // Append known user IDs from DMs.
         for channel in &channels {
             match channel {
-                Channel::DirectMessage { recipients, .. } | Channel::Group { recipients, .. } => {
+                Channel::DirectMessage { id, recipients, .. } | Channel::Group { id, recipients, .. } => {
                     user_ids.extend(&mut recipients.clone().into_iter());
+
+                    if let Ok(Some(voice_state)) = self.fetch_voice_state(&mut conn, id).await {
+                        voice_states.push(voice_state)
+                    }
                 }
                 _ => {}
             }
@@ -199,32 +206,21 @@ impl State {
             self.insert_subscription(channel.id().to_string());
         }
 
-        let mut conn = get_connection().await.unwrap();
-        let mut new_servers = Vec::with_capacity(servers.len());
-
-        for server in servers {
-            let mut voice_states = vec![];
-
+        for server in &servers {
             for channel in &server.channels {
-                let members = conn.smembers::<_, Vec<String>>(format!("vc-members-{channel}")).await.unwrap();
-
-                if !members.is_empty() {
-                    voice_states.push(ChannelVoiceState {
-                        id: channel.clone(),
-                        participants: members.into_iter().map(|id| UserVoiceState { id }).collect()
-                    })
+                if let Ok(Some(voice_state)) = self.fetch_voice_state(&mut conn, channel).await {
+                    voice_states.push(voice_state)
                 }
             }
-
-            new_servers.push(ReadyServer { server: server.into(), voice_states })
         }
 
         Ok(EventV1::Ready {
             users,
-            servers: new_servers,
+            servers: servers.into_iter().map(Into::into).collect(),
             channels: channels.into_iter().map(Into::into).collect(),
             members: members.into_iter().map(Into::into).collect(),
             emojis: emojis.into_iter().map(Into::into).collect(),
+            voice_states
         })
     }
 
@@ -571,4 +567,19 @@ impl State {
 
         true
     }
+
+    async fn fetch_voice_state(&self, conn: &mut Conn, channel: &str) -> Result<Option<v0::ChannelVoiceState>> {
+        let members = conn.smembers::<_, Vec<String>>(format!("vc-members-{channel}"))
+            .await
+            .map_err(|_| create_error!(InternalError))?;
+
+        if !members.is_empty() {
+            Ok(Some(v0::ChannelVoiceState {
+                id: channel.to_string(),
+                participants: members.into_iter().map(|id| v0::UserVoiceState { id }).collect()
+            }))
+        } else {
+            Ok(None)
+        }
+    }
 }
diff --git a/crates/core/database/src/events/client.rs b/crates/core/database/src/events/client.rs
index 04fb7f1b0..feab64d44 100644
--- a/crates/core/database/src/events/client.rs
+++ b/crates/core/database/src/events/client.rs
@@ -2,10 +2,7 @@ use authifier::AuthifierEvent;
 use serde::{Deserialize, Serialize};
 
 use revolt_models::v0::{
-    AppendMessage, Channel, Emoji, FieldsChannel, FieldsMember, FieldsRole, FieldsServer,
-    FieldsUser, FieldsWebhook, Member, MemberCompositeKey, Message, PartialChannel, PartialMember,
-    PartialMessage, PartialRole, PartialServer, PartialUser, PartialWebhook, Report, Server, User,
-    UserSettings, Webhook
+    AppendMessage, Channel, ChannelVoiceState, Emoji, FieldsChannel, FieldsMember, FieldsRole, FieldsServer, FieldsUser, FieldsWebhook, Member, MemberCompositeKey, Message, PartialChannel, PartialMember, PartialMessage, PartialRole, PartialServer, PartialUser, PartialWebhook, Report, Server, User, UserSettings, UserVoiceState, Webhook
 };
 use revolt_result::Error;
 
@@ -39,25 +36,6 @@ pub enum ErrorEvent {
     APIError(Error),
 }
 
-#[derive(Serialize, Deserialize, Debug, Clone)]
-pub struct UserVoiceState {
-    pub id: String
-    // TODO - muted, etc
-}
-
-#[derive(Serialize, Deserialize, Debug, Clone)]
-pub struct ChannelVoiceState {
-    pub id: String,
-    pub participants: Vec<UserVoiceState>
-}
-
-#[derive(Serialize, Deserialize, Debug, Clone)]
-pub struct ReadyServer {
-    #[serde(flatten)]
-    pub server: Server,
-    pub voice_states: Vec<ChannelVoiceState>
-}
-
 /// Protocol Events
 #[derive(Serialize, Deserialize, Debug, Clone)]
 #[serde(tag = "type")]
@@ -70,10 +48,11 @@ pub enum EventV1 {
     /// Basic data to cache
     Ready {
         users: Vec<User>,
-        servers: Vec<ReadyServer>,
+        servers: Vec<Server>,
         channels: Vec<Channel>,
         members: Vec<Member>,
         emojis: Vec<Emoji>,
+        voice_states: Vec<ChannelVoiceState>
     },
 
     /// Ping response
@@ -248,7 +227,7 @@ pub enum EventV1 {
     /// Voice events
     VoiceChannelJoin {
         id: String,
-        user: String,
+        state: UserVoiceState,
     },
     VoiceChannelLeave {
         id: String,
diff --git a/crates/core/models/src/v0/channels.rs b/crates/core/models/src/v0/channels.rs
index f30c75336..fd88f093a 100644
--- a/crates/core/models/src/v0/channels.rs
+++ b/crates/core/models/src/v0/channels.rs
@@ -1,4 +1,4 @@
-use super::File;
+use super::{File, UserVoiceState};
 
 use revolt_permissions::{Override, OverrideField};
 use std::collections::{HashMap, HashSet};
@@ -306,10 +306,18 @@ auto_derived!(
     }
 
     /// Voice server token response
-    pub struct LegacyCreateVoiceUserResponse {
+    pub struct CreateVoiceUserResponse {
         /// Token for authenticating with the voice server
-        token: String,
+        pub token: String,
     }
+
+    /// Voice state for a channel
+    pub struct ChannelVoiceState {
+        pub id: String,
+        /// The states of the users who are connected to the channel
+        pub participants: Vec<UserVoiceState>
+    }
+
 );
 
 impl Channel {
diff --git a/crates/core/models/src/v0/users.rs b/crates/core/models/src/v0/users.rs
index 1966e35ca..1e6c4fffe 100644
--- a/crates/core/models/src/v0/users.rs
+++ b/crates/core/models/src/v0/users.rs
@@ -270,6 +270,13 @@ auto_derived!(
         /// Username and discriminator combo separated by #
         pub username: String,
     }
+
+    /// Voice State information for a user
+    pub struct UserVoiceState {
+        pub id: String
+        // TODO - muted, etc
+    }
+
 );
 
 pub trait CheckRelationship {
diff --git a/crates/delta/src/routes/channels/voice_join.rs b/crates/delta/src/routes/channels/voice_join.rs
index 7b252ceda..e6afd62b6 100644
--- a/crates/delta/src/routes/channels/voice_join.rs
+++ b/crates/delta/src/routes/channels/voice_join.rs
@@ -2,27 +2,19 @@ use std::borrow::Cow;
 
 use revolt_config::config;
 use revolt_models::v0;
-use revolt_database::{events::client::EventV1, util::{permissions::perms, reference::Reference}, Channel, Database, User};
+use revolt_database::{util::{permissions::perms, reference::Reference}, Channel, Database, User};
 use revolt_permissions::{calculate_channel_permissions, ChannelPermission};
 use revolt_result::{create_error, Result};
 
 use livekit_api::{access_token::{AccessToken, VideoGrants}, services::room::{CreateRoomOptions, RoomClient}};
 use rocket::{serde::json::Json, State};
-use serde::{Deserialize, Serialize};
-
-/// # Voice Server Token Response
-#[derive(Serialize, Deserialize, JsonSchema)]
-pub struct CreateVoiceUserResponse {
-    /// Token for authenticating with the voice server
-    token: String,
-}
 
 /// # Join Call
 ///
 /// Asks the voice server for a token to join the call.
 #[openapi(tag = "Voice")]
 #[post("/<target>/join_call")]
-pub async fn call(db: &State<Database>, rooms: &State<RoomClient>, user: User, target: Reference) -> Result<Json<CreateVoiceUserResponse>> {
+pub async fn call(db: &State<Database>, rooms: &State<RoomClient>, user: User, target: Reference) -> Result<Json<v0::CreateVoiceUserResponse>> {
     let channel = target.as_channel(db).await?;
 
     let mut permissions = perms(db, &user).channel(&channel);
@@ -71,5 +63,5 @@ pub async fn call(db: &State<Database>, rooms: &State<RoomClient>, user: User, t
 
     log::info!("created room {room:?}");
 
-    Ok(Json(CreateVoiceUserResponse { token }))
+    Ok(Json(v0::CreateVoiceUserResponse { token }))
 }
diff --git a/crates/voice-ingress/src/main.rs b/crates/voice-ingress/src/main.rs
index 43edde5c5..6fc6c0d16 100644
--- a/crates/voice-ingress/src/main.rs
+++ b/crates/voice-ingress/src/main.rs
@@ -3,6 +3,7 @@ use std::env;
 use redis_kiss::{get_connection, AsyncCommands};
 
 use revolt_database::events::client::EventV1;
+use revolt_models::v0::UserVoiceState;
 use rocket::{build, post, routes, serde::json::Json, Config};
 use rocket_empty::EmptyResponse;
 use livekit_protocol::WebhookEvent;
@@ -47,9 +48,13 @@ async fn ingress(body: Json<WebhookEvent>) -> Result<EmptyResponse> {
             redis.sadd::<_, _, u64>(format!("vc-members-{}", channel_id), user_id).await.unwrap();
             redis.set::<_, _, String>(format!("vc-{}", user_id), &channel_id).await.unwrap();
 
+            let voice_state = UserVoiceState {
+                id: user_id.clone()
+            };
+
             EventV1::VoiceChannelJoin {
                 id: channel_id.clone(),
-                user: user_id.clone()
+                state: voice_state
             }
             .p(channel_id.clone())
             .await

From 7a4421089ce5a44f58d4a999a2d43b2b423395c7 Mon Sep 17 00:00:00 2001
From: Zomatree <me@zomatree.live>
Date: Thu, 11 Apr 2024 01:07:03 +0100
Subject: [PATCH 03/62] track current state

---
 crates/bonfire/src/events/impl.rs             |  53 +++++---
 crates/core/database/src/events/client.rs     |   7 +-
 .../database/src/models/channels/model.rs     |   8 ++
 .../core/database/src/models/users/model.rs   |  10 +-
 crates/core/models/src/v0/users.rs            |  13 +-
 .../delta/src/routes/channels/voice_join.rs   |  27 +++-
 crates/voice-ingress/src/main.rs              | 127 +++++++++++++++---
 7 files changed, 199 insertions(+), 46 deletions(-)

diff --git a/crates/bonfire/src/events/impl.rs b/crates/bonfire/src/events/impl.rs
index b7e900829..afe5877b9 100644
--- a/crates/bonfire/src/events/impl.rs
+++ b/crates/bonfire/src/events/impl.rs
@@ -133,12 +133,8 @@ impl State {
         // Append known user IDs from DMs.
         for channel in &channels {
             match channel {
-                Channel::DirectMessage { id, recipients, .. } | Channel::Group { id, recipients, .. } => {
+                Channel::DirectMessage { recipients, .. } | Channel::Group { recipients, .. } => {
                     user_ids.extend(&mut recipients.clone().into_iter());
-
-                    if let Ok(Some(voice_state)) = self.fetch_voice_state(&mut conn, id).await {
-                        voice_states.push(voice_state)
-                    }
                 }
                 _ => {}
             }
@@ -206,11 +202,9 @@ impl State {
             self.insert_subscription(channel.id().to_string());
         }
 
-        for server in &servers {
-            for channel in &server.channels {
-                if let Ok(Some(voice_state)) = self.fetch_voice_state(&mut conn, channel).await {
-                    voice_states.push(voice_state)
-                }
+        for channel in &channels {
+            if let Ok(Some(voice_state)) = self.fetch_voice_state(&mut conn, channel).await {
+                voice_states.push(voice_state)
             }
         }
 
@@ -220,7 +214,7 @@ impl State {
             channels: channels.into_iter().map(Into::into).collect(),
             members: members.into_iter().map(Into::into).collect(),
             emojis: emojis.into_iter().map(Into::into).collect(),
-            voice_states
+            voice_states,
         })
     }
 
@@ -568,15 +562,44 @@ impl State {
         true
     }
 
-    async fn fetch_voice_state(&self, conn: &mut Conn, channel: &str) -> Result<Option<v0::ChannelVoiceState>> {
-        let members = conn.smembers::<_, Vec<String>>(format!("vc-members-{channel}"))
+    async fn fetch_voice_state(
+        &self,
+        conn: &mut Conn,
+        channel: &Channel,
+    ) -> Result<Option<v0::ChannelVoiceState>> {
+        let members = conn
+            .smembers::<_, Vec<String>>(format!("vc-members-{}", channel.id()))
             .await
             .map_err(|_| create_error!(InternalError))?;
 
+        let channel_or_server_id = channel.server().unwrap_or_else(|| channel.id());
+
+
         if !members.is_empty() {
+            let mut participants = Vec::with_capacity(members.len());
+
+            for id in members {
+                let unique_key = format!("{channel_or_server_id}-{id}");
+
+                let (audio, deafened, screensharing, camera) = conn
+                    .mget::<_, (bool, bool, bool, bool)>(&[
+                        format!("audio-{unique_key}"),
+                        format!("deafened-{unique_key}"),
+                        format!("screensharing-{unique_key}"),
+                        format!("camera-{unique_key}")
+
+                    ])
+                    .await
+                    .map_err(|_| create_error!(InternalError))?;
+
+                let voice_state = v0::UserVoiceState { id, audio, deafened, screensharing, camera };
+
+                participants.push(voice_state);
+            }
+
             Ok(Some(v0::ChannelVoiceState {
-                id: channel.to_string(),
-                participants: members.into_iter().map(|id| v0::UserVoiceState { id }).collect()
+                id: channel.id(),
+                participants,
             }))
         } else {
             Ok(None)
diff --git a/crates/core/database/src/events/client.rs b/crates/core/database/src/events/client.rs
index feab64d44..473c5cb32 100644
--- a/crates/core/database/src/events/client.rs
+++ b/crates/core/database/src/events/client.rs
@@ -2,7 +2,7 @@ use authifier::AuthifierEvent;
 use serde::{Deserialize, Serialize};
 
 use revolt_models::v0::{
-    AppendMessage, Channel, ChannelVoiceState, Emoji, FieldsChannel, FieldsMember, FieldsRole, FieldsServer, FieldsUser, FieldsWebhook, Member, MemberCompositeKey, Message, PartialChannel, PartialMember, PartialMessage, PartialRole, PartialServer, PartialUser, PartialWebhook, Report, Server, User, UserSettings, UserVoiceState, Webhook
+    AppendMessage, Channel, ChannelVoiceState, Emoji, FieldsChannel, FieldsMember, FieldsRole, FieldsServer, FieldsUser, FieldsWebhook, Member, MemberCompositeKey, Message, PartialChannel, PartialMember, PartialMessage, PartialRole, PartialServer, PartialUser, PartialUserVoiceState, PartialWebhook, Report, Server, User, UserSettings, UserVoiceState, Webhook
 };
 use revolt_result::Error;
 
@@ -232,6 +232,11 @@ pub enum EventV1 {
     VoiceChannelLeave {
         id: String,
         user: String,
+    },
+    UserVoiceStateUpdate {
+        id: String,
+        channel_id: String,
+        data: PartialUserVoiceState
     }
 }
 
diff --git a/crates/core/database/src/models/channels/model.rs b/crates/core/database/src/models/channels/model.rs
index 2b671c382..775999930 100644
--- a/crates/core/database/src/models/channels/model.rs
+++ b/crates/core/database/src/models/channels/model.rs
@@ -430,6 +430,14 @@ impl Channel {
         }
     }
 
+    /// Clone this channel's server id
+    pub fn server(&self) -> Option<String> {
+        match self {
+            Channel::TextChannel { server, .. } | Channel::VoiceChannel { server, .. } => Some(server.clone()),
+            _ => None
+        }
+    }
+
     /// Set role permission on a channel
     pub async fn set_role_permission(
         &mut self,
diff --git a/crates/core/database/src/models/users/model.rs b/crates/core/database/src/models/users/model.rs
index 624cbefc0..7d52ed38a 100644
--- a/crates/core/database/src/models/users/model.rs
+++ b/crates/core/database/src/models/users/model.rs
@@ -569,10 +569,14 @@ impl User {
     }
 
     /// Gets current voice channel
-    pub async fn current_voice_channel(&self) -> Result<Option<String>> {
-        let mut conn = get_connection().await.map_err(|_| create_error!(InternalError))?;
+    ///
+    /// current_context: Either the channel id if a dm or group, or server_id if in a server
+    pub async fn current_voice_channel(&self, current_context: &str) -> Result<Option<String>> {
+        let mut conn = get_connection()
+            .await
+            .map_err(|_| create_error!(InternalError))?;
 
-        conn.get::<_, Option<String>>(format!("vc-{}", &self.id))
+        conn.get::<_, Option<String>>(format!("vc-{}-{current_context}", &self.id))
             .await
             .map_err(|_| create_error!(InternalError))
     }
diff --git a/crates/core/models/src/v0/users.rs b/crates/core/models/src/v0/users.rs
index 1e6c4fffe..50d8163c7 100644
--- a/crates/core/models/src/v0/users.rs
+++ b/crates/core/models/src/v0/users.rs
@@ -270,13 +270,18 @@ auto_derived!(
         /// Username and discriminator combo separated by #
         pub username: String,
     }
+);
 
+auto_derived_partial!(
     /// Voice State information for a user
     pub struct UserVoiceState {
-        pub id: String
-        // TODO - muted, etc
-    }
-
+        pub id: String,
+        pub audio: bool,
+        pub deafened: bool,
+        pub screensharing: bool,
+        pub camera: bool
+    },
+    "PartialUserVoiceState"
 );
 
 pub trait CheckRelationship {
diff --git a/crates/delta/src/routes/channels/voice_join.rs b/crates/delta/src/routes/channels/voice_join.rs
index e6afd62b6..08330b806 100644
--- a/crates/delta/src/routes/channels/voice_join.rs
+++ b/crates/delta/src/routes/channels/voice_join.rs
@@ -19,13 +19,17 @@ pub async fn call(db: &State<Database>, rooms: &State<RoomClient>, user: User, t
 
     let mut permissions = perms(db, &user).channel(&channel);
 
-    calculate_channel_permissions(&mut permissions)
-        .await
-        .throw_if_lacking_channel_permission(ChannelPermission::Connect)?;
+    let current_permissions = calculate_channel_permissions(&mut permissions).await;
+    current_permissions.throw_if_lacking_channel_permission(ChannelPermission::Connect)?;
 
-    if user.current_voice_channel().await?.is_some() {
-        return Err(create_error!(AlreadyInVoiceChannel))
-    }
+    // TODO - decide if we should allow being in multiple voice channels for users
+
+    // if user.current_voice_channel(&channel.server().unwrap_or_else(|| channel.id()))
+    //     .await?
+    //     .is_some()
+    // {
+    //     return Err(create_error!(AlreadyInVoiceChannel))
+    // }
 
     let config = config().await;
 
@@ -39,12 +43,23 @@ pub async fn call(db: &State<Database>, rooms: &State<RoomClient>, user: User, t
         _ => return Err(create_error!(CannotJoinCall))
     };
 
+    let mut allowed_sources = Vec::new();
+
+    if current_permissions.has(ChannelPermission::Speak as u64) {
+        allowed_sources.push("MICROPHONE".to_string())
+    };
+
+    if current_permissions.has(ChannelPermission::Video as u64) {
+        allowed_sources.extend(["CAMERA".to_string(), "SCREEN_SHARE".to_string(), "SCREEN_SHARE_AUDIO".to_string()]);
+    };
+
     let token = AccessToken::with_api_key(&config.api.livekit.key, &config.api.livekit.secret)
         .with_name(&format!("{}#{}", user.username, user.discriminator))
         .with_identity(&user.id)
         .with_metadata(&serde_json::to_string(&user).map_err(|_| create_error!(InternalError))?)
         .with_grants(VideoGrants {
             room_join: true,
+            can_publish_sources: allowed_sources,
             room: channel.id().to_string(),
             ..Default::default()
         })
diff --git a/crates/voice-ingress/src/main.rs b/crates/voice-ingress/src/main.rs
index 6fc6c0d16..dbe9bbfce 100644
--- a/crates/voice-ingress/src/main.rs
+++ b/crates/voice-ingress/src/main.rs
@@ -2,31 +2,36 @@ use std::env;
 
 use redis_kiss::{get_connection, AsyncCommands};
 
-use revolt_database::events::client::EventV1;
-use revolt_models::v0::UserVoiceState;
-use rocket::{build, post, routes, serde::json::Json, Config};
+use revolt_database::{events::client::EventV1, util::reference::Reference, Database, DatabaseInfo};
+use revolt_models::v0::{PartialUserVoiceState, UserVoiceState};
+use rocket::{build, post, routes, serde::json::Json, Config, State};
 use rocket_empty::EmptyResponse;
 use livekit_protocol::WebhookEvent;
 
-use revolt_config::Database;
 use revolt_result::Result;
 
-#[async_std::main]
-async fn main() {
+#[rocket::main]
+async fn main() -> Result<(), rocket::Error> {
     revolt_config::configure!(voice_ingress);
 
-    let rocket = build()
-        .manage(get_connection().await.unwrap())
+    let database = DatabaseInfo::Auto.connect().await.unwrap();
+
+    let _rocket = build()
+        .manage(database)
         .mount("/", routes![ingress])
         .configure(Config { port: 8500, ..Default::default() })
+        .ignite()
+        .await?
         .launch()
-        .await
-        .unwrap();
+        .await?;
+
+    Ok(())
 }
 
+
 #[post("/", data="<body>")]
-async fn ingress(body: Json<WebhookEvent>) -> Result<EmptyResponse> {
-    let mut redis = get_connection().await.unwrap();
+async fn ingress(db: &State<Database>, body: Json<WebhookEvent>) -> Result<EmptyResponse> {
+    let mut conn = get_connection().await.unwrap();
 
     log::debug!("received event: {body:?}");
 
@@ -45,11 +50,27 @@ async fn ingress(body: Json<WebhookEvent>) -> Result<EmptyResponse> {
             let channel_id = channel_id.unwrap();
             let user_id = user_id.unwrap();
 
-            redis.sadd::<_, _, u64>(format!("vc-members-{}", channel_id), user_id).await.unwrap();
-            redis.set::<_, _, String>(format!("vc-{}", user_id), &channel_id).await.unwrap();
+            let channel = Reference::from_unchecked(channel_id.clone())
+                .as_channel(db)
+                .await?;
+
+
+            let unique_key = format!("{}-{user_id}", channel.server().unwrap_or_else(|| channel.id()));
+
+            conn.sadd::<_, _, u64>(format!("vc-members-{channel_id}"), user_id).await.unwrap();
+
+            conn.set::<_, _, String>(format!("vc-{unique_key}"), &channel_id).await.unwrap();
+            conn.set::<_, _, String>(format!("audio-{unique_key}"), true).await.unwrap();
+            conn.set::<_, _, String>(format!("deafened-{unique_key}"), false).await.unwrap();
+            conn.set::<_, _, String>(format!("screensharing-{unique_key}"), false).await.unwrap();
+            conn.set::<_, _, String>(format!("camera-{unique_key}"), false).await.unwrap();
 
             let voice_state = UserVoiceState {
-                id: user_id.clone()
+                id: user_id.clone(),
+                audio: false,
+                deafened: false,
+                screensharing: false,
+                camera: false
             };
 
             EventV1::VoiceChannelJoin {
@@ -63,8 +84,20 @@ async fn ingress(body: Json<WebhookEvent>) -> Result<EmptyResponse> {
             let channel_id = channel_id.unwrap();
             let user_id = user_id.unwrap();
 
-            redis.srem::<_, _, u64>(format!("vc-members-{}", channel_id), user_id).await.unwrap();
-            redis.del::<_, u64>(format!("vc-{}", user_id)).await.unwrap();
+            let channel = Reference::from_unchecked(channel_id.clone())
+                .as_channel(db)
+                .await?;
+
+            conn.srem::<_, _, u64>(format!("vc-members-{channel_id}"), user_id).await.unwrap();
+
+            let unique_key = format!("{}-{user_id}", channel.server().unwrap_or_else(|| channel.id()));
+
+            conn.del::<_, u64>(format!("vc-{unique_key}")).await.unwrap();
+
+            conn.del::<_, u64>(format!("audio-{unique_key}")).await.unwrap();
+            conn.del::<_, u64>(format!("deafened-{unique_key}")).await.unwrap();
+            conn.del::<_, u64>(format!("screensharing-{unique_key}")).await.unwrap();
+            conn.del::<_, u64>(format!("camera-{unique_key}")).await.unwrap();
 
             EventV1::VoiceChannelLeave {
                 id: channel_id.clone(),
@@ -73,6 +106,66 @@ async fn ingress(body: Json<WebhookEvent>) -> Result<EmptyResponse> {
             .p(channel_id.clone())
             .await
         },
+        "track_published" | "track_unpublished" => {
+            let value = body.event == "track_published"; // to avoid duplicating this entire case twice
+
+            let channel_id = channel_id.unwrap();
+            let user_id = user_id.unwrap();
+            let track = body.track.as_ref().unwrap();
+
+            let user = Reference::from_unchecked(user_id.clone())
+                .as_user(db)
+                .await?;
+
+            let channel = Reference::from_unchecked(channel_id.clone())
+                .as_channel(db)
+                .await?;
+
+            let unique_key = if user.bot.is_some() {
+                format!("{}-{user_id}", channel.server().unwrap_or_else(|| channel.id()))
+            } else {
+                user_id.to_string()
+            };
+
+            let partial = match track.source {
+                /* TrackSource::Unknown */ 0 => {
+                    PartialUserVoiceState::default()
+                }
+                /* TrackSource::Camera */ 1 => {
+                    conn.set::<_, _, String>(format!("camera-{unique_key}"), value).await.unwrap();
+
+                    PartialUserVoiceState {
+                        camera: Some(value),
+                        ..Default::default()
+                    }
+                }
+                /* TrackSource::Microphone */ 2 => {
+                    conn.set::<_, _, String>(format!("audio-{unique_key}"), value).await.unwrap();
+
+                    PartialUserVoiceState {
+                        audio: Some(value),
+                        ..Default::default()
+                    }
+                },
+                /* TrackSource::ScreenShare | TrackSource::ScreenShareAudio */ 3 | 4 => {
+                    conn.set::<_, _, String>(format!("screensharing-{unique_key}"), value).await.unwrap();
+
+                    PartialUserVoiceState {
+                        screensharing: Some(value),
+                        ..Default::default()
+                    }
+                },
+                _ => unreachable!()
+            };
+
+            EventV1::UserVoiceStateUpdate {
+                id: user_id.clone(),
+                channel_id: channel_id.clone(),
+                data: partial
+            }
+            .p(channel_id.clone())
+            .await;
+        },
         _ => {}
     };
 

From 67569f932ed0d61dfe048c50d0b3c03d2be74cb1 Mon Sep 17 00:00:00 2001
From: Zomatree <me@zomatree.live>
Date: Wed, 24 Apr 2024 02:23:52 +0100
Subject: [PATCH 04/62] more stuff

---
 Cargo.lock                                    |   1 +
 crates/bonfire/src/events/impl.rs             |  12 +-
 .../admin_migrations/ops/mongodb/scripts.rs   |  20 ++-
 .../src/models/server_members/model.rs        |  13 +-
 crates/core/database/src/util/bridge/v0.rs    |  16 +-
 crates/core/models/src/v0/server_members.rs   |  12 ++
 crates/core/models/src/v0/users.rs            |   6 +-
 crates/core/result/src/lib.rs                 |  33 ++++
 crates/delta/Cargo.toml                       |   1 +
 .../delta/src/routes/servers/member_edit.rs   |  70 +++++++-
 crates/voice-ingress/src/main.rs              | 155 ++++++++++--------
 11 files changed, 257 insertions(+), 82 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 10f7a1c2f..6df07905a 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4103,6 +4103,7 @@ dependencies = [
  "lettre",
  "linkify 0.6.0",
  "livekit-api",
+ "livekit-protocol",
  "log",
  "lru 0.7.8",
  "nanoid",
diff --git a/crates/bonfire/src/events/impl.rs b/crates/bonfire/src/events/impl.rs
index afe5877b9..3f6eb9548 100644
--- a/crates/bonfire/src/events/impl.rs
+++ b/crates/bonfire/src/events/impl.rs
@@ -574,7 +574,6 @@ impl State {
 
         let channel_or_server_id = channel.server().unwrap_or_else(|| channel.id());
 
-
         if !members.is_empty() {
             let mut participants = Vec::with_capacity(members.len());
 
@@ -586,13 +585,18 @@ impl State {
                         format!("audio-{unique_key}"),
                         format!("deafened-{unique_key}"),
                         format!("screensharing-{unique_key}"),
-                        format!("camera-{unique_key}")
-
+                        format!("camera-{unique_key}"),
                     ])
                     .await
                     .map_err(|_| create_error!(InternalError))?;
 
-                let voice_state = v0::UserVoiceState { id, audio, deafened, screensharing, camera };
+                let voice_state = v0::UserVoiceState {
+                    id,
+                    can_receive: audio,
+                    can_publish: deafened,
+                    screensharing,
+                    camera,
+                };
 
                 participants.push(voice_state);
             }
diff --git a/crates/core/database/src/models/admin_migrations/ops/mongodb/scripts.rs b/crates/core/database/src/models/admin_migrations/ops/mongodb/scripts.rs
index ecc146721..bf36fed29 100644
--- a/crates/core/database/src/models/admin_migrations/ops/mongodb/scripts.rs
+++ b/crates/core/database/src/models/admin_migrations/ops/mongodb/scripts.rs
@@ -19,7 +19,7 @@ struct MigrationInfo {
     revision: i32,
 }
 
-pub const LATEST_REVISION: i32 = 26;
+pub const LATEST_REVISION: i32 = 27;
 
 pub async fn migrate_database(db: &MongoDb) {
     let migrations = db.col::<Document>("migrations");
@@ -983,6 +983,24 @@ pub async fn run_migrations(db: &MongoDb, revision: i32) -> i32 {
             .expect("Failed to create ratelimit_events index.");
     }
 
+    if revision <= 26 {
+        info!("Running migration [revision 26 / 17-04-2024]: Add `can_publish` and `can_receive` to members");
+
+        db.col::<Document>("server_members")
+            .update_many(
+                doc! {},
+                doc! {
+                    "$set": {
+                        "can_publish": true,
+                        "can_receive": true
+                    }
+                },
+                None
+            )
+            .await
+            .expect("Failed to update members");
+    }
+
     // Need to migrate fields on attachments, change `user_id`, `object_id`, etc to `parent`.
 
     // Reminder to update LATEST_REVISION when adding new migrations.
diff --git a/crates/core/database/src/models/server_members/model.rs b/crates/core/database/src/models/server_members/model.rs
index 63a35ec32..fd068aeeb 100644
--- a/crates/core/database/src/models/server_members/model.rs
+++ b/crates/core/database/src/models/server_members/model.rs
@@ -3,8 +3,8 @@ use revolt_permissions::{calculate_channel_permissions, ChannelPermission};
 use revolt_result::{create_error, Result};
 
 use crate::{
-    events::client::EventV1, util::permissions::DatabasePermissionQuery, Channel, Database, File,
-    Server, SystemMessage, User,
+    events::client::EventV1, if_false, util::permissions::DatabasePermissionQuery, Channel,
+    Database, File, Server, SystemMessage, User,
 };
 
 auto_derived_partial!(
@@ -30,6 +30,13 @@ auto_derived_partial!(
         /// Timestamp this member is timed out until
         #[serde(skip_serializing_if = "Option::is_none")]
         pub timeout: Option<Timestamp>,
+
+        /// Whether the member is server-wide voice muted
+        #[serde(skip_serializing_if = "if_false")]
+        pub can_publish: bool,
+        /// Whether the member is server-wide voice deafened
+        #[serde(skip_serializing_if = "if_false")]
+        pub can_receive: bool,
     },
     "PartialMember"
 );
@@ -69,6 +76,8 @@ impl Default for Member {
             avatar: None,
             roles: vec![],
             timeout: None,
+            can_publish: false,
+            can_receive: false,
         }
     }
 }
diff --git a/crates/core/database/src/util/bridge/v0.rs b/crates/core/database/src/util/bridge/v0.rs
index 2d49fd026..042f10c8f 100644
--- a/crates/core/database/src/util/bridge/v0.rs
+++ b/crates/core/database/src/util/bridge/v0.rs
@@ -186,7 +186,7 @@ impl From<crate::Channel> for Channel {
                 default_permissions,
                 role_permissions,
                 nsfw,
-                voice
+                voice,
             } => Channel::TextChannel {
                 id,
                 server,
@@ -197,7 +197,7 @@ impl From<crate::Channel> for Channel {
                 default_permissions,
                 role_permissions,
                 nsfw,
-                voice
+                voice,
             },
             crate::Channel::VoiceChannel {
                 id,
@@ -268,7 +268,7 @@ impl From<Channel> for crate::Channel {
                 default_permissions,
                 role_permissions,
                 nsfw,
-                voice
+                voice,
             } => crate::Channel::TextChannel {
                 id,
                 server,
@@ -279,7 +279,7 @@ impl From<Channel> for crate::Channel {
                 default_permissions,
                 role_permissions,
                 nsfw,
-                voice
+                voice,
             },
             Channel::VoiceChannel {
                 id,
@@ -614,6 +614,8 @@ impl From<crate::Member> for Member {
             avatar: value.avatar.map(|f| f.into()),
             roles: value.roles,
             timeout: value.timeout,
+            can_publish: value.can_publish,
+            can_receive: value.can_receive,
         }
     }
 }
@@ -627,6 +629,8 @@ impl From<Member> for crate::Member {
             avatar: value.avatar.map(|f| f.into()),
             roles: value.roles,
             timeout: value.timeout,
+            can_publish: value.can_publish,
+            can_receive: value.can_receive,
         }
     }
 }
@@ -640,6 +644,8 @@ impl From<crate::PartialMember> for PartialMember {
             avatar: value.avatar.map(|f| f.into()),
             roles: value.roles,
             timeout: value.timeout,
+            can_publish: value.can_publish,
+            can_receive: value.can_receive,
         }
     }
 }
@@ -653,6 +659,8 @@ impl From<PartialMember> for crate::PartialMember {
             avatar: value.avatar.map(|f| f.into()),
             roles: value.roles,
             timeout: value.timeout,
+            can_publish: value.can_publish,
+            can_receive: value.can_receive,
         }
     }
 }
diff --git a/crates/core/models/src/v0/server_members.rs b/crates/core/models/src/v0/server_members.rs
index 5b26b88a2..a13191436 100644
--- a/crates/core/models/src/v0/server_members.rs
+++ b/crates/core/models/src/v0/server_members.rs
@@ -1,6 +1,7 @@
 use std::collections::HashMap;
 
 use super::{File, Role, User};
+use crate::if_false;
 
 use iso8601_timestamp::Timestamp;
 use once_cell::sync::Lazy;
@@ -57,6 +58,13 @@ auto_derived_partial!(
         /// Timestamp this member is timed out until
         #[cfg_attr(feature = "serde", serde(skip_serializing_if = "Option::is_none"))]
         pub timeout: Option<Timestamp>,
+
+        /// Whether the member is server-wide voice muted
+        #[serde(skip_serializing_if = "if_false")]
+        pub can_publish: bool,
+        /// Whether the member is server-wide voice deafened
+        #[serde(skip_serializing_if = "if_false")]
+        pub can_receive: bool,
     },
     "PartialMember"
 );
@@ -126,5 +134,9 @@ auto_derived!(
         /// Fields to remove from channel object
         #[cfg_attr(feature = "validator", validate(length(min = 1)))]
         pub remove: Option<Vec<FieldsMember>>,
+        /// server-wide voice muted
+        pub can_publish: Option<bool>,
+        /// server-wide voice deafened
+        pub can_receive: Option<bool>,
     }
 );
diff --git a/crates/core/models/src/v0/users.rs b/crates/core/models/src/v0/users.rs
index 50d8163c7..7b959d9a0 100644
--- a/crates/core/models/src/v0/users.rs
+++ b/crates/core/models/src/v0/users.rs
@@ -276,10 +276,10 @@ auto_derived_partial!(
     /// Voice State information for a user
     pub struct UserVoiceState {
         pub id: String,
-        pub audio: bool,
-        pub deafened: bool,
+        pub can_receive: bool,
+        pub can_publish: bool,
         pub screensharing: bool,
-        pub camera: bool
+        pub camera: bool,
     },
     "PartialUserVoiceState"
 );
diff --git a/crates/core/result/src/lib.rs b/crates/core/result/src/lib.rs
index c8e6c1c9a..3733a640d 100644
--- a/crates/core/result/src/lib.rs
+++ b/crates/core/result/src/lib.rs
@@ -1,3 +1,5 @@
+use std::panic::Location;
+
 #[cfg(feature = "serde")]
 #[macro_use]
 extern crate serde;
@@ -172,6 +174,37 @@ macro_rules! query {
     };
 }
 
+pub trait ToRevoltError<T> {
+    #[track_caller]
+    fn to_internal_error(self) -> Result<T, Error>;
+}
+
+impl<T, E> ToRevoltError<T> for Result<T, E> {
+    fn to_internal_error(self) -> Result<T, Error> {
+        self.map_err(|_| {
+            let loc = Location::caller();
+
+            Error {
+                error_type: ErrorType::InternalError,
+                location: format!("{}:{}:{}", loc.file(), loc.line(), loc.column())
+            }
+        })
+    }
+}
+
+impl<T> ToRevoltError<T> for Option<T> {
+    fn to_internal_error(self) -> Result<T, Error> {
+        self.ok_or_else(|| {
+            let loc = Location::caller();
+
+            Error {
+                error_type: ErrorType::InternalError,
+                location: format!("{}:{}:{}", loc.file(), loc.line(), loc.column())
+            }
+        })
+    }
+}
+
 #[cfg(test)]
 mod tests {
     use crate::ErrorType;
diff --git a/crates/delta/Cargo.toml b/crates/delta/Cargo.toml
index e5227d042..e8a4b6844 100644
--- a/crates/delta/Cargo.toml
+++ b/crates/delta/Cargo.toml
@@ -82,6 +82,7 @@ revolt-permissions = { path = "../core/permissions", features = ["schemas"] }
 
 # voice
 livekit-api = "0.3.2"
+livekit-protocol = "0.3.2"
 
 [build-dependencies]
 vergen = "7.5.0"
diff --git a/crates/delta/src/routes/servers/member_edit.rs b/crates/delta/src/routes/servers/member_edit.rs
index 8d4788129..941a36ff3 100644
--- a/crates/delta/src/routes/servers/member_edit.rs
+++ b/crates/delta/src/routes/servers/member_edit.rs
@@ -1,5 +1,8 @@
 use std::collections::HashSet;
 
+use livekit_api::services::room::{RoomClient, UpdateParticipantOptions};
+use livekit_protocol::ParticipantPermission;
+use redis_kiss::{get_connection, redis::Pipeline, AsyncCommands};
 use revolt_database::{
     util::{permissions::DatabasePermissionQuery, reference::Reference},
     Database, File, PartialMember, User,
@@ -7,7 +10,7 @@ use revolt_database::{
 use revolt_models::v0;
 
 use revolt_permissions::{calculate_server_permissions, ChannelPermission};
-use revolt_result::{create_error, Result};
+use revolt_result::{create_error, Result, ToRevoltError};
 use rocket::{serde::json::Json, State};
 use validator::Validate;
 
@@ -17,6 +20,7 @@ use validator::Validate;
 #[openapi(tag = "Server Members")]
 #[patch("/<server>/members/<target>", data = "<data>")]
 pub async fn edit(
+    room_client: &State<RoomClient>,
     db: &State<Database>,
     user: User,
     server: Reference,
@@ -87,6 +91,14 @@ pub async fn edit(
         permissions.throw_if_lacking_channel_permission(ChannelPermission::TimeoutMembers)?;
     }
 
+    if data.can_publish.is_some() {
+        permissions.throw_if_lacking_channel_permission(ChannelPermission::MuteMembers)?;
+    }
+
+    if data.can_receive.is_some() {
+        permissions.throw_if_lacking_channel_permission(ChannelPermission::DeafenMembers)?;
+    }
+
     // Resolve our ranking
     let our_ranking = query.get_member_rank().unwrap_or(i64::MIN);
 
@@ -122,12 +134,16 @@ pub async fn edit(
         roles,
         timeout,
         remove,
+        can_publish,
+        can_receive,
     } = data;
 
     let mut partial = PartialMember {
         nickname,
         roles,
         timeout,
+        can_publish,
+        can_receive,
         ..Default::default()
     };
 
@@ -155,5 +171,57 @@ pub async fn edit(
         )
         .await?;
 
+    if can_publish.is_some() || can_receive.is_some() {
+        let mut conn = get_connection().await.to_internal_error()?;
+
+        // if we edit the member while they are in a voice channel we need to also update the perms
+        // otherwise it wont take place until they leave and rejoin
+        if let Some(channel) = conn
+            .get::<_, Option<String>>(format!("vc-{}-{}", &member.id.user, &member.id.server))
+            .await
+            .to_internal_error()?
+        {
+            let mut pipeline = Pipeline::new();
+            let mut new_perms = ParticipantPermission::default();
+
+            if let Some(can_publish) = can_publish {
+                pipeline.set(
+                    format!("can_publish-{}-{}", &channel, &member.id.user),
+                    can_publish,
+                );
+
+                new_perms.can_publish = can_publish;
+                new_perms.can_publish_data = can_publish;
+            };
+
+            if let Some(can_receive) = can_receive {
+                pipeline.set(
+                    format!("can_receive-{}-{}", &channel, &member.id.user),
+                    can_receive,
+                );
+
+                new_perms.can_subscribe = can_receive;
+            };
+
+            pipeline
+                .query_async(&mut conn.into_inner())
+                .await
+                .to_internal_error()?;
+
+            room_client
+                .update_participant(
+                    &channel,
+                    &member.id.user,
+                    UpdateParticipantOptions {
+                        permission: Some(new_perms),
+                        name: "".to_string(),
+                        metadata: "".to_string(),
+                    },
+                )
+                .await
+                .to_internal_error()?;
+        };
+    };
+
     Ok(Json(member.into()))
 }
diff --git a/crates/voice-ingress/src/main.rs b/crates/voice-ingress/src/main.rs
index dbe9bbfce..d6b0a8131 100644
--- a/crates/voice-ingress/src/main.rs
+++ b/crates/voice-ingress/src/main.rs
@@ -1,14 +1,16 @@
 use std::env;
 
-use redis_kiss::{get_connection, AsyncCommands};
+use redis_kiss::{get_connection, redis::Pipeline, AsyncCommands};
 
-use revolt_database::{events::client::EventV1, util::reference::Reference, Database, DatabaseInfo};
+use livekit_protocol::WebhookEvent;
+use revolt_database::{
+    events::client::EventV1, util::reference::Reference, Database, DatabaseInfo,
+};
 use revolt_models::v0::{PartialUserVoiceState, UserVoiceState};
 use rocket::{build, post, routes, serde::json::Json, Config, State};
 use rocket_empty::EmptyResponse;
-use livekit_protocol::WebhookEvent;
 
-use revolt_result::Result;
+use revolt_result::{Result, ToRevoltError};
 
 #[rocket::main]
 async fn main() -> Result<(), rocket::Error> {
@@ -19,7 +21,10 @@ async fn main() -> Result<(), rocket::Error> {
     let _rocket = build()
         .manage(database)
         .mount("/", routes![ingress])
-        .configure(Config { port: 8500, ..Default::default() })
+        .configure(Config {
+            port: 8500,
+            ..Default::default()
+        })
         .ignite()
         .await?
         .launch()
@@ -28,90 +33,96 @@ async fn main() -> Result<(), rocket::Error> {
     Ok(())
 }
 
-
-#[post("/", data="<body>")]
+#[post("/", data = "<body>")]
 async fn ingress(db: &State<Database>, body: Json<WebhookEvent>) -> Result<EmptyResponse> {
-    let mut conn = get_connection().await.unwrap();
+    let mut conn = get_connection().await.to_internal_error()?;
 
     log::debug!("received event: {body:?}");
 
-    let channel_id = body
-        .room
-        .as_ref()
-        .map(|r| &r.name);
+    let channel_id = body.room.as_ref().map(|r| &r.name);
 
-    let user_id = body
-        .participant
-        .as_ref()
-        .map(|r| &r.identity);
+    let user_id = body.participant.as_ref().map(|r| &r.identity);
 
     match body.event.as_str() {
         "participant_joined" => {
-            let channel_id = channel_id.unwrap();
-            let user_id = user_id.unwrap();
+            let channel_id = channel_id.to_internal_error()?;
+            let user_id = user_id.to_internal_error()?;
 
             let channel = Reference::from_unchecked(channel_id.clone())
                 .as_channel(db)
                 .await?;
 
-
-            let unique_key = format!("{}-{user_id}", channel.server().unwrap_or_else(|| channel.id()));
-
-            conn.sadd::<_, _, u64>(format!("vc-members-{channel_id}"), user_id).await.unwrap();
-
-            conn.set::<_, _, String>(format!("vc-{unique_key}"), &channel_id).await.unwrap();
-            conn.set::<_, _, String>(format!("audio-{unique_key}"), true).await.unwrap();
-            conn.set::<_, _, String>(format!("deafened-{unique_key}"), false).await.unwrap();
-            conn.set::<_, _, String>(format!("screensharing-{unique_key}"), false).await.unwrap();
-            conn.set::<_, _, String>(format!("camera-{unique_key}"), false).await.unwrap();
+            let unique_key = format!(
+                "{}-{user_id}",
+                channel.server().unwrap_or_else(|| channel.id())
+            );
+
+            Pipeline::new()
+                .sadd(format!("vc-members-{channel_id}"), user_id)
+                .set(format!("vc-{unique_key}"), channel_id)
+                .set(format!("publish-{unique_key}"), true)
+                .set(format!("subscribe-{unique_key}"), false)
+                .set(format!("screensharing-{unique_key}"), false)
+                .set(format!("camera-{unique_key}"), false)
+                .query_async(&mut conn.into_inner())
+                .await
+                .to_internal_error()?;
 
             let voice_state = UserVoiceState {
                 id: user_id.clone(),
-                audio: false,
-                deafened: false,
+                can_receive: false,
+                can_publish: false,
                 screensharing: false,
-                camera: false
+                camera: false,
             };
 
             EventV1::VoiceChannelJoin {
                 id: channel_id.clone(),
-                state: voice_state
+                state: voice_state,
             }
             .p(channel_id.clone())
             .await
-        },
+        }
         "participant_left" => {
-            let channel_id = channel_id.unwrap();
-            let user_id = user_id.unwrap();
+            let channel_id = channel_id.to_internal_error()?;
+            let user_id = user_id.to_internal_error()?;
 
             let channel = Reference::from_unchecked(channel_id.clone())
                 .as_channel(db)
                 .await?;
 
-            conn.srem::<_, _, u64>(format!("vc-members-{channel_id}"), user_id).await.unwrap();
-
-            let unique_key = format!("{}-{user_id}", channel.server().unwrap_or_else(|| channel.id()));
-
-            conn.del::<_, u64>(format!("vc-{unique_key}")).await.unwrap();
-
-            conn.del::<_, u64>(format!("audio-{unique_key}")).await.unwrap();
-            conn.del::<_, u64>(format!("deafened-{unique_key}")).await.unwrap();
-            conn.del::<_, u64>(format!("screensharing-{unique_key}")).await.unwrap();
-            conn.del::<_, u64>(format!("camera-{unique_key}")).await.unwrap();
+            conn.srem::<_, _, u64>(format!("vc-members-{channel_id}"), user_id)
+                .await
+                .to_internal_error()?;
+
+            let unique_key = format!(
+                "{}-{user_id}",
+                channel.server().unwrap_or_else(|| channel.id())
+            );
+
+            conn.del::<_, Vec<u64>>(&[
+                format!("vc-{unique_key}"),
+                format!("audio-{unique_key}"),
+                format!("deafened-{unique_key}"),
+                format!("screensharing-{unique_key}"),
+                format!("camera-{unique_key}"),
+            ])
+            .await
+            .to_internal_error()?;
 
             EventV1::VoiceChannelLeave {
                 id: channel_id.clone(),
-                user: user_id.clone()
+                user: user_id.clone(),
             }
             .p(channel_id.clone())
             .await
-        },
+        }
         "track_published" | "track_unpublished" => {
             let value = body.event == "track_published"; // to avoid duplicating this entire case twice
 
-            let channel_id = channel_id.unwrap();
-            let user_id = user_id.unwrap();
-            let track = body.track.as_ref().unwrap();
+            let channel_id = channel_id.to_internal_error()?;
+            let user_id = user_id.to_internal_error()?;
+            let track = body.track.as_ref().to_internal_error()?;
 
             let user = Reference::from_unchecked(user_id.clone())
                 .as_user(db)
@@ -122,52 +133,62 @@ async fn ingress(db: &State<Database>, body: Json<WebhookEvent>) -> Result<Empty
                 .await?;
 
             let unique_key = if user.bot.is_some() {
-                format!("{}-{user_id}", channel.server().unwrap_or_else(|| channel.id()))
+                format!(
+                    "{}-{user_id}",
+                    channel.server().unwrap_or_else(|| channel.id())
+                )
             } else {
                 user_id.to_string()
             };
 
             let partial = match track.source {
-                /* TrackSource::Unknown */ 0 => {
-                    PartialUserVoiceState::default()
-                }
-                /* TrackSource::Camera */ 1 => {
-                    conn.set::<_, _, String>(format!("camera-{unique_key}"), value).await.unwrap();
+                /* TrackSource::Unknown */ 0 => PartialUserVoiceState::default(),
+                /* TrackSource::Camera */
+                1 => {
+                    conn.set::<_, _, String>(format!("camera-{unique_key}"), value)
+                        .await
+                        .to_internal_error()?;
 
                     PartialUserVoiceState {
                         camera: Some(value),
                         ..Default::default()
                     }
                 }
-                /* TrackSource::Microphone */ 2 => {
-                    conn.set::<_, _, String>(format!("audio-{unique_key}"), value).await.unwrap();
+                /* TrackSource::Microphone */
+                2 => {
+                    conn.set::<_, _, String>(format!("audio-{unique_key}"), value)
+                        .await
+                        .to_internal_error()?;
 
                     PartialUserVoiceState {
-                        audio: Some(value),
+                        can_publish: Some(value),
                         ..Default::default()
                     }
-                },
-                /* TrackSource::ScreenShare | TrackSource::ScreenShareAudio */ 3 | 4 => {
-                    conn.set::<_, _, String>(format!("screensharing-{unique_key}"), value).await.unwrap();
+                }
+                /* TrackSource::ScreenShare | TrackSource::ScreenShareAudio */
+                3 | 4 => {
+                    conn.set::<_, _, String>(format!("screensharing-{unique_key}"), value)
+                        .await
+                        .to_internal_error()?;
 
                     PartialUserVoiceState {
                         screensharing: Some(value),
                         ..Default::default()
                     }
-                },
-                _ => unreachable!()
+                }
+                _ => unreachable!(),
             };
 
             EventV1::UserVoiceStateUpdate {
                 id: user_id.clone(),
                 channel_id: channel_id.clone(),
-                data: partial
+                data: partial,
             }
             .p(channel_id.clone())
             .await;
-        },
+        }
         _ => {}
     };
 
     Ok(EmptyResponse)
-}
\ No newline at end of file
+}

From 675c7d6c0d807fd9e2a51d17d0714ea75fdf4bb1 Mon Sep 17 00:00:00 2001
From: Zomatree <me@zomatree.live>
Date: Wed, 24 Apr 2024 02:29:31 +0100
Subject: [PATCH 05/62] fix redis key inconsistancy

---
 crates/bonfire/src/events/impl.rs | 10 +++++-----
 crates/voice-ingress/src/main.rs  | 12 ++++++------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/crates/bonfire/src/events/impl.rs b/crates/bonfire/src/events/impl.rs
index 3f6eb9548..744a99f8f 100644
--- a/crates/bonfire/src/events/impl.rs
+++ b/crates/bonfire/src/events/impl.rs
@@ -580,10 +580,10 @@ impl State {
             for id in members {
                 let unique_key = format!("{channel_or_server_id}-{id}");
 
-                let (audio, deafened, screensharing, camera) = conn
+                let (can_publish, can_receive, screensharing, camera) = conn
                     .mget::<_, (bool, bool, bool, bool)>(&[
-                        format!("audio-{unique_key}"),
-                        format!("deafened-{unique_key}"),
+                        format!("can_publish-{unique_key}"),
+                        format!("can_receive-{unique_key}"),
                         format!("screensharing-{unique_key}"),
                         format!("camera-{unique_key}"),
                     ])
@@ -592,8 +592,8 @@ impl State {
 
                 let voice_state = v0::UserVoiceState {
                     id,
-                    can_receive: audio,
-                    can_publish: deafened,
+                    can_receive,
+                    can_publish,
                     screensharing,
                     camera,
                 };
diff --git a/crates/voice-ingress/src/main.rs b/crates/voice-ingress/src/main.rs
index d6b0a8131..28147efc9 100644
--- a/crates/voice-ingress/src/main.rs
+++ b/crates/voice-ingress/src/main.rs
@@ -60,8 +60,8 @@ async fn ingress(db: &State<Database>, body: Json<WebhookEvent>) -> Result<Empty
             Pipeline::new()
                 .sadd(format!("vc-members-{channel_id}"), user_id)
                 .set(format!("vc-{unique_key}"), channel_id)
-                .set(format!("publish-{unique_key}"), true)
-                .set(format!("subscribe-{unique_key}"), false)
+                .set(format!("can_publish-{unique_key}"), true)
+                .set(format!("can_receive-{unique_key}"), true)
                 .set(format!("screensharing-{unique_key}"), false)
                 .set(format!("camera-{unique_key}"), false)
                 .query_async(&mut conn.into_inner())
@@ -70,7 +70,7 @@ async fn ingress(db: &State<Database>, body: Json<WebhookEvent>) -> Result<Empty
 
             let voice_state = UserVoiceState {
                 id: user_id.clone(),
-                can_receive: false,
+                can_receive: true,
                 can_publish: false,
                 screensharing: false,
                 camera: false,
@@ -102,8 +102,8 @@ async fn ingress(db: &State<Database>, body: Json<WebhookEvent>) -> Result<Empty
 
             conn.del::<_, Vec<u64>>(&[
                 format!("vc-{unique_key}"),
-                format!("audio-{unique_key}"),
-                format!("deafened-{unique_key}"),
+                format!("can_publish-{unique_key}"),
+                format!("can_receive-{unique_key}"),
                 format!("screensharing-{unique_key}"),
                 format!("camera-{unique_key}"),
             ])
@@ -156,7 +156,7 @@ async fn ingress(db: &State<Database>, body: Json<WebhookEvent>) -> Result<Empty
                 }
                 /* TrackSource::Microphone */
                 2 => {
-                    conn.set::<_, _, String>(format!("audio-{unique_key}"), value)
+                    conn.set::<_, _, String>(format!("can_receive-{unique_key}"), value)
                         .await
                         .to_internal_error()?;
 

From ffbc89979299be88251bb1c6601a391254afc571 Mon Sep 17 00:00:00 2001
From: Zomatree <me@zomatree.live>
Date: Mon, 13 May 2024 14:09:08 +0100
Subject: [PATCH 06/62] split voice ops into its own library

---
 Cargo.lock                                    |  22 +-
 crates/bonfire/Cargo.toml                     |   1 +
 crates/bonfire/src/events/impl.rs             |  48 +---
 crates/bonfire/src/main.rs                    |  15 +-
 .../database/src/models/channels/model.rs     |  11 +-
 crates/core/models/src/v0/server_members.rs   |   9 +-
 crates/core/permissions/src/models/mod.rs     |   2 +-
 crates/core/result/src/lib.rs                 |   4 +-
 crates/core/result/src/rocket.rs              |   2 +
 crates/core/voice/Cargo.toml                  |  33 +++
 crates/core/voice/src/lib.rs                  | 266 ++++++++++++++++++
 crates/delta/Cargo.toml                       |   1 +
 crates/delta/src/main.rs                      |   8 +-
 .../delta/src/routes/channels/voice_join.rs   |  70 +----
 .../delta/src/routes/servers/member_edit.rs   |  55 +++-
 crates/voice-ingress/Cargo.toml               |   4 +-
 crates/voice-ingress/src/main.rs              | 112 +-------
 17 files changed, 446 insertions(+), 217 deletions(-)
 create mode 100644 crates/core/voice/Cargo.toml
 create mode 100644 crates/core/voice/src/lib.rs

diff --git a/Cargo.lock b/Cargo.lock
index 6df07905a..69e98842e 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4016,6 +4016,7 @@ dependencies = [
  "revolt-permissions",
  "revolt-presence",
  "revolt-result",
+ "revolt-voice",
  "rmp-serde",
  "sentry",
  "serde",
@@ -4118,6 +4119,7 @@ dependencies = [
  "revolt-models",
  "revolt-permissions",
  "revolt-result",
+ "revolt-voice",
  "revolt_rocket_okapi",
  "rocket",
  "rocket_authifier",
@@ -4188,6 +4190,24 @@ dependencies = [
  "serde_json",
 ]
 
+[[package]]
+name = "revolt-voice"
+version = "0.1.0"
+dependencies = [
+ "async-std",
+ "futures",
+ "livekit-api",
+ "livekit-protocol",
+ "redis-kiss",
+ "revolt-config",
+ "revolt-database",
+ "revolt-models",
+ "revolt-permissions",
+ "revolt-result",
+ "serde",
+ "serde_json",
+]
+
 [[package]]
 name = "revolt-voice-ingress"
 version = "0.7.1"
@@ -4203,8 +4223,8 @@ dependencies = [
  "revolt-database",
  "revolt-models",
  "revolt-permissions",
- "revolt-presence",
  "revolt-result",
+ "revolt-voice",
  "rmp-serde",
  "rocket",
  "rocket_empty",
diff --git a/crates/bonfire/Cargo.toml b/crates/bonfire/Cargo.toml
index 485ec527a..4e5a2f0a3 100644
--- a/crates/bonfire/Cargo.toml
+++ b/crates/bonfire/Cargo.toml
@@ -40,6 +40,7 @@ revolt-config = { path = "../core/config" }
 revolt-database = { path = "../core/database" }
 revolt-permissions = { version = "0.7.1", path = "../core/permissions" }
 revolt-presence = { path = "../core/presence", features = ["redis-is-patched"] }
+revolt-voice = { path = "../core/voice" }
 
 # redis
 fred = { version = "8.0.1", features = ["subscriber-client"] }
diff --git a/crates/bonfire/src/events/impl.rs b/crates/bonfire/src/events/impl.rs
index 744a99f8f..2f0141653 100644
--- a/crates/bonfire/src/events/impl.rs
+++ b/crates/bonfire/src/events/impl.rs
@@ -7,9 +7,9 @@ use revolt_database::{
 use revolt_models::v0;
 use revolt_permissions::{calculate_channel_permissions, ChannelPermission};
 use revolt_presence::filter_online;
-use revolt_result::{create_error, Result};
+use revolt_result::Result;
+use revolt_voice::{delete_voice_state, get_voice_channel_members, get_voice_state};
 
-use redis_kiss::{get_connection, AsyncCommands, Conn};
 
 use super::state::{Cache, State};
 
@@ -127,9 +127,6 @@ impl State {
         // Filter server channels by permission.
         let channels = self.cache.filter_accessible_channels(db, channels).await;
 
-        let mut voice_states = Vec::new();
-        let mut conn = get_connection().await.unwrap();
-
         // Append known user IDs from DMs.
         for channel in &channels {
             match channel {
@@ -202,8 +199,11 @@ impl State {
             self.insert_subscription(channel.id().to_string());
         }
 
+        // fetch voice states for all the channels we can see
+        let mut voice_states = Vec::new();
+
         for channel in &channels {
-            if let Ok(Some(voice_state)) = self.fetch_voice_state(&mut conn, channel).await {
+            if let Ok(Some(voice_state)) = self.fetch_voice_state(channel).await {
                 voice_states.push(voice_state)
             }
         }
@@ -564,41 +564,21 @@ impl State {
 
     async fn fetch_voice_state(
         &self,
-        conn: &mut Conn,
         channel: &Channel,
     ) -> Result<Option<v0::ChannelVoiceState>> {
-        let members = conn
-            .smembers::<_, Vec<String>>(format!("vc-members-{}", channel.id()))
-            .await
-            .map_err(|_| create_error!(InternalError))?;
-
-        let channel_or_server_id = channel.server().unwrap_or_else(|| channel.id());
+        let members = get_voice_channel_members(&channel.id()).await?;
 
         if !members.is_empty() {
             let mut participants = Vec::with_capacity(members.len());
 
-            for id in members {
-                let unique_key = format!("{channel_or_server_id}-{id}");
-
-                let (can_publish, can_receive, screensharing, camera) = conn
-                    .mget::<_, (bool, bool, bool, bool)>(&[
-                        format!("can_publish-{unique_key}"),
-                        format!("can_receive-{unique_key}"),
-                        format!("screensharing-{unique_key}"),
-                        format!("camera-{unique_key}"),
-                    ])
-                    .await
-                    .map_err(|_| create_error!(InternalError))?;
-
-                let voice_state = v0::UserVoiceState {
-                    id,
-                    can_receive,
-                    can_publish,
-                    screensharing,
-                    camera,
-                };
+            for user_id in members {
+                if let Some(voice_state) = get_voice_state(&channel.id(), channel.server().as_deref(), &user_id).await? {
+                    participants.push(voice_state);
+                } else {
+                    log::info!("Voice state not found but member in voice channel members, removing.");
 
-                participants.push(voice_state);
+                    delete_voice_state(&channel.id(), channel.server().as_deref(),  &user_id).await?;
+                }
             }
 
             Ok(Some(v0::ChannelVoiceState {
diff --git a/crates/bonfire/src/main.rs b/crates/bonfire/src/main.rs
index 856eb2436..54a2b56ea 100644
--- a/crates/bonfire/src/main.rs
+++ b/crates/bonfire/src/main.rs
@@ -1,7 +1,9 @@
-use std::env;
+use std::{env, sync::Arc};
 
 use async_std::net::TcpListener;
 use revolt_presence::clear_region;
+use once_cell::sync::OnceCell;
+use revolt_voice::VoiceClient;
 
 #[macro_use]
 extern crate log;
@@ -12,6 +14,15 @@ pub mod events;
 mod database;
 mod websocket;
 
+pub static VOICE_CLIENT: OnceCell<Arc<VoiceClient>> = OnceCell::new();
+
+pub fn get_voice_client() -> Arc<VoiceClient> {
+    VOICE_CLIENT
+        .get()
+        .expect("get_voice_client called before set")
+        .clone()
+}
+
 #[async_std::main]
 async fn main() {
     // Configure requirements for Bonfire.
@@ -21,6 +32,8 @@ async fn main() {
     // Clean up the current region information.
     clear_region(None).await;
 
+    VOICE_CLIENT.set(Arc::new(VoiceClient::from_revolt_config().await)).unwrap();
+
     // Setup a TCP listener to accept WebSocket connections on.
     // By default, we bind to port 9000 on all interfaces.
     let bind = env::var("HOST").unwrap_or_else(|_| "0.0.0.0:9000".into());
diff --git a/crates/core/database/src/models/channels/model.rs b/crates/core/database/src/models/channels/model.rs
index 775999930..c96151fbb 100644
--- a/crates/core/database/src/models/channels/model.rs
+++ b/crates/core/database/src/models/channels/model.rs
@@ -1,4 +1,4 @@
-use std::collections::HashMap;
+use std::{borrow::Cow, collections::HashMap};
 
 use revolt_config::config;
 use revolt_models::v0::{self, MessageAuthor, VoiceInformation};
@@ -438,6 +438,15 @@ impl Channel {
         }
     }
 
+    /// Gets this channel's voice information
+    pub fn voice(&self) -> Option<Cow<VoiceInformation>> {
+        match self {
+            Self::DirectMessage { .. } | Channel::VoiceChannel { .. } => Some(Cow::Owned(v0::VoiceInformation::default())),
+            Self::TextChannel { voice: Some(voice), .. } => Some(Cow::Borrowed(voice)),
+            _ => None
+        }
+    }
+
     /// Set role permission on a channel
     pub async fn set_role_permission(
         &mut self,
diff --git a/crates/core/models/src/v0/server_members.rs b/crates/core/models/src/v0/server_members.rs
index a13191436..0ed31fe0a 100644
--- a/crates/core/models/src/v0/server_members.rs
+++ b/crates/core/models/src/v0/server_members.rs
@@ -131,12 +131,15 @@ auto_derived!(
         pub roles: Option<Vec<String>>,
         /// Timestamp this member is timed out until
         pub timeout: Option<Timestamp>,
-        /// Fields to remove from channel object
-        #[cfg_attr(feature = "validator", validate(length(min = 1)))]
-        pub remove: Option<Vec<FieldsMember>>,
         /// server-wide voice muted
         pub can_publish: Option<bool>,
         /// server-wide voice deafened
         pub can_receive: Option<bool>,
+        /// voice channel to move to if already in a voice channel
+        pub voice_channel: Option<String>,
+        /// Fields to remove from channel object
+        #[cfg_attr(feature = "validator", validate(length(min = 1)))]
+        pub remove: Option<Vec<FieldsMember>>,
+
     }
 );
diff --git a/crates/core/permissions/src/models/mod.rs b/crates/core/permissions/src/models/mod.rs
index 330fe7562..b8788230b 100644
--- a/crates/core/permissions/src/models/mod.rs
+++ b/crates/core/permissions/src/models/mod.rs
@@ -8,7 +8,7 @@ pub use server::*;
 pub use user::*;
 
 /// Holds a permission value to manipulate.
-#[derive(Clone, Debug)]
+#[derive(Copy, Clone, Debug)]
 pub struct PermissionValue(u64);
 
 impl PermissionValue {
diff --git a/crates/core/result/src/lib.rs b/crates/core/result/src/lib.rs
index 3733a640d..e3bdb4f26 100644
--- a/crates/core/result/src/lib.rs
+++ b/crates/core/result/src/lib.rs
@@ -134,7 +134,9 @@ pub enum ErrorType {
 
     // ? Voice errors
     LiveKitUnavailable,
-    AlreadyInVoiceChannel
+    AlreadyInVoiceChannel,
+    NotAVoiceChannel,
+    AlreadyConnected
 }
 
 #[macro_export]
diff --git a/crates/core/result/src/rocket.rs b/crates/core/result/src/rocket.rs
index 756da38e4..fd2466dc8 100644
--- a/crates/core/result/src/rocket.rs
+++ b/crates/core/result/src/rocket.rs
@@ -77,6 +77,8 @@ impl<'r> Responder<'r, 'static> for Error {
 
             ErrorType::LiveKitUnavailable => Status::BadRequest,
             ErrorType::AlreadyInVoiceChannel => Status::BadRequest,
+            ErrorType::NotAVoiceChannel => Status::BadRequest,
+            ErrorType::AlreadyConnected => Status::BadRequest
         };
 
         // Serialize the error data structure into JSON.
diff --git a/crates/core/voice/Cargo.toml b/crates/core/voice/Cargo.toml
new file mode 100644
index 000000000..029b61932
--- /dev/null
+++ b/crates/core/voice/Cargo.toml
@@ -0,0 +1,33 @@
+[package]
+name = "revolt-voice"
+version = "0.1.0"
+edition = "2021"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+# voice
+livekit-api = "0.3.2"
+livekit-protocol = "0.3.2"
+
+# core
+revolt-result = { path = "../result" }
+revolt-models = { path = "../models" }
+revolt-config = { path = "../config" }
+revolt-database = { path = "../database" }
+revolt-permissions = { version = "0.7.1", path = "../permissions" }
+
+# async
+futures = "0.3.21"
+async-std = { version = "1.8.0", features = [
+    "tokio1",
+    "tokio02",
+    "attributes",
+] }
+
+# util
+redis-kiss = "0.1.4"
+
+# serde
+serde_json = "1.0.79"
+serde = "1.0.136"
diff --git a/crates/core/voice/src/lib.rs b/crates/core/voice/src/lib.rs
new file mode 100644
index 000000000..226364d54
--- /dev/null
+++ b/crates/core/voice/src/lib.rs
@@ -0,0 +1,266 @@
+use livekit_api::{access_token::{AccessToken, VideoGrants}, services::room::{CreateRoomOptions, RoomClient}};
+use livekit_protocol::Room;
+use redis_kiss::{get_connection, redis::Pipeline, AsyncCommands};
+use revolt_database::{Channel, User};
+use revolt_models::v0::{self, PartialUserVoiceState, UserVoiceState};
+use revolt_permissions::{ChannelPermission, PermissionValue};
+use revolt_result::{Result, ToRevoltError, create_error};
+use std::time::Duration;
+use revolt_config::config;
+
+pub async fn raise_if_in_voice(user: &User, target: &str) -> Result<()> {
+    let mut conn = get_connection()
+        .await
+        .to_internal_error()?;
+
+    if user.bot.is_some()
+    // bots can be in as many voice channels as it wants so we just check if its already connected to the one its trying to connect to
+        && conn.sismember(format!("vc-{}", &user.id), target)
+            .await
+            .to_internal_error()?
+    {
+        Err(create_error!(AlreadyConnected))
+
+    } else if conn.scard::<_, u32>(format!("vc-{}", &user.id))  // check if the current vc set is empty
+        .await
+        .to_internal_error()? > 0
+    {
+        Err(create_error!(AlreadyInVoiceChannel))
+    } else {
+        Ok(())
+    }
+}
+
+pub fn get_allowed_sources(permissions: PermissionValue) -> Vec<String> {
+    let mut allowed_sources = Vec::new();
+
+    if permissions.has(ChannelPermission::Speak as u64) {
+        allowed_sources.push("MICROPHONE".to_string())
+    };
+
+    if permissions.has(ChannelPermission::Video as u64) {
+        allowed_sources.extend([
+            "CAMERA".to_string(),
+            "SCREEN_SHARE".to_string(),
+            "SCREEN_SHARE_AUDIO".to_string()
+        ]);
+    };
+
+    allowed_sources
+}
+
+pub async fn create_voice_state(channel_id: &str, server_id: Option<&str>, user_id: &str) -> Result<UserVoiceState> {
+    let unique_key = format!(
+        "{}-{}",
+        &user_id,
+        server_id.unwrap_or(channel_id)
+    );
+
+    let voice_state = UserVoiceState {
+        id: user_id.to_string(),
+        can_receive: true,
+        can_publish: false,
+        screensharing: false,
+        camera: false,
+    };
+
+    Pipeline::new()
+        .sadd(format!("vc-members-{channel_id}"), user_id)
+        .sadd(format!("vc-{user_id}"), channel_id)
+        .set(format!("can_publish-{unique_key}"), voice_state.can_publish)
+        .set(format!("can_receive-{unique_key}"), voice_state.can_receive)
+        .set(format!("screensharing-{unique_key}"), voice_state.screensharing)
+        .set(format!("camera-{unique_key}"), voice_state.camera)
+        .query_async(&mut get_connection()
+            .await
+            .to_internal_error()?
+            .into_inner())
+        .await
+        .to_internal_error()?;
+
+    Ok(voice_state)
+}
+
+pub async fn delete_voice_state(channel_id: &str, server_id: Option<&str>, user_id: &str) -> Result<()> {
+    let unique_key = format!(
+        "{}-{}",
+        &user_id,
+        server_id.unwrap_or(channel_id)
+    );
+
+    Pipeline::new()
+        .srem(format!("vc-members-{channel_id}"), user_id)
+        .srem(format!("vc-{user_id}"), channel_id)
+        .del(&[
+            format!("can_publish-{unique_key}"),
+            format!("can_receive-{unique_key}"),
+            format!("screensharing-{unique_key}"),
+            format!("camera-{unique_key}"),
+        ])
+        .query_async(&mut get_connection()
+            .await
+            .to_internal_error()?
+            .into_inner())
+        .await
+        .to_internal_error()?;
+
+    Ok(())
+}
+
+pub async fn update_voice_state_tracks(channel_id: &str, server_id: Option<&str>, user_id: &str, added: bool, track: i32) -> Result<PartialUserVoiceState> {
+    let partial = match track {
+        /* TrackSource::Unknown */ 0 => PartialUserVoiceState::default(),
+        /* TrackSource::Camera */ 1 => {
+            PartialUserVoiceState {
+                camera: Some(added),
+                ..Default::default()
+            }
+        }
+        /* TrackSource::Microphone */ 2 => {
+            PartialUserVoiceState {
+                can_publish: Some(added),
+                ..Default::default()
+            }
+        }
+        /* TrackSource::ScreenShare | TrackSource::ScreenShareAudio */ 3 | 4 => {
+            PartialUserVoiceState {
+                screensharing: Some(added),
+                ..Default::default()
+            }
+        }
+        _ => unreachable!(),
+    };
+
+    update_voice_state(channel_id, server_id, user_id, &partial).await?;
+
+    Ok(partial)
+}
+
+pub async fn update_voice_state(channel_id: &str, server_id: Option<&str>, user_id: &str, partial: &PartialUserVoiceState) -> Result<()> {
+    let unique_key = format!(
+        "{}-{}",
+        &user_id,
+        server_id.unwrap_or(channel_id)
+    );
+
+    let mut pipeline = Pipeline::new();
+
+    if let Some(camera) = &partial.camera {
+        pipeline.set(format!("camera-{unique_key}"), camera);
+    };
+
+    if let Some(can_publish) = &partial.can_publish {
+        pipeline.set(format!("can_publish-{unique_key}"), can_publish);
+    }
+
+    if let Some(can_receive) = &partial.can_receive {
+        pipeline.set(format!("can_receive-{unique_key}"), can_receive);
+    }
+
+    if let Some(screensharing) = &partial.screensharing {
+        pipeline.set(format!("screensharing-{unique_key}"), screensharing);
+    }
+
+    pipeline.query_async(&mut get_connection()
+        .await
+        .to_internal_error()?
+        .into_inner()
+    )
+    .await
+    .to_internal_error()?;
+
+    Ok(())
+}
+
+pub async fn get_voice_channel_members(channel_id: &str) -> Result<Vec<String>> {
+    get_connection()
+        .await
+        .to_internal_error()?
+        .smembers::<_, Vec<String>>(format!("vc-members-{}", channel_id))
+        .await
+        .to_internal_error()
+}
+
+pub async fn get_voice_state(channel_id: &str, server_id: Option<&str>, user_id: &str) -> Result<Option<UserVoiceState>> {
+    let unique_key = format!("{}-{user_id}", server_id.unwrap_or(channel_id));
+
+    let (can_publish, can_receive, screensharing, camera) = get_connection()
+        .await
+        .to_internal_error()?
+        .mget::<_, (Option<bool>, Option<bool>, Option<bool>, Option<bool>)>(&[
+            format!("can_publish-{unique_key}"),
+            format!("can_receive-{unique_key}"),
+            format!("screensharing-{unique_key}"),
+            format!("camera-{unique_key}"),
+        ])
+        .await
+        .to_internal_error()?;
+
+    match (can_publish, can_receive, screensharing, camera) {
+        (Some(can_publish), Some(can_receive), Some(screensharing), Some(camera)) => {
+            Ok(Some(v0::UserVoiceState {
+                id: user_id.to_string(),
+                can_receive,
+                can_publish,
+                screensharing,
+                camera,
+            }))
+        },
+        _ => Ok(None)
+    }
+}
+
+#[derive(Debug)]
+pub struct VoiceClient {
+    rooms: RoomClient,
+    api_key: String,
+    api_secret: String
+}
+
+impl VoiceClient {
+    pub fn new(url: String, api_key: String, api_secret: String) -> Self {
+        Self {
+            rooms: RoomClient::with_api_key(&url, &api_key, &api_secret),
+            api_key,
+            api_secret
+        }
+    }
+
+    pub async fn from_revolt_config() -> Self {
+        let config = config().await;
+
+        Self::new(config.hosts.livekit, config.api.livekit.key, config.api.livekit.secret)
+    }
+
+    pub fn create_token(&self, user: &User, permissions: PermissionValue, channel: &Channel) -> Result<String> {
+        let allowed_sources = get_allowed_sources(permissions);
+
+        AccessToken::with_api_key(&self.api_key, &self.api_secret)
+            .with_name(&format!("{}#{}", user.username, user.discriminator))
+            .with_identity(&user.id)
+            .with_metadata(&serde_json::to_string(&user).to_internal_error()?)
+            .with_ttl(Duration::from_secs(10))
+            .with_grants(VideoGrants {
+                room_join: true,
+                can_publish_sources: allowed_sources,
+                room: channel.id().to_string(),
+                ..Default::default()
+            })
+            .to_jwt()
+            .to_internal_error()
+    }
+
+    pub async fn create_room(&self, channel: &Channel) -> Result<Room> {
+        let voice = channel
+            .voice()
+            .ok_or_else(|| create_error!(NotAVoiceChannel))?;
+
+        self.rooms.create_room(&channel.id(), CreateRoomOptions {
+            max_participants: voice.max_users.unwrap_or(u32::MAX),
+            empty_timeout: 5 * 60,  // 5 minutes
+            ..Default::default()
+        })
+        .await
+        .map_err(|_| create_error!(InternalError))
+    }
+}
\ No newline at end of file
diff --git a/crates/delta/Cargo.toml b/crates/delta/Cargo.toml
index e8a4b6844..a69c3fcb0 100644
--- a/crates/delta/Cargo.toml
+++ b/crates/delta/Cargo.toml
@@ -79,6 +79,7 @@ revolt-models = { path = "../core/models", features = [
 ] }
 revolt-result = { path = "../core/result", features = ["rocket", "okapi"] }
 revolt-permissions = { path = "../core/permissions", features = ["schemas"] }
+revolt-voice = { path = "../core/voice" }
 
 # voice
 livekit-api = "0.3.2"
diff --git a/crates/delta/src/main.rs b/crates/delta/src/main.rs
index f910e660c..7d7b760e0 100644
--- a/crates/delta/src/main.rs
+++ b/crates/delta/src/main.rs
@@ -99,10 +99,8 @@ pub async fn web() -> Rocket<Build> {
     )
     .into();
 
-
-    log::info!("{:?}", &config.api.livekit);
-
-    let room_client = RoomClient::with_api_key(&config.api.livekit.url, &config.api.livekit.key, &config.api.livekit.secret);
+    // Voice handler
+    let voice_client = revolt_voice::VoiceClient::new(config.api.livekit.url.clone(), config.api.livekit.key.clone(), config.api.livekit.secret.clone());
 
     // Configure Rocket
     let rocket = rocket::build();
@@ -117,7 +115,7 @@ pub async fn web() -> Rocket<Build> {
         .manage(authifier)
         .manage(db)
         .manage(cors.clone())
-        .manage(room_client)
+        .manage(voice_client)
         .attach(util::ratelimiter::RatelimitFairing)
         .attach(cors)
         .configure(rocket::Config {
diff --git a/crates/delta/src/routes/channels/voice_join.rs b/crates/delta/src/routes/channels/voice_join.rs
index 08330b806..460b362da 100644
--- a/crates/delta/src/routes/channels/voice_join.rs
+++ b/crates/delta/src/routes/channels/voice_join.rs
@@ -1,12 +1,9 @@
-use std::borrow::Cow;
-
-use revolt_config::config;
 use revolt_models::v0;
-use revolt_database::{util::{permissions::perms, reference::Reference}, Channel, Database, User};
+use revolt_database::{util::{permissions::perms, reference::Reference}, Database, User};
 use revolt_permissions::{calculate_channel_permissions, ChannelPermission};
-use revolt_result::{create_error, Result};
+use revolt_result::Result;
+use revolt_voice::{VoiceClient, raise_if_in_voice};
 
-use livekit_api::{access_token::{AccessToken, VideoGrants}, services::room::{CreateRoomOptions, RoomClient}};
 use rocket::{serde::json::Json, State};
 
 /// # Join Call
@@ -14,69 +11,20 @@ use rocket::{serde::json::Json, State};
 /// Asks the voice server for a token to join the call.
 #[openapi(tag = "Voice")]
 #[post("/<target>/join_call")]
-pub async fn call(db: &State<Database>, rooms: &State<RoomClient>, user: User, target: Reference) -> Result<Json<v0::CreateVoiceUserResponse>> {
+pub async fn call(db: &State<Database>, voice: &State<VoiceClient>, user: User, target: Reference) -> Result<Json<v0::CreateVoiceUserResponse>> {
     let channel = target.as_channel(db).await?;
 
+    raise_if_in_voice(&user, &channel.id()).await?;
+
     let mut permissions = perms(db, &user).channel(&channel);
 
     let current_permissions = calculate_channel_permissions(&mut permissions).await;
     current_permissions.throw_if_lacking_channel_permission(ChannelPermission::Connect)?;
 
-    // TODO - decide if we should allow being in multiple voice channels for users
-
-    // if user.current_voice_channel(&channel.server().unwrap_or_else(|| channel.id()))
-    //     .await?
-    //     .is_some()
-    // {
-    //     return Err(create_error!(AlreadyInVoiceChannel))
-    // }
-
-    let config = config().await;
-
-    if config.api.livekit.url.is_empty() {
-        return Err(create_error!(LiveKitUnavailable));
-    };
-
-    let voice = match &channel {
-        Channel::DirectMessage { .. } | Channel::VoiceChannel { .. } => Cow::Owned(v0::VoiceInformation::default()),
-        Channel::TextChannel { voice: Some(voice), .. } => Cow::Borrowed(voice),
-        _ => return Err(create_error!(CannotJoinCall))
-    };
-
-    let mut allowed_sources = Vec::new();
-
-    if current_permissions.has(ChannelPermission::Speak as u64) {
-        allowed_sources.push("MICROPHONE".to_string())
-    };
-
-    if current_permissions.has(ChannelPermission::Video as u64) {
-        allowed_sources.extend(["CAMERA".to_string(), "SCREEN_SHARE".to_string(), "SCREEN_SHARE_AUDIO".to_string()]);
-    };
-
-    let token = AccessToken::with_api_key(&config.api.livekit.key, &config.api.livekit.secret)
-        .with_name(&format!("{}#{}", user.username, user.discriminator))
-        .with_identity(&user.id)
-        .with_metadata(&serde_json::to_string(&user).map_err(|_| create_error!(InternalError))?)
-        .with_grants(VideoGrants {
-            room_join: true,
-            can_publish_sources: allowed_sources,
-            room: channel.id().to_string(),
-            ..Default::default()
-        })
-        .to_jwt()
-        .inspect_err(|e| log::error!("{e:?}"))
-        .map_err(|_| create_error!(InternalError))?;
-
-    let room = rooms.create_room(&channel.id(), CreateRoomOptions {
-        max_participants: voice.max_users.unwrap_or(u32::MAX),
-        empty_timeout: 5 * 60,  // 5 minutes
-        ..Default::default()
-    })
-    .await
-    .inspect_err(|e| log::error!("{e:?}"))
-    .map_err(|_| create_error!(InternalError))?;
+    let token = voice.create_token(&user, current_permissions, &channel)?;
+    let room = voice.create_room(&channel).await?;
 
-    log::info!("created room {room:?}");
+    log::debug!("created room {}", room.name);
 
     Ok(Json(v0::CreateVoiceUserResponse { token }))
 }
diff --git a/crates/delta/src/routes/servers/member_edit.rs b/crates/delta/src/routes/servers/member_edit.rs
index 941a36ff3..3506e955f 100644
--- a/crates/delta/src/routes/servers/member_edit.rs
+++ b/crates/delta/src/routes/servers/member_edit.rs
@@ -1,17 +1,17 @@
 use std::collections::HashSet;
 
+use futures::TryFutureExt;
 use livekit_api::services::room::{RoomClient, UpdateParticipantOptions};
 use livekit_protocol::ParticipantPermission;
 use redis_kiss::{get_connection, redis::Pipeline, AsyncCommands};
 use revolt_database::{
-    util::{permissions::DatabasePermissionQuery, reference::Reference},
-    Database, File, PartialMember, User,
+    events::client::EventV1, util::{permissions::DatabasePermissionQuery, reference::Reference}, Database, File, PartialMember, User
 };
-use revolt_models::v0;
+use revolt_models::v0::{self, PartialUserVoiceState};
 
 use revolt_permissions::{calculate_server_permissions, ChannelPermission};
 use revolt_result::{create_error, Result, ToRevoltError};
-use rocket::{serde::json::Json, State};
+use rocket::{form::validate::Contains, serde::json::Json, State};
 use validator::Validate;
 
 /// # Edit Member
@@ -99,6 +99,25 @@ pub async fn edit(
         permissions.throw_if_lacking_channel_permission(ChannelPermission::DeafenMembers)?;
     }
 
+    if let Some(new_channel) = &data.voice_channel {
+        permissions.throw_if_lacking_channel_permission(ChannelPermission::MoveMembers)?;
+
+        // ensure the channel we are moving them to is in the server and is a voice channel
+
+        let channel = Reference::from_unchecked(new_channel.clone())
+            .as_channel(db)
+            .await
+            .map_err(|_| create_error!(UnknownChannel))?;
+
+        if !channel.server().is_some_and(|v| v == member.id.server) {
+            Err(create_error!(UnknownChannel))?
+        }
+
+        if channel.voice().is_none() {
+            Err(create_error!(NotAVoiceChannel))?
+        }
+    }
+
     // Resolve our ranking
     let our_ranking = query.get_member_rank().unwrap_or(i64::MIN);
 
@@ -136,6 +155,7 @@ pub async fn edit(
         remove,
         can_publish,
         can_receive,
+        voice_channel
     } = data;
 
     let mut partial = PartialMember {
@@ -171,13 +191,15 @@ pub async fn edit(
         )
         .await?;
 
-    if can_publish.is_some() || can_receive.is_some() {
+    if can_publish.is_some() || can_receive.is_some() || voice_channel.is_some() {
         let mut conn = get_connection().await.to_internal_error()?;
 
+        let unique_key = format!("{}-{}", &member.id.user, &member.id.server);
+
         // if we edit the member while they are in a voice channel we need to also update the perms
         // otherwise it wont take place until they leave and rejoin
         if let Some(channel) = conn
-            .get::<_, Option<String>>(format!("vc-{}-{}", &member.id.user, &member.id.server))
+            .get::<_, Option<String>>(format!("vc-{}", &unique_key))
             .await
             .to_internal_error()?
         {
@@ -186,7 +208,7 @@ pub async fn edit(
 
             if let Some(can_publish) = can_publish {
                 pipeline.set(
-                    format!("can_publish-{}-{}", &channel, &member.id.user),
+                    format!("can_publish-{}", unique_key),
                     can_publish,
                 );
 
@@ -196,13 +218,18 @@ pub async fn edit(
 
             if let Some(can_receive) = can_receive {
                 pipeline.set(
-                    format!("can_receive-{}-{}", &channel, &member.id.user),
+                    format!("can_receive-{}", unique_key),
                     can_receive,
                 );
 
                 new_perms.can_subscribe = can_receive;
             };
 
+            if let Some(new_channel) = voice_channel {
+                pipeline
+                    .smove(format!("vc-members-{channel}"), format!("vc-members-{new_channel}"), &member.id.user);
+            };
+
             pipeline
                 .query_async(&mut conn.into_inner())
                 .await
@@ -220,6 +247,18 @@ pub async fn edit(
                 )
                 .await
                 .to_internal_error()?;
+
+            EventV1::UserVoiceStateUpdate {
+                id: member.id.user.clone(),
+                channel_id: channel.clone(),
+                data: PartialUserVoiceState {
+                    can_publish,
+                    can_receive,
+                    ..Default::default()
+                }
+            }
+            .p(channel)
+            .await;
         };
     };
 
diff --git a/crates/voice-ingress/Cargo.toml b/crates/voice-ingress/Cargo.toml
index b220968f3..70fba32cb 100644
--- a/crates/voice-ingress/Cargo.toml
+++ b/crates/voice-ingress/Cargo.toml
@@ -36,8 +36,8 @@ revolt-result = { path = "../core/result" }
 revolt-models = { path = "../core/models" }
 revolt-config = { path = "../core/config" }
 revolt-database = { path = "../core/database" }
-revolt-permissions = { version = "0.7.1", path = "../core/permissions" }
-revolt-presence = { path = "../core/presence", features = ["redis-is-patched"] }
+revolt-permissions = { path = "../core/permissions" }
+revolt-voice = { path = "../core/voice" }
 
 # voice
 livekit-api = "0.3.2"
diff --git a/crates/voice-ingress/src/main.rs b/crates/voice-ingress/src/main.rs
index 28147efc9..4ff6d3600 100644
--- a/crates/voice-ingress/src/main.rs
+++ b/crates/voice-ingress/src/main.rs
@@ -1,12 +1,11 @@
 use std::env;
 
-use redis_kiss::{get_connection, redis::Pipeline, AsyncCommands};
 
 use livekit_protocol::WebhookEvent;
 use revolt_database::{
     events::client::EventV1, util::reference::Reference, Database, DatabaseInfo,
 };
-use revolt_models::v0::{PartialUserVoiceState, UserVoiceState};
+use revolt_voice::{create_voice_state, delete_voice_state, update_voice_state_tracks, VoiceClient};
 use rocket::{build, post, routes, serde::json::Json, Config, State};
 use rocket_empty::EmptyResponse;
 
@@ -17,9 +16,11 @@ async fn main() -> Result<(), rocket::Error> {
     revolt_config::configure!(voice_ingress);
 
     let database = DatabaseInfo::Auto.connect().await.unwrap();
+    let voice_client = VoiceClient::from_revolt_config().await;
 
     let _rocket = build()
         .manage(database)
+        .manage(voice_client)
         .mount("/", routes![ingress])
         .configure(Config {
             port: 8500,
@@ -34,13 +35,10 @@ async fn main() -> Result<(), rocket::Error> {
 }
 
 #[post("/", data = "<body>")]
-async fn ingress(db: &State<Database>, body: Json<WebhookEvent>) -> Result<EmptyResponse> {
-    let mut conn = get_connection().await.to_internal_error()?;
-
+async fn ingress(db: &State<Database>, voice_client: &State<VoiceClient>, body: Json<WebhookEvent>) -> Result<EmptyResponse> {
     log::debug!("received event: {body:?}");
 
     let channel_id = body.room.as_ref().map(|r| &r.name);
-
     let user_id = body.participant.as_ref().map(|r| &r.identity);
 
     match body.event.as_str() {
@@ -52,29 +50,7 @@ async fn ingress(db: &State<Database>, body: Json<WebhookEvent>) -> Result<Empty
                 .as_channel(db)
                 .await?;
 
-            let unique_key = format!(
-                "{}-{user_id}",
-                channel.server().unwrap_or_else(|| channel.id())
-            );
-
-            Pipeline::new()
-                .sadd(format!("vc-members-{channel_id}"), user_id)
-                .set(format!("vc-{unique_key}"), channel_id)
-                .set(format!("can_publish-{unique_key}"), true)
-                .set(format!("can_receive-{unique_key}"), true)
-                .set(format!("screensharing-{unique_key}"), false)
-                .set(format!("camera-{unique_key}"), false)
-                .query_async(&mut conn.into_inner())
-                .await
-                .to_internal_error()?;
-
-            let voice_state = UserVoiceState {
-                id: user_id.clone(),
-                can_receive: true,
-                can_publish: false,
-                screensharing: false,
-                camera: false,
-            };
+            let voice_state = create_voice_state(channel_id, channel.server().as_deref(), user_id).await?;
 
             EventV1::VoiceChannelJoin {
                 id: channel_id.clone(),
@@ -91,24 +67,7 @@ async fn ingress(db: &State<Database>, body: Json<WebhookEvent>) -> Result<Empty
                 .as_channel(db)
                 .await?;
 
-            conn.srem::<_, _, u64>(format!("vc-members-{channel_id}"), user_id)
-                .await
-                .to_internal_error()?;
-
-            let unique_key = format!(
-                "{}-{user_id}",
-                channel.server().unwrap_or_else(|| channel.id())
-            );
-
-            conn.del::<_, Vec<u64>>(&[
-                format!("vc-{unique_key}"),
-                format!("can_publish-{unique_key}"),
-                format!("can_receive-{unique_key}"),
-                format!("screensharing-{unique_key}"),
-                format!("camera-{unique_key}"),
-            ])
-            .await
-            .to_internal_error()?;
+            delete_voice_state(channel_id, channel.server().as_deref(), user_id).await?;
 
             EventV1::VoiceChannelLeave {
                 id: channel_id.clone(),
@@ -118,66 +77,21 @@ async fn ingress(db: &State<Database>, body: Json<WebhookEvent>) -> Result<Empty
             .await
         }
         "track_published" | "track_unpublished" => {
-            let value = body.event == "track_published"; // to avoid duplicating this entire case twice
-
             let channel_id = channel_id.to_internal_error()?;
             let user_id = user_id.to_internal_error()?;
             let track = body.track.as_ref().to_internal_error()?;
 
-            let user = Reference::from_unchecked(user_id.clone())
-                .as_user(db)
-                .await?;
-
             let channel = Reference::from_unchecked(channel_id.clone())
                 .as_channel(db)
                 .await?;
 
-            let unique_key = if user.bot.is_some() {
-                format!(
-                    "{}-{user_id}",
-                    channel.server().unwrap_or_else(|| channel.id())
-                )
-            } else {
-                user_id.to_string()
-            };
-
-            let partial = match track.source {
-                /* TrackSource::Unknown */ 0 => PartialUserVoiceState::default(),
-                /* TrackSource::Camera */
-                1 => {
-                    conn.set::<_, _, String>(format!("camera-{unique_key}"), value)
-                        .await
-                        .to_internal_error()?;
-
-                    PartialUserVoiceState {
-                        camera: Some(value),
-                        ..Default::default()
-                    }
-                }
-                /* TrackSource::Microphone */
-                2 => {
-                    conn.set::<_, _, String>(format!("can_receive-{unique_key}"), value)
-                        .await
-                        .to_internal_error()?;
-
-                    PartialUserVoiceState {
-                        can_publish: Some(value),
-                        ..Default::default()
-                    }
-                }
-                /* TrackSource::ScreenShare | TrackSource::ScreenShareAudio */
-                3 | 4 => {
-                    conn.set::<_, _, String>(format!("screensharing-{unique_key}"), value)
-                        .await
-                        .to_internal_error()?;
-
-                    PartialUserVoiceState {
-                        screensharing: Some(value),
-                        ..Default::default()
-                    }
-                }
-                _ => unreachable!(),
-            };
+            let partial = update_voice_state_tracks(
+                channel_id,
+                channel.server().as_deref(),
+                user_id,
+                body.event == "track_published",  // to avoid duplicating this entire case twice
+                track.source
+            ).await?;
 
             EventV1::UserVoiceStateUpdate {
                 id: user_id.clone(),

From 120ca449b86239ca1fcc0805b96e825cc748de40 Mon Sep 17 00:00:00 2001
From: Zomatree <me@zomatree.live>
Date: Tue, 23 Jul 2024 04:07:34 +0100
Subject: [PATCH 07/62] feat(livekit): more permission handling

---
 Cargo.lock                                    |  1 +
 crates/core/database/src/events/client.rs     |  2 +-
 .../src/models/server_members/model.rs        | 16 +++---
 .../src/models/server_members/ops/mongodb.rs  |  2 +
 crates/core/database/src/util/bridge/v0.rs    |  4 ++
 crates/core/database/src/util/permissions.rs  | 16 ++++++
 crates/core/models/src/v0/server_members.rs   | 10 ++--
 crates/core/permissions/src/impl.rs           |  8 +++
 crates/core/permissions/src/models/channel.rs |  5 +-
 crates/core/permissions/src/test.rs           | 32 ++++++++++++
 crates/core/permissions/src/trait.rs          |  6 +++
 crates/core/result/Cargo.toml                 |  3 ++
 crates/core/result/src/lib.rs                 |  6 ++-
 crates/core/voice/src/lib.rs                  | 40 +++++++++++++--
 crates/delta/src/routes/root.rs               |  4 +-
 crates/delta/src/routes/servers/ban_create.rs | 10 +++-
 .../delta/src/routes/servers/member_edit.rs   | 49 ++++++++++++-------
 crates/voice-ingress/src/main.rs              |  2 +-
 18 files changed, 177 insertions(+), 39 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 69e98842e..c32da1943 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4182,6 +4182,7 @@ dependencies = [
 name = "revolt-result"
 version = "0.7.1"
 dependencies = [
+ "log",
  "revolt_okapi",
  "revolt_rocket_okapi",
  "rocket",
diff --git a/crates/core/database/src/events/client.rs b/crates/core/database/src/events/client.rs
index 473c5cb32..f9222bfe0 100644
--- a/crates/core/database/src/events/client.rs
+++ b/crates/core/database/src/events/client.rs
@@ -236,7 +236,7 @@ pub enum EventV1 {
     UserVoiceStateUpdate {
         id: String,
         channel_id: String,
-        data: PartialUserVoiceState
+        data: PartialUserVoiceState,
     }
 }
 
diff --git a/crates/core/database/src/models/server_members/model.rs b/crates/core/database/src/models/server_members/model.rs
index fd068aeeb..fb9c4417c 100644
--- a/crates/core/database/src/models/server_members/model.rs
+++ b/crates/core/database/src/models/server_members/model.rs
@@ -32,11 +32,11 @@ auto_derived_partial!(
         pub timeout: Option<Timestamp>,
 
         /// Whether the member is server-wide voice muted
-        #[serde(skip_serializing_if = "if_false")]
-        pub can_publish: bool,
+        #[serde(skip_serializing_if = "Option::is_none")]
+        pub can_publish: Option<bool>,
         /// Whether the member is server-wide voice deafened
-        #[serde(skip_serializing_if = "if_false")]
-        pub can_receive: bool,
+        #[serde(skip_serializing_if = "Option::is_none")]
+        pub can_receive: Option<bool>,
     },
     "PartialMember"
 );
@@ -57,6 +57,8 @@ auto_derived!(
         Avatar,
         Roles,
         Timeout,
+        CanReceive,
+        CanPublish,
     }
 
     /// Member removal intention
@@ -76,8 +78,8 @@ impl Default for Member {
             avatar: None,
             roles: vec![],
             timeout: None,
-            can_publish: false,
-            can_receive: false,
+            can_publish: None,
+            can_receive: None,
         }
     }
 }
@@ -199,6 +201,8 @@ impl Member {
             FieldsMember::Nickname => self.nickname = None,
             FieldsMember::Roles => self.roles.clear(),
             FieldsMember::Timeout => self.timeout = None,
+            FieldsMember::CanReceive => self.can_receive = None,
+            FieldsMember::CanPublish => self.can_publish = None
         }
     }
 
diff --git a/crates/core/database/src/models/server_members/ops/mongodb.rs b/crates/core/database/src/models/server_members/ops/mongodb.rs
index 8ab526790..1c5116906 100644
--- a/crates/core/database/src/models/server_members/ops/mongodb.rs
+++ b/crates/core/database/src/models/server_members/ops/mongodb.rs
@@ -173,6 +173,8 @@ impl IntoDocumentPath for FieldsMember {
             FieldsMember::Nickname => "nickname",
             FieldsMember::Roles => "roles",
             FieldsMember::Timeout => "timeout",
+            FieldsMember::CanPublish => "can_publish",
+            FieldsMember::CanReceive => "can_receive"
         })
     }
 }
diff --git a/crates/core/database/src/util/bridge/v0.rs b/crates/core/database/src/util/bridge/v0.rs
index 042f10c8f..de7505bef 100644
--- a/crates/core/database/src/util/bridge/v0.rs
+++ b/crates/core/database/src/util/bridge/v0.rs
@@ -690,6 +690,8 @@ impl From<crate::FieldsMember> for FieldsMember {
             crate::FieldsMember::Nickname => FieldsMember::Nickname,
             crate::FieldsMember::Roles => FieldsMember::Roles,
             crate::FieldsMember::Timeout => FieldsMember::Timeout,
+            crate::FieldsMember::CanReceive => FieldsMember::CanReceive,
+            crate::FieldsMember::CanPublish => FieldsMember::CanPublish,
         }
     }
 }
@@ -701,6 +703,8 @@ impl From<FieldsMember> for crate::FieldsMember {
             FieldsMember::Nickname => crate::FieldsMember::Nickname,
             FieldsMember::Roles => crate::FieldsMember::Roles,
             FieldsMember::Timeout => crate::FieldsMember::Timeout,
+            FieldsMember::CanReceive => crate::FieldsMember::CanReceive,
+            FieldsMember::CanPublish => crate::FieldsMember::CanPublish,
         }
     }
 }
diff --git a/crates/core/database/src/util/permissions.rs b/crates/core/database/src/util/permissions.rs
index 3adb2ec34..08fe3a9eb 100644
--- a/crates/core/database/src/util/permissions.rs
+++ b/crates/core/database/src/util/permissions.rs
@@ -179,6 +179,22 @@ impl PermissionQuery for DatabasePermissionQuery<'_> {
         }
     }
 
+    async fn do_we_have_publish_overwrites(&mut self) -> bool {
+        if let Some(member) = &self.member {
+            member.can_publish.unwrap_or(true)
+        } else {
+            false
+        }
+    }
+
+    async fn do_we_have_receive_overwrites(&mut self) -> bool {
+        if let Some(member) = &self.member {
+            member.can_receive.unwrap_or(true)
+        } else {
+            false
+        }
+    }
+
     // * For calculating channel permission
 
     /// Get the type of the channel
diff --git a/crates/core/models/src/v0/server_members.rs b/crates/core/models/src/v0/server_members.rs
index 0ed31fe0a..d1cbe9651 100644
--- a/crates/core/models/src/v0/server_members.rs
+++ b/crates/core/models/src/v0/server_members.rs
@@ -60,11 +60,11 @@ auto_derived_partial!(
         pub timeout: Option<Timestamp>,
 
         /// Whether the member is server-wide voice muted
-        #[serde(skip_serializing_if = "if_false")]
-        pub can_publish: bool,
+        #[serde(skip_serializing_if = "Option::is_none")]
+        pub can_publish: Option<bool>,
         /// Whether the member is server-wide voice deafened
-        #[serde(skip_serializing_if = "if_false")]
-        pub can_receive: bool,
+        #[serde(skip_serializing_if = "Option::is_none")]
+        pub can_receive: Option<bool>,
     },
     "PartialMember"
 );
@@ -85,6 +85,8 @@ auto_derived!(
         Avatar,
         Roles,
         Timeout,
+        CanReceive,
+        CanPublish,
     }
 
     /// Member removal intention
diff --git a/crates/core/permissions/src/impl.rs b/crates/core/permissions/src/impl.rs
index 9975eeda5..f175d6bd4 100644
--- a/crates/core/permissions/src/impl.rs
+++ b/crates/core/permissions/src/impl.rs
@@ -61,6 +61,14 @@ pub async fn calculate_server_permissions<P: PermissionQuery>(query: &mut P) ->
         permissions.apply(role_override);
     }
 
+    if !query.do_we_have_publish_overwrites().await {
+        permissions.revoke(ChannelPermission::Speak as u64);
+    }
+
+    if !query.do_we_have_receive_overwrites().await {
+        permissions.revoke(ChannelPermission::Listen as u64);
+    }
+
     if query.are_we_timed_out().await {
         permissions.restrict(*ALLOW_IN_TIMEOUT);
     }
diff --git a/crates/core/permissions/src/models/channel.rs b/crates/core/permissions/src/models/channel.rs
index 17762b1ed..0b2867ae8 100644
--- a/crates/core/permissions/src/models/channel.rs
+++ b/crates/core/permissions/src/models/channel.rs
@@ -89,6 +89,8 @@ pub enum ChannelPermission {
     DeafenMembers = 1 << 34,
     /// Move members between voice channels
     MoveMembers = 1 << 35,
+    /// Listen to other users
+    Listen = 1 << 36,
 
     // * Misc. permissions
     // % Bits 36 to 52: free area
@@ -124,7 +126,8 @@ pub static DEFAULT_PERMISSION: Lazy<u64> = Lazy::new(|| {
             + ChannelPermission::SendEmbeds
             + ChannelPermission::UploadFiles
             + ChannelPermission::Connect
-            + ChannelPermission::Speak,
+            + ChannelPermission::Speak
+            + ChannelPermission::Listen
     )
 });
 
diff --git a/crates/core/permissions/src/test.rs b/crates/core/permissions/src/test.rs
index e4dadd485..93e1dea2c 100644
--- a/crates/core/permissions/src/test.rs
+++ b/crates/core/permissions/src/test.rs
@@ -64,6 +64,14 @@ async fn validate_user_permissions() {
             unreachable!()
         }
 
+        async fn do_we_have_publish_overwrites(&mut self) -> bool {
+            true
+        }
+
+        async fn do_we_have_receive_overwrites(&mut self) -> bool {
+            true
+        }
+
         async fn get_channel_type(&mut self) -> ChannelType {
             ChannelType::DirectMessage
         }
@@ -153,6 +161,14 @@ async fn validate_group_permissions() {
             unreachable!()
         }
 
+        async fn do_we_have_publish_overwrites(&mut self) -> bool {
+            true
+        }
+
+        async fn do_we_have_receive_overwrites(&mut self) -> bool {
+            true
+        }
+
         async fn get_channel_type(&mut self) -> ChannelType {
             ChannelType::Group
         }
@@ -254,6 +270,14 @@ async fn validate_server_permissions() {
             false
         }
 
+        async fn do_we_have_publish_overwrites(&mut self) -> bool {
+            true
+        }
+
+        async fn do_we_have_receive_overwrites(&mut self) -> bool {
+            true
+        }
+
         async fn get_channel_type(&mut self) -> ChannelType {
             ChannelType::ServerChannel
         }
@@ -346,6 +370,14 @@ async fn validate_timed_out_member() {
             true
         }
 
+        async fn do_we_have_publish_overwrites(&mut self) -> bool {
+            true
+        }
+
+        async fn do_we_have_receive_overwrites(&mut self) -> bool {
+            true
+        }
+
         async fn get_channel_type(&mut self) -> ChannelType {
             ChannelType::ServerChannel
         }
diff --git a/crates/core/permissions/src/trait.rs b/crates/core/permissions/src/trait.rs
index d4a7c3d36..96b42caf8 100644
--- a/crates/core/permissions/src/trait.rs
+++ b/crates/core/permissions/src/trait.rs
@@ -39,6 +39,12 @@ pub trait PermissionQuery {
     /// Is our perspective user timed out on this server?
     async fn are_we_timed_out(&mut self) -> bool;
 
+    /// Is the member muted?
+    async fn do_we_have_publish_overwrites(&mut self) -> bool;
+
+    /// Is the member deafend?
+    async fn do_we_have_receive_overwrites(&mut self) -> bool;
+
     // * For calculating channel permission
 
     /// Get the type of the channel
diff --git a/crates/core/result/Cargo.toml b/crates/core/result/Cargo.toml
index c7f1ec042..fae07bd6f 100644
--- a/crates/core/result/Cargo.toml
+++ b/crates/core/result/Cargo.toml
@@ -28,3 +28,6 @@ schemars = { version = "0.8.8", optional = true }
 rocket = { optional = true, version = "0.5.0-rc.2", default-features = false }
 revolt_rocket_okapi = { version = "0.9.1", optional = true }
 revolt_okapi = { version = "0.9.1", optional = true }
+
+# utilities
+log = "0.4"
\ No newline at end of file
diff --git a/crates/core/result/src/lib.rs b/crates/core/result/src/lib.rs
index e3bdb4f26..713f5a18b 100644
--- a/crates/core/result/src/lib.rs
+++ b/crates/core/result/src/lib.rs
@@ -181,9 +181,11 @@ pub trait ToRevoltError<T> {
     fn to_internal_error(self) -> Result<T, Error>;
 }
 
-impl<T, E> ToRevoltError<T> for Result<T, E> {
+impl<T, E: std::fmt::Debug> ToRevoltError<T> for Result<T, E> {
     fn to_internal_error(self) -> Result<T, Error> {
-        self.map_err(|_| {
+        self
+        .inspect_err(|e| log::error!("{e:?}"))
+        .map_err(|_| {
             let loc = Location::caller();
 
             Error {
diff --git a/crates/core/voice/src/lib.rs b/crates/core/voice/src/lib.rs
index 226364d54..0e0c714b3 100644
--- a/crates/core/voice/src/lib.rs
+++ b/crates/core/voice/src/lib.rs
@@ -1,5 +1,5 @@
-use livekit_api::{access_token::{AccessToken, VideoGrants}, services::room::{CreateRoomOptions, RoomClient}};
-use livekit_protocol::Room;
+use livekit_api::{access_token::{AccessToken, VideoGrants}, services::room::{CreateRoomOptions, RoomClient, UpdateParticipantOptions}};
+use livekit_protocol::{ParticipantInfo, ParticipantPermission, Room};
 use redis_kiss::{get_connection, redis::Pipeline, AsyncCommands};
 use revolt_database::{Channel, User};
 use revolt_models::v0::{self, PartialUserVoiceState, UserVoiceState};
@@ -31,6 +31,22 @@ pub async fn raise_if_in_voice(user: &User, target: &str) -> Result<()> {
     }
 }
 
+pub async fn get_user_voice_channel_in_server(user_id: &str, server_id: &str) -> Result<Option<String>> {
+    let mut conn = get_connection()
+        .await
+        .to_internal_error()?;
+
+    let unique_key = format!(
+        "{}-{}",
+        user_id,
+        server_id
+    );
+
+    conn.get::<&str, Option<String>>(&unique_key)
+        .await
+        .to_internal_error()
+}
+
 pub fn get_allowed_sources(permissions: PermissionValue) -> Vec<String> {
     let mut allowed_sources = Vec::new();
 
@@ -67,6 +83,7 @@ pub async fn create_voice_state(channel_id: &str, server_id: Option<&str>, user_
     Pipeline::new()
         .sadd(format!("vc-members-{channel_id}"), user_id)
         .sadd(format!("vc-{user_id}"), channel_id)
+        .set(&unique_key, channel_id)
         .set(format!("can_publish-{unique_key}"), voice_state.can_publish)
         .set(format!("can_receive-{unique_key}"), voice_state.can_receive)
         .set(format!("screensharing-{unique_key}"), voice_state.screensharing)
@@ -96,6 +113,7 @@ pub async fn delete_voice_state(channel_id: &str, server_id: Option<&str>, user_
             format!("can_receive-{unique_key}"),
             format!("screensharing-{unique_key}"),
             format!("camera-{unique_key}"),
+            unique_key.clone(),
         ])
         .query_async(&mut get_connection()
             .await
@@ -243,6 +261,7 @@ impl VoiceClient {
             .with_grants(VideoGrants {
                 room_join: true,
                 can_publish_sources: allowed_sources,
+                can_subscribe: permissions.has_channel_permission(ChannelPermission::Listen),
                 room: channel.id().to_string(),
                 ..Default::default()
             })
@@ -261,6 +280,21 @@ impl VoiceClient {
             ..Default::default()
         })
         .await
-        .map_err(|_| create_error!(InternalError))
+        .to_internal_error()
+    }
+
+    pub async fn update_permissions(&self, user: &User, channel_id: &str, new_permissions: ParticipantPermission) -> Result<ParticipantInfo> {
+        self.rooms
+            .update_participant(
+                channel_id,
+                &user.id,
+                UpdateParticipantOptions {
+                    permission: Some(new_permissions),
+                    name: "".to_string(),
+                    metadata: "".to_string(),
+                },
+            )
+            .await
+            .to_internal_error()
     }
 }
\ No newline at end of file
diff --git a/crates/delta/src/routes/root.rs b/crates/delta/src/routes/root.rs
index d8677f8b4..63a731fa0 100644
--- a/crates/delta/src/routes/root.rs
+++ b/crates/delta/src/routes/root.rs
@@ -105,8 +105,8 @@ pub async fn root() -> Result<Json<RevoltConfig>> {
                 url: config.hosts.january,
             },
             livekit: VoiceFeature {
-                enabled: !config.api.livekit.url.is_empty(),
-                url: config.api.livekit.url.to_string(),
+                enabled: !config.hosts.livekit.is_empty(),
+                url: config.hosts.livekit.to_string(),
             },
         },
         ws: config.hosts.events,
diff --git a/crates/delta/src/routes/servers/ban_create.rs b/crates/delta/src/routes/servers/ban_create.rs
index 8003e79ea..09666ac48 100644
--- a/crates/delta/src/routes/servers/ban_create.rs
+++ b/crates/delta/src/routes/servers/ban_create.rs
@@ -5,11 +5,11 @@ use revolt_database::{
 use revolt_models::v0;
 
 use revolt_permissions::{
-    calculate_channel_permissions, calculate_server_permissions, ChannelPermission,
+    calculate_server_permissions, ChannelPermission,
 };
 use revolt_result::{create_error, Result};
+use revolt_voice::{delete_voice_state, get_user_voice_channel_in_server, VoiceClient};
 use rocket::{serde::json::Json, State};
-use serde::{Deserialize, Serialize};
 use validator::Validate;
 
 /// # Ban User
@@ -19,6 +19,7 @@ use validator::Validate;
 #[put("/<server>/bans/<target>", data = "<data>")]
 pub async fn ban(
     db: &State<Database>,
+    voice: &State<VoiceClient>,
     user: User,
     server: Reference,
     target: Reference,
@@ -57,6 +58,11 @@ pub async fn ban(
         member
             .remove(db, &server, RemovalIntention::Ban, false)
             .await?;
+
+        // If the member is in a voice channel while banned kick them from the voice channel
+        if let Some(channel_id) = get_user_voice_channel_in_server(&user.id, &server.id).await? {
+            delete_voice_state(&channel_id, Some(&server.id), &user.id).await?
+        }
     }
 
     ServerBan::create(db, &server, &target.id, data.reason)
diff --git a/crates/delta/src/routes/servers/member_edit.rs b/crates/delta/src/routes/servers/member_edit.rs
index 3506e955f..218eddbc7 100644
--- a/crates/delta/src/routes/servers/member_edit.rs
+++ b/crates/delta/src/routes/servers/member_edit.rs
@@ -7,10 +7,11 @@ use redis_kiss::{get_connection, redis::Pipeline, AsyncCommands};
 use revolt_database::{
     events::client::EventV1, util::{permissions::DatabasePermissionQuery, reference::Reference}, Database, File, PartialMember, User
 };
-use revolt_models::v0::{self, PartialUserVoiceState};
+use revolt_models::v0::{self, FieldsMember, PartialUserVoiceState};
 
 use revolt_permissions::{calculate_server_permissions, ChannelPermission};
 use revolt_result::{create_error, Result, ToRevoltError};
+use revolt_voice::VoiceClient;
 use rocket::{form::validate::Contains, serde::json::Json, State};
 use validator::Validate;
 
@@ -20,7 +21,7 @@ use validator::Validate;
 #[openapi(tag = "Server Members")]
 #[patch("/<server>/members/<target>", data = "<data>")]
 pub async fn edit(
-    room_client: &State<RoomClient>,
+    voice_client: &State<VoiceClient>,
     db: &State<Database>,
     user: User,
     server: Reference,
@@ -37,6 +38,7 @@ pub async fn edit(
     // Fetch server, target member and current permissions
     let mut server = server.as_server(db).await?;
     let mut member = target.as_member(db, &server.id).await?;
+    let target_user = target.as_user(db).await?;
     let mut query = DatabasePermissionQuery::new(db, &user)
         .server(&server)
         .member(&member);
@@ -153,8 +155,8 @@ pub async fn edit(
         roles,
         timeout,
         remove,
-        can_publish,
-        can_receive,
+        mut can_publish,
+        mut can_receive,
         voice_channel
     } = data;
 
@@ -181,6 +183,10 @@ pub async fn edit(
         partial.avatar = Some(File::use_avatar(db, &avatar, &user.id).await?);
     }
 
+    let remove_contains_voice = remove
+        .as_ref()
+        .map(|r| r.contains(FieldsMember::CanPublish) || r.contains(FieldsMember::CanReceive)).unwrap_or_default();
+
     member
         .update(
             db,
@@ -191,7 +197,11 @@ pub async fn edit(
         )
         .await?;
 
-    if can_publish.is_some() || can_receive.is_some() || voice_channel.is_some() {
+    if can_publish.is_some() ||
+       can_receive.is_some() ||
+       voice_channel.is_some() ||
+       remove_contains_voice
+    {
         let mut conn = get_connection().await.to_internal_error()?;
 
         let unique_key = format!("{}-{}", &member.id.user, &member.id.server);
@@ -206,6 +216,22 @@ pub async fn edit(
             let mut pipeline = Pipeline::new();
             let mut new_perms = ParticipantPermission::default();
 
+            if remove_contains_voice {
+                let mut query = DatabasePermissionQuery::new(db, &target_user)
+                    .server(&server)
+                    .member(&member);
+
+                let permissions = calculate_server_permissions(&mut query).await;
+
+                if !permissions.has_channel_permission(ChannelPermission::Speak) {
+                    can_publish = Some(false)
+                }
+
+                if !permissions.has_channel_permission(ChannelPermission::Listen) {
+                    can_receive = Some(false)
+                }
+            }
+
             if let Some(can_publish) = can_publish {
                 pipeline.set(
                     format!("can_publish-{}", unique_key),
@@ -235,18 +261,7 @@ pub async fn edit(
                 .await
                 .to_internal_error()?;
 
-            room_client
-                .update_participant(
-                    &channel,
-                    &member.id.user,
-                    UpdateParticipantOptions {
-                        permission: Some(new_perms),
-                        name: "".to_string(),
-                        metadata: "".to_string(),
-                    },
-                )
-                .await
-                .to_internal_error()?;
+            voice_client.update_permissions(&user, &channel, new_perms).await?;
 
             EventV1::UserVoiceStateUpdate {
                 id: member.id.user.clone(),
diff --git a/crates/voice-ingress/src/main.rs b/crates/voice-ingress/src/main.rs
index 4ff6d3600..f4c9f8770 100644
--- a/crates/voice-ingress/src/main.rs
+++ b/crates/voice-ingress/src/main.rs
@@ -96,7 +96,7 @@ async fn ingress(db: &State<Database>, voice_client: &State<VoiceClient>, body:
             EventV1::UserVoiceStateUpdate {
                 id: user_id.clone(),
                 channel_id: channel_id.clone(),
-                data: partial,
+                data: partial
             }
             .p(channel_id.clone())
             .await;

From 2f7294705e228f8454b6ac6bc168cb0ae9ce13bb Mon Sep 17 00:00:00 2001
From: Zomatree <me@zomatree.live>
Date: Sun, 13 Oct 2024 20:23:00 +0100
Subject: [PATCH 08/62] feat(livekit): push unfinished code

---
 .../delta/src/routes/servers/roles_delete.rs  | 46 +++++++++++++++++--
 crates/delta/src/routes/servers/roles_edit.rs | 42 +++++++++++++++--
 2 files changed, 81 insertions(+), 7 deletions(-)

diff --git a/crates/delta/src/routes/servers/roles_delete.rs b/crates/delta/src/routes/servers/roles_delete.rs
index 9063dae24..adb302568 100644
--- a/crates/delta/src/routes/servers/roles_delete.rs
+++ b/crates/delta/src/routes/servers/roles_delete.rs
@@ -1,9 +1,10 @@
 use revolt_database::{
-    util::{permissions::DatabasePermissionQuery, reference::Reference},
-    Database, User,
+    util::{permissions::DatabasePermissionQuery, reference::Reference}, Channel, Database, User
 };
-use revolt_permissions::{calculate_server_permissions, ChannelPermission};
+use revolt_models::v0::PartialUserVoiceState;
+use revolt_permissions::{calculate_channel_permissions, calculate_server_permissions, ChannelPermission};
 use revolt_result::{create_error, Result};
+use revolt_voice::{get_allowed_sources, get_voice_channel_members, get_voice_state};
 use rocket::State;
 use rocket_empty::EmptyResponse;
 
@@ -31,6 +32,45 @@ pub async fn delete(
             return Err(create_error!(NotElevated));
         }
 
+        for channel_id in &server.channels {
+            let channel = Reference::from_unchecked(channel_id.clone()).as_channel(db).await?;
+
+            if matches!(channel, Channel::VoiceChannel { .. }) {
+                for member_id in get_voice_channel_members(channel_id).await? {
+                    let member = Reference::from_unchecked(member_id).as_member(db, &server.id).await?;
+
+                    if member.roles.contains(&role_id) {
+                        let user = Reference::from_unchecked(member.id.user.clone()).as_user(db).await?;
+                        let voice_state = get_voice_state(channel_id, Some(&server.id), &user.id).await?.unwrap();
+
+                        let mut query = DatabasePermissionQuery::new(db, &user)
+                            .member(&member)
+                            .channel(&channel)
+                            .server(&server);
+
+                        let permissions = calculate_channel_permissions(&mut query).await;
+
+                        let sources = get_allowed_sources(permissions);
+
+                        let mut update_event = PartialUserVoiceState {
+                            id: Some(user.id.clone()),
+                            ..Default::default()
+                        };
+
+                        if !sources.contains(&"CAMERA".to_string()) {
+                            update_event.camera = 
+                            update_event
+                        }
+
+                        if voice_state.camera && !sources.contains(&"MICROPHONE".to_string()) {
+                            update_event. = Some(false);
+                        }
+
+                    }
+                }
+            }
+        };
+
         role.delete(db, &server.id, &role_id)
             .await
             .map(|_| EmptyResponse)
diff --git a/crates/delta/src/routes/servers/roles_edit.rs b/crates/delta/src/routes/servers/roles_edit.rs
index c7f5124ce..a63206e65 100644
--- a/crates/delta/src/routes/servers/roles_edit.rs
+++ b/crates/delta/src/routes/servers/roles_edit.rs
@@ -1,10 +1,10 @@
 use revolt_database::{
-    util::{permissions::DatabasePermissionQuery, reference::Reference},
-    Database, PartialRole, User,
+    util::{permissions::DatabasePermissionQuery, reference::Reference}, Channel, Database, PartialRole, User
 };
-use revolt_models::v0;
-use revolt_permissions::{calculate_server_permissions, ChannelPermission};
+use revolt_models::v0::{self, PartialUserVoiceState};
+use revolt_permissions::{calculate_channel_permissions, calculate_server_permissions, ChannelPermission, PermissionQuery};
 use revolt_result::{create_error, Result};
+use revolt_voice::{get_allowed_sources, get_voice_channel_members, get_voice_state, update_voice_state_tracks, VoiceClient};
 use rocket::{serde::json::Json, State};
 use serde::{Deserialize, Serialize};
 use validator::Validate;
@@ -16,6 +16,7 @@ use validator::Validate;
 #[patch("/<target>/roles/<role_id>", data = "<data>")]
 pub async fn edit(
     db: &State<Database>,
+    voice: &State<VoiceClient>,
     user: User,
     target: Reference,
     role_id: String,
@@ -76,6 +77,39 @@ pub async fn edit(
         )
         .await?;
 
+        for channel_id in &server.channels {
+            let channel = Reference::from_unchecked(channel_id.clone()).as_channel(db).await?;
+
+            if matches!(channel, Channel::VoiceChannel { .. }) {
+                for member_id in get_voice_channel_members(channel_id).await? {
+                    let member = Reference::from_unchecked(member_id).as_member(db, &server.id).await?;
+
+                    if member.roles.contains(&role_id) {
+                        let user = Reference::from_unchecked(member.id.user.clone()).as_user(db).await?;
+                        let voice_state = get_voice_state(channel_id, Some(&server.id), &user.id).await?.unwrap();
+
+                        let mut query = DatabasePermissionQuery::new(db, &user)
+                            .member(&member)
+                            .channel(&channel)
+                            .server(&server);
+
+                        let permissions = calculate_channel_permissions(&mut query).await;
+
+                        let sources = get_allowed_sources(permissions);
+
+                        let mut update_event = PartialUserVoiceState {
+                            id: Some(user.id.clone()),
+                            ..Default::default()
+                        };
+
+                        if voice_state.camera && !sources.contains(&"CAMERA".to_string()) {
+                            update_event.camera = Some(false);
+                        }
+                    }
+                }
+            }
+        };
+
         Ok(Json(role.into()))
     } else {
         Err(create_error!(NotFound))

From c55b5bf75f08e2aa4dd13f6211962bf2c3384c21 Mon Sep 17 00:00:00 2001
From: Zomatree <me@zomatree.live>
Date: Mon, 27 Jan 2025 20:46:29 +0000
Subject: [PATCH 09/62] fix: include voice states in servercreate event feat:
 call started system message in dms

---
 Cargo.lock                                    |  24 +--
 crates/bonfire/Cargo.toml                     |   1 -
 crates/bonfire/src/config.rs                  |   1 +
 crates/bonfire/src/events/impl.rs             |  33 +---
 crates/bonfire/src/main.rs                    |   2 +-
 crates/core/database/Cargo.toml               |   5 +
 crates/core/database/src/events/client.rs     |   1 +
 crates/core/database/src/lib.rs               |   3 +
 .../database/src/models/messages/model.rs     |   5 +
 .../src/models/server_members/model.rs        |  10 +
 crates/core/database/src/util/bridge/v0.rs    |   1 +
 .../src/lib.rs => database/src/voice/mod.rs}  | 173 ++++++------------
 .../core/database/src/voice/voice_client.rs   | 108 +++++++++++
 crates/core/models/src/v0/messages.rs         |   3 +
 crates/core/result/src/lib.rs                 |   2 +
 crates/core/voice/Cargo.toml                  |  33 ----
 crates/daemons/voice-ingress/Cargo.toml       |   1 -
 crates/daemons/voice-ingress/src/main.rs      |   2 +-
 crates/delta/Cargo.toml                       |   1 -
 crates/delta/src/main.rs                      |   4 +-
 .../delta/src/routes/channels/voice_join.rs   |  30 ++-
 crates/delta/src/routes/servers/ban_create.rs |   2 +-
 .../delta/src/routes/servers/member_edit.rs   |   2 +-
 .../delta/src/routes/servers/roles_delete.rs  |   5 +-
 crates/delta/src/routes/servers/roles_edit.rs |   5 +-
 25 files changed, 237 insertions(+), 220 deletions(-)
 rename crates/core/{voice/src/lib.rs => database/src/voice/mod.rs} (53%)
 create mode 100644 crates/core/database/src/voice/voice_client.rs
 delete mode 100644 crates/core/voice/Cargo.toml

diff --git a/Cargo.lock b/Cargo.lock
index 51db43a61..9db589c30 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -6268,7 +6268,6 @@ dependencies = [
  "revolt-permissions",
  "revolt-presence",
  "revolt-result",
- "revolt-voice",
  "rmp-serde",
  "sentry",
  "serde",
@@ -6313,6 +6312,9 @@ dependencies = [
  "isahc",
  "iso8601-timestamp 0.2.17",
  "linkify 0.8.1",
+ "livekit-api",
+ "livekit-protocol",
+ "livekit-runtime",
  "log",
  "lru 0.11.1",
  "mongodb",
@@ -6375,7 +6377,6 @@ dependencies = [
  "revolt-permissions",
  "revolt-presence",
  "revolt-result",
- "revolt-voice",
  "revolt_rocket_okapi",
  "rocket",
  "rocket_authifier",
@@ -6538,24 +6539,6 @@ dependencies = [
  "utoipa",
 ]
 
-[[package]]
-name = "revolt-voice"
-version = "0.1.0"
-dependencies = [
- "async-std",
- "futures",
- "livekit-api",
- "livekit-protocol",
- "redis-kiss",
- "revolt-config",
- "revolt-database",
- "revolt-models",
- "revolt-permissions",
- "revolt-result",
- "serde",
- "serde_json",
-]
-
 [[package]]
 name = "revolt-voice-ingress"
 version = "0.7.1"
@@ -6573,7 +6556,6 @@ dependencies = [
  "revolt-models",
  "revolt-permissions",
  "revolt-result",
- "revolt-voice",
  "rmp-serde",
  "rocket",
  "rocket_empty",
diff --git a/crates/bonfire/Cargo.toml b/crates/bonfire/Cargo.toml
index 64c6507de..86627e3cb 100644
--- a/crates/bonfire/Cargo.toml
+++ b/crates/bonfire/Cargo.toml
@@ -43,7 +43,6 @@ revolt-config = { path = "../core/config" }
 revolt-database = { path = "../core/database" }
 revolt-permissions = { version = "0.8.1", path = "../core/permissions" }
 revolt-presence = { path = "../core/presence", features = ["redis-is-patched"] }
-revolt-voice = { path = "../core/voice" }
 
 # redis
 fred = { version = "8.0.1", features = ["subscriber-client"] }
diff --git a/crates/bonfire/src/config.rs b/crates/bonfire/src/config.rs
index 5642d3baa..04cfd5ca6 100644
--- a/crates/bonfire/src/config.rs
+++ b/crates/bonfire/src/config.rs
@@ -93,6 +93,7 @@ impl ProtocolConfiguration {
             ReadyPayloadFields::Channels,
             ReadyPayloadFields::Members,
             ReadyPayloadFields::Emoji,
+            ReadyPayloadFields::VoiceStates,
         ]
     }
 }
diff --git a/crates/bonfire/src/events/impl.rs b/crates/bonfire/src/events/impl.rs
index 714d9a8d7..5c974fb65 100644
--- a/crates/bonfire/src/events/impl.rs
+++ b/crates/bonfire/src/events/impl.rs
@@ -3,13 +3,13 @@ use std::collections::HashSet;
 use revolt_database::{
     events::client::{EventV1, ReadyPayloadFields},
     util::permissions::DatabasePermissionQuery,
+    voice::{delete_voice_state, get_voice_channel_members, get_voice_state, get_channel_voice_state},
     Channel, Database, Member, MemberCompositeKey, Presence, RelationshipStatus,
 };
 use revolt_models::v0;
 use revolt_permissions::{calculate_channel_permissions, ChannelPermission};
 use revolt_presence::filter_online;
 use revolt_result::Result;
-use revolt_voice::{delete_voice_state, get_voice_channel_members, get_voice_state};
 
 
 use super::state::{Cache, State};
@@ -236,7 +236,7 @@ impl State {
             let mut voice_states = Vec::new();
 
             for channel in &channels {
-                if let Ok(Some(voice_state)) = self.fetch_voice_state(channel).await {
+                if let Ok(Some(voice_state)) = get_channel_voice_state(channel).await {
                     voice_states.push(voice_state)
                 }
             }
@@ -464,6 +464,7 @@ impl State {
                 server,
                 channels,
                 emojis: _,
+                voice_states: _,
             } => {
                 self.insert_subscription(id.clone()).await;
 
@@ -637,32 +638,4 @@ impl State {
 
         true
     }
-
-    async fn fetch_voice_state(
-        &self,
-        channel: &Channel,
-    ) -> Result<Option<v0::ChannelVoiceState>> {
-        let members = get_voice_channel_members(&channel.id()).await?;
-
-        if !members.is_empty() {
-            let mut participants = Vec::with_capacity(members.len());
-
-            for user_id in members {
-                if let Some(voice_state) = get_voice_state(&channel.id(), channel.server().as_deref(), &user_id).await? {
-                    participants.push(voice_state);
-                } else {
-                    log::info!("Voice state not found but member in voice channel members, removing.");
-
-                    delete_voice_state(&channel.id(), channel.server().as_deref(),  &user_id).await?;
-                }
-            }
-
-            Ok(Some(v0::ChannelVoiceState {
-                id: channel.id().to_string(),
-                participants,
-            }))
-        } else {
-            Ok(None)
-        }
-    }
 }
diff --git a/crates/bonfire/src/main.rs b/crates/bonfire/src/main.rs
index 2cfeac921..3f68e4729 100644
--- a/crates/bonfire/src/main.rs
+++ b/crates/bonfire/src/main.rs
@@ -3,7 +3,7 @@ use std::{env, sync::Arc};
 use async_std::net::TcpListener;
 use revolt_presence::clear_region;
 use once_cell::sync::OnceCell;
-use revolt_voice::VoiceClient;
+use revolt_database::voice::VoiceClient;
 
 #[macro_use]
 extern crate log;
diff --git a/crates/core/database/Cargo.toml b/crates/core/database/Cargo.toml
index ba3de99ac..329217ffa 100644
--- a/crates/core/database/Cargo.toml
+++ b/crates/core/database/Cargo.toml
@@ -100,3 +100,8 @@ authifier = { version = "1.0.9", features = ["rocket_impl"] }
 
 # RabbitMQ
 amqprs = { version = "1.7.0" }
+
+# Voice
+livekit-api = "0.4.1"
+livekit-protocol = "0.3.6"
+livekit-runtime = { version = "0.3.1", features = ["tokio"] }
\ No newline at end of file
diff --git a/crates/core/database/src/events/client.rs b/crates/core/database/src/events/client.rs
index 9262d9996..6262f9da6 100644
--- a/crates/core/database/src/events/client.rs
+++ b/crates/core/database/src/events/client.rs
@@ -120,6 +120,7 @@ pub enum EventV1 {
         server: Server,
         channels: Vec<Channel>,
         emojis: Vec<Emoji>,
+        voice_states: Vec<ChannelVoiceState>
     },
 
     /// Update existing server
diff --git a/crates/core/database/src/lib.rs b/crates/core/database/src/lib.rs
index 9e26336d1..8889f196c 100644
--- a/crates/core/database/src/lib.rs
+++ b/crates/core/database/src/lib.rs
@@ -108,6 +108,9 @@ pub mod tasks;
 mod amqp;
 pub use amqp::amqp::AMQP;
 
+pub mod voice;
+
+
 /// Utility function to check if a boolean value is false
 pub fn if_false(t: &bool) -> bool {
     !t
diff --git a/crates/core/database/src/models/messages/model.rs b/crates/core/database/src/models/messages/model.rs
index 725d46d1d..d4991ed42 100644
--- a/crates/core/database/src/models/messages/model.rs
+++ b/crates/core/database/src/models/messages/model.rs
@@ -106,6 +106,8 @@ auto_derived!(
         MessagePinned { id: String, by: String },
         #[serde(rename = "message_unpinned")]
         MessageUnpinned { id: String, by: String },
+        #[serde(rename = "call_started")]
+        CallStarted { by: String },
     }
 
     /// Name and / or avatar override information
@@ -658,6 +660,9 @@ impl Message {
                             v0::SystemMessage::MessageUnpinned { by, .. } => {
                                 users.push(by.clone());
                             }
+                            v0::SystemMessage::CallStarted { by } => {
+                                users.push(by.clone())
+                            }
                         }
                     }
                     users
diff --git a/crates/core/database/src/models/server_members/model.rs b/crates/core/database/src/models/server_members/model.rs
index 0728c30a8..da33644f3 100644
--- a/crates/core/database/src/models/server_members/model.rs
+++ b/crates/core/database/src/models/server_members/model.rs
@@ -1,6 +1,7 @@
 use iso8601_timestamp::Timestamp;
 use revolt_permissions::{calculate_channel_permissions, ChannelPermission};
 use revolt_result::{create_error, Result};
+use crate::voice::get_channel_voice_state;
 
 use crate::{
     events::client::EventV1, if_false, util::permissions::DatabasePermissionQuery, Channel,
@@ -132,6 +133,14 @@ impl Member {
 
         let emojis = db.fetch_emoji_by_parent_id(&server.id).await?;
 
+        let mut voice_states = Vec::new();
+
+        for channel in &channels {
+            if let Ok(Some(voice_state)) = get_channel_voice_state(channel).await {
+                voice_states.push(voice_state)
+            }
+        }
+
         EventV1::ServerMemberJoin {
             id: server.id.clone(),
             user: user.id.clone(),
@@ -148,6 +157,7 @@ impl Member {
                 .map(|channel| channel.into())
                 .collect(),
             emojis: emojis.into_iter().map(|emoji| emoji.into()).collect(),
+            voice_states
         }
         .private(user.id.clone())
         .await;
diff --git a/crates/core/database/src/util/bridge/v0.rs b/crates/core/database/src/util/bridge/v0.rs
index c04af1554..1ad07a927 100644
--- a/crates/core/database/src/util/bridge/v0.rs
+++ b/crates/core/database/src/util/bridge/v0.rs
@@ -545,6 +545,7 @@ impl From<crate::SystemMessage> for SystemMessage {
             crate::SystemMessage::UserRemove { id, by } => Self::UserRemove { id, by },
             crate::SystemMessage::MessagePinned { id, by } => Self::MessagePinned { id, by },
             crate::SystemMessage::MessageUnpinned { id, by } => Self::MessageUnpinned { id, by },
+            crate::SystemMessage::CallStarted { by } => Self::CallStarted { by }
         }
     }
 }
diff --git a/crates/core/voice/src/lib.rs b/crates/core/database/src/voice/mod.rs
similarity index 53%
rename from crates/core/voice/src/lib.rs
rename to crates/core/database/src/voice/mod.rs
index c5bfc0f8b..2e59ca335 100644
--- a/crates/core/voice/src/lib.rs
+++ b/crates/core/database/src/voice/mod.rs
@@ -1,28 +1,25 @@
-use livekit_api::{
-    access_token::{AccessToken, VideoGrants},
-    services::room::{CreateRoomOptions, RoomClient, UpdateParticipantOptions},
-};
-use livekit_protocol::{ParticipantInfo, ParticipantPermission, Room};
+
 use redis_kiss::{get_connection, redis::Pipeline, AsyncCommands};
-use revolt_config::config;
-use revolt_database::{Channel, User};
+use crate::models::{Channel, User};
 use revolt_models::v0::{self, PartialUserVoiceState, UserVoiceState};
 use revolt_permissions::{ChannelPermission, PermissionValue};
 use revolt_result::{create_error, Result, ToRevoltError};
-use std::{collections::HashMap, time::Duration};
+
+mod voice_client;
+pub use voice_client::VoiceClient;
 
 pub async fn raise_if_in_voice(user: &User, target: &str) -> Result<()> {
     let mut conn = get_connection().await.to_internal_error()?;
 
     if user.bot.is_some()
     // bots can be in as many voice channels as it wants so we just check if its already connected to the one its trying to connect to
-        && conn.sismember(format!("vc-{}", &user.id), target)
+        && conn.sismember(format!("vc:{}", &user.id), target)
             .await
             .to_internal_error()?
     {
         Err(create_error!(AlreadyConnected))
     } else if conn
-        .scard::<_, u32>(format!("vc-{}", &user.id)) // check if the current vc set is empty
+        .scard::<_, u32>(format!("vc:{}", &user.id)) // check if the current vc set is empty
         .await
         .to_internal_error()?
         > 0
@@ -39,7 +36,7 @@ pub async fn get_user_voice_channel_in_server(
 ) -> Result<Option<String>> {
     let mut conn = get_connection().await.to_internal_error()?;
 
-    let unique_key = format!("{}-{}", user_id, server_id);
+    let unique_key = format!("{}:{}", user_id, server_id);
 
     conn.get::<&str, Option<String>>(&unique_key)
         .await
@@ -65,7 +62,7 @@ pub async fn create_voice_state(
     server_id: Option<&str>,
     user_id: &str,
 ) -> Result<UserVoiceState> {
-    let unique_key = format!("{}-{}", &user_id, server_id.unwrap_or(channel_id));
+    let unique_key = format!("{}:{}", &user_id, server_id.unwrap_or(channel_id));
 
     let voice_state = UserVoiceState {
         id: user_id.to_string(),
@@ -76,22 +73,22 @@ pub async fn create_voice_state(
     };
 
     Pipeline::new()
-        .sadd(format!("vc-members-{channel_id}"), user_id)
-        .sadd(format!("vc-{user_id}"), channel_id)
+        .sadd(format!("vc_members:{channel_id}"), user_id)
+        .sadd(format!("vc:{user_id}"), channel_id)
         .set(&unique_key, channel_id)
         .set(
-            format!("is_publishing-{unique_key}"),
+            format!("is_publishing:{unique_key}"),
             voice_state.is_publishing,
         )
         .set(
-            format!("is_receiving-{unique_key}"),
+            format!("is_receiving:{unique_key}"),
             voice_state.is_receiving,
         )
         .set(
-            format!("screensharing-{unique_key}"),
+            format!("screensharing:{unique_key}"),
             voice_state.screensharing,
         )
-        .set(format!("camera-{unique_key}"), voice_state.camera)
+        .set(format!("camera:{unique_key}"), voice_state.camera)
         .query_async(&mut get_connection().await.to_internal_error()?.into_inner())
         .await
         .to_internal_error()?;
@@ -104,16 +101,16 @@ pub async fn delete_voice_state(
     server_id: Option<&str>,
     user_id: &str,
 ) -> Result<()> {
-    let unique_key = format!("{}-{}", &user_id, server_id.unwrap_or(channel_id));
+    let unique_key = format!("{}:{}", &user_id, server_id.unwrap_or(channel_id));
 
     Pipeline::new()
-        .srem(format!("vc-members-{channel_id}"), user_id)
-        .srem(format!("vc-{user_id}"), channel_id)
+        .srem(format!("vc_members:{channel_id}"), user_id)
+        .srem(format!("vc:{user_id}"), channel_id)
         .del(&[
-            format!("is_publishing-{unique_key}"),
-            format!("is_receiving-{unique_key}"),
-            format!("screensharing-{unique_key}"),
-            format!("camera-{unique_key}"),
+            format!("is_publishing:{unique_key}"),
+            format!("is_receiving:{unique_key}"),
+            format!("screensharing:{unique_key}"),
+            format!("camera:{unique_key}"),
             unique_key.clone(),
         ])
         .query_async(&mut get_connection().await.to_internal_error()?.into_inner())
@@ -161,24 +158,24 @@ pub async fn update_voice_state(
     user_id: &str,
     partial: &PartialUserVoiceState,
 ) -> Result<()> {
-    let unique_key = format!("{}-{}", &user_id, server_id.unwrap_or(channel_id));
+    let unique_key = format!("{}:{}", &user_id, server_id.unwrap_or(channel_id));
 
     let mut pipeline = Pipeline::new();
 
     if let Some(camera) = &partial.camera {
-        pipeline.set(format!("camera-{unique_key}"), camera);
+        pipeline.set(format!("camera:{unique_key}"), camera);
     };
 
     if let Some(is_publishing) = &partial.is_publishing {
-        pipeline.set(format!("is_publishing-{unique_key}"), is_publishing);
+        pipeline.set(format!("is_publishing:{unique_key}"), is_publishing);
     }
 
     if let Some(is_receiving) = &partial.is_receiving {
-        pipeline.set(format!("is_receiving-{unique_key}"), is_receiving);
+        pipeline.set(format!("is_receiving:{unique_key}"), is_receiving);
     }
 
     if let Some(screensharing) = &partial.screensharing {
-        pipeline.set(format!("screensharing-{unique_key}"), screensharing);
+        pipeline.set(format!("screensharing:{unique_key}"), screensharing);
     }
 
     pipeline
@@ -193,7 +190,7 @@ pub async fn get_voice_channel_members(channel_id: &str) -> Result<Vec<String>>
     get_connection()
         .await
         .to_internal_error()?
-        .smembers::<_, Vec<String>>(format!("vc-members-{}", channel_id))
+        .smembers::<_, Vec<String>>(format!("vc_members:{}", channel_id))
         .await
         .to_internal_error()
 }
@@ -203,16 +200,16 @@ pub async fn get_voice_state(
     server_id: Option<&str>,
     user_id: &str,
 ) -> Result<Option<UserVoiceState>> {
-    let unique_key = format!("{}-{user_id}", server_id.unwrap_or(channel_id));
+    let unique_key = format!("{}:{user_id}", server_id.unwrap_or(channel_id));
 
     let (is_publishing, is_receiving, screensharing, camera) = get_connection()
         .await
         .to_internal_error()?
         .mget::<_, (Option<bool>, Option<bool>, Option<bool>, Option<bool>)>(&[
-            format!("is_publishing-{unique_key}"),
-            format!("is_receiving-{unique_key}"),
-            format!("screensharing-{unique_key}"),
-            format!("camera-{unique_key}"),
+            format!("is_publishing:{unique_key}"),
+            format!("is_receiving:{unique_key}"),
+            format!("screensharing:{unique_key}"),
+            format!("camera:{unique_key}"),
         ])
         .await
         .to_internal_error()?;
@@ -231,92 +228,32 @@ pub async fn get_voice_state(
     }
 }
 
-#[derive(Debug)]
-pub struct VoiceClient {
-    rooms: RoomClient,
-    api_key: String,
-    api_secret: String,
-}
+pub async fn get_channel_voice_state(channel: &Channel) -> Result<Option<v0::ChannelVoiceState>> {
+    let members = get_voice_channel_members(channel.id()).await?;
 
-impl VoiceClient {
-    pub fn new(url: String, api_key: String, api_secret: String) -> Self {
-        Self {
-            rooms: RoomClient::with_api_key(&url, &api_key, &api_secret),
-            api_key,
-            api_secret,
-        }
-    }
+    let server = match channel {
+        Channel::TextChannel { server, .. } | Channel::VoiceChannel { server, .. } => Some(server.as_str()),
+        _ => None
+    };
 
-    pub async fn from_revolt_config() -> Self {
-        let config = config().await;
+    if !members.is_empty() {
+        let mut participants = Vec::with_capacity(members.len());
 
-        Self::new(
-            config.hosts.livekit,
-            config.api.livekit.key,
-            config.api.livekit.secret,
-        )
-    }
+        for user_id in members {
+            if let Some(voice_state) = get_voice_state(channel.id(), server, &user_id).await? {
+                participants.push(voice_state);
+            } else {
+                log::info!("Voice state not found but member in voice channel members, removing.");
 
-    pub fn create_token(
-        &self,
-        user: &User,
-        permissions: PermissionValue,
-        channel: &Channel,
-    ) -> Result<String> {
-        let allowed_sources = get_allowed_sources(permissions);
-
-        AccessToken::with_api_key(&self.api_key, &self.api_secret)
-            .with_name(&format!("{}#{}", user.username, user.discriminator))
-            .with_identity(&user.id)
-            .with_metadata(&serde_json::to_string(&user).to_internal_error()?)
-            .with_ttl(Duration::from_secs(10))
-            .with_grants(VideoGrants {
-                room_join: true,
-                can_publish_sources: allowed_sources.into_iter().map(ToString::to_string).collect(),
-                can_subscribe: permissions.has_channel_permission(ChannelPermission::Listen),
-                room: channel.id().to_string(),
-                ..Default::default()
-            })
-            .to_jwt()
-            .to_internal_error()
-    }
-
-    pub async fn create_room(&self, channel: &Channel) -> Result<Room> {
-        let voice = channel
-            .voice()
-            .ok_or_else(|| create_error!(NotAVoiceChannel))?;
-
-        self.rooms
-            .create_room(
-                channel.id(),
-                CreateRoomOptions {
-                    max_participants: voice.max_users.unwrap_or(u32::MAX),
-                    empty_timeout: 5 * 60, // 5 minutes
-                    ..Default::default()
-                },
-            )
-            .await
-            .to_internal_error()
-    }
+                delete_voice_state(channel.id(), server,  &user_id).await?;
+            }
+        }
 
-    pub async fn update_permissions(
-        &self,
-        user: &User,
-        channel_id: &str,
-        new_permissions: ParticipantPermission,
-    ) -> Result<ParticipantInfo> {
-        self.rooms
-            .update_participant(
-                channel_id,
-                &user.id,
-                UpdateParticipantOptions {
-                    permission: Some(new_permissions),
-                    attributes: HashMap::new(),
-                    name: "".to_string(),
-                    metadata: "".to_string(),
-                },
-            )
-            .await
-            .to_internal_error()
+        Ok(Some(v0::ChannelVoiceState {
+            id: channel.id().to_string(),
+            participants,
+        }))
+    } else {
+        Ok(None)
     }
 }
diff --git a/crates/core/database/src/voice/voice_client.rs b/crates/core/database/src/voice/voice_client.rs
new file mode 100644
index 000000000..0aa78ec20
--- /dev/null
+++ b/crates/core/database/src/voice/voice_client.rs
@@ -0,0 +1,108 @@
+use livekit_api::{
+    access_token::{AccessToken, VideoGrants},
+    services::room::{CreateRoomOptions, RoomClient, UpdateParticipantOptions},
+};
+use livekit_protocol::{ParticipantInfo, ParticipantPermission, Room};
+use revolt_config::config;
+use crate::models::{Channel, User};
+use revolt_models::v0;
+use revolt_permissions::{ChannelPermission, PermissionValue};
+use revolt_result::{create_error, Result, ToRevoltError};
+use std::{borrow::Cow, collections::HashMap, time::Duration};
+
+use super::get_allowed_sources;
+
+#[derive(Debug)]
+pub struct VoiceClient {
+    rooms: RoomClient,
+    api_key: String,
+    api_secret: String,
+}
+
+impl VoiceClient {
+    pub fn new(url: String, api_key: String, api_secret: String) -> Self {
+        Self {
+            rooms: RoomClient::with_api_key(&url, &api_key, &api_secret),
+            api_key,
+            api_secret,
+        }
+    }
+
+    pub async fn from_revolt_config() -> Self {
+        let config = config().await;
+
+        Self::new(
+            config.hosts.livekit,
+            config.api.livekit.key,
+            config.api.livekit.secret,
+        )
+    }
+
+    pub fn create_token(
+        &self,
+        user: &User,
+        permissions: PermissionValue,
+        channel: &Channel,
+    ) -> Result<String> {
+        let allowed_sources = get_allowed_sources(permissions);
+
+        AccessToken::with_api_key(&self.api_key, &self.api_secret)
+            .with_name(&format!("{}#{}", user.username, user.discriminator))
+            .with_identity(&user.id)
+            .with_metadata(&serde_json::to_string(&user).to_internal_error()?)
+            .with_ttl(Duration::from_secs(10))
+            .with_grants(VideoGrants {
+                room_join: true,
+                can_publish: true,
+                can_publish_sources: vec![], // allowed_sources.into_iter().map(ToString::to_string).collect(),
+                can_subscribe: permissions.has_channel_permission(ChannelPermission::Listen),
+                room: channel.id().to_string(),
+                ..Default::default()
+            })
+            .to_jwt()
+            .to_internal_error()
+    }
+
+    pub async fn create_room(&self, channel: &Channel) -> Result<Room> {
+        let voice = match channel {
+            Channel::DirectMessage { .. } | Channel::VoiceChannel { .. } => Some(Cow::Owned(v0::VoiceInformation::default())),
+            Channel::TextChannel { voice: Some(voice), .. } => Some(Cow::Borrowed(voice)),
+            _ => None
+        }
+
+            .ok_or_else(|| create_error!(NotAVoiceChannel))?;
+
+        self.rooms
+            .create_room(
+                channel.id(),
+                CreateRoomOptions {
+                    max_participants: voice.max_users.unwrap_or(u32::MAX),
+                    empty_timeout: 5 * 60, // 5 minutes
+                    ..Default::default()
+                },
+            )
+            .await
+            .to_internal_error()
+    }
+
+    pub async fn update_permissions(
+        &self,
+        user: &User,
+        channel_id: &str,
+        new_permissions: ParticipantPermission,
+    ) -> Result<ParticipantInfo> {
+        self.rooms
+            .update_participant(
+                channel_id,
+                &user.id,
+                UpdateParticipantOptions {
+                    permission: Some(new_permissions),
+                    attributes: HashMap::new(),
+                    name: "".to_string(),
+                    metadata: "".to_string(),
+                },
+            )
+            .await
+            .to_internal_error()
+    }
+}
diff --git a/crates/core/models/src/v0/messages.rs b/crates/core/models/src/v0/messages.rs
index b8c53aeed..21541984b 100644
--- a/crates/core/models/src/v0/messages.rs
+++ b/crates/core/models/src/v0/messages.rs
@@ -134,6 +134,8 @@ auto_derived!(
         MessagePinned { id: String, by: String },
         #[serde(rename = "message_unpinned")]
         MessageUnpinned { id: String, by: String },
+        #[serde(rename = "call_started")]
+        CallStarted { by: String },
     }
 
     /// Name and / or avatar override information
@@ -438,6 +440,7 @@ impl From<SystemMessage> for String {
             }
             SystemMessage::MessagePinned { .. } => "Message pinned.".to_string(),
             SystemMessage::MessageUnpinned { .. } => "Message unpinned.".to_string(),
+            SystemMessage::CallStarted { .. } => "Call started.".to_string(),
         }
     }
 }
diff --git a/crates/core/result/src/lib.rs b/crates/core/result/src/lib.rs
index 36dda5ac0..8c04b7098 100644
--- a/crates/core/result/src/lib.rs
+++ b/crates/core/result/src/lib.rs
@@ -218,6 +218,7 @@ pub trait ToRevoltError<T> {
 }
 
 impl<T, E: std::fmt::Debug> ToRevoltError<T> for Result<T, E> {
+    #[track_caller]
     fn to_internal_error(self) -> Result<T, Error> {
         self
         .inspect_err(|e| log::error!("{e:?}"))
@@ -233,6 +234,7 @@ impl<T, E: std::fmt::Debug> ToRevoltError<T> for Result<T, E> {
 }
 
 impl<T> ToRevoltError<T> for Option<T> {
+    #[track_caller]
     fn to_internal_error(self) -> Result<T, Error> {
         self.ok_or_else(|| {
             let loc = Location::caller();
diff --git a/crates/core/voice/Cargo.toml b/crates/core/voice/Cargo.toml
deleted file mode 100644
index b43e4bf47..000000000
--- a/crates/core/voice/Cargo.toml
+++ /dev/null
@@ -1,33 +0,0 @@
-[package]
-name = "revolt-voice"
-version = "0.1.0"
-edition = "2021"
-
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
-[dependencies]
-# voice
-livekit-api = "0.4.1"
-livekit-protocol = "0.3.6"
-
-# core
-revolt-result = { path = "../result" }
-revolt-models = { path = "../models" }
-revolt-config = { path = "../config" }
-revolt-database = { path = "../database" }
-revolt-permissions = { path = "../permissions" }
-
-# async
-futures = "0.3.21"
-async-std = { version = "1.8.0", features = [
-    "tokio1",
-    "tokio02",
-    "attributes",
-] }
-
-# util
-redis-kiss = "0.1.4"
-
-# serde
-serde_json = "1.0.79"
-serde = "1.0.136"
diff --git a/crates/daemons/voice-ingress/Cargo.toml b/crates/daemons/voice-ingress/Cargo.toml
index a2aea7aa5..93eee95bd 100644
--- a/crates/daemons/voice-ingress/Cargo.toml
+++ b/crates/daemons/voice-ingress/Cargo.toml
@@ -37,7 +37,6 @@ revolt-models = { path = "../../core/models" }
 revolt-config = { path = "../../core/config" }
 revolt-database = { path = "../../core/database" }
 revolt-permissions = { path = "../../core/permissions" }
-revolt-voice = { path = "../../core/voice" }
 
 # voice
 livekit-api = "0.4.1"
diff --git a/crates/daemons/voice-ingress/src/main.rs b/crates/daemons/voice-ingress/src/main.rs
index f4c9f8770..91abe3215 100644
--- a/crates/daemons/voice-ingress/src/main.rs
+++ b/crates/daemons/voice-ingress/src/main.rs
@@ -4,8 +4,8 @@ use std::env;
 use livekit_protocol::WebhookEvent;
 use revolt_database::{
     events::client::EventV1, util::reference::Reference, Database, DatabaseInfo,
+    voice::{create_voice_state, delete_voice_state, update_voice_state_tracks, VoiceClient}
 };
-use revolt_voice::{create_voice_state, delete_voice_state, update_voice_state_tracks, VoiceClient};
 use rocket::{build, post, routes, serde::json::Json, Config, State};
 use rocket_empty::EmptyResponse;
 
diff --git a/crates/delta/Cargo.toml b/crates/delta/Cargo.toml
index 0039f8ff9..5de0a2c03 100644
--- a/crates/delta/Cargo.toml
+++ b/crates/delta/Cargo.toml
@@ -80,7 +80,6 @@ revolt-models = { path = "../core/models", features = [
 revolt-presence = { path = "../core/presence" }
 revolt-result = { path = "../core/result", features = ["rocket", "okapi"] }
 revolt-permissions = { path = "../core/permissions", features = ["schemas"] }
-revolt-voice = { path = "../core/voice" }
 
 # voice
 livekit-api = "0.4.1"
diff --git a/crates/delta/src/main.rs b/crates/delta/src/main.rs
index 245d77860..f9feb40b3 100644
--- a/crates/delta/src/main.rs
+++ b/crates/delta/src/main.rs
@@ -24,7 +24,7 @@ use amqprs::{
 use async_std::channel::unbounded;
 use authifier::AuthifierEvent;
 use rocket::data::ToByteUnit;
-use livekit_api::services::room::RoomClient;
+use revolt_database::voice::VoiceClient;
 
 pub async fn web() -> Rocket<Build> {
     // Get settings
@@ -84,7 +84,7 @@ pub async fn web() -> Rocket<Build> {
     .into();
 
     // Voice handler
-    let voice_client = revolt_voice::VoiceClient::new(config.api.livekit.url.clone(), config.api.livekit.key.clone(), config.api.livekit.secret.clone());
+    let voice_client = VoiceClient::new(config.api.livekit.url.clone(), config.api.livekit.key.clone(), config.api.livekit.secret.clone());
     // Configure Rabbit
     let connection = Connection::open(&OpenConnectionArguments::new(
         &config.rabbit.host,
diff --git a/crates/delta/src/routes/channels/voice_join.rs b/crates/delta/src/routes/channels/voice_join.rs
index 460b362da..c2f9f3096 100644
--- a/crates/delta/src/routes/channels/voice_join.rs
+++ b/crates/delta/src/routes/channels/voice_join.rs
@@ -1,8 +1,7 @@
 use revolt_models::v0;
-use revolt_database::{util::{permissions::perms, reference::Reference}, Database, User};
+use revolt_database::{util::{permissions::perms, reference::Reference}, voice::{raise_if_in_voice, VoiceClient}, Channel, Database, SystemMessage, User, AMQP};
 use revolt_permissions::{calculate_channel_permissions, ChannelPermission};
 use revolt_result::Result;
-use revolt_voice::{VoiceClient, raise_if_in_voice};
 
 use rocket::{serde::json::Json, State};
 
@@ -11,10 +10,10 @@ use rocket::{serde::json::Json, State};
 /// Asks the voice server for a token to join the call.
 #[openapi(tag = "Voice")]
 #[post("/<target>/join_call")]
-pub async fn call(db: &State<Database>, voice: &State<VoiceClient>, user: User, target: Reference) -> Result<Json<v0::CreateVoiceUserResponse>> {
+pub async fn call(db: &State<Database>, amqp: &State<AMQP>, voice: &State<VoiceClient>, user: User, target: Reference) -> Result<Json<v0::CreateVoiceUserResponse>> {
     let channel = target.as_channel(db).await?;
 
-    raise_if_in_voice(&user, &channel.id()).await?;
+    raise_if_in_voice(&user, channel.id()).await?;
 
     let mut permissions = perms(db, &user).channel(&channel);
 
@@ -24,7 +23,28 @@ pub async fn call(db: &State<Database>, voice: &State<VoiceClient>, user: User,
     let token = voice.create_token(&user, current_permissions, &channel)?;
     let room = voice.create_room(&channel).await?;
 
-    log::debug!("created room {}", room.name);
+    log::debug!("Created room {}", room.name);
+
+    match &channel {
+        Channel::DirectMessage { .. } | Channel::Group { .. } => {
+            SystemMessage::CallStarted {
+                by: user.id.clone()
+            }
+            .into_message(channel.id().to_string())
+            .send(
+                db,
+                Some(amqp),
+                v0::MessageAuthor::System {
+                    username: &user.username,
+                    avatar: user.avatar.as_ref().map(|file| file.id.as_ref()),
+                },
+                None,
+                None,
+                &channel, false
+            ).await?;
+        }
+        _ => {}
+    };
 
     Ok(Json(v0::CreateVoiceUserResponse { token }))
 }
diff --git a/crates/delta/src/routes/servers/ban_create.rs b/crates/delta/src/routes/servers/ban_create.rs
index 09666ac48..309b53f69 100644
--- a/crates/delta/src/routes/servers/ban_create.rs
+++ b/crates/delta/src/routes/servers/ban_create.rs
@@ -1,5 +1,6 @@
 use revolt_database::{
     util::{permissions::DatabasePermissionQuery, reference::Reference},
+    voice::{delete_voice_state, get_user_voice_channel_in_server, VoiceClient},
     Database, RemovalIntention, ServerBan, User,
 };
 use revolt_models::v0;
@@ -8,7 +9,6 @@ use revolt_permissions::{
     calculate_server_permissions, ChannelPermission,
 };
 use revolt_result::{create_error, Result};
-use revolt_voice::{delete_voice_state, get_user_voice_channel_in_server, VoiceClient};
 use rocket::{serde::json::Json, State};
 use validator::Validate;
 
diff --git a/crates/delta/src/routes/servers/member_edit.rs b/crates/delta/src/routes/servers/member_edit.rs
index 5fb71a14d..e20fa8460 100644
--- a/crates/delta/src/routes/servers/member_edit.rs
+++ b/crates/delta/src/routes/servers/member_edit.rs
@@ -7,13 +7,13 @@ use redis_kiss::{get_connection, redis::Pipeline, AsyncCommands};
 use revolt_database::{
     events::client::EventV1,
     util::{permissions::DatabasePermissionQuery, reference::Reference},
+    voice::VoiceClient,
     Database, File, PartialMember, User,
 };
 use revolt_models::v0::{self, FieldsMember, PartialUserVoiceState};
 
 use revolt_permissions::{calculate_server_permissions, ChannelPermission};
 use revolt_result::{create_error, Result, ToRevoltError};
-use revolt_voice::VoiceClient;
 use rocket::{form::validate::Contains, serde::json::Json, State};
 use validator::Validate;
 
diff --git a/crates/delta/src/routes/servers/roles_delete.rs b/crates/delta/src/routes/servers/roles_delete.rs
index 3f1e5b509..881ef6cb5 100644
--- a/crates/delta/src/routes/servers/roles_delete.rs
+++ b/crates/delta/src/routes/servers/roles_delete.rs
@@ -1,11 +1,12 @@
 use livekit_protocol::ParticipantPermission;
 use revolt_database::{
-    util::{permissions::DatabasePermissionQuery, reference::Reference}, Channel, Database, User
+    util::{permissions::DatabasePermissionQuery, reference::Reference},
+    voice::{get_allowed_sources, get_voice_channel_members, get_voice_state, update_voice_state, VoiceClient},
+    Channel, Database, User
 };
 use revolt_models::v0::PartialUserVoiceState;
 use revolt_permissions::{calculate_channel_permissions, calculate_server_permissions, ChannelPermission};
 use revolt_result::{create_error, Result};
-use revolt_voice::{get_allowed_sources, get_voice_channel_members, get_voice_state, update_voice_state, VoiceClient};
 use rocket::State;
 use rocket_empty::EmptyResponse;
 
diff --git a/crates/delta/src/routes/servers/roles_edit.rs b/crates/delta/src/routes/servers/roles_edit.rs
index 46d22314a..7b211d0f2 100644
--- a/crates/delta/src/routes/servers/roles_edit.rs
+++ b/crates/delta/src/routes/servers/roles_edit.rs
@@ -1,11 +1,12 @@
 use livekit_protocol::ParticipantPermission;
 use revolt_database::{
-    util::{permissions::DatabasePermissionQuery, reference::Reference}, Channel, Database, PartialRole, User
+    util::{permissions::DatabasePermissionQuery, reference::Reference},
+    voice::{get_allowed_sources, get_voice_channel_members, get_voice_state, update_voice_state, update_voice_state_tracks, VoiceClient},
+    Channel, Database, PartialRole, User
 };
 use revolt_models::v0::{self, PartialUserVoiceState};
 use revolt_permissions::{calculate_channel_permissions, calculate_server_permissions, ChannelPermission, PermissionQuery};
 use revolt_result::{create_error, Result};
-use revolt_voice::{get_allowed_sources, get_voice_channel_members, get_voice_state, update_voice_state, update_voice_state_tracks, VoiceClient};
 use rocket::{serde::json::Json, State};
 use serde::{Deserialize, Serialize};
 use validator::Validate;

From c8ae34ba73fa59b2376ebd2cc8c884e2d3c4c0bd Mon Sep 17 00:00:00 2001
From: Zomatree <me@zomatree.live>
Date: Tue, 28 Jan 2025 15:55:21 +0000
Subject: [PATCH 10/62] feat: implement missing permission syncs

---
 crates/core/database/src/events/client.rs     |   5 +
 crates/core/database/src/voice/mod.rs         | 125 ++++++++++++++++--
 .../core/database/src/voice/voice_client.rs   |   6 +
 crates/core/result/src/lib.rs                 |  21 ++-
 .../src/routes/channels/channel_delete.rs     |  25 ++--
 .../routes/channels/group_remove_member.rs    |  56 ++++----
 .../src/routes/channels/permissions_set.rs    |  16 ++-
 .../channels/permissions_set_default.rs       |  11 +-
 crates/delta/src/routes/servers/ban_create.rs |   3 +-
 .../delta/src/routes/servers/member_edit.rs   |  79 ++---------
 .../delta/src/routes/servers/member_remove.rs |   7 +
 .../src/routes/servers/permissions_set.rs     |  10 +-
 .../routes/servers/permissions_set_default.rs |  10 +-
 .../delta/src/routes/servers/roles_delete.rs  |  48 +------
 crates/delta/src/routes/servers/roles_edit.rs |  53 +-------
 .../delta/src/routes/servers/server_delete.rs |  19 ++-
 16 files changed, 266 insertions(+), 228 deletions(-)

diff --git a/crates/core/database/src/events/client.rs b/crates/core/database/src/events/client.rs
index 6262f9da6..99781ea43 100644
--- a/crates/core/database/src/events/client.rs
+++ b/crates/core/database/src/events/client.rs
@@ -254,6 +254,11 @@ pub enum EventV1 {
         id: String,
         user: String,
     },
+    VoiceChannelMove {
+        user: String,
+        from: String,
+        to: String,
+    },
     UserVoiceStateUpdate {
         id: String,
         channel_id: String,
diff --git a/crates/core/database/src/voice/mod.rs b/crates/core/database/src/voice/mod.rs
index 2e59ca335..996ee5054 100644
--- a/crates/core/database/src/voice/mod.rs
+++ b/crates/core/database/src/voice/mod.rs
@@ -1,15 +1,20 @@
 
-use redis_kiss::{get_connection, redis::Pipeline, AsyncCommands};
-use crate::models::{Channel, User};
+use livekit_protocol::ParticipantPermission;
+use redis_kiss::{get_connection as _get_connection, Conn, redis::Pipeline, AsyncCommands};
+use crate::{events::client::EventV1, models::{Channel, User}, util::{permissions::DatabasePermissionQuery, reference::Reference}, Database, Role, Server};
 use revolt_models::v0::{self, PartialUserVoiceState, UserVoiceState};
-use revolt_permissions::{ChannelPermission, PermissionValue};
+use revolt_permissions::{calculate_channel_permissions, ChannelPermission, PermissionValue};
 use revolt_result::{create_error, Result, ToRevoltError};
 
 mod voice_client;
 pub use voice_client::VoiceClient;
 
+async fn get_connection() -> Result<Conn> {
+    _get_connection().await.to_internal_error()
+}
+
 pub async fn raise_if_in_voice(user: &User, target: &str) -> Result<()> {
-    let mut conn = get_connection().await.to_internal_error()?;
+    let mut conn = get_connection().await?;
 
     if user.bot.is_some()
     // bots can be in as many voice channels as it wants so we just check if its already connected to the one its trying to connect to
@@ -30,11 +35,27 @@ pub async fn raise_if_in_voice(user: &User, target: &str) -> Result<()> {
     }
 }
 
+pub async fn get_user_voice_channels(user_id: &str) -> Result<Vec<String>> {
+    get_connection()
+        .await?
+        .smembers(format!("vc:{user_id}"))
+        .await
+        .to_internal_error()
+}
+
+pub async fn is_in_voice_channel(user_id: &str, channel_id: &str) -> Result<bool> {
+    get_connection()
+        .await?
+        .sismember(format!("vc:{}", user_id), channel_id)
+        .await
+        .to_internal_error()
+}
+
 pub async fn get_user_voice_channel_in_server(
     user_id: &str,
     server_id: &str,
 ) -> Result<Option<String>> {
-    let mut conn = get_connection().await.to_internal_error()?;
+    let mut conn = get_connection().await?;
 
     let unique_key = format!("{}:{}", user_id, server_id);
 
@@ -89,7 +110,7 @@ pub async fn create_voice_state(
             voice_state.screensharing,
         )
         .set(format!("camera:{unique_key}"), voice_state.camera)
-        .query_async(&mut get_connection().await.to_internal_error()?.into_inner())
+        .query_async(&mut get_connection().await?.into_inner())
         .await
         .to_internal_error()?;
 
@@ -113,7 +134,7 @@ pub async fn delete_voice_state(
             format!("camera:{unique_key}"),
             unique_key.clone(),
         ])
-        .query_async(&mut get_connection().await.to_internal_error()?.into_inner())
+        .query_async(&mut get_connection().await?.into_inner())
         .await
         .to_internal_error()?;
 
@@ -179,7 +200,7 @@ pub async fn update_voice_state(
     }
 
     pipeline
-        .query_async(&mut get_connection().await.to_internal_error()?.into_inner())
+        .query_async(&mut get_connection().await?.into_inner())
         .await
         .to_internal_error()?;
 
@@ -188,8 +209,7 @@ pub async fn update_voice_state(
 
 pub async fn get_voice_channel_members(channel_id: &str) -> Result<Vec<String>> {
     get_connection()
-        .await
-        .to_internal_error()?
+        .await?
         .smembers::<_, Vec<String>>(format!("vc_members:{}", channel_id))
         .await
         .to_internal_error()
@@ -203,8 +223,7 @@ pub async fn get_voice_state(
     let unique_key = format!("{}:{user_id}", server_id.unwrap_or(channel_id));
 
     let (is_publishing, is_receiving, screensharing, camera) = get_connection()
-        .await
-        .to_internal_error()?
+        .await?
         .mget::<_, (Option<bool>, Option<bool>, Option<bool>, Option<bool>)>(&[
             format!("is_publishing:{unique_key}"),
             format!("is_receiving:{unique_key}"),
@@ -257,3 +276,85 @@ pub async fn get_channel_voice_state(channel: &Channel) -> Result<Option<v0::Cha
         Ok(None)
     }
 }
+
+pub async fn move_user(user: &str, from: &str, to: &str) -> Result<()> {
+    get_connection()
+        .await?
+        .smove(
+            format!("vc-members-{from}"),
+            format!("vc-members-{to}"),
+            user,
+        )
+        .await
+        .to_internal_error()?;
+
+    Ok(())
+}
+
+pub async fn sync_voice_permissions(db: &Database, voice_client: &VoiceClient, channel: &Channel, server: Option<&Server>, role_id: Option<&str>) -> Result<()> {
+
+    for user_id in get_voice_channel_members(channel.id()).await? {
+        let user = Reference::from_unchecked(user_id.clone()).as_user(db).await?;
+
+        sync_user_voice_permissions(db, voice_client, &user, channel, server, role_id).await?;
+    };
+
+    Ok(())
+}
+
+pub async fn sync_user_voice_permissions(db: &Database, voice_client: &VoiceClient, user: &User, channel: &Channel, server: Option<&Server>, role_id: Option<&str>) -> Result<()> {
+    let channel_id = channel.id();
+    let server_id: Option<&str> = server.as_ref().map(|s| s.id.as_str());
+
+    let member = match server_id {
+        Some(server_id) => Some(Reference::from_unchecked(user.id.clone()).as_member(db, server_id).await?),
+        None => None
+    };
+
+    if role_id.is_none_or(|role_id| member.as_ref().is_none_or(|member| member.roles.iter().any(|r| r == role_id))) {
+        let voice_state = get_voice_state(channel_id, server_id, &user.id).await?.unwrap();
+
+        let mut query = DatabasePermissionQuery::new(db, user)
+            .channel(channel);
+
+        if let (Some(server), Some(member)) = (server, member.as_ref()) {
+                query = query.member(member).server(server)
+        }
+
+        let permissions = calculate_channel_permissions(&mut query).await;
+
+        let mut update_event = PartialUserVoiceState {
+            id: Some(user.id.clone()),
+            ..Default::default()
+        };
+
+        let before = update_event.clone();
+
+        let can_video = permissions.has_channel_permission(ChannelPermission::Video);
+        let can_speak = permissions.has_channel_permission(ChannelPermission::Speak);
+        let can_listen = permissions.has_channel_permission(ChannelPermission::Listen);
+
+        update_event.camera = voice_state.camera.then_some(can_video);
+        update_event.screensharing = voice_state.screensharing.then_some(can_video);
+        update_event.is_publishing = voice_state.is_publishing.then_some(can_speak);
+
+        update_voice_state(channel_id, server_id, &user.id, &update_event).await?;
+
+        voice_client.update_permissions(user, channel_id, ParticipantPermission {
+            can_subscribe: can_listen,
+            can_publish: can_speak,
+            can_publish_data: can_speak,
+            ..Default::default()
+        }).await?;
+
+        if update_event != before {
+            EventV1::UserVoiceStateUpdate {
+                id: user.id.clone(),
+                channel_id: channel_id.to_string(),
+                data: update_event
+            }.p(channel_id.to_string()).await;
+        };
+    };
+
+    Ok(())
+}
\ No newline at end of file
diff --git a/crates/core/database/src/voice/voice_client.rs b/crates/core/database/src/voice/voice_client.rs
index 0aa78ec20..4f540870b 100644
--- a/crates/core/database/src/voice/voice_client.rs
+++ b/crates/core/database/src/voice/voice_client.rs
@@ -105,4 +105,10 @@ impl VoiceClient {
             .await
             .to_internal_error()
     }
+
+    pub async fn remove_user(&self, user: &User, channel_id: &str) -> Result<()> {
+        self.rooms.remove_participant(channel_id, &user.id)
+            .await
+            .to_internal_error()
+    }
 }
diff --git a/crates/core/result/src/lib.rs b/crates/core/result/src/lib.rs
index 8c04b7098..e9d4f24b2 100644
--- a/crates/core/result/src/lib.rs
+++ b/crates/core/result/src/lib.rs
@@ -220,25 +220,24 @@ pub trait ToRevoltError<T> {
 impl<T, E: std::fmt::Debug> ToRevoltError<T> for Result<T, E> {
     #[track_caller]
     fn to_internal_error(self) -> Result<T, Error> {
-        self
-        .inspect_err(|e| log::error!("{e:?}"))
-        .map_err(|_| {
-            let loc = Location::caller();
+        let loc = Location::caller();
 
-            Error {
-                error_type: ErrorType::InternalError,
-                location: format!("{}:{}:{}", loc.file(), loc.line(), loc.column())
-            }
-        })
+        self
+            .map_err(|_| {
+                Error {
+                    error_type: ErrorType::InternalError,
+                    location: format!("{}:{}:{}", loc.file(), loc.line(), loc.column())
+                }
+            })
     }
 }
 
 impl<T> ToRevoltError<T> for Option<T> {
     #[track_caller]
     fn to_internal_error(self) -> Result<T, Error> {
-        self.ok_or_else(|| {
-            let loc = Location::caller();
+        let loc = Location::caller();
 
+        self.ok_or_else(|| {
             Error {
                 error_type: ErrorType::InternalError,
                 location: format!("{}:{}:{}", loc.file(), loc.line(), loc.column())
diff --git a/crates/delta/src/routes/channels/channel_delete.rs b/crates/delta/src/routes/channels/channel_delete.rs
index 86dea166c..8c8dd5db8 100644
--- a/crates/delta/src/routes/channels/channel_delete.rs
+++ b/crates/delta/src/routes/channels/channel_delete.rs
@@ -1,6 +1,5 @@
 use revolt_database::{
-    util::{permissions::DatabasePermissionQuery, reference::Reference},
-    Channel, Database, PartialChannel, User, AMQP,
+    util::{permissions::DatabasePermissionQuery, reference::Reference}, voice::{delete_voice_state, get_voice_channel_members, VoiceClient}, Channel, Database, PartialChannel, User, AMQP
 };
 use revolt_models::v0;
 use revolt_permissions::{calculate_channel_permissions, ChannelPermission};
@@ -15,6 +14,7 @@ use rocket_empty::EmptyResponse;
 #[delete("/<target>?<options..>")]
 pub async fn delete(
     db: &State<Database>,
+    voice_client: &State<VoiceClient>,
     amqp: &State<AMQP>,
     user: User,
     target: Reference,
@@ -27,7 +27,7 @@ pub async fn delete(
     permissions.throw_if_lacking_channel_permission(ChannelPermission::ViewChannel)?;
 
     match &channel {
-        Channel::SavedMessages { .. } => Err(create_error!(NoEffect)),
+        Channel::SavedMessages { .. } => Err(create_error!(NoEffect))?,
         Channel::DirectMessage { .. } => channel
             .update(
                 db,
@@ -37,8 +37,7 @@ pub async fn delete(
                 },
                 vec![],
             )
-            .await
-            .map(|_| EmptyResponse),
+            .await?,
         Channel::Group { .. } => channel
             .remove_user_from_group(
                 db,
@@ -47,13 +46,21 @@ pub async fn delete(
                 None,
                 options.leave_silently.unwrap_or_default(),
             )
-            .await
-            .map(|_| EmptyResponse),
+            .await?,
         Channel::TextChannel { .. } | Channel::VoiceChannel { .. } => {
             permissions.throw_if_lacking_channel_permission(ChannelPermission::ManageChannel)?;
-            channel.delete(db).await.map(|_| EmptyResponse)
+            channel.delete(db).await?
         }
-    }
+    };
+
+    for user_id in get_voice_channel_members(channel.id()).await? {
+        let user = Reference::from_unchecked(user_id).as_user(db).await?;
+
+        voice_client.remove_user(&user, channel.id()).await?;
+        delete_voice_state(channel.id(), channel.server().as_deref(), &user.id).await?;
+    };
+
+    Ok(EmptyResponse)
 }
 
 #[cfg(test)]
diff --git a/crates/delta/src/routes/channels/group_remove_member.rs b/crates/delta/src/routes/channels/group_remove_member.rs
index 90cccfefa..6bc0feb25 100644
--- a/crates/delta/src/routes/channels/group_remove_member.rs
+++ b/crates/delta/src/routes/channels/group_remove_member.rs
@@ -1,4 +1,4 @@
-use revolt_database::{util::reference::Reference, Channel, Database, User, AMQP};
+use revolt_database::{util::reference::Reference, voice::{delete_voice_state, is_in_voice_channel, raise_if_in_voice, VoiceClient}, Channel, Database, User, AMQP};
 use revolt_permissions::ChannelPermission;
 use revolt_result::{create_error, Result};
 
@@ -12,6 +12,7 @@ use rocket_empty::EmptyResponse;
 #[delete("/<target>/recipients/<member>")]
 pub async fn remove_member(
     db: &State<Database>,
+    voice_client: &State<VoiceClient>,
     amqp: &State<AMQP>,
     user: User,
     target: Reference,
@@ -23,32 +24,35 @@ pub async fn remove_member(
 
     let channel = target.as_channel(db).await?;
 
-    match &channel {
-        Channel::Group {
-            owner, recipients, ..
-        } => {
-            if &user.id != owner {
-                return Err(create_error!(MissingPermission {
-                    permission: ChannelPermission::ManageChannel.to_string()
-                }));
-            }
-
-            let member = member.as_user(db).await?;
-            if user.id == member.id {
-                return Err(create_error!(CannotRemoveYourself));
-            }
-
-            if !recipients.iter().any(|x| *x == member.id) {
-                return Err(create_error!(NotInGroup));
-            }
-
-            channel
-                .remove_user_from_group(db, amqp, &member, Some(&user.id), false)
-                .await
-                .map(|_| EmptyResponse)
+    if let Channel::Group { owner, recipients, .. } = &channel {
+        if &user.id != owner {
+            return Err(create_error!(MissingPermission {
+                permission: ChannelPermission::ManageChannel.to_string()
+            }));
         }
-        _ => Err(create_error!(InvalidOperation)),
-    }
+
+        let member = member.as_user(db).await?;
+        if user.id == member.id {
+            return Err(create_error!(CannotRemoveYourself));
+        }
+
+        if !recipients.iter().any(|x| *x == member.id) {
+            return Err(create_error!(NotInGroup));
+        }
+
+        channel
+            .remove_user_from_group(db, amqp, &member, Some(&user.id), false)
+            .await?;
+    } else {
+        return Err(create_error!(InvalidOperation))
+    };
+
+    if is_in_voice_channel(&user.id, channel.id()).await? {
+        voice_client.remove_user(&user, channel.id()).await?;
+        delete_voice_state(channel.id(), None, &user.id).await?;
+    };
+
+    Ok(EmptyResponse)
 }
 
 #[cfg(test)]
diff --git a/crates/delta/src/routes/channels/permissions_set.rs b/crates/delta/src/routes/channels/permissions_set.rs
index b4b3c3dce..e35645406 100644
--- a/crates/delta/src/routes/channels/permissions_set.rs
+++ b/crates/delta/src/routes/channels/permissions_set.rs
@@ -1,6 +1,5 @@
 use revolt_database::{
-    util::{permissions::DatabasePermissionQuery, reference::Reference},
-    Channel, Database, User,
+    util::{permissions::DatabasePermissionQuery, reference::Reference}, voice::{sync_voice_permissions, VoiceClient}, Channel, Database, User
 };
 use revolt_models::v0;
 use revolt_permissions::{calculate_channel_permissions, ChannelPermission, Override};
@@ -17,14 +16,15 @@ use serde::Deserialize;
 #[put("/<target>/permissions/<role_id>", data = "<data>", rank = 2)]
 pub async fn set_role_permissions(
     db: &State<Database>,
+    voice_client: &State<VoiceClient>,
     user: User,
     target: Reference,
     role_id: String,
     data: Json<v0::DataSetRolePermissions>,
 ) -> Result<Json<v0::Channel>> {
-    let mut channel = target.as_channel(db).await?;
+    let channel = target.as_channel(db).await?;
     let mut query = DatabasePermissionQuery::new(db, &user).channel(&channel);
-    let permissions = calculate_channel_permissions(&mut query).await;
+    let permissions: revolt_permissions::PermissionValue = calculate_channel_permissions(&mut query).await;
 
     permissions.throw_if_lacking_channel_permission(ChannelPermission::ManagePermissions)?;
 
@@ -39,11 +39,15 @@ pub async fn set_role_permissions(
                 .throw_permission_override(current_value, &data.permissions)
                 .await?;
 
-            channel
+            let mut new_channel = channel.clone();
+
+            new_channel
                 .set_role_permission(db, &role_id, data.permissions.clone().into())
                 .await?;
 
-            Ok(Json(channel.into()))
+            sync_voice_permissions(db, voice_client, &new_channel, Some(server), Some(&role_id)).await?;
+
+            Ok(Json(new_channel.into()))
         } else {
             Err(create_error!(NotFound))
         }
diff --git a/crates/delta/src/routes/channels/permissions_set_default.rs b/crates/delta/src/routes/channels/permissions_set_default.rs
index 5957426ab..ed82de816 100644
--- a/crates/delta/src/routes/channels/permissions_set_default.rs
+++ b/crates/delta/src/routes/channels/permissions_set_default.rs
@@ -1,6 +1,5 @@
 use revolt_database::{
-    util::{permissions::DatabasePermissionQuery, reference::Reference},
-    Channel, Database, PartialChannel, User,
+    util::{permissions::DatabasePermissionQuery, reference::Reference}, voice::{sync_voice_permissions, VoiceClient}, Channel, Database, PartialChannel, User
 };
 use revolt_models::v0::{self, DataDefaultChannelPermissions};
 use revolt_permissions::{calculate_channel_permissions, ChannelPermission};
@@ -16,6 +15,7 @@ use rocket::{serde::json::Json, State};
 #[put("/<target>/permissions/default", data = "<data>", rank = 1)]
 pub async fn set_default_permissions(
     db: &State<Database>,
+    voice_client: &State<VoiceClient>,
     user: User,
     target: Reference,
     data: Json<v0::DataDefaultChannelPermissions>,
@@ -75,5 +75,12 @@ pub async fn set_default_permissions(
         _ => return Err(create_error!(InvalidOperation)),
     }
 
+    let server = match channel.server() {
+        Some(server_id) => Some(Reference::from_unchecked(server_id).as_server(db).await?),
+        None => None
+    };
+
+    sync_voice_permissions(db, voice_client, &channel, server.as_ref(), None).await?;
+
     Ok(Json(channel.into()))
 }
diff --git a/crates/delta/src/routes/servers/ban_create.rs b/crates/delta/src/routes/servers/ban_create.rs
index 309b53f69..cd1c8cf36 100644
--- a/crates/delta/src/routes/servers/ban_create.rs
+++ b/crates/delta/src/routes/servers/ban_create.rs
@@ -19,7 +19,7 @@ use validator::Validate;
 #[put("/<server>/bans/<target>", data = "<data>")]
 pub async fn ban(
     db: &State<Database>,
-    voice: &State<VoiceClient>,
+    voice_client: &State<VoiceClient>,
     user: User,
     server: Reference,
     target: Reference,
@@ -61,6 +61,7 @@ pub async fn ban(
 
         // If the member is in a voice channel while banned kick them from the voice channel
         if let Some(channel_id) = get_user_voice_channel_in_server(&user.id, &server.id).await? {
+            voice_client.remove_user(&user, &channel_id).await?;
             delete_voice_state(&channel_id, Some(&server.id), &user.id).await?
         }
     }
diff --git a/crates/delta/src/routes/servers/member_edit.rs b/crates/delta/src/routes/servers/member_edit.rs
index e20fa8460..d86155be2 100644
--- a/crates/delta/src/routes/servers/member_edit.rs
+++ b/crates/delta/src/routes/servers/member_edit.rs
@@ -7,7 +7,7 @@ use redis_kiss::{get_connection, redis::Pipeline, AsyncCommands};
 use revolt_database::{
     events::client::EventV1,
     util::{permissions::DatabasePermissionQuery, reference::Reference},
-    voice::VoiceClient,
+    voice::{get_user_voice_channel_in_server, move_user, sync_user_voice_permissions, VoiceClient},
     Database, File, PartialMember, User,
 };
 use revolt_models::v0::{self, FieldsMember, PartialUserVoiceState};
@@ -23,8 +23,8 @@ use validator::Validate;
 #[openapi(tag = "Server Members")]
 #[patch("/<server>/members/<target>", data = "<data>")]
 pub async fn edit(
-    voice_client: &State<VoiceClient>,
     db: &State<Database>,
+    voice_client: &State<VoiceClient>,
     user: User,
     server: Reference,
     target: Reference,
@@ -190,6 +190,18 @@ pub async fn edit(
         .map(|r| r.contains(FieldsMember::CanPublish) || r.contains(FieldsMember::CanReceive))
         .unwrap_or_default();
 
+    if can_publish.is_some()
+        || can_receive.is_some()
+        || voice_channel.is_some()
+        || remove_contains_voice
+    {
+        if let Some(channel) = get_user_voice_channel_in_server(&target_user.id, &server.id).await? {
+            let channel = Reference::from_unchecked(channel).as_channel(db).await?;
+
+            sync_user_voice_permissions(db, voice_client, &user, &channel, Some(&server), None).await?;
+        };
+    };
+
     member
         .update(
             db,
@@ -200,68 +212,5 @@ pub async fn edit(
         )
         .await?;
 
-    if can_publish.is_some()
-        || can_receive.is_some()
-        || voice_channel.is_some()
-        || remove_contains_voice
-    {
-        let mut conn = get_connection().await.to_internal_error()?;
-
-        let unique_key = format!("{}-{}", &member.id.user, &member.id.server);
-
-        // if we edit the member while they are in a voice channel we need to also update the perms
-        // otherwise it wont take place until they leave and rejoin
-        if let Some(channel) = conn
-            .get::<_, Option<String>>(format!("vc-{}", &unique_key))
-            .await
-            .to_internal_error()?
-        {
-            let mut pipeline = Pipeline::new();
-            let mut new_perms = ParticipantPermission::default();
-
-            if remove_contains_voice {
-                let mut query = DatabasePermissionQuery::new(db, &target_user)
-                    .server(&server)
-                    .member(&member);
-
-                let permissions = calculate_server_permissions(&mut query).await;
-
-                if !permissions.has_channel_permission(ChannelPermission::Speak) {
-                    can_publish = Some(false)
-                }
-
-                if !permissions.has_channel_permission(ChannelPermission::Listen) {
-                    can_publish = Some(false)
-                }
-            }
-
-            if let Some(can_publish) = can_publish {
-                new_perms.can_publish = can_publish;
-                new_perms.can_publish_data = can_publish;
-            };
-
-            if let Some(can_receive) = can_receive {
-                new_perms.can_subscribe = can_receive;
-            };
-
-            if let Some(new_channel) = voice_channel {
-                pipeline.smove(
-                    format!("vc-members-{channel}"),
-                    format!("vc-members-{new_channel}"),
-                    &member.id.user,
-                );
-            };
-
-            pipeline
-                .query_async(&mut conn.into_inner())
-                .await
-                .to_internal_error()?;
-
-            voice_client
-                .update_permissions(&user, &channel, new_perms)
-                .await?;
-        };
-    };
-
     Ok(Json(member.into()))
 }
diff --git a/crates/delta/src/routes/servers/member_remove.rs b/crates/delta/src/routes/servers/member_remove.rs
index a7e2f50af..a06e4be47 100644
--- a/crates/delta/src/routes/servers/member_remove.rs
+++ b/crates/delta/src/routes/servers/member_remove.rs
@@ -1,5 +1,6 @@
 use revolt_database::{
     util::{permissions::DatabasePermissionQuery, reference::Reference},
+    voice::{delete_voice_state, get_user_voice_channel_in_server, VoiceClient},
     Database, RemovalIntention, User,
 };
 use revolt_permissions::{calculate_server_permissions, ChannelPermission};
@@ -14,6 +15,7 @@ use rocket_empty::EmptyResponse;
 #[delete("/<target>/members/<member>")]
 pub async fn kick(
     db: &State<Database>,
+    voice_client: &State<VoiceClient>,
     user: User,
     target: Reference,
     member: Reference,
@@ -40,6 +42,11 @@ pub async fn kick(
         return Err(create_error!(NotElevated));
     }
 
+    if let Some(channel_id) = get_user_voice_channel_in_server(&user.id, &server.id).await? {
+        voice_client.remove_user(&user, &channel_id).await?;
+        delete_voice_state(&channel_id, Some(&server.id), &user.id).await?;
+    }
+
     member
         .remove(db, &server, RemovalIntention::Kick, false)
         .await
diff --git a/crates/delta/src/routes/servers/permissions_set.rs b/crates/delta/src/routes/servers/permissions_set.rs
index 0c293aa89..3d80d3873 100644
--- a/crates/delta/src/routes/servers/permissions_set.rs
+++ b/crates/delta/src/routes/servers/permissions_set.rs
@@ -1,6 +1,5 @@
 use revolt_database::{
-    util::{permissions::DatabasePermissionQuery, reference::Reference},
-    Database, User,
+    util::{permissions::DatabasePermissionQuery, reference::Reference}, voice::{sync_voice_permissions, VoiceClient}, Database, User
 };
 use revolt_models::v0;
 use revolt_permissions::{calculate_server_permissions, ChannelPermission, Override};
@@ -14,6 +13,7 @@ use rocket::{serde::json::Json, State};
 #[put("/<target>/permissions/<role_id>", data = "<data>", rank = 2)]
 pub async fn set_role_permission(
     db: &State<Database>,
+    voice_client: &State<VoiceClient>,
     user: User,
     target: Reference,
     role_id: String,
@@ -40,6 +40,12 @@ pub async fn set_role_permission(
             .throw_permission_override(current_value, &data.permissions)
             .await?;
 
+        for channel_id in &server.channels {
+            let channel = Reference::from_unchecked(channel_id.clone()).as_channel(db).await?;
+
+            sync_voice_permissions(db, voice_client, &channel, Some(&server), Some(&role_id)).await?;
+        };
+
         server
             .set_role_permission(db, &role_id, data.permissions.into())
             .await?;
diff --git a/crates/delta/src/routes/servers/permissions_set_default.rs b/crates/delta/src/routes/servers/permissions_set_default.rs
index 8189e9569..42c364d83 100644
--- a/crates/delta/src/routes/servers/permissions_set_default.rs
+++ b/crates/delta/src/routes/servers/permissions_set_default.rs
@@ -1,6 +1,5 @@
 use revolt_database::{
-    util::{permissions::DatabasePermissionQuery, reference::Reference},
-    Database, PartialServer, Server, User,
+    util::{permissions::DatabasePermissionQuery, reference::Reference}, voice::{sync_voice_permissions, VoiceClient}, Database, PartialServer, Server, User
 };
 use revolt_models::v0;
 use revolt_permissions::{
@@ -16,6 +15,7 @@ use rocket::{serde::json::Json, State};
 #[put("/<target>/permissions/default", data = "<data>", rank = 1)]
 pub async fn set_default_permissions(
     db: &State<Database>,
+    voice_client: &State<VoiceClient>,
     user: User,
     target: Reference,
     data: Json<DataPermissionsValue>,
@@ -39,6 +39,12 @@ pub async fn set_default_permissions(
         )
         .await?;
 
+    for channel_id in &server.channels {
+        let channel = Reference::from_unchecked(channel_id.clone()).as_channel(db).await?;
+
+        sync_voice_permissions(db, voice_client, &channel, Some(&server), None).await?;
+    };
+
     server
         .update(
             db,
diff --git a/crates/delta/src/routes/servers/roles_delete.rs b/crates/delta/src/routes/servers/roles_delete.rs
index 881ef6cb5..38b408597 100644
--- a/crates/delta/src/routes/servers/roles_delete.rs
+++ b/crates/delta/src/routes/servers/roles_delete.rs
@@ -1,11 +1,9 @@
-use livekit_protocol::ParticipantPermission;
 use revolt_database::{
     util::{permissions::DatabasePermissionQuery, reference::Reference},
-    voice::{get_allowed_sources, get_voice_channel_members, get_voice_state, update_voice_state, VoiceClient},
-    Channel, Database, User
+    voice::{sync_voice_permissions, VoiceClient},
+    Database, User
 };
-use revolt_models::v0::PartialUserVoiceState;
-use revolt_permissions::{calculate_channel_permissions, calculate_server_permissions, ChannelPermission};
+use revolt_permissions::{calculate_server_permissions, ChannelPermission};
 use revolt_result::{create_error, Result};
 use rocket::State;
 use rocket_empty::EmptyResponse;
@@ -38,45 +36,7 @@ pub async fn delete(
         for channel_id in &server.channels {
             let channel = Reference::from_unchecked(channel_id.clone()).as_channel(db).await?;
 
-            if matches!(channel, Channel::VoiceChannel { .. }) {
-                for member_id in get_voice_channel_members(channel_id).await? {
-                    let member = Reference::from_unchecked(member_id).as_member(db, &server.id).await?;
-
-                    if member.roles.contains(&role_id) {
-                        let user = Reference::from_unchecked(member.id.user.clone()).as_user(db).await?;
-                        let voice_state = get_voice_state(channel_id, Some(&server.id), &user.id).await?.unwrap();
-
-                        let mut query = DatabasePermissionQuery::new(db, &user)
-                            .member(&member)
-                            .channel(&channel)
-                            .server(&server);
-
-                        let permissions = calculate_channel_permissions(&mut query).await;
-
-                        let mut update_event = PartialUserVoiceState {
-                            id: Some(user.id.clone()),
-                            ..Default::default()
-                        };
-
-                        let can_video = permissions.has_channel_permission(ChannelPermission::Video);
-                        let can_speak = permissions.has_channel_permission(ChannelPermission::Speak);
-                        let can_listen = permissions.has_channel_permission(ChannelPermission::Listen);
-
-                        update_event.camera = voice_state.camera.then_some(can_video);
-                        update_event.screensharing = voice_state.screensharing.then_some(can_video);
-                        update_event.is_publishing = voice_state.is_publishing.then_some(can_speak);
-
-                        update_voice_state(channel_id, Some(&server.id), &user.id, &update_event).await?;
-
-                        voice_client.update_permissions(&user, channel_id, ParticipantPermission {
-                            can_subscribe: can_listen,
-                            can_publish: can_speak,
-                            can_publish_data: can_speak,
-                            ..Default::default()
-                        }).await?;
-                    }
-                }
-            }
+            sync_voice_permissions(db, voice_client, &channel, Some(&server), Some(&role_id)).await?;
         };
 
         role.delete(db, &server.id, &role_id)
diff --git a/crates/delta/src/routes/servers/roles_edit.rs b/crates/delta/src/routes/servers/roles_edit.rs
index 7b211d0f2..9d3f85a20 100644
--- a/crates/delta/src/routes/servers/roles_edit.rs
+++ b/crates/delta/src/routes/servers/roles_edit.rs
@@ -1,14 +1,12 @@
-use livekit_protocol::ParticipantPermission;
 use revolt_database::{
     util::{permissions::DatabasePermissionQuery, reference::Reference},
-    voice::{get_allowed_sources, get_voice_channel_members, get_voice_state, update_voice_state, update_voice_state_tracks, VoiceClient},
-    Channel, Database, PartialRole, User
+    voice::{sync_voice_permissions, VoiceClient},
+    Database, PartialRole, User
 };
-use revolt_models::v0::{self, PartialUserVoiceState};
-use revolt_permissions::{calculate_channel_permissions, calculate_server_permissions, ChannelPermission, PermissionQuery};
+use revolt_models::v0;
+use revolt_permissions::{calculate_server_permissions, ChannelPermission};
 use revolt_result::{create_error, Result};
 use rocket::{serde::json::Json, State};
-use serde::{Deserialize, Serialize};
 use validator::Validate;
 
 /// # Edit Role
@@ -18,12 +16,11 @@ use validator::Validate;
 #[patch("/<target>/roles/<role_id>", data = "<data>")]
 pub async fn edit(
     db: &State<Database>,
-    voice: &State<VoiceClient>,
+    voice_client: &State<VoiceClient>,
     user: User,
     target: Reference,
     role_id: String,
     data: Json<v0::DataEditRole>,
-    voice_client: &State<VoiceClient>
 ) -> Result<Json<v0::Role>> {
     let data = data.into_inner();
     data.validate().map_err(|error| {
@@ -83,45 +80,7 @@ pub async fn edit(
         for channel_id in &server.channels {
             let channel = Reference::from_unchecked(channel_id.clone()).as_channel(db).await?;
 
-            if matches!(channel, Channel::VoiceChannel { .. }) {
-                for member_id in get_voice_channel_members(channel_id).await? {
-                    let member = Reference::from_unchecked(member_id).as_member(db, &server.id).await?;
-
-                    if member.roles.contains(&role_id) {
-                        let user = Reference::from_unchecked(member.id.user.clone()).as_user(db).await?;
-                        let voice_state = get_voice_state(channel_id, Some(&server.id), &user.id).await?.unwrap();
-
-                        let mut query = DatabasePermissionQuery::new(db, &user)
-                            .member(&member)
-                            .channel(&channel)
-                            .server(&server);
-
-                        let permissions = calculate_channel_permissions(&mut query).await;
-
-                        let mut update_event = PartialUserVoiceState {
-                            id: Some(user.id.clone()),
-                            ..Default::default()
-                        };
-
-                        let can_video = permissions.has_channel_permission(ChannelPermission::Video);
-                        let can_speak = permissions.has_channel_permission(ChannelPermission::Speak);
-                        let can_listen = permissions.has_channel_permission(ChannelPermission::Listen);
-
-                        update_event.camera = voice_state.camera.then_some(can_video);
-                        update_event.screensharing = voice_state.screensharing.then_some(can_video);
-                        update_event.is_publishing = voice_state.is_publishing.then_some(can_speak);
-
-                        update_voice_state(channel_id, Some(&server.id), &user.id, &update_event).await?;
-
-                        voice_client.update_permissions(&user, channel_id, ParticipantPermission {
-                            can_subscribe: can_listen,
-                            can_publish: can_speak,
-                            can_publish_data: can_speak,
-                            ..Default::default()
-                        }).await?;
-                    }
-                }
-            }
+            sync_voice_permissions(db, voice_client, &channel, Some(&server), Some(&role_id)).await?;
         };
 
         Ok(Json(role.into()))
diff --git a/crates/delta/src/routes/servers/server_delete.rs b/crates/delta/src/routes/servers/server_delete.rs
index 28a3bf42a..9c9096594 100644
--- a/crates/delta/src/routes/servers/server_delete.rs
+++ b/crates/delta/src/routes/servers/server_delete.rs
@@ -1,4 +1,8 @@
-use revolt_database::{util::reference::Reference, Database, RemovalIntention, User};
+use revolt_database::{
+    util::reference::Reference,
+    voice::{delete_voice_state, get_user_voice_channel_in_server, VoiceClient},
+    Database, RemovalIntention, User,
+};
 use revolt_models::v0;
 use revolt_result::Result;
 use rocket::State;
@@ -12,6 +16,7 @@ use rocket_empty::EmptyResponse;
 #[delete("/<target>?<options..>")]
 pub async fn delete(
     db: &State<Database>,
+    voice_client: &State<VoiceClient>,
     user: User,
     target: Reference,
     options: v0::OptionsServerDelete,
@@ -20,8 +25,20 @@ pub async fn delete(
     let member = db.fetch_member(&target.id, &user.id).await?;
 
     if server.owner == user.id {
+        for channel_id in &server.channels {
+            voice_client.remove_user(&user, channel_id).await?;
+            delete_voice_state(channel_id, Some(&server.id), &user.id).await?;
+        }
+
         server.delete(db).await
     } else {
+        if let Some(channel_id) = get_user_voice_channel_in_server(&user.id, &server.id).await? {
+            if server.channels.iter().any(|c| c == &channel_id) {
+                voice_client.remove_user(&user, &channel_id).await?;
+                delete_voice_state(&channel_id, Some(&server.id), &user.id).await?;
+            }
+        };
+
         member
             .remove(
                 db,

From 41a6de67cdcb3632c843266a827ef66b3318c997 Mon Sep 17 00:00:00 2001
From: Zomatree <me@zomatree.live>
Date: Tue, 28 Jan 2025 15:59:58 +0000
Subject: [PATCH 11/62] fix: remove locked rocket version

---
 Cargo.lock | 45 ++++++++++++++++++++-------------------------
 Cargo.toml |  2 +-
 2 files changed, 21 insertions(+), 26 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 9db589c30..80cd01bdd 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -972,7 +972,7 @@ dependencies = [
  "http 1.2.0",
  "http-body 1.0.1",
  "http-body-util",
- "hyper 1.5.2",
+ "hyper 1.6.0",
  "hyper-util",
  "itoa",
  "matchit",
@@ -3197,9 +3197,9 @@ dependencies = [
 
 [[package]]
 name = "httparse"
-version = "1.9.5"
+version = "1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7d71d3574edd2771538b901e6549113b4006ece66150fb69c0fb6d9a2adae946"
+checksum = "f2d708df4e7140240a16cd6ab0ab65c972d7433ab77819ea693fde9c43811e2a"
 
 [[package]]
 name = "httpdate"
@@ -3242,9 +3242,9 @@ dependencies = [
 
 [[package]]
 name = "hyper"
-version = "1.5.2"
+version = "1.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "256fb8d4bd6413123cc9d91832d78325c48ff41677595be797d90f42969beae0"
+checksum = "cc2b571658e38e0c01b1fdca3bbbe93c00d3d71693ff2770043f8c29bc7d6f80"
 dependencies = [
  "bytes 1.9.0",
  "futures-channel",
@@ -3285,7 +3285,7 @@ checksum = "a0bea761b46ae2b24eb4aef630d8d1c398157b6fc29e6350ecf090a0b70c952c"
 dependencies = [
  "futures-util",
  "http 1.2.0",
- "hyper 1.5.2",
+ "hyper 1.6.0",
  "hyper-util",
  "rustls 0.22.4",
  "rustls-pki-types",
@@ -3303,7 +3303,7 @@ checksum = "2d191583f3da1305256f22463b9bb0471acad48a4e534a5218b9963e9c1f59b2"
 dependencies = [
  "futures-util",
  "http 1.2.0",
- "hyper 1.5.2",
+ "hyper 1.6.0",
  "hyper-util",
  "rustls 0.23.21",
  "rustls-pki-types",
@@ -3333,7 +3333,7 @@ checksum = "70206fc6890eaca9fde8a0bf71caa2ddfc9fe045ac9e5c70df101a7dbde866e0"
 dependencies = [
  "bytes 1.9.0",
  "http-body-util",
- "hyper 1.5.2",
+ "hyper 1.6.0",
  "hyper-util",
  "native-tls",
  "tokio 1.43.0",
@@ -3352,7 +3352,7 @@ dependencies = [
  "futures-util",
  "http 1.2.0",
  "http-body 1.0.1",
- "hyper 1.5.2",
+ "hyper 1.6.0",
  "pin-project-lite 0.2.16",
  "socket2 0.5.8",
  "tokio 1.43.0",
@@ -6152,7 +6152,7 @@ dependencies = [
  "http 1.2.0",
  "http-body 1.0.1",
  "http-body-util",
- "hyper 1.5.2",
+ "hyper 1.6.0",
  "hyper-rustls 0.27.5",
  "hyper-tls 0.6.0",
  "hyper-util",
@@ -6575,7 +6575,7 @@ dependencies = [
  "erased-serde",
  "http 1.2.0",
  "http-body-util",
- "hyper 1.5.2",
+ "hyper 1.6.0",
  "hyper-rustls 0.26.0",
  "hyper-util",
  "parking_lot",
@@ -7053,9 +7053,9 @@ dependencies = [
 
 [[package]]
 name = "rustls-pki-types"
-version = "1.10.1"
+version = "1.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2bf47e6ff922db3825eb750c4e2ff784c6ff8fb9e13046ef6a1d1c5401b0b37"
+checksum = "917ce264624a4b4db1c364dcc35bfca9ded014d0a958cd47ad3e960e988ea51c"
 
 [[package]]
 name = "rustls-webpki"
@@ -7104,9 +7104,9 @@ dependencies = [
 
 [[package]]
 name = "ryu"
-version = "1.0.18"
+version = "1.0.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f"
+checksum = "6ea1a2d0a644769cc99faa24c3ad26b379b786fe7c36fd3c546254801650e6dd"
 
 [[package]]
 name = "schannel"
@@ -8380,7 +8380,7 @@ dependencies = [
  "serde",
  "serde_spanned",
  "toml_datetime",
- "winnow 0.6.24",
+ "winnow 0.6.25",
 ]
 
 [[package]]
@@ -8708,9 +8708,9 @@ checksum = "260bc6647b3893a9a90668360803a15f96b85a5257b1c3a0c3daf6ae2496de42"
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.15"
+version = "1.0.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "11cd88e12b17c6494200a9c1b683a04fcac9573ed74cd1b62aeb2727c5592243"
+checksum = "a210d160f08b701c8721ba1c726c11662f877ea6b7094007e1ca9a1041945034"
 
 [[package]]
 name = "unicode-normalization"
@@ -9522,9 +9522,9 @@ dependencies = [
 
 [[package]]
 name = "winnow"
-version = "0.6.24"
+version = "0.6.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c8d71a593cc5c42ad7876e2c1fda56f314f3754c084128833e64f1345ff8a03a"
+checksum = "ad699df48212c6cc6eb4435f35500ac6fd3b9913324f938aea302022ce19d310"
 dependencies = [
  "memchr",
 ]
@@ -9739,8 +9739,3 @@ dependencies = [
 name = "redis"
 version = "0.22.3"
 source = "git+https://github.com/revoltchat/redis-rs?rev=1a41faf356fd21aebba71cea7eb7eb2653e5f0ef#1a41faf356fd21aebba71cea7eb7eb2653e5f0ef"
-
-[[patch.unused]]
-name = "rocket"
-version = "0.5.0-rc.2"
-source = "git+https://github.com/rwf2/Rocket/?rev=4dcd928#4dcd92837f3a4626a28d4b25da8e6e560878d004"
diff --git a/Cargo.toml b/Cargo.toml
index 2c3013fdf..e8c4eab68 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -16,7 +16,7 @@ redis22 = { package = "redis", version = "0.22.3", git = "https://github.com/rev
 redis23 = { package = "redis", version = "0.23.1", git = "https://github.com/revoltchat/redis-rs", rev = "f8ca28ab85da59d2ccde526b4d2fb390eff5a5f9" }
 # authifier = { package = "authifier", version = "1.0.8", path = "../authifier/crates/authifier" }
 # rocket_authifier = { package = "rocket_authifier", version = "1.0.8", path = "../authifier/crates/rocket_authifier" }
-rocket = { git = "https://github.com/rwf2/Rocket/", rev = "4dcd928" }
+# rocket = { git = "https://github.com/rwf2/Rocket/", rev = "4dcd928" }
 
 [profile.release]
 lto = true

From 742eb3bb7d9b3666877cd0ff4449d1cd477ce376 Mon Sep 17 00:00:00 2001
From: Zomatree <me@zomatree.live>
Date: Tue, 28 Jan 2025 16:06:58 +0000
Subject: [PATCH 12/62] fix: remove local testing values from config

---
 Revolt.toml                             | 6 ------
 crates/core/config/Revolt.toml          | 6 +++---
 crates/core/database/src/drivers/mod.rs | 2 +-
 3 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/Revolt.toml b/Revolt.toml
index f9ea06291..97da148d6 100644
--- a/Revolt.toml
+++ b/Revolt.toml
@@ -53,9 +53,3 @@ access_key_id = "minioautumn"
 secret_access_key = "minioautumn"
 # Bucket to upload to by default
 default_bucket = "revolt-uploads"
-
-[rabbit]
-host = "rabbit.backend.orb.local"
-port = 5672
-username = "rabbituser"
-password = "rabbitpass"
diff --git a/crates/core/config/Revolt.toml b/crates/core/config/Revolt.toml
index 6b9a4919c..d298a2d7f 100644
--- a/crates/core/config/Revolt.toml
+++ b/crates/core/config/Revolt.toml
@@ -65,11 +65,11 @@ max_concurrent_connections = 50
 
 [api.livekit]
 # Livekit server url
-url = "ws://livekit:7880"
+url = "ws://local.revolt.chat/livekit"
 # Livekit security key name
-key = "dev"
+key = ""
 # Livekit security secret value
-secret = "qweasdzxcqweasdzxcqweasdzxcqweasdzxcqweasdzxcqweasdzxc"
+secret = ""
 
 
 [pushd]
diff --git a/crates/core/database/src/drivers/mod.rs b/crates/core/database/src/drivers/mod.rs
index 605a56126..f24263aef 100644
--- a/crates/core/database/src/drivers/mod.rs
+++ b/crates/core/database/src/drivers/mod.rs
@@ -43,7 +43,7 @@ impl DatabaseInfo {
     #[async_recursion]
     pub async fn connect(self) -> Result<Database, String> {
         let config = config().await;
-        println!("{config:?}");
+
         Ok(match self {
             DatabaseInfo::Auto => {
                 if std::env::var("TEST_DB").is_ok() {

From 2593a4272bf78b2e20c49843e8dd1ff3b35d19d4 Mon Sep 17 00:00:00 2001
From: Zomatree <me@zomatree.live>
Date: Sun, 2 Feb 2025 13:46:45 +0000
Subject: [PATCH 13/62] chore: switch to ids for parameter

---
 crates/core/database/src/voice/voice_client.rs      |  4 ++--
 crates/daemons/voice-ingress/Dockerfile             | 12 ++++++------
 crates/daemons/voice-ingress/src/main.rs            | 13 ++++++++++++-
 crates/delta/src/routes/channels/channel_delete.rs  |  4 +---
 .../src/routes/channels/group_remove_member.rs      |  2 +-
 crates/delta/src/routes/servers/ban_create.rs       |  2 +-
 crates/delta/src/routes/servers/member_remove.rs    |  2 +-
 crates/delta/src/routes/servers/server_delete.rs    |  4 ++--
 8 files changed, 26 insertions(+), 17 deletions(-)

diff --git a/crates/core/database/src/voice/voice_client.rs b/crates/core/database/src/voice/voice_client.rs
index 4f540870b..261f68a73 100644
--- a/crates/core/database/src/voice/voice_client.rs
+++ b/crates/core/database/src/voice/voice_client.rs
@@ -106,8 +106,8 @@ impl VoiceClient {
             .to_internal_error()
     }
 
-    pub async fn remove_user(&self, user: &User, channel_id: &str) -> Result<()> {
-        self.rooms.remove_participant(channel_id, &user.id)
+    pub async fn remove_user(&self, user_id: &str, channel_id: &str) -> Result<()> {
+        self.rooms.remove_participant(channel_id, user_id)
             .await
             .to_internal_error()
     }
diff --git a/crates/daemons/voice-ingress/Dockerfile b/crates/daemons/voice-ingress/Dockerfile
index 773069863..4749d5cc9 100644
--- a/crates/daemons/voice-ingress/Dockerfile
+++ b/crates/daemons/voice-ingress/Dockerfile
@@ -1,11 +1,11 @@
 # Build Stage
 FROM ghcr.io/revoltchat/base:latest AS builder
+FROM debian:12 AS debian
 
 # Bundle Stage
-FROM debian:bullseye-slim
-RUN apt-get update && \
-    apt-get install -y ca-certificates && \
-    apt-get clean
+FROM gcr.io/distroless/cc-debian12:nonroot
 COPY --from=builder /home/rust/src/target/release/revolt-voice-ingress ./
-EXPOSE 9000
-CMD ["./revolt-voice-ingress"]
+COPY --from=debian /usr/bin/uname /usr/bin/uname
+
+USER nonroot
+CMD ["./revolt-voice-ingress"]
\ No newline at end of file
diff --git a/crates/daemons/voice-ingress/src/main.rs b/crates/daemons/voice-ingress/src/main.rs
index 91abe3215..55fdf7551 100644
--- a/crates/daemons/voice-ingress/src/main.rs
+++ b/crates/daemons/voice-ingress/src/main.rs
@@ -1,7 +1,7 @@
 use std::env;
 
 
-use livekit_protocol::WebhookEvent;
+use livekit_protocol::{TrackType, WebhookEvent};
 use revolt_database::{
     events::client::EventV1, util::reference::Reference, Database, DatabaseInfo,
     voice::{create_voice_state, delete_voice_state, update_voice_state_tracks, VoiceClient}
@@ -85,6 +85,17 @@ async fn ingress(db: &State<Database>, voice_client: &State<VoiceClient>, body:
                 .as_channel(db)
                 .await?;
 
+            // remove the user if they try publish a video larger than 1080x720 or they publish data
+            if body.event == "track_published"
+                && (
+                    (track.r#type == TrackType::Video as i32 && (track.width > 1080 || track.height > 720))
+                    | (track.r#type == TrackType::Data as i32)
+                )
+            {
+                voice_client.remove_user(user_id, channel_id).await?;
+                delete_voice_state(channel_id, channel.server().as_deref(), user_id).await?;
+            }
+
             let partial = update_voice_state_tracks(
                 channel_id,
                 channel.server().as_deref(),
diff --git a/crates/delta/src/routes/channels/channel_delete.rs b/crates/delta/src/routes/channels/channel_delete.rs
index 8c8dd5db8..5cefe7552 100644
--- a/crates/delta/src/routes/channels/channel_delete.rs
+++ b/crates/delta/src/routes/channels/channel_delete.rs
@@ -54,9 +54,7 @@ pub async fn delete(
     };
 
     for user_id in get_voice_channel_members(channel.id()).await? {
-        let user = Reference::from_unchecked(user_id).as_user(db).await?;
-
-        voice_client.remove_user(&user, channel.id()).await?;
+        voice_client.remove_user(&user_id, channel.id()).await?;
         delete_voice_state(channel.id(), channel.server().as_deref(), &user.id).await?;
     };
 
diff --git a/crates/delta/src/routes/channels/group_remove_member.rs b/crates/delta/src/routes/channels/group_remove_member.rs
index 6bc0feb25..9836a7c39 100644
--- a/crates/delta/src/routes/channels/group_remove_member.rs
+++ b/crates/delta/src/routes/channels/group_remove_member.rs
@@ -48,7 +48,7 @@ pub async fn remove_member(
     };
 
     if is_in_voice_channel(&user.id, channel.id()).await? {
-        voice_client.remove_user(&user, channel.id()).await?;
+        voice_client.remove_user(&user.id, channel.id()).await?;
         delete_voice_state(channel.id(), None, &user.id).await?;
     };
 
diff --git a/crates/delta/src/routes/servers/ban_create.rs b/crates/delta/src/routes/servers/ban_create.rs
index cd1c8cf36..96a8d4c92 100644
--- a/crates/delta/src/routes/servers/ban_create.rs
+++ b/crates/delta/src/routes/servers/ban_create.rs
@@ -61,7 +61,7 @@ pub async fn ban(
 
         // If the member is in a voice channel while banned kick them from the voice channel
         if let Some(channel_id) = get_user_voice_channel_in_server(&user.id, &server.id).await? {
-            voice_client.remove_user(&user, &channel_id).await?;
+            voice_client.remove_user(&user.id, &channel_id).await?;
             delete_voice_state(&channel_id, Some(&server.id), &user.id).await?
         }
     }
diff --git a/crates/delta/src/routes/servers/member_remove.rs b/crates/delta/src/routes/servers/member_remove.rs
index a06e4be47..3276add74 100644
--- a/crates/delta/src/routes/servers/member_remove.rs
+++ b/crates/delta/src/routes/servers/member_remove.rs
@@ -43,7 +43,7 @@ pub async fn kick(
     }
 
     if let Some(channel_id) = get_user_voice_channel_in_server(&user.id, &server.id).await? {
-        voice_client.remove_user(&user, &channel_id).await?;
+        voice_client.remove_user(&user.id, &channel_id).await?;
         delete_voice_state(&channel_id, Some(&server.id), &user.id).await?;
     }
 
diff --git a/crates/delta/src/routes/servers/server_delete.rs b/crates/delta/src/routes/servers/server_delete.rs
index 9c9096594..1cae301c8 100644
--- a/crates/delta/src/routes/servers/server_delete.rs
+++ b/crates/delta/src/routes/servers/server_delete.rs
@@ -26,7 +26,7 @@ pub async fn delete(
 
     if server.owner == user.id {
         for channel_id in &server.channels {
-            voice_client.remove_user(&user, channel_id).await?;
+            voice_client.remove_user(&user.id, channel_id).await?;
             delete_voice_state(channel_id, Some(&server.id), &user.id).await?;
         }
 
@@ -34,7 +34,7 @@ pub async fn delete(
     } else {
         if let Some(channel_id) = get_user_voice_channel_in_server(&user.id, &server.id).await? {
             if server.channels.iter().any(|c| c == &channel_id) {
-                voice_client.remove_user(&user, &channel_id).await?;
+                voice_client.remove_user(&user.id, &channel_id).await?;
                 delete_voice_state(&channel_id, Some(&server.id), &user.id).await?;
             }
         };

From 060b4c43f4407bf8f0210e3f7fea8db47ad11934 Mon Sep 17 00:00:00 2001
From: Zomatree <me@zomatree.live>
Date: Fri, 7 Feb 2025 21:35:51 +0000
Subject: [PATCH 14/62] feat: make Channel::server return a reference

---
 crates/core/database/src/models/channels/model.rs         | 4 ++--
 crates/core/database/src/voice/mod.rs                     | 2 +-
 crates/core/database/src/voice/voice_client.rs            | 2 +-
 crates/daemons/voice-ingress/src/main.rs                  | 8 ++++----
 crates/delta/src/routes/channels/channel_delete.rs        | 2 +-
 .../delta/src/routes/channels/permissions_set_default.rs  | 2 +-
 crates/delta/src/routes/servers/member_edit.rs            | 4 ++--
 7 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/crates/core/database/src/models/channels/model.rs b/crates/core/database/src/models/channels/model.rs
index 94dd272a2..8af881ff4 100644
--- a/crates/core/database/src/models/channels/model.rs
+++ b/crates/core/database/src/models/channels/model.rs
@@ -435,9 +435,9 @@ impl Channel {
     }
 
     /// Clone this channel's server id
-    pub fn server(&self) -> Option<String> {
+    pub fn server(&self) -> Option<&str> {
         match self {
-            Channel::TextChannel { server, .. } | Channel::VoiceChannel { server, .. } => Some(server.clone()),
+            Channel::TextChannel { server, .. } | Channel::VoiceChannel { server, .. } => Some(server),
             _ => None
         }
     }
diff --git a/crates/core/database/src/voice/mod.rs b/crates/core/database/src/voice/mod.rs
index 996ee5054..18380660a 100644
--- a/crates/core/database/src/voice/mod.rs
+++ b/crates/core/database/src/voice/mod.rs
@@ -1,7 +1,7 @@
 
 use livekit_protocol::ParticipantPermission;
 use redis_kiss::{get_connection as _get_connection, Conn, redis::Pipeline, AsyncCommands};
-use crate::{events::client::EventV1, models::{Channel, User}, util::{permissions::DatabasePermissionQuery, reference::Reference}, Database, Role, Server};
+use crate::{events::client::EventV1, models::{Channel, User}, util::{permissions::DatabasePermissionQuery, reference::Reference}, Database, Server};
 use revolt_models::v0::{self, PartialUserVoiceState, UserVoiceState};
 use revolt_permissions::{calculate_channel_permissions, ChannelPermission, PermissionValue};
 use revolt_result::{create_error, Result, ToRevoltError};
diff --git a/crates/core/database/src/voice/voice_client.rs b/crates/core/database/src/voice/voice_client.rs
index 261f68a73..a6b2ba033 100644
--- a/crates/core/database/src/voice/voice_client.rs
+++ b/crates/core/database/src/voice/voice_client.rs
@@ -54,7 +54,7 @@ impl VoiceClient {
             .with_grants(VideoGrants {
                 room_join: true,
                 can_publish: true,
-                can_publish_sources: vec![], // allowed_sources.into_iter().map(ToString::to_string).collect(),
+                can_publish_sources: allowed_sources.into_iter().map(ToString::to_string).collect(),
                 can_subscribe: permissions.has_channel_permission(ChannelPermission::Listen),
                 room: channel.id().to_string(),
                 ..Default::default()
diff --git a/crates/daemons/voice-ingress/src/main.rs b/crates/daemons/voice-ingress/src/main.rs
index 55fdf7551..04ec6e092 100644
--- a/crates/daemons/voice-ingress/src/main.rs
+++ b/crates/daemons/voice-ingress/src/main.rs
@@ -50,7 +50,7 @@ async fn ingress(db: &State<Database>, voice_client: &State<VoiceClient>, body:
                 .as_channel(db)
                 .await?;
 
-            let voice_state = create_voice_state(channel_id, channel.server().as_deref(), user_id).await?;
+            let voice_state = create_voice_state(channel_id, channel.server(), user_id).await?;
 
             EventV1::VoiceChannelJoin {
                 id: channel_id.clone(),
@@ -67,7 +67,7 @@ async fn ingress(db: &State<Database>, voice_client: &State<VoiceClient>, body:
                 .as_channel(db)
                 .await?;
 
-            delete_voice_state(channel_id, channel.server().as_deref(), user_id).await?;
+            delete_voice_state(channel_id, channel.server(), user_id).await?;
 
             EventV1::VoiceChannelLeave {
                 id: channel_id.clone(),
@@ -93,12 +93,12 @@ async fn ingress(db: &State<Database>, voice_client: &State<VoiceClient>, body:
                 )
             {
                 voice_client.remove_user(user_id, channel_id).await?;
-                delete_voice_state(channel_id, channel.server().as_deref(), user_id).await?;
+                delete_voice_state(channel_id, channel.server(), user_id).await?;
             }
 
             let partial = update_voice_state_tracks(
                 channel_id,
-                channel.server().as_deref(),
+                channel.server(),
                 user_id,
                 body.event == "track_published",  // to avoid duplicating this entire case twice
                 track.source
diff --git a/crates/delta/src/routes/channels/channel_delete.rs b/crates/delta/src/routes/channels/channel_delete.rs
index 5cefe7552..f3dab86db 100644
--- a/crates/delta/src/routes/channels/channel_delete.rs
+++ b/crates/delta/src/routes/channels/channel_delete.rs
@@ -55,7 +55,7 @@ pub async fn delete(
 
     for user_id in get_voice_channel_members(channel.id()).await? {
         voice_client.remove_user(&user_id, channel.id()).await?;
-        delete_voice_state(channel.id(), channel.server().as_deref(), &user.id).await?;
+        delete_voice_state(channel.id(), channel.server(), &user.id).await?;
     };
 
     Ok(EmptyResponse)
diff --git a/crates/delta/src/routes/channels/permissions_set_default.rs b/crates/delta/src/routes/channels/permissions_set_default.rs
index ed82de816..91f53b2fb 100644
--- a/crates/delta/src/routes/channels/permissions_set_default.rs
+++ b/crates/delta/src/routes/channels/permissions_set_default.rs
@@ -76,7 +76,7 @@ pub async fn set_default_permissions(
     }
 
     let server = match channel.server() {
-        Some(server_id) => Some(Reference::from_unchecked(server_id).as_server(db).await?),
+        Some(server_id) => Some(Reference::from_unchecked(server_id.to_string()).as_server(db).await?),
         None => None
     };
 
diff --git a/crates/delta/src/routes/servers/member_edit.rs b/crates/delta/src/routes/servers/member_edit.rs
index d86155be2..16ebbd963 100644
--- a/crates/delta/src/routes/servers/member_edit.rs
+++ b/crates/delta/src/routes/servers/member_edit.rs
@@ -157,8 +157,8 @@ pub async fn edit(
         roles,
         timeout,
         remove,
-        mut can_publish,
-        mut can_receive,
+        can_publish,
+        can_receive,
         voice_channel,
     } = data;
 

From 367ac887f4a01b5c597557ae9ba876fec13b6ecc Mon Sep 17 00:00:00 2001
From: Zomatree <me@zomatree.live>
Date: Mon, 17 Feb 2025 01:39:00 +0000
Subject: [PATCH 15/62] feat: support multiple voice nodes

---
 Revolt.toml                                   | 19 ++++--
 crates/core/config/Revolt.toml                | 10 +--
 crates/core/config/src/lib.rs                 |  9 ++-
 crates/core/database/src/voice/mod.rs         | 38 ++++++++---
 .../core/database/src/voice/voice_client.rs   | 65 +++++++++++++------
 crates/core/models/src/v0/channels.rs         |  9 ++-
 crates/core/permissions/src/models/channel.rs |  1 +
 crates/core/result/src/axum.rs                |  1 +
 crates/core/result/src/lib.rs                 |  1 +
 crates/core/result/src/rocket.rs              |  1 +
 crates/daemons/voice-ingress/src/main.rs      | 63 +++++++++++++-----
 crates/delta/src/main.rs                      |  2 +-
 .../src/routes/channels/channel_delete.rs     | 12 ++--
 .../routes/channels/group_remove_member.rs    |  6 +-
 .../delta/src/routes/channels/voice_join.rs   | 14 ++--
 crates/delta/src/routes/root.rs               |  7 +-
 crates/delta/src/routes/servers/ban_create.rs |  5 +-
 .../delta/src/routes/servers/member_edit.rs   |  8 ++-
 .../delta/src/routes/servers/member_remove.rs |  6 +-
 .../delta/src/routes/servers/server_delete.rs | 15 +++--
 20 files changed, 209 insertions(+), 83 deletions(-)

diff --git a/Revolt.toml b/Revolt.toml
index 97da148d6..e5058c51b 100644
--- a/Revolt.toml
+++ b/Revolt.toml
@@ -20,10 +20,14 @@ api = "http://local.revolt.chat:14702"
 events = "ws://local.revolt.chat:14703"
 autumn = "http://local.revolt.chat:14704"
 january = "http://local.revolt.chat:14705"
-livekit = "ws://local.revolt.chat:14706"
 voso_legacy = ""
 voso_legacy_ws = ""
 
+# Public urls for livekit nodes
+# each entry here should have a corresponding entry under `api.livekit.nodes`
+[hosts.livekit]
+worldwide = "ws://local.revolt.chat:14706"
+
 [api]
 
 [api.smtp]
@@ -38,9 +42,16 @@ port = 14025
 use_tls = false
 
 [api.livekit]
-url = "ws://local.revolt.chat:14706"
-key = ""
-secret = ""
+
+# Config for livekit nodes
+# Make sure to change the secret when deploying
+# The key and secret should match the values livekit is using
+[api.livekit.nodes.worldwide]
+url = "http://livekit"
+lat = 0.0
+lon = 0.0
+key = "worldwide_key"
+secret = "ZjCofRlfm6GGtjlifmNpCDkcQbEIIVC0"
 
 [files.s3]
 # S3 protocol endpoint
diff --git a/crates/core/config/Revolt.toml b/crates/core/config/Revolt.toml
index d298a2d7f..c2c2c2b3a 100644
--- a/crates/core/config/Revolt.toml
+++ b/crates/core/config/Revolt.toml
@@ -17,10 +17,11 @@ api = "http://local.revolt.chat/api"
 events = "ws://local.revolt.chat/ws"
 autumn = "http://local.revolt.chat/autumn"
 january = "http://local.revolt.chat/january"
-livekit = "ws://local.revolt.chat/livekit"
 voso_legacy = ""
 voso_legacy_ws = ""
 
+[hosts.livekit]
+
 [rabbit]
 host = "rabbit"
 port = 5672
@@ -64,13 +65,8 @@ hcaptcha_sitekey = ""
 max_concurrent_connections = 50
 
 [api.livekit]
-# Livekit server url
-url = "ws://local.revolt.chat/livekit"
-# Livekit security key name
-key = ""
-# Livekit security secret value
-secret = ""
 
+[api.livekit.nodes]
 
 [pushd]
 # this changes the names of the queues to not overlap 
diff --git a/crates/core/config/src/lib.rs b/crates/core/config/src/lib.rs
index 168788dcc..5e6404348 100644
--- a/crates/core/config/src/lib.rs
+++ b/crates/core/config/src/lib.rs
@@ -105,7 +105,7 @@ pub struct Hosts {
     pub events: String,
     pub autumn: String,
     pub january: String,
-    pub livekit: String
+    pub livekit: HashMap<String, String>
 }
 
 #[derive(Deserialize, Debug, Clone)]
@@ -176,7 +176,14 @@ pub struct ApiWorkers {
 
 #[derive(Deserialize, Debug, Clone)]
 pub struct ApiLiveKit {
+    pub nodes: HashMap<String, LiveKitNode>
+}
+
+#[derive(Deserialize, Debug, Clone)]
+pub struct LiveKitNode {
     pub url: String,
+    pub lat: f64,
+    pub lon: f64,
     pub key: String,
     pub secret: String
 }
diff --git a/crates/core/database/src/voice/mod.rs b/crates/core/database/src/voice/mod.rs
index 18380660a..10ee8b168 100644
--- a/crates/core/database/src/voice/mod.rs
+++ b/crates/core/database/src/voice/mod.rs
@@ -35,6 +35,24 @@ pub async fn raise_if_in_voice(user: &User, target: &str) -> Result<()> {
     }
 }
 
+pub async fn set_channel_node(channel: &str, node: &str) -> Result<()> {
+    get_connection()
+        .await?
+        .set(format!("node:{channel}"), node)
+        .await
+        .to_internal_error()?;
+
+    Ok(())
+}
+
+pub async fn get_channel_node(channel: &str) -> Result<String> {
+    get_connection()
+        .await?
+        .get(format!("node:{channel}"))
+        .await
+        .to_internal_error()
+}
+
 pub async fn get_user_voice_channels(user_id: &str) -> Result<Vec<String>> {
     get_connection()
         .await?
@@ -207,10 +225,10 @@ pub async fn update_voice_state(
     Ok(())
 }
 
-pub async fn get_voice_channel_members(channel_id: &str) -> Result<Vec<String>> {
+pub async fn get_voice_channel_members(channel_id: &str) -> Result<Option<Vec<String>>> {
     get_connection()
         .await?
-        .smembers::<_, Vec<String>>(format!("vc_members:{}", channel_id))
+        .smembers(format!("vc_members:{}", channel_id))
         .await
         .to_internal_error()
 }
@@ -255,8 +273,9 @@ pub async fn get_channel_voice_state(channel: &Channel) -> Result<Option<v0::Cha
         _ => None
     };
 
-    if !members.is_empty() {
+    if let Some(members) = members {
         let mut participants = Vec::with_capacity(members.len());
+        let node = get_channel_node(channel.id()).await?;
 
         for user_id in members {
             if let Some(voice_state) = get_voice_state(channel.id(), server, &user_id).await? {
@@ -271,6 +290,7 @@ pub async fn get_channel_voice_state(channel: &Channel) -> Result<Option<v0::Cha
         Ok(Some(v0::ChannelVoiceState {
             id: channel.id().to_string(),
             participants,
+            node
         }))
     } else {
         Ok(None)
@@ -292,17 +312,18 @@ pub async fn move_user(user: &str, from: &str, to: &str) -> Result<()> {
 }
 
 pub async fn sync_voice_permissions(db: &Database, voice_client: &VoiceClient, channel: &Channel, server: Option<&Server>, role_id: Option<&str>) -> Result<()> {
+    let node = get_channel_node(channel.id()).await?;
 
-    for user_id in get_voice_channel_members(channel.id()).await? {
+    for user_id in get_voice_channel_members(channel.id()).await?.iter().flatten() {
         let user = Reference::from_unchecked(user_id.clone()).as_user(db).await?;
 
-        sync_user_voice_permissions(db, voice_client, &user, channel, server, role_id).await?;
+        sync_user_voice_permissions(db, voice_client, &node, &user, channel, server, role_id).await?;
     };
 
     Ok(())
 }
 
-pub async fn sync_user_voice_permissions(db: &Database, voice_client: &VoiceClient, user: &User, channel: &Channel, server: Option<&Server>, role_id: Option<&str>) -> Result<()> {
+pub async fn sync_user_voice_permissions(db: &Database, voice_client: &VoiceClient, node: &str, user: &User, channel: &Channel, server: Option<&Server>, role_id: Option<&str>) -> Result<()> {
     let channel_id = channel.id();
     let server_id: Option<&str> = server.as_ref().map(|s| s.id.as_str());
 
@@ -315,7 +336,8 @@ pub async fn sync_user_voice_permissions(db: &Database, voice_client: &VoiceClie
         let voice_state = get_voice_state(channel_id, server_id, &user.id).await?.unwrap();
 
         let mut query = DatabasePermissionQuery::new(db, user)
-            .channel(channel);
+            .channel(channel)
+            .user(user);
 
         if let (Some(server), Some(member)) = (server, member.as_ref()) {
                 query = query.member(member).server(server)
@@ -340,7 +362,7 @@ pub async fn sync_user_voice_permissions(db: &Database, voice_client: &VoiceClie
 
         update_voice_state(channel_id, server_id, &user.id, &update_event).await?;
 
-        voice_client.update_permissions(user, channel_id, ParticipantPermission {
+        voice_client.update_permissions(node, user, channel_id, ParticipantPermission {
             can_subscribe: can_listen,
             can_publish: can_speak,
             can_publish_data: can_speak,
diff --git a/crates/core/database/src/voice/voice_client.rs b/crates/core/database/src/voice/voice_client.rs
index a6b2ba033..ea6f52e80 100644
--- a/crates/core/database/src/voice/voice_client.rs
+++ b/crates/core/database/src/voice/voice_client.rs
@@ -1,9 +1,9 @@
 use livekit_api::{
     access_token::{AccessToken, VideoGrants},
-    services::room::{CreateRoomOptions, RoomClient, UpdateParticipantOptions},
+    services::room::{CreateRoomOptions, RoomClient as InnerRoomClient, UpdateParticipantOptions},
 };
 use livekit_protocol::{ParticipantInfo, ParticipantPermission, Room};
-use revolt_config::config;
+use revolt_config::{config, LiveKitNode};
 use crate::models::{Channel, User};
 use revolt_models::v0;
 use revolt_permissions::{ChannelPermission, PermissionValue};
@@ -12,41 +12,59 @@ use std::{borrow::Cow, collections::HashMap, time::Duration};
 
 use super::get_allowed_sources;
 
+
+#[derive(Debug)]
+pub struct RoomClient {
+    pub client: InnerRoomClient,
+    pub node: LiveKitNode
+}
+
 #[derive(Debug)]
 pub struct VoiceClient {
-    rooms: RoomClient,
-    api_key: String,
-    api_secret: String,
+    pub rooms: HashMap<String, RoomClient>
 }
 
 impl VoiceClient {
-    pub fn new(url: String, api_key: String, api_secret: String) -> Self {
+    pub fn new(nodes: HashMap<String, LiveKitNode>) -> Self {
         Self {
-            rooms: RoomClient::with_api_key(&url, &api_key, &api_secret),
-            api_key,
-            api_secret,
+            rooms: nodes
+                .into_iter()
+                .map(|(name, node)|
+                    (
+                        name,
+                        RoomClient {
+                            client: InnerRoomClient::with_api_key(&node.url, &node.key, &node.secret),
+                            node
+                        }
+                    )
+                )
+                .collect()
         }
     }
 
     pub async fn from_revolt_config() -> Self {
         let config = config().await;
 
-        Self::new(
-            config.hosts.livekit,
-            config.api.livekit.key,
-            config.api.livekit.secret,
-        )
+        Self::new(config.api.livekit.nodes.clone())
+    }
+
+    pub fn get_node(&self, name: &str) -> Result<&RoomClient> {
+        self.rooms.get(name)
+            .ok_or_else(|| create_error!(UnknownNode))
     }
 
     pub fn create_token(
         &self,
+        node: &str,
         user: &User,
         permissions: PermissionValue,
         channel: &Channel,
     ) -> Result<String> {
+        let room = self.get_node(node)?;
+
         let allowed_sources = get_allowed_sources(permissions);
 
-        AccessToken::with_api_key(&self.api_key, &self.api_secret)
+        AccessToken::with_api_key(&room.node.key, &room.node.secret)
             .with_name(&format!("{}#{}", user.username, user.discriminator))
             .with_identity(&user.id)
             .with_metadata(&serde_json::to_string(&user).to_internal_error()?)
@@ -63,7 +81,9 @@ impl VoiceClient {
             .to_internal_error()
     }
 
-    pub async fn create_room(&self, channel: &Channel) -> Result<Room> {
+    pub async fn create_room(&self, node: &str, channel: &Channel) -> Result<Room> {
+        let room = self.get_node(node)?;
+
         let voice = match channel {
             Channel::DirectMessage { .. } | Channel::VoiceChannel { .. } => Some(Cow::Owned(v0::VoiceInformation::default())),
             Channel::TextChannel { voice: Some(voice), .. } => Some(Cow::Borrowed(voice)),
@@ -72,7 +92,7 @@ impl VoiceClient {
 
             .ok_or_else(|| create_error!(NotAVoiceChannel))?;
 
-        self.rooms
+        room.client
             .create_room(
                 channel.id(),
                 CreateRoomOptions {
@@ -87,11 +107,14 @@ impl VoiceClient {
 
     pub async fn update_permissions(
         &self,
+        node: &str,
         user: &User,
         channel_id: &str,
         new_permissions: ParticipantPermission,
     ) -> Result<ParticipantInfo> {
-        self.rooms
+        let room = self.get_node(node)?;
+
+        room.client
             .update_participant(
                 channel_id,
                 &user.id,
@@ -106,8 +129,10 @@ impl VoiceClient {
             .to_internal_error()
     }
 
-    pub async fn remove_user(&self, user_id: &str, channel_id: &str) -> Result<()> {
-        self.rooms.remove_participant(channel_id, user_id)
+    pub async fn remove_user(&self, node: &str, user_id: &str, channel_id: &str) -> Result<()> {
+        let room = self.get_node(node)?;
+
+        room.client.remove_participant(channel_id, user_id)
             .await
             .to_internal_error()
     }
diff --git a/crates/core/models/src/v0/channels.rs b/crates/core/models/src/v0/channels.rs
index 7947f1fa8..e4dafbe08 100644
--- a/crates/core/models/src/v0/channels.rs
+++ b/crates/core/models/src/v0/channels.rs
@@ -315,7 +315,14 @@ auto_derived!(
     pub struct ChannelVoiceState {
         pub id: String,
         /// The states of the users who are connected to the channel
-        pub participants: Vec<UserVoiceState>
+        pub participants: Vec<UserVoiceState>,
+        /// The node's node which the channel is currently using
+        pub node: String
+    }
+
+    /// Join a voice channel
+    pub struct DataJoinCall {
+        pub node: String
     }
 
 );
diff --git a/crates/core/permissions/src/models/channel.rs b/crates/core/permissions/src/models/channel.rs
index 0b2867ae8..252fb35a4 100644
--- a/crates/core/permissions/src/models/channel.rs
+++ b/crates/core/permissions/src/models/channel.rs
@@ -128,6 +128,7 @@ pub static DEFAULT_PERMISSION: Lazy<u64> = Lazy::new(|| {
             + ChannelPermission::Connect
             + ChannelPermission::Speak
             + ChannelPermission::Listen
+            + ChannelPermission::Video
     )
 });
 
diff --git a/crates/core/result/src/axum.rs b/crates/core/result/src/axum.rs
index 78c35eb76..813ba76ac 100644
--- a/crates/core/result/src/axum.rs
+++ b/crates/core/result/src/axum.rs
@@ -78,6 +78,7 @@ impl IntoResponse for Error {
             ErrorType::AlreadyInVoiceChannel => StatusCode::BAD_REQUEST,
             ErrorType::NotAVoiceChannel => StatusCode::BAD_REQUEST,
             ErrorType::AlreadyConnected => StatusCode::BAD_REQUEST,
+            ErrorType::UnknownNode => StatusCode::BAD_REQUEST,
             ErrorType::ProxyError => StatusCode::BAD_REQUEST,
             ErrorType::FileTooSmall => StatusCode::UNPROCESSABLE_ENTITY,
             ErrorType::FileTooLarge { .. } => StatusCode::UNPROCESSABLE_ENTITY,
diff --git a/crates/core/result/src/lib.rs b/crates/core/result/src/lib.rs
index e9d4f24b2..9be2de7e5 100644
--- a/crates/core/result/src/lib.rs
+++ b/crates/core/result/src/lib.rs
@@ -161,6 +161,7 @@ pub enum ErrorType {
     AlreadyInVoiceChannel,
     NotAVoiceChannel,
     AlreadyConnected,
+    UnknownNode,
     // ? Micro-service errors
     ProxyError,
     FileTooSmall,
diff --git a/crates/core/result/src/rocket.rs b/crates/core/result/src/rocket.rs
index 046b06843..78a7f8444 100644
--- a/crates/core/result/src/rocket.rs
+++ b/crates/core/result/src/rocket.rs
@@ -82,6 +82,7 @@ impl<'r> Responder<'r, 'static> for Error {
             ErrorType::AlreadyInVoiceChannel => Status::BadRequest,
             ErrorType::NotAVoiceChannel => Status::BadRequest,
             ErrorType::AlreadyConnected => Status::BadRequest,
+            ErrorType::UnknownNode => Status::BadRequest,
             ErrorType::ProxyError => Status::BadRequest,
             ErrorType::FileTooSmall => Status::UnprocessableEntity,
             ErrorType::FileTooLarge { .. } => Status::UnprocessableEntity,
diff --git a/crates/daemons/voice-ingress/src/main.rs b/crates/daemons/voice-ingress/src/main.rs
index 04ec6e092..6bf98c228 100644
--- a/crates/daemons/voice-ingress/src/main.rs
+++ b/crates/daemons/voice-ingress/src/main.rs
@@ -1,15 +1,16 @@
 use std::env;
 
 
-use livekit_protocol::{TrackType, WebhookEvent};
+use livekit_protocol::TrackType;
+use livekit_api::{access_token::TokenVerifier, webhooks::WebhookReceiver};
 use revolt_database::{
     events::client::EventV1, util::reference::Reference, Database, DatabaseInfo,
     voice::{create_voice_state, delete_voice_state, update_voice_state_tracks, VoiceClient}
 };
-use rocket::{build, post, routes, serde::json::Json, Config, State};
+use rocket::{build, http::Status, post, request::{FromRequest, Outcome}, routes, Config, Request, State};
 use rocket_empty::EmptyResponse;
-
-use revolt_result::{Result, ToRevoltError};
+use std::net::Ipv4Addr;
+use revolt_result::{create_error, Error, Result, ToRevoltError};
 
 #[rocket::main]
 async fn main() -> Result<(), rocket::Error> {
@@ -17,13 +18,13 @@ async fn main() -> Result<(), rocket::Error> {
 
     let database = DatabaseInfo::Auto.connect().await.unwrap();
     let voice_client = VoiceClient::from_revolt_config().await;
-
     let _rocket = build()
         .manage(database)
         .manage(voice_client)
         .mount("/", routes![ingress])
         .configure(Config {
             port: 8500,
+            address: Ipv4Addr::new(0, 0, 0, 0).into(),
             ..Default::default()
         })
         .ignite()
@@ -34,14 +35,44 @@ async fn main() -> Result<(), rocket::Error> {
     Ok(())
 }
 
-#[post("/", data = "<body>")]
-async fn ingress(db: &State<Database>, voice_client: &State<VoiceClient>, body: Json<WebhookEvent>) -> Result<EmptyResponse> {
+struct AuthHeader<'a>(&'a str);
+
+#[rocket::async_trait]
+impl<'r> FromRequest<'r> for AuthHeader<'r> {
+    type Error = Error;
+
+    async fn from_request(request: &'r Request<'_>) -> Outcome<Self, Self::Error> {
+        match request.headers().get("Authorization").next() {
+            Some(token) => Outcome::Success(Self(token)),
+            None => Outcome::Error((Status::Unauthorized, create_error!(NotAuthenticated)))
+        }
+    }
+}
+
+impl std::ops::Deref for AuthHeader<'_> {
+    type Target = str;
+
+    fn deref(&self) -> &Self::Target {
+        self.0
+    }
+}
+
+#[post("/<node>", data = "<body>")]
+async fn ingress(db: &State<Database>, node: &str, voice_client: &State<VoiceClient>, auth_header: AuthHeader<'_>, body: &str) -> Result<EmptyResponse> {
     log::debug!("received event: {body:?}");
 
-    let channel_id = body.room.as_ref().map(|r| &r.name);
-    let user_id = body.participant.as_ref().map(|r| &r.identity);
+    let config = revolt_config::config().await;
+
+    let node_info = config.api.livekit.nodes.get(node)
+        .ok_or_else(|| create_error!(NotAuthenticated))?;
+
+    let webhook_receiver = WebhookReceiver::new(TokenVerifier::with_api_key(&node_info.key, &node_info.secret));
+    let event = webhook_receiver.receive(body, &auth_header).to_internal_error()?;
+
+    let channel_id = event.room.as_ref().map(|r| &r.name);
+    let user_id = event.participant.as_ref().map(|r| &r.identity);
 
-    match body.event.as_str() {
+    match event.event.as_str() {
         "participant_joined" => {
             let channel_id = channel_id.to_internal_error()?;
             let user_id = user_id.to_internal_error()?;
@@ -79,20 +110,22 @@ async fn ingress(db: &State<Database>, voice_client: &State<VoiceClient>, body:
         "track_published" | "track_unpublished" => {
             let channel_id = channel_id.to_internal_error()?;
             let user_id = user_id.to_internal_error()?;
-            let track = body.track.as_ref().to_internal_error()?;
+            let track = event.track.as_ref().to_internal_error()?;
 
             let channel = Reference::from_unchecked(channel_id.clone())
                 .as_channel(db)
                 .await?;
 
             // remove the user if they try publish a video larger than 1080x720 or they publish data
-            if body.event == "track_published"
+            // TODO: move to config
+            if event.event == "track_published"
                 && (
-                    (track.r#type == TrackType::Video as i32 && (track.width > 1080 || track.height > 720))
+                    // handle any size which goes over the limit of "1080x720" to stop people from making too tall or too wide and bypassing the limit
+                    (track.r#type == TrackType::Video as i32 && (track.width * track.height) >= (1080 * 720))
                     | (track.r#type == TrackType::Data as i32)
                 )
             {
-                voice_client.remove_user(user_id, channel_id).await?;
+                voice_client.remove_user(node, user_id, channel_id).await?;
                 delete_voice_state(channel_id, channel.server(), user_id).await?;
             }
 
@@ -100,7 +133,7 @@ async fn ingress(db: &State<Database>, voice_client: &State<VoiceClient>, body:
                 channel_id,
                 channel.server(),
                 user_id,
-                body.event == "track_published",  // to avoid duplicating this entire case twice
+                event.event == "track_published",  // to avoid duplicating this entire case twice
                 track.source
             ).await?;
 
diff --git a/crates/delta/src/main.rs b/crates/delta/src/main.rs
index f9feb40b3..aaa769325 100644
--- a/crates/delta/src/main.rs
+++ b/crates/delta/src/main.rs
@@ -84,7 +84,7 @@ pub async fn web() -> Rocket<Build> {
     .into();
 
     // Voice handler
-    let voice_client = VoiceClient::new(config.api.livekit.url.clone(), config.api.livekit.key.clone(), config.api.livekit.secret.clone());
+    let voice_client = VoiceClient::new(config.api.livekit.nodes.clone());
     // Configure Rabbit
     let connection = Connection::open(&OpenConnectionArguments::new(
         &config.rabbit.host,
diff --git a/crates/delta/src/routes/channels/channel_delete.rs b/crates/delta/src/routes/channels/channel_delete.rs
index f3dab86db..4264e47b1 100644
--- a/crates/delta/src/routes/channels/channel_delete.rs
+++ b/crates/delta/src/routes/channels/channel_delete.rs
@@ -1,5 +1,5 @@
 use revolt_database::{
-    util::{permissions::DatabasePermissionQuery, reference::Reference}, voice::{delete_voice_state, get_voice_channel_members, VoiceClient}, Channel, Database, PartialChannel, User, AMQP
+    util::{permissions::DatabasePermissionQuery, reference::Reference}, voice::{delete_voice_state, get_channel_node, get_voice_channel_members, VoiceClient}, Channel, Database, PartialChannel, User, AMQP
 };
 use revolt_models::v0;
 use revolt_permissions::{calculate_channel_permissions, ChannelPermission};
@@ -53,9 +53,13 @@ pub async fn delete(
         }
     };
 
-    for user_id in get_voice_channel_members(channel.id()).await? {
-        voice_client.remove_user(&user_id, channel.id()).await?;
-        delete_voice_state(channel.id(), channel.server(), &user.id).await?;
+    if let Some(users) = get_voice_channel_members(channel.id()).await? {
+        let node = get_channel_node(channel.id()).await?;
+
+        for user in users {
+            voice_client.remove_user(&node, &user, channel.id()).await?;
+            delete_voice_state(channel.id(), channel.server(), &user).await?;
+        }
     };
 
     Ok(EmptyResponse)
diff --git a/crates/delta/src/routes/channels/group_remove_member.rs b/crates/delta/src/routes/channels/group_remove_member.rs
index 9836a7c39..0f6291bb1 100644
--- a/crates/delta/src/routes/channels/group_remove_member.rs
+++ b/crates/delta/src/routes/channels/group_remove_member.rs
@@ -1,4 +1,4 @@
-use revolt_database::{util::reference::Reference, voice::{delete_voice_state, is_in_voice_channel, raise_if_in_voice, VoiceClient}, Channel, Database, User, AMQP};
+use revolt_database::{util::reference::Reference, voice::{delete_voice_state, get_channel_node, is_in_voice_channel, raise_if_in_voice, VoiceClient}, Channel, Database, User, AMQP};
 use revolt_permissions::ChannelPermission;
 use revolt_result::{create_error, Result};
 
@@ -48,7 +48,9 @@ pub async fn remove_member(
     };
 
     if is_in_voice_channel(&user.id, channel.id()).await? {
-        voice_client.remove_user(&user.id, channel.id()).await?;
+        let node = get_channel_node(channel.id()).await?;
+        
+        voice_client.remove_user(&node, &user.id, channel.id()).await?;
         delete_voice_state(channel.id(), None, &user.id).await?;
     };
 
diff --git a/crates/delta/src/routes/channels/voice_join.rs b/crates/delta/src/routes/channels/voice_join.rs
index c2f9f3096..313590885 100644
--- a/crates/delta/src/routes/channels/voice_join.rs
+++ b/crates/delta/src/routes/channels/voice_join.rs
@@ -1,7 +1,7 @@
 use revolt_models::v0;
 use revolt_database::{util::{permissions::perms, reference::Reference}, voice::{raise_if_in_voice, VoiceClient}, Channel, Database, SystemMessage, User, AMQP};
 use revolt_permissions::{calculate_channel_permissions, ChannelPermission};
-use revolt_result::Result;
+use revolt_result::{create_error, Result};
 
 use rocket::{serde::json::Json, State};
 
@@ -9,8 +9,12 @@ use rocket::{serde::json::Json, State};
 ///
 /// Asks the voice server for a token to join the call.
 #[openapi(tag = "Voice")]
-#[post("/<target>/join_call")]
-pub async fn call(db: &State<Database>, amqp: &State<AMQP>, voice: &State<VoiceClient>, user: User, target: Reference) -> Result<Json<v0::CreateVoiceUserResponse>> {
+#[post("/<target>/join_call", data="<data>")]
+pub async fn call(db: &State<Database>, amqp: &State<AMQP>, voice: &State<VoiceClient>, user: User, target: Reference, data: Json<v0::DataJoinCall>) -> Result<Json<v0::CreateVoiceUserResponse>> {
+    if !voice.rooms.contains_key(&data.node) {
+        return Err(create_error!(UnknownNode))
+    }
+
     let channel = target.as_channel(db).await?;
 
     raise_if_in_voice(&user, channel.id()).await?;
@@ -20,8 +24,8 @@ pub async fn call(db: &State<Database>, amqp: &State<AMQP>, voice: &State<VoiceC
     let current_permissions = calculate_channel_permissions(&mut permissions).await;
     current_permissions.throw_if_lacking_channel_permission(ChannelPermission::Connect)?;
 
-    let token = voice.create_token(&user, current_permissions, &channel)?;
-    let room = voice.create_room(&channel).await?;
+    let token = voice.create_token(&data.node, &user, current_permissions, &channel)?;
+    let room = voice.create_room(&data.node, &channel).await?;
 
     log::debug!("Created room {}", room.name);
 
diff --git a/crates/delta/src/routes/root.rs b/crates/delta/src/routes/root.rs
index 6d670398c..d928a8aad 100644
--- a/crates/delta/src/routes/root.rs
+++ b/crates/delta/src/routes/root.rs
@@ -25,9 +25,7 @@ pub struct Feature {
 #[derive(Serialize, JsonSchema, Debug)]
 pub struct VoiceFeature {
     /// Whether voice is enabled
-    pub enabled: bool,
-    /// URL pointing to the voice API
-    pub url: String
+    pub enabled: bool
 }
 
 /// # Feature Configuration
@@ -105,8 +103,7 @@ pub async fn root() -> Result<Json<RevoltConfig>> {
                 url: config.hosts.january,
             },
             livekit: VoiceFeature {
-                enabled: !config.hosts.livekit.is_empty(),
-                url: config.hosts.livekit.to_string(),
+                enabled: !config.hosts.livekit.is_empty()
             },
         },
         ws: config.hosts.events,
diff --git a/crates/delta/src/routes/servers/ban_create.rs b/crates/delta/src/routes/servers/ban_create.rs
index 96a8d4c92..491347bb3 100644
--- a/crates/delta/src/routes/servers/ban_create.rs
+++ b/crates/delta/src/routes/servers/ban_create.rs
@@ -1,6 +1,6 @@
 use revolt_database::{
     util::{permissions::DatabasePermissionQuery, reference::Reference},
-    voice::{delete_voice_state, get_user_voice_channel_in_server, VoiceClient},
+    voice::{delete_voice_state, get_channel_node, get_user_voice_channel_in_server, VoiceClient},
     Database, RemovalIntention, ServerBan, User,
 };
 use revolt_models::v0;
@@ -61,7 +61,8 @@ pub async fn ban(
 
         // If the member is in a voice channel while banned kick them from the voice channel
         if let Some(channel_id) = get_user_voice_channel_in_server(&user.id, &server.id).await? {
-            voice_client.remove_user(&user.id, &channel_id).await?;
+            let node = get_channel_node(&channel_id).await?;
+            voice_client.remove_user(&node, &user.id, &channel_id).await?;
             delete_voice_state(&channel_id, Some(&server.id), &user.id).await?
         }
     }
diff --git a/crates/delta/src/routes/servers/member_edit.rs b/crates/delta/src/routes/servers/member_edit.rs
index 16ebbd963..e08bbfd52 100644
--- a/crates/delta/src/routes/servers/member_edit.rs
+++ b/crates/delta/src/routes/servers/member_edit.rs
@@ -7,7 +7,7 @@ use redis_kiss::{get_connection, redis::Pipeline, AsyncCommands};
 use revolt_database::{
     events::client::EventV1,
     util::{permissions::DatabasePermissionQuery, reference::Reference},
-    voice::{get_user_voice_channel_in_server, move_user, sync_user_voice_permissions, VoiceClient},
+    voice::{get_channel_node, get_user_voice_channel_in_server, move_user, sync_user_voice_permissions, VoiceClient},
     Database, File, PartialMember, User,
 };
 use revolt_models::v0::{self, FieldsMember, PartialUserVoiceState};
@@ -185,6 +185,8 @@ pub async fn edit(
         partial.avatar = Some(File::use_user_avatar(db, &avatar, &user.id, &user.id).await?);
     }
 
+    // TODO: impelement moving users
+
     let remove_contains_voice = remove
         .as_ref()
         .map(|r| r.contains(FieldsMember::CanPublish) || r.contains(FieldsMember::CanReceive))
@@ -196,9 +198,11 @@ pub async fn edit(
         || remove_contains_voice
     {
         if let Some(channel) = get_user_voice_channel_in_server(&target_user.id, &server.id).await? {
+            let node = get_channel_node(&channel).await?;
             let channel = Reference::from_unchecked(channel).as_channel(db).await?;
 
-            sync_user_voice_permissions(db, voice_client, &user, &channel, Some(&server), None).await?;
+
+            sync_user_voice_permissions(db, voice_client, &node, &user, &channel, Some(&server), None).await?;
         };
     };
 
diff --git a/crates/delta/src/routes/servers/member_remove.rs b/crates/delta/src/routes/servers/member_remove.rs
index 3276add74..9315b1b4a 100644
--- a/crates/delta/src/routes/servers/member_remove.rs
+++ b/crates/delta/src/routes/servers/member_remove.rs
@@ -1,6 +1,6 @@
 use revolt_database::{
     util::{permissions::DatabasePermissionQuery, reference::Reference},
-    voice::{delete_voice_state, get_user_voice_channel_in_server, VoiceClient},
+    voice::{delete_voice_state, get_channel_node, get_user_voice_channel_in_server, VoiceClient},
     Database, RemovalIntention, User,
 };
 use revolt_permissions::{calculate_server_permissions, ChannelPermission};
@@ -43,7 +43,9 @@ pub async fn kick(
     }
 
     if let Some(channel_id) = get_user_voice_channel_in_server(&user.id, &server.id).await? {
-        voice_client.remove_user(&user.id, &channel_id).await?;
+        let node = get_channel_node(&channel_id).await?;
+
+        voice_client.remove_user(&node, &user.id, &channel_id).await?;
         delete_voice_state(&channel_id, Some(&server.id), &user.id).await?;
     }
 
diff --git a/crates/delta/src/routes/servers/server_delete.rs b/crates/delta/src/routes/servers/server_delete.rs
index 1cae301c8..abf6724f7 100644
--- a/crates/delta/src/routes/servers/server_delete.rs
+++ b/crates/delta/src/routes/servers/server_delete.rs
@@ -1,6 +1,6 @@
 use revolt_database::{
     util::reference::Reference,
-    voice::{delete_voice_state, get_user_voice_channel_in_server, VoiceClient},
+    voice::{delete_voice_state, get_channel_node, get_user_voice_channel_in_server, get_voice_channel_members, VoiceClient},
     Database, RemovalIntention, User,
 };
 use revolt_models::v0;
@@ -26,15 +26,22 @@ pub async fn delete(
 
     if server.owner == user.id {
         for channel_id in &server.channels {
-            voice_client.remove_user(&user.id, channel_id).await?;
-            delete_voice_state(channel_id, Some(&server.id), &user.id).await?;
+            if let Some(users) = get_voice_channel_members(channel_id).await? {
+                let node = get_channel_node(channel_id).await?;
+
+                for user in users {
+                    voice_client.remove_user(&node, &user, channel_id).await?;
+                    delete_voice_state(channel_id, Some(&server.id), &user).await?;
+                }
+            }
         }
 
         server.delete(db).await
     } else {
         if let Some(channel_id) = get_user_voice_channel_in_server(&user.id, &server.id).await? {
             if server.channels.iter().any(|c| c == &channel_id) {
-                voice_client.remove_user(&user.id, &channel_id).await?;
+                let node = get_channel_node(&channel_id).await?;
+                voice_client.remove_user(&node, &user.id, &channel_id).await?;
                 delete_voice_state(&channel_id, Some(&server.id), &user.id).await?;
             }
         };

From 951128032bfdf7f8d74f4098cb41a511d2bc8b19 Mon Sep 17 00:00:00 2001
From: Zomatree <me@zomatree.live>
Date: Mon, 17 Feb 2025 01:48:34 +0000
Subject: [PATCH 16/62] fix: expose list of nodes

---
 crates/delta/src/routes/root.rs | 30 +++++++++++++++++++++++++-----
 1 file changed, 25 insertions(+), 5 deletions(-)

diff --git a/crates/delta/src/routes/root.rs b/crates/delta/src/routes/root.rs
index d928a8aad..6b42497c9 100644
--- a/crates/delta/src/routes/root.rs
+++ b/crates/delta/src/routes/root.rs
@@ -21,11 +21,22 @@ pub struct Feature {
     pub url: String,
 }
 
+/// # Information about a livekit node
+#[derive(Serialize, JsonSchema, Debug)]
+pub struct VoiceNode {
+    pub name: String,
+    pub lat: f64,
+    pub lon: f64,
+    pub public_url: String
+}
+
 /// # Voice Server Configuration
 #[derive(Serialize, JsonSchema, Debug)]
 pub struct VoiceFeature {
     /// Whether voice is enabled
-    pub enabled: bool
+    pub enabled: bool,
+    /// All livekit nodes
+    pub nodes: Vec<VoiceNode>,
 }
 
 /// # Feature Configuration
@@ -90,20 +101,29 @@ pub async fn root() -> Result<Json<RevoltConfig>> {
         features: RevoltFeatures {
             captcha: CaptchaFeature {
                 enabled: !config.api.security.captcha.hcaptcha_key.is_empty(),
-                key: config.api.security.captcha.hcaptcha_sitekey,
+                key: config.api.security.captcha.hcaptcha_sitekey.clone(),
             },
             email: !config.api.smtp.host.is_empty(),
             invite_only: config.api.registration.invite_only,
             autumn: Feature {
                 enabled: !config.hosts.autumn.is_empty(),
-                url: config.hosts.autumn,
+                url: config.hosts.autumn.clone(),
             },
             january: Feature {
                 enabled: !config.hosts.january.is_empty(),
-                url: config.hosts.january,
+                url: config.hosts.january.clone(),
             },
             livekit: VoiceFeature {
-                enabled: !config.hosts.livekit.is_empty()
+                enabled: !config.hosts.livekit.is_empty(),
+                nodes: config.api.livekit.nodes.iter().map(|(name, value)| {
+                    VoiceNode {
+                        name: name.clone(),
+                        lat: value.lat,
+                        lon: value.lon,
+                        public_url: config.hosts.livekit.get(name).expect("Missing corresponding host for voice node").clone()
+                    }
+                })
+                .collect()
             },
         },
         ws: config.hosts.events,

From 9c2cc8736c4ae3171434e8031ee52c5bd0a3927e Mon Sep 17 00:00:00 2001
From: Zomatree <me@zomatree.live>
Date: Mon, 17 Feb 2025 02:11:32 +0000
Subject: [PATCH 17/62] fix: respond with the url when joining a voice channel

---
 crates/core/models/src/v0/channels.rs          |  2 ++
 crates/delta/src/routes/channels/voice_join.rs | 10 ++++++----
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/crates/core/models/src/v0/channels.rs b/crates/core/models/src/v0/channels.rs
index e4dafbe08..efd65aeb8 100644
--- a/crates/core/models/src/v0/channels.rs
+++ b/crates/core/models/src/v0/channels.rs
@@ -309,6 +309,8 @@ auto_derived!(
     pub struct CreateVoiceUserResponse {
         /// Token for authenticating with the voice server
         pub token: String,
+        /// Url of the livekit server to connect to
+        pub url: String
     }
 
     /// Voice state for a channel
diff --git a/crates/delta/src/routes/channels/voice_join.rs b/crates/delta/src/routes/channels/voice_join.rs
index 313590885..eebbdc719 100644
--- a/crates/delta/src/routes/channels/voice_join.rs
+++ b/crates/delta/src/routes/channels/voice_join.rs
@@ -1,3 +1,4 @@
+use revolt_config::config;
 use revolt_models::v0;
 use revolt_database::{util::{permissions::perms, reference::Reference}, voice::{raise_if_in_voice, VoiceClient}, Channel, Database, SystemMessage, User, AMQP};
 use revolt_permissions::{calculate_channel_permissions, ChannelPermission};
@@ -11,9 +12,10 @@ use rocket::{serde::json::Json, State};
 #[openapi(tag = "Voice")]
 #[post("/<target>/join_call", data="<data>")]
 pub async fn call(db: &State<Database>, amqp: &State<AMQP>, voice: &State<VoiceClient>, user: User, target: Reference, data: Json<v0::DataJoinCall>) -> Result<Json<v0::CreateVoiceUserResponse>> {
-    if !voice.rooms.contains_key(&data.node) {
-        return Err(create_error!(UnknownNode))
-    }
+    let config = config().await;
+
+    let node_host = config.hosts.livekit.get(&data.node)
+        .ok_or_else(|| create_error!(UnknownNode))?;
 
     let channel = target.as_channel(db).await?;
 
@@ -50,5 +52,5 @@ pub async fn call(db: &State<Database>, amqp: &State<AMQP>, voice: &State<VoiceC
         _ => {}
     };
 
-    Ok(Json(v0::CreateVoiceUserResponse { token }))
+    Ok(Json(v0::CreateVoiceUserResponse { token, url: node_host.clone() }))
 }

From 8b5e085232f53348b2fb36641bb13c30da2aa5f5 Mon Sep 17 00:00:00 2001
From: Zomatree <me@zomatree.live>
Date: Sat, 1 Mar 2025 22:09:40 +0000
Subject: [PATCH 18/62] feat: being moved between voice channels

---
 crates/core/database/src/events/client.rs     |  5 ++
 crates/core/database/src/voice/mod.rs         | 24 +++++-
 .../core/database/src/voice/voice_client.rs   |  2 +-
 crates/core/result/src/axum.rs                |  2 +-
 crates/core/result/src/lib.rs                 |  2 +-
 crates/core/result/src/rocket.rs              |  2 +-
 crates/daemons/voice-ingress/src/main.rs      | 26 +++++--
 .../src/routes/channels/channel_delete.rs     |  2 +-
 .../routes/channels/group_remove_member.rs    |  4 +-
 crates/delta/src/routes/servers/ban_create.rs |  2 +-
 .../delta/src/routes/servers/member_edit.rs   | 78 ++++++++++++-------
 .../delta/src/routes/servers/member_remove.rs |  2 +-
 .../delta/src/routes/servers/server_delete.rs |  4 +-
 13 files changed, 106 insertions(+), 49 deletions(-)

diff --git a/crates/core/database/src/events/client.rs b/crates/core/database/src/events/client.rs
index 99781ea43..22ef110fa 100644
--- a/crates/core/database/src/events/client.rs
+++ b/crates/core/database/src/events/client.rs
@@ -258,11 +258,16 @@ pub enum EventV1 {
         user: String,
         from: String,
         to: String,
+        state: UserVoiceState
     },
     UserVoiceStateUpdate {
         id: String,
         channel_id: String,
         data: PartialUserVoiceState,
+    },
+    UserMoveVoiceChannel {
+        node: String,
+        token: String
     }
 }
 
diff --git a/crates/core/database/src/voice/mod.rs b/crates/core/database/src/voice/mod.rs
index 10ee8b168..b1e797e46 100644
--- a/crates/core/database/src/voice/mod.rs
+++ b/crates/core/database/src/voice/mod.rs
@@ -29,7 +29,7 @@ pub async fn raise_if_in_voice(user: &User, target: &str) -> Result<()> {
         .to_internal_error()?
         > 0
     {
-        Err(create_error!(AlreadyInVoiceChannel))
+        Err(create_error!(NotConnected))
     } else {
         Ok(())
     }
@@ -45,7 +45,7 @@ pub async fn set_channel_node(channel: &str, node: &str) -> Result<()> {
     Ok(())
 }
 
-pub async fn get_channel_node(channel: &str) -> Result<String> {
+pub async fn get_channel_node(channel: &str) -> Result<Option<String>> {
     get_connection()
         .await?
         .get(format!("node:{channel}"))
@@ -61,6 +61,22 @@ pub async fn get_user_voice_channels(user_id: &str) -> Result<Vec<String>> {
         .to_internal_error()
 }
 
+pub async fn set_user_moved_from_voice(old_channel: &str, new_channel: &str, user_id: &str) -> Result<()> {
+    get_connection()
+        .await?
+        .set_ex(format!("moved_to:{user_id}:{new_channel}"), old_channel, 10)
+        .await
+        .to_internal_error()
+}
+
+pub async fn get_user_moved_from_voice(channel_id: &str, user_id: &str) -> Result<Option<String>> {
+    get_connection()
+        .await?
+        .get(format!("moved_to:{user_id}:{channel_id}"))
+        .await
+        .to_internal_error()
+}
+
 pub async fn is_in_voice_channel(user_id: &str, channel_id: &str) -> Result<bool> {
     get_connection()
         .await?
@@ -275,7 +291,7 @@ pub async fn get_channel_voice_state(channel: &Channel) -> Result<Option<v0::Cha
 
     if let Some(members) = members {
         let mut participants = Vec::with_capacity(members.len());
-        let node = get_channel_node(channel.id()).await?;
+        let node = get_channel_node(channel.id()).await?.unwrap();
 
         for user_id in members {
             if let Some(voice_state) = get_voice_state(channel.id(), server, &user_id).await? {
@@ -312,7 +328,7 @@ pub async fn move_user(user: &str, from: &str, to: &str) -> Result<()> {
 }
 
 pub async fn sync_voice_permissions(db: &Database, voice_client: &VoiceClient, channel: &Channel, server: Option<&Server>, role_id: Option<&str>) -> Result<()> {
-    let node = get_channel_node(channel.id()).await?;
+    let node = get_channel_node(channel.id()).await?.unwrap();
 
     for user_id in get_voice_channel_members(channel.id()).await?.iter().flatten() {
         let user = Reference::from_unchecked(user_id.clone()).as_user(db).await?;
diff --git a/crates/core/database/src/voice/voice_client.rs b/crates/core/database/src/voice/voice_client.rs
index ea6f52e80..52733c8bc 100644
--- a/crates/core/database/src/voice/voice_client.rs
+++ b/crates/core/database/src/voice/voice_client.rs
@@ -97,7 +97,7 @@ impl VoiceClient {
                 channel.id(),
                 CreateRoomOptions {
                     max_participants: voice.max_users.unwrap_or(u32::MAX),
-                    empty_timeout: 5 * 60, // 5 minutes
+                    empty_timeout: 5 * 60, // 5 minutes,
                     ..Default::default()
                 },
             )
diff --git a/crates/core/result/src/axum.rs b/crates/core/result/src/axum.rs
index 813ba76ac..c04d9aa5c 100644
--- a/crates/core/result/src/axum.rs
+++ b/crates/core/result/src/axum.rs
@@ -75,7 +75,7 @@ impl IntoResponse for Error {
             ErrorType::NoEffect => StatusCode::OK,
             ErrorType::FailedValidation { .. } => StatusCode::BAD_REQUEST,
             ErrorType::LiveKitUnavailable => StatusCode::BAD_REQUEST,
-            ErrorType::AlreadyInVoiceChannel => StatusCode::BAD_REQUEST,
+            ErrorType::NotConnected => StatusCode::BAD_REQUEST,
             ErrorType::NotAVoiceChannel => StatusCode::BAD_REQUEST,
             ErrorType::AlreadyConnected => StatusCode::BAD_REQUEST,
             ErrorType::UnknownNode => StatusCode::BAD_REQUEST,
diff --git a/crates/core/result/src/lib.rs b/crates/core/result/src/lib.rs
index 9be2de7e5..84eaaaa18 100644
--- a/crates/core/result/src/lib.rs
+++ b/crates/core/result/src/lib.rs
@@ -158,9 +158,9 @@ pub enum ErrorType {
 
     // ? Voice errors
     LiveKitUnavailable,
-    AlreadyInVoiceChannel,
     NotAVoiceChannel,
     AlreadyConnected,
+    NotConnected,
     UnknownNode,
     // ? Micro-service errors
     ProxyError,
diff --git a/crates/core/result/src/rocket.rs b/crates/core/result/src/rocket.rs
index 78a7f8444..da01649b9 100644
--- a/crates/core/result/src/rocket.rs
+++ b/crates/core/result/src/rocket.rs
@@ -79,9 +79,9 @@ impl<'r> Responder<'r, 'static> for Error {
             ErrorType::NoEffect => Status::Ok,
             ErrorType::FailedValidation { .. } => Status::BadRequest,
             ErrorType::LiveKitUnavailable => Status::BadRequest,
-            ErrorType::AlreadyInVoiceChannel => Status::BadRequest,
             ErrorType::NotAVoiceChannel => Status::BadRequest,
             ErrorType::AlreadyConnected => Status::BadRequest,
+            ErrorType::NotConnected => Status::BadRequest,
             ErrorType::UnknownNode => Status::BadRequest,
             ErrorType::ProxyError => Status::BadRequest,
             ErrorType::FileTooSmall => Status::UnprocessableEntity,
diff --git a/crates/daemons/voice-ingress/src/main.rs b/crates/daemons/voice-ingress/src/main.rs
index 6bf98c228..9602fa1ca 100644
--- a/crates/daemons/voice-ingress/src/main.rs
+++ b/crates/daemons/voice-ingress/src/main.rs
@@ -4,8 +4,7 @@ use std::env;
 use livekit_protocol::TrackType;
 use livekit_api::{access_token::TokenVerifier, webhooks::WebhookReceiver};
 use revolt_database::{
-    events::client::EventV1, util::reference::Reference, Database, DatabaseInfo,
-    voice::{create_voice_state, delete_voice_state, update_voice_state_tracks, VoiceClient}
+    events::client::EventV1, util::reference::Reference, voice::{create_voice_state, delete_voice_state, get_user_moved_from_voice, update_voice_state_tracks, VoiceClient}, Database, DatabaseInfo
 };
 use rocket::{build, http::Status, post, request::{FromRequest, Outcome}, routes, Config, Request, State};
 use rocket_empty::EmptyResponse;
@@ -83,12 +82,23 @@ async fn ingress(db: &State<Database>, node: &str, voice_client: &State<VoiceCli
 
             let voice_state = create_voice_state(channel_id, channel.server(), user_id).await?;
 
-            EventV1::VoiceChannelJoin {
-                id: channel_id.clone(),
-                state: voice_state,
-            }
-            .p(channel_id.clone())
-            .await
+            if let Some(moved_from) = get_user_moved_from_voice(channel_id, user_id).await? {
+                EventV1::VoiceChannelMove {
+                    user: user_id.clone(),
+                    from: moved_from,
+                    to: channel_id.clone(),
+                    state: voice_state
+                }
+                .p(channel_id.clone())
+                .await;
+            } else {
+                EventV1::VoiceChannelJoin {
+                    id: channel_id.clone(),
+                    state: voice_state,
+                }
+                .p(channel_id.clone())
+                .await;
+            };
         }
         "participant_left" => {
             let channel_id = channel_id.to_internal_error()?;
diff --git a/crates/delta/src/routes/channels/channel_delete.rs b/crates/delta/src/routes/channels/channel_delete.rs
index 4264e47b1..823e02331 100644
--- a/crates/delta/src/routes/channels/channel_delete.rs
+++ b/crates/delta/src/routes/channels/channel_delete.rs
@@ -54,7 +54,7 @@ pub async fn delete(
     };
 
     if let Some(users) = get_voice_channel_members(channel.id()).await? {
-        let node = get_channel_node(channel.id()).await?;
+        let node = get_channel_node(channel.id()).await?.unwrap();
 
         for user in users {
             voice_client.remove_user(&node, &user, channel.id()).await?;
diff --git a/crates/delta/src/routes/channels/group_remove_member.rs b/crates/delta/src/routes/channels/group_remove_member.rs
index 0f6291bb1..fc63acc16 100644
--- a/crates/delta/src/routes/channels/group_remove_member.rs
+++ b/crates/delta/src/routes/channels/group_remove_member.rs
@@ -48,8 +48,8 @@ pub async fn remove_member(
     };
 
     if is_in_voice_channel(&user.id, channel.id()).await? {
-        let node = get_channel_node(channel.id()).await?;
-        
+        let node = get_channel_node(channel.id()).await?.unwrap();
+
         voice_client.remove_user(&node, &user.id, channel.id()).await?;
         delete_voice_state(channel.id(), None, &user.id).await?;
     };
diff --git a/crates/delta/src/routes/servers/ban_create.rs b/crates/delta/src/routes/servers/ban_create.rs
index 491347bb3..26881a306 100644
--- a/crates/delta/src/routes/servers/ban_create.rs
+++ b/crates/delta/src/routes/servers/ban_create.rs
@@ -61,7 +61,7 @@ pub async fn ban(
 
         // If the member is in a voice channel while banned kick them from the voice channel
         if let Some(channel_id) = get_user_voice_channel_in_server(&user.id, &server.id).await? {
-            let node = get_channel_node(&channel_id).await?;
+            let node = get_channel_node(&channel_id).await?.unwrap();
             voice_client.remove_user(&node, &user.id, &channel_id).await?;
             delete_voice_state(&channel_id, Some(&server.id), &user.id).await?
         }
diff --git a/crates/delta/src/routes/servers/member_edit.rs b/crates/delta/src/routes/servers/member_edit.rs
index e08bbfd52..b23db2208 100644
--- a/crates/delta/src/routes/servers/member_edit.rs
+++ b/crates/delta/src/routes/servers/member_edit.rs
@@ -6,13 +6,13 @@ use livekit_protocol::ParticipantPermission;
 use redis_kiss::{get_connection, redis::Pipeline, AsyncCommands};
 use revolt_database::{
     events::client::EventV1,
-    util::{permissions::DatabasePermissionQuery, reference::Reference},
-    voice::{get_channel_node, get_user_voice_channel_in_server, move_user, sync_user_voice_permissions, VoiceClient},
+    util::{permissions::{perms, DatabasePermissionQuery}, reference::Reference},
+    voice::{get_channel_node, get_user_voice_channel_in_server, move_user, set_channel_node, set_user_moved_from_voice, sync_user_voice_permissions, VoiceClient},
     Database, File, PartialMember, User,
 };
 use revolt_models::v0::{self, FieldsMember, PartialUserVoiceState};
 
-use revolt_permissions::{calculate_server_permissions, ChannelPermission};
+use revolt_permissions::{calculate_channel_permissions, calculate_server_permissions, ChannelPermission};
 use revolt_result::{create_error, Result, ToRevoltError};
 use rocket::{form::validate::Contains, serde::json::Json, State};
 use validator::Validate;
@@ -103,7 +103,7 @@ pub async fn edit(
         permissions.throw_if_lacking_channel_permission(ChannelPermission::DeafenMembers)?;
     }
 
-    if let Some(new_channel) = &data.voice_channel {
+    let new_voice_channel = if let Some(new_channel) = &data.voice_channel {
         permissions.throw_if_lacking_channel_permission(ChannelPermission::MoveMembers)?;
 
         // ensure the channel we are moving them to is in the server and is a voice channel
@@ -113,14 +113,18 @@ pub async fn edit(
             .await
             .map_err(|_| create_error!(UnknownChannel))?;
 
-        if !channel.server().is_some_and(|v| v == member.id.server) {
+        if channel.server().is_none_or(|v| v != member.id.server) {
             Err(create_error!(UnknownChannel))?
         }
 
-        if channel.voice().is_none() {
-            Err(create_error!(NotAVoiceChannel))?
-        }
-    }
+        if get_user_voice_channel_in_server(&target_user.id, &server.id).await?.is_none() {
+            Err(create_error!(NotConnected))?
+        };
+
+        Some(channel)
+    } else {
+        None
+    };
 
     // Resolve our ranking
     let our_ranking = query.get_member_rank().unwrap_or(i64::MIN);
@@ -159,7 +163,7 @@ pub async fn edit(
         remove,
         can_publish,
         can_receive,
-        voice_channel,
+        voice_channel: _,
     } = data;
 
     let mut partial = PartialMember {
@@ -185,27 +189,11 @@ pub async fn edit(
         partial.avatar = Some(File::use_user_avatar(db, &avatar, &user.id, &user.id).await?);
     }
 
-    // TODO: impelement moving users
-
     let remove_contains_voice = remove
         .as_ref()
         .map(|r| r.contains(FieldsMember::CanPublish) || r.contains(FieldsMember::CanReceive))
         .unwrap_or_default();
 
-    if can_publish.is_some()
-        || can_receive.is_some()
-        || voice_channel.is_some()
-        || remove_contains_voice
-    {
-        if let Some(channel) = get_user_voice_channel_in_server(&target_user.id, &server.id).await? {
-            let node = get_channel_node(&channel).await?;
-            let channel = Reference::from_unchecked(channel).as_channel(db).await?;
-
-
-            sync_user_voice_permissions(db, voice_client, &node, &user, &channel, Some(&server), None).await?;
-        };
-    };
-
     member
         .update(
             db,
@@ -216,5 +204,43 @@ pub async fn edit(
         )
         .await?;
 
+    if let Some(new_voice_channel) = new_voice_channel {
+        if let Some(channel) = get_user_voice_channel_in_server(&target_user.id, &server.id).await? {
+            let old_node = get_channel_node(&channel).await?.unwrap();
+
+            let new_node = match get_channel_node(new_voice_channel.id()).await? {
+                Some(node) => node,
+                None => {
+                    set_channel_node(new_voice_channel.id(), &old_node).await?;
+                    old_node.clone()
+                }
+            };
+
+            set_user_moved_from_voice(&channel, new_voice_channel.id(), &target_user.id).await?;
+
+            let mut query = perms(db, &target_user).channel(&new_voice_channel);
+            let permissions = calculate_channel_permissions(&mut query).await;
+
+            voice_client.create_room(&new_node, &new_voice_channel).await?;
+            let token = voice_client.create_token(&new_node, &target_user, permissions, &new_voice_channel)?;
+
+            voice_client.remove_user(&old_node, &target_user.id, &channel).await?;
+
+            EventV1::UserMoveVoiceChannel {
+                node: new_node,
+                token
+            }
+            .p_user(target_user.id.clone(), db)
+            .await;
+        };
+    } else if can_publish.is_some() || can_receive.is_some() || remove_contains_voice {
+        if let Some(channel) = get_user_voice_channel_in_server(&target_user.id, &server.id).await? {
+            let node = get_channel_node(&channel).await?.unwrap();
+            let channel = Reference::from_unchecked(channel).as_channel(db).await?;
+
+            sync_user_voice_permissions(db, voice_client, &node, &user, &channel, Some(&server), None).await?;
+        };
+    };
+
     Ok(Json(member.into()))
 }
diff --git a/crates/delta/src/routes/servers/member_remove.rs b/crates/delta/src/routes/servers/member_remove.rs
index 9315b1b4a..1f8ea9eef 100644
--- a/crates/delta/src/routes/servers/member_remove.rs
+++ b/crates/delta/src/routes/servers/member_remove.rs
@@ -43,7 +43,7 @@ pub async fn kick(
     }
 
     if let Some(channel_id) = get_user_voice_channel_in_server(&user.id, &server.id).await? {
-        let node = get_channel_node(&channel_id).await?;
+        let node = get_channel_node(&channel_id).await?.unwrap();
 
         voice_client.remove_user(&node, &user.id, &channel_id).await?;
         delete_voice_state(&channel_id, Some(&server.id), &user.id).await?;
diff --git a/crates/delta/src/routes/servers/server_delete.rs b/crates/delta/src/routes/servers/server_delete.rs
index abf6724f7..667a171fa 100644
--- a/crates/delta/src/routes/servers/server_delete.rs
+++ b/crates/delta/src/routes/servers/server_delete.rs
@@ -27,7 +27,7 @@ pub async fn delete(
     if server.owner == user.id {
         for channel_id in &server.channels {
             if let Some(users) = get_voice_channel_members(channel_id).await? {
-                let node = get_channel_node(channel_id).await?;
+                let node = get_channel_node(channel_id).await?.unwrap();
 
                 for user in users {
                     voice_client.remove_user(&node, &user, channel_id).await?;
@@ -40,7 +40,7 @@ pub async fn delete(
     } else {
         if let Some(channel_id) = get_user_voice_channel_in_server(&user.id, &server.id).await? {
             if server.channels.iter().any(|c| c == &channel_id) {
-                let node = get_channel_node(&channel_id).await?;
+                let node = get_channel_node(&channel_id).await?.unwrap();
                 voice_client.remove_user(&node, &user.id, &channel_id).await?;
                 delete_voice_state(&channel_id, Some(&server.id), &user.id).await?;
             }

From 091aa4705bbcd9a4a59f394c142c851e054452ba Mon Sep 17 00:00:00 2001
From: Zomatree <me@zomatree.live>
Date: Tue, 25 Mar 2025 20:37:06 +0000
Subject: [PATCH 19/62] fix: use existing node if someone is already in the
 voice channel

---
 .../core/database/src/voice/voice_client.rs   |  7 ++++--
 crates/core/models/src/v0/channels.rs         |  2 +-
 .../delta/src/routes/channels/voice_join.rs   | 22 ++++++++++++++-----
 .../delta/src/routes/servers/member_edit.rs   |  4 ++++
 4 files changed, 26 insertions(+), 9 deletions(-)

diff --git a/crates/core/database/src/voice/voice_client.rs b/crates/core/database/src/voice/voice_client.rs
index 52733c8bc..0b2ecdbec 100644
--- a/crates/core/database/src/voice/voice_client.rs
+++ b/crates/core/database/src/voice/voice_client.rs
@@ -42,6 +42,10 @@ impl VoiceClient {
         }
     }
 
+    pub fn is_enabled(&self) -> bool {
+        !self.rooms.is_empty()
+    }
+
     pub async fn from_revolt_config() -> Self {
         let config = config().await;
 
@@ -89,8 +93,7 @@ impl VoiceClient {
             Channel::TextChannel { voice: Some(voice), .. } => Some(Cow::Borrowed(voice)),
             _ => None
         }
-
-            .ok_or_else(|| create_error!(NotAVoiceChannel))?;
+        .ok_or_else(|| create_error!(NotAVoiceChannel))?;
 
         room.client
             .create_room(
diff --git a/crates/core/models/src/v0/channels.rs b/crates/core/models/src/v0/channels.rs
index efd65aeb8..ecd895c42 100644
--- a/crates/core/models/src/v0/channels.rs
+++ b/crates/core/models/src/v0/channels.rs
@@ -324,7 +324,7 @@ auto_derived!(
 
     /// Join a voice channel
     pub struct DataJoinCall {
-        pub node: String
+        pub node: Option<String>
     }
 
 );
diff --git a/crates/delta/src/routes/channels/voice_join.rs b/crates/delta/src/routes/channels/voice_join.rs
index eebbdc719..7c3c86cd2 100644
--- a/crates/delta/src/routes/channels/voice_join.rs
+++ b/crates/delta/src/routes/channels/voice_join.rs
@@ -1,6 +1,6 @@
 use revolt_config::config;
 use revolt_models::v0;
-use revolt_database::{util::{permissions::perms, reference::Reference}, voice::{raise_if_in_voice, VoiceClient}, Channel, Database, SystemMessage, User, AMQP};
+use revolt_database::{util::{permissions::perms, reference::Reference}, voice::{get_channel_node, raise_if_in_voice, VoiceClient}, Channel, Database, SystemMessage, User, AMQP};
 use revolt_permissions::{calculate_channel_permissions, ChannelPermission};
 use revolt_result::{create_error, Result};
 
@@ -12,10 +12,11 @@ use rocket::{serde::json::Json, State};
 #[openapi(tag = "Voice")]
 #[post("/<target>/join_call", data="<data>")]
 pub async fn call(db: &State<Database>, amqp: &State<AMQP>, voice: &State<VoiceClient>, user: User, target: Reference, data: Json<v0::DataJoinCall>) -> Result<Json<v0::CreateVoiceUserResponse>> {
-    let config = config().await;
+    if !voice.is_enabled() {
+        return Err(create_error!(LiveKitUnavailable))
+    }
 
-    let node_host = config.hosts.livekit.get(&data.node)
-        .ok_or_else(|| create_error!(UnknownNode))?;
+    let config = config().await;
 
     let channel = target.as_channel(db).await?;
 
@@ -26,8 +27,17 @@ pub async fn call(db: &State<Database>, amqp: &State<AMQP>, voice: &State<VoiceC
     let current_permissions = calculate_channel_permissions(&mut permissions).await;
     current_permissions.throw_if_lacking_channel_permission(ChannelPermission::Connect)?;
 
-    let token = voice.create_token(&data.node, &user, current_permissions, &channel)?;
-    let room = voice.create_room(&data.node, &channel).await?;
+    let existing_node = get_channel_node(channel.id()).await?;
+
+    let node = existing_node.or(data.into_inner().node)
+        .ok_or_else(|| create_error!(UnknownNode))?;
+
+    let node_host = config.hosts.livekit.get(&node)
+        .ok_or_else(|| create_error!(UnknownNode))?
+        .clone();
+
+    let token = voice.create_token(&node, &user, current_permissions, &channel)?;
+    let room = voice.create_room(&node, &channel).await?;
 
     log::debug!("Created room {}", room.name);
 
diff --git a/crates/delta/src/routes/servers/member_edit.rs b/crates/delta/src/routes/servers/member_edit.rs
index b23db2208..b6e205b74 100644
--- a/crates/delta/src/routes/servers/member_edit.rs
+++ b/crates/delta/src/routes/servers/member_edit.rs
@@ -104,6 +104,10 @@ pub async fn edit(
     }
 
     let new_voice_channel = if let Some(new_channel) = &data.voice_channel {
+        if !voice_client.is_enabled() {
+            return Err(create_error!(LiveKitUnavailable))
+        };
+
         permissions.throw_if_lacking_channel_permission(ChannelPermission::MoveMembers)?;
 
         // ensure the channel we are moving them to is in the server and is a voice channel

From 38380db6e7d63eafc1d93e216e206f9d14535361 Mon Sep 17 00:00:00 2001
From: Zomatree <me@zomatree.live>
Date: Tue, 29 Apr 2025 15:05:18 +0100
Subject: [PATCH 20/62] refactor: Remove VoiceChannel

---
 crates/bonfire/src/events/impl.rs             |   2 +
 .../admin_migrations/ops/mongodb/scripts.rs   |  21 +-
 .../src/models/channel_invites/model.rs       |   2 +-
 .../database/src/models/channels/model.rs     |  45 ++---
 .../src/models/channels/ops/mongodb.rs        |   2 +-
 .../src/models/channels/ops/reference.rs      |   3 -
 .../database/src/models/messages/model.rs     |   1 +
 crates/core/database/src/util/bridge/v0.rs    |   4 +
 .../database/src/util/bulk_permissions.rs     |  15 +-
 crates/core/database/src/util/permissions.rs  |  16 +-
 crates/core/database/src/voice/mod.rs         |   5 +-
 .../core/database/src/voice/voice_client.rs   |   2 +-
 crates/core/models/src/v0/channels.rs         |   8 +-
 .../pushd/src/consumers/outbound/apn.rs       |   1 +
 .../pushd/src/consumers/outbound/fcm.rs       |   1 +
 .../src/routes/channels/channel_delete.rs     |   1 +
 .../delta/src/routes/channels/channel_edit.rs | 186 +++++++++++-------
 .../src/routes/channels/message_query.rs      |   1 +
 .../src/routes/channels/message_search.rs     |   1 +
 .../delta/src/routes/channels/message_send.rs |   1 +
 .../channels/permissions_set_default.rs       |   4 -
 .../delta/src/routes/invites/invite_fetch.rs  |   7 -
 22 files changed, 176 insertions(+), 153 deletions(-)

diff --git a/crates/bonfire/src/events/impl.rs b/crates/bonfire/src/events/impl.rs
index 5c974fb65..5be05c722 100644
--- a/crates/bonfire/src/events/impl.rs
+++ b/crates/bonfire/src/events/impl.rs
@@ -18,6 +18,7 @@ use super::state::{Cache, State};
 impl Cache {
     /// Check whether the current user can view a channel
     pub async fn can_view_channel(&self, db: &Database, channel: &Channel) -> bool {
+        #[allow(deprecated)]
         match &channel {
             Channel::TextChannel { server, .. } | Channel::VoiceChannel { server, .. } => {
                 let member = self.members.get(server);
@@ -284,6 +285,7 @@ impl State {
 
             let id = &id.to_string();
             for (channel_id, channel) in &self.cache.channels {
+                #[allow(deprecated)]
                 match channel {
                     Channel::TextChannel { server, .. } | Channel::VoiceChannel { server, .. } => {
                         if server == id {
diff --git a/crates/core/database/src/models/admin_migrations/ops/mongodb/scripts.rs b/crates/core/database/src/models/admin_migrations/ops/mongodb/scripts.rs
index c83d8d8c5..f66adf143 100644
--- a/crates/core/database/src/models/admin_migrations/ops/mongodb/scripts.rs
+++ b/crates/core/database/src/models/admin_migrations/ops/mongodb/scripts.rs
@@ -21,7 +21,7 @@ struct MigrationInfo {
     revision: i32,
 }
 
-pub const LATEST_REVISION: i32 = 31;
+pub const LATEST_REVISION: i32 = 33;
 
 pub async fn migrate_database(db: &MongoDb) {
     let migrations = db.col::<Document>("migrations");
@@ -1185,6 +1185,7 @@ pub async fn run_migrations(db: &MongoDb, revision: i32) -> i32 {
             .await;
 
         for webhook in webhooks {
+            #[allow(deprecated)]
             match db.fetch_channel(&webhook.channel_id).await {
                 Ok(channel) => {
                     let creator_id = match channel {
@@ -1246,6 +1247,24 @@ pub async fn run_migrations(db: &MongoDb, revision: i32) -> i32 {
             .expect("Failed to update members");
     }
 
+    if revision <= 33 {
+        info!("Running migration [revision 33 / 29-04-2025]: Convert all `VoiceChannel`'s into `TextChannel` ");
+
+        db.col::<Document>("channels")
+            .update_many(
+                doc! { "channel_type": "VoiceChannel" },
+                doc! {
+                    "$set": {
+                        "channel_type": "TextChannel",
+                        "voice": {}
+                    }
+                },
+                None
+            )
+            .await
+            .expect("Failed to update voice channels");
+    };
+
     // Reminder to update LATEST_REVISION when adding new migrations.
     LATEST_REVISION.max(revision)
 }
diff --git a/crates/core/database/src/models/channel_invites/model.rs b/crates/core/database/src/models/channel_invites/model.rs
index e3af921ab..a5d877fee 100644
--- a/crates/core/database/src/models/channel_invites/model.rs
+++ b/crates/core/database/src/models/channel_invites/model.rs
@@ -69,7 +69,7 @@ impl Invite {
                 creator: creator.id.clone(),
                 channel: id.clone(),
             }),
-            Channel::TextChannel { id, server, .. } | Channel::VoiceChannel { id, server, .. } => {
+            Channel::TextChannel { id, server, .. } => {
                 Ok(Invite::Server {
                     code,
                     creator: creator.id.clone(),
diff --git a/crates/core/database/src/models/channels/model.rs b/crates/core/database/src/models/channels/model.rs
index 8af881ff4..6aa55be83 100644
--- a/crates/core/database/src/models/channels/model.rs
+++ b/crates/core/database/src/models/channels/model.rs
@@ -1,3 +1,4 @@
+#![allow(deprecated)]
 use std::{borrow::Cow, collections::HashMap};
 
 use revolt_config::config;
@@ -108,7 +109,7 @@ auto_derived!(
             #[serde(skip_serializing_if = "Option::is_none")]
             voice: Option<VoiceInformation>
         },
-        /// Voice channel belonging to a server
+        #[deprecated = "Use TextChannel { voice } instead"]
         VoiceChannel {
             /// Unique Id
             #[serde(rename = "_id")]
@@ -165,6 +166,8 @@ auto_derived!(
         pub default_permissions: Option<OverrideField>,
         #[serde(skip_serializing_if = "Option::is_none")]
         pub last_message_id: Option<String>,
+        #[serde(skip_serializing_if = "Option::is_none")]
+        pub voice: Option<VoiceInformation>
     }
 
     /// Optional fields on channel object
@@ -225,15 +228,17 @@ impl Channel {
                 nsfw: data.nsfw.unwrap_or(false),
                 voice: data.voice
             },
-            v0::LegacyServerChannelType::Voice => Channel::VoiceChannel {
+            v0::LegacyServerChannelType::Voice => Channel::TextChannel {
                 id: id.clone(),
                 server: server.id.to_owned(),
                 name: data.name,
                 description: data.description,
                 icon: None,
+                last_message_id: None,
                 default_permissions: None,
                 role_permissions: HashMap::new(),
                 nsfw: data.nsfw.unwrap_or(false),
+                voice: Some(data.voice.unwrap_or_default())
             },
         };
 
@@ -464,12 +469,6 @@ impl Channel {
                 server,
                 role_permissions,
                 ..
-            }
-            | Channel::VoiceChannel {
-                id,
-                server,
-                role_permissions,
-                ..
             } => {
                 db.set_channel_role_permission(id, role_id, permissions)
                     .await?;
@@ -516,7 +515,7 @@ impl Channel {
             clear: remove.into_iter().map(|v| v.into()).collect(),
         }
         .p(match self {
-            Self::TextChannel { server, .. } | Self::VoiceChannel { server, .. } => server.clone(),
+            Self::TextChannel { server, .. } => server.clone(),
             _ => id,
         })
         .await;
@@ -529,16 +528,14 @@ impl Channel {
         match field {
             FieldsChannel::Description => match self {
                 Self::Group { description, .. }
-                | Self::TextChannel { description, .. }
-                | Self::VoiceChannel { description, .. } => {
+                | Self::TextChannel { description, .. } => {
                     description.take();
                 }
                 _ => {}
             },
             FieldsChannel::Icon => match self {
                 Self::Group { icon, .. }
-                | Self::TextChannel { icon, .. }
-                | Self::VoiceChannel { icon, .. } => {
+                | Self::TextChannel { icon, .. } => {
                     icon.take();
                 }
                 _ => {}
@@ -547,10 +544,6 @@ impl Channel {
                 Self::TextChannel {
                     default_permissions,
                     ..
-                }
-                | Self::VoiceChannel {
-                    default_permissions,
-                    ..
                 } => {
                     default_permissions.take();
                 }
@@ -567,6 +560,7 @@ impl Channel {
     }
 
     /// Apply partial channel to channel
+    #[allow(deprecated)]
     pub fn apply_options(&mut self, partial: PartialChannel) {
         match self {
             Self::SavedMessages { .. } => {}
@@ -615,15 +609,7 @@ impl Channel {
                 nsfw,
                 default_permissions,
                 role_permissions,
-                ..
-            }
-            | Self::VoiceChannel {
-                name,
-                description,
-                icon,
-                nsfw,
-                default_permissions,
-                role_permissions,
+                voice,
                 ..
             } => {
                 if let Some(v) = partial.name {
@@ -649,7 +635,12 @@ impl Channel {
                 if let Some(v) = partial.default_permissions {
                     default_permissions.replace(v);
                 }
-            }
+
+                if let Some(v) = partial.voice {
+                    voice.replace(v);
+                }
+            },
+            Self::VoiceChannel { .. } => {}
         }
     }
 
diff --git a/crates/core/database/src/models/channels/ops/mongodb.rs b/crates/core/database/src/models/channels/ops/mongodb.rs
index 51c6b66e5..c75fab536 100644
--- a/crates/core/database/src/models/channels/ops/mongodb.rs
+++ b/crates/core/database/src/models/channels/ops/mongodb.rs
@@ -190,7 +190,7 @@ impl AbstractChannels for MongoDb {
     async fn delete_channel(&self, channel: &Channel) -> Result<()> {
         let id = channel.id().to_string();
         let server_id = match channel {
-            Channel::TextChannel { server, .. } | Channel::VoiceChannel { server, .. } => {
+            Channel::TextChannel { server, .. } => {
                 Some(server)
             }
             _ => None,
diff --git a/crates/core/database/src/models/channels/ops/reference.rs b/crates/core/database/src/models/channels/ops/reference.rs
index 7d5c9a59f..518808bcc 100644
--- a/crates/core/database/src/models/channels/ops/reference.rs
+++ b/crates/core/database/src/models/channels/ops/reference.rs
@@ -94,9 +94,6 @@ impl AbstractChannels for ReferenceDb {
             match &mut channel {
                 Channel::TextChannel {
                     role_permissions, ..
-                }
-                | Channel::VoiceChannel {
-                    role_permissions, ..
                 } => {
                     if role_permissions.get(role_id).is_some() {
                         role_permissions.remove(role_id);
diff --git a/crates/core/database/src/models/messages/model.rs b/crates/core/database/src/models/messages/model.rs
index d4991ed42..f2ff0f55b 100644
--- a/crates/core/database/src/models/messages/model.rs
+++ b/crates/core/database/src/models/messages/model.rs
@@ -342,6 +342,7 @@ impl Message {
 
         // Validate the mentions go to users in the channel/server
         if !mentions.is_empty() {
+            #[allow(deprecated)]
             match channel {
                 Channel::DirectMessage { ref recipients, .. }
                 | Channel::Group { ref recipients, .. } => {
diff --git a/crates/core/database/src/util/bridge/v0.rs b/crates/core/database/src/util/bridge/v0.rs
index 1ad07a927..3673411ec 100644
--- a/crates/core/database/src/util/bridge/v0.rs
+++ b/crates/core/database/src/util/bridge/v0.rs
@@ -143,6 +143,7 @@ impl From<crate::FieldsWebhook> for FieldsWebhook {
 }
 
 impl From<crate::Channel> for Channel {
+    #[allow(deprecated)]
     fn from(value: crate::Channel) -> Self {
         match value {
             crate::Channel::SavedMessages { id, user } => Channel::SavedMessages { id, user },
@@ -225,6 +226,7 @@ impl From<crate::Channel> for Channel {
 }
 
 impl From<Channel> for crate::Channel {
+    #[allow(deprecated)]
     fn from(value: Channel) -> crate::Channel {
         match value {
             Channel::SavedMessages { id, user } => crate::Channel::SavedMessages { id, user },
@@ -319,6 +321,7 @@ impl From<crate::PartialChannel> for PartialChannel {
             role_permissions: value.role_permissions,
             default_permissions: value.default_permissions,
             last_message_id: value.last_message_id,
+            voice: value.voice
         }
     }
 }
@@ -336,6 +339,7 @@ impl From<PartialChannel> for crate::PartialChannel {
             role_permissions: value.role_permissions,
             default_permissions: value.default_permissions,
             last_message_id: value.last_message_id,
+            voice: value.voice
         }
     }
 }
diff --git a/crates/core/database/src/util/bulk_permissions.rs b/crates/core/database/src/util/bulk_permissions.rs
index 400359772..e45269ca5 100644
--- a/crates/core/database/src/util/bulk_permissions.rs
+++ b/crates/core/database/src/util/bulk_permissions.rs
@@ -121,10 +121,6 @@ impl<'z> BulkDatabasePermissionQuery<'z> {
                 Channel::TextChannel {
                     default_permissions,
                     ..
-                }
-                | Channel::VoiceChannel {
-                    default_permissions,
-                    ..
                 } => default_permissions.unwrap_or_default().into(),
                 _ => Default::default(),
             }
@@ -133,7 +129,7 @@ impl<'z> BulkDatabasePermissionQuery<'z> {
         }
     }
 
-    #[allow(dead_code)]
+    #[allow(dead_code, deprecated)]
     fn get_channel_type(&mut self) -> ChannelType {
         if let Some(channel) = &self.channel {
             match channel {
@@ -156,9 +152,6 @@ impl<'z> BulkDatabasePermissionQuery<'z> {
             match channel {
                 Channel::TextChannel {
                     role_permissions, ..
-                }
-                | Channel::VoiceChannel {
-                    role_permissions, ..
                 } => role_permissions,
                 _ => panic!("Not supported for non-server channels"),
             }
@@ -185,12 +178,6 @@ async fn calculate_members_permissions<'a>(
             role_permissions,
             default_permissions,
             ..
-        }
-        | Channel::VoiceChannel {
-            id,
-            role_permissions,
-            default_permissions,
-            ..
         } => (id, role_permissions, default_permissions),
         _ => panic!("Calculation of member permissions must be done on a server channel"),
     };
diff --git a/crates/core/database/src/util/permissions.rs b/crates/core/database/src/util/permissions.rs
index 436b236f6..e3254e66d 100644
--- a/crates/core/database/src/util/permissions.rs
+++ b/crates/core/database/src/util/permissions.rs
@@ -204,6 +204,7 @@ impl PermissionQuery for DatabasePermissionQuery<'_> {
     // * For calculating channel permission
 
     /// Get the type of the channel
+    #[allow(deprecated)]
     async fn get_channel_type(&mut self) -> ChannelType {
         if let Some(channel) = &self.channel {
             match channel {
@@ -241,14 +242,6 @@ impl PermissionQuery for DatabasePermissionQuery<'_> {
                 | Cow::Owned(Channel::TextChannel {
                     default_permissions,
                     ..
-                })
-                | Cow::Borrowed(Channel::VoiceChannel {
-                    default_permissions,
-                    ..
-                })
-                | Cow::Owned(Channel::VoiceChannel {
-                    default_permissions,
-                    ..
                 }) => default_permissions.unwrap_or_default().into(),
                 _ => Default::default(),
             }
@@ -266,12 +259,6 @@ impl PermissionQuery for DatabasePermissionQuery<'_> {
                 })
                 | Cow::Owned(Channel::TextChannel {
                     role_permissions, ..
-                })
-                | Cow::Borrowed(Channel::VoiceChannel {
-                    role_permissions, ..
-                })
-                | Cow::Owned(Channel::VoiceChannel {
-                    role_permissions, ..
                 }) => {
                     if let Some(server) = &self.server {
                         let member_roles = self
@@ -361,6 +348,7 @@ impl PermissionQuery for DatabasePermissionQuery<'_> {
     /// (this will only ever be called for server channels, use unimplemented!() for other code paths)
     async fn set_server_from_channel(&mut self) {
         if let Some(channel) = &self.channel {
+            #[allow(deprecated)]
             match channel {
                 Cow::Borrowed(Channel::TextChannel { server, .. })
                 | Cow::Owned(Channel::TextChannel { server, .. })
diff --git a/crates/core/database/src/voice/mod.rs b/crates/core/database/src/voice/mod.rs
index b1e797e46..05eabdb78 100644
--- a/crates/core/database/src/voice/mod.rs
+++ b/crates/core/database/src/voice/mod.rs
@@ -284,10 +284,7 @@ pub async fn get_voice_state(
 pub async fn get_channel_voice_state(channel: &Channel) -> Result<Option<v0::ChannelVoiceState>> {
     let members = get_voice_channel_members(channel.id()).await?;
 
-    let server = match channel {
-        Channel::TextChannel { server, .. } | Channel::VoiceChannel { server, .. } => Some(server.as_str()),
-        _ => None
-    };
+    let server = channel.server();
 
     if let Some(members) = members {
         let mut participants = Vec::with_capacity(members.len());
diff --git a/crates/core/database/src/voice/voice_client.rs b/crates/core/database/src/voice/voice_client.rs
index 0b2ecdbec..e6067f790 100644
--- a/crates/core/database/src/voice/voice_client.rs
+++ b/crates/core/database/src/voice/voice_client.rs
@@ -89,7 +89,7 @@ impl VoiceClient {
         let room = self.get_node(node)?;
 
         let voice = match channel {
-            Channel::DirectMessage { .. } | Channel::VoiceChannel { .. } => Some(Cow::Owned(v0::VoiceInformation::default())),
+            Channel::DirectMessage { .. } => Some(Cow::Owned(v0::VoiceInformation::default())),
             Channel::TextChannel { voice: Some(voice), .. } => Some(Cow::Borrowed(voice)),
             _ => None
         }
diff --git a/crates/core/models/src/v0/channels.rs b/crates/core/models/src/v0/channels.rs
index ecd895c42..b08de26b2 100644
--- a/crates/core/models/src/v0/channels.rs
+++ b/crates/core/models/src/v0/channels.rs
@@ -1,3 +1,4 @@
+#![allow(deprecated)]
 use super::{File, UserVoiceState};
 
 use revolt_permissions::{Override, OverrideField};
@@ -112,7 +113,7 @@ auto_derived!(
             #[cfg_attr(feature = "serde", serde(skip_serializing_if = "Option::is_none"))]
             voice: Option<VoiceInformation>
         },
-        /// DEPRECATED (use TextChannel { voice }): Voice channel belonging to a server
+        #[deprecated = "Use TextChannel { voice } instead"]
         VoiceChannel {
             /// Unique Id
             #[cfg_attr(feature = "serde", serde(rename = "_id"))]
@@ -183,6 +184,8 @@ auto_derived!(
         pub default_permissions: Option<OverrideField>,
         #[cfg_attr(feature = "serde", serde(skip_serializing_if = "Option::is_none"))]
         pub last_message_id: Option<String>,
+        #[cfg_attr(feature = "serde", serde(skip_serializing_if = "Option::is_none"))]
+        pub voice: Option<VoiceInformation>,
     }
 
     /// Optional fields on channel object
@@ -218,6 +221,9 @@ auto_derived!(
         /// Whether this channel is archived
         pub archived: Option<bool>,
 
+        /// Voice Information for voice channels
+        pub voice: Option<VoiceInformation>,
+
         /// Fields to remove from channel
         #[cfg_attr(feature = "serde", serde(default))]
         pub remove: Option<Vec<FieldsChannel>>,
diff --git a/crates/daemons/pushd/src/consumers/outbound/apn.rs b/crates/daemons/pushd/src/consumers/outbound/apn.rs
index 3b6ac3a71..c7ac6c875 100644
--- a/crates/daemons/pushd/src/consumers/outbound/apn.rs
+++ b/crates/daemons/pushd/src/consumers/outbound/apn.rs
@@ -62,6 +62,7 @@ impl ApnsOutboundConsumer {
         // in a dm it should just be "Sendername".
         // not sure how feasible all those are given the PushNotification object as it currently stands.
 
+        #[allow(deprecated)]
         match &notification.channel {
             Channel::DirectMessage { .. } => notification.author.clone(),
             Channel::Group { name, .. } => format!("{}, #{}", notification.author, name),
diff --git a/crates/daemons/pushd/src/consumers/outbound/fcm.rs b/crates/daemons/pushd/src/consumers/outbound/fcm.rs
index 61700bbb9..a22708d87 100644
--- a/crates/daemons/pushd/src/consumers/outbound/fcm.rs
+++ b/crates/daemons/pushd/src/consumers/outbound/fcm.rs
@@ -26,6 +26,7 @@ impl FcmOutboundConsumer {
         // in a dm it should just be "Sendername".
         // not sure how feasible all those are given the PushNotification object as it currently stands.
 
+        #[allow(deprecated)]
         match &notification.channel {
             Channel::DirectMessage { .. } => notification.author.clone(),
             Channel::Group { name, .. } => format!("{}, #{}", notification.author, name),
diff --git a/crates/delta/src/routes/channels/channel_delete.rs b/crates/delta/src/routes/channels/channel_delete.rs
index 823e02331..ebb589b79 100644
--- a/crates/delta/src/routes/channels/channel_delete.rs
+++ b/crates/delta/src/routes/channels/channel_delete.rs
@@ -26,6 +26,7 @@ pub async fn delete(
 
     permissions.throw_if_lacking_channel_permission(ChannelPermission::ViewChannel)?;
 
+    #[allow(deprecated)]
     match &channel {
         Channel::SavedMessages { .. } => Err(create_error!(NoEffect))?,
         Channel::DirectMessage { .. } => channel
diff --git a/crates/delta/src/routes/channels/channel_edit.rs b/crates/delta/src/routes/channels/channel_edit.rs
index 1977ec9ba..d69fb8b3e 100644
--- a/crates/delta/src/routes/channels/channel_edit.rs
+++ b/crates/delta/src/routes/channels/channel_edit.rs
@@ -95,22 +95,6 @@ pub async fn edit(
             icon,
             nsfw,
             ..
-        }
-        | Channel::TextChannel {
-            id,
-            name,
-            description,
-            icon,
-            nsfw,
-            ..
-        }
-        | Channel::VoiceChannel {
-            id,
-            name,
-            description,
-            icon,
-            nsfw,
-            ..
         } => {
             if let Some(fields) = &data.remove {
                 if fields.contains(&v0::FieldsChannel::Icon) {
@@ -153,77 +137,129 @@ pub async fn edit(
             }
 
             // Send out mutation system messages.
-            if let Channel::Group { .. } = &channel {
-                if let Some(name) = &partial.name {
-                    SystemMessage::ChannelRenamed {
-                        name: name.to_string(),
-                        by: user.id.clone(),
-                    }
-                    .into_message(channel.id().to_string())
-                    .send(
-                        db,
-                        Some(amqp),
-                        user.as_author_for_system(),
-                        None,
-                        None,
-                        &channel,
-                        false,
-                    )
-                    .await
-                    .ok();
+            if let Some(name) = &partial.name {
+                SystemMessage::ChannelRenamed {
+                    name: name.to_string(),
+                    by: user.id.clone(),
                 }
+                .into_message(channel.id().to_string())
+                .send(
+                    db,
+                    Some(amqp),
+                    user.as_author_for_system(),
+                    None,
+                    None,
+                    &channel,
+                    false,
+                )
+                .await
+                .ok();
+            }
 
-                if partial.description.is_some() {
-                    SystemMessage::ChannelDescriptionChanged {
-                        by: user.id.clone(),
+            if partial.description.is_some() {
+                SystemMessage::ChannelDescriptionChanged {
+                    by: user.id.clone(),
+                }
+                .into_message(channel.id().to_string())
+                .send(
+                    db,
+                    Some(amqp),
+                    user.as_author_for_system(),
+                    None,
+                    None,
+                    &channel,
+                    false,
+                )
+                .await
+                .ok();
+            }
+
+            if partial.icon.is_some() {
+                SystemMessage::ChannelIconChanged {
+                    by: user.id.clone(),
+                }
+                .into_message(channel.id().to_string())
+                .send(
+                    db,
+                    Some(amqp),
+                    user.as_author_for_system(),
+                    None,
+                    None,
+                    &channel,
+                    false,
+                )
+                .await
+                .ok();
+            }
+        }
+        Channel::TextChannel {
+            id,
+            name,
+            description,
+            icon,
+            nsfw,
+            voice,
+            ..
+        } => {
+            if let Some(fields) = &data.remove {
+                if fields.contains(&v0::FieldsChannel::Icon) {
+                    if let Some(icon) = &icon {
+                        db.mark_attachment_as_deleted(&icon.id).await?;
                     }
-                    .into_message(channel.id().to_string())
-                    .send(
-                        db,
-                        Some(amqp),
-                        user.as_author_for_system(),
-                        None,
-                        None,
-                        &channel,
-                        false,
-                    )
-                    .await
-                    .ok();
                 }
 
-                if partial.icon.is_some() {
-                    SystemMessage::ChannelIconChanged {
-                        by: user.id.clone(),
+                for field in fields {
+                    match field {
+                        v0::FieldsChannel::Description => {
+                            description.take();
+                        }
+                        v0::FieldsChannel::Icon => {
+                            icon.take();
+                        }
+                        _ => {}
                     }
-                    .into_message(channel.id().to_string())
-                    .send(
-                        db,
-                        Some(amqp),
-                        user.as_author_for_system(),
-                        None,
-                        None,
-                        &channel,
-                        false,
-                    )
-                    .await
-                    .ok();
                 }
             }
 
-            channel
-                .update(
-                    db,
-                    partial,
-                    data.remove
-                        .unwrap_or_default()
-                        .into_iter()
-                        .map(|f| f.into())
-                        .collect(),
-                )
-                .await?;
+            if let Some(icon_id) = data.icon {
+                partial.icon = Some(File::use_channel_icon(db, &icon_id, id, &user.id).await?);
+                *icon = partial.icon.clone();
+            }
+
+            if let Some(new_name) = data.name {
+                *name = new_name.clone();
+                partial.name = Some(new_name);
+            }
+
+            if let Some(new_description) = data.description {
+                partial.description = Some(new_description);
+                *description = partial.description.clone();
+            }
+
+            if let Some(new_nsfw) = data.nsfw {
+                *nsfw = new_nsfw;
+                partial.nsfw = Some(new_nsfw);
+            }
+
+            if let Some(new_voice) = data.voice {
+                *voice = Some(new_voice.clone());
+                partial.voice = Some(new_voice);
+            }
         }
         _ => return Err(create_error!(InvalidOperation)),
     };
 
+    channel
+        .update(
+            db,
+            partial,
+            data.remove
+                .unwrap_or_default()
+                .into_iter()
+                .map(|f| f.into())
+                .collect(),
+        )
+        .await?;
+
     Ok(Json(channel.into()))
 }
diff --git a/crates/delta/src/routes/channels/message_query.rs b/crates/delta/src/routes/channels/message_query.rs
index 5193bd02a..2ab6e8da5 100644
--- a/crates/delta/src/routes/channels/message_query.rs
+++ b/crates/delta/src/routes/channels/message_query.rs
@@ -65,6 +65,7 @@ pub async fn query(
         },
         &user,
         include_users,
+        #[allow(deprecated)]
         match channel {
             Channel::TextChannel { server, .. } | Channel::VoiceChannel { server, .. } => {
                 Some(server)
diff --git a/crates/delta/src/routes/channels/message_search.rs b/crates/delta/src/routes/channels/message_search.rs
index eb173bc05..b3b90071e 100644
--- a/crates/delta/src/routes/channels/message_search.rs
+++ b/crates/delta/src/routes/channels/message_search.rs
@@ -69,6 +69,7 @@ pub async fn search(
         },
         &user,
         include_users,
+        #[allow(deprecated)]
         match channel {
             Channel::TextChannel { server, .. } | Channel::VoiceChannel { server, .. } => {
                 Some(server)
diff --git a/crates/delta/src/routes/channels/message_send.rs b/crates/delta/src/routes/channels/message_send.rs
index 8ad9fb422..d55bd8bda 100644
--- a/crates/delta/src/routes/channels/message_send.rs
+++ b/crates/delta/src/routes/channels/message_send.rs
@@ -192,6 +192,7 @@ mod test {
                 d: ChannelPermission::ViewChannel as i64,
             }),
             last_message_id: None,
+            voice: None,
         };
         locked_channel
             .update(&harness.db, partial, vec![])
diff --git a/crates/delta/src/routes/channels/permissions_set_default.rs b/crates/delta/src/routes/channels/permissions_set_default.rs
index 91f53b2fb..14386281c 100644
--- a/crates/delta/src/routes/channels/permissions_set_default.rs
+++ b/crates/delta/src/routes/channels/permissions_set_default.rs
@@ -48,10 +48,6 @@ pub async fn set_default_permissions(
         Channel::TextChannel {
             default_permissions,
             ..
-        }
-        | Channel::VoiceChannel {
-            default_permissions,
-            ..
         } => {
             if let DataDefaultChannelPermissions::Field { permissions: field } = data {
                 permissions
diff --git a/crates/delta/src/routes/invites/invite_fetch.rs b/crates/delta/src/routes/invites/invite_fetch.rs
index a56c30bb9..edf547446 100644
--- a/crates/delta/src/routes/invites/invite_fetch.rs
+++ b/crates/delta/src/routes/invites/invite_fetch.rs
@@ -23,13 +23,6 @@ pub async fn fetch(db: &State<Database>, target: Reference) -> Result<Json<v0::I
                     name,
                     description,
                     ..
-                }
-                | Channel::VoiceChannel {
-                    id,
-                    server,
-                    name,
-                    description,
-                    ..
                 } => {
                     let server = db.fetch_server(&server).await?;
 

From a4246f39e4cc3f889d67e767373ec1f6005985b8 Mon Sep 17 00:00:00 2001
From: Paul Makles <me@insrt.uk>
Date: Mon, 10 Feb 2025 17:19:54 +0000
Subject: [PATCH 21/62] chore: add pushd to debug image script

---
 scripts/publish-debug-image.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/scripts/publish-debug-image.sh b/scripts/publish-debug-image.sh
index 1f0eb2e48..247338ab5 100755
--- a/scripts/publish-debug-image.sh
+++ b/scripts/publish-debug-image.sh
@@ -25,6 +25,7 @@ docker build -t ghcr.io/revoltchat/server:$TAG - < crates/delta/Dockerfile
 docker build -t ghcr.io/revoltchat/bonfire:$TAG - < crates/bonfire/Dockerfile
 docker build -t ghcr.io/revoltchat/autumn:$TAG - < crates/services/autumn/Dockerfile
 docker build -t ghcr.io/revoltchat/january:$TAG - < crates/services/january/Dockerfile
+docker build -t ghcr.io/revoltchat/pushd:$TAG - < crates/daemons/pushd/Dockerfile
 
 if [ "$DEBUG" = "true" ]; then
   git restore Cargo.toml
@@ -34,3 +35,4 @@ docker push ghcr.io/revoltchat/server:$TAG
 docker push ghcr.io/revoltchat/bonfire:$TAG
 docker push ghcr.io/revoltchat/autumn:$TAG
 docker push ghcr.io/revoltchat/january:$TAG
+docker push ghcr.io/revoltchat/pushd:$TAG

From 343b90b9af24ee08c7e4c65335722bcb49e7ed96 Mon Sep 17 00:00:00 2001
From: Paul Makles <me@insrt.uk>
Date: Mon, 10 Feb 2025 17:20:29 +0000
Subject: [PATCH 22/62] refactor: add error messages for Rabbit issues

---
 crates/delta/src/main.rs | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/crates/delta/src/main.rs b/crates/delta/src/main.rs
index aaa769325..ae7556cea 100644
--- a/crates/delta/src/main.rs
+++ b/crates/delta/src/main.rs
@@ -93,8 +93,12 @@ pub async fn web() -> Rocket<Build> {
         &config.rabbit.password,
     ))
     .await
-    .unwrap();
-    let channel = connection.open_channel(None).await.unwrap();
+    .expect("Failed to connect to RabbitMQ");
+
+    let channel = connection
+        .open_channel(None)
+        .await
+        .expect("Failed to open RabbitMQ channel");
 
     channel
         .exchange_declare(

From e8cb0bb88a1fbd6e197e1920122e0960d124adb7 Mon Sep 17 00:00:00 2001
From: Paul Makles <me@insrt.uk>
Date: Mon, 10 Feb 2025 17:21:23 +0000
Subject: [PATCH 23/62] docs: add some notes on overrides; fix defaults

---
 .gitignore  |  1 +
 README.md   | 34 +++++++++++++++++++++++++++++++++-
 Revolt.toml |  7 +++++--
 default.nix | 20 ++------------------
 4 files changed, 41 insertions(+), 21 deletions(-)

diff --git a/.gitignore b/.gitignore
index 3699f3fc4..4bbb168a2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
 Rocket.toml
 Revolt.*.toml
+compose.override.yml
 
 target
 .data
diff --git a/README.md b/README.md
index ea8cab84b..c480340f5 100644
--- a/README.md
+++ b/README.md
@@ -61,7 +61,7 @@ As a heads-up, the development environment uses the following ports:
 | MinIO                     |     14009      |
 | Maildev                   | 14025<br>14080 |
 | Revolt Web App            |     14701      |
-| RabbitMQ                  |  5672<br>15672 |
+| RabbitMQ                  | 5672<br>15672  |
 | `crates/delta`            |     14702      |
 | `crates/bonfire`          |     14703      |
 | `crates/services/autumn`  |     14704      |
@@ -91,6 +91,38 @@ If you'd like to change anything, create a `Revolt.overrides.toml` file and spec
 > proxy = "https://abc@your.sentry/1"
 > ```
 
+> [!TIP]
+> If you have port conflicts on common services, you can try the following:
+>
+> ```yaml
+> # compose.override.yml
+> services:
+>   redis:
+>     ports: !override
+>       - "14079:6379"
+>
+>   database:
+>     ports: !override
+>       - "14017:27017"
+>
+>   rabbit:
+>     ports: !override
+>       - "14072:5672"
+>       - "14672:15672"
+> ```
+>
+> And corresponding Revolt configuration:
+>
+> ```toml
+> # Revolt.overrides.toml
+> [database]
+> mongodb = "mongodb://127.0.0.1:14017"
+> redis = "redis://127.0.0.1:14079/"
+>
+> [rabbit]
+> port = 14072
+> ```
+
 Then continue:
 
 ```bash
diff --git a/Revolt.toml b/Revolt.toml
index e5058c51b..5fc7f4511 100644
--- a/Revolt.toml
+++ b/Revolt.toml
@@ -4,10 +4,13 @@
 [database]
 # MongoDB connection URL
 # Defaults to the container name specified in self-hosted
-mongodb = "mongodb://127.0.0.1:14017"
+mongodb = "mongodb://127.0.0.1:27017"
 # Redis connection URL
 # Defaults to the container name specified in self-hosted
-redis = "redis://127.0.0.1:14079/"
+redis = "redis://127.0.0.1:6379/"
+
+[rabbit]
+host = "127.0.0.1"
 
 [hosts]
 # Web locations of various services
diff --git a/default.nix b/default.nix
index 16096d502..f87363083 100644
--- a/default.nix
+++ b/default.nix
@@ -1,26 +1,10 @@
-let
-  # Pinned nixpkgs, deterministic. Last updated: 28-07-2024.
-  pkgs = import (fetchTarball("https://github.com/NixOS/nixpkgs/archive/9b34ca580417e1ebc56c4df57d8b387dad686665.tar.gz")) {};
-
-  # Rolling updates, not deterministic.
-  # pkgs = import (fetchTarball("channel:nixpkgs-unstable")) {};
-in pkgs.mkShell {
-  name = "revoltEnv";
-
-  # LD_LIBRARY_PATH = pkgs.lib.makeLibraryPath [
-  #   pkgs.gcc-unwrapped
-  #   pkgs.zlib
-  #   pkgs.glib
-  #   pkgs.libGL
-  # ];
+{ pkgs ? import <nixpkgs> {} }:
 
+pkgs.mkShell rec {
   buildInputs = [
     # Tools
     pkgs.git
 
-    # Database
-    # pkgs.mongodb
-
     # Cargo
     pkgs.cargo
     pkgs.cargo-nextest

From 9a2a7901e7f782b25a871d40be179a3a9e01ccf3 Mon Sep 17 00:00:00 2001
From: Paul Makles <me@insrt.uk>
Date: Mon, 10 Feb 2025 17:51:22 +0000
Subject: [PATCH 24/62] fix: ensure limit is always at least 1 when sent to
 database

---
 crates/core/database/src/models/messages/ops/mongodb.rs | 2 +-
 crates/core/models/src/v0/messages.rs                   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/crates/core/database/src/models/messages/ops/mongodb.rs b/crates/core/database/src/models/messages/ops/mongodb.rs
index 18eeb3796..721a3b7c9 100644
--- a/crates/core/database/src/models/messages/ops/mongodb.rs
+++ b/crates/core/database/src/models/messages/ops/mongodb.rs
@@ -95,7 +95,7 @@ impl AbstractMessages for MongoDb {
                         COL,
                         older_message_filter,
                         FindOptions::builder()
-                            .limit(limit / 2)
+                            .limit(limit / 2 + 1)
                             .sort(doc! {
                                 "_id": -1_i32
                             })
diff --git a/crates/core/models/src/v0/messages.rs b/crates/core/models/src/v0/messages.rs
index 21541984b..37ed526ed 100644
--- a/crates/core/models/src/v0/messages.rs
+++ b/crates/core/models/src/v0/messages.rs
@@ -282,7 +282,7 @@ auto_derived!(
     pub struct OptionsQueryMessages {
         /// Maximum number of messages to fetch
         ///
-        /// For fetching nearby messages, this is \`(limit + 1)\`.
+        /// For fetching nearby messages, this is \`(limit + 2)\`.
         #[cfg_attr(feature = "validator", validate(range(min = 1, max = 100)))]
         pub limit: Option<i64>,
         /// Message id before which messages should be fetched

From 12854d0f1b4746265f8812840895c47782a95422 Mon Sep 17 00:00:00 2001
From: Paul Makles <me@insrt.uk>
Date: Mon, 10 Feb 2025 18:04:46 +0000
Subject: [PATCH 25/62] fix: change permission check for fetching channel
 webhooks

---
 crates/delta/src/routes/channels/webhook_fetch_all.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crates/delta/src/routes/channels/webhook_fetch_all.rs b/crates/delta/src/routes/channels/webhook_fetch_all.rs
index 06d94d802..6afc7ac8b 100644
--- a/crates/delta/src/routes/channels/webhook_fetch_all.rs
+++ b/crates/delta/src/routes/channels/webhook_fetch_all.rs
@@ -22,7 +22,7 @@ pub async fn fetch_webhooks(
     let mut query = DatabasePermissionQuery::new(db, &user).channel(&channel);
     calculate_channel_permissions(&mut query)
         .await
-        .throw_if_lacking_channel_permission(ChannelPermission::ViewChannel)?;
+        .throw_if_lacking_channel_permission(ChannelPermission::ManageWebhooks)?;
 
     Ok(Json(
         db.fetch_webhooks_for_channel(channel.id())

From a7345a7b9068aa654b88a3ba5cf260f6f078ebca Mon Sep 17 00:00:00 2001
From: Paul Makles <me@insrt.uk>
Date: Mon, 10 Feb 2025 18:19:34 +0000
Subject: [PATCH 26/62] chore: mount API at /0.8/ as well

---
 crates/delta/src/main.rs       | 11 ++++++++-
 crates/delta/src/routes/mod.rs | 41 ++++++++++++++++++++++++++++++++++
 2 files changed, 51 insertions(+), 1 deletion(-)

diff --git a/crates/delta/src/main.rs b/crates/delta/src/main.rs
index ae7556cea..c5977c57a 100644
--- a/crates/delta/src/main.rs
+++ b/crates/delta/src/main.rs
@@ -77,7 +77,15 @@ pub async fn web() -> Rocket<Build> {
     // Configure Swagger
     let swagger = revolt_rocket_okapi::swagger_ui::make_swagger_ui(
         &revolt_rocket_okapi::swagger_ui::SwaggerUIConfig {
-            url: "../openapi.json".to_owned(),
+            url: "/openapi.json".to_owned(),
+            ..Default::default()
+        },
+    )
+    .into();
+
+    let swagger_0_8 = revolt_rocket_okapi::swagger_ui::make_swagger_ui(
+        &revolt_rocket_okapi::swagger_ui::SwaggerUIConfig {
+            url: "/0.8/openapi.json".to_owned(),
             ..Default::default()
         },
     )
@@ -124,6 +132,7 @@ pub async fn web() -> Rocket<Build> {
         .mount("/", rocket_cors::catch_all_options_routes())
         .mount("/", util::ratelimiter::routes())
         .mount("/swagger/", swagger)
+        .mount("/0.8/swagger/", swagger_0_8)
         .manage(authifier)
         .manage(db)
         .manage(amqp)
diff --git a/crates/delta/src/routes/mod.rs b/crates/delta/src/routes/mod.rs
index 516c2166c..1f150e0b6 100644
--- a/crates/delta/src/routes/mod.rs
+++ b/crates/delta/src/routes/mod.rs
@@ -61,6 +61,47 @@ pub fn mount(config: Settings, mut rocket: Rocket<Build>) -> Rocket<Build> {
         };
     }
 
+    if config.features.webhooks_enabled {
+        mount_endpoints_and_merged_docs! {
+            rocket, "/0.8".to_owned(), settings,
+            "/" => (vec![], custom_openapi_spec()),
+            "" => openapi_get_routes_spec![root::root],
+            "/users" => users::routes(),
+            "/bots" => bots::routes(),
+            "/channels" => channels::routes(),
+            "/servers" => servers::routes(),
+            "/invites" => invites::routes(),
+            "/custom" => customisation::routes(),
+            "/safety" => safety::routes(),
+            "/auth/account" => rocket_authifier::routes::account::routes(),
+            "/auth/session" => rocket_authifier::routes::session::routes(),
+            "/auth/mfa" => rocket_authifier::routes::mfa::routes(),
+            "/onboard" => onboard::routes(),
+            "/push" => push::routes(),
+            "/sync" => sync::routes(),
+            "/webhooks" => webhooks::routes()
+        };
+    } else {
+        mount_endpoints_and_merged_docs! {
+            rocket, "/0.8".to_owned(), settings,
+            "/" => (vec![], custom_openapi_spec()),
+            "" => openapi_get_routes_spec![root::root],
+            "/users" => users::routes(),
+            "/bots" => bots::routes(),
+            "/channels" => channels::routes(),
+            "/servers" => servers::routes(),
+            "/invites" => invites::routes(),
+            "/custom" => customisation::routes(),
+            "/safety" => safety::routes(),
+            "/auth/account" => rocket_authifier::routes::account::routes(),
+            "/auth/session" => rocket_authifier::routes::session::routes(),
+            "/auth/mfa" => rocket_authifier::routes::mfa::routes(),
+            "/onboard" => onboard::routes(),
+            "/push" => push::routes(),
+            "/sync" => sync::routes()
+        };
+    }
+
     rocket
 }
 

From 8bfe3ec6b0a35689317c429650a9d1f3f5af179a Mon Sep 17 00:00:00 2001
From: Paul Makles <me@insrt.uk>
Date: Mon, 10 Feb 2025 18:34:37 +0000
Subject: [PATCH 27/62] fix: ensure ratelimiter adjusts for version prefix

---
 crates/delta/src/routes/mod.rs       |  7 ++++++-
 crates/delta/src/util/ratelimiter.rs | 22 ++++++++++++++++++----
 2 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/crates/delta/src/routes/mod.rs b/crates/delta/src/routes/mod.rs
index 1f150e0b6..5107e7c26 100644
--- a/crates/delta/src/routes/mod.rs
+++ b/crates/delta/src/routes/mod.rs
@@ -231,10 +231,15 @@ fn custom_openapi_spec() -> OpenApi {
                 ..Default::default()
             },
             Server {
-                url: "http://local.revolt.chat:8000".to_owned(),
+                url: "http://local.revolt.chat:14702".to_owned(),
                 description: Some("Local Revolt Environment".to_owned()),
                 ..Default::default()
             },
+            Server {
+                url: "http://local.revolt.chat:14702/0.8".to_owned(),
+                description: Some("Local Revolt Environment (v0.8)".to_owned()),
+                ..Default::default()
+            },
         ],
         external_docs: Some(ExternalDocs {
             url: "https://developers.revolt.chat".to_owned(),
diff --git a/crates/delta/src/util/ratelimiter.rs b/crates/delta/src/util/ratelimiter.rs
index c95f818df..95952918e 100644
--- a/crates/delta/src/util/ratelimiter.rs
+++ b/crates/delta/src/util/ratelimiter.rs
@@ -94,14 +94,28 @@ pub struct Ratelimiter {
 ///
 /// Optionally, include a resource id to hash against.
 fn resolve_bucket<'r>(request: &'r rocket::Request<'_>) -> (&'r str, Option<&'r str>) {
-    if let Some(segment) = request.routed_segment(0) {
-        let resource = request.routed_segment(1);
+    let (segment, resource, extra) = if matches!(request.routed_segment(0), Some("0.8")) {
+        (
+            request.routed_segment(1),
+            request.routed_segment(2),
+            request.routed_segment(3),
+        )
+    } else {
+        (
+            request.routed_segment(0),
+            request.routed_segment(1),
+            request.routed_segment(2),
+        )
+    };
+
+    if let Some(segment) = segment {
+        let resource = resource;
 
         let method = request.method();
         match (segment, resource, method) {
             ("users", target, Method::Patch) => ("user_edit", target),
             ("users", _, _) => {
-                if let Some("default_avatar") = request.routed_segment(2) {
+                if let Some("default_avatar") = extra {
                     return ("default_avatar", None);
                 }
 
@@ -110,7 +124,7 @@ fn resolve_bucket<'r>(request: &'r rocket::Request<'_>) -> (&'r str, Option<&'r
             ("bots", _, _) => ("bots", None),
             ("channels", Some(id), _) => {
                 if request.method() == Method::Post {
-                    if let Some("messages") = request.routed_segment(2) {
+                    if let Some("messages") = extra {
                         return ("messaging", Some(id));
                     }
                 }

From 0b02c84f0471b464c6971b592c77f477f17c6f5a Mon Sep 17 00:00:00 2001
From: Paul Makles <me@insrt.uk>
Date: Mon, 10 Feb 2025 18:37:21 +0000
Subject: [PATCH 28/62] chore: bump version to 0.8.2

---
 Cargo.lock                         | 26 +++++++++++++-------------
 crates/bindings/node/Cargo.toml    |  8 ++++----
 crates/bonfire/Cargo.toml          |  4 ++--
 crates/core/config/Cargo.toml      |  4 ++--
 crates/core/database/Cargo.toml    | 12 ++++++------
 crates/core/files/Cargo.toml       |  6 +++---
 crates/core/models/Cargo.toml      |  6 +++---
 crates/core/permissions/Cargo.toml |  4 ++--
 crates/core/presence/Cargo.toml    |  2 +-
 crates/core/result/Cargo.toml      |  2 +-
 crates/daemons/pushd/Cargo.toml    |  8 ++++----
 crates/delta/Cargo.toml            |  2 +-
 crates/services/autumn/Cargo.toml  | 10 +++++-----
 crates/services/january/Cargo.toml | 10 +++++-----
 14 files changed, 52 insertions(+), 52 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 80cd01bdd..1c5bd6016 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -6210,7 +6210,7 @@ dependencies = [
 
 [[package]]
 name = "revolt-autumn"
-version = "0.8.1"
+version = "0.8.2"
 dependencies = [
  "axum",
  "axum-macros",
@@ -6247,7 +6247,7 @@ dependencies = [
 
 [[package]]
 name = "revolt-bonfire"
-version = "0.8.1"
+version = "0.8.2"
 dependencies = [
  "async-channel 2.3.1",
  "async-std",
@@ -6277,7 +6277,7 @@ dependencies = [
 
 [[package]]
 name = "revolt-config"
-version = "0.8.1"
+version = "0.8.2"
 dependencies = [
  "async-std",
  "cached",
@@ -6293,7 +6293,7 @@ dependencies = [
 
 [[package]]
 name = "revolt-database"
-version = "0.8.1"
+version = "0.8.2"
 dependencies = [
  "amqprs",
  "async-lock 2.8.0",
@@ -6345,7 +6345,7 @@ dependencies = [
 
 [[package]]
 name = "revolt-delta"
-version = "0.8.1"
+version = "0.8.2"
 dependencies = [
  "amqprs",
  "async-channel 1.9.0",
@@ -6394,7 +6394,7 @@ dependencies = [
 
 [[package]]
 name = "revolt-files"
-version = "0.8.1"
+version = "0.8.2"
 dependencies = [
  "aes-gcm",
  "aws-config",
@@ -6417,7 +6417,7 @@ dependencies = [
 
 [[package]]
 name = "revolt-january"
-version = "0.8.1"
+version = "0.8.2"
 dependencies = [
  "async-recursion",
  "axum",
@@ -6445,7 +6445,7 @@ dependencies = [
 
 [[package]]
 name = "revolt-models"
-version = "0.8.1"
+version = "0.8.2"
 dependencies = [
  "indexmap 1.9.3",
  "iso8601-timestamp 0.2.17",
@@ -6463,7 +6463,7 @@ dependencies = [
 
 [[package]]
 name = "revolt-nodejs-bindings"
-version = "0.8.1"
+version = "0.8.2"
 dependencies = [
  "async-std",
  "neon",
@@ -6476,7 +6476,7 @@ dependencies = [
 
 [[package]]
 name = "revolt-permissions"
-version = "0.8.1"
+version = "0.8.2"
 dependencies = [
  "async-std",
  "async-trait",
@@ -6491,7 +6491,7 @@ dependencies = [
 
 [[package]]
 name = "revolt-presence"
-version = "0.8.1"
+version = "0.8.2"
 dependencies = [
  "async-std",
  "log",
@@ -6502,7 +6502,7 @@ dependencies = [
 
 [[package]]
 name = "revolt-pushd"
-version = "0.8.1"
+version = "0.8.2"
 dependencies = [
  "amqprs",
  "async-trait",
@@ -6526,7 +6526,7 @@ dependencies = [
 
 [[package]]
 name = "revolt-result"
-version = "0.8.1"
+version = "0.8.2"
 dependencies = [
  "axum",
  "log",
diff --git a/crates/bindings/node/Cargo.toml b/crates/bindings/node/Cargo.toml
index 55ada675f..43b9b8567 100644
--- a/crates/bindings/node/Cargo.toml
+++ b/crates/bindings/node/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "revolt-nodejs-bindings"
-version = "0.8.1"
+version = "0.8.2"
 description = "Node.js bindings for the Revolt software"
 authors = ["Paul Makles <me@insrt.uk>"]
 license = "MIT"
@@ -20,6 +20,6 @@ serde = { version = "1", features = ["derive"] }
 
 async-std = "1.12.0"
 
-revolt-config = { version = "0.8.1", path = "../../core/config" }
-revolt-result = { version = "0.8.1", path = "../../core/result" }
-revolt-database = { version = "0.8.1", path = "../../core/database" }
+revolt-config = { version = "0.8.2", path = "../../core/config" }
+revolt-result = { version = "0.8.2", path = "../../core/result" }
+revolt-database = { version = "0.8.2", path = "../../core/database" }
diff --git a/crates/bonfire/Cargo.toml b/crates/bonfire/Cargo.toml
index 86627e3cb..ed13358b5 100644
--- a/crates/bonfire/Cargo.toml
+++ b/crates/bonfire/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "revolt-bonfire"
-version = "0.8.1"
+version = "0.8.2"
 license = "AGPL-3.0-or-later"
 edition = "2021"
 
@@ -41,7 +41,7 @@ revolt-result = { path = "../core/result" }
 revolt-models = { path = "../core/models" }
 revolt-config = { path = "../core/config" }
 revolt-database = { path = "../core/database" }
-revolt-permissions = { version = "0.8.1", path = "../core/permissions" }
+revolt-permissions = { version = "0.8.2", path = "../core/permissions" }
 revolt-presence = { path = "../core/presence", features = ["redis-is-patched"] }
 
 # redis
diff --git a/crates/core/config/Cargo.toml b/crates/core/config/Cargo.toml
index 1e9c96d6e..b23c10b94 100644
--- a/crates/core/config/Cargo.toml
+++ b/crates/core/config/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "revolt-config"
-version = "0.8.1"
+version = "0.8.2"
 edition = "2021"
 license = "MIT"
 authors = ["Paul Makles <me@insrt.uk>"]
@@ -34,4 +34,4 @@ pretty_env_logger = "0.4.0"
 sentry = "0.31.5"
 
 # Core
-revolt-result = { version = "0.8.1", path = "../result", optional = true }
+revolt-result = { version = "0.8.2", path = "../result", optional = true }
diff --git a/crates/core/database/Cargo.toml b/crates/core/database/Cargo.toml
index 329217ffa..16e0b43fd 100644
--- a/crates/core/database/Cargo.toml
+++ b/crates/core/database/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "revolt-database"
-version = "0.8.1"
+version = "0.8.2"
 edition = "2021"
 license = "AGPL-3.0-or-later"
 authors = ["Paul Makles <me@insrt.uk>"]
@@ -24,15 +24,15 @@ default = ["mongodb", "async-std-runtime", "tasks"]
 
 [dependencies]
 # Core
-revolt-config = { version = "0.8.1", path = "../config", features = [
+revolt-config = { version = "0.8.2", path = "../config", features = [
     "report-macros",
 ] }
-revolt-result = { version = "0.8.1", path = "../result" }
-revolt-models = { version = "0.8.1", path = "../models", features = [
+revolt-result = { version = "0.8.2", path = "../result" }
+revolt-models = { version = "0.8.2", path = "../models", features = [
     "validator",
 ] }
-revolt-presence = { version = "0.8.1", path = "../presence" }
-revolt-permissions = { version = "0.8.1", path = "../permissions", features = [
+revolt-presence = { version = "0.8.2", path = "../presence" }
+revolt-permissions = { version = "0.8.2", path = "../permissions", features = [
     "serde",
     "bson",
 ] }
diff --git a/crates/core/files/Cargo.toml b/crates/core/files/Cargo.toml
index 59ce115ab..de7d2d175 100644
--- a/crates/core/files/Cargo.toml
+++ b/crates/core/files/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "revolt-files"
-version = "0.8.1"
+version = "0.8.2"
 edition = "2021"
 license = "AGPL-3.0-or-later"
 authors = ["Paul Makles <me@insrt.uk>"]
@@ -20,10 +20,10 @@ typenum = "1.17.0"
 aws-config = "1.5.5"
 aws-sdk-s3 = { version = "1.46.0", features = ["behavior-version-latest"] }
 
-revolt-config = { version = "0.8.1", path = "../config", features = [
+revolt-config = { version = "0.8.2", path = "../config", features = [
     "report-macros",
 ] }
-revolt-result = { version = "0.8.1", path = "../result" }
+revolt-result = { version = "0.8.2", path = "../result" }
 
 # image processing
 jxl-oxide = "0.8.1"
diff --git a/crates/core/models/Cargo.toml b/crates/core/models/Cargo.toml
index b840d47f7..4d0c7fa6d 100644
--- a/crates/core/models/Cargo.toml
+++ b/crates/core/models/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "revolt-models"
-version = "0.8.1"
+version = "0.8.2"
 edition = "2021"
 license = "MIT"
 authors = ["Paul Makles <me@insrt.uk>"]
@@ -20,8 +20,8 @@ default = ["serde", "partials", "rocket"]
 
 [dependencies]
 # Core
-revolt-config = { version = "0.8.1", path = "../config" }
-revolt-permissions = { version = "0.8.1", path = "../permissions" }
+revolt-config = { version = "0.8.2", path = "../config" }
+revolt-permissions = { version = "0.8.2", path = "../permissions" }
 
 # Utility
 regex = "1"
diff --git a/crates/core/permissions/Cargo.toml b/crates/core/permissions/Cargo.toml
index c30e9b743..daf61e8d9 100644
--- a/crates/core/permissions/Cargo.toml
+++ b/crates/core/permissions/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "revolt-permissions"
-version = "0.8.1"
+version = "0.8.2"
 edition = "2021"
 license = "MIT"
 authors = ["Paul Makles <me@insrt.uk>"]
@@ -21,7 +21,7 @@ async-std = { version = "1.8.0", features = ["attributes"] }
 
 [dependencies]
 # Core
-revolt-result = { version = "0.8.1", path = "../result" }
+revolt-result = { version = "0.8.2", path = "../result" }
 
 # Utility
 auto_ops = "0.3.0"
diff --git a/crates/core/presence/Cargo.toml b/crates/core/presence/Cargo.toml
index 48ef797a3..7df7c7026 100644
--- a/crates/core/presence/Cargo.toml
+++ b/crates/core/presence/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "revolt-presence"
-version = "0.8.1"
+version = "0.8.2"
 edition = "2021"
 license = "AGPL-3.0-or-later"
 authors = ["Paul Makles <me@insrt.uk>"]
diff --git a/crates/core/result/Cargo.toml b/crates/core/result/Cargo.toml
index 62475f5bb..8e057ba6e 100644
--- a/crates/core/result/Cargo.toml
+++ b/crates/core/result/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "revolt-result"
-version = "0.8.1"
+version = "0.8.2"
 edition = "2021"
 license = "MIT"
 authors = ["Paul Makles <me@insrt.uk>"]
diff --git a/crates/daemons/pushd/Cargo.toml b/crates/daemons/pushd/Cargo.toml
index 231bba2fd..a6f1c61f1 100644
--- a/crates/daemons/pushd/Cargo.toml
+++ b/crates/daemons/pushd/Cargo.toml
@@ -1,12 +1,12 @@
 [package]
 name = "revolt-pushd"
-version = "0.8.1"
+version = "0.8.2"
 edition = "2021"
 
 [dependencies]
-revolt-config = { version = "0.8.1", path = "../../core/config" }
-revolt-database = { version = "0.8.1", path = "../../core/database" }
-revolt-models = { version = "0.8.1", path = "../../core/models", features = [
+revolt-config = { version = "0.8.2", path = "../../core/config" }
+revolt-database = { version = "0.8.2", path = "../../core/database" }
+revolt-models = { version = "0.8.2", path = "../../core/models", features = [
     "validator",
 ] }
 
diff --git a/crates/delta/Cargo.toml b/crates/delta/Cargo.toml
index 5de0a2c03..9797a5f0c 100644
--- a/crates/delta/Cargo.toml
+++ b/crates/delta/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "revolt-delta"
-version = "0.8.1"
+version = "0.8.2"
 license = "AGPL-3.0-or-later"
 authors = ["Paul Makles <paulmakles@gmail.com>"]
 edition = "2018"
diff --git a/crates/services/autumn/Cargo.toml b/crates/services/autumn/Cargo.toml
index 580316c8d..31356a89b 100644
--- a/crates/services/autumn/Cargo.toml
+++ b/crates/services/autumn/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "revolt-autumn"
-version = "0.8.1"
+version = "0.8.2"
 edition = "2021"
 
 [dependencies]
@@ -42,12 +42,12 @@ tracing = "0.1"
 tracing-subscriber = { version = "0.3", features = ["env-filter"] }
 
 # Core crates
-revolt-files = { version = "0.8.1", path = "../../core/files" }
-revolt-config = { version = "0.8.1", path = "../../core/config" }
-revolt-database = { version = "0.8.1", path = "../../core/database", features = [
+revolt-files = { version = "0.8.2", path = "../../core/files" }
+revolt-config = { version = "0.8.2", path = "../../core/config" }
+revolt-database = { version = "0.8.2", path = "../../core/database", features = [
     "axum-impl",
 ] }
-revolt-result = { version = "0.8.1", path = "../../core/result", features = [
+revolt-result = { version = "0.8.2", path = "../../core/result", features = [
     "utoipa",
     "axum",
 ] }
diff --git a/crates/services/january/Cargo.toml b/crates/services/january/Cargo.toml
index b7ec1d1d6..005ba4065 100644
--- a/crates/services/january/Cargo.toml
+++ b/crates/services/january/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "revolt-january"
-version = "0.8.1"
+version = "0.8.2"
 edition = "2021"
 
 [dependencies]
@@ -31,13 +31,13 @@ tracing = "0.1"
 tracing-subscriber = { version = "0.3", features = ["env-filter"] }
 
 # Core crates
-revolt-config = { version = "0.8.1", path = "../../core/config" }
-revolt-models = { version = "0.8.1", path = "../../core/models" }
-revolt-result = { version = "0.8.1", path = "../../core/result", features = [
+revolt-config = { version = "0.8.2", path = "../../core/config" }
+revolt-models = { version = "0.8.2", path = "../../core/models" }
+revolt-result = { version = "0.8.2", path = "../../core/result", features = [
     "utoipa",
     "axum",
 ] }
-revolt-files = { version = "0.8.1", path = "../../core/files" }
+revolt-files = { version = "0.8.2", path = "../../core/files" }
 
 # Axum / web server
 axum = { version = "0.7.5" }

From 9e5fbec9b073c7ac54c42f87e3b4065d74763d82 Mon Sep 17 00:00:00 2001
From: Paul Makles <me@insrt.uk>
Date: Mon, 10 Feb 2025 18:50:19 +0000
Subject: [PATCH 29/62] chore: disable LTO because it likely overloads GitHub
 worker

---
 Cargo.toml | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index e8c4eab68..57b4459c6 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -18,5 +18,9 @@ redis23 = { package = "redis", version = "0.23.1", git = "https://github.com/rev
 # rocket_authifier = { package = "rocket_authifier", version = "1.0.8", path = "../authifier/crates/rocket_authifier" }
 # rocket = { git = "https://github.com/rwf2/Rocket/", rev = "4dcd928" }
 
-[profile.release]
-lto = true
+# I'm 99% sure this is overloading the GitHub worker
+# hence builds have been failing since, let's just
+# disable it for now. In the future, we could use this
+# if we were rolling our own CI.
+# [profile.release]
+# lto = true

From ae15a0b4c709631b1f4810c0960ec45f2ee7e17b Mon Sep 17 00:00:00 2001
From: Paul Makles <me@insrt.uk>
Date: Mon, 10 Feb 2025 18:54:15 +0000
Subject: [PATCH 30/62] fix: don't allow users to time themselves out closes
 #376

---
 crates/core/result/src/lib.rs                  |  1 +
 crates/delta/src/routes/servers/member_edit.rs | 14 +++++++++-----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/crates/core/result/src/lib.rs b/crates/core/result/src/lib.rs
index 84eaaaa18..2a3022557 100644
--- a/crates/core/result/src/lib.rs
+++ b/crates/core/result/src/lib.rs
@@ -117,6 +117,7 @@ pub enum ErrorType {
         max: usize,
     },
     AlreadyInServer,
+    CannotTimeoutYourself,
 
     // ? Bot related errors
     ReachedMaximumBots,
diff --git a/crates/delta/src/routes/servers/member_edit.rs b/crates/delta/src/routes/servers/member_edit.rs
index b6e205b74..89a74b0e0 100644
--- a/crates/delta/src/routes/servers/member_edit.rs
+++ b/crates/delta/src/routes/servers/member_edit.rs
@@ -21,13 +21,13 @@ use validator::Validate;
 ///
 /// Edit a member by their id.
 #[openapi(tag = "Server Members")]
-#[patch("/<server>/members/<target>", data = "<data>")]
+#[patch("/<server>/members/<member>", data = "<data>")]
 pub async fn edit(
     db: &State<Database>,
     voice_client: &State<VoiceClient>,
     user: User,
     server: Reference,
-    target: Reference,
+    member: Reference,
     data: Json<v0::DataMemberEdit>,
 ) -> Result<Json<v0::Member>> {
     let data = data.into_inner();
@@ -37,10 +37,10 @@ pub async fn edit(
         })
     })?;
 
-    // Fetch server and target member
+    // Fetch server and member
     let mut server = server.as_server(db).await?;
-    let mut member = target.as_member(db, &server.id).await?;
-    let target_user = target.as_user(&db).await?;
+    let target_user = member.as_user(&db).await?;
+    let mut member = member.as_member(db, &server.id).await?;
 
     // Fetch our currrent permissions
     let mut query = DatabasePermissionQuery::new(db, &user).server(&server);
@@ -92,6 +92,10 @@ pub async fn edit(
             .map(|x| x.contains(&v0::FieldsMember::Timeout))
             .unwrap_or_default()
     {
+        if data.timeout.is_some() && member.id.user == user.id {
+            return Err(create_error!(CannotTimeoutYourself));
+        }
+
         permissions.throw_if_lacking_channel_permission(ChannelPermission::TimeoutMembers)?;
     }
 

From 4ea08a189dba293850d5a1b3b7fab125c8c8ece3 Mon Sep 17 00:00:00 2001
From: Paul Makles <me@insrt.uk>
Date: Mon, 10 Feb 2025 19:05:21 +0000
Subject: [PATCH 31/62] fix: match new error type for status code

---
 crates/core/result/src/axum.rs   | 1 +
 crates/core/result/src/rocket.rs | 1 +
 2 files changed, 2 insertions(+)

diff --git a/crates/core/result/src/axum.rs b/crates/core/result/src/axum.rs
index c04d9aa5c..68b880832 100644
--- a/crates/core/result/src/axum.rs
+++ b/crates/core/result/src/axum.rs
@@ -42,6 +42,7 @@ impl IntoResponse for Error {
             ErrorType::InvalidRole => StatusCode::NOT_FOUND,
             ErrorType::Banned => StatusCode::FORBIDDEN,
             ErrorType::AlreadyInServer => StatusCode::CONFLICT,
+            ErrorType::CannotTimeoutYourself => StatusCode::BAD_REQUEST,
 
             ErrorType::TooManyServers { .. } => StatusCode::BAD_REQUEST,
             ErrorType::TooManyEmbeds { .. } => StatusCode::BAD_REQUEST,
diff --git a/crates/core/result/src/rocket.rs b/crates/core/result/src/rocket.rs
index da01649b9..6e5b55784 100644
--- a/crates/core/result/src/rocket.rs
+++ b/crates/core/result/src/rocket.rs
@@ -47,6 +47,7 @@ impl<'r> Responder<'r, 'static> for Error {
             ErrorType::InvalidRole => Status::NotFound,
             ErrorType::Banned => Status::Forbidden,
             ErrorType::AlreadyInServer => Status::Conflict,
+            ErrorType::CannotTimeoutYourself => Status::BadRequest,
 
             ErrorType::TooManyServers { .. } => Status::BadRequest,
             ErrorType::TooManyEmbeds { .. } => Status::BadRequest,

From 9a98c53aff5dc5972083c7cc7bdd28e158199419 Mon Sep 17 00:00:00 2001
From: Paul Makles <me@insrt.uk>
Date: Wed, 27 Nov 2024 16:56:30 +0000
Subject: [PATCH 32/62] feat: init crond crate

---
 Cargo.lock                                     | 10 ++++++++++
 Cargo.toml                                     |  3 +--
 crates/core/database/src/models/users/model.rs | 11 +++++++++--
 crates/daemons/crond/Cargo.toml                | 14 ++++++++++++++
 crates/daemons/crond/src/main.rs               |  3 +++
 5 files changed, 37 insertions(+), 4 deletions(-)
 create mode 100644 crates/daemons/crond/Cargo.toml
 create mode 100644 crates/daemons/crond/src/main.rs

diff --git a/Cargo.lock b/Cargo.lock
index 1c5bd6016..ab295d309 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1663,6 +1663,16 @@ dependencies = [
 [[package]]
 name = "crc64fast-nvme"
 version = "1.1.1"
+name = "crond"
+version = "0.7.19"
+dependencies = [
+ "revolt-database",
+ "revolt-files",
+]
+
+[[package]]
+name = "crossbeam-channel"
+version = "0.5.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d5e2ee08013e3f228d6d2394116c4549a6df77708442c62d887d83f68ef2ee37"
 dependencies = [
diff --git a/Cargo.toml b/Cargo.toml
index 57b4459c6..0eaad88c6 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -7,8 +7,7 @@ members = [
     "crates/core/*",
     "crates/services/*",
     "crates/bindings/*",
-    "crates/daemons/pushd",
-    "crates/daemons/voice-ingress"
+    "crates/daemons/*",
 ]
 
 [patch.crates-io]
diff --git a/crates/core/database/src/models/users/model.rs b/crates/core/database/src/models/users/model.rs
index d85801e75..6768258e6 100644
--- a/crates/core/database/src/models/users/model.rs
+++ b/crates/core/database/src/models/users/model.rs
@@ -153,7 +153,7 @@ pub static DISCRIMINATOR_SEARCH_SPACE: Lazy<HashSet<String>> = Lazy::new(|| {
         .collect::<HashSet<String>>();
 
     for discrim in [
-        123, 1234, 1111, 2222, 3333, 4444, 5555, 6666, 7777, 8888, 9999,
+        123, 1234, 1111, 2222, 3333, 4444, 5555, 6666, 7777, 8888, 9999, 1488,
     ] {
         set.remove(&format!("{:0>4}", discrim));
     }
@@ -294,7 +294,14 @@ impl User {
         }
 
         // Ensure none of the following substrings show up in the username
-        const BLOCKED_SUBSTRINGS: &[&str] = &["```"];
+        const BLOCKED_SUBSTRINGS: &[&str] = &[
+            "```",
+            "discord.gg",
+            "rvlt.gg",
+            "guilded.gg",
+            "https://",
+            "http://",
+        ];
 
         for substr in BLOCKED_SUBSTRINGS {
             if username_lowercase.contains(substr) {
diff --git a/crates/daemons/crond/Cargo.toml b/crates/daemons/crond/Cargo.toml
new file mode 100644
index 000000000..85ec4349a
--- /dev/null
+++ b/crates/daemons/crond/Cargo.toml
@@ -0,0 +1,14 @@
+[package]
+name = "crond"
+version = "0.7.19"
+license = "AGPL-3.0-or-later"
+authors = ["Paul Makles <me@insrt.uk>"]
+edition = "2021"
+description = "Revolt Daemon Service: Timed data clean up tasks"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+# Core
+revolt-database = { version = "0.7.19", path = "../../core/database" }
+revolt-files = { version = "0.7.19", path = "../../core/files" }
diff --git a/crates/daemons/crond/src/main.rs b/crates/daemons/crond/src/main.rs
new file mode 100644
index 000000000..e7a11a969
--- /dev/null
+++ b/crates/daemons/crond/src/main.rs
@@ -0,0 +1,3 @@
+fn main() {
+    println!("Hello, world!");
+}

From a42746c55b6ff9f9885a16ca5c8833b9d46d819e Mon Sep 17 00:00:00 2001
From: Paul Makles <me@insrt.uk>
Date: Wed, 27 Nov 2024 21:54:39 +0000
Subject: [PATCH 33/62] feat: file deletion implementation

---
 Cargo.lock                                    | 18 +++++++
 crates/core/config/Revolt.toml                |  1 +
 crates/core/config/src/lib.rs                 |  1 +
 .../database/src/models/file_hashes/ops.rs    |  3 ++
 .../src/models/file_hashes/ops/mongodb.rs     |  5 ++
 .../src/models/file_hashes/ops/reference.rs   | 12 ++++-
 crates/core/database/src/models/files/ops.rs  | 12 +++++
 .../database/src/models/files/ops/mongodb.rs  | 54 ++++++++++++++++++-
 .../src/models/files/ops/reference.rs         | 45 ++++++++++++++++
 crates/core/files/src/lib.rs                  | 17 ++++++
 crates/daemons/crond/Cargo.toml               | 10 +++-
 crates/daemons/crond/src/main.rs              | 20 ++++++-
 .../daemons/crond/src/tasks/file_deletion.rs  | 39 ++++++++++++++
 crates/daemons/crond/src/tasks/mod.rs         |  2 +
 .../crond/src/tasks/prune_dangling_files.rs   | 36 +++++++++++++
 15 files changed, 269 insertions(+), 6 deletions(-)
 create mode 100644 crates/daemons/crond/src/tasks/file_deletion.rs
 create mode 100644 crates/daemons/crond/src/tasks/mod.rs
 create mode 100644 crates/daemons/crond/src/tasks/prune_dangling_files.rs

diff --git a/Cargo.lock b/Cargo.lock
index ab295d309..3316dc6dd 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2624,6 +2624,9 @@ name = "futures"
 version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "65bc07b1a8bc7c85c5f2e110c476c7389b4554ba72af57d8445ea63a576b0876"
+version = "0.3.30"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0"
 dependencies = [
  "futures-channel",
  "futures-core",
@@ -2655,6 +2658,9 @@ name = "futures-executor"
 version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1e28d1d997f585e54aebc3f97d39e72338912123a67330d723fdbb564d646c9f"
+version = "0.3.30"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d"
 dependencies = [
  "futures-core",
  "futures-task",
@@ -6301,6 +6307,18 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "revolt-crond"
+version = "0.7.19"
+dependencies = [
+ "log",
+ "revolt-config",
+ "revolt-database",
+ "revolt-files",
+ "revolt-result",
+ "tokio 1.35.1",
+]
+
 [[package]]
 name = "revolt-database"
 version = "0.8.2"
diff --git a/crates/core/config/Revolt.toml b/crates/core/config/Revolt.toml
index c2c2c2b3a..442daf027 100644
--- a/crates/core/config/Revolt.toml
+++ b/crates/core/config/Revolt.toml
@@ -265,3 +265,4 @@ events = ""
 voice_ingress = ""
 files = ""
 proxy = ""
+crond = ""
diff --git a/crates/core/config/src/lib.rs b/crates/core/config/src/lib.rs
index 5e6404348..4fa300848 100644
--- a/crates/core/config/src/lib.rs
+++ b/crates/core/config/src/lib.rs
@@ -339,6 +339,7 @@ pub struct Sentry {
     pub voice_ingress: String,
     pub files: String,
     pub proxy: String,
+    pub crond: String,
 }
 
 #[derive(Deserialize, Debug, Clone)]
diff --git a/crates/core/database/src/models/file_hashes/ops.rs b/crates/core/database/src/models/file_hashes/ops.rs
index e7f626584..648a1a2f6 100644
--- a/crates/core/database/src/models/file_hashes/ops.rs
+++ b/crates/core/database/src/models/file_hashes/ops.rs
@@ -15,4 +15,7 @@ pub trait AbstractAttachmentHashes: Sync + Send {
 
     /// Update an attachment hash nonce value.
     async fn set_attachment_hash_nonce(&self, hash: &str, nonce: &str) -> Result<()>;
+
+    /// Delete attachment hash by id.
+    async fn delete_attachment_hash(&self, id: &str) -> Result<()>;
 }
diff --git a/crates/core/database/src/models/file_hashes/ops/mongodb.rs b/crates/core/database/src/models/file_hashes/ops/mongodb.rs
index c55a06104..153cb72f1 100644
--- a/crates/core/database/src/models/file_hashes/ops/mongodb.rs
+++ b/crates/core/database/src/models/file_hashes/ops/mongodb.rs
@@ -48,4 +48,9 @@ impl AbstractAttachmentHashes for MongoDb {
             .map(|_| ())
             .map_err(|_| create_database_error!("update_one", COL))
     }
+
+    /// Delete attachment hash by id.
+    async fn delete_attachment_hash(&self, id: &str) -> Result<()> {
+        query!(self, delete_one_by_id, COL, id).map(|_| ())
+    }
 }
diff --git a/crates/core/database/src/models/file_hashes/ops/reference.rs b/crates/core/database/src/models/file_hashes/ops/reference.rs
index 86bbeee8b..7733523e3 100644
--- a/crates/core/database/src/models/file_hashes/ops/reference.rs
+++ b/crates/core/database/src/models/file_hashes/ops/reference.rs
@@ -23,8 +23,8 @@ impl AbstractAttachmentHashes for ReferenceDb {
         let hashes = self.file_hashes.lock().await;
         hashes
             .values()
+            .find(|&hash| hash.id == hash_value || hash.processed_hash == hash_value)
             .cloned()
-            .find(|hash| hash.id == hash_value || hash.processed_hash == hash_value)
             .ok_or(create_error!(NotFound))
     }
 
@@ -38,4 +38,14 @@ impl AbstractAttachmentHashes for ReferenceDb {
             Err(create_error!(NotFound))
         }
     }
+
+    /// Delete attachment hash by id.
+    async fn delete_attachment_hash(&self, id: &str) -> Result<()> {
+        let mut file_hashes = self.file_hashes.lock().await;
+        if file_hashes.remove(id).is_some() {
+            Ok(())
+        } else {
+            Err(create_error!(NotFound))
+        }
+    }
 }
diff --git a/crates/core/database/src/models/files/ops.rs b/crates/core/database/src/models/files/ops.rs
index 58d599d35..b30d3acc8 100644
--- a/crates/core/database/src/models/files/ops.rs
+++ b/crates/core/database/src/models/files/ops.rs
@@ -15,6 +15,15 @@ pub trait AbstractAttachments: Sync + Send {
     /// Fetch an attachment by its id.
     async fn fetch_attachment(&self, tag: &str, file_id: &str) -> Result<File>;
 
+    /// Fetch all deleted attachments.
+    async fn fetch_deleted_attachments(&self) -> Result<Vec<File>>;
+
+    /// Fetch all dangling attachments.
+    async fn fetch_dangling_files(&self) -> Result<Vec<File>>;
+
+    /// Count references to a given hash.
+    async fn count_file_hash_references(&self, hash: &str) -> Result<usize>;
+
     /// Find an attachment by its details and mark it as used by a given parent.
     async fn find_and_use_attachment(
         &self,
@@ -32,4 +41,7 @@ pub trait AbstractAttachments: Sync + Send {
 
     /// Mark multiple attachments as having been deleted.
     async fn mark_attachments_as_deleted(&self, ids: &[String]) -> Result<()>;
+
+    /// Delete the attachment entry.
+    async fn delete_attachment(&self, id: &str) -> Result<()>;
 }
diff --git a/crates/core/database/src/models/files/ops/mongodb.rs b/crates/core/database/src/models/files/ops/mongodb.rs
index c2295cf3d..43e8e946d 100644
--- a/crates/core/database/src/models/files/ops/mongodb.rs
+++ b/crates/core/database/src/models/files/ops/mongodb.rs
@@ -32,6 +32,51 @@ impl AbstractAttachments for MongoDb {
         .ok_or_else(|| create_error!(NotFound))
     }
 
+    /// Fetch all deleted attachments.
+    async fn fetch_deleted_attachments(&self) -> Result<Vec<File>> {
+        query!(
+            self,
+            find,
+            COL,
+            doc! {
+                "deleted": true,
+                "reported": {
+                    "$ne": true
+                }
+            }
+        )
+    }
+
+    /// Fetch all dangling attachments.
+    async fn fetch_dangling_files(&self) -> Result<Vec<File>> {
+        query!(
+            self,
+            find,
+            COL,
+            doc! {
+                "used_for.type": {
+                    "$exists": 0
+                },
+                "deleted": {
+                    "$ne": true
+                }
+            }
+        )
+    }
+
+    /// Count references to a given hash.
+    async fn count_file_hash_references(&self, hash: &str) -> Result<usize> {
+        query!(
+            self,
+            count_documents,
+            COL,
+            doc! {
+                "hash": hash
+            }
+        )
+        .map(|count| count as usize)
+    }
+
     /// Find an attachment by its details and mark it as used by a given parent.
     async fn find_and_use_attachment(
         &self,
@@ -114,7 +159,7 @@ impl AbstractAttachments for MongoDb {
     /// Mark multiple attachments as having been deleted.
     async fn mark_attachments_as_deleted(&self, ids: &[String]) -> Result<()> {
         self.col::<Document>(COL)
-            .update_one(
+            .update_many(
                 doc! {
                     "_id": {
                         "$in": ids
@@ -129,7 +174,12 @@ impl AbstractAttachments for MongoDb {
             )
             .await
             .map(|_| ())
-            .map_err(|_| create_database_error!("update_one", COL))
+            .map_err(|_| create_database_error!("update_many", COL))
+    }
+
+    /// Delete the attachment entry.
+    async fn delete_attachment(&self, id: &str) -> Result<()> {
+        query!(self, delete_one_by_id, COL, id).map(|_| ())
     }
 }
 
diff --git a/crates/core/database/src/models/files/ops/reference.rs b/crates/core/database/src/models/files/ops/reference.rs
index e18794272..208b0b0a9 100644
--- a/crates/core/database/src/models/files/ops/reference.rs
+++ b/crates/core/database/src/models/files/ops/reference.rs
@@ -33,6 +33,41 @@ impl AbstractAttachments for ReferenceDb {
         }
     }
 
+    /// Fetch all deleted attachments.
+    async fn fetch_deleted_attachments(&self) -> Result<Vec<File>> {
+        let files = self.files.lock().await;
+        Ok(files
+            .values()
+            .filter(|file| {
+                // file has been marked as deleted
+                file.deleted.is_some_and(|v| v)
+                    // and it has not been reported
+                    && !file.reported.is_some_and(|v| v)
+            })
+            .cloned()
+            .collect())
+    }
+
+    /// Fetch all dangling attachments.
+    async fn fetch_dangling_files(&self) -> Result<Vec<File>> {
+        let files = self.files.lock().await;
+        Ok(files
+            .values()
+            .filter(|file| file.used_for.is_none() && !file.deleted.is_some_and(|v| v))
+            .cloned()
+            .collect())
+    }
+
+    /// Count references to a given hash.
+    async fn count_file_hash_references(&self, hash: &str) -> Result<usize> {
+        let files = self.files.lock().await;
+        Ok(files
+            .values()
+            .filter(|file| file.hash.as_ref().is_some_and(|h| h == hash))
+            .cloned()
+            .count())
+    }
+
     /// Find an attachment by its details and mark it as used by a given parent.
     async fn find_and_use_attachment(
         &self,
@@ -96,4 +131,14 @@ impl AbstractAttachments for ReferenceDb {
 
         Ok(())
     }
+
+    /// Delete the attachment entry.
+    async fn delete_attachment(&self, id: &str) -> Result<()> {
+        let mut files = self.files.lock().await;
+        if files.remove(id).is_some() {
+            Ok(())
+        } else {
+            Err(create_error!(NotFound))
+        }
+    }
 }
diff --git a/crates/core/files/src/lib.rs b/crates/core/files/src/lib.rs
index c09853dd9..dacc988e5 100644
--- a/crates/core/files/src/lib.rs
+++ b/crates/core/files/src/lib.rs
@@ -113,6 +113,23 @@ pub async fn upload_to_s3(bucket_id: &str, path: &str, buf: &[u8]) -> Result<Str
     Ok(BASE64_STANDARD.encode(nonce))
 }
 
+/// Delete a file from S3 by path
+pub async fn delete_from_s3(bucket_id: &str, path: &str) -> Result<()> {
+    let config = config().await;
+    let client = create_client(config.files.s3);
+
+    report_internal_error!(
+        client
+            .delete_object()
+            .bucket(bucket_id)
+            .key(path)
+            .send()
+            .await
+    )?;
+
+    Ok(())
+}
+
 /// Determine size of image at temp file
 pub fn image_size(f: &NamedTempFile) -> Option<(usize, usize)> {
     if let Ok(size) = imagesize::size(f.path())
diff --git a/crates/daemons/crond/Cargo.toml b/crates/daemons/crond/Cargo.toml
index 85ec4349a..f2c4b94fe 100644
--- a/crates/daemons/crond/Cargo.toml
+++ b/crates/daemons/crond/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "crond"
+name = "revolt-crond"
 version = "0.7.19"
 license = "AGPL-3.0-or-later"
 authors = ["Paul Makles <me@insrt.uk>"]
@@ -9,6 +9,14 @@ description = "Revolt Daemon Service: Timed data clean up tasks"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
+# Utility
+log = "0.4"
+
+# Async
+tokio = { version = "1" }
+
 # Core
 revolt-database = { version = "0.7.19", path = "../../core/database" }
+revolt-result = { version = "0.7.19", path = "../../core/result" }
+revolt-config = { version = "0.7.19", path = "../../core/config" }
 revolt-files = { version = "0.7.19", path = "../../core/files" }
diff --git a/crates/daemons/crond/src/main.rs b/crates/daemons/crond/src/main.rs
index e7a11a969..40af6a2bd 100644
--- a/crates/daemons/crond/src/main.rs
+++ b/crates/daemons/crond/src/main.rs
@@ -1,3 +1,19 @@
-fn main() {
-    println!("Hello, world!");
+use revolt_config::configure;
+use revolt_database::DatabaseInfo;
+use revolt_result::Result;
+use tasks::{file_deletion, prune_dangling_files};
+use tokio::try_join;
+
+pub mod tasks;
+
+#[tokio::main]
+async fn main() -> Result<()> {
+    configure!(crond);
+
+    let db = DatabaseInfo::Auto.connect().await.expect("database");
+    try_join!(
+        file_deletion::task(db.clone()),
+        prune_dangling_files::task(db)
+    )
+    .map(|_| ())
 }
diff --git a/crates/daemons/crond/src/tasks/file_deletion.rs b/crates/daemons/crond/src/tasks/file_deletion.rs
new file mode 100644
index 000000000..912173b3f
--- /dev/null
+++ b/crates/daemons/crond/src/tasks/file_deletion.rs
@@ -0,0 +1,39 @@
+use std::time::Duration;
+
+use log::info;
+use revolt_database::Database;
+use revolt_files::delete_from_s3;
+use revolt_result::Result;
+use tokio::time::sleep;
+
+pub async fn task(db: Database) -> Result<()> {
+    loop {
+        let files = db.fetch_deleted_attachments().await?;
+
+        for file in files {
+            let count = db
+                .count_file_hash_references(file.hash.as_ref().expect("no `hash` present"))
+                .await?;
+
+            // No other files reference this file on disk anymore
+            if count <= 1 {
+                let file_hash = db
+                    .fetch_attachment_hash(file.hash.as_ref().expect("no `hash` present"))
+                    .await?;
+
+                // Delete from S3
+                delete_from_s3(&file_hash.bucket_id, &file_hash.path).await?;
+
+                // Delete the hash
+                db.delete_attachment_hash(&file_hash.id).await?;
+                info!("Deleted file hash {}", file_hash.id);
+            }
+
+            // Delete the file
+            db.delete_attachment(&file.id).await?;
+            info!("Deleted file {}", file.id);
+        }
+
+        sleep(Duration::from_secs(60)).await;
+    }
+}
diff --git a/crates/daemons/crond/src/tasks/mod.rs b/crates/daemons/crond/src/tasks/mod.rs
new file mode 100644
index 000000000..2a668f14c
--- /dev/null
+++ b/crates/daemons/crond/src/tasks/mod.rs
@@ -0,0 +1,2 @@
+pub mod file_deletion;
+pub mod prune_dangling_files;
diff --git a/crates/daemons/crond/src/tasks/prune_dangling_files.rs b/crates/daemons/crond/src/tasks/prune_dangling_files.rs
new file mode 100644
index 000000000..be1eb6d6b
--- /dev/null
+++ b/crates/daemons/crond/src/tasks/prune_dangling_files.rs
@@ -0,0 +1,36 @@
+use std::time::Duration;
+
+use revolt_database::{iso8601_timestamp::Timestamp, Database};
+use revolt_result::Result;
+use tokio::time::sleep;
+
+use log::info;
+
+pub async fn task(db: Database) -> Result<()> {
+    loop {
+        // This could just be a single database query
+        // ... but timestamps are inconsistently serialised
+        // ... sometimes they are dates/numbers, hard to query
+        // ... in the future, we could use Postgres instead! :D
+        // ...
+        // ... on the plus side, it's still only 2 queries
+
+        let files = db.fetch_dangling_files().await?;
+        let file_ids: Vec<String> = files
+            .into_iter()
+            .filter(|file| {
+                file.uploaded_at.is_some_and(|uploaded_at| {
+                    Timestamp::now_utc().duration_since(uploaded_at) > Duration::from_secs(60 * 60)
+                })
+            })
+            .map(|file| file.id)
+            .collect();
+
+        if !file_ids.is_empty() {
+            db.mark_attachments_as_deleted(&file_ids).await?;
+            info!("Marked {} dangling files for deletion", file_ids.len());
+        }
+
+        sleep(Duration::from_secs(60)).await;
+    }
+}

From d54c5e80fa6c59312e34a1f3be81ebda06eccba5 Mon Sep 17 00:00:00 2001
From: Paul Makles <me@insrt.uk>
Date: Mon, 10 Feb 2025 19:03:48 +0000
Subject: [PATCH 34/62] chore: fix version references

---
 Cargo.lock                      |  4 ++--
 crates/daemons/crond/Cargo.toml | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 3316dc6dd..af86e6dde 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -6309,14 +6309,14 @@ dependencies = [
 
 [[package]]
 name = "revolt-crond"
-version = "0.7.19"
+version = "0.8.2"
 dependencies = [
  "log",
  "revolt-config",
  "revolt-database",
  "revolt-files",
  "revolt-result",
- "tokio 1.35.1",
+ "tokio 1.40.0",
 ]
 
 [[package]]
diff --git a/crates/daemons/crond/Cargo.toml b/crates/daemons/crond/Cargo.toml
index f2c4b94fe..bd5d3f3b2 100644
--- a/crates/daemons/crond/Cargo.toml
+++ b/crates/daemons/crond/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "revolt-crond"
-version = "0.7.19"
+version = "0.8.2"
 license = "AGPL-3.0-or-later"
 authors = ["Paul Makles <me@insrt.uk>"]
 edition = "2021"
@@ -16,7 +16,7 @@ log = "0.4"
 tokio = { version = "1" }
 
 # Core
-revolt-database = { version = "0.7.19", path = "../../core/database" }
-revolt-result = { version = "0.7.19", path = "../../core/result" }
-revolt-config = { version = "0.7.19", path = "../../core/config" }
-revolt-files = { version = "0.7.19", path = "../../core/files" }
+revolt-database = { version = "0.8.2", path = "../../core/database" }
+revolt-result = { version = "0.8.2", path = "../../core/result" }
+revolt-config = { version = "0.8.2", path = "../../core/config" }
+revolt-files = { version = "0.8.2", path = "../../core/files" }

From 370442bf4edeb94dd296e97ec199a66a9605b85d Mon Sep 17 00:00:00 2001
From: Paul Makles <me@insrt.uk>
Date: Mon, 10 Feb 2025 20:28:48 +0000
Subject: [PATCH 35/62] feat: add crond container definitions

---
 .github/workflows/docker.yaml   |  4 ++++
 Dockerfile                      |  1 +
 Dockerfile.useCurrentArch       |  1 +
 README.md                       |  1 +
 crates/daemons/crond/Dockerfile | 10 ++++++++++
 scripts/build-image-layer.sh    |  3 +++
 scripts/publish-debug-image.sh  |  2 ++
 7 files changed, 22 insertions(+)
 create mode 100644 crates/daemons/crond/Dockerfile

diff --git a/.github/workflows/docker.yaml b/.github/workflows/docker.yaml
index 58e186d0b..761078765 100644
--- a/.github/workflows/docker.yaml
+++ b/.github/workflows/docker.yaml
@@ -110,6 +110,10 @@ jobs:
               "pushd": {
                 "path": "crates/daemons/pushd",
                 "tag": "${{ github.repository_owner }}/pushd"
+              },
+              "crond": {
+                "path": "crates/daemons/crond",
+                "tag": "${{ github.repository_owner }}/crond"
               }
             }
           export_to: output
diff --git a/Dockerfile b/Dockerfile
index 10112b667..c75748c20 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -29,6 +29,7 @@ COPY crates/core/presence/Cargo.toml ./crates/core/presence/
 COPY crates/core/result/Cargo.toml ./crates/core/result/
 COPY crates/services/autumn/Cargo.toml ./crates/services/autumn/
 COPY crates/services/january/Cargo.toml ./crates/services/january/
+COPY crates/daemons/crond/Cargo.toml ./crates/daemons/crond/
 COPY crates/daemons/pushd/Cargo.toml ./crates/daemons/pushd/
 RUN sh /tmp/build-image-layer.sh deps
 
diff --git a/Dockerfile.useCurrentArch b/Dockerfile.useCurrentArch
index 34a69462e..54b508ef7 100644
--- a/Dockerfile.useCurrentArch
+++ b/Dockerfile.useCurrentArch
@@ -25,6 +25,7 @@ COPY crates/core/presence/Cargo.toml ./crates/core/presence/
 COPY crates/core/result/Cargo.toml ./crates/core/result/
 COPY crates/services/autumn/Cargo.toml ./crates/services/autumn/
 COPY crates/services/january/Cargo.toml ./crates/services/january/
+COPY crates/daemons/crond/Cargo.toml ./crates/daemons/crond/
 COPY crates/daemons/pushd/Cargo.toml ./crates/daemons/pushd/
 RUN sh /tmp/build-image-layer.sh deps
 
diff --git a/README.md b/README.md
index c480340f5..d0894dee7 100644
--- a/README.md
+++ b/README.md
@@ -26,6 +26,7 @@ The services and libraries that power the Revolt service.<br/>
 | `services/january` | [crates/services/january](crates/services/january) | Proxy server                             | ![License](https://img.shields.io/badge/license-AGPL--3.0--or--later-blue)                                                                                                                                                                                                                                |
 | `services/autumn`  | [crates/services/autumn](crates/services/autumn)   | File server                              | ![License](https://img.shields.io/badge/license-AGPL--3.0--or--later-blue)                                                                                                                                                                                                                                |
 | `bindings/node`    | [crates/bindings/node](crates/bindings/node)       | Node.js bindings for the Revolt software | ![License](https://img.shields.io/badge/license-AGPL--3.0--or--later-blue)                                                                                                                                                                                                                                |
+| `daemons/crond`    | [crates/daemons/crond](crates/daemons/crond)       | Timed data clean up daemon server        | ![License](https://img.shields.io/badge/license-AGPL--3.0--or--later-blue)                                                                                                                                                                                                                                |
 | `daemons/pushd`    | [crates/daemons/pushd](crates/daemons/pushd)       | Push notification daemon server          | ![License](https://img.shields.io/badge/license-AGPL--3.0--or--later-blue)                                                                                                                                                                                                                                |
 
 </div>
diff --git a/crates/daemons/crond/Dockerfile b/crates/daemons/crond/Dockerfile
new file mode 100644
index 000000000..8a4c915a9
--- /dev/null
+++ b/crates/daemons/crond/Dockerfile
@@ -0,0 +1,10 @@
+# Build Stage
+FROM ghcr.io/revoltchat/base:latest AS builder
+FROM debian:12 AS debian
+
+# Bundle Stage
+FROM gcr.io/distroless/cc-debian12:nonroot
+COPY --from=builder /home/rust/src/target/release/revolt-crond ./
+
+USER nonroot
+CMD ["./revolt-crond"]
\ No newline at end of file
diff --git a/scripts/build-image-layer.sh b/scripts/build-image-layer.sh
index 4b2e18c47..064ee7564 100644
--- a/scripts/build-image-layer.sh
+++ b/scripts/build-image-layer.sh
@@ -34,12 +34,14 @@ deps() {
     crates/core/result/src \
     crates/services/autumn/src \
     crates/services/january/src \
+    crates/daemons/crond/src \
     crates/daemons/pushd/src
   echo 'fn main() { panic!("stub"); }' |
     tee crates/bonfire/src/main.rs |
     tee crates/delta/src/main.rs |
     tee crates/services/autumn/src/main.rs |
     tee crates/services/january/src/main.rs |
+    tee crates/daemons/crond/src/main.rs |
     tee crates/daemons/pushd/src/main.rs
   echo '' |
     tee crates/bindings/node/src/lib.rs |
@@ -62,6 +64,7 @@ apps() {
   touch -am \
     crates/bonfire/src/main.rs \
     crates/delta/src/main.rs \
+    crates/daemons/crond/src/main.rs \
     crates/daemons/pushd/src/main.rs \
     crates/core/config/src/lib.rs \
     crates/core/database/src/lib.rs \
diff --git a/scripts/publish-debug-image.sh b/scripts/publish-debug-image.sh
index 247338ab5..6686344cb 100755
--- a/scripts/publish-debug-image.sh
+++ b/scripts/publish-debug-image.sh
@@ -25,6 +25,7 @@ docker build -t ghcr.io/revoltchat/server:$TAG - < crates/delta/Dockerfile
 docker build -t ghcr.io/revoltchat/bonfire:$TAG - < crates/bonfire/Dockerfile
 docker build -t ghcr.io/revoltchat/autumn:$TAG - < crates/services/autumn/Dockerfile
 docker build -t ghcr.io/revoltchat/january:$TAG - < crates/services/january/Dockerfile
+docker build -t ghcr.io/revoltchat/crond:$TAG - < crates/daemons/crond/Dockerfile
 docker build -t ghcr.io/revoltchat/pushd:$TAG - < crates/daemons/pushd/Dockerfile
 
 if [ "$DEBUG" = "true" ]; then
@@ -35,4 +36,5 @@ docker push ghcr.io/revoltchat/server:$TAG
 docker push ghcr.io/revoltchat/bonfire:$TAG
 docker push ghcr.io/revoltchat/autumn:$TAG
 docker push ghcr.io/revoltchat/january:$TAG
+docker push ghcr.io/revoltchat/crond:$TAG
 docker push ghcr.io/revoltchat/pushd:$TAG

From 92f4b44cb3affe983e53da909de277ea5820b47f Mon Sep 17 00:00:00 2001
From: Paul Makles <me@insrt.uk>
Date: Tue, 18 Feb 2025 11:53:21 +0000
Subject: [PATCH 36/62] chore: clarify cargo deny / tomls

---
 crates/daemons/pushd/Cargo.toml    |   1 +
 crates/services/autumn/Cargo.toml  |   1 +
 crates/services/january/Cargo.toml |   1 +
 deny.toml                          | 185 ++++++++++++++++++-----------
 4 files changed, 116 insertions(+), 72 deletions(-)

diff --git a/crates/daemons/pushd/Cargo.toml b/crates/daemons/pushd/Cargo.toml
index a6f1c61f1..be0e3cc5d 100644
--- a/crates/daemons/pushd/Cargo.toml
+++ b/crates/daemons/pushd/Cargo.toml
@@ -2,6 +2,7 @@
 name = "revolt-pushd"
 version = "0.8.2"
 edition = "2021"
+license = "AGPL-3.0-or-later"
 
 [dependencies]
 revolt-config = { version = "0.8.2", path = "../../core/config" }
diff --git a/crates/services/autumn/Cargo.toml b/crates/services/autumn/Cargo.toml
index 31356a89b..4b944f553 100644
--- a/crates/services/autumn/Cargo.toml
+++ b/crates/services/autumn/Cargo.toml
@@ -2,6 +2,7 @@
 name = "revolt-autumn"
 version = "0.8.2"
 edition = "2021"
+license = "AGPL-3.0-or-later"
 
 [dependencies]
 # ID generation
diff --git a/crates/services/january/Cargo.toml b/crates/services/january/Cargo.toml
index 005ba4065..a053d11a9 100644
--- a/crates/services/january/Cargo.toml
+++ b/crates/services/january/Cargo.toml
@@ -2,6 +2,7 @@
 name = "revolt-january"
 version = "0.8.2"
 edition = "2021"
+license = "AGPL-3.0-or-later"
 
 [dependencies]
 # Utility
diff --git a/deny.toml b/deny.toml
index 48dc5f08a..d8f1bf679 100644
--- a/deny.toml
+++ b/deny.toml
@@ -9,6 +9,11 @@
 # The values provided in this template are the default values that will be used
 # when any section or field is not specified in your own configuration
 
+# Root options
+
+# The graph table configures how the dependency graph is constructed and thus
+# which crates the checks are performed against
+[graph]
 # If 1 or more target triples (and optionally, target_features) are specified,
 # only the specified targets will be checked when running `cargo deny check`.
 # This means, if a particular package is only ever used as a target specific
@@ -20,85 +25,83 @@
 targets = [
     # The triple can be any string, but only the target triples built in to
     # rustc (as of 1.40) can be checked against actual config expressions
-    #{ triple = "x86_64-unknown-linux-musl" },
+    #"x86_64-unknown-linux-musl",
     # You can also specify which target_features you promise are enabled for a
     # particular target. target_features are currently not validated against
     # the actual valid features supported by the target architecture.
     #{ triple = "wasm32-unknown-unknown", features = ["atomics"] },
 ]
+# When creating the dependency graph used as the source of truth when checks are
+# executed, this field can be used to prune crates from the graph, removing them
+# from the view of cargo-deny. This is an extremely heavy hammer, as if a crate
+# is pruned from the graph, all of its dependencies will also be pruned unless
+# they are connected to another crate in the graph that hasn't been pruned,
+# so it should be used with care. The identifiers are [Package ID Specifications]
+# (https://doc.rust-lang.org/cargo/reference/pkgid-spec.html)
+#exclude = []
+# If true, metadata will be collected with `--all-features`. Note that this can't
+# be toggled off if true, if you want to conditionally enable `--all-features` it
+# is recommended to pass `--all-features` on the cmd line instead
+all-features = false
+# If true, metadata will be collected with `--no-default-features`. The same
+# caveat with `all-features` applies
+no-default-features = false
+# If set, these feature will be enabled when collecting metadata. If `--features`
+# is specified on the cmd line they will take precedence over this option.
+#features = []
+
+# The output table provides options for how/if diagnostics are outputted
+[output]
+# When outputting inclusion graphs in diagnostics that include features, this
+# option can be used to specify the depth at which feature edges will be added.
+# This option is included since the graphs can be quite large and the addition
+# of features from the crate(s) to all of the graph roots can be far too verbose.
+# This option can be overridden via `--feature-depth` on the cmd line
+feature-depth = 1
 
 # This section is considered when running `cargo deny check advisories`
 # More documentation for the advisories section can be found here:
 # https://embarkstudios.github.io/cargo-deny/checks/advisories/cfg.html
 [advisories]
-# The path where the advisory database is cloned/fetched into
-db-path = "~/.cargo/advisory-db"
+# The path where the advisory databases are cloned/fetched into
+#db-path = "$CARGO_HOME/advisory-dbs"
 # The url(s) of the advisory databases to use
-db-urls = ["https://github.com/rustsec/advisory-db"]
-# The lint level for security vulnerabilities
-vulnerability = "deny"
-# The lint level for unmaintained crates
-unmaintained = "warn"
-# The lint level for crates that have been yanked from their source registry
-yanked = "warn"
-# The lint level for crates with security notices. Note that as of
-# 2019-12-17 there are no security notice advisories in
-# https://github.com/rustsec/advisory-db
-notice = "warn"
+#db-urls = ["https://github.com/rustsec/advisory-db"]
 # A list of advisory IDs to ignore. Note that ignored advisories will still
 # output a note when they are encountered.
 ignore = [
     #"RUSTSEC-0000-0000",
+    #{ id = "RUSTSEC-0000-0000", reason = "you can specify a reason the advisory is ignored" },
+    #"a-crate-that-is-yanked@0.1.1", # you can also ignore yanked crate versions if you wish
+    #{ crate = "a-crate-that-is-yanked@0.1.1", reason = "you can specify why you are ignoring the yanked crate" },
 ]
-# Threshold for security vulnerabilities, any vulnerability with a CVSS score
-# lower than the range specified will be ignored. Note that ignored advisories
-# will still output a note when they are encountered.
-# * None - CVSS Score 0.0
-# * Low - CVSS Score 0.1 - 3.9
-# * Medium - CVSS Score 4.0 - 6.9
-# * High - CVSS Score 7.0 - 8.9
-# * Critical - CVSS Score 9.0 - 10.0
-#severity-threshold =
+# If this is true, then cargo deny will use the git executable to fetch advisory database.
+# If this is false, then it uses a built-in git library.
+# Setting this to true can be helpful if you have special authentication requirements that cargo-deny does not support.
+# See Git Authentication for more information about setting up git authentication.
+#git-fetch-with-cli = true
 
 # This section is considered when running `cargo deny check licenses`
 # More documentation for the licenses section can be found here:
 # https://embarkstudios.github.io/cargo-deny/checks/licenses/cfg.html
 [licenses]
-# The lint level for crates which do not have a detectable license
-unlicensed = "warn"
 # List of explicitly allowed licenses
 # See https://spdx.org/licenses/ for list of possible licenses
 # [possible values: any SPDX 3.11 short identifier (+ optional exception)].
 allow = [
+    # any non-copyleft licenses are okay!
     "MIT",
     "ISC",
     "0BSD",
+    "Zlib",
     "CC0-1.0",
+    "MPL-2.0",
     "Apache-2.0",
+    "Apache-2.0 WITH LLVM-exception",
     "BSD-2-Clause",
     "BSD-3-Clause",
-    #"Apache-2.0 WITH LLVM-exception",
-]
-# List of explicitly disallowed licenses
-# See https://spdx.org/licenses/ for list of possible licenses
-# [possible values: any SPDX 3.11 short identifier (+ optional exception)].
-deny = [
-    #"Nokia",
+    "OpenSSL",
 ]
-# Lint level for licenses considered copyleft
-copyleft = "warn"
-# Blanket approval or denial for OSI-approved or FSF Free/Libre licenses
-# * both - The license will be approved if it is both OSI-approved *AND* FSF
-# * either - The license will be approved if it is either OSI-approved *OR* FSF
-# * osi-only - The license will be approved if is OSI-approved *AND NOT* FSF
-# * fsf-only - The license will be approved if is FSF *AND NOT* OSI-approved
-# * neither - This predicate is ignored and the default lint level is used
-allow-osi-fsf-free = "neither"
-# Lint level used when no other predicates are matched
-# 1. License isn't in the allow or deny lists
-# 2. License isn't copyleft
-# 3. License isn't OSI/FSF, or allow-osi-fsf-free = "neither"
-default = "deny"
 # The confidence threshold for detecting a license from license text.
 # The higher the value, the more closely the license text must be to the
 # canonical license text of a valid SPDX license file.
@@ -108,29 +111,34 @@ confidence-threshold = 0.8
 # aren't accepted for every possible crate as with the normal allow list
 exceptions = [
     # Each entry is the crate and version constraint, and its specific allow
-    # list
-    #{ allow = ["Zlib"], name = "adler32", version = "*" },
+    { allow = ["AGPL-3.0"], crate = "revolt-database" },
+    { allow = ["AGPL-3.0"], crate = "revolt-presence" },
+    { allow = ["AGPL-3.0"], crate = "revolt-files" },
+    { allow = ["AGPL-3.0"], crate = "revolt-pushd" },
+    { allow = ["AGPL-3.0"], crate = "revolt-crond" },
+    { allow = ["AGPL-3.0"], crate = "revolt-delta" },
+    { allow = ["AGPL-3.0"], crate = "revolt-bonfire" },
+    { allow = ["AGPL-3.0"], crate = "revolt-autumn" },
+    { allow = ["AGPL-3.0"], crate = "revolt-january" },
 ]
 
 # Some crates don't have (easily) machine readable licensing information,
 # adding a clarification entry for it allows you to manually specify the
 # licensing information
-#[[licenses.clarify]]
-# The name of the crate the clarification applies to
-#name = "ring"
-# The optional version constraint for the crate
-#version = "*"
+[[licenses.clarify]]
+# The package spec the clarification applies to
+crate = "ring"
 # The SPDX expression for the license requirements of the crate
-#expression = "MIT AND ISC AND OpenSSL"
+expression = "MIT AND ISC AND OpenSSL"
 # One or more files in the crate's source used as the "source of truth" for
 # the license expression. If the contents match, the clarification will be used
 # when running the license check, otherwise the clarification will be ignored
 # and the crate will be checked normally, which may produce warnings or errors
 # depending on the rest of your configuration
-#license-files = [
+license-files = [
     # Each entry is a crate relative path, and the (opaque) hash of its contents
-    #{ path = "LICENSE", hash = 0xbd0eed23 }
-#]
+    { path = "LICENSE", hash = 0xbd0eed23 },
+]
 
 [licenses.private]
 # If true, ignores workspace crates that aren't published, or are only
@@ -159,30 +167,63 @@ wildcards = "allow"
 # * simplest-path - The path to the version with the fewest edges is highlighted
 # * all - Both lowest-version and simplest-path are used
 highlight = "all"
+# The default lint level for `default` features for crates that are members of
+# the workspace that is being checked. This can be overridden by allowing/denying
+# `default` on a crate-by-crate basis if desired.
+workspace-default-features = "allow"
+# The default lint level for `default` features for external crates that are not
+# members of the workspace. This can be overridden by allowing/denying `default`
+# on a crate-by-crate basis if desired.
+external-default-features = "allow"
 # List of crates that are allowed. Use with care!
 allow = [
-    #{ name = "ansi_term", version = "=0.11.0" },
+    #"ansi_term@0.11.0",
+    #{ crate = "ansi_term@0.11.0", reason = "you can specify a reason it is allowed" },
 ]
 # List of crates to deny
 deny = [
-    # Each entry the name of a crate and a version range. If version is
-    # not specified, all versions will be matched.
-    #{ name = "ansi_term", version = "=0.11.0" },
-    #
+    #"ansi_term@0.11.0",
+    #{ crate = "ansi_term@0.11.0", reason = "you can specify a reason it is banned" },
     # Wrapper crates can optionally be specified to allow the crate when it
     # is a direct dependency of the otherwise banned crate
-    #{ name = "ansi_term", version = "=0.11.0", wrappers = [] },
+    #{ crate = "ansi_term@0.11.0", wrappers = ["this-crate-directly-depends-on-ansi_term"] },
 ]
+
+# List of features to allow/deny
+# Each entry the name of a crate and a version range. If version is
+# not specified, all versions will be matched.
+#[[bans.features]]
+#crate = "reqwest"
+# Features to not allow
+#deny = ["json"]
+# Features to allow
+#allow = [
+#    "rustls",
+#    "__rustls",
+#    "__tls",
+#    "hyper-rustls",
+#    "rustls",
+#    "rustls-pemfile",
+#    "rustls-tls-webpki-roots",
+#    "tokio-rustls",
+#    "webpki-roots",
+#]
+# If true, the allowed features must exactly match the enabled feature set. If
+# this is set there is no point setting `deny`
+#exact = true
+
 # Certain crates/versions that will be skipped when doing duplicate detection.
 skip = [
-    #{ name = "ansi_term", version = "=0.11.0" },
+    #"ansi_term@0.11.0",
+    #{ crate = "ansi_term@0.11.0", reason = "you can specify a reason why it can't be updated/removed" },
 ]
 # Similarly to `skip` allows you to skip certain crates during duplicate
 # detection. Unlike skip, it also includes the entire tree of transitive
 # dependencies starting at the specified crate, up to a certain depth, which is
-# by default infinite
+# by default infinite.
 skip-tree = [
-    #{ name = "ansi_term", version = "=0.11.0", depth = 20 },
+    #"ansi_term@0.11.0", # will be skipped along with _all_ of its direct and transitive dependencies
+    #{ crate = "ansi_term@0.11.0", depth = 20 },
 ]
 
 # This section is considered when running `cargo deny check sources`.
@@ -202,9 +243,9 @@ allow-registry = ["https://github.com/rust-lang/crates.io-index"]
 allow-git = []
 
 [sources.allow-org]
-# 1 or more github.com organizations to allow git sources for
-github = ["insertish"]
-# 1 or more gitlab.com organizations to allow git sources for
-# gitlab = []
-# 1 or more bitbucket.org organizations to allow git sources for
-# bitbucket = [""]
+# github.com organizations to allow git sources for
+github = []
+# gitlab.com organizations to allow git sources for
+gitlab = []
+# bitbucket.org organizations to allow git sources for
+bitbucket = []

From 6558e9f7c4d2bf7a1569d93783c23eceb59047b6 Mon Sep 17 00:00:00 2001
From: Paul Makles <me@insrt.uk>
Date: Mon, 24 Feb 2025 22:17:48 +0000
Subject: [PATCH 37/62] feat: add company information to email footers

---
 crates/core/config/src/lib.rs                 |  10 +-
 crates/core/database/src/drivers/mod.rs       |  64 +-
 crates/core/database/templates/deletion.html  | 527 +++-------------
 .../database/templates/deletion.original.html |   8 +
 crates/core/database/templates/deletion.txt   |   7 +
 .../templates/deletion.whitelabel.txt         |   9 +
 .../templates/policy-change.original.html     |  53 ++
 crates/core/database/templates/reset.html     | 524 +++-------------
 .../database/templates/reset.original.html    |   8 +
 crates/core/database/templates/reset.txt      |   7 +
 .../database/templates/reset.whitelabel.txt   |   9 +
 .../core/database/templates/suspension.html   | 587 +++---------------
 .../templates/suspension.original.html        |   8 +
 crates/core/database/templates/suspension.txt |   7 +
 .../templates/suspension.whitelabel.txt       |   8 +
 crates/core/database/templates/verify.html    | 524 +++-------------
 .../database/templates/verify.original.html   |   8 +
 crates/core/database/templates/verify.txt     |   7 +
 .../database/templates/verify.whitelabel.txt  |  10 +
 19 files changed, 502 insertions(+), 1883 deletions(-)
 create mode 100644 crates/core/database/templates/deletion.whitelabel.txt
 create mode 100644 crates/core/database/templates/policy-change.original.html
 create mode 100644 crates/core/database/templates/reset.whitelabel.txt
 create mode 100644 crates/core/database/templates/suspension.whitelabel.txt
 create mode 100644 crates/core/database/templates/verify.whitelabel.txt

diff --git a/crates/core/config/src/lib.rs b/crates/core/config/src/lib.rs
index 4fa300848..fa12b84b8 100644
--- a/crates/core/config/src/lib.rs
+++ b/crates/core/config/src/lib.rs
@@ -352,6 +352,7 @@ pub struct Settings {
     pub files: Files,
     pub features: Features,
     pub sentry: Sentry,
+    pub production: bool,
 }
 
 impl Settings {
@@ -379,7 +380,14 @@ pub async fn read() -> Config {
 
 #[cached(time = 30)]
 pub async fn config() -> Settings {
-    read().await.try_deserialize::<Settings>().unwrap()
+    let mut config = read().await.try_deserialize::<Settings>().unwrap();
+
+    // auto-detect production nodes
+    if config.hosts.api.contains("https") && config.hosts.api.contains("revolt.chat") {
+        config.production = true;
+    }
+
+    config
 }
 
 /// Configure logging and common Rust variables
diff --git a/crates/core/database/src/drivers/mod.rs b/crates/core/database/src/drivers/mod.rs
index f24263aef..f3ffbede2 100644
--- a/crates/core/database/src/drivers/mod.rs
+++ b/crates/core/database/src/drivers/mod.rs
@@ -120,26 +120,50 @@ impl Database {
                         use_tls: config.api.smtp.use_tls,
                     },
                     expiry: Default::default(),
-                    templates: Templates {
-                        verify: Template {
-                            title: "Verify your Revolt account.".into(),
-                            text: include_str!("../../templates/verify.txt").into(),
-                            url: format!("{}/login/verify/", config.hosts.app),
-                            html: Some(include_str!("../../templates/verify.html").into()),
-                        },
-                        reset: Template {
-                            title: "Reset your Revolt password.".into(),
-                            text: include_str!("../../templates/reset.txt").into(),
-                            url: format!("{}/login/reset/", config.hosts.app),
-                            html: Some(include_str!("../../templates/reset.html").into()),
-                        },
-                        deletion: Template {
-                            title: "Confirm account deletion.".into(),
-                            text: include_str!("../../templates/deletion.txt").into(),
-                            url: format!("{}/delete/", config.hosts.app),
-                            html: Some(include_str!("../../templates/deletion.html").into()),
-                        },
-                        welcome: None,
+                    templates: if config.production {
+                        Templates {
+                            verify: Template {
+                                title: "Verify your Revolt account.".into(),
+                                text: include_str!("../../templates/verify.txt").into(),
+                                url: format!("{}/login/verify/", config.hosts.app),
+                                html: Some(include_str!("../../templates/verify.html").into()),
+                            },
+                            reset: Template {
+                                title: "Reset your Revolt password.".into(),
+                                text: include_str!("../../templates/reset.txt").into(),
+                                url: format!("{}/login/reset/", config.hosts.app),
+                                html: Some(include_str!("../../templates/reset.html").into()),
+                            },
+                            deletion: Template {
+                                title: "Confirm account deletion.".into(),
+                                text: include_str!("../../templates/deletion.txt").into(),
+                                url: format!("{}/delete/", config.hosts.app),
+                                html: Some(include_str!("../../templates/deletion.html").into()),
+                            },
+                            welcome: None,
+                        }
+                    } else {
+                        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,
+                            },
+                            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 {
diff --git a/crates/core/database/templates/deletion.html b/crates/core/database/templates/deletion.html
index ef19ee40f..d25138838 100644
--- a/crates/core/database/templates/deletion.html
+++ b/crates/core/database/templates/deletion.html
@@ -1,464 +1,93 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html>
   <head>
-    <!-- Compiled with Bootstrap Email version: 1.3.1 -->
-    <meta http-equiv="x-ua-compatible" content="ie=edge" />
-    <meta name="x-apple-disable-message-reformatting" />
-    <meta name="viewport" content="width=device-width, initial-scale=1" />
-    <meta
-      name="format-detection"
-      content="telephone=no, date=no, address=no, email=no"
-    />
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <!-- Compiled with Bootstrap Email version: 1.5.1 --><meta http-equiv="x-ua-compatible" content="ie=edge">
+    <meta name="x-apple-disable-message-reformatting">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <meta name="format-detection" content="telephone=no, date=no, address=no, email=no">
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
     <style type="text/css">
-      body,
-      table,
-      td {
-        font-family: Helvetica, Arial, sans-serif !important;
-      }
-      .ExternalClass {
-        width: 100%;
-      }
-      .ExternalClass,
-      .ExternalClass p,
-      .ExternalClass span,
-      .ExternalClass font,
-      .ExternalClass td,
-      .ExternalClass div {
-        line-height: 150%;
-      }
-      a {
-        text-decoration: none;
-      }
-      * {
-        color: inherit;
-      }
-      a[x-apple-data-detectors],
-      u + #body a,
-      #MessageViewBody a {
-        color: inherit;
-        text-decoration: none;
-        font-size: inherit;
-        font-family: inherit;
-        font-weight: inherit;
-        line-height: inherit;
-      }
-      img {
-        -ms-interpolation-mode: bicubic;
-      }
-      table:not([class^="s-"]) {
-        font-family: Helvetica, Arial, sans-serif;
-        mso-table-lspace: 0pt;
-        mso-table-rspace: 0pt;
-        border-spacing: 0px;
-        border-collapse: collapse;
-      }
-      table:not([class^="s-"]) td {
-        border-spacing: 0px;
-        border-collapse: collapse;
-      }
-      @media screen and (max-width: 600px) {
-        .w-full,
-        .w-full > tbody > tr > td {
-          width: 100% !important;
-        }
-        .w-24,
-        .w-24 > tbody > tr > td {
-          width: 96px !important;
-        }
-        .p-lg-10:not(table),
-        .p-lg-10:not(.btn) > tbody > tr > td,
-        .p-lg-10.btn td a {
-          padding: 0 !important;
-        }
-        .p-3:not(table),
-        .p-3:not(.btn) > tbody > tr > td,
-        .p-3.btn td a {
-          padding: 12px !important;
-        }
-        .p-6:not(table),
-        .p-6:not(.btn) > tbody > tr > td,
-        .p-6.btn td a {
-          padding: 24px !important;
-        }
-        *[class*="s-lg-"] > tbody > tr > td {
-          font-size: 0 !important;
-          line-height: 0 !important;
-          height: 0 !important;
-        }
-        .s-4 > tbody > tr > td {
-          font-size: 16px !important;
-          line-height: 16px !important;
-          height: 16px !important;
-        }
-        .s-6 > tbody > tr > td {
-          font-size: 24px !important;
-          line-height: 24px !important;
-          height: 24px !important;
-        }
-        .s-10 > tbody > tr > td {
-          font-size: 40px !important;
-          line-height: 40px !important;
-          height: 40px !important;
-        }
-      }
+      body,table,td{font-family:Helvetica,Arial,sans-serif !important}.ExternalClass{width:100%}.ExternalClass,.ExternalClass p,.ExternalClass span,.ExternalClass font,.ExternalClass td,.ExternalClass div{line-height:150%}a{text-decoration:none}*{color:inherit}a[x-apple-data-detectors],u+#body a,#MessageViewBody a{color:inherit;text-decoration:none;font-size:inherit;font-family:inherit;font-weight:inherit;line-height:inherit}img{-ms-interpolation-mode:bicubic}table:not([class^=s-]){font-family:Helvetica,Arial,sans-serif;mso-table-lspace:0pt;mso-table-rspace:0pt;border-spacing:0px;border-collapse:collapse}table:not([class^=s-]) td{border-spacing:0px;border-collapse:collapse}@media screen and (max-width: 600px){.w-full,.w-full>tbody>tr>td{width:100% !important}.w-24,.w-24>tbody>tr>td{width:96px !important}.p-lg-10:not(table),.p-lg-10:not(.btn)>tbody>tr>td,.p-lg-10.btn td a{padding:0 !important}.p-3:not(table),.p-3:not(.btn)>tbody>tr>td,.p-3.btn td a{padding:12px !important}.p-6:not(table),.p-6:not(.btn)>tbody>tr>td,.p-6.btn td a{padding:24px !important}*[class*=s-lg-]>tbody>tr>td{font-size:0 !important;line-height:0 !important;height:0 !important}.s-4>tbody>tr>td{font-size:16px !important;line-height:16px !important;height:16px !important}.s-6>tbody>tr>td{font-size:24px !important;line-height:24px !important;height:24px !important}.s-10>tbody>tr>td{font-size:40px !important;line-height:40px !important;height:40px !important}}
     </style>
   </head>
-  <body
-    class="bg-light"
-    style="
-      outline: 0;
-      width: 100%;
-      min-width: 100%;
-      height: 100%;
-      -webkit-text-size-adjust: 100%;
-      -ms-text-size-adjust: 100%;
-      font-family: Helvetica, Arial, sans-serif;
-      line-height: 24px;
-      font-weight: normal;
-      font-size: 16px;
-      -moz-box-sizing: border-box;
-      -webkit-box-sizing: border-box;
-      box-sizing: border-box;
-      color: #000000;
-      margin: 0;
-      padding: 0;
-      border-width: 0;
-    "
-    bgcolor="#f7fafc"
-  >
-    <table
-      class="bg-light body"
-      valign="top"
-      role="presentation"
-      border="0"
-      cellpadding="0"
-      cellspacing="0"
-      style="
-        outline: 0;
-        width: 100%;
-        min-width: 100%;
-        height: 100%;
-        -webkit-text-size-adjust: 100%;
-        -ms-text-size-adjust: 100%;
-        font-family: Helvetica, Arial, sans-serif;
-        line-height: 24px;
-        font-weight: normal;
-        font-size: 16px;
-        -moz-box-sizing: border-box;
-        -webkit-box-sizing: border-box;
-        box-sizing: border-box;
-        color: #000000;
-        margin: 0;
-        padding: 0;
-        border-width: 0;
-      "
-      bgcolor="#f7fafc"
-    >
+  <body class="bg-light" style="outline: 0; width: 100%; min-width: 100%; height: 100%; -webkit-text-size-adjust: 100%; -ms-text-size-adjust: 100%; font-family: Helvetica, Arial, sans-serif; line-height: 24px; font-weight: normal; font-size: 16px; -moz-box-sizing: border-box; -webkit-box-sizing: border-box; box-sizing: border-box; color: #000000; margin: 0; padding: 0; border-width: 0;" bgcolor="#f7fafc">
+    <table class="bg-light body" valign="top" role="presentation" border="0" cellpadding="0" cellspacing="0" style="outline: 0; width: 100%; min-width: 100%; height: 100%; -webkit-text-size-adjust: 100%; -ms-text-size-adjust: 100%; font-family: Helvetica, Arial, sans-serif; line-height: 24px; font-weight: normal; font-size: 16px; -moz-box-sizing: border-box; -webkit-box-sizing: border-box; box-sizing: border-box; color: #000000; margin: 0; padding: 0; border-width: 0;" bgcolor="#f7fafc">
       <tbody>
         <tr>
-          <td
-            valign="top"
-            style="line-height: 24px; font-size: 16px; margin: 0"
-            align="left"
-            bgcolor="#f7fafc"
-          >
-            <table
-              class="container"
-              role="presentation"
-              border="0"
-              cellpadding="0"
-              cellspacing="0"
-              style="width: 100%"
-            >
+          <td valign="top" style="line-height: 24px; font-size: 16px; margin: 0;" align="left" bgcolor="#f7fafc">
+            <table class="container" role="presentation" border="0" cellpadding="0" cellspacing="0" style="width: 100%;">
               <tbody>
                 <tr>
-                  <td
-                    align="center"
-                    style="
-                      line-height: 24px;
-                      font-size: 16px;
-                      margin: 0;
-                      padding: 0 16px;
-                    "
-                  >
+                  <td align="center" style="line-height: 24px; font-size: 16px; margin: 0; padding: 0 16px;">
                     <!--[if (gte mso 9)|(IE)]>
                       <table align="center" role="presentation">
                         <tbody>
                           <tr>
                             <td width="600">
                     <![endif]-->
-                    <table
-                      align="center"
-                      role="presentation"
-                      border="0"
-                      cellpadding="0"
-                      cellspacing="0"
-                      style="width: 100%; max-width: 600px; margin: 0 auto"
-                    >
+                    <table align="center" role="presentation" border="0" cellpadding="0" cellspacing="0" style="width: 100%; max-width: 600px; margin: 0 auto;">
                       <tbody>
                         <tr>
-                          <td
-                            style="
-                              line-height: 24px;
-                              font-size: 16px;
-                              margin: 0;
-                            "
-                            align="left"
-                          >
-                            <table
-                              class="s-10 w-full"
-                              role="presentation"
-                              border="0"
-                              cellpadding="0"
-                              cellspacing="0"
-                              style="width: 100%"
-                              width="100%"
-                            >
+                          <td style="line-height: 24px; font-size: 16px; margin: 0;" align="left">
+                            <table class="s-10 w-full" role="presentation" border="0" cellpadding="0" cellspacing="0" style="width: 100%;" width="100%">
                               <tbody>
                                 <tr>
-                                  <td
-                                    style="
-                                      line-height: 40px;
-                                      font-size: 40px;
-                                      width: 100%;
-                                      height: 40px;
-                                      margin: 0;
-                                    "
-                                    align="left"
-                                    width="100%"
-                                    height="40"
-                                  >
+                                  <td style="line-height: 40px; font-size: 40px; width: 100%; height: 40px; margin: 0;" align="left" width="100%" height="40">
                                     &#160;
                                   </td>
                                 </tr>
                               </tbody>
                             </table>
-                            <table
-                              class="ax-center"
-                              role="presentation"
-                              align="center"
-                              border="0"
-                              cellpadding="0"
-                              cellspacing="0"
-                              style="margin: 0 auto"
-                            >
+                            <table class="ax-center" role="presentation" align="center" border="0" cellpadding="0" cellspacing="0" style="margin: 0 auto;">
                               <tbody>
                                 <tr>
-                                  <td
-                                    style="
-                                      line-height: 24px;
-                                      font-size: 16px;
-                                      margin: 0;
-                                    "
-                                    align="left"
-                                  >
-                                    <img
-                                      alt="Revolt Logo"
-                                      class="w-24"
-                                      src="https://app.revolt.chat/assets/logo_round.png"
-                                      style="
-                                        height: auto;
-                                        line-height: 100%;
-                                        outline: none;
-                                        text-decoration: none;
-                                        display: block;
-                                        width: 96px;
-                                        border-style: none;
-                                        border-width: 0;
-                                      "
-                                      width="96"
-                                    />
+                                  <td style="line-height: 24px; font-size: 16px; margin: 0;" align="left">
+                                    <img alt="Revolt Logo" class="w-24" src="https://app.revolt.chat/assets/logo_round.png" style="height: auto; line-height: 100%; outline: none; text-decoration: none; display: block; width: 96px; border-style: none; border-width: 0;" width="96">
                                   </td>
                                 </tr>
                               </tbody>
                             </table>
-                            <table
-                              class="s-10 w-full"
-                              role="presentation"
-                              border="0"
-                              cellpadding="0"
-                              cellspacing="0"
-                              style="width: 100%"
-                              width="100%"
-                            >
+                            <table class="s-10 w-full" role="presentation" border="0" cellpadding="0" cellspacing="0" style="width: 100%;" width="100%">
                               <tbody>
                                 <tr>
-                                  <td
-                                    style="
-                                      line-height: 40px;
-                                      font-size: 40px;
-                                      width: 100%;
-                                      height: 40px;
-                                      margin: 0;
-                                    "
-                                    align="left"
-                                    width="100%"
-                                    height="40"
-                                  >
+                                  <td style="line-height: 40px; font-size: 40px; width: 100%; height: 40px; margin: 0;" align="left" width="100%" height="40">
                                     &#160;
                                   </td>
                                 </tr>
                               </tbody>
                             </table>
-                            <table
-                              class="card p-6 p-lg-10 space-y-4"
-                              role="presentation"
-                              border="0"
-                              cellpadding="0"
-                              cellspacing="0"
-                              style="
-                                border-radius: 6px;
-                                border-collapse: separate !important;
-                                width: 100%;
-                                overflow: hidden;
-                                border: 1px solid #e2e8f0;
-                              "
-                              bgcolor="#ffffff"
-                            >
+                            <table class="card p-6 p-lg-10 space-y-4" role="presentation" border="0" cellpadding="0" cellspacing="0" style="border-radius: 6px; border-collapse: separate !important; width: 100%; overflow: hidden; border: 1px solid #e2e8f0;" bgcolor="#ffffff">
                               <tbody>
                                 <tr>
-                                  <td
-                                    style="
-                                      line-height: 24px;
-                                      font-size: 16px;
-                                      width: 100%;
-                                      margin: 0;
-                                      padding: 40px;
-                                    "
-                                    align="left"
-                                    bgcolor="#ffffff"
-                                  >
-                                    <h1
-                                      class="h3 fw-700"
-                                      style="
-                                        padding-top: 0;
-                                        padding-bottom: 0;
-                                        font-weight: 700 !important;
-                                        vertical-align: baseline;
-                                        font-size: 28px;
-                                        line-height: 33.6px;
-                                        margin: 0;
-                                      "
-                                      align="left"
-                                    >
-                                      Account Deletion
-                                    </h1>
-                                    <table
-                                      class="s-4 w-full"
-                                      role="presentation"
-                                      border="0"
-                                      cellpadding="0"
-                                      cellspacing="0"
-                                      style="width: 100%"
-                                      width="100%"
-                                    >
+                                  <td style="line-height: 24px; font-size: 16px; width: 100%; margin: 0; padding: 40px;" align="left" bgcolor="#ffffff">
+                                    <h1 class="h3 fw-700" style="padding-top: 0; padding-bottom: 0; font-weight: 700 !important; vertical-align: baseline; font-size: 28px; line-height: 33.6px; margin: 0;" align="left">Account Deletion</h1>
+                                    <table class="s-4 w-full" role="presentation" border="0" cellpadding="0" cellspacing="0" style="width: 100%;" width="100%">
                                       <tbody>
                                         <tr>
-                                          <td
-                                            style="
-                                              line-height: 16px;
-                                              font-size: 16px;
-                                              width: 100%;
-                                              height: 16px;
-                                              margin: 0;
-                                            "
-                                            align="left"
-                                            width="100%"
-                                            height="16"
-                                          >
+                                          <td style="line-height: 16px; font-size: 16px; width: 100%; height: 16px; margin: 0;" align="left" width="100%" height="16">
                                             &#160;
                                           </td>
                                         </tr>
                                       </tbody>
                                     </table>
-                                    <p
-                                      class=""
-                                      style="
-                                        line-height: 24px;
-                                        font-size: 16px;
-                                        width: 100%;
-                                        margin: 0;
-                                      "
-                                      align="left"
-                                    >
-                                      You requested to have your account
-                                      deleted, if you did not perform this
-                                      action please take measures to secure your
-                                      account immediately.
+                                    <p class="" style="line-height: 24px; font-size: 16px; width: 100%; margin: 0;" align="left">
+                                      You requested to have your account deleted, if you did not perform
+                                      this action please take measures to secure your account immediately.
                                     </p>
-                                    <table
-                                      class="s-4 w-full"
-                                      role="presentation"
-                                      border="0"
-                                      cellpadding="0"
-                                      cellspacing="0"
-                                      style="width: 100%"
-                                      width="100%"
-                                    >
+                                    <table class="s-4 w-full" role="presentation" border="0" cellpadding="0" cellspacing="0" style="width: 100%;" width="100%">
                                       <tbody>
                                         <tr>
-                                          <td
-                                            style="
-                                              line-height: 16px;
-                                              font-size: 16px;
-                                              width: 100%;
-                                              height: 16px;
-                                              margin: 0;
-                                            "
-                                            align="left"
-                                            width="100%"
-                                            height="16"
-                                          >
+                                          <td style="line-height: 16px; font-size: 16px; width: 100%; height: 16px; margin: 0;" align="left" width="100%" height="16">
                                             &#160;
                                           </td>
                                         </tr>
                                       </tbody>
                                     </table>
-                                    <table
-                                      class="btn btn-primary p-3 fw-700"
-                                      role="presentation"
-                                      border="0"
-                                      cellpadding="0"
-                                      cellspacing="0"
-                                      style="
-                                        border-radius: 6px;
-                                        border-collapse: separate !important;
-                                        font-weight: 700 !important;
-                                      "
-                                    >
+                                    <table class="btn btn-primary p-3 fw-700" role="presentation" border="0" cellpadding="0" cellspacing="0" style="border-radius: 6px; border-collapse: separate !important; font-weight: 700 !important;">
                                       <tbody>
                                         <tr>
-                                          <td
-                                            style="
-                                              line-height: 24px;
-                                              font-size: 16px;
-                                              border-radius: 6px;
-                                              font-weight: 700 !important;
-                                              margin: 0;
-                                            "
-                                            align="center"
-                                            bgcolor="#0d6efd"
-                                          >
-                                            <a
-                                              href="{{url}}"
-                                              style="
-                                                color: #ffffff;
-                                                font-size: 16px;
-                                                font-family: Helvetica, Arial,
-                                                  sans-serif;
-                                                text-decoration: none;
-                                                border-radius: 6px;
-                                                line-height: 20px;
-                                                display: block;
-                                                font-weight: 700 !important;
-                                                white-space: nowrap;
-                                                background-color: #0d6efd;
-                                                padding: 12px;
-                                                border: 1px solid #0d6efd;
-                                              "
-                                              >Confirm</a
-                                            >
+                                          <td style="line-height: 24px; font-size: 16px; border-radius: 6px; font-weight: 700 !important; margin: 0;" align="center" bgcolor="#0d6efd">
+                                            <a href="{{url}}" style="color: #ffffff; font-size: 16px; font-family: Helvetica, Arial, sans-serif; text-decoration: none; border-radius: 6px; line-height: 20px; display: block; font-weight: 700 !important; white-space: nowrap; background-color: #0d6efd; padding: 12px; border: 1px solid #0d6efd;">Confirm</a>
                                           </td>
                                         </tr>
                                       </tbody>
@@ -467,66 +96,58 @@
                                 </tr>
                               </tbody>
                             </table>
-                            <table
-                              class="s-6 w-full"
-                              role="presentation"
-                              border="0"
-                              cellpadding="0"
-                              cellspacing="0"
-                              style="width: 100%"
-                              width="100%"
-                            >
+                            <table class="s-6 w-full" role="presentation" border="0" cellpadding="0" cellspacing="0" style="width: 100%;" width="100%">
                               <tbody>
                                 <tr>
-                                  <td
-                                    style="
-                                      line-height: 24px;
-                                      font-size: 24px;
-                                      width: 100%;
-                                      height: 24px;
-                                      margin: 0;
-                                    "
-                                    align="left"
-                                    width="100%"
-                                    height="24"
-                                  >
+                                  <td style="line-height: 24px; font-size: 24px; width: 100%; height: 24px; margin: 0;" align="left" width="100%" height="24">
                                     &#160;
                                   </td>
                                 </tr>
                               </tbody>
                             </table>
-                            <div
-                              class="text-muted text-center"
-                              style="color: #718096"
-                              align="center"
-                            >
-                              This email is intended for {{email}}<br />
-                              Sent from Revolt<br />
+                            <div class="text-muted text-center" style="color: #718096;" align="center">
+                              This email is intended for {{email}}<br>
+                              Sent from Revolt<br>
                               Made in Europe
                             </div>
-                            <table
-                              class="s-6 w-full"
-                              role="presentation"
-                              border="0"
-                              cellpadding="0"
-                              cellspacing="0"
-                              style="width: 100%"
-                              width="100%"
-                            >
+                            <table class="s-6 w-full" role="presentation" border="0" cellpadding="0" cellspacing="0" style="width: 100%;" width="100%">
                               <tbody>
                                 <tr>
-                                  <td
-                                    style="
-                                      line-height: 24px;
-                                      font-size: 24px;
-                                      width: 100%;
-                                      height: 24px;
-                                      margin: 0;
-                                    "
-                                    align="left"
-                                    width="100%"
-                                    height="24"
-                                  >
+                                  <td style="line-height: 24px; font-size: 24px; width: 100%; height: 24px; margin: 0;" align="left" width="100%" height="24">
+                                    &#160;
+                                  </td>
+                                </tr>
+                              </tbody>
+                            </table>
+                            <table class="s-6 w-full" role="presentation" border="0" cellpadding="0" cellspacing="0" style="width: 100%;" width="100%">
+                              <tbody>
+                                <tr>
+                                  <td style="line-height: 24px; font-size: 24px; width: 100%; height: 24px; margin: 0;" align="left" width="100%" height="24">
+                                    &#160;
+                                  </td>
+                                </tr>
+                              </tbody>
+                            </table>
+                            <table class="ax-center" role="presentation" align="center" border="0" cellpadding="0" cellspacing="0" style="margin: 0 auto;">
+                              <tbody>
+                                <tr>
+                                  <td style="line-height: 24px; font-size: 16px; margin: 0;" align="left">
+                                    <div class="text-muted text-xs" style="color: #718096; font-size: 12px; line-height: 14.4px;">
+                                      Revolt Platforms Ltd. is a company incorporated and registered under the
+                                      laws of England and Wales.<br>
+                                      Registered Company Number: 16260658<br>
+                                      Registered Office:<br>
+                                      Suite 5703 Unit 3A, 34-35 Hatton Garden,<br>
+                                      Holborn, United Kingdom, EC1N 8DX
+                                    </div>
+                                  </td>
+                                </tr>
+                              </tbody>
+                            </table>
+                            <table class="s-6 w-full" role="presentation" border="0" cellpadding="0" cellspacing="0" style="width: 100%;" width="100%">
+                              <tbody>
+                                <tr>
+                                  <td style="line-height: 24px; font-size: 24px; width: 100%; height: 24px; margin: 0;" align="left" width="100%" height="24">
                                     &#160;
                                   </td>
                                 </tr>
diff --git a/crates/core/database/templates/deletion.original.html b/crates/core/database/templates/deletion.original.html
index fa9f83e4c..0da330eac 100644
--- a/crates/core/database/templates/deletion.original.html
+++ b/crates/core/database/templates/deletion.original.html
@@ -25,6 +25,14 @@ <h1 class="h3 fw-700">Account Deletion</h1>
         Sent from Revolt<br />
         Made in Europe
       </div>
+      <div class="text-muted text-xs my-6 ax-center">
+        Revolt Platforms Ltd. is a company incorporated and registered under the
+        laws of England and Wales.<br />
+        Registered Company Number: 16260658<br />
+        Registered Office:<br />
+        Suite 5703 Unit 3A, 34-35 Hatton Garden,<br />
+        Holborn, United Kingdom, EC1N 8DX
+      </div>
     </div>
   </body>
 </html>
diff --git a/crates/core/database/templates/deletion.txt b/crates/core/database/templates/deletion.txt
index 71a5a936c..b6c2871b0 100644
--- a/crates/core/database/templates/deletion.txt
+++ b/crates/core/database/templates/deletion.txt
@@ -5,3 +5,10 @@ Please navigate to: {{url}}
 This email is intended for {{email}}
 Sent by Revolt
 Made in Europe
+
+Revolt Platforms Ltd. is a company incorporated and registered under the laws of England and Wales.
+
+Registration Number: 16260658
+Registered Office:
+Suite 5703 Unit 3A, 34-35 Hatton Garden,
+Holborn, United Kingdom, EC1N 8DX
\ No newline at end of file
diff --git a/crates/core/database/templates/deletion.whitelabel.txt b/crates/core/database/templates/deletion.whitelabel.txt
new file mode 100644
index 000000000..491280aac
--- /dev/null
+++ b/crates/core/database/templates/deletion.whitelabel.txt
@@ -0,0 +1,9 @@
+You requested to have your account deleted, if you did not perform this action please take measures to secure your account immediately.
+
+Please navigate to: {{url}}
+
+This email is intended for {{email}}
+
+This email has no association with Revolt or Revolt Platforms Ltd.
+Learn more about third party instances here:
+https://developers.revolt.chat/faq.html
diff --git a/crates/core/database/templates/policy-change.original.html b/crates/core/database/templates/policy-change.original.html
new file mode 100644
index 000000000..0df2443ad
--- /dev/null
+++ b/crates/core/database/templates/policy-change.original.html
@@ -0,0 +1,53 @@
+<html>
+  <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <style>
+      /* Add custom classes and styles that you want inlined here */
+    </style>
+  </head>
+  <body class="bg-light">
+    <div class="container">
+      <img
+        alt="Revolt Logo"
+        class="ax-center my-10 w-24"
+        src="https://app.revolt.chat/assets/logo_round.png"
+      />
+      <div class="card p-6 p-lg-10 space-y-4">
+        <h1 class="h3 fw-700">Notice of Terms &amp; Policy Change</h1>
+        <p>
+          This email is to notify you that we're updating all of our policy
+          documents.
+        </p>
+        <p>
+          You can read our updated Terms of Service and Privacy Policy below:<br />
+          Effective. 24th March 2025
+        </p>
+        <a class="p-3 fw-700" href="https://revolt.chat/terms"
+          >Terms of Service</a
+        >
+        <a class="p-3 fw-700" href="https://revolt.chat/terms"
+          >Privacy Policy</a
+        >
+        <p>
+          Our Community Guidelines have also been updated to help us better
+          protect and safeguard the platform. You can check them out here:
+        </p>
+        <a class="p-3 fw-700" href="https://revolt.chat/terms"
+          >Community Guidelines</a
+        >
+      </div>
+      <div class="text-muted text-center my-6">
+        Sent by Revolt<br />
+        Made in Europe
+      </div>
+      <div class="text-muted text-xs my-6 ax-center">
+        Revolt Platforms Ltd. is a company incorporated and registered under the
+        laws of England and Wales.<br />
+        Registered Company Number: 16260658<br />
+        Registered Office:<br />
+        Suite 5703 Unit 3A, 34-35 Hatton Garden,<br />
+        Holborn, United Kingdom, EC1N 8DX
+      </div>
+    </div>
+  </body>
+</html>
diff --git a/crates/core/database/templates/reset.html b/crates/core/database/templates/reset.html
index 2ca5d90c4..9b938f7a4 100644
--- a/crates/core/database/templates/reset.html
+++ b/crates/core/database/templates/reset.html
@@ -1,462 +1,90 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html>
   <head>
-    <!-- Compiled with Bootstrap Email version: 1.3.1 -->
-    <meta http-equiv="x-ua-compatible" content="ie=edge" />
-    <meta name="x-apple-disable-message-reformatting" />
-    <meta name="viewport" content="width=device-width, initial-scale=1" />
-    <meta
-      name="format-detection"
-      content="telephone=no, date=no, address=no, email=no"
-    />
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <!-- Compiled with Bootstrap Email version: 1.5.1 --><meta http-equiv="x-ua-compatible" content="ie=edge">
+    <meta name="x-apple-disable-message-reformatting">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <meta name="format-detection" content="telephone=no, date=no, address=no, email=no">
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
     <style type="text/css">
-      body,
-      table,
-      td {
-        font-family: Helvetica, Arial, sans-serif !important;
-      }
-      .ExternalClass {
-        width: 100%;
-      }
-      .ExternalClass,
-      .ExternalClass p,
-      .ExternalClass span,
-      .ExternalClass font,
-      .ExternalClass td,
-      .ExternalClass div {
-        line-height: 150%;
-      }
-      a {
-        text-decoration: none;
-      }
-      * {
-        color: inherit;
-      }
-      a[x-apple-data-detectors],
-      u + #body a,
-      #MessageViewBody a {
-        color: inherit;
-        text-decoration: none;
-        font-size: inherit;
-        font-family: inherit;
-        font-weight: inherit;
-        line-height: inherit;
-      }
-      img {
-        -ms-interpolation-mode: bicubic;
-      }
-      table:not([class^="s-"]) {
-        font-family: Helvetica, Arial, sans-serif;
-        mso-table-lspace: 0pt;
-        mso-table-rspace: 0pt;
-        border-spacing: 0px;
-        border-collapse: collapse;
-      }
-      table:not([class^="s-"]) td {
-        border-spacing: 0px;
-        border-collapse: collapse;
-      }
-      @media screen and (max-width: 600px) {
-        .w-full,
-        .w-full > tbody > tr > td {
-          width: 100% !important;
-        }
-        .w-24,
-        .w-24 > tbody > tr > td {
-          width: 96px !important;
-        }
-        .p-lg-10:not(table),
-        .p-lg-10:not(.btn) > tbody > tr > td,
-        .p-lg-10.btn td a {
-          padding: 0 !important;
-        }
-        .p-3:not(table),
-        .p-3:not(.btn) > tbody > tr > td,
-        .p-3.btn td a {
-          padding: 12px !important;
-        }
-        .p-6:not(table),
-        .p-6:not(.btn) > tbody > tr > td,
-        .p-6.btn td a {
-          padding: 24px !important;
-        }
-        *[class*="s-lg-"] > tbody > tr > td {
-          font-size: 0 !important;
-          line-height: 0 !important;
-          height: 0 !important;
-        }
-        .s-4 > tbody > tr > td {
-          font-size: 16px !important;
-          line-height: 16px !important;
-          height: 16px !important;
-        }
-        .s-6 > tbody > tr > td {
-          font-size: 24px !important;
-          line-height: 24px !important;
-          height: 24px !important;
-        }
-        .s-10 > tbody > tr > td {
-          font-size: 40px !important;
-          line-height: 40px !important;
-          height: 40px !important;
-        }
-      }
+      body,table,td{font-family:Helvetica,Arial,sans-serif !important}.ExternalClass{width:100%}.ExternalClass,.ExternalClass p,.ExternalClass span,.ExternalClass font,.ExternalClass td,.ExternalClass div{line-height:150%}a{text-decoration:none}*{color:inherit}a[x-apple-data-detectors],u+#body a,#MessageViewBody a{color:inherit;text-decoration:none;font-size:inherit;font-family:inherit;font-weight:inherit;line-height:inherit}img{-ms-interpolation-mode:bicubic}table:not([class^=s-]){font-family:Helvetica,Arial,sans-serif;mso-table-lspace:0pt;mso-table-rspace:0pt;border-spacing:0px;border-collapse:collapse}table:not([class^=s-]) td{border-spacing:0px;border-collapse:collapse}@media screen and (max-width: 600px){.w-full,.w-full>tbody>tr>td{width:100% !important}.w-24,.w-24>tbody>tr>td{width:96px !important}.p-lg-10:not(table),.p-lg-10:not(.btn)>tbody>tr>td,.p-lg-10.btn td a{padding:0 !important}.p-3:not(table),.p-3:not(.btn)>tbody>tr>td,.p-3.btn td a{padding:12px !important}.p-6:not(table),.p-6:not(.btn)>tbody>tr>td,.p-6.btn td a{padding:24px !important}*[class*=s-lg-]>tbody>tr>td{font-size:0 !important;line-height:0 !important;height:0 !important}.s-4>tbody>tr>td{font-size:16px !important;line-height:16px !important;height:16px !important}.s-6>tbody>tr>td{font-size:24px !important;line-height:24px !important;height:24px !important}.s-10>tbody>tr>td{font-size:40px !important;line-height:40px !important;height:40px !important}}
     </style>
   </head>
-  <body
-    class="bg-light"
-    style="
-      outline: 0;
-      width: 100%;
-      min-width: 100%;
-      height: 100%;
-      -webkit-text-size-adjust: 100%;
-      -ms-text-size-adjust: 100%;
-      font-family: Helvetica, Arial, sans-serif;
-      line-height: 24px;
-      font-weight: normal;
-      font-size: 16px;
-      -moz-box-sizing: border-box;
-      -webkit-box-sizing: border-box;
-      box-sizing: border-box;
-      color: #000000;
-      margin: 0;
-      padding: 0;
-      border-width: 0;
-    "
-    bgcolor="#f7fafc"
-  >
-    <table
-      class="bg-light body"
-      valign="top"
-      role="presentation"
-      border="0"
-      cellpadding="0"
-      cellspacing="0"
-      style="
-        outline: 0;
-        width: 100%;
-        min-width: 100%;
-        height: 100%;
-        -webkit-text-size-adjust: 100%;
-        -ms-text-size-adjust: 100%;
-        font-family: Helvetica, Arial, sans-serif;
-        line-height: 24px;
-        font-weight: normal;
-        font-size: 16px;
-        -moz-box-sizing: border-box;
-        -webkit-box-sizing: border-box;
-        box-sizing: border-box;
-        color: #000000;
-        margin: 0;
-        padding: 0;
-        border-width: 0;
-      "
-      bgcolor="#f7fafc"
-    >
+  <body class="bg-light" style="outline: 0; width: 100%; min-width: 100%; height: 100%; -webkit-text-size-adjust: 100%; -ms-text-size-adjust: 100%; font-family: Helvetica, Arial, sans-serif; line-height: 24px; font-weight: normal; font-size: 16px; -moz-box-sizing: border-box; -webkit-box-sizing: border-box; box-sizing: border-box; color: #000000; margin: 0; padding: 0; border-width: 0;" bgcolor="#f7fafc">
+    <table class="bg-light body" valign="top" role="presentation" border="0" cellpadding="0" cellspacing="0" style="outline: 0; width: 100%; min-width: 100%; height: 100%; -webkit-text-size-adjust: 100%; -ms-text-size-adjust: 100%; font-family: Helvetica, Arial, sans-serif; line-height: 24px; font-weight: normal; font-size: 16px; -moz-box-sizing: border-box; -webkit-box-sizing: border-box; box-sizing: border-box; color: #000000; margin: 0; padding: 0; border-width: 0;" bgcolor="#f7fafc">
       <tbody>
         <tr>
-          <td
-            valign="top"
-            style="line-height: 24px; font-size: 16px; margin: 0"
-            align="left"
-            bgcolor="#f7fafc"
-          >
-            <table
-              class="container"
-              role="presentation"
-              border="0"
-              cellpadding="0"
-              cellspacing="0"
-              style="width: 100%"
-            >
+          <td valign="top" style="line-height: 24px; font-size: 16px; margin: 0;" align="left" bgcolor="#f7fafc">
+            <table class="container" role="presentation" border="0" cellpadding="0" cellspacing="0" style="width: 100%;">
               <tbody>
                 <tr>
-                  <td
-                    align="center"
-                    style="
-                      line-height: 24px;
-                      font-size: 16px;
-                      margin: 0;
-                      padding: 0 16px;
-                    "
-                  >
+                  <td align="center" style="line-height: 24px; font-size: 16px; margin: 0; padding: 0 16px;">
                     <!--[if (gte mso 9)|(IE)]>
                       <table align="center" role="presentation">
                         <tbody>
                           <tr>
                             <td width="600">
                     <![endif]-->
-                    <table
-                      align="center"
-                      role="presentation"
-                      border="0"
-                      cellpadding="0"
-                      cellspacing="0"
-                      style="width: 100%; max-width: 600px; margin: 0 auto"
-                    >
+                    <table align="center" role="presentation" border="0" cellpadding="0" cellspacing="0" style="width: 100%; max-width: 600px; margin: 0 auto;">
                       <tbody>
                         <tr>
-                          <td
-                            style="
-                              line-height: 24px;
-                              font-size: 16px;
-                              margin: 0;
-                            "
-                            align="left"
-                          >
-                            <table
-                              class="s-10 w-full"
-                              role="presentation"
-                              border="0"
-                              cellpadding="0"
-                              cellspacing="0"
-                              style="width: 100%"
-                              width="100%"
-                            >
+                          <td style="line-height: 24px; font-size: 16px; margin: 0;" align="left">
+                            <table class="s-10 w-full" role="presentation" border="0" cellpadding="0" cellspacing="0" style="width: 100%;" width="100%">
                               <tbody>
                                 <tr>
-                                  <td
-                                    style="
-                                      line-height: 40px;
-                                      font-size: 40px;
-                                      width: 100%;
-                                      height: 40px;
-                                      margin: 0;
-                                    "
-                                    align="left"
-                                    width="100%"
-                                    height="40"
-                                  >
+                                  <td style="line-height: 40px; font-size: 40px; width: 100%; height: 40px; margin: 0;" align="left" width="100%" height="40">
                                     &#160;
                                   </td>
                                 </tr>
                               </tbody>
                             </table>
-                            <table
-                              class="ax-center"
-                              role="presentation"
-                              align="center"
-                              border="0"
-                              cellpadding="0"
-                              cellspacing="0"
-                              style="margin: 0 auto"
-                            >
+                            <table class="ax-center" role="presentation" align="center" border="0" cellpadding="0" cellspacing="0" style="margin: 0 auto;">
                               <tbody>
                                 <tr>
-                                  <td
-                                    style="
-                                      line-height: 24px;
-                                      font-size: 16px;
-                                      margin: 0;
-                                    "
-                                    align="left"
-                                  >
-                                    <img
-                                      alt="Revolt Logo"
-                                      class="w-24"
-                                      src="https://app.revolt.chat/assets/logo_round.png"
-                                      style="
-                                        height: auto;
-                                        line-height: 100%;
-                                        outline: none;
-                                        text-decoration: none;
-                                        display: block;
-                                        width: 96px;
-                                        border-style: none;
-                                        border-width: 0;
-                                      "
-                                      width="96"
-                                    />
+                                  <td style="line-height: 24px; font-size: 16px; margin: 0;" align="left">
+                                    <img class="w-24" src="https://app.revolt.chat/assets/logo_round.png" style="height: auto; line-height: 100%; outline: none; text-decoration: none; display: block; width: 96px; border-style: none; border-width: 0;" width="96">
                                   </td>
                                 </tr>
                               </tbody>
                             </table>
-                            <table
-                              class="s-10 w-full"
-                              role="presentation"
-                              border="0"
-                              cellpadding="0"
-                              cellspacing="0"
-                              style="width: 100%"
-                              width="100%"
-                            >
+                            <table class="s-10 w-full" role="presentation" border="0" cellpadding="0" cellspacing="0" style="width: 100%;" width="100%">
                               <tbody>
                                 <tr>
-                                  <td
-                                    style="
-                                      line-height: 40px;
-                                      font-size: 40px;
-                                      width: 100%;
-                                      height: 40px;
-                                      margin: 0;
-                                    "
-                                    align="left"
-                                    width="100%"
-                                    height="40"
-                                  >
+                                  <td style="line-height: 40px; font-size: 40px; width: 100%; height: 40px; margin: 0;" align="left" width="100%" height="40">
                                     &#160;
                                   </td>
                                 </tr>
                               </tbody>
                             </table>
-                            <table
-                              class="card p-6 p-lg-10 space-y-4"
-                              role="presentation"
-                              border="0"
-                              cellpadding="0"
-                              cellspacing="0"
-                              style="
-                                border-radius: 6px;
-                                border-collapse: separate !important;
-                                width: 100%;
-                                overflow: hidden;
-                                border: 1px solid #e2e8f0;
-                              "
-                              bgcolor="#ffffff"
-                            >
+                            <table class="card p-6 p-lg-10 space-y-4" role="presentation" border="0" cellpadding="0" cellspacing="0" style="border-radius: 6px; border-collapse: separate !important; width: 100%; overflow: hidden; border: 1px solid #e2e8f0;" bgcolor="#ffffff">
                               <tbody>
                                 <tr>
-                                  <td
-                                    style="
-                                      line-height: 24px;
-                                      font-size: 16px;
-                                      width: 100%;
-                                      margin: 0;
-                                      padding: 40px;
-                                    "
-                                    align="left"
-                                    bgcolor="#ffffff"
-                                  >
-                                    <h1
-                                      class="h3 fw-700"
-                                      style="
-                                        padding-top: 0;
-                                        padding-bottom: 0;
-                                        font-weight: 700 !important;
-                                        vertical-align: baseline;
-                                        font-size: 28px;
-                                        line-height: 33.6px;
-                                        margin: 0;
-                                      "
-                                      align="left"
-                                    >
-                                      Password Reset
-                                    </h1>
-                                    <table
-                                      class="s-4 w-full"
-                                      role="presentation"
-                                      border="0"
-                                      cellpadding="0"
-                                      cellspacing="0"
-                                      style="width: 100%"
-                                      width="100%"
-                                    >
+                                  <td style="line-height: 24px; font-size: 16px; width: 100%; margin: 0; padding: 40px;" align="left" bgcolor="#ffffff">
+                                    <h1 class="h3 fw-700" style="padding-top: 0; padding-bottom: 0; font-weight: 700 !important; vertical-align: baseline; font-size: 28px; line-height: 33.6px; margin: 0;" align="left">Password Reset</h1>
+                                    <table class="s-4 w-full" role="presentation" border="0" cellpadding="0" cellspacing="0" style="width: 100%;" width="100%">
                                       <tbody>
                                         <tr>
-                                          <td
-                                            style="
-                                              line-height: 16px;
-                                              font-size: 16px;
-                                              width: 100%;
-                                              height: 16px;
-                                              margin: 0;
-                                            "
-                                            align="left"
-                                            width="100%"
-                                            height="16"
-                                          >
+                                          <td style="line-height: 16px; font-size: 16px; width: 100%; height: 16px; margin: 0;" align="left" width="100%" height="16">
                                             &#160;
                                           </td>
                                         </tr>
                                       </tbody>
                                     </table>
-                                    <p
-                                      class=""
-                                      style="
-                                        line-height: 24px;
-                                        font-size: 16px;
-                                        width: 100%;
-                                        margin: 0;
-                                      "
-                                      align="left"
-                                    >
-                                      You requested a password reset, click
-                                      below to continue.
-                                    </p>
-                                    <table
-                                      class="s-4 w-full"
-                                      role="presentation"
-                                      border="0"
-                                      cellpadding="0"
-                                      cellspacing="0"
-                                      style="width: 100%"
-                                      width="100%"
-                                    >
+                                    <p class="" style="line-height: 24px; font-size: 16px; width: 100%; margin: 0;" align="left">You requested a password reset, click below to continue.</p>
+                                    <table class="s-4 w-full" role="presentation" border="0" cellpadding="0" cellspacing="0" style="width: 100%;" width="100%">
                                       <tbody>
                                         <tr>
-                                          <td
-                                            style="
-                                              line-height: 16px;
-                                              font-size: 16px;
-                                              width: 100%;
-                                              height: 16px;
-                                              margin: 0;
-                                            "
-                                            align="left"
-                                            width="100%"
-                                            height="16"
-                                          >
+                                          <td style="line-height: 16px; font-size: 16px; width: 100%; height: 16px; margin: 0;" align="left" width="100%" height="16">
                                             &#160;
                                           </td>
                                         </tr>
                                       </tbody>
                                     </table>
-                                    <table
-                                      class="btn btn-primary p-3 fw-700"
-                                      role="presentation"
-                                      border="0"
-                                      cellpadding="0"
-                                      cellspacing="0"
-                                      style="
-                                        border-radius: 6px;
-                                        border-collapse: separate !important;
-                                        font-weight: 700 !important;
-                                      "
-                                    >
+                                    <table class="btn btn-primary p-3 fw-700" role="presentation" border="0" cellpadding="0" cellspacing="0" style="border-radius: 6px; border-collapse: separate !important; font-weight: 700 !important;">
                                       <tbody>
                                         <tr>
-                                          <td
-                                            style="
-                                              line-height: 24px;
-                                              font-size: 16px;
-                                              border-radius: 6px;
-                                              font-weight: 700 !important;
-                                              margin: 0;
-                                            "
-                                            align="center"
-                                            bgcolor="#0d6efd"
-                                          >
-                                            <a
-                                              href="{{url}}"
-                                              style="
-                                                color: #ffffff;
-                                                font-size: 16px;
-                                                font-family: Helvetica, Arial,
-                                                  sans-serif;
-                                                text-decoration: none;
-                                                border-radius: 6px;
-                                                line-height: 20px;
-                                                display: block;
-                                                font-weight: 700 !important;
-                                                white-space: nowrap;
-                                                background-color: #0d6efd;
-                                                padding: 12px;
-                                                border: 1px solid #0d6efd;
-                                              "
-                                              >Reset</a
-                                            >
+                                          <td style="line-height: 24px; font-size: 16px; border-radius: 6px; font-weight: 700 !important; margin: 0;" align="center" bgcolor="#0d6efd">
+                                            <a href="{{url}}" style="color: #ffffff; font-size: 16px; font-family: Helvetica, Arial, sans-serif; text-decoration: none; border-radius: 6px; line-height: 20px; display: block; font-weight: 700 !important; white-space: nowrap; background-color: #0d6efd; padding: 12px; border: 1px solid #0d6efd;">Reset</a>
                                           </td>
                                         </tr>
                                       </tbody>
@@ -465,66 +93,58 @@
                                 </tr>
                               </tbody>
                             </table>
-                            <table
-                              class="s-6 w-full"
-                              role="presentation"
-                              border="0"
-                              cellpadding="0"
-                              cellspacing="0"
-                              style="width: 100%"
-                              width="100%"
-                            >
+                            <table class="s-6 w-full" role="presentation" border="0" cellpadding="0" cellspacing="0" style="width: 100%;" width="100%">
                               <tbody>
                                 <tr>
-                                  <td
-                                    style="
-                                      line-height: 24px;
-                                      font-size: 24px;
-                                      width: 100%;
-                                      height: 24px;
-                                      margin: 0;
-                                    "
-                                    align="left"
-                                    width="100%"
-                                    height="24"
-                                  >
+                                  <td style="line-height: 24px; font-size: 24px; width: 100%; height: 24px; margin: 0;" align="left" width="100%" height="24">
                                     &#160;
                                   </td>
                                 </tr>
                               </tbody>
                             </table>
-                            <div
-                              class="text-muted text-center"
-                              style="color: #718096"
-                              align="center"
-                            >
-                              This email is intended for {{email}}<br />
-                              Sent from Revolt<br />
+                            <div class="text-muted text-center" style="color: #718096;" align="center">
+                              This email is intended for {{email}}<br>
+                              Sent from Revolt<br>
                               Made in Europe
                             </div>
-                            <table
-                              class="s-6 w-full"
-                              role="presentation"
-                              border="0"
-                              cellpadding="0"
-                              cellspacing="0"
-                              style="width: 100%"
-                              width="100%"
-                            >
+                            <table class="s-6 w-full" role="presentation" border="0" cellpadding="0" cellspacing="0" style="width: 100%;" width="100%">
                               <tbody>
                                 <tr>
-                                  <td
-                                    style="
-                                      line-height: 24px;
-                                      font-size: 24px;
-                                      width: 100%;
-                                      height: 24px;
-                                      margin: 0;
-                                    "
-                                    align="left"
-                                    width="100%"
-                                    height="24"
-                                  >
+                                  <td style="line-height: 24px; font-size: 24px; width: 100%; height: 24px; margin: 0;" align="left" width="100%" height="24">
+                                    &#160;
+                                  </td>
+                                </tr>
+                              </tbody>
+                            </table>
+                            <table class="s-6 w-full" role="presentation" border="0" cellpadding="0" cellspacing="0" style="width: 100%;" width="100%">
+                              <tbody>
+                                <tr>
+                                  <td style="line-height: 24px; font-size: 24px; width: 100%; height: 24px; margin: 0;" align="left" width="100%" height="24">
+                                    &#160;
+                                  </td>
+                                </tr>
+                              </tbody>
+                            </table>
+                            <table class="ax-center" role="presentation" align="center" border="0" cellpadding="0" cellspacing="0" style="margin: 0 auto;">
+                              <tbody>
+                                <tr>
+                                  <td style="line-height: 24px; font-size: 16px; margin: 0;" align="left">
+                                    <div class="text-muted text-xs" style="color: #718096; font-size: 12px; line-height: 14.4px;">
+                                      Revolt Platforms Ltd. is a company incorporated and registered under the
+                                      laws of England and Wales.<br>
+                                      Registered Company Number: 16260658<br>
+                                      Registered Office:<br>
+                                      Suite 5703 Unit 3A, 34-35 Hatton Garden,<br>
+                                      Holborn, United Kingdom, EC1N 8DX
+                                    </div>
+                                  </td>
+                                </tr>
+                              </tbody>
+                            </table>
+                            <table class="s-6 w-full" role="presentation" border="0" cellpadding="0" cellspacing="0" style="width: 100%;" width="100%">
+                              <tbody>
+                                <tr>
+                                  <td style="line-height: 24px; font-size: 24px; width: 100%; height: 24px; margin: 0;" align="left" width="100%" height="24">
                                     &#160;
                                   </td>
                                 </tr>
diff --git a/crates/core/database/templates/reset.original.html b/crates/core/database/templates/reset.original.html
index 86041f120..f15d03289 100644
--- a/crates/core/database/templates/reset.original.html
+++ b/crates/core/database/templates/reset.original.html
@@ -21,6 +21,14 @@ <h1 class="h3 fw-700">Password Reset</h1>
         Sent from Revolt<br />
         Made in Europe
       </div>
+      <div class="text-muted text-xs my-6 ax-center">
+        Revolt Platforms Ltd. is a company incorporated and registered under the
+        laws of England and Wales.<br />
+        Registered Company Number: 16260658<br />
+        Registered Office:<br />
+        Suite 5703 Unit 3A, 34-35 Hatton Garden,<br />
+        Holborn, United Kingdom, EC1N 8DX
+      </div>
     </div>
   </body>
 </html>
diff --git a/crates/core/database/templates/reset.txt b/crates/core/database/templates/reset.txt
index d72421d4c..020032c71 100644
--- a/crates/core/database/templates/reset.txt
+++ b/crates/core/database/templates/reset.txt
@@ -5,3 +5,10 @@ Please navigate to: {{url}}
 This email is intended for {{email}}
 Sent by Revolt
 Made in Europe
+
+Revolt Platforms Ltd. is a company incorporated and registered under the laws of England and Wales.
+
+Registration Number: 16260658
+Registered Office:
+Suite 5703 Unit 3A, 34-35 Hatton Garden,
+Holborn, United Kingdom, EC1N 8DX
diff --git a/crates/core/database/templates/reset.whitelabel.txt b/crates/core/database/templates/reset.whitelabel.txt
new file mode 100644
index 000000000..9ac5028fc
--- /dev/null
+++ b/crates/core/database/templates/reset.whitelabel.txt
@@ -0,0 +1,9 @@
+You requested a password reset, if you did not perform this action you can safely ignore this email.
+
+Please navigate to: {{url}}
+
+This email is intended for {{email}}
+
+This email has no association with Revolt or Revolt Platforms Ltd.
+Learn more about third party instances here:
+https://developers.revolt.chat/faq.html
diff --git a/crates/core/database/templates/suspension.html b/crates/core/database/templates/suspension.html
index fafd2b40b..5002c2580 100644
--- a/crates/core/database/templates/suspension.html
+++ b/crates/core/database/templates/suspension.html
@@ -1,408 +1,80 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html>
   <head>
-    <!-- Compiled with Bootstrap Email version: 1.5.1 -->
-    <meta http-equiv="x-ua-compatible" content="ie=edge" />
-    <meta name="x-apple-disable-message-reformatting" />
-    <meta name="viewport" content="width=device-width, initial-scale=1" />
-    <meta
-      name="format-detection"
-      content="telephone=no, date=no, address=no, email=no"
-    />
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <!-- Compiled with Bootstrap Email version: 1.5.1 --><meta http-equiv="x-ua-compatible" content="ie=edge">
+    <meta name="x-apple-disable-message-reformatting">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <meta name="format-detection" content="telephone=no, date=no, address=no, email=no">
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
     <style type="text/css">
-      body,
-      table,
-      td {
-        font-family: Helvetica, Arial, sans-serif !important;
-      }
-      .ExternalClass {
-        width: 100%;
-      }
-      .ExternalClass,
-      .ExternalClass p,
-      .ExternalClass span,
-      .ExternalClass font,
-      .ExternalClass td,
-      .ExternalClass div {
-        line-height: 150%;
-      }
-      a {
-        text-decoration: none;
-      }
-      * {
-        color: inherit;
-      }
-      a[x-apple-data-detectors],
-      u + #body a,
-      #MessageViewBody a {
-        color: inherit;
-        text-decoration: none;
-        font-size: inherit;
-        font-family: inherit;
-        font-weight: inherit;
-        line-height: inherit;
-      }
-      img {
-        -ms-interpolation-mode: bicubic;
-      }
-      table:not([class^="s-"]) {
-        font-family: Helvetica, Arial, sans-serif;
-        mso-table-lspace: 0pt;
-        mso-table-rspace: 0pt;
-        border-spacing: 0px;
-        border-collapse: collapse;
-      }
-      table:not([class^="s-"]) td {
-        border-spacing: 0px;
-        border-collapse: collapse;
-      }
-      @media screen and (max-width: 600px) {
-        .w-full,
-        .w-full > tbody > tr > td {
-          width: 100% !important;
-        }
-        .w-24,
-        .w-24 > tbody > tr > td {
-          width: 96px !important;
-        }
-        .p-lg-10:not(table),
-        .p-lg-10:not(.btn) > tbody > tr > td,
-        .p-lg-10.btn td a {
-          padding: 0 !important;
-        }
-        .p-6:not(table),
-        .p-6:not(.btn) > tbody > tr > td,
-        .p-6.btn td a {
-          padding: 24px !important;
-        }
-        *[class*="s-lg-"] > tbody > tr > td {
-          font-size: 0 !important;
-          line-height: 0 !important;
-          height: 0 !important;
-        }
-        .s-4 > tbody > tr > td {
-          font-size: 16px !important;
-          line-height: 16px !important;
-          height: 16px !important;
-        }
-        .s-6 > tbody > tr > td {
-          font-size: 24px !important;
-          line-height: 24px !important;
-          height: 24px !important;
-        }
-        .s-10 > tbody > tr > td {
-          font-size: 40px !important;
-          line-height: 40px !important;
-          height: 40px !important;
-        }
-      }
+      body,table,td{font-family:Helvetica,Arial,sans-serif !important}.ExternalClass{width:100%}.ExternalClass,.ExternalClass p,.ExternalClass span,.ExternalClass font,.ExternalClass td,.ExternalClass div{line-height:150%}a{text-decoration:none}*{color:inherit}a[x-apple-data-detectors],u+#body a,#MessageViewBody a{color:inherit;text-decoration:none;font-size:inherit;font-family:inherit;font-weight:inherit;line-height:inherit}img{-ms-interpolation-mode:bicubic}table:not([class^=s-]){font-family:Helvetica,Arial,sans-serif;mso-table-lspace:0pt;mso-table-rspace:0pt;border-spacing:0px;border-collapse:collapse}table:not([class^=s-]) td{border-spacing:0px;border-collapse:collapse}@media screen and (max-width: 600px){.w-full,.w-full>tbody>tr>td{width:100% !important}.w-24,.w-24>tbody>tr>td{width:96px !important}.p-lg-10:not(table),.p-lg-10:not(.btn)>tbody>tr>td,.p-lg-10.btn td a{padding:0 !important}.p-6:not(table),.p-6:not(.btn)>tbody>tr>td,.p-6.btn td a{padding:24px !important}*[class*=s-lg-]>tbody>tr>td{font-size:0 !important;line-height:0 !important;height:0 !important}.s-4>tbody>tr>td{font-size:16px !important;line-height:16px !important;height:16px !important}.s-6>tbody>tr>td{font-size:24px !important;line-height:24px !important;height:24px !important}.s-10>tbody>tr>td{font-size:40px !important;line-height:40px !important;height:40px !important}}
     </style>
   </head>
-  <body
-    class="bg-light"
-    style="
-      outline: 0;
-      width: 100%;
-      min-width: 100%;
-      height: 100%;
-      -webkit-text-size-adjust: 100%;
-      -ms-text-size-adjust: 100%;
-      font-family: Helvetica, Arial, sans-serif;
-      line-height: 24px;
-      font-weight: normal;
-      font-size: 16px;
-      -moz-box-sizing: border-box;
-      -webkit-box-sizing: border-box;
-      box-sizing: border-box;
-      color: #000000;
-      margin: 0;
-      padding: 0;
-      border-width: 0;
-    "
-    bgcolor="#f7fafc"
-  >
-    <table
-      class="bg-light body"
-      valign="top"
-      role="presentation"
-      border="0"
-      cellpadding="0"
-      cellspacing="0"
-      style="
-        outline: 0;
-        width: 100%;
-        min-width: 100%;
-        height: 100%;
-        -webkit-text-size-adjust: 100%;
-        -ms-text-size-adjust: 100%;
-        font-family: Helvetica, Arial, sans-serif;
-        line-height: 24px;
-        font-weight: normal;
-        font-size: 16px;
-        -moz-box-sizing: border-box;
-        -webkit-box-sizing: border-box;
-        box-sizing: border-box;
-        color: #000000;
-        margin: 0;
-        padding: 0;
-        border-width: 0;
-      "
-      bgcolor="#f7fafc"
-    >
+  <body class="bg-light" style="outline: 0; width: 100%; min-width: 100%; height: 100%; -webkit-text-size-adjust: 100%; -ms-text-size-adjust: 100%; font-family: Helvetica, Arial, sans-serif; line-height: 24px; font-weight: normal; font-size: 16px; -moz-box-sizing: border-box; -webkit-box-sizing: border-box; box-sizing: border-box; color: #000000; margin: 0; padding: 0; border-width: 0;" bgcolor="#f7fafc">
+    <table class="bg-light body" valign="top" role="presentation" border="0" cellpadding="0" cellspacing="0" style="outline: 0; width: 100%; min-width: 100%; height: 100%; -webkit-text-size-adjust: 100%; -ms-text-size-adjust: 100%; font-family: Helvetica, Arial, sans-serif; line-height: 24px; font-weight: normal; font-size: 16px; -moz-box-sizing: border-box; -webkit-box-sizing: border-box; box-sizing: border-box; color: #000000; margin: 0; padding: 0; border-width: 0;" bgcolor="#f7fafc">
       <tbody>
         <tr>
-          <td
-            valign="top"
-            style="line-height: 24px; font-size: 16px; margin: 0"
-            align="left"
-            bgcolor="#f7fafc"
-          >
-            <table
-              class="container"
-              role="presentation"
-              border="0"
-              cellpadding="0"
-              cellspacing="0"
-              style="width: 100%"
-            >
+          <td valign="top" style="line-height: 24px; font-size: 16px; margin: 0;" align="left" bgcolor="#f7fafc">
+            <table class="container" role="presentation" border="0" cellpadding="0" cellspacing="0" style="width: 100%;">
               <tbody>
                 <tr>
-                  <td
-                    align="center"
-                    style="
-                      line-height: 24px;
-                      font-size: 16px;
-                      margin: 0;
-                      padding: 0 16px;
-                    "
-                  >
+                  <td align="center" style="line-height: 24px; font-size: 16px; margin: 0; padding: 0 16px;">
                     <!--[if (gte mso 9)|(IE)]>
                       <table align="center" role="presentation">
                         <tbody>
                           <tr>
                             <td width="600">
                     <![endif]-->
-                    <table
-                      align="center"
-                      role="presentation"
-                      border="0"
-                      cellpadding="0"
-                      cellspacing="0"
-                      style="width: 100%; max-width: 600px; margin: 0 auto"
-                    >
+                    <table align="center" role="presentation" border="0" cellpadding="0" cellspacing="0" style="width: 100%; max-width: 600px; margin: 0 auto;">
                       <tbody>
                         <tr>
-                          <td
-                            style="
-                              line-height: 24px;
-                              font-size: 16px;
-                              margin: 0;
-                            "
-                            align="left"
-                          >
-                            <table
-                              class="s-10 w-full"
-                              role="presentation"
-                              border="0"
-                              cellpadding="0"
-                              cellspacing="0"
-                              style="width: 100%"
-                              width="100%"
-                            >
+                          <td style="line-height: 24px; font-size: 16px; margin: 0;" align="left">
+                            <table class="s-10 w-full" role="presentation" border="0" cellpadding="0" cellspacing="0" style="width: 100%;" width="100%">
                               <tbody>
                                 <tr>
-                                  <td
-                                    style="
-                                      line-height: 40px;
-                                      font-size: 40px;
-                                      width: 100%;
-                                      height: 40px;
-                                      margin: 0;
-                                    "
-                                    align="left"
-                                    width="100%"
-                                    height="40"
-                                  >
+                                  <td style="line-height: 40px; font-size: 40px; width: 100%; height: 40px; margin: 0;" align="left" width="100%" height="40">
                                     &#160;
                                   </td>
                                 </tr>
                               </tbody>
                             </table>
-                            <table
-                              class="ax-center"
-                              role="presentation"
-                              align="center"
-                              border="0"
-                              cellpadding="0"
-                              cellspacing="0"
-                              style="margin: 0 auto"
-                            >
+                            <table class="ax-center" role="presentation" align="center" border="0" cellpadding="0" cellspacing="0" style="margin: 0 auto;">
                               <tbody>
                                 <tr>
-                                  <td
-                                    style="
-                                      line-height: 24px;
-                                      font-size: 16px;
-                                      margin: 0;
-                                    "
-                                    align="left"
-                                  >
-                                    <img
-                                      alt="Revolt Logo"
-                                      class="w-24"
-                                      src="https://app.revolt.chat/assets/logo_round.png"
-                                      style="
-                                        height: auto;
-                                        line-height: 100%;
-                                        outline: none;
-                                        text-decoration: none;
-                                        display: block;
-                                        width: 96px;
-                                        border-style: none;
-                                        border-width: 0;
-                                      "
-                                      width="96"
-                                    />
+                                  <td style="line-height: 24px; font-size: 16px; margin: 0;" align="left">
+                                    <img alt="Revolt Logo" class="w-24" src="https://app.revolt.chat/assets/logo_round.png" style="height: auto; line-height: 100%; outline: none; text-decoration: none; display: block; width: 96px; border-style: none; border-width: 0;" width="96">
                                   </td>
                                 </tr>
                               </tbody>
                             </table>
-                            <table
-                              class="s-10 w-full"
-                              role="presentation"
-                              border="0"
-                              cellpadding="0"
-                              cellspacing="0"
-                              style="width: 100%"
-                              width="100%"
-                            >
+                            <table class="s-10 w-full" role="presentation" border="0" cellpadding="0" cellspacing="0" style="width: 100%;" width="100%">
                               <tbody>
                                 <tr>
-                                  <td
-                                    style="
-                                      line-height: 40px;
-                                      font-size: 40px;
-                                      width: 100%;
-                                      height: 40px;
-                                      margin: 0;
-                                    "
-                                    align="left"
-                                    width="100%"
-                                    height="40"
-                                  >
+                                  <td style="line-height: 40px; font-size: 40px; width: 100%; height: 40px; margin: 0;" align="left" width="100%" height="40">
                                     &#160;
                                   </td>
                                 </tr>
                               </tbody>
                             </table>
-                            <table
-                              class="card p-6 p-lg-10 space-y-4"
-                              role="presentation"
-                              border="0"
-                              cellpadding="0"
-                              cellspacing="0"
-                              style="
-                                border-radius: 6px;
-                                border-collapse: separate !important;
-                                width: 100%;
-                                overflow: hidden;
-                                border: 1px solid #e2e8f0;
-                              "
-                              bgcolor="#ffffff"
-                            >
+                            <table class="card p-6 p-lg-10 space-y-4" role="presentation" border="0" cellpadding="0" cellspacing="0" style="border-radius: 6px; border-collapse: separate !important; width: 100%; overflow: hidden; border: 1px solid #e2e8f0;" bgcolor="#ffffff">
                               <tbody>
                                 <tr>
-                                  <td
-                                    style="
-                                      line-height: 24px;
-                                      font-size: 16px;
-                                      width: 100%;
-                                      margin: 0;
-                                      padding: 40px;
-                                    "
-                                    align="left"
-                                    bgcolor="#ffffff"
-                                  >
-                                    <h1
-                                      class="h3 fw-700"
-                                      style="
-                                        padding-top: 0;
-                                        padding-bottom: 0;
-                                        font-weight: 700 !important;
-                                        vertical-align: baseline;
-                                        font-size: 28px;
-                                        line-height: 33.6px;
-                                        margin: 0;
-                                      "
-                                      align="left"
-                                    >
-                                      Account Suspended
-                                    </h1>
-                                    <table
-                                      class="s-4 w-full"
-                                      role="presentation"
-                                      border="0"
-                                      cellpadding="0"
-                                      cellspacing="0"
-                                      style="width: 100%"
-                                      width="100%"
-                                    >
+                                  <td style="line-height: 24px; font-size: 16px; width: 100%; margin: 0; padding: 40px;" align="left" bgcolor="#ffffff">
+                                    <h1 class="h3 fw-700" style="padding-top: 0; padding-bottom: 0; font-weight: 700 !important; vertical-align: baseline; font-size: 28px; line-height: 33.6px; margin: 0;" align="left">Account Suspended</h1>
+                                    <table class="s-4 w-full" role="presentation" border="0" cellpadding="0" cellspacing="0" style="width: 100%;" width="100%">
                                       <tbody>
                                         <tr>
-                                          <td
-                                            style="
-                                              line-height: 16px;
-                                              font-size: 16px;
-                                              width: 100%;
-                                              height: 16px;
-                                              margin: 0;
-                                            "
-                                            align="left"
-                                            width="100%"
-                                            height="16"
-                                          >
+                                          <td style="line-height: 16px; font-size: 16px; width: 100%; height: 16px; margin: 0;" align="left" width="100%" height="16">
                                             &#160;
                                           </td>
                                         </tr>
                                       </tbody>
                                     </table>
-                                    <p
-                                      class=""
-                                      style="
-                                        line-height: 24px;
-                                        font-size: 16px;
-                                        width: 100%;
-                                        margin: 0;
-                                      "
-                                      align="left"
-                                    >
-                                      Your account has been suspended, for one
-                                      or more reasons:
-                                    </p>
-                                    <table
-                                      class="s-4 w-full"
-                                      role="presentation"
-                                      border="0"
-                                      cellpadding="0"
-                                      cellspacing="0"
-                                      style="width: 100%"
-                                      width="100%"
-                                    >
+                                    <p class="" style="line-height: 24px; font-size: 16px; width: 100%; margin: 0;" align="left">Your account has been suspended, for one or more reasons:</p>
+                                    <table class="s-4 w-full" role="presentation" border="0" cellpadding="0" cellspacing="0" style="width: 100%;" width="100%">
                                       <tbody>
                                         <tr>
-                                          <td
-                                            style="
-                                              line-height: 16px;
-                                              font-size: 16px;
-                                              width: 100%;
-                                              height: 16px;
-                                              margin: 0;
-                                            "
-                                            align="left"
-                                            width="100%"
-                                            height="16"
-                                          >
+                                          <td style="line-height: 16px; font-size: 16px; width: 100%; height: 16px; margin: 0;" align="left" width="100%" height="16">
                                             &#160;
                                           </td>
                                         </tr>
@@ -411,193 +83,98 @@
                                     <ul class="">
                                       {{list}}
                                     </ul>
-                                    <table
-                                      class="s-4 w-full"
-                                      role="presentation"
-                                      border="0"
-                                      cellpadding="0"
-                                      cellspacing="0"
-                                      style="width: 100%"
-                                      width="100%"
-                                    >
+                                    <table class="s-4 w-full" role="presentation" border="0" cellpadding="0" cellspacing="0" style="width: 100%;" width="100%">
                                       <tbody>
                                         <tr>
-                                          <td
-                                            style="
-                                              line-height: 16px;
-                                              font-size: 16px;
-                                              width: 100%;
-                                              height: 16px;
-                                              margin: 0;
-                                            "
-                                            align="left"
-                                            width="100%"
-                                            height="16"
-                                          >
+                                          <td style="line-height: 16px; font-size: 16px; width: 100%; height: 16px; margin: 0;" align="left" width="100%" height="16">
                                             &#160;
                                           </td>
                                         </tr>
                                       </tbody>
                                     </table>
-                                    <p
-                                      style="display: {{duration_display}}; line-height: 24px; font-size: 16px; width: 100%; margin: 0;"
-                                      class=""
-                                      align="left"
-                                    >
-                                      You will be able to use your account again
-                                      in {{duration}} days.
+                                    <p style="display: {{duration_display}}; line-height: 24px; font-size: 16px; width: 100%; margin: 0;" class="" align="left">
+                                      You will be able to use your account again in {{duration}} days.
                                     </p>
-                                    <table
-                                      class="s-4 w-full"
-                                      role="presentation"
-                                      border="0"
-                                      cellpadding="0"
-                                      cellspacing="0"
-                                      style="width: 100%"
-                                      width="100%"
-                                    >
+                                    <table class="s-4 w-full" role="presentation" border="0" cellpadding="0" cellspacing="0" style="width: 100%;" width="100%">
                                       <tbody>
                                         <tr>
-                                          <td
-                                            style="
-                                              line-height: 16px;
-                                              font-size: 16px;
-                                              width: 100%;
-                                              height: 16px;
-                                              margin: 0;
-                                            "
-                                            align="left"
-                                            width="100%"
-                                            height="16"
-                                          >
+                                          <td style="line-height: 16px; font-size: 16px; width: 100%; height: 16px; margin: 0;" align="left" width="100%" height="16">
                                             &#160;
                                           </td>
                                         </tr>
                                       </tbody>
                                     </table>
-                                    <p
-                                      class=""
-                                      style="
-                                        line-height: 24px;
-                                        font-size: 16px;
-                                        width: 100%;
-                                        margin: 0;
-                                      "
-                                      align="left"
-                                    >
-                                      Further violations may result in a
-                                      permanent ban depending on severity,
-                                      please abide by the
-                                      <a
-                                        href="https://revolt.chat/aup"
-                                        style="color: #0d6efd"
-                                        >Acceptable Usage Policy</a
-                                      >.
+                                    <p class="" style="line-height: 24px; font-size: 16px; width: 100%; margin: 0;" align="left">
+                                      Further violations may result in a permanent ban depending on
+                                      severity, please abide by the
+                                      <a href="https://revolt.chat/aup" style="color: #0d6efd;">Acceptable Usage Policy</a>.
                                     </p>
-                                    <table
-                                      class="s-4 w-full"
-                                      role="presentation"
-                                      border="0"
-                                      cellpadding="0"
-                                      cellspacing="0"
-                                      style="width: 100%"
-                                      width="100%"
-                                    >
+                                    <table class="s-4 w-full" role="presentation" border="0" cellpadding="0" cellspacing="0" style="width: 100%;" width="100%">
                                       <tbody>
                                         <tr>
-                                          <td
-                                            style="
-                                              line-height: 16px;
-                                              font-size: 16px;
-                                              width: 100%;
-                                              height: 16px;
-                                              margin: 0;
-                                            "
-                                            align="left"
-                                            width="100%"
-                                            height="16"
-                                          >
+                                          <td style="line-height: 16px; font-size: 16px; width: 100%; height: 16px; margin: 0;" align="left" width="100%" height="16">
                                             &#160;
                                           </td>
                                         </tr>
                                       </tbody>
                                     </table>
-                                    <p
-                                      style="
-                                        line-height: 24px;
-                                        font-size: 16px;
-                                        width: 100%;
-                                        margin: 0;
-                                      "
-                                      align="left"
-                                    >
-                                      Ban evasion is prohibited and will be
-                                      dealt with accordingly.
-                                    </p>
+                                    <p style="line-height: 24px; font-size: 16px; width: 100%; margin: 0;" align="left">Ban evasion is prohibited and will be dealt with accordingly.</p>
                                   </td>
                                 </tr>
                               </tbody>
                             </table>
-                            <table
-                              class="s-6 w-full"
-                              role="presentation"
-                              border="0"
-                              cellpadding="0"
-                              cellspacing="0"
-                              style="width: 100%"
-                              width="100%"
-                            >
+                            <table class="s-6 w-full" role="presentation" border="0" cellpadding="0" cellspacing="0" style="width: 100%;" width="100%">
                               <tbody>
                                 <tr>
-                                  <td
-                                    style="
-                                      line-height: 24px;
-                                      font-size: 24px;
-                                      width: 100%;
-                                      height: 24px;
-                                      margin: 0;
-                                    "
-                                    align="left"
-                                    width="100%"
-                                    height="24"
-                                  >
+                                  <td style="line-height: 24px; font-size: 24px; width: 100%; height: 24px; margin: 0;" align="left" width="100%" height="24">
                                     &#160;
                                   </td>
                                 </tr>
                               </tbody>
                             </table>
-                            <div
-                              class="text-muted text-center"
-                              style="color: #718096"
-                              align="center"
-                            >
-                              This email is intended for {{email}}<br />
-                              Sent from Revolt<br />
+                            <div class="text-muted text-center" style="color: #718096;" align="center">
+                              This email is intended for {{email}}<br>
+                              Sent from Revolt<br>
                               Made in Europe
                             </div>
-                            <table
-                              class="s-6 w-full"
-                              role="presentation"
-                              border="0"
-                              cellpadding="0"
-                              cellspacing="0"
-                              style="width: 100%"
-                              width="100%"
-                            >
+                            <table class="s-6 w-full" role="presentation" border="0" cellpadding="0" cellspacing="0" style="width: 100%;" width="100%">
+                              <tbody>
+                                <tr>
+                                  <td style="line-height: 24px; font-size: 24px; width: 100%; height: 24px; margin: 0;" align="left" width="100%" height="24">
+                                    &#160;
+                                  </td>
+                                </tr>
+                              </tbody>
+                            </table>
+                            <table class="s-6 w-full" role="presentation" border="0" cellpadding="0" cellspacing="0" style="width: 100%;" width="100%">
+                              <tbody>
+                                <tr>
+                                  <td style="line-height: 24px; font-size: 24px; width: 100%; height: 24px; margin: 0;" align="left" width="100%" height="24">
+                                    &#160;
+                                  </td>
+                                </tr>
+                              </tbody>
+                            </table>
+                            <table class="ax-center" role="presentation" align="center" border="0" cellpadding="0" cellspacing="0" style="margin: 0 auto;">
+                              <tbody>
+                                <tr>
+                                  <td style="line-height: 24px; font-size: 16px; margin: 0;" align="left">
+                                    <div class="text-muted text-xs" style="color: #718096; font-size: 12px; line-height: 14.4px;">
+                                      Revolt Platforms Ltd. is a company incorporated and registered under the
+                                      laws of England and Wales.<br>
+                                      Registered Company Number: 16260658<br>
+                                      Registered Office:<br>
+                                      Suite 5703 Unit 3A, 34-35 Hatton Garden,<br>
+                                      Holborn, United Kingdom, EC1N 8DX
+                                    </div>
+                                  </td>
+                                </tr>
+                              </tbody>
+                            </table>
+                            <table class="s-6 w-full" role="presentation" border="0" cellpadding="0" cellspacing="0" style="width: 100%;" width="100%">
                               <tbody>
                                 <tr>
-                                  <td
-                                    style="
-                                      line-height: 24px;
-                                      font-size: 24px;
-                                      width: 100%;
-                                      height: 24px;
-                                      margin: 0;
-                                    "
-                                    align="left"
-                                    width="100%"
-                                    height="24"
-                                  >
+                                  <td style="line-height: 24px; font-size: 24px; width: 100%; height: 24px; margin: 0;" align="left" width="100%" height="24">
                                     &#160;
                                   </td>
                                 </tr>
diff --git a/crates/core/database/templates/suspension.original.html b/crates/core/database/templates/suspension.original.html
index 624801e93..fbbbb4168 100644
--- a/crates/core/database/templates/suspension.original.html
+++ b/crates/core/database/templates/suspension.original.html
@@ -33,6 +33,14 @@ <h1 class="h3 fw-700">Account Suspended</h1>
         Sent from Revolt<br />
         Made in Europe
       </div>
+      <div class="text-muted text-xs my-6 ax-center">
+        Revolt Platforms Ltd. is a company incorporated and registered under the
+        laws of England and Wales.<br />
+        Registered Company Number: 16260658<br />
+        Registered Office:<br />
+        Suite 5703 Unit 3A, 34-35 Hatton Garden,<br />
+        Holborn, United Kingdom, EC1N 8DX
+      </div>
     </div>
   </body>
 </html>
diff --git a/crates/core/database/templates/suspension.txt b/crates/core/database/templates/suspension.txt
index ace1d25cc..30d48d846 100644
--- a/crates/core/database/templates/suspension.txt
+++ b/crates/core/database/templates/suspension.txt
@@ -10,3 +10,10 @@ Ban evasion is prohibited and will be dealt with accordingly.
 This email is intended for {{email}}
 Sent by Revolt
 Made in Europe
+
+Revolt Platforms Ltd. is a company incorporated and registered under the laws of England and Wales.
+
+Registration Number: 16260658
+Registered Office:
+Suite 5703 Unit 3A, 34-35 Hatton Garden,
+Holborn, United Kingdom, EC1N 8DX
diff --git a/crates/core/database/templates/suspension.whitelabel.txt b/crates/core/database/templates/suspension.whitelabel.txt
new file mode 100644
index 000000000..45d9aa560
--- /dev/null
+++ b/crates/core/database/templates/suspension.whitelabel.txt
@@ -0,0 +1,8 @@
+Your account has been suspended, for one or more reasons:
+{{list}}
+
+This email is intended for {{email}}
+
+This email has no association with Revolt or Revolt Platforms Ltd.
+Learn more about third party instances here:
+https://developers.revolt.chat/faq.html
diff --git a/crates/core/database/templates/verify.html b/crates/core/database/templates/verify.html
index a2b196c4e..8ab9713d0 100644
--- a/crates/core/database/templates/verify.html
+++ b/crates/core/database/templates/verify.html
@@ -1,462 +1,90 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html>
   <head>
-    <!-- Compiled with Bootstrap Email version: 1.3.1 -->
-    <meta http-equiv="x-ua-compatible" content="ie=edge" />
-    <meta name="x-apple-disable-message-reformatting" />
-    <meta name="viewport" content="width=device-width, initial-scale=1" />
-    <meta
-      name="format-detection"
-      content="telephone=no, date=no, address=no, email=no"
-    />
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <!-- Compiled with Bootstrap Email version: 1.5.1 --><meta http-equiv="x-ua-compatible" content="ie=edge">
+    <meta name="x-apple-disable-message-reformatting">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <meta name="format-detection" content="telephone=no, date=no, address=no, email=no">
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
     <style type="text/css">
-      body,
-      table,
-      td {
-        font-family: Helvetica, Arial, sans-serif !important;
-      }
-      .ExternalClass {
-        width: 100%;
-      }
-      .ExternalClass,
-      .ExternalClass p,
-      .ExternalClass span,
-      .ExternalClass font,
-      .ExternalClass td,
-      .ExternalClass div {
-        line-height: 150%;
-      }
-      a {
-        text-decoration: none;
-      }
-      * {
-        color: inherit;
-      }
-      a[x-apple-data-detectors],
-      u + #body a,
-      #MessageViewBody a {
-        color: inherit;
-        text-decoration: none;
-        font-size: inherit;
-        font-family: inherit;
-        font-weight: inherit;
-        line-height: inherit;
-      }
-      img {
-        -ms-interpolation-mode: bicubic;
-      }
-      table:not([class^="s-"]) {
-        font-family: Helvetica, Arial, sans-serif;
-        mso-table-lspace: 0pt;
-        mso-table-rspace: 0pt;
-        border-spacing: 0px;
-        border-collapse: collapse;
-      }
-      table:not([class^="s-"]) td {
-        border-spacing: 0px;
-        border-collapse: collapse;
-      }
-      @media screen and (max-width: 600px) {
-        .w-full,
-        .w-full > tbody > tr > td {
-          width: 100% !important;
-        }
-        .w-24,
-        .w-24 > tbody > tr > td {
-          width: 96px !important;
-        }
-        .p-lg-10:not(table),
-        .p-lg-10:not(.btn) > tbody > tr > td,
-        .p-lg-10.btn td a {
-          padding: 0 !important;
-        }
-        .p-3:not(table),
-        .p-3:not(.btn) > tbody > tr > td,
-        .p-3.btn td a {
-          padding: 12px !important;
-        }
-        .p-6:not(table),
-        .p-6:not(.btn) > tbody > tr > td,
-        .p-6.btn td a {
-          padding: 24px !important;
-        }
-        *[class*="s-lg-"] > tbody > tr > td {
-          font-size: 0 !important;
-          line-height: 0 !important;
-          height: 0 !important;
-        }
-        .s-4 > tbody > tr > td {
-          font-size: 16px !important;
-          line-height: 16px !important;
-          height: 16px !important;
-        }
-        .s-6 > tbody > tr > td {
-          font-size: 24px !important;
-          line-height: 24px !important;
-          height: 24px !important;
-        }
-        .s-10 > tbody > tr > td {
-          font-size: 40px !important;
-          line-height: 40px !important;
-          height: 40px !important;
-        }
-      }
+      body,table,td{font-family:Helvetica,Arial,sans-serif !important}.ExternalClass{width:100%}.ExternalClass,.ExternalClass p,.ExternalClass span,.ExternalClass font,.ExternalClass td,.ExternalClass div{line-height:150%}a{text-decoration:none}*{color:inherit}a[x-apple-data-detectors],u+#body a,#MessageViewBody a{color:inherit;text-decoration:none;font-size:inherit;font-family:inherit;font-weight:inherit;line-height:inherit}img{-ms-interpolation-mode:bicubic}table:not([class^=s-]){font-family:Helvetica,Arial,sans-serif;mso-table-lspace:0pt;mso-table-rspace:0pt;border-spacing:0px;border-collapse:collapse}table:not([class^=s-]) td{border-spacing:0px;border-collapse:collapse}@media screen and (max-width: 600px){.w-full,.w-full>tbody>tr>td{width:100% !important}.w-24,.w-24>tbody>tr>td{width:96px !important}.p-lg-10:not(table),.p-lg-10:not(.btn)>tbody>tr>td,.p-lg-10.btn td a{padding:0 !important}.p-3:not(table),.p-3:not(.btn)>tbody>tr>td,.p-3.btn td a{padding:12px !important}.p-6:not(table),.p-6:not(.btn)>tbody>tr>td,.p-6.btn td a{padding:24px !important}*[class*=s-lg-]>tbody>tr>td{font-size:0 !important;line-height:0 !important;height:0 !important}.s-4>tbody>tr>td{font-size:16px !important;line-height:16px !important;height:16px !important}.s-6>tbody>tr>td{font-size:24px !important;line-height:24px !important;height:24px !important}.s-10>tbody>tr>td{font-size:40px !important;line-height:40px !important;height:40px !important}}
     </style>
   </head>
-  <body
-    class="bg-light"
-    style="
-      outline: 0;
-      width: 100%;
-      min-width: 100%;
-      height: 100%;
-      -webkit-text-size-adjust: 100%;
-      -ms-text-size-adjust: 100%;
-      font-family: Helvetica, Arial, sans-serif;
-      line-height: 24px;
-      font-weight: normal;
-      font-size: 16px;
-      -moz-box-sizing: border-box;
-      -webkit-box-sizing: border-box;
-      box-sizing: border-box;
-      color: #000000;
-      margin: 0;
-      padding: 0;
-      border-width: 0;
-    "
-    bgcolor="#f7fafc"
-  >
-    <table
-      class="bg-light body"
-      valign="top"
-      role="presentation"
-      border="0"
-      cellpadding="0"
-      cellspacing="0"
-      style="
-        outline: 0;
-        width: 100%;
-        min-width: 100%;
-        height: 100%;
-        -webkit-text-size-adjust: 100%;
-        -ms-text-size-adjust: 100%;
-        font-family: Helvetica, Arial, sans-serif;
-        line-height: 24px;
-        font-weight: normal;
-        font-size: 16px;
-        -moz-box-sizing: border-box;
-        -webkit-box-sizing: border-box;
-        box-sizing: border-box;
-        color: #000000;
-        margin: 0;
-        padding: 0;
-        border-width: 0;
-      "
-      bgcolor="#f7fafc"
-    >
+  <body class="bg-light" style="outline: 0; width: 100%; min-width: 100%; height: 100%; -webkit-text-size-adjust: 100%; -ms-text-size-adjust: 100%; font-family: Helvetica, Arial, sans-serif; line-height: 24px; font-weight: normal; font-size: 16px; -moz-box-sizing: border-box; -webkit-box-sizing: border-box; box-sizing: border-box; color: #000000; margin: 0; padding: 0; border-width: 0;" bgcolor="#f7fafc">
+    <table class="bg-light body" valign="top" role="presentation" border="0" cellpadding="0" cellspacing="0" style="outline: 0; width: 100%; min-width: 100%; height: 100%; -webkit-text-size-adjust: 100%; -ms-text-size-adjust: 100%; font-family: Helvetica, Arial, sans-serif; line-height: 24px; font-weight: normal; font-size: 16px; -moz-box-sizing: border-box; -webkit-box-sizing: border-box; box-sizing: border-box; color: #000000; margin: 0; padding: 0; border-width: 0;" bgcolor="#f7fafc">
       <tbody>
         <tr>
-          <td
-            valign="top"
-            style="line-height: 24px; font-size: 16px; margin: 0"
-            align="left"
-            bgcolor="#f7fafc"
-          >
-            <table
-              class="container"
-              role="presentation"
-              border="0"
-              cellpadding="0"
-              cellspacing="0"
-              style="width: 100%"
-            >
+          <td valign="top" style="line-height: 24px; font-size: 16px; margin: 0;" align="left" bgcolor="#f7fafc">
+            <table class="container" role="presentation" border="0" cellpadding="0" cellspacing="0" style="width: 100%;">
               <tbody>
                 <tr>
-                  <td
-                    align="center"
-                    style="
-                      line-height: 24px;
-                      font-size: 16px;
-                      margin: 0;
-                      padding: 0 16px;
-                    "
-                  >
+                  <td align="center" style="line-height: 24px; font-size: 16px; margin: 0; padding: 0 16px;">
                     <!--[if (gte mso 9)|(IE)]>
                       <table align="center" role="presentation">
                         <tbody>
                           <tr>
                             <td width="600">
                     <![endif]-->
-                    <table
-                      align="center"
-                      role="presentation"
-                      border="0"
-                      cellpadding="0"
-                      cellspacing="0"
-                      style="width: 100%; max-width: 600px; margin: 0 auto"
-                    >
+                    <table align="center" role="presentation" border="0" cellpadding="0" cellspacing="0" style="width: 100%; max-width: 600px; margin: 0 auto;">
                       <tbody>
                         <tr>
-                          <td
-                            style="
-                              line-height: 24px;
-                              font-size: 16px;
-                              margin: 0;
-                            "
-                            align="left"
-                          >
-                            <table
-                              class="s-10 w-full"
-                              role="presentation"
-                              border="0"
-                              cellpadding="0"
-                              cellspacing="0"
-                              style="width: 100%"
-                              width="100%"
-                            >
+                          <td style="line-height: 24px; font-size: 16px; margin: 0;" align="left">
+                            <table class="s-10 w-full" role="presentation" border="0" cellpadding="0" cellspacing="0" style="width: 100%;" width="100%">
                               <tbody>
                                 <tr>
-                                  <td
-                                    style="
-                                      line-height: 40px;
-                                      font-size: 40px;
-                                      width: 100%;
-                                      height: 40px;
-                                      margin: 0;
-                                    "
-                                    align="left"
-                                    width="100%"
-                                    height="40"
-                                  >
+                                  <td style="line-height: 40px; font-size: 40px; width: 100%; height: 40px; margin: 0;" align="left" width="100%" height="40">
                                     &#160;
                                   </td>
                                 </tr>
                               </tbody>
                             </table>
-                            <table
-                              class="ax-center"
-                              role="presentation"
-                              align="center"
-                              border="0"
-                              cellpadding="0"
-                              cellspacing="0"
-                              style="margin: 0 auto"
-                            >
+                            <table class="ax-center" role="presentation" align="center" border="0" cellpadding="0" cellspacing="0" style="margin: 0 auto;">
                               <tbody>
                                 <tr>
-                                  <td
-                                    style="
-                                      line-height: 24px;
-                                      font-size: 16px;
-                                      margin: 0;
-                                    "
-                                    align="left"
-                                  >
-                                    <img
-                                      alt="Revolt Logo"
-                                      class="w-24"
-                                      src="https://app.revolt.chat/assets/logo_round.png"
-                                      style="
-                                        height: auto;
-                                        line-height: 100%;
-                                        outline: none;
-                                        text-decoration: none;
-                                        display: block;
-                                        width: 96px;
-                                        border-style: none;
-                                        border-width: 0;
-                                      "
-                                      width="96"
-                                    />
+                                  <td style="line-height: 24px; font-size: 16px; margin: 0;" align="left">
+                                    <img alt="Revolt Logo" class="w-24" src="https://app.revolt.chat/assets/logo_round.png" style="height: auto; line-height: 100%; outline: none; text-decoration: none; display: block; width: 96px; border-style: none; border-width: 0;" width="96">
                                   </td>
                                 </tr>
                               </tbody>
                             </table>
-                            <table
-                              class="s-10 w-full"
-                              role="presentation"
-                              border="0"
-                              cellpadding="0"
-                              cellspacing="0"
-                              style="width: 100%"
-                              width="100%"
-                            >
+                            <table class="s-10 w-full" role="presentation" border="0" cellpadding="0" cellspacing="0" style="width: 100%;" width="100%">
                               <tbody>
                                 <tr>
-                                  <td
-                                    style="
-                                      line-height: 40px;
-                                      font-size: 40px;
-                                      width: 100%;
-                                      height: 40px;
-                                      margin: 0;
-                                    "
-                                    align="left"
-                                    width="100%"
-                                    height="40"
-                                  >
+                                  <td style="line-height: 40px; font-size: 40px; width: 100%; height: 40px; margin: 0;" align="left" width="100%" height="40">
                                     &#160;
                                   </td>
                                 </tr>
                               </tbody>
                             </table>
-                            <table
-                              class="card p-6 p-lg-10 space-y-4"
-                              role="presentation"
-                              border="0"
-                              cellpadding="0"
-                              cellspacing="0"
-                              style="
-                                border-radius: 6px;
-                                border-collapse: separate !important;
-                                width: 100%;
-                                overflow: hidden;
-                                border: 1px solid #e2e8f0;
-                              "
-                              bgcolor="#ffffff"
-                            >
+                            <table class="card p-6 p-lg-10 space-y-4" role="presentation" border="0" cellpadding="0" cellspacing="0" style="border-radius: 6px; border-collapse: separate !important; width: 100%; overflow: hidden; border: 1px solid #e2e8f0;" bgcolor="#ffffff">
                               <tbody>
                                 <tr>
-                                  <td
-                                    style="
-                                      line-height: 24px;
-                                      font-size: 16px;
-                                      width: 100%;
-                                      margin: 0;
-                                      padding: 40px;
-                                    "
-                                    align="left"
-                                    bgcolor="#ffffff"
-                                  >
-                                    <h1
-                                      class="h3 fw-700"
-                                      style="
-                                        padding-top: 0;
-                                        padding-bottom: 0;
-                                        font-weight: 700 !important;
-                                        vertical-align: baseline;
-                                        font-size: 28px;
-                                        line-height: 33.6px;
-                                        margin: 0;
-                                      "
-                                      align="left"
-                                    >
-                                      Almost there!
-                                    </h1>
-                                    <table
-                                      class="s-4 w-full"
-                                      role="presentation"
-                                      border="0"
-                                      cellpadding="0"
-                                      cellspacing="0"
-                                      style="width: 100%"
-                                      width="100%"
-                                    >
+                                  <td style="line-height: 24px; font-size: 16px; width: 100%; margin: 0; padding: 40px;" align="left" bgcolor="#ffffff">
+                                    <h1 class="h3 fw-700" style="padding-top: 0; padding-bottom: 0; font-weight: 700 !important; vertical-align: baseline; font-size: 28px; line-height: 33.6px; margin: 0;" align="left">Almost there!</h1>
+                                    <table class="s-4 w-full" role="presentation" border="0" cellpadding="0" cellspacing="0" style="width: 100%;" width="100%">
                                       <tbody>
                                         <tr>
-                                          <td
-                                            style="
-                                              line-height: 16px;
-                                              font-size: 16px;
-                                              width: 100%;
-                                              height: 16px;
-                                              margin: 0;
-                                            "
-                                            align="left"
-                                            width="100%"
-                                            height="16"
-                                          >
+                                          <td style="line-height: 16px; font-size: 16px; width: 100%; height: 16px; margin: 0;" align="left" width="100%" height="16">
                                             &#160;
                                           </td>
                                         </tr>
                                       </tbody>
                                     </table>
-                                    <p
-                                      class=""
-                                      style="
-                                        line-height: 24px;
-                                        font-size: 16px;
-                                        width: 100%;
-                                        margin: 0;
-                                      "
-                                      align="left"
-                                    >
-                                      To complete your sign up, we just need to
-                                      verify your email.
-                                    </p>
-                                    <table
-                                      class="s-4 w-full"
-                                      role="presentation"
-                                      border="0"
-                                      cellpadding="0"
-                                      cellspacing="0"
-                                      style="width: 100%"
-                                      width="100%"
-                                    >
+                                    <p class="" style="line-height: 24px; font-size: 16px; width: 100%; margin: 0;" align="left">To complete your sign up, we just need to verify your email.</p>
+                                    <table class="s-4 w-full" role="presentation" border="0" cellpadding="0" cellspacing="0" style="width: 100%;" width="100%">
                                       <tbody>
                                         <tr>
-                                          <td
-                                            style="
-                                              line-height: 16px;
-                                              font-size: 16px;
-                                              width: 100%;
-                                              height: 16px;
-                                              margin: 0;
-                                            "
-                                            align="left"
-                                            width="100%"
-                                            height="16"
-                                          >
+                                          <td style="line-height: 16px; font-size: 16px; width: 100%; height: 16px; margin: 0;" align="left" width="100%" height="16">
                                             &#160;
                                           </td>
                                         </tr>
                                       </tbody>
                                     </table>
-                                    <table
-                                      class="btn btn-primary p-3 fw-700"
-                                      role="presentation"
-                                      border="0"
-                                      cellpadding="0"
-                                      cellspacing="0"
-                                      style="
-                                        border-radius: 6px;
-                                        border-collapse: separate !important;
-                                        font-weight: 700 !important;
-                                      "
-                                    >
+                                    <table class="btn btn-primary p-3 fw-700" role="presentation" border="0" cellpadding="0" cellspacing="0" style="border-radius: 6px; border-collapse: separate !important; font-weight: 700 !important;">
                                       <tbody>
                                         <tr>
-                                          <td
-                                            style="
-                                              line-height: 24px;
-                                              font-size: 16px;
-                                              border-radius: 6px;
-                                              font-weight: 700 !important;
-                                              margin: 0;
-                                            "
-                                            align="center"
-                                            bgcolor="#0d6efd"
-                                          >
-                                            <a
-                                              href="{{url}}"
-                                              style="
-                                                color: #ffffff;
-                                                font-size: 16px;
-                                                font-family: Helvetica, Arial,
-                                                  sans-serif;
-                                                text-decoration: none;
-                                                border-radius: 6px;
-                                                line-height: 20px;
-                                                display: block;
-                                                font-weight: 700 !important;
-                                                white-space: nowrap;
-                                                background-color: #0d6efd;
-                                                padding: 12px;
-                                                border: 1px solid #0d6efd;
-                                              "
-                                              >Confirm</a
-                                            >
+                                          <td style="line-height: 24px; font-size: 16px; border-radius: 6px; font-weight: 700 !important; margin: 0;" align="center" bgcolor="#0d6efd">
+                                            <a href="{{url}}" style="color: #ffffff; font-size: 16px; font-family: Helvetica, Arial, sans-serif; text-decoration: none; border-radius: 6px; line-height: 20px; display: block; font-weight: 700 !important; white-space: nowrap; background-color: #0d6efd; padding: 12px; border: 1px solid #0d6efd;">Confirm</a>
                                           </td>
                                         </tr>
                                       </tbody>
@@ -465,66 +93,58 @@
                                 </tr>
                               </tbody>
                             </table>
-                            <table
-                              class="s-6 w-full"
-                              role="presentation"
-                              border="0"
-                              cellpadding="0"
-                              cellspacing="0"
-                              style="width: 100%"
-                              width="100%"
-                            >
+                            <table class="s-6 w-full" role="presentation" border="0" cellpadding="0" cellspacing="0" style="width: 100%;" width="100%">
                               <tbody>
                                 <tr>
-                                  <td
-                                    style="
-                                      line-height: 24px;
-                                      font-size: 24px;
-                                      width: 100%;
-                                      height: 24px;
-                                      margin: 0;
-                                    "
-                                    align="left"
-                                    width="100%"
-                                    height="24"
-                                  >
+                                  <td style="line-height: 24px; font-size: 24px; width: 100%; height: 24px; margin: 0;" align="left" width="100%" height="24">
                                     &#160;
                                   </td>
                                 </tr>
                               </tbody>
                             </table>
-                            <div
-                              class="text-muted text-center"
-                              style="color: #718096"
-                              align="center"
-                            >
-                              This email is intended for {{email}}<br />
-                              Sent from Revolt<br />
+                            <div class="text-muted text-center" style="color: #718096;" align="center">
+                              This email is intended for {{email}}<br>
+                              Sent from Revolt<br>
                               Made in Europe
                             </div>
-                            <table
-                              class="s-6 w-full"
-                              role="presentation"
-                              border="0"
-                              cellpadding="0"
-                              cellspacing="0"
-                              style="width: 100%"
-                              width="100%"
-                            >
+                            <table class="s-6 w-full" role="presentation" border="0" cellpadding="0" cellspacing="0" style="width: 100%;" width="100%">
                               <tbody>
                                 <tr>
-                                  <td
-                                    style="
-                                      line-height: 24px;
-                                      font-size: 24px;
-                                      width: 100%;
-                                      height: 24px;
-                                      margin: 0;
-                                    "
-                                    align="left"
-                                    width="100%"
-                                    height="24"
-                                  >
+                                  <td style="line-height: 24px; font-size: 24px; width: 100%; height: 24px; margin: 0;" align="left" width="100%" height="24">
+                                    &#160;
+                                  </td>
+                                </tr>
+                              </tbody>
+                            </table>
+                            <table class="s-6 w-full" role="presentation" border="0" cellpadding="0" cellspacing="0" style="width: 100%;" width="100%">
+                              <tbody>
+                                <tr>
+                                  <td style="line-height: 24px; font-size: 24px; width: 100%; height: 24px; margin: 0;" align="left" width="100%" height="24">
+                                    &#160;
+                                  </td>
+                                </tr>
+                              </tbody>
+                            </table>
+                            <table class="ax-center" role="presentation" align="center" border="0" cellpadding="0" cellspacing="0" style="margin: 0 auto;">
+                              <tbody>
+                                <tr>
+                                  <td style="line-height: 24px; font-size: 16px; margin: 0;" align="left">
+                                    <div class="text-muted text-xs" style="color: #718096; font-size: 12px; line-height: 14.4px;">
+                                      Revolt Platforms Ltd. is a company incorporated and registered under the
+                                      laws of England and Wales.<br>
+                                      Registered Company Number: 16260658<br>
+                                      Registered Office:<br>
+                                      Suite 5703 Unit 3A, 34-35 Hatton Garden,<br>
+                                      Holborn, United Kingdom, EC1N 8DX
+                                    </div>
+                                  </td>
+                                </tr>
+                              </tbody>
+                            </table>
+                            <table class="s-6 w-full" role="presentation" border="0" cellpadding="0" cellspacing="0" style="width: 100%;" width="100%">
+                              <tbody>
+                                <tr>
+                                  <td style="line-height: 24px; font-size: 24px; width: 100%; height: 24px; margin: 0;" align="left" width="100%" height="24">
                                     &#160;
                                   </td>
                                 </tr>
diff --git a/crates/core/database/templates/verify.original.html b/crates/core/database/templates/verify.original.html
index 1d16a46c0..75ae25cea 100644
--- a/crates/core/database/templates/verify.original.html
+++ b/crates/core/database/templates/verify.original.html
@@ -22,6 +22,14 @@ <h1 class="h3 fw-700">Almost there!</h1>
         Sent from Revolt<br />
         Made in Europe
       </div>
+      <div class="text-muted text-xs my-6 ax-center">
+        Revolt Platforms Ltd. is a company incorporated and registered under the
+        laws of England and Wales.<br />
+        Registered Company Number: 16260658<br />
+        Registered Office:<br />
+        Suite 5703 Unit 3A, 34-35 Hatton Garden,<br />
+        Holborn, United Kingdom, EC1N 8DX
+      </div>
     </div>
   </body>
 </html>
diff --git a/crates/core/database/templates/verify.txt b/crates/core/database/templates/verify.txt
index a3f104c82..7fa871eef 100644
--- a/crates/core/database/templates/verify.txt
+++ b/crates/core/database/templates/verify.txt
@@ -6,3 +6,10 @@ Please navigate to: {{url}}
 This email is intended for {{email}}
 Sent by Revolt
 Made in Europe
+
+Revolt Platforms Ltd. is a company incorporated and registered under the laws of England and Wales.
+
+Registration Number: 16260658
+Registered Office:
+Suite 5703 Unit 3A, 34-35 Hatton Garden,
+Holborn, United Kingdom, EC1N 8DX
diff --git a/crates/core/database/templates/verify.whitelabel.txt b/crates/core/database/templates/verify.whitelabel.txt
new file mode 100644
index 000000000..fb54088df
--- /dev/null
+++ b/crates/core/database/templates/verify.whitelabel.txt
@@ -0,0 +1,10 @@
+Almost there!
+To complete your sign up, we just need to verify your email.
+
+Please navigate to: {{url}}
+
+This email is intended for {{email}}
+
+This email has no association with Revolt or Revolt Platforms Ltd.
+Learn more about third party instances here:
+https://developers.revolt.chat/faq.html

From 1d385ef2bc1cd13e0e7e6779c97a495dd7594a34 Mon Sep 17 00:00:00 2001
From: Paul Makles <me@insrt.uk>
Date: Mon, 24 Feb 2025 22:18:10 +0000
Subject: [PATCH 38/62] chore: bump version to 0.8.3

---
 Cargo.lock                         | 28 ++++++++++++++--------------
 crates/bindings/node/Cargo.toml    |  8 ++++----
 crates/bonfire/Cargo.toml          |  4 ++--
 crates/core/config/Cargo.toml      |  4 ++--
 crates/core/database/Cargo.toml    | 12 ++++++------
 crates/core/files/Cargo.toml       |  6 +++---
 crates/core/models/Cargo.toml      |  6 +++---
 crates/core/permissions/Cargo.toml |  4 ++--
 crates/core/presence/Cargo.toml    |  2 +-
 crates/core/result/Cargo.toml      |  2 +-
 crates/daemons/crond/Cargo.toml    | 10 +++++-----
 crates/daemons/pushd/Cargo.toml    |  8 ++++----
 crates/delta/Cargo.toml            |  2 +-
 crates/services/autumn/Cargo.toml  | 10 +++++-----
 crates/services/january/Cargo.toml | 10 +++++-----
 15 files changed, 58 insertions(+), 58 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index af86e6dde..da64ff4bf 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -6226,7 +6226,7 @@ dependencies = [
 
 [[package]]
 name = "revolt-autumn"
-version = "0.8.2"
+version = "0.8.3"
 dependencies = [
  "axum",
  "axum-macros",
@@ -6263,7 +6263,7 @@ dependencies = [
 
 [[package]]
 name = "revolt-bonfire"
-version = "0.8.2"
+version = "0.8.3"
 dependencies = [
  "async-channel 2.3.1",
  "async-std",
@@ -6293,7 +6293,7 @@ dependencies = [
 
 [[package]]
 name = "revolt-config"
-version = "0.8.2"
+version = "0.8.3"
 dependencies = [
  "async-std",
  "cached",
@@ -6309,7 +6309,7 @@ dependencies = [
 
 [[package]]
 name = "revolt-crond"
-version = "0.8.2"
+version = "0.8.3"
 dependencies = [
  "log",
  "revolt-config",
@@ -6321,7 +6321,7 @@ dependencies = [
 
 [[package]]
 name = "revolt-database"
-version = "0.8.2"
+version = "0.8.3"
 dependencies = [
  "amqprs",
  "async-lock 2.8.0",
@@ -6373,7 +6373,7 @@ dependencies = [
 
 [[package]]
 name = "revolt-delta"
-version = "0.8.2"
+version = "0.8.3"
 dependencies = [
  "amqprs",
  "async-channel 1.9.0",
@@ -6422,7 +6422,7 @@ dependencies = [
 
 [[package]]
 name = "revolt-files"
-version = "0.8.2"
+version = "0.8.3"
 dependencies = [
  "aes-gcm",
  "aws-config",
@@ -6445,7 +6445,7 @@ dependencies = [
 
 [[package]]
 name = "revolt-january"
-version = "0.8.2"
+version = "0.8.3"
 dependencies = [
  "async-recursion",
  "axum",
@@ -6473,7 +6473,7 @@ dependencies = [
 
 [[package]]
 name = "revolt-models"
-version = "0.8.2"
+version = "0.8.3"
 dependencies = [
  "indexmap 1.9.3",
  "iso8601-timestamp 0.2.17",
@@ -6491,7 +6491,7 @@ dependencies = [
 
 [[package]]
 name = "revolt-nodejs-bindings"
-version = "0.8.2"
+version = "0.8.3"
 dependencies = [
  "async-std",
  "neon",
@@ -6504,7 +6504,7 @@ dependencies = [
 
 [[package]]
 name = "revolt-permissions"
-version = "0.8.2"
+version = "0.8.3"
 dependencies = [
  "async-std",
  "async-trait",
@@ -6519,7 +6519,7 @@ dependencies = [
 
 [[package]]
 name = "revolt-presence"
-version = "0.8.2"
+version = "0.8.3"
 dependencies = [
  "async-std",
  "log",
@@ -6530,7 +6530,7 @@ dependencies = [
 
 [[package]]
 name = "revolt-pushd"
-version = "0.8.2"
+version = "0.8.3"
 dependencies = [
  "amqprs",
  "async-trait",
@@ -6554,7 +6554,7 @@ dependencies = [
 
 [[package]]
 name = "revolt-result"
-version = "0.8.2"
+version = "0.8.3"
 dependencies = [
  "axum",
  "log",
diff --git a/crates/bindings/node/Cargo.toml b/crates/bindings/node/Cargo.toml
index 43b9b8567..bd8ae3327 100644
--- a/crates/bindings/node/Cargo.toml
+++ b/crates/bindings/node/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "revolt-nodejs-bindings"
-version = "0.8.2"
+version = "0.8.3"
 description = "Node.js bindings for the Revolt software"
 authors = ["Paul Makles <me@insrt.uk>"]
 license = "MIT"
@@ -20,6 +20,6 @@ serde = { version = "1", features = ["derive"] }
 
 async-std = "1.12.0"
 
-revolt-config = { version = "0.8.2", path = "../../core/config" }
-revolt-result = { version = "0.8.2", path = "../../core/result" }
-revolt-database = { version = "0.8.2", path = "../../core/database" }
+revolt-config = { version = "0.8.3", path = "../../core/config" }
+revolt-result = { version = "0.8.3", path = "../../core/result" }
+revolt-database = { version = "0.8.3", path = "../../core/database" }
diff --git a/crates/bonfire/Cargo.toml b/crates/bonfire/Cargo.toml
index ed13358b5..f1d12fa2c 100644
--- a/crates/bonfire/Cargo.toml
+++ b/crates/bonfire/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "revolt-bonfire"
-version = "0.8.2"
+version = "0.8.3"
 license = "AGPL-3.0-or-later"
 edition = "2021"
 
@@ -41,7 +41,7 @@ revolt-result = { path = "../core/result" }
 revolt-models = { path = "../core/models" }
 revolt-config = { path = "../core/config" }
 revolt-database = { path = "../core/database" }
-revolt-permissions = { version = "0.8.2", path = "../core/permissions" }
+revolt-permissions = { version = "0.8.3", path = "../core/permissions" }
 revolt-presence = { path = "../core/presence", features = ["redis-is-patched"] }
 
 # redis
diff --git a/crates/core/config/Cargo.toml b/crates/core/config/Cargo.toml
index b23c10b94..05d3dd9be 100644
--- a/crates/core/config/Cargo.toml
+++ b/crates/core/config/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "revolt-config"
-version = "0.8.2"
+version = "0.8.3"
 edition = "2021"
 license = "MIT"
 authors = ["Paul Makles <me@insrt.uk>"]
@@ -34,4 +34,4 @@ pretty_env_logger = "0.4.0"
 sentry = "0.31.5"
 
 # Core
-revolt-result = { version = "0.8.2", path = "../result", optional = true }
+revolt-result = { version = "0.8.3", path = "../result", optional = true }
diff --git a/crates/core/database/Cargo.toml b/crates/core/database/Cargo.toml
index 16e0b43fd..f3a9b4e17 100644
--- a/crates/core/database/Cargo.toml
+++ b/crates/core/database/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "revolt-database"
-version = "0.8.2"
+version = "0.8.3"
 edition = "2021"
 license = "AGPL-3.0-or-later"
 authors = ["Paul Makles <me@insrt.uk>"]
@@ -24,15 +24,15 @@ default = ["mongodb", "async-std-runtime", "tasks"]
 
 [dependencies]
 # Core
-revolt-config = { version = "0.8.2", path = "../config", features = [
+revolt-config = { version = "0.8.3", path = "../config", features = [
     "report-macros",
 ] }
-revolt-result = { version = "0.8.2", path = "../result" }
-revolt-models = { version = "0.8.2", path = "../models", features = [
+revolt-result = { version = "0.8.3", path = "../result" }
+revolt-models = { version = "0.8.3", path = "../models", features = [
     "validator",
 ] }
-revolt-presence = { version = "0.8.2", path = "../presence" }
-revolt-permissions = { version = "0.8.2", path = "../permissions", features = [
+revolt-presence = { version = "0.8.3", path = "../presence" }
+revolt-permissions = { version = "0.8.3", path = "../permissions", features = [
     "serde",
     "bson",
 ] }
diff --git a/crates/core/files/Cargo.toml b/crates/core/files/Cargo.toml
index de7d2d175..c6b27e755 100644
--- a/crates/core/files/Cargo.toml
+++ b/crates/core/files/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "revolt-files"
-version = "0.8.2"
+version = "0.8.3"
 edition = "2021"
 license = "AGPL-3.0-or-later"
 authors = ["Paul Makles <me@insrt.uk>"]
@@ -20,10 +20,10 @@ typenum = "1.17.0"
 aws-config = "1.5.5"
 aws-sdk-s3 = { version = "1.46.0", features = ["behavior-version-latest"] }
 
-revolt-config = { version = "0.8.2", path = "../config", features = [
+revolt-config = { version = "0.8.3", path = "../config", features = [
     "report-macros",
 ] }
-revolt-result = { version = "0.8.2", path = "../result" }
+revolt-result = { version = "0.8.3", path = "../result" }
 
 # image processing
 jxl-oxide = "0.8.1"
diff --git a/crates/core/models/Cargo.toml b/crates/core/models/Cargo.toml
index 4d0c7fa6d..63cf8b94d 100644
--- a/crates/core/models/Cargo.toml
+++ b/crates/core/models/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "revolt-models"
-version = "0.8.2"
+version = "0.8.3"
 edition = "2021"
 license = "MIT"
 authors = ["Paul Makles <me@insrt.uk>"]
@@ -20,8 +20,8 @@ default = ["serde", "partials", "rocket"]
 
 [dependencies]
 # Core
-revolt-config = { version = "0.8.2", path = "../config" }
-revolt-permissions = { version = "0.8.2", path = "../permissions" }
+revolt-config = { version = "0.8.3", path = "../config" }
+revolt-permissions = { version = "0.8.3", path = "../permissions" }
 
 # Utility
 regex = "1"
diff --git a/crates/core/permissions/Cargo.toml b/crates/core/permissions/Cargo.toml
index daf61e8d9..423d1cad2 100644
--- a/crates/core/permissions/Cargo.toml
+++ b/crates/core/permissions/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "revolt-permissions"
-version = "0.8.2"
+version = "0.8.3"
 edition = "2021"
 license = "MIT"
 authors = ["Paul Makles <me@insrt.uk>"]
@@ -21,7 +21,7 @@ async-std = { version = "1.8.0", features = ["attributes"] }
 
 [dependencies]
 # Core
-revolt-result = { version = "0.8.2", path = "../result" }
+revolt-result = { version = "0.8.3", path = "../result" }
 
 # Utility
 auto_ops = "0.3.0"
diff --git a/crates/core/presence/Cargo.toml b/crates/core/presence/Cargo.toml
index 7df7c7026..81d5813a6 100644
--- a/crates/core/presence/Cargo.toml
+++ b/crates/core/presence/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "revolt-presence"
-version = "0.8.2"
+version = "0.8.3"
 edition = "2021"
 license = "AGPL-3.0-or-later"
 authors = ["Paul Makles <me@insrt.uk>"]
diff --git a/crates/core/result/Cargo.toml b/crates/core/result/Cargo.toml
index 8e057ba6e..35dedcaac 100644
--- a/crates/core/result/Cargo.toml
+++ b/crates/core/result/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "revolt-result"
-version = "0.8.2"
+version = "0.8.3"
 edition = "2021"
 license = "MIT"
 authors = ["Paul Makles <me@insrt.uk>"]
diff --git a/crates/daemons/crond/Cargo.toml b/crates/daemons/crond/Cargo.toml
index bd5d3f3b2..a3f09ce2f 100644
--- a/crates/daemons/crond/Cargo.toml
+++ b/crates/daemons/crond/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "revolt-crond"
-version = "0.8.2"
+version = "0.8.3"
 license = "AGPL-3.0-or-later"
 authors = ["Paul Makles <me@insrt.uk>"]
 edition = "2021"
@@ -16,7 +16,7 @@ log = "0.4"
 tokio = { version = "1" }
 
 # Core
-revolt-database = { version = "0.8.2", path = "../../core/database" }
-revolt-result = { version = "0.8.2", path = "../../core/result" }
-revolt-config = { version = "0.8.2", path = "../../core/config" }
-revolt-files = { version = "0.8.2", path = "../../core/files" }
+revolt-database = { version = "0.8.3", path = "../../core/database" }
+revolt-result = { version = "0.8.3", path = "../../core/result" }
+revolt-config = { version = "0.8.3", path = "../../core/config" }
+revolt-files = { version = "0.8.3", path = "../../core/files" }
diff --git a/crates/daemons/pushd/Cargo.toml b/crates/daemons/pushd/Cargo.toml
index be0e3cc5d..eb608825a 100644
--- a/crates/daemons/pushd/Cargo.toml
+++ b/crates/daemons/pushd/Cargo.toml
@@ -1,13 +1,13 @@
 [package]
 name = "revolt-pushd"
-version = "0.8.2"
+version = "0.8.3"
 edition = "2021"
 license = "AGPL-3.0-or-later"
 
 [dependencies]
-revolt-config = { version = "0.8.2", path = "../../core/config" }
-revolt-database = { version = "0.8.2", path = "../../core/database" }
-revolt-models = { version = "0.8.2", path = "../../core/models", features = [
+revolt-config = { version = "0.8.3", path = "../../core/config" }
+revolt-database = { version = "0.8.3", path = "../../core/database" }
+revolt-models = { version = "0.8.3", path = "../../core/models", features = [
     "validator",
 ] }
 
diff --git a/crates/delta/Cargo.toml b/crates/delta/Cargo.toml
index 9797a5f0c..7fdfa0106 100644
--- a/crates/delta/Cargo.toml
+++ b/crates/delta/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "revolt-delta"
-version = "0.8.2"
+version = "0.8.3"
 license = "AGPL-3.0-or-later"
 authors = ["Paul Makles <paulmakles@gmail.com>"]
 edition = "2018"
diff --git a/crates/services/autumn/Cargo.toml b/crates/services/autumn/Cargo.toml
index 4b944f553..1480fc19b 100644
--- a/crates/services/autumn/Cargo.toml
+++ b/crates/services/autumn/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "revolt-autumn"
-version = "0.8.2"
+version = "0.8.3"
 edition = "2021"
 license = "AGPL-3.0-or-later"
 
@@ -43,12 +43,12 @@ tracing = "0.1"
 tracing-subscriber = { version = "0.3", features = ["env-filter"] }
 
 # Core crates
-revolt-files = { version = "0.8.2", path = "../../core/files" }
-revolt-config = { version = "0.8.2", path = "../../core/config" }
-revolt-database = { version = "0.8.2", path = "../../core/database", features = [
+revolt-files = { version = "0.8.3", path = "../../core/files" }
+revolt-config = { version = "0.8.3", path = "../../core/config" }
+revolt-database = { version = "0.8.3", path = "../../core/database", features = [
     "axum-impl",
 ] }
-revolt-result = { version = "0.8.2", path = "../../core/result", features = [
+revolt-result = { version = "0.8.3", path = "../../core/result", features = [
     "utoipa",
     "axum",
 ] }
diff --git a/crates/services/january/Cargo.toml b/crates/services/january/Cargo.toml
index a053d11a9..15446704b 100644
--- a/crates/services/january/Cargo.toml
+++ b/crates/services/january/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "revolt-january"
-version = "0.8.2"
+version = "0.8.3"
 edition = "2021"
 license = "AGPL-3.0-or-later"
 
@@ -32,13 +32,13 @@ tracing = "0.1"
 tracing-subscriber = { version = "0.3", features = ["env-filter"] }
 
 # Core crates
-revolt-config = { version = "0.8.2", path = "../../core/config" }
-revolt-models = { version = "0.8.2", path = "../../core/models" }
-revolt-result = { version = "0.8.2", path = "../../core/result", features = [
+revolt-config = { version = "0.8.3", path = "../../core/config" }
+revolt-models = { version = "0.8.3", path = "../../core/models" }
+revolt-result = { version = "0.8.3", path = "../../core/result", features = [
     "utoipa",
     "axum",
 ] }
-revolt-files = { version = "0.8.2", path = "../../core/files" }
+revolt-files = { version = "0.8.3", path = "../../core/files" }
 
 # Axum / web server
 axum = { version = "0.7.5" }

From a671ba6308bec603a8cfce400dab1e5020ba5cce Mon Sep 17 00:00:00 2001
From: Paul Makles <me@insrt.uk>
Date: Tue, 25 Feb 2025 11:08:00 +0000
Subject: [PATCH 39/62] fix: don't bump the lockfile version

---
 Cargo.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Cargo.lock b/Cargo.lock
index da64ff4bf..55fa2ff2e 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1,6 +1,6 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
-version = 4
+version = 3
 
 [[package]]
 name = "addr2line"

From 7abbad700cfef3eb08e8dadbd145eaadca9dd203 Mon Sep 17 00:00:00 2001
From: Paul Makles <me@insrt.uk>
Date: Tue, 25 Feb 2025 14:24:05 +0000
Subject: [PATCH 40/62] fix: include `production` default value for config

---
 crates/core/config/Revolt.toml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/crates/core/config/Revolt.toml b/crates/core/config/Revolt.toml
index 442daf027..cd59ecf29 100644
--- a/crates/core/config/Revolt.toml
+++ b/crates/core/config/Revolt.toml
@@ -1,3 +1,5 @@
+production = false
+
 [database]
 # MongoDB connection URL
 # Defaults to the container name specified in self-hosted

From bfc6f50ee5006c1087728039a292e2a5897b4cd2 Mon Sep 17 00:00:00 2001
From: IAmTomahawkx <iamtomahawkx@gmail.com>
Date: Sun, 9 Mar 2025 21:40:21 -0700
Subject: [PATCH 41/62] chore: ignore python venv and dev script for user
 generation

Signed-off-by: IAmTomahawkx <iamtomahawkx@gmail.com>
---
 .gitignore                            |  2 +
 scripts/generate-shitload-of-users.py | 93 +++++++++++++++++++++++++++
 2 files changed, 95 insertions(+)
 create mode 100644 scripts/generate-shitload-of-users.py

diff --git a/.gitignore b/.gitignore
index 4bbb168a2..1e8bce961 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,6 +5,8 @@ compose.override.yml
 target
 .data
 .env
+.venv/
+venv/
 
 .vercel
 .DS_Store
diff --git a/scripts/generate-shitload-of-users.py b/scripts/generate-shitload-of-users.py
new file mode 100644
index 000000000..607475ff3
--- /dev/null
+++ b/scripts/generate-shitload-of-users.py
@@ -0,0 +1,93 @@
+# a test script that generates a ton of users for debugging use
+# note that you'll need to comment out the ratelimiter in delta/src/main.rs
+# and keep the number relatively low or requests will time out (the beefier the machine the more you can handle).
+# this script assumes mailhog is running, and uses that to automate "emails".
+
+# In the real world, antispam will catch this and nuke you to hell and back.
+# But it works fine in a dev env!
+
+# requires httpx
+import asyncio
+import os
+import re
+import uuid
+
+import httpx
+
+API_URL: str = os.getenv("API_URL") # type: ignore
+MAILHOG_API: str = os.getenv("MAILHOG_API") # type: ignore
+COUNT = int(os.getenv("COUNT")) # type: ignore # cbf to deal with type checking
+INVITE: str = os.getenv("INVITE") # type: ignore
+
+assert API_URL and MAILHOG_API and COUNT and INVITE
+
+API_URL = API_URL.strip("/")
+MAILHOG_API = MAILHOG_API.strip("/")
+
+async def filter_hog(client: httpx.AsyncClient, email: str) -> str:
+    """
+    returns the token provided by the mail server.
+    This script assumes the use of mailhog.
+    """
+
+    resp = await client.get(MAILHOG_API + "/api/v2/search", params={"kind": "to", "query": email}, follow_redirects=True, timeout=60)
+    if resp.status_code != 200:
+        raise Exception(resp.status_code, resp.content)
+    
+    data = resp.json()
+    if not data["items"]:
+        raise Exception("No message found")
+    
+    message_id = data["items"][0]["ID"]
+    body = data["items"][0]["Content"]["Body"].replace("\r", "")
+    token = re.search("/login/verify(=\n/|/\n=|/=\n)(?P<token>[^\n]+)", body, re.MULTILINE)
+    if not token:
+        raise Exception("No token found")
+    
+    ret = token.group("token")
+
+    await client.delete(MAILHOG_API + f"/api/v1/messages/{message_id}", timeout=60)
+    return ret
+
+
+async def task() -> None:
+    _id = str(uuid.uuid4())[:4]
+    email = f"{_id}@example.com"
+
+    async with httpx.AsyncClient() as client:
+        resp = await client.post(API_URL + "/auth/account/create", json={"email": email, "password": _id*3, "invite": INVITE}, timeout=60)
+        if resp.status_code != 204:
+            raise Exception(resp.status_code, resp.content)
+
+        token = await filter_hog(client, email)
+
+        resp = await client.post(API_URL + f"/auth/account/verify/{token}", timeout=60)
+        if resp.status_code != 200:
+            raise Exception("verify", resp.status_code, resp.content)
+        
+        ticket = resp.json()["ticket"]
+        userid = ticket["_id"]
+        
+        resp = await client.post(API_URL + "/auth/session/login", json={"email": email, "password": _id*3, "friendly_name": "Not A Client"}, timeout=60)
+        if resp.status_code != 200:
+            raise Exception("session", resp.status_code, resp.content)
+        
+        session = resp.json()
+        token = session["token"]
+        
+        resp = await client.post(API_URL + "/onboard/complete", json={"username": _id}, headers={"x-session-token": token}, timeout=60) # complete onboarding to allow creating a session
+        if resp.status_code != 200:
+            raise Exception("onboard", resp.status_code, resp.content)
+        
+        resp = await client.post(API_URL + f"/invites/{INVITE}", headers={"x-session-token": token}, timeout=60)
+        if resp.status_code != 200:
+            raise Exception("invite", resp.status_code, resp.content)
+        
+        print(f"Created account and session for {email} with ID: {userid}")
+        return userid
+
+async def main():
+    tasks = [asyncio.create_task(task()) for _ in range(COUNT)]
+    print(await asyncio.gather(*tasks))
+
+asyncio.run(main())
\ No newline at end of file

From 6f0e80eef9413a75d168f64d71db2dbd82e394af Mon Sep 17 00:00:00 2001
From: phazeschift <51278042+phazeschift@users.noreply.github.com>
Date: Fri, 14 Mar 2025 16:52:02 -0700
Subject: [PATCH 42/62] test: Add tests for invite/fetch

Signed-off-by: phazeschift <51278042+phazeschift@users.noreply.github.com>
---
 .../delta/src/routes/invites/invite_fetch.rs  | 185 ++++++++++++++++++
 1 file changed, 185 insertions(+)

diff --git a/crates/delta/src/routes/invites/invite_fetch.rs b/crates/delta/src/routes/invites/invite_fetch.rs
index edf547446..175fc944c 100644
--- a/crates/delta/src/routes/invites/invite_fetch.rs
+++ b/crates/delta/src/routes/invites/invite_fetch.rs
@@ -69,3 +69,188 @@ pub async fn fetch(db: &State<Database>, target: Reference) -> Result<Json<v0::I
         }
     }))
 }
+
+#[cfg(test)]
+mod test {
+    use crate::{rocket, util::test::TestHarness};
+    use revolt_database::{Channel, Server};
+    use revolt_models::v0::{
+        DataCreateGroup, DataCreateServer, DataCreateServerChannel, Invite, InviteResponse,
+        LegacyServerChannelType,
+    };
+    use rocket::http::{Header, Status};
+
+    #[rocket::async_test]
+    async fn success_fetch_group_invite() {
+        let harness = TestHarness::new().await;
+        let (_, session, user) = harness.new_user().await;
+
+        let group = Channel::create_group(
+            &harness.db,
+            DataCreateGroup {
+                ..Default::default()
+            },
+            user.id.clone(),
+        )
+        .await
+        .expect("`Channel`");
+        let create_response = harness
+            .client
+            .post(format!("/channels/{}/invites", group.id()))
+            .header(Header::new("x-session-token", session.token.to_string()))
+            .dispatch()
+            .await;
+        assert_eq!(create_response.status(), Status::Ok);
+        let invite_from_create: Invite = create_response.into_json().await.expect("`Invite`");
+        let invite_code = match invite_from_create {
+            Invite::Group { code, .. } => code,
+            _ => unreachable!(),
+        };
+        let response = harness
+            .client
+            .get(format!("/invites/{}", invite_code))
+            .dispatch()
+            .await;
+        assert_eq!(response.status(), Status::Ok);
+        let invite_response: InviteResponse = response.into_json().await.expect("`FetchInvite`");
+        match invite_response {
+            InviteResponse::Group {
+                code,
+                channel_id,
+                user_name,
+                ..
+            } => {
+                assert_eq!(code, invite_code);
+                assert_eq!(channel_id, group.id());
+                assert_eq!(user_name, user.username);
+            }
+            _ => unreachable!(),
+        }
+    }
+
+    #[rocket::async_test]
+    async fn fail_fetch_missing_invite() {
+        let harness = TestHarness::new().await;
+        let response = harness
+            .client
+            .get(format!("/invites/{}", TestHarness::rand_string()))
+            .dispatch()
+            .await;
+        assert_eq!(response.status(), Status::NotFound);
+    }
+
+    #[rocket::async_test]
+    async fn success_fetch_text_channel_invite() {
+        let harness = TestHarness::new().await;
+        let (_, session, user) = harness.new_user().await;
+        let (_, channels) = Server::create(
+            &harness.db,
+            DataCreateServer {
+                name: "Test Server".to_string(),
+                ..Default::default()
+            },
+            &user,
+            true,
+        )
+        .await
+        .expect("Failed to create test server");
+
+        let channel = channels.first().expect("Server Channel");
+        let create_response = harness
+            .client
+            .post(format!("/channels/{}/invites", channel.id()))
+            .header(Header::new("x-session-token", session.token.to_string()))
+            .dispatch()
+            .await;
+        assert_eq!(create_response.status(), Status::Ok);
+        let invite_from_create: Invite = create_response.into_json().await.expect("`Invite`");
+        let invite_code = match invite_from_create {
+            Invite::Server { code, .. } => code,
+            _ => unreachable!(),
+        };
+        let response = harness
+            .client
+            .get(format!("/invites/{}", invite_code))
+            .dispatch()
+            .await;
+        assert_eq!(response.status(), Status::Ok);
+        let invite_response: InviteResponse = response.into_json().await.expect("`FetchInvite`");
+        match invite_response {
+            InviteResponse::Server {
+                code,
+                channel_id,
+                user_name,
+                ..
+            } => {
+                assert_eq!(code, invite_code);
+                assert_eq!(channel_id, channel.id());
+                assert_eq!(user_name, user.username);
+            }
+            _ => unreachable!(),
+        };
+    }
+
+    #[rocket::async_test]
+    async fn success_fetch_voice_channel_invite() {
+        let harness = TestHarness::new().await;
+        let (_, session, user) = harness.new_user().await;
+        let (server, _) = Server::create(
+            &harness.db,
+            DataCreateServer {
+                name: "Test Server".to_string(),
+                ..Default::default()
+            },
+            &user,
+            true,
+        )
+        .await
+        .expect("Failed to create test server");
+        let server_mut: &mut Server = &mut server.clone();
+
+        let channel = Channel::create_server_channel(
+            &harness.db,
+            server_mut,
+            DataCreateServerChannel {
+                channel_type: LegacyServerChannelType::Voice,
+                name: "Voice Channel".to_string(),
+                description: None,
+                nsfw: Some(false),
+            },
+            true,
+        )
+        .await
+        .expect("Failed to make new channel");
+        let create_response = harness
+            .client
+            .post(format!("/channels/{}/invites", channel.id()))
+            .header(Header::new("x-session-token", session.token.to_string()))
+            .dispatch()
+            .await;
+        assert_eq!(create_response.status(), Status::Ok);
+        let invite_from_create: Invite = create_response.into_json().await.expect("`Invite`");
+        let invite_code = match invite_from_create {
+            Invite::Server { code, .. } => code,
+            _ => unreachable!(),
+        };
+        let response = harness
+            .client
+            .get(format!("/invites/{}", invite_code))
+            .dispatch()
+            .await;
+        assert_eq!(response.status(), Status::Ok);
+        let invite_response: InviteResponse = response.into_json().await.expect("`FetchInvite`");
+        match invite_response {
+            InviteResponse::Server {
+                code,
+                channel_id,
+                user_name,
+                ..
+            } => {
+                assert_eq!(code, invite_code);
+                assert_eq!(channel_id, channel.id());
+                assert_eq!(user_name, user.username);
+            }
+            _ => unreachable!(),
+        };
+    }
+}

From 6737100b4b91d4dc286494f14e1a986d5b8146a0 Mon Sep 17 00:00:00 2001
From: phazeschift <51278042+phazeschift@users.noreply.github.com>
Date: Sat, 15 Mar 2025 18:47:04 -0700
Subject: [PATCH 43/62] test: add utilities for common setup

Signed-off-by: phazeschift <51278042+phazeschift@users.noreply.github.com>
---
 .../delta/src/routes/invites/invite_fetch.rs  | 69 +++++++------------
 crates/delta/src/util/test.rs                 | 69 ++++++++++++++++++-
 2 files changed, 92 insertions(+), 46 deletions(-)

diff --git a/crates/delta/src/routes/invites/invite_fetch.rs b/crates/delta/src/routes/invites/invite_fetch.rs
index 175fc944c..fb89fd3b7 100644
--- a/crates/delta/src/routes/invites/invite_fetch.rs
+++ b/crates/delta/src/routes/invites/invite_fetch.rs
@@ -75,10 +75,9 @@ mod test {
     use crate::{rocket, util::test::TestHarness};
     use revolt_database::{Channel, Server};
     use revolt_models::v0::{
-        DataCreateGroup, DataCreateServer, DataCreateServerChannel, Invite, InviteResponse,
-        LegacyServerChannelType,
+        DataCreateGroup, DataCreateServerChannel, Invite, InviteResponse, LegacyServerChannelType,
     };
-    use rocket::http::{Header, Status};
+    use rocket::http::Status;
 
     #[rocket::async_test]
     async fn success_fetch_group_invite() {
@@ -94,12 +93,13 @@ mod test {
         )
         .await
         .expect("`Channel`");
-        let create_response = harness
-            .client
-            .post(format!("/channels/{}/invites", group.id()))
-            .header(Header::new("x-session-token", session.token.to_string()))
-            .dispatch()
-            .await;
+        let create_response = TestHarness::with_session(
+            session,
+            harness
+                .client
+                .post(format!("/channels/{}/invites", group.id())),
+        )
+        .await;
         assert_eq!(create_response.status(), Status::Ok);
         let invite_from_create: Invite = create_response.into_json().await.expect("`Invite`");
         let invite_code = match invite_from_create {
@@ -143,25 +143,15 @@ mod test {
     async fn success_fetch_text_channel_invite() {
         let harness = TestHarness::new().await;
         let (_, session, user) = harness.new_user().await;
-        let (_, channels) = Server::create(
-            &harness.db,
-            DataCreateServer {
-                name: "Test Server".to_string(),
-                ..Default::default()
-            },
-            &user,
-            true,
-        )
-        .await
-        .expect("Failed to create test server");
-
+        let (_, channels) = harness.new_server(&user).await;
         let channel = channels.first().expect("Server Channel");
-        let create_response = harness
-            .client
-            .post(format!("/channels/{}/invites", channel.id()))
-            .header(Header::new("x-session-token", session.token.to_string()))
-            .dispatch()
-            .await;
+        let create_response = TestHarness::with_session(
+            session,
+            harness
+                .client
+                .post(format!("/channels/{}/invites", channel.id())),
+        )
+        .await;
         assert_eq!(create_response.status(), Status::Ok);
         let invite_from_create: Invite = create_response.into_json().await.expect("`Invite`");
         let invite_code = match invite_from_create {
@@ -194,17 +184,7 @@ mod test {
     async fn success_fetch_voice_channel_invite() {
         let harness = TestHarness::new().await;
         let (_, session, user) = harness.new_user().await;
-        let (server, _) = Server::create(
-            &harness.db,
-            DataCreateServer {
-                name: "Test Server".to_string(),
-                ..Default::default()
-            },
-            &user,
-            true,
-        )
-        .await
-        .expect("Failed to create test server");
+        let (server, _) = harness.new_server(&user).await;
         let server_mut: &mut Server = &mut server.clone();
 
         let channel = Channel::create_server_channel(
@@ -220,12 +200,13 @@ mod test {
         )
         .await
         .expect("Failed to make new channel");
-        let create_response = harness
-            .client
-            .post(format!("/channels/{}/invites", channel.id()))
-            .header(Header::new("x-session-token", session.token.to_string()))
-            .dispatch()
-            .await;
+        let create_response = TestHarness::with_session(
+            session,
+            harness
+                .client
+                .post(format!("/channels/{}/invites", channel.id())),
+        )
+        .await;
         assert_eq!(create_response.status(), Status::Ok);
         let invite_from_create: Invite = create_response.into_json().await.expect("`Invite`");
         let invite_code = match invite_from_create {
diff --git a/crates/delta/src/util/test.rs b/crates/delta/src/util/test.rs
index 4beee9ec3..3de142811 100644
--- a/crates/delta/src/util/test.rs
+++ b/crates/delta/src/util/test.rs
@@ -5,9 +5,13 @@ use authifier::{
 use futures::StreamExt;
 use rand::Rng;
 use redis_kiss::redis::aio::PubSub;
-use revolt_database::{events::client::EventV1, Database, User, AMQP};
+use revolt_database::util::idempotency::IdempotencyKey;
+use revolt_database::{
+    events::client::EventV1, Channel, Database, Member, Message, Server, User, AMQP,
+};
 use revolt_models::v0;
-use rocket::local::asynchronous::Client;
+use rocket::http::Header;
+use rocket::local::asynchronous::{Client, LocalRequest, LocalResponse};
 
 pub struct TestHarness {
     pub client: Client,
@@ -104,6 +108,67 @@ impl TestHarness {
         (account, session, user)
     }
 
+    pub async fn new_server(&self, user: &User) -> (Server, Vec<Channel>) {
+        Server::create(
+            &self.db,
+            v0::DataCreateServer {
+                name: "Test Server".to_string(),
+                ..Default::default()
+            },
+            user,
+            true,
+        )
+        .await
+        .expect("Failed to create test server")
+    }
+
+    pub async fn new_message(
+        &self,
+        user: &User,
+        server: &Server,
+        channels: Vec<Channel>,
+    ) -> (Channel, Member, Message) {
+        let (member, channels) = Member::create(&self.db, server, user, Some(channels))
+            .await
+            .expect("Failed to create member");
+        let channel = &channels[0];
+        let message = Message::create_from_api(
+            &self.db,
+            None,
+            channel.clone(),
+            v0::DataMessageSend {
+                content: Some("Test message".to_string()),
+                nonce: None,
+                attachments: None,
+                replies: None,
+                embeds: None,
+                masquerade: None,
+                interactions: None,
+                flags: None,
+            },
+            v0::MessageAuthor::User(&user.clone().into(&self.db, Some(user)).await),
+            Some(user.clone().into(&self.db, Some(user)).await),
+            Some(member.clone().into()),
+            user.limits().await,
+            IdempotencyKey::unchecked_from_string("0".to_string()),
+            false,
+            false,
+        )
+        .await
+        .expect("Failed to create message");
+        (channel.clone(), member, message)
+    }
+
+    pub async fn with_session<'c>(
+        session: Session,
+        request: LocalRequest<'c>,
+    ) -> LocalResponse<'c> {
+        request
+            .header(Header::new("x-session-token", session.token.to_string()))
+            .dispatch()
+            .await
+    }
+
     pub async fn wait_for_event<F>(&mut self, topic: &str, predicate: F) -> EventV1
     where
         F: Fn(&EventV1) -> bool,

From c1c5b0fd298093617f42f8271fa9d0a844859c28 Mon Sep 17 00:00:00 2001
From: phazeschift <51278042+phazeschift@users.noreply.github.com>
Date: Sun, 16 Mar 2025 14:15:45 -0700
Subject: [PATCH 44/62] test: add delete server channel test

Signed-off-by: phazeschift <51278042+phazeschift@users.noreply.github.com>
---
 .../src/routes/channels/channel_delete.rs     | 23 ++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/crates/delta/src/routes/channels/channel_delete.rs b/crates/delta/src/routes/channels/channel_delete.rs
index ebb589b79..2c7008e0c 100644
--- a/crates/delta/src/routes/channels/channel_delete.rs
+++ b/crates/delta/src/routes/channels/channel_delete.rs
@@ -109,5 +109,26 @@ mod test {
     // TEST: member leaves group (no delete)
     // TEST: no effect with saved messages
     // TEST: DM set to inactive
-    // TEST: server channel deleted
+
+    #[rocket::async_test]
+    async fn success_delete_channel() {
+        let mut harness = TestHarness::new().await;
+        let (_, session, user) = harness.new_user().await;
+        let (_, channels) = harness.new_server(&user).await;
+        let response = TestHarness::with_session(
+            session,
+            harness
+                .client
+                .delete(format!("/channels/{}", channels[0].id())),
+        )
+        .await;
+        assert_eq!(response.status(), Status::NoContent);
+        drop(response);
+        harness
+            .wait_for_event(channels[0].id(), |event| match event {
+                EventV1::ChannelDelete { id, .. } => id == channels[0].id(),
+                _ => false,
+            })
+            .await;
+    }
 }

From 5fe19d98154e20a3f2905ab1027de1a99a54374f Mon Sep 17 00:00:00 2001
From: Nils Ponsard <nilsponsard@gmail.com>
Date: Wed, 5 Mar 2025 19:23:11 +0100
Subject: [PATCH 45/62] feat: allow to set an icon when creating a group

Signed-off-by: Nils Ponsard <nilsponsard@gmail.com>
---
 crates/core/database/src/models/channels/model.rs | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/crates/core/database/src/models/channels/model.rs b/crates/core/database/src/models/channels/model.rs
index 6aa55be83..797da5afd 100644
--- a/crates/core/database/src/models/channels/model.rs
+++ b/crates/core/database/src/models/channels/model.rs
@@ -279,16 +279,24 @@ impl Channel {
             }));
         }
 
+        let id = ulid::Ulid::new().to_string();
+
+        let icon = if let Some(icon_id) = data.icon {
+            Some(File::use_channel_icon(db, &icon_id, &id, &owner_id).await?)
+        } else {
+            None
+        };
+
         let recipients = data.users.into_iter().collect::<Vec<String>>();
         let channel = Channel::Group {
-            id: ulid::Ulid::new().to_string(),
+            id,
 
             name: data.name,
             owner: owner_id,
             description: data.description,
             recipients: recipients.clone(),
 
-            icon: None,
+            icon,
             last_message_id: None,
 
             permissions: None,

From 9c3b2fb3648f6d345fa7b58e27522b3e747af310 Mon Sep 17 00:00:00 2001
From: Bradlee Barnes <69256931+StupidRepo@users.noreply.github.com>
Date: Fri, 7 Mar 2025 22:39:04 +0000
Subject: [PATCH 46/62] fix: allow message pinning and unpinning for DM-like
 channels

Signed-off-by: Bradlee Barnes <69256931+StupidRepo@users.noreply.github.com>
---
 crates/delta/src/routes/channels/message_pin.rs   | 15 +++++++--------
 crates/delta/src/routes/channels/message_unpin.rs | 15 +++++++--------
 2 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/crates/delta/src/routes/channels/message_pin.rs b/crates/delta/src/routes/channels/message_pin.rs
index d8df7febd..933ff16d0 100644
--- a/crates/delta/src/routes/channels/message_pin.rs
+++ b/crates/delta/src/routes/channels/message_pin.rs
@@ -1,7 +1,4 @@
-use revolt_database::{
-    util::{permissions::DatabasePermissionQuery, reference::Reference},
-    Database, PartialMessage, SystemMessage, User, AMQP,
-};
+use revolt_database::{util::{permissions::DatabasePermissionQuery, reference::Reference}, Channel, Database, PartialMessage, SystemMessage, User, AMQP};
 use revolt_models::v0::MessageAuthor;
 use revolt_permissions::{calculate_channel_permissions, ChannelPermission};
 use revolt_result::{create_error, Result};
@@ -22,10 +19,12 @@ pub async fn message_pin(
 ) -> Result<EmptyResponse> {
     let channel = target.as_channel(db).await?;
 
-    let mut query = DatabasePermissionQuery::new(db, &user).channel(&channel);
-    calculate_channel_permissions(&mut query)
-        .await
-        .throw_if_lacking_channel_permission(ChannelPermission::ManageMessages)?;
+    if !matches!(channel, Channel::DirectMessage { .. } | Channel::Group { .. } | Channel::SavedMessages { .. }) {
+        let mut query = DatabasePermissionQuery::new(db, &user).channel(&channel);
+        calculate_channel_permissions(&mut query)
+            .await
+            .throw_if_lacking_channel_permission(ChannelPermission::ManageMessages)?;
+    }
 
     let mut message = msg.as_message_in_channel(db, channel.id()).await?;
 
diff --git a/crates/delta/src/routes/channels/message_unpin.rs b/crates/delta/src/routes/channels/message_unpin.rs
index 67154842d..356bf2ea9 100644
--- a/crates/delta/src/routes/channels/message_unpin.rs
+++ b/crates/delta/src/routes/channels/message_unpin.rs
@@ -1,7 +1,4 @@
-use revolt_database::{
-    util::{permissions::DatabasePermissionQuery, reference::Reference},
-    Database, FieldsMessage, PartialMessage, SystemMessage, User, AMQP,
-};
+use revolt_database::{util::{permissions::DatabasePermissionQuery, reference::Reference}, Channel, Database, FieldsMessage, PartialMessage, SystemMessage, User, AMQP};
 use revolt_models::v0::MessageAuthor;
 use revolt_permissions::{calculate_channel_permissions, ChannelPermission};
 use revolt_result::{create_error, Result};
@@ -22,10 +19,12 @@ pub async fn message_unpin(
 ) -> Result<EmptyResponse> {
     let channel = target.as_channel(db).await?;
 
-    let mut query = DatabasePermissionQuery::new(db, &user).channel(&channel);
-    calculate_channel_permissions(&mut query)
-        .await
-        .throw_if_lacking_channel_permission(ChannelPermission::ManageMessages)?;
+    if !matches!(channel, Channel::DirectMessage { .. } | Channel::Group { .. } | Channel::SavedMessages { .. }) {
+        let mut query = DatabasePermissionQuery::new(db, &user).channel(&channel);
+        calculate_channel_permissions(&mut query)
+            .await
+            .throw_if_lacking_channel_permission(ChannelPermission::ManageMessages)?;
+    }
 
     let mut message = msg.as_message_in_channel(db, channel.id()).await?;
 

From 773b890012d1304f5ae8ee11d2be488deb821864 Mon Sep 17 00:00:00 2001
From: Bradlee Barnes <69256931+StupidRepo@users.noreply.github.com>
Date: Sat, 8 Mar 2025 00:50:57 +0000
Subject: [PATCH 47/62] fix: remove SavedMessages and Group due to given
 permissions

Signed-off-by: Bradlee Barnes <69256931+StupidRepo@users.noreply.github.com>
---
 crates/delta/src/routes/channels/message_pin.rs   | 2 +-
 crates/delta/src/routes/channels/message_unpin.rs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/crates/delta/src/routes/channels/message_pin.rs b/crates/delta/src/routes/channels/message_pin.rs
index 933ff16d0..8078d35b0 100644
--- a/crates/delta/src/routes/channels/message_pin.rs
+++ b/crates/delta/src/routes/channels/message_pin.rs
@@ -19,7 +19,7 @@ pub async fn message_pin(
 ) -> Result<EmptyResponse> {
     let channel = target.as_channel(db).await?;
 
-    if !matches!(channel, Channel::DirectMessage { .. } | Channel::Group { .. } | Channel::SavedMessages { .. }) {
+    if !matches!(channel, Channel::DirectMessage { .. }) {
         let mut query = DatabasePermissionQuery::new(db, &user).channel(&channel);
         calculate_channel_permissions(&mut query)
             .await
diff --git a/crates/delta/src/routes/channels/message_unpin.rs b/crates/delta/src/routes/channels/message_unpin.rs
index 356bf2ea9..7fe5fba93 100644
--- a/crates/delta/src/routes/channels/message_unpin.rs
+++ b/crates/delta/src/routes/channels/message_unpin.rs
@@ -19,7 +19,7 @@ pub async fn message_unpin(
 ) -> Result<EmptyResponse> {
     let channel = target.as_channel(db).await?;
 
-    if !matches!(channel, Channel::DirectMessage { .. } | Channel::Group { .. } | Channel::SavedMessages { .. }) {
+    if !matches!(channel, Channel::DirectMessage { .. }) {
         let mut query = DatabasePermissionQuery::new(db, &user).channel(&channel);
         calculate_channel_permissions(&mut query)
             .await

From 62204fe50bd5f4db9d399a43ea2136296169becc Mon Sep 17 00:00:00 2001
From: Builderb <builderbgamer@gmail.com>
Date: Wed, 2 Apr 2025 12:05:04 +0100
Subject: [PATCH 48/62] feat: allow bots to manage emojis (#407)

* Remove bot check on emoji create

Signed-off-by: Builderb <builderbgamer@gmail.com>

* Remove bot check on emoji delete

Signed-off-by: Builderb <builderbgamer@gmail.com>

---------

Signed-off-by: Builderb <builderbgamer@gmail.com>
---
 crates/delta/src/routes/customisation/emoji_create.rs | 5 -----
 crates/delta/src/routes/customisation/emoji_delete.rs | 4 ----
 2 files changed, 9 deletions(-)

diff --git a/crates/delta/src/routes/customisation/emoji_create.rs b/crates/delta/src/routes/customisation/emoji_create.rs
index 323d42fd8..d8288dae7 100644
--- a/crates/delta/src/routes/customisation/emoji_create.rs
+++ b/crates/delta/src/routes/customisation/emoji_create.rs
@@ -27,11 +27,6 @@ pub async fn create_emoji(
         })
     })?;
 
-    // Bots cannot manage emojis
-    if user.bot.is_some() {
-        return Err(create_error!(IsBot));
-    }
-
     // Validate we have permission to write into parent
     match &data.parent {
         v0::EmojiParent::Server { id } => {
diff --git a/crates/delta/src/routes/customisation/emoji_delete.rs b/crates/delta/src/routes/customisation/emoji_delete.rs
index ad647e5b7..53cbb8371 100644
--- a/crates/delta/src/routes/customisation/emoji_delete.rs
+++ b/crates/delta/src/routes/customisation/emoji_delete.rs
@@ -18,10 +18,6 @@ pub async fn delete_emoji(
     user: User,
     emoji_id: Reference,
 ) -> Result<EmptyResponse> {
-    // Bots cannot manage emoji
-    if user.bot.is_some() {
-        return Err(create_error!(IsBot));
-    }
 
     // Fetch the emoji
     let emoji = emoji_id.as_emoji(db).await?;

From 2f3d1f0c7ec8ab000fd807b586118179ad010845 Mon Sep 17 00:00:00 2001
From: ShaksterNano <54268387+shaksternano@users.noreply.github.com>
Date: Mon, 31 Mar 2025 22:26:30 +0100
Subject: [PATCH 49/62] feat: add option to send message with missing replies

Signed-off-by: ShaksterNano <54268387+shaksternano@users.noreply.github.com>
---
 .../database/src/models/messages/model.rs     |  31 +++-
 crates/core/models/src/v0/messages.rs         |   4 +
 .../delta/src/routes/channels/message_send.rs | 159 ++++++++++++++++++
 crates/delta/src/util/test.rs                 |  16 ++
 4 files changed, 203 insertions(+), 7 deletions(-)

diff --git a/crates/core/database/src/models/messages/model.rs b/crates/core/database/src/models/messages/model.rs
index f2ff0f55b..92055cde6 100644
--- a/crates/core/database/src/models/messages/model.rs
+++ b/crates/core/database/src/models/messages/model.rs
@@ -8,7 +8,7 @@ use revolt_models::v0::{
     MessageWebhook, PushNotification, ReplyIntent, SendableEmbed, Text, RE_MENTION,
 };
 use revolt_permissions::{ChannelPermission, PermissionValue};
-use revolt_result::Result;
+use revolt_result::{ErrorType, Result};
 use ulid::Ulid;
 use validator::Validate;
 
@@ -329,14 +329,31 @@ impl Message {
                 }));
             }
 
-            for ReplyIntent { id, mention } in entries {
-                let message = db.fetch_message(&id).await?;
+            for ReplyIntent {
+                id,
+                mention,
+                fail_if_not_exists,
+            } in entries
+            {
+                match db.fetch_message(&id).await {
+                    // Referenced message exists
+                    Ok(message) => {
+                        if mention && allow_mentions {
+                            mentions.insert(message.author.to_owned());
+                        }
 
-                if mention && allow_mentions {
-                    mentions.insert(message.author.to_owned());
+                        replies.insert(message.id);
+                    }
+                    // If the referenced message doesn't exist and fail_if_not_exists
+                    // is set to false, send the message without the reply.
+                    Err(e) => {
+                        if !matches!(e.error_type, ErrorType::NotFound)
+                            || fail_if_not_exists.unwrap_or(true)
+                        {
+                            return Err(e);
+                        }
+                    }
                 }
-
-                replies.insert(message.id);
             }
         }
 
diff --git a/crates/core/models/src/v0/messages.rs b/crates/core/models/src/v0/messages.rs
index 37ed526ed..2897b4473 100644
--- a/crates/core/models/src/v0/messages.rs
+++ b/crates/core/models/src/v0/messages.rs
@@ -241,6 +241,10 @@ auto_derived!(
         pub id: String,
         /// Whether this reply should mention the message's author
         pub mention: bool,
+        /// Whether to error if the referenced message doesn't exist.
+        /// Otherwise, send a message without this reply.
+        /// Default is true.
+        pub fail_if_not_exists: Option<bool>,
     }
 
     /// Message to send
diff --git a/crates/delta/src/routes/channels/message_send.rs b/crates/delta/src/routes/channels/message_send.rs
index d55bd8bda..83f7a272e 100644
--- a/crates/delta/src/routes/channels/message_send.rs
+++ b/crates/delta/src/routes/channels/message_send.rs
@@ -327,4 +327,163 @@ mod test {
             "Mention was scrubbed when the user can see the channel"
         );
     }
+
+    #[rocket::async_test]
+    async fn message_reply() {
+        let harness = TestHarness::new().await;
+        let (_, _, user) = harness.new_user().await;
+        let (server, channels) = harness.new_server(&user).await;
+        let channel = harness.new_channel(&server).await;
+        let (_, member, message) = harness.new_message(&user, &server, channels).await;
+
+        // Send a message with a reply
+        // Should succeed
+        let message_with_reply = Message::create_from_api(
+            &harness.db,
+            Some(&harness.amqp),
+            channel.clone(),
+            v0::DataMessageSend {
+                content: Some("Message with reply".to_string()),
+                nonce: None,
+                attachments: None,
+                replies: Some(vec![v0::ReplyIntent {
+                    id: message.id.clone(),
+                    mention: false,
+                    fail_if_not_exists: Some(true),
+                }]),
+                embeds: None,
+                masquerade: None,
+                interactions: None,
+                flags: None,
+            },
+            v0::MessageAuthor::User(&user.clone().into(&harness.db, Some(&user)).await),
+            Some(user.clone().into(&harness.db, Some(&user)).await),
+            Some(member.clone().into()),
+            user.limits().await,
+            IdempotencyKey::unchecked_from_string("1".to_string()),
+            false,
+            false,
+        )
+        .await
+        .expect("Failed to create message with reply");
+
+        assert!(
+            message_with_reply.replies.is_some(),
+            "Message replies is None",
+        );
+
+        let replies = message_with_reply.replies.unwrap();
+
+        assert!(!replies.is_empty(), "Message replies is empty",);
+
+        assert_eq!(replies[0], message.id, "Message reply ID does not match",);
+
+        // Delete the message
+        message
+            .clone()
+            .delete(&harness.db)
+            .await
+            .expect("Failed to delete message");
+
+        // Attempt to create messages with a reply to a deleted message
+
+        // fail_if_not_exists is set to false
+        // Should send the message without a reply
+        let message_with_missing_reply = Message::create_from_api(
+            &harness.db,
+            Some(&harness.amqp),
+            channel.clone(),
+            v0::DataMessageSend {
+                content: Some("Message with missing reply".to_string()),
+                nonce: None,
+                attachments: None,
+                replies: Some(vec![v0::ReplyIntent {
+                    id: message.id.clone(),
+                    mention: false,
+                    fail_if_not_exists: Some(false),
+                }]),
+                embeds: None,
+                masquerade: None,
+                interactions: None,
+                flags: None,
+            },
+            v0::MessageAuthor::User(&user.clone().into(&harness.db, Some(&user)).await),
+            Some(user.clone().into(&harness.db, Some(&user)).await),
+            Some(member.clone().into()),
+            user.limits().await,
+            IdempotencyKey::unchecked_from_string("3".to_string()),
+            false,
+            false,
+        )
+        .await
+        .expect("Failed to create message with missing reply");
+
+        assert!(
+            message_with_missing_reply.replies.is_none()
+                || message_with_missing_reply.replies.unwrap().is_empty(),
+            "Message replies exist when they shouldn't",
+        );
+
+        // fail_if_not_exists is set to true
+        // Should fail to send the message
+        Message::create_from_api(
+            &harness.db,
+            Some(&harness.amqp),
+            channel.clone(),
+            v0::DataMessageSend {
+                content: Some("Message with missing reply".to_string()),
+                nonce: None,
+                attachments: None,
+                replies: Some(vec![v0::ReplyIntent {
+                    id: message.id.clone(),
+                    mention: false,
+                    fail_if_not_exists: Some(true),
+                }]),
+                embeds: None,
+                masquerade: None,
+                interactions: None,
+                flags: None,
+            },
+            v0::MessageAuthor::User(&user.clone().into(&harness.db, Some(&user)).await),
+            Some(user.clone().into(&harness.db, Some(&user)).await),
+            Some(member.clone().into()),
+            user.limits().await,
+            IdempotencyKey::unchecked_from_string("4".to_string()),
+            false,
+            false,
+        )
+        .await
+        .expect_err("Created message with missing reply and true fail");
+
+        // fail_if_not_exists is not set
+        // Should fail to send the message
+        Message::create_from_api(
+            &harness.db,
+            Some(&harness.amqp),
+            channel.clone(),
+            v0::DataMessageSend {
+                content: Some("Message with missing reply".to_string()),
+                nonce: None,
+                attachments: None,
+                replies: Some(vec![v0::ReplyIntent {
+                    id: message.id.clone(),
+                    mention: false,
+                    fail_if_not_exists: None,
+                }]),
+                embeds: None,
+                masquerade: None,
+                interactions: None,
+                flags: None,
+            },
+            v0::MessageAuthor::User(&user.clone().into(&harness.db, Some(&user)).await),
+            Some(user.clone().into(&harness.db, Some(&user)).await),
+            Some(member.clone().into()),
+            user.limits().await,
+            IdempotencyKey::unchecked_from_string("4".to_string()),
+            false,
+            false,
+        )
+        .await
+        .expect_err("Created message with missing reply and none fail");
+    }
 }
diff --git a/crates/delta/src/util/test.rs b/crates/delta/src/util/test.rs
index 3de142811..88dcdd1a9 100644
--- a/crates/delta/src/util/test.rs
+++ b/crates/delta/src/util/test.rs
@@ -122,6 +122,22 @@ impl TestHarness {
         .expect("Failed to create test server")
     }
 
+    pub async fn new_channel(&self, server: &Server) -> Channel {
+        Channel::create_server_channel(
+            &self.db,
+            &mut server.clone(),
+            v0::DataCreateServerChannel {
+                channel_type: v0::LegacyServerChannelType::Text,
+                name: "Test Channel".to_string(),
+                description: None,
+                nsfw: Some(false),
+            },
+            true,
+        )
+        .await
+        .expect("Failed to make test channel")
+    }
+
     pub async fn new_message(
         &self,
         user: &User,

From 21b9164ee70d09996327a46db826d8c18677f402 Mon Sep 17 00:00:00 2001
From: izzy <me@insrt.uk>
Date: Wed, 2 Apr 2025 12:11:46 +0100
Subject: [PATCH 50/62] chore: bump version to 0.8.4 chore: enable webhooks in
 test builds

---
 Cargo.lock                          | 30 ++++++++++++++---------------
 crates/bindings/node/Cargo.toml     |  8 ++++----
 crates/bonfire/Cargo.toml           |  4 ++--
 crates/core/config/Cargo.toml       |  4 ++--
 crates/core/config/Revolt.test.toml |  3 +++
 crates/core/config/Revolt.toml      |  1 -
 crates/core/database/Cargo.toml     | 12 ++++++------
 crates/core/files/Cargo.toml        |  6 +++---
 crates/core/models/Cargo.toml       |  6 +++---
 crates/core/permissions/Cargo.toml  |  4 ++--
 crates/core/presence/Cargo.toml     |  2 +-
 crates/core/result/Cargo.toml       |  2 +-
 crates/daemons/crond/Cargo.toml     | 10 +++++-----
 crates/daemons/pushd/Cargo.toml     |  8 ++++----
 crates/delta/Cargo.toml             |  2 +-
 crates/services/autumn/Cargo.toml   | 10 +++++-----
 crates/services/january/Cargo.toml  | 10 +++++-----
 17 files changed, 62 insertions(+), 60 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 55fa2ff2e..9764727f9 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1,6 +1,6 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
-version = 3
+version = 4
 
 [[package]]
 name = "addr2line"
@@ -6226,7 +6226,7 @@ dependencies = [
 
 [[package]]
 name = "revolt-autumn"
-version = "0.8.3"
+version = "0.8.4"
 dependencies = [
  "axum",
  "axum-macros",
@@ -6263,7 +6263,7 @@ dependencies = [
 
 [[package]]
 name = "revolt-bonfire"
-version = "0.8.3"
+version = "0.8.4"
 dependencies = [
  "async-channel 2.3.1",
  "async-std",
@@ -6293,7 +6293,7 @@ dependencies = [
 
 [[package]]
 name = "revolt-config"
-version = "0.8.3"
+version = "0.8.4"
 dependencies = [
  "async-std",
  "cached",
@@ -6309,7 +6309,7 @@ dependencies = [
 
 [[package]]
 name = "revolt-crond"
-version = "0.8.3"
+version = "0.8.4"
 dependencies = [
  "log",
  "revolt-config",
@@ -6321,7 +6321,7 @@ dependencies = [
 
 [[package]]
 name = "revolt-database"
-version = "0.8.3"
+version = "0.8.4"
 dependencies = [
  "amqprs",
  "async-lock 2.8.0",
@@ -6373,7 +6373,7 @@ dependencies = [
 
 [[package]]
 name = "revolt-delta"
-version = "0.8.3"
+version = "0.8.4"
 dependencies = [
  "amqprs",
  "async-channel 1.9.0",
@@ -6422,7 +6422,7 @@ dependencies = [
 
 [[package]]
 name = "revolt-files"
-version = "0.8.3"
+version = "0.8.4"
 dependencies = [
  "aes-gcm",
  "aws-config",
@@ -6445,7 +6445,7 @@ dependencies = [
 
 [[package]]
 name = "revolt-january"
-version = "0.8.3"
+version = "0.8.4"
 dependencies = [
  "async-recursion",
  "axum",
@@ -6473,7 +6473,7 @@ dependencies = [
 
 [[package]]
 name = "revolt-models"
-version = "0.8.3"
+version = "0.8.4"
 dependencies = [
  "indexmap 1.9.3",
  "iso8601-timestamp 0.2.17",
@@ -6491,7 +6491,7 @@ dependencies = [
 
 [[package]]
 name = "revolt-nodejs-bindings"
-version = "0.8.3"
+version = "0.8.4"
 dependencies = [
  "async-std",
  "neon",
@@ -6504,7 +6504,7 @@ dependencies = [
 
 [[package]]
 name = "revolt-permissions"
-version = "0.8.3"
+version = "0.8.4"
 dependencies = [
  "async-std",
  "async-trait",
@@ -6519,7 +6519,7 @@ dependencies = [
 
 [[package]]
 name = "revolt-presence"
-version = "0.8.3"
+version = "0.8.4"
 dependencies = [
  "async-std",
  "log",
@@ -6530,7 +6530,7 @@ dependencies = [
 
 [[package]]
 name = "revolt-pushd"
-version = "0.8.3"
+version = "0.8.4"
 dependencies = [
  "amqprs",
  "async-trait",
@@ -6554,7 +6554,7 @@ dependencies = [
 
 [[package]]
 name = "revolt-result"
-version = "0.8.3"
+version = "0.8.4"
 dependencies = [
  "axum",
  "log",
diff --git a/crates/bindings/node/Cargo.toml b/crates/bindings/node/Cargo.toml
index bd8ae3327..e2cfba1ce 100644
--- a/crates/bindings/node/Cargo.toml
+++ b/crates/bindings/node/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "revolt-nodejs-bindings"
-version = "0.8.3"
+version = "0.8.4"
 description = "Node.js bindings for the Revolt software"
 authors = ["Paul Makles <me@insrt.uk>"]
 license = "MIT"
@@ -20,6 +20,6 @@ serde = { version = "1", features = ["derive"] }
 
 async-std = "1.12.0"
 
-revolt-config = { version = "0.8.3", path = "../../core/config" }
-revolt-result = { version = "0.8.3", path = "../../core/result" }
-revolt-database = { version = "0.8.3", path = "../../core/database" }
+revolt-config = { version = "0.8.4", path = "../../core/config" }
+revolt-result = { version = "0.8.4", path = "../../core/result" }
+revolt-database = { version = "0.8.4", path = "../../core/database" }
diff --git a/crates/bonfire/Cargo.toml b/crates/bonfire/Cargo.toml
index f1d12fa2c..30b695079 100644
--- a/crates/bonfire/Cargo.toml
+++ b/crates/bonfire/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "revolt-bonfire"
-version = "0.8.3"
+version = "0.8.4"
 license = "AGPL-3.0-or-later"
 edition = "2021"
 
@@ -41,7 +41,7 @@ revolt-result = { path = "../core/result" }
 revolt-models = { path = "../core/models" }
 revolt-config = { path = "../core/config" }
 revolt-database = { path = "../core/database" }
-revolt-permissions = { version = "0.8.3", path = "../core/permissions" }
+revolt-permissions = { version = "0.8.4", path = "../core/permissions" }
 revolt-presence = { path = "../core/presence", features = ["redis-is-patched"] }
 
 # redis
diff --git a/crates/core/config/Cargo.toml b/crates/core/config/Cargo.toml
index 05d3dd9be..00c8a00c2 100644
--- a/crates/core/config/Cargo.toml
+++ b/crates/core/config/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "revolt-config"
-version = "0.8.3"
+version = "0.8.4"
 edition = "2021"
 license = "MIT"
 authors = ["Paul Makles <me@insrt.uk>"]
@@ -34,4 +34,4 @@ pretty_env_logger = "0.4.0"
 sentry = "0.31.5"
 
 # Core
-revolt-result = { version = "0.8.3", path = "../result", optional = true }
+revolt-result = { version = "0.8.4", path = "../result", optional = true }
diff --git a/crates/core/config/Revolt.test.toml b/crates/core/config/Revolt.test.toml
index 7ac98ee26..d7241d418 100644
--- a/crates/core/config/Revolt.test.toml
+++ b/crates/core/config/Revolt.test.toml
@@ -7,3 +7,6 @@ host = "127.0.0.1"
 port = 5672
 username = "rabbituser"
 password = "rabbitpass"
+
+[features]
+webhooks_enabled = true
diff --git a/crates/core/config/Revolt.toml b/crates/core/config/Revolt.toml
index cd59ecf29..d33b0e7cc 100644
--- a/crates/core/config/Revolt.toml
+++ b/crates/core/config/Revolt.toml
@@ -179,7 +179,6 @@ default_bucket = "revolt-uploads"
 
 
 [features]
-# Bucket to upload to by default
 # Feature gate options
 webhooks_enabled = false
 
diff --git a/crates/core/database/Cargo.toml b/crates/core/database/Cargo.toml
index f3a9b4e17..e47fc8d3e 100644
--- a/crates/core/database/Cargo.toml
+++ b/crates/core/database/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "revolt-database"
-version = "0.8.3"
+version = "0.8.4"
 edition = "2021"
 license = "AGPL-3.0-or-later"
 authors = ["Paul Makles <me@insrt.uk>"]
@@ -24,15 +24,15 @@ default = ["mongodb", "async-std-runtime", "tasks"]
 
 [dependencies]
 # Core
-revolt-config = { version = "0.8.3", path = "../config", features = [
+revolt-config = { version = "0.8.4", path = "../config", features = [
     "report-macros",
 ] }
-revolt-result = { version = "0.8.3", path = "../result" }
-revolt-models = { version = "0.8.3", path = "../models", features = [
+revolt-result = { version = "0.8.4", path = "../result" }
+revolt-models = { version = "0.8.4", path = "../models", features = [
     "validator",
 ] }
-revolt-presence = { version = "0.8.3", path = "../presence" }
-revolt-permissions = { version = "0.8.3", path = "../permissions", features = [
+revolt-presence = { version = "0.8.4", path = "../presence" }
+revolt-permissions = { version = "0.8.4", path = "../permissions", features = [
     "serde",
     "bson",
 ] }
diff --git a/crates/core/files/Cargo.toml b/crates/core/files/Cargo.toml
index c6b27e755..e83031365 100644
--- a/crates/core/files/Cargo.toml
+++ b/crates/core/files/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "revolt-files"
-version = "0.8.3"
+version = "0.8.4"
 edition = "2021"
 license = "AGPL-3.0-or-later"
 authors = ["Paul Makles <me@insrt.uk>"]
@@ -20,10 +20,10 @@ typenum = "1.17.0"
 aws-config = "1.5.5"
 aws-sdk-s3 = { version = "1.46.0", features = ["behavior-version-latest"] }
 
-revolt-config = { version = "0.8.3", path = "../config", features = [
+revolt-config = { version = "0.8.4", path = "../config", features = [
     "report-macros",
 ] }
-revolt-result = { version = "0.8.3", path = "../result" }
+revolt-result = { version = "0.8.4", path = "../result" }
 
 # image processing
 jxl-oxide = "0.8.1"
diff --git a/crates/core/models/Cargo.toml b/crates/core/models/Cargo.toml
index 63cf8b94d..b3bbd4093 100644
--- a/crates/core/models/Cargo.toml
+++ b/crates/core/models/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "revolt-models"
-version = "0.8.3"
+version = "0.8.4"
 edition = "2021"
 license = "MIT"
 authors = ["Paul Makles <me@insrt.uk>"]
@@ -20,8 +20,8 @@ default = ["serde", "partials", "rocket"]
 
 [dependencies]
 # Core
-revolt-config = { version = "0.8.3", path = "../config" }
-revolt-permissions = { version = "0.8.3", path = "../permissions" }
+revolt-config = { version = "0.8.4", path = "../config" }
+revolt-permissions = { version = "0.8.4", path = "../permissions" }
 
 # Utility
 regex = "1"
diff --git a/crates/core/permissions/Cargo.toml b/crates/core/permissions/Cargo.toml
index 423d1cad2..f2ffb04ca 100644
--- a/crates/core/permissions/Cargo.toml
+++ b/crates/core/permissions/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "revolt-permissions"
-version = "0.8.3"
+version = "0.8.4"
 edition = "2021"
 license = "MIT"
 authors = ["Paul Makles <me@insrt.uk>"]
@@ -21,7 +21,7 @@ async-std = { version = "1.8.0", features = ["attributes"] }
 
 [dependencies]
 # Core
-revolt-result = { version = "0.8.3", path = "../result" }
+revolt-result = { version = "0.8.4", path = "../result" }
 
 # Utility
 auto_ops = "0.3.0"
diff --git a/crates/core/presence/Cargo.toml b/crates/core/presence/Cargo.toml
index 81d5813a6..3470514f1 100644
--- a/crates/core/presence/Cargo.toml
+++ b/crates/core/presence/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "revolt-presence"
-version = "0.8.3"
+version = "0.8.4"
 edition = "2021"
 license = "AGPL-3.0-or-later"
 authors = ["Paul Makles <me@insrt.uk>"]
diff --git a/crates/core/result/Cargo.toml b/crates/core/result/Cargo.toml
index 35dedcaac..b62d3dbf3 100644
--- a/crates/core/result/Cargo.toml
+++ b/crates/core/result/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "revolt-result"
-version = "0.8.3"
+version = "0.8.4"
 edition = "2021"
 license = "MIT"
 authors = ["Paul Makles <me@insrt.uk>"]
diff --git a/crates/daemons/crond/Cargo.toml b/crates/daemons/crond/Cargo.toml
index a3f09ce2f..d394df0d8 100644
--- a/crates/daemons/crond/Cargo.toml
+++ b/crates/daemons/crond/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "revolt-crond"
-version = "0.8.3"
+version = "0.8.4"
 license = "AGPL-3.0-or-later"
 authors = ["Paul Makles <me@insrt.uk>"]
 edition = "2021"
@@ -16,7 +16,7 @@ log = "0.4"
 tokio = { version = "1" }
 
 # Core
-revolt-database = { version = "0.8.3", path = "../../core/database" }
-revolt-result = { version = "0.8.3", path = "../../core/result" }
-revolt-config = { version = "0.8.3", path = "../../core/config" }
-revolt-files = { version = "0.8.3", path = "../../core/files" }
+revolt-database = { version = "0.8.4", path = "../../core/database" }
+revolt-result = { version = "0.8.4", path = "../../core/result" }
+revolt-config = { version = "0.8.4", path = "../../core/config" }
+revolt-files = { version = "0.8.4", path = "../../core/files" }
diff --git a/crates/daemons/pushd/Cargo.toml b/crates/daemons/pushd/Cargo.toml
index eb608825a..dad79cf3d 100644
--- a/crates/daemons/pushd/Cargo.toml
+++ b/crates/daemons/pushd/Cargo.toml
@@ -1,13 +1,13 @@
 [package]
 name = "revolt-pushd"
-version = "0.8.3"
+version = "0.8.4"
 edition = "2021"
 license = "AGPL-3.0-or-later"
 
 [dependencies]
-revolt-config = { version = "0.8.3", path = "../../core/config" }
-revolt-database = { version = "0.8.3", path = "../../core/database" }
-revolt-models = { version = "0.8.3", path = "../../core/models", features = [
+revolt-config = { version = "0.8.4", path = "../../core/config" }
+revolt-database = { version = "0.8.4", path = "../../core/database" }
+revolt-models = { version = "0.8.4", path = "../../core/models", features = [
     "validator",
 ] }
 
diff --git a/crates/delta/Cargo.toml b/crates/delta/Cargo.toml
index 7fdfa0106..0dc892574 100644
--- a/crates/delta/Cargo.toml
+++ b/crates/delta/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "revolt-delta"
-version = "0.8.3"
+version = "0.8.4"
 license = "AGPL-3.0-or-later"
 authors = ["Paul Makles <paulmakles@gmail.com>"]
 edition = "2018"
diff --git a/crates/services/autumn/Cargo.toml b/crates/services/autumn/Cargo.toml
index 1480fc19b..dc2424131 100644
--- a/crates/services/autumn/Cargo.toml
+++ b/crates/services/autumn/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "revolt-autumn"
-version = "0.8.3"
+version = "0.8.4"
 edition = "2021"
 license = "AGPL-3.0-or-later"
 
@@ -43,12 +43,12 @@ tracing = "0.1"
 tracing-subscriber = { version = "0.3", features = ["env-filter"] }
 
 # Core crates
-revolt-files = { version = "0.8.3", path = "../../core/files" }
-revolt-config = { version = "0.8.3", path = "../../core/config" }
-revolt-database = { version = "0.8.3", path = "../../core/database", features = [
+revolt-files = { version = "0.8.4", path = "../../core/files" }
+revolt-config = { version = "0.8.4", path = "../../core/config" }
+revolt-database = { version = "0.8.4", path = "../../core/database", features = [
     "axum-impl",
 ] }
-revolt-result = { version = "0.8.3", path = "../../core/result", features = [
+revolt-result = { version = "0.8.4", path = "../../core/result", features = [
     "utoipa",
     "axum",
 ] }
diff --git a/crates/services/january/Cargo.toml b/crates/services/january/Cargo.toml
index 15446704b..01b6f4022 100644
--- a/crates/services/january/Cargo.toml
+++ b/crates/services/january/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "revolt-january"
-version = "0.8.3"
+version = "0.8.4"
 edition = "2021"
 license = "AGPL-3.0-or-later"
 
@@ -32,13 +32,13 @@ tracing = "0.1"
 tracing-subscriber = { version = "0.3", features = ["env-filter"] }
 
 # Core crates
-revolt-config = { version = "0.8.3", path = "../../core/config" }
-revolt-models = { version = "0.8.3", path = "../../core/models" }
-revolt-result = { version = "0.8.3", path = "../../core/result", features = [
+revolt-config = { version = "0.8.4", path = "../../core/config" }
+revolt-models = { version = "0.8.4", path = "../../core/models" }
+revolt-result = { version = "0.8.4", path = "../../core/result", features = [
     "utoipa",
     "axum",
 ] }
-revolt-files = { version = "0.8.3", path = "../../core/files" }
+revolt-files = { version = "0.8.4", path = "../../core/files" }
 
 # Axum / web server
 axum = { version = "0.7.5" }

From a110a087be018d123fb8dd41f3560f19891e10cf Mon Sep 17 00:00:00 2001
From: izzy <me@insrt.uk>
Date: Wed, 2 Apr 2025 12:14:31 +0100
Subject: [PATCH 51/62] ci: downgrade lockfile

---
 Cargo.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Cargo.lock b/Cargo.lock
index 9764727f9..4d6226dae 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1,6 +1,6 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
-version = 4
+version = 3
 
 [[package]]
 name = "addr2line"

From 2a36f5912dd239efc92c545176199fd02798ce02 Mon Sep 17 00:00:00 2001
From: Tom <iamtomahawkx@gmail.com>
Date: Sat, 5 Apr 2025 10:45:04 -0700
Subject: [PATCH 52/62] feat: Add Mass Mentions to the backend (#394)

* feat: create base of push daemon

Signed-off-by: IAmTomahawkx <iamtomahawkx@gmail.com>

* Add outbound senders

* Make web_push send to rabbit instead (temp stuff)

* feat: stability and friend requests

* make vapid fr stuff not suck

* swap naming of queue

* move pushd into daemons folder

* fix cargo file for move into daemons folder

* feat: probably working fcm push notifs

* comment out fcm webpush stuff since the config keys dont exist

* fix fcm, name queues according to their prod status and configure routing keys

* add pushd to docker

* mix: Remove old code, add stuff to pushd

* fix: lockfile

* feat: update rocket to 5.0.1

* fix: fix queues and ack bugs

* Move rabbit messsage processing into ack queue

* chore: update readme

* chore: optimizations for ack database hits

* pushd flowchart

* misc: update flowchart

* exit dependancy hell

* add rocket_impl flag to authifier

* make the tests file of delta actually compile

* fix: don't silence every push message

* fix: don't silence all messages

* add debug logging for sending data to rabbit from message events

* validate mentions at a server membership level

* put back that import that was actually important

* minor fix to lockfile

* update delta authifier

* feat: proper permissions for push notifications

* add unit test for mention sanitization

* remove local file dependancy on authifier

* update ports to proper defaults

* fixTM the node bindings

* Theoretically configure docker releases for pushd

Signed-off-by: IAmTomahawkx <iamtomahawkx@gmail.com>

* declare exchange in pushd and delta

* fix createbuckets script

Signed-off-by: IAmTomahawkx <iamtomahawkx@gmail.com>

* fix: reference db implementation

Signed-off-by: IAmTomahawkx <iamtomahawkx@gmail.com>

* fix: remove finally redundant code

Signed-off-by: IAmTomahawkx <iamtomahawkx@gmail.com>

* fix: changes

Signed-off-by: IAmTomahawkx <iamtomahawkx@gmail.com>

* fix: other changes

Signed-off-by: IAmTomahawkx <iamtomahawkx@gmail.com>

* fix: make channel name return result

Signed-off-by: IAmTomahawkx <iamtomahawkx@gmail.com>

* Add role mention parsing

* feat: update to mongo 3.1, add member generator.

* integrate mass mentions into pushd

* patch redis-rs with updated versions

* feat: chunk role mentions

* move permission bits to 37/38 to avoid livekit conflict

* change role mention format to <%id>

* fix the lockfile from merge

* fix: PR change requests

* feat: add tests

* fix: i am a dumbass

* fix: tests, again

---------

Signed-off-by: IAmTomahawkx <iamtomahawkx@gmail.com>
---
 .config/nextest.toml                          |    2 +-
 Cargo.lock                                    | 2454 ++++++++++++-----
 Cargo.toml                                    |    6 +-
 crates/bonfire/Cargo.toml                     |    2 +-
 crates/core/config/Revolt.toml                |   19 +-
 crates/core/config/src/lib.rs                 |   11 +
 crates/core/database/Cargo.toml               |    4 +-
 crates/core/database/src/amqp/amqp.rs         |   32 +
 crates/core/database/src/drivers/mongodb.rs   |   18 +-
 crates/core/database/src/events/rabbit.rs     |    6 +
 .../models/admin_migrations/ops/mongodb.rs    |    4 +-
 .../admin_migrations/ops/mongodb/init.rs      |  342 ++-
 .../admin_migrations/ops/mongodb/scripts.rs   |  571 ++--
 .../src/models/channel_invites/ops/mongodb.rs |    9 +-
 .../src/models/channel_unreads/ops.rs         |    8 +
 .../src/models/channel_unreads/ops/mongodb.rs |   47 +-
 .../models/channel_unreads/ops/reference.rs   |   32 +
 .../models/channel_webhooks/ops/mongodb.rs    |    9 +-
 .../src/models/channels/ops/mongodb.rs        |   44 +-
 .../database/src/models/emojis/ops/mongodb.rs |    1 -
 .../src/models/file_hashes/ops/mongodb.rs     |    1 -
 .../database/src/models/files/ops/mongodb.rs  |    5 -
 .../database/src/models/messages/model.rs     |  212 +-
 .../src/models/messages/ops/mongodb.rs        |   22 +-
 .../models/ratelimit_events/ops/mongodb.rs    |   15 +-
 .../database/src/models/server_members/ops.rs |   79 +
 .../src/models/server_members/ops/mongodb.rs  |  142 +-
 .../models/server_members/ops/reference.rs    |   66 +-
 .../src/models/servers/ops/mongodb.rs         |   45 +-
 .../src/models/user_settings/ops/mongodb.rs   |    2 +-
 .../database/src/models/users/ops/mongodb.rs  |  142 +-
 crates/core/database/src/tasks/ack.rs         |   64 +-
 crates/core/database/src/tasks/mod.rs         |   10 +-
 crates/core/database/src/util/bridge/v0.rs    |    2 +
 .../database/src/util/bulk_permissions.rs     |   23 +
 crates/core/models/Cargo.toml                 |    4 +-
 crates/core/models/src/v0/messages.rs         |   15 +-
 crates/core/permissions/src/models/channel.rs |    8 +-
 crates/core/result/src/axum.rs                |    5 +-
 crates/core/result/src/lib.rs                 |    7 +
 crates/core/result/src/rocket.rs              |    4 +
 crates/daemons/pushd/Cargo.toml               |    6 +-
 crates/daemons/pushd/Pushd Flowchart.graffle  |  Bin 45755 -> 52601 bytes
 .../pushd/src/consumers/inbound/ack.rs        |   10 +
 .../src/consumers/inbound/mass_mention.rs     |  275 ++
 .../pushd/src/consumers/inbound/mod.rs        |    1 +
 .../pushd/src/consumers/outbound/apn.rs       |   23 +-
 crates/daemons/pushd/src/main.rs              |   26 +-
 crates/delta/Cargo.toml                       |    4 +-
 .../delta/src/routes/channels/message_send.rs |  194 +-
 crates/delta/src/util/test.rs                 |   25 +-
 51 files changed, 3533 insertions(+), 1525 deletions(-)
 create mode 100644 crates/daemons/pushd/src/consumers/inbound/mass_mention.rs

diff --git a/.config/nextest.toml b/.config/nextest.toml
index d50a040ba..1f69a63f0 100644
--- a/.config/nextest.toml
+++ b/.config/nextest.toml
@@ -1,2 +1,2 @@
 [profile.default]
-slow-timeout = { period = "3s", terminate-after = 2 }
+slow-timeout = { period = "5s", terminate-after = 10 }
diff --git a/Cargo.lock b/Cargo.lock
index 4d6226dae..31789720e 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1,12 +1,14 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
-version = 3
+version = 4
 
 [[package]]
 name = "addr2line"
 version = "0.24.2"
+version = "0.24.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1"
+checksum = "dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1"
 dependencies = [
  "gimli",
 ]
@@ -25,6 +27,7 @@ checksum = "d122413f284cf2d62fb1b7db97e02edb8cda96d769b16e443a4f6195e35662b0"
 dependencies = [
  "crypto-common",
  "generic-array 0.14.7",
+ "generic-array 0.14.7",
 ]
 
 [[package]]
@@ -55,8 +58,10 @@ dependencies = [
 [[package]]
 name = "ahash"
 version = "0.7.8"
+version = "0.7.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "891477e0c6a8957309ee5c45a6368af3ae14bb510732d2684ffa19af310920f9"
+checksum = "891477e0c6a8957309ee5c45a6368af3ae14bb510732d2684ffa19af310920f9"
 dependencies = [
  "getrandom",
  "once_cell",
@@ -94,8 +99,10 @@ checksum = "4aa90d7ce82d4be67b64039a3d588d38dbcc6736577de4a847025ce5b0c468d1"
 [[package]]
 name = "allocator-api2"
 version = "0.2.21"
+version = "0.2.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923"
+checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923"
 
 [[package]]
 name = "amqp_serde"
@@ -103,6 +110,7 @@ version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "787581044ca08ad61cdb3a4e21afba087fb8cdba3bb3e23ce69a7d091808014d"
 dependencies = [
+ "bytes 1.9.0",
  "bytes 1.9.0",
  "serde",
  "serde_bytes_ng",
@@ -117,9 +125,10 @@ dependencies = [
  "amqp_serde",
  "async-trait",
  "bytes 1.9.0",
+ "bytes 1.9.0",
  "serde",
  "serde_bytes_ng",
- "tokio 1.43.0",
+ "tokio 1.42.0",
 ]
 
 [[package]]
@@ -137,73 +146,29 @@ dependencies = [
  "libc",
 ]
 
-[[package]]
-name = "anstream"
-version = "0.6.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8acc5369981196006228e28809f761875c0327210a891e941f4c683b3a99529b"
-dependencies = [
- "anstyle",
- "anstyle-parse",
- "anstyle-query",
- "anstyle-wincon",
- "colorchoice",
- "is_terminal_polyfill",
- "utf8parse",
-]
-
-[[package]]
-name = "anstyle"
-version = "1.0.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "55cc3b69f167a1ef2e161439aa98aed94e6028e5f9a59be9a6ffb47aef1651f9"
-
-[[package]]
-name = "anstyle-parse"
-version = "0.2.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3b2d16507662817a6a20a9ea92df6652ee4f94f914589377d69f3b21bc5798a9"
-dependencies = [
- "utf8parse",
-]
-
-[[package]]
-name = "anstyle-query"
-version = "1.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "79947af37f4177cfead1110013d678905c37501914fba0efea834c3fe9a8d60c"
-dependencies = [
- "windows-sys 0.59.0",
-]
-
-[[package]]
-name = "anstyle-wincon"
-version = "3.0.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca3534e77181a9cc07539ad51f2141fe32f6c3ffd4df76db8ad92346b003ae4e"
-dependencies = [
- "anstyle",
- "once_cell",
- "windows-sys 0.59.0",
-]
-
 [[package]]
 name = "anyhow"
 version = "1.0.95"
+version = "1.0.95"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "34ac096ce696dc2fcabef30516bb13c0a68a11d30131d3df6f04711467681b04"
+checksum = "34ac096ce696dc2fcabef30516bb13c0a68a11d30131d3df6f04711467681b04"
 
 [[package]]
 name = "arbitrary"
 version = "1.4.1"
+version = "1.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dde20b3d026af13f561bdd0f15edf01fc734f0dafcedbaf42bba506a9517f223"
+checksum = "dde20b3d026af13f561bdd0f15edf01fc734f0dafcedbaf42bba506a9517f223"
 
 [[package]]
 name = "arc-swap"
 version = "1.7.1"
+version = "1.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "69f7f8c3906b62b754cd5326047894316021dcfe5a194c8ea52bdd94934a3457"
+checksum = "69f7f8c3906b62b754cd5326047894316021dcfe5a194c8ea52bdd94934a3457"
 
 [[package]]
 name = "arg_enum_proc_macro"
@@ -213,14 +178,16 @@ checksum = "0ae92a5119aa49cdbcf6b9f893fe4e1d98b04ccbf82ee0584ad948a44a734dea"
 dependencies = [
  "proc-macro2",
  "quote 1.0.38",
- "syn 2.0.96",
+ "syn 2.0.94",
 ]
 
 [[package]]
 name = "arrayref"
 version = "0.3.9"
+version = "0.3.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "76a2e8124351fda1ef8aaaa3bbd7ebbcb486bbcd4225aca0aa0d84bb2db8fecb"
+checksum = "76a2e8124351fda1ef8aaaa3bbd7ebbcb486bbcd4225aca0aa0d84bb2db8fecb"
 
 [[package]]
 name = "arrayvec"
@@ -236,14 +203,20 @@ checksum = "a3203e79f4dd9bdda415ed03cf14dae5a2bf775c683a00f94e9cd1faf0f596e5"
 dependencies = [
  "quote 1.0.38",
  "syn 1.0.109",
+ "quote 1.0.38",
+ "syn 1.0.109",
 ]
 
 [[package]]
 name = "async-channel"
 version = "1.9.0"
+version = "1.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "81953c529336010edd6d8e358f886d9581267795c61b19475b71314bffa46d35"
+checksum = "81953c529336010edd6d8e358f886d9581267795c61b19475b71314bffa46d35"
 dependencies = [
+ "concurrent-queue",
+ "event-listener 2.5.3",
  "concurrent-queue",
  "event-listener 2.5.3",
  "futures-core",
@@ -255,59 +228,72 @@ version = "2.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "89b47800b0be77592da0afd425cc03468052844aff33b84e33cc696f64e77b6a"
 dependencies = [
+ "concurrent-queue",
  "concurrent-queue",
  "event-listener-strategy",
  "futures-core",
- "pin-project-lite 0.2.16",
+ "pin-project-lite 0.2.15",
 ]
 
 [[package]]
 name = "async-executor"
 version = "1.13.1"
+version = "1.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "30ca9a001c1e8ba5149f91a74362376cc6bc5b919d92d988668657bd570bdcec"
+checksum = "30ca9a001c1e8ba5149f91a74362376cc6bc5b919d92d988668657bd570bdcec"
 dependencies = [
  "async-task",
  "concurrent-queue",
  "fastrand 2.3.0",
- "futures-lite 2.6.0",
+ "futures-lite 2.5.0",
  "slab",
 ]
 
 [[package]]
 name = "async-global-executor"
 version = "2.4.1"
+version = "2.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "05b1b633a2115cd122d73b955eadd9916c18c8f510ec9cd1686404c60ad1c29c"
+checksum = "05b1b633a2115cd122d73b955eadd9916c18c8f510ec9cd1686404c60ad1c29c"
 dependencies = [
+ "async-channel 2.3.1",
  "async-channel 2.3.1",
  "async-executor",
  "async-io",
  "async-lock 3.4.0",
+ "async-lock 3.4.0",
  "blocking",
- "futures-lite 2.6.0",
+ "futures-lite 2.5.0",
  "once_cell",
  "tokio 0.2.25",
- "tokio 1.43.0",
+ "tokio 1.42.0",
 ]
 
 [[package]]
 name = "async-io"
 version = "2.4.0"
+version = "2.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "43a2b323ccce0a1d90b449fd71f2a06ca7faa7c54c2751f06c9bd851fc061059"
+checksum = "43a2b323ccce0a1d90b449fd71f2a06ca7faa7c54c2751f06c9bd851fc061059"
 dependencies = [
  "async-lock 3.4.0",
  "cfg-if",
  "concurrent-queue",
  "futures-io",
- "futures-lite 2.6.0",
+ "futures-lite 2.5.0",
  "parking",
  "polling 3.7.4",
  "rustix",
+ "polling 3.7.4",
+ "rustix",
  "slab",
  "tracing",
  "windows-sys 0.59.0",
+ "tracing",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -317,6 +303,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "287272293e9d8c41773cec55e365490fe034813a2f172f502d6ddcf75b2f582b"
 dependencies = [
  "event-listener 2.5.3",
+ "event-listener 2.5.3",
 ]
 
 [[package]]
@@ -327,24 +314,30 @@ checksum = "ff6e472cdea888a4bd64f342f09b3f50e1886d32afe8df3d663c01140b811b18"
 dependencies = [
  "event-listener 5.4.0",
  "event-listener-strategy",
- "pin-project-lite 0.2.16",
+ "pin-project-lite 0.2.15",
 ]
 
 [[package]]
 name = "async-process"
 version = "2.3.0"
+version = "2.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "63255f1dc2381611000436537bbedfe83183faa303a5a0edaf191edef06526bb"
+checksum = "63255f1dc2381611000436537bbedfe83183faa303a5a0edaf191edef06526bb"
 dependencies = [
+ "async-channel 2.3.1",
  "async-channel 2.3.1",
  "async-io",
  "async-lock 3.4.0",
  "async-signal",
  "async-task",
+ "async-lock 3.4.0",
+ "async-signal",
+ "async-task",
  "blocking",
  "cfg-if",
- "event-listener 5.4.0",
- "futures-lite 2.6.0",
+ "event-listener 5.3.1",
+ "futures-lite 2.5.0",
  "rustix",
  "tracing",
 ]
@@ -357,7 +350,7 @@ checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11"
 dependencies = [
  "proc-macro2",
  "quote 1.0.38",
- "syn 2.0.96",
+ "syn 2.0.94",
 ]
 
 [[package]]
@@ -381,83 +374,78 @@ dependencies = [
 [[package]]
 name = "async-std"
 version = "1.13.0"
+version = "1.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c634475f29802fde2b8f0b505b1bd00dfe4df7d4a000f0b36f7671197d5c3615"
+checksum = "c634475f29802fde2b8f0b505b1bd00dfe4df7d4a000f0b36f7671197d5c3615"
 dependencies = [
  "async-attributes",
  "async-channel 1.9.0",
+ "async-channel 1.9.0",
  "async-global-executor",
  "async-io",
  "async-lock 3.4.0",
+ "async-lock 3.4.0",
  "async-process",
  "crossbeam-utils",
  "futures-channel",
  "futures-core",
  "futures-io",
- "futures-lite 2.6.0",
+ "futures-lite 2.5.0",
  "gloo-timers",
  "kv-log-macro",
  "log",
  "memchr",
  "once_cell",
- "pin-project-lite 0.2.16",
+ "pin-project-lite 0.2.15",
  "pin-utils",
  "slab",
  "wasm-bindgen-futures",
 ]
 
-[[package]]
-name = "async-std-resolver"
-version = "0.21.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f2f8a4a203be3325981310ab243a28e6e4ea55b6519bffce05d41ab60e09ad8"
-dependencies = [
- "async-std",
- "async-trait",
- "futures-io",
- "futures-util",
- "pin-utils",
- "socket2 0.4.10",
- "trust-dns-resolver",
-]
-
 [[package]]
 name = "async-stream"
 version = "0.3.6"
+version = "0.3.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0b5a71a6f37880a80d1d7f19efd781e4b5de42c88f0722cc13bcb6cc2cfe8476"
+checksum = "0b5a71a6f37880a80d1d7f19efd781e4b5de42c88f0722cc13bcb6cc2cfe8476"
 dependencies = [
  "async-stream-impl",
  "futures-core",
- "pin-project-lite 0.2.16",
+ "pin-project-lite 0.2.15",
 ]
 
 [[package]]
 name = "async-stream-impl"
 version = "0.3.6"
+version = "0.3.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c7c24de15d275a1ecfd47a380fb4d5ec9bfe0933f309ed5e705b775596a3574d"
+checksum = "c7c24de15d275a1ecfd47a380fb4d5ec9bfe0933f309ed5e705b775596a3574d"
 dependencies = [
  "proc-macro2",
  "quote 1.0.38",
- "syn 2.0.96",
+ "syn 2.0.94",
 ]
 
 [[package]]
 name = "async-task"
 version = "4.7.1"
+version = "4.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de"
+checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de"
 
 [[package]]
 name = "async-trait"
-version = "0.1.85"
+version = "0.1.84"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f934833b4b7233644e5848f235df3f57ed8c80f1528a26c3dfa13d2147fa056"
+checksum = "1b1244b10dcd56c92219da4e14caa97e312079e185f04ba3eea25061561dc0a0"
 dependencies = [
  "proc-macro2",
  "quote 1.0.38",
- "syn 2.0.96",
+ "syn 2.0.94",
 ]
 
 [[package]]
@@ -470,14 +458,22 @@ dependencies = [
  "futures-io",
  "futures-util",
  "log",
- "pin-project-lite 0.2.16",
+ "pin-project-lite 0.2.15",
  "tungstenite",
 ]
 
 [[package]]
 name = "atomic"
 version = "0.5.3"
+version = "0.5.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c59bdb34bc650a32731b31bd8f0829cc15d24a708ee31559e0bb34f2bc320cba"
+
+[[package]]
+name = "atomic"
+version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8d818003e740b63afc82337e3160717f4f63078720a810b7b903e70a5d1d2994"
 checksum = "c59bdb34bc650a32731b31bd8f0829cc15d24a708ee31559e0bb34f2bc320cba"
 
 [[package]]
@@ -487,13 +483,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8d818003e740b63afc82337e3160717f4f63078720a810b7b903e70a5d1d2994"
 dependencies = [
  "bytemuck",
+ "bytemuck",
 ]
 
 [[package]]
 name = "atomic-waker"
 version = "1.1.2"
+version = "1.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0"
+checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0"
 
 [[package]]
 name = "atty"
@@ -508,9 +507,9 @@ dependencies = [
 
 [[package]]
 name = "authifier"
-version = "1.0.9"
+version = "1.0.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ba4df3b5df5cf1a08d4af71c407fb56a675b6aaf4d1fec704da32595497d73d"
+checksum = "edfe88c4a9fcf24b18a216b27c9766966af2a40603d24c7782237afd6ca0d5cd"
 dependencies = [
  "async-std",
  "async-trait",
@@ -520,6 +519,7 @@ dependencies = [
  "futures",
  "handlebars",
  "iso8601-timestamp 0.1.11",
+ "iso8601-timestamp 0.1.11",
  "lazy_static",
  "lettre",
  "log",
@@ -528,6 +528,7 @@ dependencies = [
  "rand 0.8.5",
  "regex",
  "reqwest 0.11.27",
+ "reqwest 0.11.27",
  "revolt_okapi",
  "revolt_rocket_okapi",
  "rocket",
@@ -553,13 +554,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0dde43e75fd43e8a1bf86103336bc699aa8d17ad1be60c76c0bdfd4828e19b78"
 dependencies = [
  "autocfg 1.4.0",
+ "autocfg 1.4.0",
 ]
 
 [[package]]
 name = "autocfg"
 version = "1.4.0"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
+checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
 
 [[package]]
 name = "av1-grain"
@@ -578,17 +582,19 @@ dependencies = [
 [[package]]
 name = "avif-serialize"
 version = "0.8.2"
+version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e335041290c43101ca215eed6f43ec437eb5a42125573f600fc3fa42b9bddd62"
+checksum = "e335041290c43101ca215eed6f43ec437eb5a42125573f600fc3fa42b9bddd62"
 dependencies = [
  "arrayvec",
 ]
 
 [[package]]
 name = "aws-config"
-version = "1.5.15"
+version = "1.5.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc47e70fc35d054c8fcd296d47a61711f043ac80534a10b4f741904f81e73a90"
+checksum = "649316840239f4e58df0b7f620c428f5fababbbca2d504488c641534050bd141"
 dependencies = [
  "aws-credential-types",
  "aws-runtime",
@@ -604,11 +610,13 @@ dependencies = [
  "aws-types",
  "bytes 1.9.0",
  "fastrand 2.3.0",
+ "bytes 1.9.0",
+ "fastrand 2.3.0",
  "hex",
  "http 0.2.12",
- "ring 0.17.8",
+ "ring",
  "time",
- "tokio 1.43.0",
+ "tokio 1.42.0",
  "tracing",
  "url",
  "zeroize",
@@ -628,9 +636,9 @@ dependencies = [
 
 [[package]]
 name = "aws-runtime"
-version = "1.5.4"
+version = "1.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bee7643696e7fdd74c10f9eb42848a87fe469d35eae9c3323f80aa98f350baac"
+checksum = "44f6f1124d6e19ab6daf7f2e615644305dc6cb2d706892a8a8c0b98db35de020"
 dependencies = [
  "aws-credential-types",
  "aws-sigv4",
@@ -643,20 +651,24 @@ dependencies = [
  "aws-types",
  "bytes 1.9.0",
  "fastrand 2.3.0",
+ "bytes 1.9.0",
+ "fastrand 2.3.0",
  "http 0.2.12",
  "http-body 0.4.6",
+ "http-body 0.4.6",
  "once_cell",
  "percent-encoding",
- "pin-project-lite 0.2.16",
+ "pin-project-lite 0.2.15",
  "tracing",
  "uuid",
+ "uuid",
 ]
 
 [[package]]
 name = "aws-sdk-s3"
-version = "1.71.0"
+version = "1.67.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "705cb534fb7b620f540d2fac268d378918dc67d25b173f67edcab3851fe19392"
+checksum = "bbc644164269a1e38ce7f2f7373629d3fb3d310c0e3feb5573a29744288b24d3"
 dependencies = [
  "aws-credential-types",
  "aws-runtime",
@@ -673,11 +685,15 @@ dependencies = [
  "aws-types",
  "bytes 1.9.0",
  "fastrand 2.3.0",
+ "bytes 1.9.0",
+ "fastrand 2.3.0",
  "hex",
  "hmac",
  "http 0.2.12",
  "http-body 0.4.6",
  "lru 0.12.5",
+ "http-body 0.4.6",
+ "lru 0.12.5",
  "once_cell",
  "percent-encoding",
  "regex-lite",
@@ -688,9 +704,9 @@ dependencies = [
 
 [[package]]
 name = "aws-sdk-sso"
-version = "1.56.0"
+version = "1.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "12e057fdcb8842de9b83592a70f5b4da0ee10bc0ad278247da1425a742a444d7"
+checksum = "cb25f7129c74d36afe33405af4517524df8f74b635af8c2c8e91c1552b8397b2"
 dependencies = [
  "aws-credential-types",
  "aws-runtime",
@@ -702,6 +718,7 @@ dependencies = [
  "aws-smithy-types",
  "aws-types",
  "bytes 1.9.0",
+ "bytes 1.9.0",
  "http 0.2.12",
  "once_cell",
  "regex-lite",
@@ -710,9 +727,9 @@ dependencies = [
 
 [[package]]
 name = "aws-sdk-ssooidc"
-version = "1.57.1"
+version = "1.53.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a120ade4a44691b3c5c2ff2fa61b14ed331fdc218397f61ab48d66593012ae2a"
+checksum = "d03a3d5ef14851625eafd89660a751776f938bf32f309308b20dcca41c44b568"
 dependencies = [
  "aws-credential-types",
  "aws-runtime",
@@ -724,6 +741,7 @@ dependencies = [
  "aws-smithy-types",
  "aws-types",
  "bytes 1.9.0",
+ "bytes 1.9.0",
  "http 0.2.12",
  "once_cell",
  "regex-lite",
@@ -732,9 +750,9 @@ dependencies = [
 
 [[package]]
 name = "aws-sdk-sts"
-version = "1.57.0"
+version = "1.53.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "115fd4fb663817ed595a5ee4f1649d7aacd861d47462323cb37576ce89271b93"
+checksum = "cf3a9f073ae3a53b54421503063dfb87ff1ea83b876f567d92e8b8d9942ba91b"
 dependencies = [
  "aws-credential-types",
  "aws-runtime",
@@ -755,9 +773,9 @@ dependencies = [
 
 [[package]]
 name = "aws-sigv4"
-version = "1.2.7"
+version = "1.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "690118821e46967b3c4501d67d7d52dd75106a9c54cf36cefa1985cedbe94e05"
+checksum = "7d3820e0c08d0737872ff3c7c1f21ebbb6693d832312d6152bf18ef50a5471c2"
 dependencies = [
  "aws-credential-types",
  "aws-smithy-eventstream",
@@ -765,16 +783,19 @@ dependencies = [
  "aws-smithy-runtime-api",
  "aws-smithy-types",
  "bytes 1.9.0",
+ "bytes 1.9.0",
  "crypto-bigint 0.5.5",
  "form_urlencoded",
  "hex",
  "hmac",
  "http 0.2.12",
  "http 1.2.0",
+ "http 1.2.0",
  "once_cell",
  "p256 0.11.1",
+ "p256 0.11.1",
  "percent-encoding",
- "ring 0.17.8",
+ "ring",
  "sha2",
  "subtle",
  "time",
@@ -784,32 +805,34 @@ dependencies = [
 
 [[package]]
 name = "aws-smithy-async"
-version = "1.2.4"
+version = "1.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa59d1327d8b5053c54bf2eaae63bf629ba9e904434d0835a28ed3c0ed0a614e"
+checksum = "427cb637d15d63d6f9aae26358e1c9a9c09d5aa490d64b09354c8217cfef0f28"
 dependencies = [
  "futures-util",
- "pin-project-lite 0.2.16",
- "tokio 1.43.0",
+ "pin-project-lite 0.2.15",
+ "tokio 1.42.0",
 ]
 
 [[package]]
 name = "aws-smithy-checksums"
-version = "0.62.0"
+version = "0.60.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2f45a1c384d7a393026bc5f5c177105aa9fa68e4749653b985707ac27d77295"
+checksum = "ba1a71073fca26775c8b5189175ea8863afb1c9ea2cceb02a5de5ad9dfbaa795"
 dependencies = [
  "aws-smithy-http",
  "aws-smithy-types",
  "bytes 1.9.0",
+ "bytes 1.9.0",
  "crc32c",
  "crc32fast",
  "crc64fast-nvme",
  "hex",
  "http 0.2.12",
  "http-body 0.4.6",
+ "http-body 0.4.6",
  "md-5",
- "pin-project-lite 0.2.16",
+ "pin-project-lite 0.2.15",
  "sha1",
  "sha2",
  "tracing",
@@ -817,41 +840,44 @@ dependencies = [
 
 [[package]]
 name = "aws-smithy-eventstream"
-version = "0.60.6"
+version = "0.60.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b18559a41e0c909b77625adf2b8c50de480a8041e5e4a3f5f7d177db70abc5a"
+checksum = "cef7d0a272725f87e51ba2bf89f8c21e4df61b9e49ae1ac367a6d69916ef7c90"
 dependencies = [
  "aws-smithy-types",
  "bytes 1.9.0",
+ "bytes 1.9.0",
  "crc32fast",
 ]
 
 [[package]]
 name = "aws-smithy-http"
-version = "0.60.12"
+version = "0.60.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7809c27ad8da6a6a68c454e651d4962479e81472aa19ae99e59f9aba1f9713cc"
+checksum = "5c8bc3e8fdc6b8d07d976e301c02fe553f72a39b7a9fea820e023268467d7ab6"
 dependencies = [
  "aws-smithy-eventstream",
  "aws-smithy-runtime-api",
  "aws-smithy-types",
  "bytes 1.9.0",
+ "bytes 1.9.0",
  "bytes-utils",
  "futures-core",
  "http 0.2.12",
  "http-body 0.4.6",
+ "http-body 0.4.6",
  "once_cell",
  "percent-encoding",
- "pin-project-lite 0.2.16",
+ "pin-project-lite 0.2.15",
  "pin-utils",
  "tracing",
 ]
 
 [[package]]
 name = "aws-smithy-json"
-version = "0.61.2"
+version = "0.61.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "623a51127f24c30776c8b374295f2df78d92517386f77ba30773f15a30ce1422"
+checksum = "ee4e69cc50921eb913c6b662f8d909131bb3e6ad6cb6090d3a39b66fc5c52095"
 dependencies = [
  "aws-smithy-types",
 ]
@@ -868,9 +894,9 @@ dependencies = [
 
 [[package]]
 name = "aws-smithy-runtime"
-version = "1.7.7"
+version = "1.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "865f7050bbc7107a6c98a397a9fcd9413690c27fa718446967cf03b2d3ac517e"
+checksum = "a05dd41a70fc74051758ee75b5c4db2c0ca070ed9229c3df50e9475cda1cb985"
 dependencies = [
  "aws-smithy-async",
  "aws-smithy-http",
@@ -878,69 +904,83 @@ dependencies = [
  "aws-smithy-types",
  "bytes 1.9.0",
  "fastrand 2.3.0",
+ "bytes 1.9.0",
+ "fastrand 2.3.0",
  "h2 0.3.26",
  "http 0.2.12",
  "http-body 0.4.6",
  "http-body 1.0.1",
+ "http-body 0.4.6",
+ "http-body 1.0.1",
  "httparse",
  "hyper 0.14.32",
+ "hyper 0.14.32",
  "hyper-rustls 0.24.2",
  "once_cell",
- "pin-project-lite 0.2.16",
+ "pin-project-lite 0.2.15",
  "pin-utils",
  "rustls 0.21.12",
- "tokio 1.43.0",
+ "tokio 1.42.0",
  "tracing",
 ]
 
 [[package]]
 name = "aws-smithy-runtime-api"
 version = "1.7.3"
+version = "1.7.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "92165296a47a812b267b4f41032ff8069ab7ff783696d217f0994a0d7ab585cd"
+checksum = "92165296a47a812b267b4f41032ff8069ab7ff783696d217f0994a0d7ab585cd"
 dependencies = [
  "aws-smithy-async",
  "aws-smithy-types",
  "bytes 1.9.0",
+ "bytes 1.9.0",
  "http 0.2.12",
  "http 1.2.0",
- "pin-project-lite 0.2.16",
- "tokio 1.43.0",
+ "pin-project-lite 0.2.15",
+ "tokio 1.42.0",
  "tracing",
  "zeroize",
 ]
 
 [[package]]
 name = "aws-smithy-types"
-version = "1.2.12"
+version = "1.2.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a28f6feb647fb5e0d5b50f0472c19a7db9462b74e2fec01bb0b44eedcc834e97"
+checksum = "38ddc9bd6c28aeb303477170ddd183760a956a03e083b3902a990238a7e3792d"
 dependencies = [
  "base64-simd",
  "bytes 1.9.0",
+ "bytes 1.9.0",
  "bytes-utils",
  "futures-core",
  "http 0.2.12",
  "http 1.2.0",
  "http-body 0.4.6",
  "http-body 1.0.1",
+ "http 1.2.0",
+ "http-body 0.4.6",
+ "http-body 1.0.1",
  "http-body-util",
  "itoa",
  "num-integer",
- "pin-project-lite 0.2.16",
+ "pin-project-lite 0.2.15",
  "pin-utils",
  "ryu",
  "serde",
  "time",
- "tokio 1.43.0",
+ "tokio 1.42.0",
  "tokio-util",
 ]
 
 [[package]]
 name = "aws-smithy-xml"
 version = "0.60.9"
+version = "0.60.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ab0b0166827aa700d3dc519f72f8b3a91c35d0b8d042dc5d643a91e6f80648fc"
+checksum = "ab0b0166827aa700d3dc519f72f8b3a91c35d0b8d042dc5d643a91e6f80648fc"
 dependencies = [
  "xmlparser",
 ]
@@ -955,24 +995,29 @@ dependencies = [
  "aws-smithy-async",
  "aws-smithy-runtime-api",
  "aws-smithy-types",
- "rustc_version 0.4.1",
+ "rustc_version",
  "tracing",
 ]
 
 [[package]]
 name = "axum"
 version = "0.7.9"
+version = "0.7.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "edca88bc138befd0323b20752846e6587272d3b03b0343c8ea28a6f819e6e71f"
+checksum = "edca88bc138befd0323b20752846e6587272d3b03b0343c8ea28a6f819e6e71f"
 dependencies = [
  "async-trait",
  "axum-core",
  "bytes 1.9.0",
+ "bytes 1.9.0",
  "futures-util",
  "http 1.2.0",
  "http-body 1.0.1",
+ "http 1.2.0",
+ "http-body 1.0.1",
  "http-body-util",
- "hyper 1.6.0",
+ "hyper 1.5.2",
  "hyper-util",
  "itoa",
  "matchit",
@@ -980,14 +1025,14 @@ dependencies = [
  "mime",
  "multer",
  "percent-encoding",
- "pin-project-lite 0.2.16",
+ "pin-project-lite 0.2.15",
  "rustversion",
  "serde",
  "serde_json",
  "serde_path_to_error",
  "serde_urlencoded",
  "sync_wrapper 1.0.2",
- "tokio 1.43.0",
+ "tokio 1.42.0",
  "tower",
  "tower-layer",
  "tower-service",
@@ -997,19 +1042,25 @@ dependencies = [
 [[package]]
 name = "axum-core"
 version = "0.4.5"
+version = "0.4.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "09f2bd6146b97ae3359fa0cc6d6b376d9539582c7b4220f041a33ec24c226199"
+checksum = "09f2bd6146b97ae3359fa0cc6d6b376d9539582c7b4220f041a33ec24c226199"
 dependencies = [
  "async-trait",
  "bytes 1.9.0",
+ "bytes 1.9.0",
  "futures-util",
  "http 1.2.0",
  "http-body 1.0.1",
+ "http 1.2.0",
+ "http-body 1.0.1",
  "http-body-util",
  "mime",
- "pin-project-lite 0.2.16",
+ "pin-project-lite 0.2.15",
  "rustversion",
  "sync_wrapper 1.0.2",
+ "sync_wrapper 1.0.2",
  "tower-layer",
  "tower-service",
  "tracing",
@@ -1018,21 +1069,27 @@ dependencies = [
 [[package]]
 name = "axum-extra"
 version = "0.9.6"
+version = "0.9.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c794b30c904f0a1c2fb7740f7df7f7972dfaa14ef6f57cb6178dc63e5dca2f04"
+checksum = "c794b30c904f0a1c2fb7740f7df7f7972dfaa14ef6f57cb6178dc63e5dca2f04"
 dependencies = [
  "axum",
  "axum-core",
  "bytes 1.9.0",
  "fastrand 2.3.0",
+ "bytes 1.9.0",
+ "fastrand 2.3.0",
  "futures-util",
  "headers",
  "http 1.2.0",
  "http-body 1.0.1",
+ "http 1.2.0",
+ "http-body 1.0.1",
  "http-body-util",
  "mime",
  "multer",
- "pin-project-lite 0.2.16",
+ "pin-project-lite 0.2.15",
  "serde",
  "tower",
  "tower-layer",
@@ -1042,60 +1099,71 @@ dependencies = [
 [[package]]
 name = "axum-macros"
 version = "0.4.2"
+version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "57d123550fa8d071b7255cb0cc04dc302baa6c8c4a79f55701552684d8399bce"
+checksum = "57d123550fa8d071b7255cb0cc04dc302baa6c8c4a79f55701552684d8399bce"
 dependencies = [
  "proc-macro2",
  "quote 1.0.38",
- "syn 2.0.96",
+ "syn 2.0.94",
 ]
 
 [[package]]
 name = "axum_typed_multipart"
 version = "0.12.2"
+version = "0.12.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "05679dcdfeccf4cc6a8f45b80318fff8a9908337da1cfeb6acca00562a345b4d"
+checksum = "05679dcdfeccf4cc6a8f45b80318fff8a9908337da1cfeb6acca00562a345b4d"
 dependencies = [
  "anyhow",
  "axum",
  "axum_typed_multipart_macros",
  "bytes 1.9.0",
+ "bytes 1.9.0",
  "chrono",
  "futures-core",
  "futures-util",
  "tempfile",
  "thiserror 1.0.69",
- "tokio 1.43.0",
+ "tokio 1.42.0",
  "uuid",
 ]
 
 [[package]]
 name = "axum_typed_multipart_macros"
 version = "0.12.2"
+version = "0.12.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "11eeb275b20a4c750c9fe7bf5a750e97e7944563003efd1c82e70c229a612ca1"
+checksum = "11eeb275b20a4c750c9fe7bf5a750e97e7944563003efd1c82e70c229a612ca1"
 dependencies = [
  "darling 0.20.10",
- "heck 0.5.0",
+ "heck",
  "proc-macro-error",
  "quote 1.0.38",
- "syn 2.0.96",
+ "syn 2.0.94",
  "ubyte",
 ]
 
 [[package]]
 name = "backtrace"
 version = "0.3.74"
+version = "0.3.74"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8d82cb332cdfaed17ae235a638438ac4d4839913cc2af585c3c6746e8f8bee1a"
+checksum = "8d82cb332cdfaed17ae235a638438ac4d4839913cc2af585c3c6746e8f8bee1a"
 dependencies = [
  "addr2line",
  "cfg-if",
  "libc",
  "miniz_oxide",
+ "miniz_oxide",
  "object",
  "rustc-demangle",
  "windows-targets 0.52.6",
+ "windows-targets 0.52.6",
 ]
 
 [[package]]
@@ -1110,6 +1178,12 @@ version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4c7f02d4ea65f2c1853089ffd8d2787bdbc63de2f0d29dedbcf8ccdfa0ccd4cf"
 
+[[package]]
+name = "base16ct"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4c7f02d4ea65f2c1853089ffd8d2787bdbc63de2f0d29dedbcf8ccdfa0ccd4cf"
+
 [[package]]
 name = "base32"
 version = "0.4.0"
@@ -1119,14 +1193,18 @@ checksum = "23ce669cd6c8588f79e15cf450314f9638f967fc5770ff1c7c1deb0925ea7cfa"
 [[package]]
 name = "base64"
 version = "0.13.1"
+version = "0.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8"
+checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8"
 
 [[package]]
 name = "base64"
 version = "0.21.7"
+version = "0.21.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567"
+checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567"
 
 [[package]]
 name = "base64"
@@ -1168,9 +1246,25 @@ dependencies = [
 [[package]]
 name = "binstring"
 version = "0.1.2"
+version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ed79c2a8151273c70956b5e3cdfdc1ff6c1a8b9779ba59c6807d281b32ee2f86"
 
+[[package]]
+name = "bit-set"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "08807e080ed7f9d5433fa9b275196cfc35414f66a0c79d864dc51a0d825231a3"
+dependencies = [
+ "bit-vec",
+]
+
+[[package]]
+name = "bit-vec"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5e764a1d40d510daf35e07be9eb06e75770908c27d411ee6c92109c9840eaaf7"
+
 [[package]]
 name = "bit_field"
 version = "0.10.2"
@@ -1198,65 +1292,91 @@ checksum = "8f68f53c83ab957f72c32642f3868eec03eb974d1fb82e453128456482613d36"
 [[package]]
 name = "bitstream-io"
 version = "2.6.0"
+version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6099cdc01846bc367c4e7dd630dc5966dccf36b652fae7a74e17b640411a91b2"
+checksum = "6099cdc01846bc367c4e7dd630dc5966dccf36b652fae7a74e17b640411a91b2"
 
 [[package]]
 name = "bitvec"
 version = "1.0.1"
+name = "bitvec"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1bc2832c24239b0141d5674bb9174f9d68a8b5b3f2753311927c172ca46f7e9c"
+checksum = "1bc2832c24239b0141d5674bb9174f9d68a8b5b3f2753311927c172ca46f7e9c"
 dependencies = [
  "funty",
  "radium",
  "tap",
  "wyz",
+ "funty",
+ "radium",
+ "tap",
+ "wyz",
 ]
 
 [[package]]
 name = "blake2b_simd"
 version = "1.0.2"
+name = "blake2b_simd"
+version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "23285ad32269793932e830392f2fe2f83e26488fd3ec778883a93c8323735780"
+checksum = "23285ad32269793932e830392f2fe2f83e26488fd3ec778883a93c8323735780"
 dependencies = [
  "arrayref",
  "arrayvec",
  "constant_time_eq",
+ "arrayref",
+ "arrayvec",
+ "constant_time_eq",
 ]
 
 [[package]]
 name = "block-buffer"
 version = "0.10.4"
+version = "0.10.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71"
+checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71"
 dependencies = [
  "generic-array 0.14.7",
+ "generic-array 0.14.7",
 ]
 
 [[package]]
 name = "blocking"
 version = "1.6.1"
+version = "1.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "703f41c54fc768e63e091340b424302bb1c29ef4aa0c7f10fe849dfb114d29ea"
+checksum = "703f41c54fc768e63e091340b424302bb1c29ef4aa0c7f10fe849dfb114d29ea"
 dependencies = [
+ "async-channel 2.3.1",
  "async-channel 2.3.1",
  "async-task",
  "futures-io",
- "futures-lite 2.6.0",
+ "futures-lite 2.5.0",
  "piper",
 ]
 
 [[package]]
 name = "bson"
 version = "2.13.0"
+version = "2.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "068208f2b6fcfa27a7f1ee37488d2bb8ba2640f68f5475d08e1d9130696aba59"
+checksum = "068208f2b6fcfa27a7f1ee37488d2bb8ba2640f68f5475d08e1d9130696aba59"
 dependencies = [
+ "ahash 0.8.11",
+ "base64 0.13.1",
+ "bitvec",
  "ahash 0.8.11",
  "base64 0.13.1",
  "bitvec",
  "hex",
- "indexmap 2.7.1",
+ "indexmap 2.7.0",
  "js-sys",
  "once_cell",
  "rand 0.8.5",
@@ -1265,31 +1385,41 @@ dependencies = [
  "serde_json",
  "time",
  "uuid",
+ "time",
+ "uuid",
 ]
 
 [[package]]
 name = "built"
 version = "0.7.5"
+version = "0.7.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c360505aed52b7ec96a3636c3f039d99103c37d1d9b4f7a8c743d3ea9ffcd03b"
+checksum = "c360505aed52b7ec96a3636c3f039d99103c37d1d9b4f7a8c743d3ea9ffcd03b"
 
 [[package]]
 name = "bumpalo"
 version = "3.16.0"
+version = "3.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c"
+checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c"
 
 [[package]]
 name = "bytemuck"
 version = "1.21.0"
+version = "1.21.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ef657dfab802224e671f5818e9a4935f9b1957ed18e58292690cc39e7a4092a3"
+checksum = "ef657dfab802224e671f5818e9a4935f9b1957ed18e58292690cc39e7a4092a3"
 
 [[package]]
 name = "byteorder"
 version = "1.5.0"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
+checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
 
 [[package]]
 name = "byteorder-lite"
@@ -1306,8 +1436,10 @@ checksum = "0e4cec68f03f32e44924783795810fa50a7035d8c8ebe78580ad7e6c703fba38"
 [[package]]
 name = "bytes"
 version = "1.9.0"
+version = "1.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "325918d6fe32f23b19878fe4b34794ae41fc19ddbe53b10571a4874d44ffd39b"
+checksum = "325918d6fe32f23b19878fe4b34794ae41fc19ddbe53b10571a4874d44ffd39b"
 
 [[package]]
 name = "bytes-utils"
@@ -1315,6 +1447,7 @@ version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7dafe3a8757b027e2be6e4e5601ed563c55989fcf1546e933c66c8eb3a058d35"
 dependencies = [
+ "bytes 1.9.0",
  "bytes 1.9.0",
  "either",
 ]
@@ -1333,7 +1466,7 @@ dependencies = [
  "instant",
  "once_cell",
  "thiserror 1.0.69",
- "tokio 1.43.0",
+ "tokio 1.42.0",
 ]
 
 [[package]]
@@ -1347,13 +1480,17 @@ dependencies = [
  "proc-macro2",
  "quote 1.0.38",
  "syn 1.0.109",
+ "quote 1.0.38",
+ "syn 1.0.109",
 ]
 
 [[package]]
 name = "cached_proc_macro_types"
 version = "0.1.1"
+version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ade8366b8bd5ba243f0a58f036cc0ca8a2f069cff1a2351ef1cac6b083e16fc0"
+checksum = "ade8366b8bd5ba243f0a58f036cc0ca8a2f069cff1a2351ef1cac6b083e16fc0"
 
 [[package]]
 name = "castaway"
@@ -1382,9 +1519,9 @@ dependencies = [
 
 [[package]]
 name = "cc"
-version = "1.2.10"
+version = "1.2.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "13208fcbb66eaeffe09b99fffbe1af420f00a7b35aa99ad683dfc1aa76145229"
+checksum = "a012a0df96dd6d06ba9a1b29d6402d1a5d77c6befd2566afdc26e10603dc93d7"
 dependencies = [
  "jobserver",
  "libc",
@@ -1400,6 +1537,7 @@ dependencies = [
  "byteorder",
  "fnv",
  "uuid",
+ "uuid",
 ]
 
 [[package]]
@@ -1421,13 +1559,16 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 [[package]]
 name = "chrono"
 version = "0.4.39"
+version = "0.4.39"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7e36cc9d416881d2e24f9a963be5fb1cd90966419ac844274161d10488b3e825"
+checksum = "7e36cc9d416881d2e24f9a963be5fb1cd90966419ac844274161d10488b3e825"
 dependencies = [
  "android-tzdata",
  "iana-time-zone",
  "js-sys",
  "num-traits",
+ "serde",
  "wasm-bindgen",
  "windows-targets 0.52.6",
 ]
@@ -1481,11 +1622,14 @@ dependencies = [
 [[package]]
 name = "coarsetime"
 version = "0.1.35"
+version = "0.1.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4252bf230cb600c19826a575b31c8c9c84c6f11acfab6dfcad2e941b10b6f8e2"
+checksum = "4252bf230cb600c19826a575b31c8c9c84c6f11acfab6dfcad2e941b10b6f8e2"
 dependencies = [
  "libc",
  "wasix",
+ "wasix",
  "wasm-bindgen",
 ]
 
@@ -1504,14 +1648,17 @@ checksum = "5b63caa9aa9397e2d9480a9b13673856c78d8ac123288526c37d7839f2a86990"
 [[package]]
 name = "combine"
 version = "4.6.7"
+version = "4.6.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ba5a308b75df32fe02788e748662718f03fde005016435c444eea572398219fd"
+checksum = "ba5a308b75df32fe02788e748662718f03fde005016435c444eea572398219fd"
 dependencies = [
+ "bytes 1.9.0",
  "bytes 1.9.0",
  "futures-core",
  "memchr",
- "pin-project-lite 0.2.16",
- "tokio 1.43.0",
+ "pin-project-lite 0.2.15",
+ "tokio 1.42.0",
  "tokio-util",
 ]
 
@@ -1527,8 +1674,10 @@ dependencies = [
 [[package]]
 name = "config"
 version = "0.13.4"
+version = "0.13.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "23738e11972c7643e4ec947840fc463b6a571afcd3e735bdfce7d03c7a784aca"
+checksum = "23738e11972c7643e4ec947840fc463b6a571afcd3e735bdfce7d03c7a784aca"
 dependencies = [
  "async-trait",
  "json5",
@@ -1540,6 +1689,7 @@ dependencies = [
  "serde",
  "serde_json",
  "toml 0.5.11",
+ "toml 0.5.11",
  "yaml-rust",
 ]
 
@@ -1552,15 +1702,25 @@ checksum = "9d6f2aa4d0537bcc1c74df8755072bd31c1ef1a3a1b85a68e8404a8c353b7b8b"
 [[package]]
 name = "const-oid"
 version = "0.9.6"
+version = "0.9.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8"
+checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8"
 
 [[package]]
 name = "constant_time_eq"
 version = "0.3.1"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7c74b8349d32d297c9134b8c88677813a227df8f779daa29bfc29c183fe3dca6"
 
+[[package]]
+name = "convert_case"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e"
+checksum = "7c74b8349d32d297c9134b8c88677813a227df8f779daa29bfc29c183fe3dca6"
+
 [[package]]
 name = "convert_case"
 version = "0.4.0"
@@ -1581,17 +1741,24 @@ dependencies = [
 [[package]]
 name = "cookie-factory"
 version = "0.3.3"
+version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9885fa71e26b8ab7855e2ec7cae6e9b380edff76cd052e07c683a0319d51b3a2"
 dependencies = [
  "futures",
 ]
+checksum = "9885fa71e26b8ab7855e2ec7cae6e9b380edff76cd052e07c683a0319d51b3a2"
+dependencies = [
+ "futures",
+]
 
 [[package]]
 name = "core-foundation"
 version = "0.9.4"
+version = "0.9.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f"
+checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f"
 dependencies = [
  "core-foundation-sys",
  "libc",
@@ -1600,8 +1767,10 @@ dependencies = [
 [[package]]
 name = "core-foundation-sys"
 version = "0.8.7"
+version = "0.8.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b"
+checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b"
 
 [[package]]
 name = "core_maths"
@@ -1614,9 +1783,9 @@ dependencies = [
 
 [[package]]
 name = "cpufeatures"
-version = "0.2.17"
+version = "0.2.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "59ed5838eebb26a2bb2e58f6d5b5316989ae9d08bab10e0e6d103e656d1b0280"
+checksum = "16b80225097f2e5ae4e7179dd2266824648f3e2f49d9134d584b76389d31c4c3"
 dependencies = [
  "libc",
 ]
@@ -1648,7 +1817,7 @@ version = "0.6.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3a47af21622d091a8f0fb295b88bc886ac74efcc613efc19f5d0b21de5c89e47"
 dependencies = [
- "rustc_version 0.4.1",
+ "rustc_version",
 ]
 
 [[package]]
@@ -1670,16 +1839,6 @@ dependencies = [
  "revolt-files",
 ]
 
-[[package]]
-name = "crossbeam-channel"
-version = "0.5.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d5e2ee08013e3f228d6d2394116c4549a6df77708442c62d887d83f68ef2ee37"
-dependencies = [
- "cbindgen",
- "crc",
-]
-
 [[package]]
 name = "crossbeam-channel"
 version = "0.5.14"
@@ -1692,8 +1851,10 @@ dependencies = [
 [[package]]
 name = "crossbeam-deque"
 version = "0.8.6"
+version = "0.8.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9dd111b7b7f7d55b72c0a6ae361660ee5853c9af73f70c3c2ef6858b950e2e51"
+checksum = "9dd111b7b7f7d55b72c0a6ae361660ee5853c9af73f70c3c2ef6858b950e2e51"
 dependencies = [
  "crossbeam-epoch",
  "crossbeam-utils",
@@ -1711,8 +1872,10 @@ dependencies = [
 [[package]]
 name = "crossbeam-queue"
 version = "0.3.12"
+version = "0.3.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0f58bbc28f91df819d0aa2a2c00cd19754769c2fad90579b3592b1c9ba7a3115"
+checksum = "0f58bbc28f91df819d0aa2a2c00cd19754769c2fad90579b3592b1c9ba7a3115"
 dependencies = [
  "crossbeam-utils",
 ]
@@ -1720,8 +1883,10 @@ dependencies = [
 [[package]]
 name = "crossbeam-utils"
 version = "0.8.21"
+version = "0.8.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28"
+checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28"
 
 [[package]]
 name = "crunchy"
@@ -1735,6 +1900,7 @@ version = "0.4.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ef2b4b23cddf68b89b8f8069890e8c270d54e2d5fe1b143820234805e4cb17ef"
 dependencies = [
+ "generic-array 0.14.7",
  "generic-array 0.14.7",
  "rand_core 0.6.4",
  "subtle",
@@ -1747,10 +1913,12 @@ version = "0.5.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0dc92fb57ca44df6db8059111ab3af99a63d5d0f8375d9972e319a379c6bab76"
 dependencies = [
+ "generic-array 0.14.7",
  "generic-array 0.14.7",
  "rand_core 0.6.4",
  "subtle",
  "zeroize",
+ "zeroize",
 ]
 
 [[package]]
@@ -1759,6 +1927,7 @@ version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3"
 dependencies = [
+ "generic-array 0.14.7",
  "generic-array 0.14.7",
  "rand_core 0.6.4",
  "typenum",
@@ -1784,14 +1953,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "13b588ba4ac1a99f7f2964d24b3d896ddc6bf847ee3855dbd4366f058cfcd331"
 dependencies = [
  "quote 1.0.38",
- "syn 2.0.96",
+ "syn 2.0.94",
 ]
 
 [[package]]
 name = "ct-codecs"
 version = "1.1.3"
+version = "1.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b916ba8ce9e4182696896f015e8a5ae6081b305f74690baa8465e35f5a142ea4"
+checksum = "b916ba8ce9e4182696896f015e8a5ae6081b305f74690baa8465e35f5a142ea4"
 
 [[package]]
 name = "ctr"
@@ -1805,8 +1976,10 @@ dependencies = [
 [[package]]
 name = "curl"
 version = "0.4.47"
+version = "0.4.47"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d9fb4d13a1be2b58f14d60adba57c9834b78c62fd86c3e76a148f732686e9265"
+checksum = "d9fb4d13a1be2b58f14d60adba57c9834b78c62fd86c3e76a148f732686e9265"
 dependencies = [
  "curl-sys",
  "libc",
@@ -1815,13 +1988,17 @@ dependencies = [
  "schannel",
  "socket2 0.5.8",
  "windows-sys 0.52.0",
+ "socket2 0.5.8",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
 name = "curl-sys"
 version = "0.4.78+curl-8.11.0"
+version = "0.4.78+curl-8.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8eec768341c5c7789611ae51cf6c459099f22e64a5d5d0ce4892434e33821eaf"
+checksum = "8eec768341c5c7789611ae51cf6c459099f22e64a5d5d0ce4892434e33821eaf"
 dependencies = [
  "cc",
  "libc",
@@ -1831,6 +2008,7 @@ dependencies = [
  "pkg-config",
  "vcpkg",
  "windows-sys 0.52.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -1873,8 +2051,10 @@ dependencies = [
  "ident_case",
  "proc-macro2",
  "quote 1.0.38",
+ "quote 1.0.38",
  "strsim 0.10.0",
  "syn 1.0.109",
+ "syn 1.0.109",
 ]
 
 [[package]]
@@ -1887,8 +2067,10 @@ dependencies = [
  "ident_case",
  "proc-macro2",
  "quote 1.0.38",
+ "quote 1.0.38",
  "strsim 0.10.0",
  "syn 1.0.109",
+ "syn 1.0.109",
 ]
 
 [[package]]
@@ -1901,8 +2083,9 @@ dependencies = [
  "ident_case",
  "proc-macro2",
  "quote 1.0.38",
+ "quote 1.0.38",
  "strsim 0.11.1",
- "syn 2.0.96",
+ "syn 2.0.94",
 ]
 
 [[package]]
@@ -1914,6 +2097,8 @@ dependencies = [
  "darling_core 0.13.4",
  "quote 1.0.38",
  "syn 1.0.109",
+ "quote 1.0.38",
+ "syn 1.0.109",
 ]
 
 [[package]]
@@ -1925,6 +2110,8 @@ dependencies = [
  "darling_core 0.14.4",
  "quote 1.0.38",
  "syn 1.0.109",
+ "quote 1.0.38",
+ "syn 1.0.109",
 ]
 
 [[package]]
@@ -1935,27 +2122,31 @@ checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806"
 dependencies = [
  "darling_core 0.20.10",
  "quote 1.0.38",
- "syn 2.0.96",
+ "syn 2.0.94",
 ]
 
 [[package]]
 name = "dashmap"
 version = "5.5.3"
+version = "5.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856"
+checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856"
 dependencies = [
  "cfg-if",
  "hashbrown 0.14.5",
+ "hashbrown 0.14.5",
  "lock_api",
  "once_cell",
+ "once_cell",
  "parking_lot_core",
 ]
 
 [[package]]
 name = "data-encoding"
-version = "2.7.0"
+version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e60eed09d8c01d3cee5b7d30acb059b76614c918fa0f992e0dd6eeb10daad6f"
+checksum = "e8566979429cf69b49a5c740c60791108e86440e8be149bbea4fe54d2c32d6e2"
 
 [[package]]
 name = "data-url"
@@ -1970,7 +2161,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "16a2561fd313df162315935989dceb8c99db4ee1933358270a57a3cfb8c957f3"
 dependencies = [
  "crossbeam-queue",
- "tokio 1.43.0",
+ "tokio 1.42.0",
 ]
 
 [[package]]
@@ -1981,13 +2172,16 @@ checksum = "bef552e6f588e446098f6ba40d89ac146c8c7b64aade83c051ee00bb5d2bc18d"
 dependencies = [
  "serde",
  "uuid",
+ "uuid",
 ]
 
 [[package]]
 name = "decancer"
 version = "1.6.5"
+version = "1.6.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "080b09f6adad25c23d8c47c54e52e59b0dc09d079c4b23e0f147dac440359d0d"
+checksum = "080b09f6adad25c23d8c47c54e52e59b0dc09d079c4b23e0f147dac440359d0d"
 
 [[package]]
 name = "der"
@@ -2010,6 +2204,19 @@ dependencies = [
  "zeroize",
 ]
 
+[[package]]
+name = "der"
+version = "0.7.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f55bf8e7b65898637379c1b74eb1551107c8294ed26d855ceb9fd1a09cfc9bc0"
+dependencies = [
+ "const-oid 0.9.6",
+ "pem-rfc7468 0.7.0",
+ "const-oid 0.9.6",
+ "pem-rfc7468 0.6.0",
+ "zeroize",
+]
+
 [[package]]
 name = "der"
 version = "0.7.9"
@@ -2044,14 +2251,14 @@ dependencies = [
 ]
 
 [[package]]
-name = "derivative"
-version = "2.2.0"
+name = "derive-where"
+version = "1.2.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b"
+checksum = "62d671cc41a825ebabc75757b62d3d168c577f9149b2d49ece1dad1f72119d25"
 dependencies = [
  "proc-macro2",
  "quote 1.0.38",
- "syn 1.0.109",
+ "syn 2.0.94",
 ]
 
 [[package]]
@@ -2060,11 +2267,12 @@ version = "0.99.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5f33878137e4dafd7fa914ad4e259e18a4e8e532b9617a2d0150262bf53abfce"
 dependencies = [
+ "convert_case",
  "convert_case",
  "proc-macro2",
  "quote 1.0.38",
- "rustc_version 0.4.1",
- "syn 2.0.96",
+ "rustc_version",
+ "syn 2.0.94",
 ]
 
 [[package]]
@@ -2085,6 +2293,7 @@ checksum = "71b28680d8be17a570a2334922518be6adc3f58ecc880cbb404eaeb8624fd867"
 dependencies = [
  "devise_core",
  "quote 1.0.38",
+ "quote 1.0.38",
 ]
 
 [[package]]
@@ -2097,30 +2306,39 @@ dependencies = [
  "proc-macro2",
  "proc-macro2-diagnostics",
  "quote 1.0.38",
- "syn 2.0.96",
+ "syn 2.0.94",
 ]
 
 [[package]]
 name = "digest"
 version = "0.10.7"
+version = "0.10.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292"
+checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292"
 dependencies = [
  "block-buffer",
  "const-oid 0.9.6",
  "crypto-common",
  "subtle",
+ "block-buffer",
+ "const-oid 0.9.6",
+ "crypto-common",
+ "subtle",
 ]
 
 [[package]]
 name = "displaydoc"
 version = "0.2.5"
+name = "displaydoc"
+version = "0.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0"
+checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0"
 dependencies = [
  "proc-macro2",
  "quote 1.0.38",
- "syn 2.0.96",
+ "syn 2.0.94",
 ]
 
 [[package]]
@@ -2147,8 +2365,10 @@ dependencies = [
 [[package]]
 name = "dyn-clone"
 version = "1.0.17"
+version = "1.0.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0d6ef0072f8a535281e4876be788938b528e9a1d43900b82c2569af7da799125"
+checksum = "0d6ef0072f8a535281e4876be788938b528e9a1d43900b82c2569af7da799125"
 
 [[package]]
 name = "ecdsa"
@@ -2162,6 +2382,23 @@ dependencies = [
  "signature 1.6.4",
 ]
 
+[[package]]
+name = "ecdsa"
+version = "0.16.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ee27f32b5c5292967d2d4a9d7f1e0b0aed2c15daded5a60300e4abb9d8020bca"
+dependencies = [
+ "der 0.7.9",
+ "digest",
+ "elliptic-curve 0.13.8",
+ "rfc6979 0.4.0",
+ "signature 2.2.0",
+ "spki 0.7.3",
+ "elliptic-curve 0.12.3",
+ "rfc6979 0.3.1",
+ "signature 1.6.4",
+]
+
 [[package]]
 name = "ecdsa"
 version = "0.16.9"
@@ -2179,9 +2416,12 @@ dependencies = [
 [[package]]
 name = "ece"
 version = "2.3.1"
+version = "2.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c2ea1d2f2cc974957a4e2575d8e5bb494549bab66338d6320c2789abcfff5746"
+checksum = "c2ea1d2f2cc974957a4e2575d8e5bb494549bab66338d6320c2789abcfff5746"
 dependencies = [
+ "base64 0.21.7",
  "base64 0.21.7",
  "byteorder",
  "hex",
@@ -2192,13 +2432,16 @@ dependencies = [
  "serde",
  "sha2",
  "thiserror 1.0.69",
+ "thiserror 1.0.69",
 ]
 
 [[package]]
 name = "ed25519-compact"
 version = "2.1.1"
+version = "2.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e9b3460f44bea8cd47f45a0c70892f1eff856d97cd55358b2f73f663789f6190"
+checksum = "e9b3460f44bea8cd47f45a0c70892f1eff856d97cd55358b2f73f663789f6190"
 dependencies = [
  "ct-codecs",
  "getrandom",
@@ -2213,8 +2456,10 @@ checksum = "12a0bb14ac04a9fcf170d0bbbef949b44cc492f4452bd20c095636956f653642"
 [[package]]
 name = "either"
 version = "1.13.0"
+version = "1.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0"
+checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0"
 
 [[package]]
 name = "elliptic-curve"
@@ -2222,6 +2467,7 @@ version = "0.12.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e7bb888ab5300a19b8e5bceef25ac745ad065f3c9f7efc6de1b91958110891d3"
 dependencies = [
+ "base16ct 0.1.1",
  "base16ct 0.1.1",
  "crypto-bigint 0.4.9",
  "der 0.6.1",
@@ -2236,6 +2482,29 @@ dependencies = [
  "zeroize",
 ]
 
+[[package]]
+name = "elliptic-curve"
+version = "0.13.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b5e6043086bf7973472e0c7dff2142ea0b680d30e18d9cc40f267efbf222bd47"
+dependencies = [
+ "base16ct 0.2.0",
+ "crypto-bigint 0.5.5",
+ "digest",
+ "ff 0.13.0",
+ "generic-array 0.14.7",
+ "group 0.13.0",
+ "digest",
+ "ff 0.12.1",
+ "generic-array 0.14.7",
+ "group 0.12.1",
+ "pkcs8 0.9.0",
+ "rand_core 0.6.4",
+ "sec1 0.3.0",
+ "subtle",
+ "zeroize",
+]
+
 [[package]]
 name = "elliptic-curve"
 version = "0.13.8"
@@ -2251,8 +2520,11 @@ dependencies = [
  "hkdf",
  "pem-rfc7468 0.7.0",
  "pkcs8 0.10.2",
+ "pem-rfc7468 0.7.0",
+ "pkcs8 0.10.2",
  "rand_core 0.6.4",
  "sec1 0.7.3",
+ "sec1 0.7.3",
  "subtle",
  "zeroize",
 ]
@@ -2260,11 +2532,15 @@ dependencies = [
 [[package]]
 name = "email-encoding"
 version = "0.2.1"
+version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a87260449b06739ee78d6281c68d2a0ff3e3af64a78df63d3a1aeb3c06997c8a"
+checksum = "a87260449b06739ee78d6281c68d2a0ff3e3af64a78df63d3a1aeb3c06997c8a"
 dependencies = [
  "base64 0.22.1",
  "memchr",
+ "base64 0.22.1",
+ "memchr",
 ]
 
 [[package]]
@@ -2273,32 +2549,42 @@ version = "0.2.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e079f19b08ca6239f47f8ba8509c11cf3ea30095831f7fed61441475edd8c449"
 
+[[package]]
+name = "email_address"
+version = "0.2.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e079f19b08ca6239f47f8ba8509c11cf3ea30095831f7fed61441475edd8c449"
+
 [[package]]
 name = "encoding_rs"
 version = "0.8.35"
+version = "0.8.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "75030f3c4f45dafd7586dd6780965a8c7e8e285a5ecb86713e63a79c5b2766f3"
+checksum = "75030f3c4f45dafd7586dd6780965a8c7e8e285a5ecb86713e63a79c5b2766f3"
 dependencies = [
  "cfg-if",
 ]
 
 [[package]]
 name = "enum-as-inner"
-version = "0.4.0"
+version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21cdad81446a7f7dc43f6a77409efeb9733d2fa65553efef6018ef257c959b73"
+checksum = "a1e6a265c649f3f5979b601d26f1d05ada116434c87741c9493cb56218f76cbc"
 dependencies = [
- "heck 0.4.1",
+ "heck",
  "proc-macro2",
  "quote 1.0.38",
- "syn 1.0.109",
+ "syn 2.0.94",
 ]
 
 [[package]]
 name = "enum-iterator"
 version = "1.5.0"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9fd242f399be1da0a5354aa462d57b4ab2b4ee0683cc552f7c007d2d12d36e94"
+checksum = "9fd242f399be1da0a5354aa462d57b4ab2b4ee0683cc552f7c007d2d12d36e94"
 dependencies = [
  "enum-iterator-derive",
 ]
@@ -2306,12 +2592,14 @@ dependencies = [
 [[package]]
 name = "enum-iterator-derive"
 version = "1.4.0"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a1ab991c1362ac86c61ab6f556cff143daa22e5a15e4e189df818b2fd19fe65b"
+checksum = "a1ab991c1362ac86c61ab6f556cff143daa22e5a15e4e189df818b2fd19fe65b"
 dependencies = [
  "proc-macro2",
  "quote 1.0.38",
- "syn 2.0.96",
+ "syn 2.0.94",
 ]
 
 [[package]]
@@ -2336,8 +2624,10 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
 [[package]]
 name = "erased-serde"
 version = "0.3.31"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6c138974f9d5e7fe373eb04df7cae98833802ae4b11c24ac7039a21d5af4b26c"
+checksum = "6c138974f9d5e7fe373eb04df7cae98833802ae4b11c24ac7039a21d5af4b26c"
 dependencies = [
  "serde",
 ]
@@ -2345,18 +2635,23 @@ dependencies = [
 [[package]]
 name = "errno"
 version = "0.3.10"
+version = "0.3.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "33d852cb9b869c2a9b3df2f71a3074817f01e1844f839a144f5fcef059a4eb5d"
+checksum = "33d852cb9b869c2a9b3df2f71a3074817f01e1844f839a144f5fcef059a4eb5d"
 dependencies = [
  "libc",
  "windows-sys 0.59.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
 name = "event-listener"
 version = "2.5.3"
+version = "2.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0"
+checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0"
 
 [[package]]
 name = "event-listener"
@@ -2364,41 +2659,60 @@ version = "5.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3492acde4c3fc54c845eaab3eed8bd00c7a7d881f78bfc801e43a93dec1331ae"
 dependencies = [
+ "concurrent-queue",
  "concurrent-queue",
  "parking",
- "pin-project-lite 0.2.16",
+ "pin-project-lite 0.2.15",
 ]
 
 [[package]]
 name = "event-listener-strategy"
 version = "0.5.3"
+version = "0.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3c3e4e0dd3673c1139bf041f3008816d9cf2946bbfac2945c09e523b8d7b05b2"
+checksum = "3c3e4e0dd3673c1139bf041f3008816d9cf2946bbfac2945c09e523b8d7b05b2"
 dependencies = [
- "event-listener 5.4.0",
- "pin-project-lite 0.2.16",
+ "event-listener 5.3.1",
+ "pin-project-lite 0.2.15",
 ]
 
 [[package]]
 name = "exr"
 version = "1.73.0"
+version = "1.73.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f83197f59927b46c04a183a619b7c29df34e63e63c7869320862268c0ef687e0"
+checksum = "f83197f59927b46c04a183a619b7c29df34e63e63c7869320862268c0ef687e0"
 dependencies = [
  "bit_field",
  "half",
  "lebe",
  "miniz_oxide",
+ "miniz_oxide",
  "rayon-core",
  "smallvec",
  "zune-inflate",
 ]
 
+[[package]]
+name = "fancy-regex"
+version = "0.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6e24cb5a94bcae1e5408b0effca5cd7172ea3c5755049c5f3af4cd283a165298"
+dependencies = [
+ "bit-set",
+ "regex-automata 0.4.9",
+ "regex-syntax 0.8.5",
+]
+
 [[package]]
 name = "fastrand"
 version = "1.9.0"
+version = "1.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be"
+checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be"
 dependencies = [
  "instant",
 ]
@@ -2406,8 +2720,10 @@ dependencies = [
 [[package]]
 name = "fastrand"
 version = "2.3.0"
+version = "2.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be"
+checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be"
 
 [[package]]
 name = "fcm_v1"
@@ -2417,6 +2733,7 @@ checksum = "fc9ed4ed7618b2f7581edb6ce28794a10fcc335e196fc2bcf56afee99ad63d10"
 dependencies = [
  "async-trait",
  "reqwest 0.11.27",
+ "reqwest 0.11.27",
  "serde",
  "serde_json",
  "yup-oauth2",
@@ -2425,8 +2742,10 @@ dependencies = [
 [[package]]
 name = "fdeflate"
 version = "0.3.7"
+version = "0.3.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1e6853b52649d4ac5c0bd02320cddc5ba956bdb407c4b75a2c6b75bf51500f8c"
+checksum = "1e6853b52649d4ac5c0bd02320cddc5ba956bdb407c4b75a2c6b75bf51500f8c"
 dependencies = [
  "simd-adler32",
 ]
@@ -2451,6 +2770,16 @@ dependencies = [
  "subtle",
 ]
 
+[[package]]
+name = "ff"
+version = "0.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ded41244b729663b1e574f1b4fb731469f69f79c17667b5d776b16cda0479449"
+dependencies = [
+ "rand_core 0.6.4",
+ "subtle",
+]
+
 [[package]]
 name = "ffprobe"
 version = "0.4.0"
@@ -2464,13 +2793,17 @@ dependencies = [
 [[package]]
 name = "figment"
 version = "0.10.19"
+version = "0.10.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8cb01cd46b0cf372153850f4c6c272d9cbea2da513e07538405148f95bd789f3"
+checksum = "8cb01cd46b0cf372153850f4c6c272d9cbea2da513e07538405148f95bd789f3"
 dependencies = [
+ "atomic 0.6.0",
  "atomic 0.6.0",
  "pear",
  "serde",
  "toml 0.8.19",
+ "toml 0.8.19",
  "uncased",
  "version_check",
 ]
@@ -2496,11 +2829,14 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80"
 [[package]]
 name = "flate2"
 version = "1.0.35"
+version = "1.0.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c936bfdafb507ebbf50b8074c54fa31c5be9a1e7e5f467dd659697041407d07c"
+checksum = "c936bfdafb507ebbf50b8074c54fa31c5be9a1e7e5f467dd659697041407d07c"
 dependencies = [
  "crc32fast",
  "miniz_oxide",
+ "miniz_oxide",
 ]
 
 [[package]]
@@ -2524,6 +2860,12 @@ version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a0d2fde1f7b3d48b8395d5f2de76c18a528bd6a9cdde438df747bfcba3e05d6f"
 
+[[package]]
+name = "foldhash"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a0d2fde1f7b3d48b8395d5f2de76c18a528bd6a9cdde438df747bfcba3e05d6f"
+
 [[package]]
 name = "fontconfig-parser"
 version = "0.5.7"
@@ -2574,12 +2916,15 @@ dependencies = [
 [[package]]
 name = "fred"
 version = "8.0.6"
+version = "8.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4b8e3a1339ed45ad8fde94530c4bdcbd5f371a3c6bd3bf57682923792830aa37"
+checksum = "4b8e3a1339ed45ad8fde94530c4bdcbd5f371a3c6bd3bf57682923792830aa37"
 dependencies = [
  "arc-swap",
  "async-trait",
  "bytes 1.9.0",
+ "bytes 1.9.0",
  "bytes-utils",
  "crossbeam-queue",
  "float-cmp",
@@ -2588,9 +2933,9 @@ dependencies = [
  "parking_lot",
  "rand 0.8.5",
  "redis-protocol",
- "semver 1.0.25",
+ "semver",
  "socket2 0.5.8",
- "tokio 1.43.0",
+ "tokio 1.42.0",
  "tokio-stream",
  "tokio-util",
  "url",
@@ -2609,6 +2954,12 @@ version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c"
 
+[[package]]
+name = "funty"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c"
+
 [[package]]
 name = "futf"
 version = "0.1.5"
@@ -2624,9 +2975,6 @@ name = "futures"
 version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "65bc07b1a8bc7c85c5f2e110c476c7389b4554ba72af57d8445ea63a576b0876"
-version = "0.3.30"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0"
 dependencies = [
  "futures-channel",
  "futures-core",
@@ -2640,8 +2988,10 @@ dependencies = [
 [[package]]
 name = "futures-channel"
 version = "0.3.31"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10"
+checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10"
 dependencies = [
  "futures-core",
  "futures-sink",
@@ -2650,17 +3000,16 @@ dependencies = [
 [[package]]
 name = "futures-core"
 version = "0.3.31"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e"
+checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e"
 
 [[package]]
 name = "futures-executor"
 version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1e28d1d997f585e54aebc3f97d39e72338912123a67330d723fdbb564d646c9f"
-version = "0.3.30"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d"
 dependencies = [
  "futures-core",
  "futures-task",
@@ -2670,35 +3019,40 @@ dependencies = [
 [[package]]
 name = "futures-io"
 version = "0.3.31"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6"
+checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6"
 
 [[package]]
 name = "futures-lite"
 version = "1.13.0"
+version = "1.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "49a9d51ce47660b1e808d3c990b4709f2f415d928835a17dfd16991515c46bce"
+checksum = "49a9d51ce47660b1e808d3c990b4709f2f415d928835a17dfd16991515c46bce"
 dependencies = [
+ "fastrand 1.9.0",
  "fastrand 1.9.0",
  "futures-core",
  "futures-io",
  "memchr",
  "parking",
- "pin-project-lite 0.2.16",
+ "pin-project-lite 0.2.15",
  "waker-fn",
 ]
 
 [[package]]
 name = "futures-lite"
-version = "2.6.0"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f5edaec856126859abb19ed65f39e90fea3a9574b9707f13539acf4abf7eb532"
+checksum = "cef40d21ae2c515b51041df9ed313ed21e572df340ea58a922a0aefe7e8891a1"
 dependencies = [
  "fastrand 2.3.0",
  "futures-core",
  "futures-io",
  "parking",
- "pin-project-lite 0.2.16",
+ "pin-project-lite 0.2.15",
 ]
 
 [[package]]
@@ -2709,43 +3063,53 @@ checksum = "45ec6fe3675af967e67c5536c0b9d44e34e6c52f86bedc4ea49c5317b8e94d06"
 dependencies = [
  "futures-channel",
  "futures-task",
- "tokio 1.43.0",
+ "tokio 1.42.0",
 ]
 
 [[package]]
 name = "futures-macro"
 version = "0.3.31"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650"
+checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650"
 dependencies = [
  "proc-macro2",
  "quote 1.0.38",
- "syn 2.0.96",
+ "syn 2.0.94",
 ]
 
 [[package]]
 name = "futures-sink"
 version = "0.3.31"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7"
+checksum = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7"
 
 [[package]]
 name = "futures-task"
 version = "0.3.31"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988"
+checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988"
 
 [[package]]
 name = "futures-timer"
 version = "3.0.3"
+version = "3.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f288b0a4f20f9a56b5d1da57e2227c661b7b16168e2f72365f57b63326e29b24"
+checksum = "f288b0a4f20f9a56b5d1da57e2227c661b7b16168e2f72365f57b63326e29b24"
 
 [[package]]
 name = "futures-util"
 version = "0.3.31"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81"
+checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81"
 dependencies = [
  "futures-channel",
  "futures-core",
@@ -2754,7 +3118,7 @@ dependencies = [
  "futures-sink",
  "futures-task",
  "memchr",
- "pin-project-lite 0.2.16",
+ "pin-project-lite 0.2.15",
  "pin-utils",
  "slab",
 ]
@@ -2771,8 +3135,10 @@ dependencies = [
 [[package]]
 name = "generator"
 version = "0.7.5"
+version = "0.7.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5cc16584ff22b460a382b7feec54b23d2908d858152e5739a120b949293bd74e"
+checksum = "5cc16584ff22b460a382b7feec54b23d2908d858152e5739a120b949293bd74e"
 dependencies = [
  "cc",
  "libc",
@@ -2781,6 +3147,20 @@ dependencies = [
  "windows 0.48.0",
 ]
 
+[[package]]
+name = "generator"
+version = "0.8.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cc6bd114ceda131d3b1d665eba35788690ad37f5916457286b32ab6fd3c438dd"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "log",
+ "rustversion",
+ "windows 0.58.0",
+ "windows 0.48.0",
+]
+
 [[package]]
 name = "generator"
 version = "0.8.4"
@@ -2797,19 +3177,23 @@ dependencies = [
 [[package]]
 name = "generic-array"
 version = "0.14.7"
+version = "0.14.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a"
+checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a"
 dependencies = [
  "typenum",
  "version_check",
  "zeroize",
+ "version_check",
+ "zeroize",
 ]
 
 [[package]]
 name = "generic-array"
-version = "1.2.0"
+version = "1.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8c8444bc9d71b935156cc0ccab7f622180808af7867b1daae6547d773591703"
+checksum = "2cb8bc4c28d15ade99c7e90b219f30da4be5c88e586277e8cbe886beeb868ab2"
 dependencies = [
  "typenum",
 ]
@@ -2826,8 +3210,10 @@ dependencies = [
 [[package]]
 name = "getrandom"
 version = "0.2.15"
+version = "0.2.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7"
+checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7"
 dependencies = [
  "cfg-if",
  "js-sys",
@@ -2838,14 +3224,15 @@ dependencies = [
 
 [[package]]
 name = "getset"
-version = "0.1.4"
+version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eded738faa0e88d3abc9d1a13cb11adc2073c400969eeb8793cf7132589959fc"
+checksum = "f636605b743120a8d32ed92fc27b6cde1a769f8f936c065151eb66f88ded513c"
 dependencies = [
+ "proc-macro-error2",
  "proc-macro-error2",
  "proc-macro2",
  "quote 1.0.38",
- "syn 2.0.96",
+ "syn 2.0.94",
 ]
 
 [[package]]
@@ -2854,6 +3241,7 @@ version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f0d8a4362ccb29cb0b265253fb0a2728f592895ee6854fd9bc13f2ffda266ff1"
 dependencies = [
+ "opaque-debug",
  "opaque-debug",
  "polyval",
 ]
@@ -2871,14 +3259,18 @@ dependencies = [
 [[package]]
 name = "gimli"
 version = "0.31.1"
+version = "0.31.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f"
+checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f"
 
 [[package]]
 name = "git2"
 version = "0.16.1"
+version = "0.16.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ccf7f68c2995f392c49fffb4f95ae2c873297830eb25c6bc4c114ce8f4562acc"
+checksum = "ccf7f68c2995f392c49fffb4f95ae2c873297830eb25c6bc4c114ce8f4562acc"
 dependencies = [
  "bitflags 1.3.2",
  "libc",
@@ -2890,14 +3282,18 @@ dependencies = [
 [[package]]
 name = "glob"
 version = "0.3.2"
+version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a8d1add55171497b4705a648c6b583acafb01d58050a51727785f0b2c8e0a2b2"
+checksum = "a8d1add55171497b4705a648c6b583acafb01d58050a51727785f0b2c8e0a2b2"
 
 [[package]]
 name = "gloo-timers"
 version = "0.3.0"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bbb143cf96099802033e0d4f4963b19fd2e0b728bcf076cd9cf7f6634f092994"
+checksum = "bbb143cf96099802033e0d4f4963b19fd2e0b728bcf076cd9cf7f6634f092994"
 dependencies = [
  "futures-channel",
  "futures-core",
@@ -2916,6 +3312,18 @@ dependencies = [
  "subtle",
 ]
 
+[[package]]
+name = "group"
+version = "0.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f0f9ef7462f7c099f518d754361858f86d8a07af53ba9af0fe635bbccb151a63"
+dependencies = [
+ "ff 0.13.0",
+ "ff 0.12.1",
+ "rand_core 0.6.4",
+ "subtle",
+]
+
 [[package]]
 name = "group"
 version = "0.13.0"
@@ -2933,15 +3341,16 @@ version = "0.3.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "81fe527a889e1532da5c525686d96d4c2e74cdd345badf8dfef9f6b39dd5f5e8"
 dependencies = [
+ "bytes 1.9.0",
  "bytes 1.9.0",
  "fnv",
  "futures-core",
  "futures-sink",
  "futures-util",
  "http 0.2.12",
- "indexmap 2.7.1",
+ "indexmap 2.7.0",
  "slab",
- "tokio 1.43.0",
+ "tokio 1.42.0",
  "tokio-util",
  "tracing",
 ]
@@ -2949,18 +3358,21 @@ dependencies = [
 [[package]]
 name = "h2"
 version = "0.4.7"
+version = "0.4.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ccae279728d634d083c00f6099cb58f01cc99c145b84b8be2f6c74618d79922e"
+checksum = "ccae279728d634d083c00f6099cb58f01cc99c145b84b8be2f6c74618d79922e"
 dependencies = [
  "atomic-waker",
  "bytes 1.9.0",
+ "bytes 1.9.0",
  "fnv",
  "futures-core",
  "futures-sink",
  "http 1.2.0",
- "indexmap 2.7.1",
+ "indexmap 2.7.0",
  "slab",
- "tokio 1.43.0",
+ "tokio 1.42.0",
  "tokio-util",
  "tracing",
 ]
@@ -2978,8 +3390,10 @@ dependencies = [
 [[package]]
 name = "handlebars"
 version = "4.5.0"
+version = "4.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "faa67bab9ff362228eb3d00bd024a4965d8231bbb7921167f0cfa66c6626b225"
+checksum = "faa67bab9ff362228eb3d00bd024a4965d8231bbb7921167f0cfa66c6626b225"
 dependencies = [
  "log",
  "pest",
@@ -2987,42 +3401,58 @@ dependencies = [
  "serde",
  "serde_json",
  "thiserror 1.0.69",
+ "thiserror 1.0.69",
 ]
 
 [[package]]
 name = "hashbrown"
 version = "0.12.3"
+version = "0.12.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
+checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
 dependencies = [
  "ahash 0.7.8",
+ "ahash 0.7.8",
 ]
 
 [[package]]
 name = "hashbrown"
 version = "0.13.2"
+version = "0.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e"
+checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e"
 
 [[package]]
 name = "hashbrown"
 version = "0.14.5"
+version = "0.14.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"
 dependencies = [
  "ahash 0.8.11",
  "allocator-api2",
 ]
+checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"
+dependencies = [
+ "ahash 0.8.11",
+ "allocator-api2",
+]
 
 [[package]]
 name = "hashbrown"
 version = "0.15.2"
+version = "0.15.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289"
+checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289"
 dependencies = [
  "allocator-api2",
  "equivalent",
  "foldhash",
+ "equivalent",
+ "foldhash",
 ]
 
 [[package]]
@@ -3031,10 +3461,13 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "322106e6bd0cba2d5ead589ddb8150a13d7c4217cf80d7c4f682ca994ccc6aa9"
 dependencies = [
+ "base64 0.21.7",
+ "bytes 1.9.0",
  "base64 0.21.7",
  "bytes 1.9.0",
  "headers-core",
  "http 1.2.0",
+ "http 1.2.0",
  "httpdate",
  "mime",
  "sha1",
@@ -3047,14 +3480,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "54b4a22553d4242c49fddb9ba998a99962b5cc6f22cb5a3482bec22522403ce4"
 dependencies = [
  "http 1.2.0",
+ "http 1.2.0",
 ]
 
-[[package]]
-name = "heck"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
-
 [[package]]
 name = "heck"
 version = "0.5.0"
@@ -3088,11 +3516,58 @@ version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
 
+[[package]]
+name = "hickory-proto"
+version = "0.24.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "447afdcdb8afb9d0a852af6dc65d9b285ce720ed7a59e42a8bf2e931c67bc1b5"
+dependencies = [
+ "async-trait",
+ "cfg-if",
+ "data-encoding",
+ "enum-as-inner",
+ "futures-channel",
+ "futures-io",
+ "futures-util",
+ "idna 1.0.3",
+ "ipnet",
+ "once_cell",
+ "rand 0.8.5",
+ "thiserror 1.0.69",
+ "tinyvec",
+ "tokio 1.42.0",
+ "tracing",
+ "url",
+]
+
+[[package]]
+name = "hickory-resolver"
+version = "0.24.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0a2e2aba9c389ce5267d31cf1e4dace82390ae276b0b364ea55630b1fa1b44b4"
+dependencies = [
+ "cfg-if",
+ "futures-util",
+ "hickory-proto",
+ "ipconfig",
+ "lru-cache",
+ "once_cell",
+ "parking_lot",
+ "rand 0.8.5",
+ "resolv-conf",
+ "smallvec",
+ "thiserror 1.0.69",
+ "tokio 1.42.0",
+ "tracing",
+]
+
 [[package]]
 name = "hkdf"
 version = "0.12.4"
+version = "0.12.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7b5f8eb2ad728638ea2c7d47a21db23b7b58a72ed6a38256b8a1849f15fbbdf7"
+checksum = "7b5f8eb2ad728638ea2c7d47a21db23b7b58a72ed6a38256b8a1849f15fbbdf7"
 dependencies = [
  "hmac",
 ]
@@ -3104,30 +3579,39 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e"
 dependencies = [
  "digest",
+ "digest",
 ]
 
 [[package]]
 name = "hmac-sha1-compact"
 version = "1.1.5"
+version = "1.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "18492c9f6f9a560e0d346369b665ad2bdbc89fa9bceca75796584e79042694c3"
+checksum = "18492c9f6f9a560e0d346369b665ad2bdbc89fa9bceca75796584e79042694c3"
 
 [[package]]
 name = "hmac-sha256"
 version = "1.1.8"
+version = "1.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4a8575493d277c9092b988c780c94737fb9fd8651a1001e16bee3eccfc1baedb"
+checksum = "4a8575493d277c9092b988c780c94737fb9fd8651a1001e16bee3eccfc1baedb"
 dependencies = [
  "digest",
+ "digest",
 ]
 
 [[package]]
 name = "hmac-sha512"
 version = "1.1.6"
+version = "1.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b0b3a0f572aa8389d325f5852b9e0a333a15b0f86ecccbb3fdb6e97cd86dc67c"
+checksum = "b0b3a0f572aa8389d325f5852b9e0a333a15b0f86ecccbb3fdb6e97cd86dc67c"
 dependencies = [
  "digest",
+ "digest",
 ]
 
 [[package]]
@@ -3152,7 +3636,7 @@ dependencies = [
  "markup5ever",
  "proc-macro2",
  "quote 1.0.38",
- "syn 2.0.96",
+ "syn 2.0.94",
 ]
 
 [[package]]
@@ -3161,6 +3645,7 @@ version = "0.2.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1"
 dependencies = [
+ "bytes 1.9.0",
  "bytes 1.9.0",
  "fnv",
  "itoa",
@@ -3169,9 +3654,12 @@ dependencies = [
 [[package]]
 name = "http"
 version = "1.2.0"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f16ca2af56261c99fba8bac40a10251ce8188205a4c448fbb745a2e4daa76fea"
+checksum = "f16ca2af56261c99fba8bac40a10251ce8188205a4c448fbb745a2e4daa76fea"
 dependencies = [
+ "bytes 1.9.0",
  "bytes 1.9.0",
  "fnv",
  "itoa",
@@ -3180,22 +3668,29 @@ dependencies = [
 [[package]]
 name = "http-body"
 version = "0.4.6"
+version = "0.4.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2"
+checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2"
 dependencies = [
+ "bytes 1.9.0",
  "bytes 1.9.0",
  "http 0.2.12",
- "pin-project-lite 0.2.16",
+ "pin-project-lite 0.2.15",
 ]
 
 [[package]]
 name = "http-body"
 version = "1.0.1"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184"
+checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184"
 dependencies = [
  "bytes 1.9.0",
  "http 1.2.0",
+ "bytes 1.9.0",
+ "http 1.2.0",
 ]
 
 [[package]]
@@ -3204,24 +3699,27 @@ version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "793429d76616a256bcb62c2a2ec2bed781c8307e797e2598c50010f2bee2544f"
 dependencies = [
+ "bytes 1.9.0",
  "bytes 1.9.0",
  "futures-util",
  "http 1.2.0",
  "http-body 1.0.1",
- "pin-project-lite 0.2.16",
+ "pin-project-lite 0.2.15",
 ]
 
 [[package]]
 name = "httparse"
-version = "1.10.0"
+version = "1.9.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2d708df4e7140240a16cd6ab0ab65c972d7433ab77819ea693fde9c43811e2a"
+checksum = "7d71d3574edd2771538b901e6549113b4006ece66150fb69c0fb6d9a2adae946"
 
 [[package]]
 name = "httpdate"
 version = "1.0.3"
+version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9"
+checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9"
 
 [[package]]
 name = "humantime"
@@ -3235,9 +3733,12 @@ dependencies = [
 [[package]]
 name = "hyper"
 version = "0.14.32"
+version = "0.14.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "41dfc780fdec9373c01bae43289ea34c972e40ee3c9f6b3c8801a35f35586ce7"
+checksum = "41dfc780fdec9373c01bae43289ea34c972e40ee3c9f6b3c8801a35f35586ce7"
 dependencies = [
+ "bytes 1.9.0",
  "bytes 1.9.0",
  "futures-channel",
  "futures-core",
@@ -3245,12 +3746,13 @@ dependencies = [
  "h2 0.3.26",
  "http 0.2.12",
  "http-body 0.4.6",
+ "http-body 0.4.6",
  "httparse",
  "httpdate",
  "itoa",
- "pin-project-lite 0.2.16",
+ "pin-project-lite 0.2.15",
  "socket2 0.5.8",
- "tokio 1.43.0",
+ "tokio 1.42.0",
  "tower-service",
  "tracing",
  "want",
@@ -3258,22 +3760,26 @@ dependencies = [
 
 [[package]]
 name = "hyper"
-version = "1.6.0"
+version = "1.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc2b571658e38e0c01b1fdca3bbbe93c00d3d71693ff2770043f8c29bc7d6f80"
+checksum = "256fb8d4bd6413123cc9d91832d78325c48ff41677595be797d90f42969beae0"
 dependencies = [
+ "bytes 1.9.0",
  "bytes 1.9.0",
  "futures-channel",
  "futures-util",
  "h2 0.4.7",
  "http 1.2.0",
  "http-body 1.0.1",
+ "h2 0.4.7",
+ "http 1.2.0",
+ "http-body 1.0.1",
  "httparse",
  "httpdate",
  "itoa",
- "pin-project-lite 0.2.16",
+ "pin-project-lite 0.2.15",
  "smallvec",
- "tokio 1.43.0",
+ "tokio 1.42.0",
  "want",
 ]
 
@@ -3286,10 +3792,11 @@ dependencies = [
  "futures-util",
  "http 0.2.12",
  "hyper 0.14.32",
+ "hyper 0.14.32",
  "log",
  "rustls 0.21.12",
  "rustls-native-certs",
- "tokio 1.43.0",
+ "tokio 1.42.0",
  "tokio-rustls 0.24.1",
 ]
 
@@ -3301,11 +3808,11 @@ checksum = "a0bea761b46ae2b24eb4aef630d8d1c398157b6fc29e6350ecf090a0b70c952c"
 dependencies = [
  "futures-util",
  "http 1.2.0",
- "hyper 1.6.0",
+ "hyper 1.5.2",
  "hyper-util",
  "rustls 0.22.4",
  "rustls-pki-types",
- "tokio 1.43.0",
+ "tokio 1.42.0",
  "tokio-rustls 0.25.0",
  "tower-service",
  "webpki-roots 0.26.7",
@@ -3319,11 +3826,11 @@ checksum = "2d191583f3da1305256f22463b9bb0471acad48a4e534a5218b9963e9c1f59b2"
 dependencies = [
  "futures-util",
  "http 1.2.0",
- "hyper 1.6.0",
+ "hyper 1.5.2",
  "hyper-util",
- "rustls 0.23.21",
+ "rustls 0.23.20",
  "rustls-pki-types",
- "tokio 1.43.0",
+ "tokio 1.42.0",
  "tokio-rustls 0.26.1",
  "tower-service",
 ]
@@ -3334,10 +3841,12 @@ version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905"
 dependencies = [
+ "bytes 1.9.0",
+ "hyper 0.14.32",
  "bytes 1.9.0",
  "hyper 0.14.32",
  "native-tls",
- "tokio 1.43.0",
+ "tokio 1.42.0",
  "tokio-native-tls",
 ]
 
@@ -3347,12 +3856,13 @@ version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "70206fc6890eaca9fde8a0bf71caa2ddfc9fe045ac9e5c70df101a7dbde866e0"
 dependencies = [
+ "bytes 1.9.0",
  "bytes 1.9.0",
  "http-body-util",
- "hyper 1.6.0",
+ "hyper 1.5.2",
  "hyper-util",
  "native-tls",
- "tokio 1.43.0",
+ "tokio 1.42.0",
  "tokio-native-tls",
  "tower-service",
 ]
@@ -3360,18 +3870,21 @@ dependencies = [
 [[package]]
 name = "hyper-util"
 version = "0.1.10"
+version = "0.1.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "df2dcfbe0677734ab2f3ffa7fa7bfd4706bfdc1ef393f2ee30184aed67e631b4"
+checksum = "df2dcfbe0677734ab2f3ffa7fa7bfd4706bfdc1ef393f2ee30184aed67e631b4"
 dependencies = [
+ "bytes 1.9.0",
  "bytes 1.9.0",
  "futures-channel",
  "futures-util",
  "http 1.2.0",
  "http-body 1.0.1",
- "hyper 1.6.0",
- "pin-project-lite 0.2.16",
+ "hyper 1.5.2",
+ "pin-project-lite 0.2.15",
  "socket2 0.5.8",
- "tokio 1.43.0",
+ "tokio 1.42.0",
  "tower-service",
  "tracing",
 ]
@@ -3379,8 +3892,10 @@ dependencies = [
 [[package]]
 name = "iana-time-zone"
 version = "0.1.61"
+version = "0.1.61"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "235e081f3925a06703c2d0117ea8b91f042756fd6e7a6e5d901e8ca1a996b220"
+checksum = "235e081f3925a06703c2d0117ea8b91f042756fd6e7a6e5d901e8ca1a996b220"
 dependencies = [
  "android_system_properties",
  "core-foundation-sys",
@@ -3388,6 +3903,7 @@ dependencies = [
  "js-sys",
  "wasm-bindgen",
  "windows-core 0.52.0",
+ "windows-core 0.52.0",
 ]
 
 [[package]]
@@ -3514,7 +4030,7 @@ checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6"
 dependencies = [
  "proc-macro2",
  "quote 1.0.38",
- "syn 2.0.96",
+ "syn 2.0.94",
 ]
 
 [[package]]
@@ -3537,13 +4053,46 @@ dependencies = [
 [[package]]
 name = "idna"
 version = "0.3.0"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6"
+checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6"
+dependencies = [
+ "unicode-bidi",
+ "unicode-normalization",
+]
+
+[[package]]
+name = "idna"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c"
 dependencies = [
  "unicode-bidi",
  "unicode-normalization",
 ]
 
+[[package]]
+name = "idna"
+version = "1.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "686f825264d630750a544639377bae737628043f20d38bbc029e8f29ea968a7e"
+dependencies = [
+ "idna_adapter",
+ "smallvec",
+ "utf8_iter",
+]
+
+[[package]]
+name = "idna_adapter"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "daca1df1c957320b2cf139ac61e7bd64fed304c5040df000a745aa1de3b4ef71"
+dependencies = [
+ "icu_normalizer",
+ "icu_properties",
+]
+
 [[package]]
 name = "idna"
 version = "0.4.0"
@@ -3584,15 +4133,17 @@ checksum = "cb56e1aa765b4b4f3aadfab769793b7087bb03a4ea4920644a6d238e2df5b9ed"
 [[package]]
 name = "image"
 version = "0.25.5"
+version = "0.25.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cd6f44aed642f18953a158afeb30206f4d50da59fbc66ecb53c66488de73563b"
+checksum = "cd6f44aed642f18953a158afeb30206f4d50da59fbc66ecb53c66488de73563b"
 dependencies = [
  "bytemuck",
  "byteorder-lite",
  "color_quant",
  "exr",
  "gif",
- "image-webp 0.2.1",
+ "image-webp 0.2.0",
  "num-traits",
  "png",
  "qoi",
@@ -3616,9 +4167,9 @@ dependencies = [
 
 [[package]]
 name = "image-webp"
-version = "0.2.1"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b77d01e822461baa8409e156015a1d91735549f0f2c17691bd2d996bef238f7f"
+checksum = "e031e8e3d94711a9ccb5d6ea357439ef3dcbed361798bd4071dc4d9793fbe22f"
 dependencies = [
  "byteorder-lite",
  "quick-error 2.0.1",
@@ -3633,8 +4184,10 @@ checksum = "edcd27d72f2f071c64249075f42e205ff93c9a4c5f6c6da53e79ed9f9832c285"
 [[package]]
 name = "imgref"
 version = "1.11.0"
+version = "1.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d0263a3d970d5c054ed9312c0057b4f3bde9c0b33836d3637361d4a9e6e7a408"
+checksum = "d0263a3d970d5c054ed9312c0057b4f3bde9c0b33836d3637361d4a9e6e7a408"
 
 [[package]]
 name = "impl_ops"
@@ -3648,6 +4201,8 @@ version = "1.9.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99"
 dependencies = [
+ "autocfg 1.4.0",
+ "hashbrown 0.12.3",
  "autocfg 1.4.0",
  "hashbrown 0.12.3",
  "serde",
@@ -3655,12 +4210,13 @@ dependencies = [
 
 [[package]]
 name = "indexmap"
-version = "2.7.1"
+version = "2.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8c9c992b02b5b4c94ea26e32fe5bccb7aa7d9f390ab5c1221ff895bc7ea8b652"
+checksum = "62f822373a4fe84d4bb149bf54e584a7f4abec90e072ed49cda0edea5b95471f"
 dependencies = [
  "equivalent",
  "hashbrown 0.15.2",
+ "hashbrown 0.15.2",
  "serde",
 ]
 
@@ -3686,13 +4242,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5"
 dependencies = [
  "generic-array 0.14.7",
+ "generic-array 0.14.7",
 ]
 
 [[package]]
 name = "instant"
 version = "0.1.13"
+version = "0.1.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222"
+checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222"
 dependencies = [
  "cfg-if",
 ]
@@ -3705,26 +4264,31 @@ checksum = "c34819042dc3d3971c46c2190835914dfbe0c3c13f61449b2997f4e9722dfa60"
 dependencies = [
  "proc-macro2",
  "quote 1.0.38",
- "syn 2.0.96",
+ "syn 2.0.94",
 ]
 
 [[package]]
 name = "ipconfig"
 version = "0.3.2"
+version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b58db92f96b720de98181bbbe63c831e87005ab460c1bf306eb2622b4707997f"
+checksum = "b58db92f96b720de98181bbbe63c831e87005ab460c1bf306eb2622b4707997f"
 dependencies = [
+ "socket2 0.5.8",
  "socket2 0.5.8",
  "widestring",
  "windows-sys 0.48.0",
  "winreg",
+ "windows-sys 0.48.0",
+ "winreg",
 ]
 
 [[package]]
 name = "ipnet"
-version = "2.11.0"
+version = "2.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "469fb0b9cefa57e3ef31275ee7cacb78f2fdca44e4765491884a2b119d4eb130"
+checksum = "ddc24109865250148c2e0f3d25d4f0f479571723792d3802153c60922a4fb708"
 
 [[package]]
 name = "is-terminal"
@@ -3749,6 +4313,7 @@ version = "1.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "334e04b4d781f436dc315cb1e7515bd96826426345d498149e4bde36b67f8ee9"
 dependencies = [
+ "async-channel 1.9.0",
  "async-channel 1.9.0",
  "castaway",
  "crossbeam-utils",
@@ -3757,11 +4322,14 @@ dependencies = [
  "encoding_rs",
  "event-listener 2.5.3",
  "futures-lite 1.13.0",
+ "event-listener 2.5.3",
+ "futures-lite 1.13.0",
  "http 0.2.12",
  "log",
  "mime",
  "once_cell",
  "polling 2.8.0",
+ "polling 2.8.0",
  "serde",
  "serde_json",
  "slab",
@@ -3775,9 +4343,12 @@ dependencies = [
 [[package]]
 name = "iso8601-timestamp"
 version = "0.1.11"
+version = "0.1.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b088f3296223f11d6bd70998132653b30b6f39e6ab4be055c0bda486fa8d11c7"
+checksum = "b088f3296223f11d6bd70998132653b30b6f39e6ab4be055c0bda486fa8d11c7"
 dependencies = [
+ "generic-array 0.14.7",
  "generic-array 0.14.7",
  "serde",
  "time",
@@ -3786,10 +4357,12 @@ dependencies = [
 [[package]]
 name = "iso8601-timestamp"
 version = "0.2.17"
+version = "0.2.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "24d4e5d712dd664b11e778d1cfc06c79ba2700d6bc1771e44fb7b6a4656b487d"
+checksum = "24d4e5d712dd664b11e778d1cfc06c79ba2700d6bc1771e44fb7b6a4656b487d"
 dependencies = [
- "generic-array 1.2.0",
+ "generic-array 1.1.1",
  "schemars",
  "serde",
  "time",
@@ -3816,8 +4389,10 @@ dependencies = [
 [[package]]
 name = "itoa"
 version = "1.0.14"
+version = "1.0.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d75a2a4b1b190afb6f5425f10f6a8f959d2ea0b9c2b1d79553551850539e4674"
+checksum = "d75a2a4b1b190afb6f5425f10f6a8f959d2ea0b9c2b1d79553551850539e4674"
 
 [[package]]
 name = "jobserver"
@@ -3836,10 +4411,11 @@ checksum = "f5d4a7da358eff58addd2877a45865158f0d78c911d43a5784ceb7bbf52833b0"
 
 [[package]]
 name = "js-sys"
-version = "0.3.77"
+version = "0.3.76"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1cfaf33c695fc6e08064efbc1f72ec937429614f25eef83af942d0e227c3a28f"
+checksum = "6717b6b5b077764fb5966237269cb3c64edddde4b14ce42647430a78ced9e7b7"
 dependencies = [
+ "once_cell",
  "once_cell",
  "wasm-bindgen",
 ]
@@ -3871,8 +4447,10 @@ dependencies = [
 [[package]]
 name = "jwt-simple"
 version = "0.11.9"
+version = "0.11.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "357892bb32159d763abdea50733fadcb9a8e1c319a9aa77592db8555d05af83e"
+checksum = "357892bb32159d763abdea50733fadcb9a8e1c319a9aa77592db8555d05af83e"
 dependencies = [
  "anyhow",
  "binstring",
@@ -3884,6 +4462,7 @@ dependencies = [
  "hmac-sha512",
  "k256",
  "p256 0.13.2",
+ "p256 0.13.2",
  "p384",
  "rand 0.8.5",
  "rsa",
@@ -3891,14 +4470,18 @@ dependencies = [
  "serde_json",
  "spki 0.6.0",
  "thiserror 1.0.69",
+ "spki 0.6.0",
+ "thiserror 1.0.69",
  "zeroize",
 ]
 
 [[package]]
 name = "jxl-bitstream"
 version = "0.4.1"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5855ff16398ffbcf81fee52c41ca65326499c8764b21bb9952c367ace98995fb"
+checksum = "5855ff16398ffbcf81fee52c41ca65326499c8764b21bb9952c367ace98995fb"
 dependencies = [
  "tracing",
 ]
@@ -3906,8 +4489,10 @@ dependencies = [
 [[package]]
 name = "jxl-coding"
 version = "0.4.1"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "da5b5093904e940bc11ef50e872c7bdf7b6e88653f012b925f8479daf212b5c9"
+checksum = "da5b5093904e940bc11ef50e872c7bdf7b6e88653f012b925f8479daf212b5c9"
 dependencies = [
  "jxl-bitstream",
  "tracing",
@@ -4038,15 +4623,21 @@ dependencies = [
 [[package]]
 name = "k256"
 version = "0.13.4"
+version = "0.13.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f6e3919bbaa2945715f0bb6d3934a173d1e9a59ac23767fbaaef277265a7411b"
+checksum = "f6e3919bbaa2945715f0bb6d3934a173d1e9a59ac23767fbaaef277265a7411b"
 dependencies = [
  "cfg-if",
  "ecdsa 0.16.9",
  "elliptic-curve 0.13.8",
  "once_cell",
+ "ecdsa 0.16.9",
+ "elliptic-curve 0.13.8",
+ "once_cell",
  "sha2",
  "signature 2.2.0",
+ "signature 2.2.0",
 ]
 
 [[package]]
@@ -4083,7 +4674,7 @@ version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
 dependencies = [
- "spin 0.9.8",
+ "spin",
 ]
 
 [[package]]
@@ -4095,37 +4686,47 @@ checksum = "03087c2bad5e1034e8cace5926dec053fb3790248370865f5117a7d0213354c8"
 [[package]]
 name = "lettre"
 version = "0.10.4"
+version = "0.10.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "76bd09637ae3ec7bd605b8e135e757980b3968430ff2b1a4a94fb7769e50166d"
+checksum = "76bd09637ae3ec7bd605b8e135e757980b3968430ff2b1a4a94fb7769e50166d"
 dependencies = [
+ "base64 0.21.7",
  "base64 0.21.7",
  "email-encoding",
  "email_address",
  "fastrand 1.9.0",
+ "email_address",
+ "fastrand 1.9.0",
  "futures-util",
  "hostname",
  "httpdate",
  "idna 0.3.0",
+ "idna 0.3.0",
  "mime",
  "native-tls",
  "nom",
  "once_cell",
  "quoted_printable",
  "socket2 0.4.10",
- "tokio 1.43.0",
+ "tokio 1.42.0",
 ]
 
 [[package]]
 name = "libc"
 version = "0.2.169"
+version = "0.2.169"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b5aba8db14291edd000dfcc4d620c7ebfb122c613afb886ca8803fa4e128a20a"
+checksum = "b5aba8db14291edd000dfcc4d620c7ebfb122c613afb886ca8803fa4e128a20a"
 
 [[package]]
 name = "libfuzzer-sys"
 version = "0.4.8"
+version = "0.4.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9b9569d2f74e257076d8c6bfa73fb505b46b851e51ddaecc825944aa3bed17fa"
+checksum = "9b9569d2f74e257076d8c6bfa73fb505b46b851e51ddaecc825944aa3bed17fa"
 dependencies = [
  "arbitrary",
  "cc",
@@ -4134,8 +4735,10 @@ dependencies = [
 [[package]]
 name = "libgit2-sys"
 version = "0.14.2+1.5.1"
+version = "0.14.2+1.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7f3d95f6b51075fe9810a7ae22c7095f12b98005ab364d8544797a825ce946a4"
+checksum = "7f3d95f6b51075fe9810a7ae22c7095f12b98005ab364d8544797a825ce946a4"
 dependencies = [
  "cc",
  "libc",
@@ -4146,8 +4749,10 @@ dependencies = [
 [[package]]
 name = "libloading"
 version = "0.8.6"
+version = "0.8.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fc2f4eb4bc735547cfed7c0a4922cbd04a4655978c09b54f1f7b228750664c34"
+checksum = "fc2f4eb4bc735547cfed7c0a4922cbd04a4655978c09b54f1f7b228750664c34"
 dependencies = [
  "cfg-if",
  "windows-targets 0.52.6",
@@ -4156,14 +4761,16 @@ dependencies = [
 [[package]]
 name = "libm"
 version = "0.2.11"
+version = "0.2.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8355be11b20d696c8f18f6cc018c4e372165b1fa8126cef092399c9951984ffa"
+checksum = "8355be11b20d696c8f18f6cc018c4e372165b1fa8126cef092399c9951984ffa"
 
 [[package]]
 name = "libnghttp2-sys"
-version = "0.1.11+1.64.0"
+version = "0.1.10+1.61.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b6c24e48a7167cffa7119da39d577fa482e66c688a4aac016bee862e1a713c4"
+checksum = "959c25552127d2e1fa72f0e52548ec04fc386e827ba71a7bd01db46a447dc135"
 dependencies = [
  "cc",
  "libc",
@@ -4181,9 +4788,9 @@ dependencies = [
 
 [[package]]
 name = "libz-sys"
-version = "1.1.21"
+version = "1.1.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df9b68e50e6e0b26f672573834882eb57759f6db9b3be2ea3c35c91188bb4eaa"
+checksum = "d2d16453e800a8cf6dd2fc3eb4bc99b786a9b90c663b8559a5b1a041bf89e472"
 dependencies = [
  "cc",
  "libc",
@@ -4194,8 +4801,10 @@ dependencies = [
 [[package]]
 name = "linked-hash-map"
 version = "0.5.6"
+version = "0.5.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f"
+checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f"
 
 [[package]]
 name = "linkify"
@@ -4219,7 +4828,7 @@ dependencies = [
 name = "linux-raw-sys"
 version = "0.4.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d26c52dbd32dccf2d10cac7725f8eae5296885fb5703b261f7d0a0739ec807ab"
+checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89"
 
 [[package]]
 name = "litemap"
@@ -4227,62 +4836,15 @@ version = "0.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4ee93343901ab17bd981295f2cf0026d4ad018c7c31ba84549a4ddbb47a45104"
 
-[[package]]
-name = "livekit-api"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bccba8f66e9eeef0edd98470bee3212ca4f4468793f18264995feb1ce4ab45dc"
-dependencies = [
- "base64 0.21.7",
- "http 0.2.12",
- "jsonwebtoken",
- "livekit-protocol",
- "log",
- "parking_lot",
- "prost",
- "reqwest 0.11.27",
- "scopeguard",
- "serde",
- "serde_json",
- "sha2",
- "thiserror 1.0.69",
- "url",
-]
-
-[[package]]
-name = "livekit-protocol"
-version = "0.3.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a3554533d83fb849cb140641edcbf48628980ef816f50002202368fe908fb85"
-dependencies = [
- "futures-util",
- "livekit-runtime",
- "parking_lot",
- "pbjson",
- "pbjson-types",
- "prost",
- "prost-types",
- "serde",
- "thiserror 1.0.69",
- "tokio 1.43.0",
-]
-
-[[package]]
-name = "livekit-runtime"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ae53eb874eb86e96e8ccffc31b5a00926d46174cbcb1c24ce4e57b1fcc5c8f6"
-dependencies = [
- "tokio 1.43.0",
- "tokio-stream",
-]
-
 [[package]]
 name = "lock_api"
 version = "0.4.12"
+version = "0.4.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17"
+checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17"
 dependencies = [
+ "autocfg 1.4.0",
  "autocfg 1.4.0",
  "scopeguard",
 ]
@@ -4304,6 +4866,7 @@ checksum = "ff50ecb28bb86013e935fb6683ab1f6d3a20016f123c76fd4c27470076ac30f5"
 dependencies = [
  "cfg-if",
  "generator 0.7.5",
+ "generator 0.7.5",
  "scoped-tls",
  "serde",
  "serde_json",
@@ -4324,6 +4887,19 @@ dependencies = [
  "tracing-subscriber",
 ]
 
+[[package]]
+name = "loom"
+version = "0.7.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "419e0dc8046cb947daa77eb95ae174acfbddb7673b4151f56d1eed8e93fbfaca"
+dependencies = [
+ "cfg-if",
+ "generator 0.8.4",
+ "scoped-tls",
+ "tracing",
+ "tracing-subscriber",
+]
+
 [[package]]
 name = "loop9"
 version = "0.1.5"
@@ -4336,28 +4912,37 @@ dependencies = [
 [[package]]
 name = "lru"
 version = "0.7.8"
+version = "0.7.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e999beba7b6e8345721bd280141ed958096a2e4abdf74f67ff4ce49b4b54e47a"
+checksum = "e999beba7b6e8345721bd280141ed958096a2e4abdf74f67ff4ce49b4b54e47a"
 dependencies = [
  "hashbrown 0.12.3",
+ "hashbrown 0.12.3",
 ]
 
 [[package]]
 name = "lru"
 version = "0.11.1"
+version = "0.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a4a83fb7698b3643a0e34f9ae6f2e8f0178c0fd42f8b59d493aa271ff3a5bf21"
+checksum = "a4a83fb7698b3643a0e34f9ae6f2e8f0178c0fd42f8b59d493aa271ff3a5bf21"
 dependencies = [
  "hashbrown 0.14.5",
+ "hashbrown 0.14.5",
 ]
 
 [[package]]
 name = "lru"
 version = "0.12.5"
+version = "0.12.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "234cf4f4a04dc1f57e24b96cc0cd600cf2af460d4161ac5ecdd0af8e1f3b2a38"
+checksum = "234cf4f4a04dc1f57e24b96cc0cd600cf2af460d4161ac5ecdd0af8e1f3b2a38"
 dependencies = [
  "hashbrown 0.15.2",
+ "hashbrown 0.15.2",
 ]
 
 [[package]]
@@ -4413,8 +4998,10 @@ dependencies = [
 [[package]]
 name = "matches"
 version = "0.1.10"
+version = "0.1.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5"
+checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5"
 
 [[package]]
 name = "matchit"
@@ -4435,11 +5022,15 @@ dependencies = [
 [[package]]
 name = "md-5"
 version = "0.10.6"
+version = "0.10.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d89e7ee0cfbedfc4da3340218492196241d89eefb6dab27de5df917a6d2e78cf"
+checksum = "d89e7ee0cfbedfc4da3340218492196241d89eefb6dab27de5df917a6d2e78cf"
 dependencies = [
  "cfg-if",
  "digest",
+ "cfg-if",
+ "digest",
 ]
 
 [[package]]
@@ -4460,11 +5051,15 @@ dependencies = [
 [[package]]
 name = "metrics"
 version = "0.23.0"
+version = "0.23.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "884adb57038347dfbaf2d5065887b6cf4312330dc8e94bc30a1a839bd79d3261"
+checksum = "884adb57038347dfbaf2d5065887b6cf4312330dc8e94bc30a1a839bd79d3261"
 dependencies = [
  "ahash 0.8.11",
  "portable-atomic",
+ "ahash 0.8.11",
+ "portable-atomic",
 ]
 
 [[package]]
@@ -4481,10 +5076,11 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
 
 [[package]]
 name = "miniz_oxide"
-version = "0.8.3"
+version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8402cab7aefae129c6977bb0ff1b8fd9a04eb5b51efc50a70bea51cda0c7924"
+checksum = "4ffbe83022cedc1d264172192511ae958937694cd57ce297164951b8b3568394"
 dependencies = [
+ "adler2",
  "adler2",
  "simd-adler32",
 ]
@@ -4492,8 +5088,10 @@ dependencies = [
 [[package]]
 name = "mio"
 version = "1.0.3"
+version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2886843bf800fba2e3377cff24abf6379b4c4d5c6681eaf9ea5b0d15090450bd"
+checksum = "2886843bf800fba2e3377cff24abf6379b4c4d5c6681eaf9ea5b0d15090450bd"
 dependencies = [
  "libc",
  "wasi",
@@ -4503,8 +5101,10 @@ dependencies = [
 [[package]]
 name = "mobc"
 version = "0.8.5"
+version = "0.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "316a7d198b51958a0ab57248bf5f42d8409551203cb3c821d5925819a8d5415f"
+checksum = "316a7d198b51958a0ab57248bf5f42d8409551203cb3c821d5925819a8d5415f"
 dependencies = [
  "async-std",
  "async-trait",
@@ -4515,7 +5115,7 @@ dependencies = [
  "log",
  "metrics",
  "thiserror 1.0.69",
- "tokio 1.43.0",
+ "tokio 1.42.0",
  "tracing",
  "tracing-subscriber",
 ]
@@ -4523,18 +5123,21 @@ dependencies = [
 [[package]]
 name = "mobc-redis"
 version = "0.8.2"
+version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5e90cc63bd181da5c1f826427d26a63ab0ad1927462b2411aaa86e5f6be3d6b1"
+checksum = "5e90cc63bd181da5c1f826427d26a63ab0ad1927462b2411aaa86e5f6be3d6b1"
 dependencies = [
  "mobc",
  "redis",
+ "redis",
 ]
 
 [[package]]
 name = "moka"
-version = "0.12.10"
+version = "0.12.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a9321642ca94a4282428e6ea4af8cc2ca4eac48ac7a6a4ea8f33f76d0ce70926"
+checksum = "23db87a7f248211f6a7c8644a1b750541f8a4c68ae7de0f908860e44c0c201f6"
 dependencies = [
  "async-lock 3.4.0",
  "crossbeam-channel",
@@ -4543,61 +5146,78 @@ dependencies = [
  "event-listener 5.4.0",
  "futures-util",
  "loom 0.7.2",
+ "loom 0.7.2",
  "parking_lot",
- "portable-atomic",
- "rustc_version 0.4.1",
+ "quanta",
+ "rustc_version",
  "smallvec",
  "tagptr",
  "thiserror 1.0.69",
  "uuid",
+ "thiserror 1.0.69",
+ "uuid",
 ]
 
 [[package]]
 name = "mongodb"
-version = "2.6.1"
+version = "3.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "16928502631c0db72214720aa479c722397fe5aed6bf1c740a3830b3fe4bfcfe"
+checksum = "ff1f6edf7fe8828429647a2200f684681ca6d5a33b45edc3140c81390d852301"
 dependencies = [
- "async-std",
- "async-std-resolver",
  "async-trait",
  "base64 0.13.1",
+ "base64 0.13.1",
  "bitflags 1.3.2",
  "bson",
  "chrono",
- "derivative",
+ "derive-where",
  "derive_more",
  "futures-core",
  "futures-executor",
  "futures-io",
+ "futures-io",
  "futures-util",
  "hex",
+ "hickory-proto",
+ "hickory-resolver",
  "hmac",
- "lazy_static",
  "md-5",
+ "mongodb-internal-macros",
+ "once_cell",
  "pbkdf2",
  "percent-encoding",
  "rand 0.8.5",
  "rustc_version_runtime",
- "rustls 0.20.9",
+ "rustls 0.21.12",
  "rustls-pemfile 1.0.4",
  "serde",
+ "serde_bytes",
  "serde_with",
  "sha-1",
+ "sha-1",
  "sha2",
- "socket2 0.4.10",
+ "socket2 0.5.8",
  "stringprep",
- "strsim 0.10.0",
+ "strsim 0.11.1",
  "take_mut",
  "thiserror 1.0.69",
- "tokio 1.43.0",
- "tokio-rustls 0.23.4",
+ "tokio 1.42.0",
+ "tokio-rustls 0.24.1",
  "tokio-util",
- "trust-dns-proto",
- "trust-dns-resolver",
  "typed-builder",
  "uuid",
- "webpki-roots 0.22.6",
+ "webpki-roots 0.25.4",
+]
+
+[[package]]
+name = "mongodb-internal-macros"
+version = "3.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8b07bfd601af78e39384707a8e80041946c98260e3e0190e294ee7435823e6bf"
+dependencies = [
+ "proc-macro2",
+ "quote 1.0.38",
+ "syn 2.0.94",
 ]
 
 [[package]]
@@ -4606,15 +5226,17 @@ version = "3.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "83e87776546dc87511aa5ee218730c92b666d7264ab6ed41f9d215af9cd5224b"
 dependencies = [
+ "bytes 1.9.0",
  "bytes 1.9.0",
  "encoding_rs",
  "futures-util",
  "http 1.2.0",
+ "http 1.2.0",
  "httparse",
  "memchr",
  "mime",
- "spin 0.9.8",
- "tokio 1.43.0",
+ "spin",
+ "tokio 1.42.0",
  "tokio-util",
  "version_check",
 ]
@@ -4642,9 +5264,9 @@ dependencies = [
 
 [[package]]
 name = "native-tls"
-version = "0.2.13"
+version = "0.2.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0dab59f8e050d5df8e4dd87d9206fb6f65a483e20ac9fda365ade4fab353196c"
+checksum = "a8614eb2c83d59d1c8cc974dd3f920198647674a0a035e1af1fa58707e317466"
 dependencies = [
  "libc",
  "log",
@@ -4667,7 +5289,7 @@ dependencies = [
  "libloading",
  "neon-macros",
  "once_cell",
- "semver 1.0.25",
+ "semver",
  "send_wrapper",
  "smallvec",
 ]
@@ -4679,7 +5301,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c6813fde79b646e47e7ad75f480aa80ef76a5d9599e2717407961531169ee38b"
 dependencies = [
  "quote 1.0.38",
- "syn 2.0.96",
+ "syn 2.0.94",
  "syn-mid",
 ]
 
@@ -4703,8 +5325,10 @@ checksum = "650eef8c711430f1a879fdd01d4745a7deea475becfb90269c06775983bbf086"
 [[package]]
 name = "nom"
 version = "7.1.3"
+version = "7.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a"
+checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a"
 dependencies = [
  "memchr",
  "minimal-lexical",
@@ -4719,9 +5343,21 @@ checksum = "0676bb32a98c1a483ce53e500a81ad9c3d5b3f7c920c28c24e9cb0980d0b5bc8"
 [[package]]
 name = "ntapi"
 version = "0.4.1"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e8a3895c6391c39d7fe7ebc444a87eb2991b2a0bc718fdabd071eec617fc68e4"
+checksum = "e8a3895c6391c39d7fe7ebc444a87eb2991b2a0bc718fdabd071eec617fc68e4"
+dependencies = [
+ "winapi",
+]
+
+[[package]]
+name = "nu-ansi-term"
+version = "0.46.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84"
 dependencies = [
+ "overload",
  "winapi",
 ]
 
@@ -4790,6 +5426,12 @@ version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9"
 
+[[package]]
+name = "num-conv"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9"
+
 [[package]]
 name = "num-derive"
 version = "0.4.2"
@@ -4798,7 +5440,7 @@ checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202"
 dependencies = [
  "proc-macro2",
  "quote 1.0.38",
- "syn 2.0.96",
+ "syn 2.0.94",
 ]
 
 [[package]]
@@ -4816,6 +5458,7 @@ version = "0.1.45"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1429034a0490724d0075ebb2bc9e875d6503c3cf69e235a8941aa757d83ef5bf"
 dependencies = [
+ "autocfg 1.4.0",
  "autocfg 1.4.0",
  "num-integer",
  "num-traits",
@@ -4838,6 +5481,7 @@ version = "0.2.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
 dependencies = [
+ "autocfg 1.4.0",
  "autocfg 1.4.0",
  "libm",
 ]
@@ -4845,9 +5489,12 @@ dependencies = [
 [[package]]
 name = "num_cpus"
 version = "1.16.0"
+version = "1.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43"
+checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43"
 dependencies = [
+ "hermit-abi 0.3.9",
  "hermit-abi 0.3.9",
  "libc",
 ]
@@ -4855,10 +5502,13 @@ dependencies = [
 [[package]]
 name = "num_enum"
 version = "0.5.11"
+version = "0.5.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1f646caf906c20226733ed5b1374287eb97e3c2a5c227ce668c1f2ce20ae57c9"
+checksum = "1f646caf906c20226733ed5b1374287eb97e3c2a5c227ce668c1f2ce20ae57c9"
 dependencies = [
  "num_enum_derive 0.5.11",
+ "num_enum_derive 0.5.11",
 ]
 
 [[package]]
@@ -4873,13 +5523,17 @@ dependencies = [
 [[package]]
 name = "num_enum_derive"
 version = "0.5.11"
+version = "0.5.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dcbff9bc912032c62bf65ef1d5aea88983b420f4f839db1e9b0c281a25c9c799"
+checksum = "dcbff9bc912032c62bf65ef1d5aea88983b420f4f839db1e9b0c281a25c9c799"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2",
  "quote 1.0.38",
  "syn 1.0.109",
+ "quote 1.0.38",
+ "syn 1.0.109",
 ]
 
 [[package]]
@@ -4891,7 +5545,7 @@ dependencies = [
  "proc-macro-crate",
  "proc-macro2",
  "quote 1.0.38",
- "syn 2.0.96",
+ "syn 2.0.94",
 ]
 
 [[package]]
@@ -4906,8 +5560,10 @@ dependencies = [
 [[package]]
 name = "object"
 version = "0.36.7"
+version = "0.36.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "62948e14d923ea95ea2c7c86c71013138b66525b86bdc08d2dcc262bdb497b87"
+checksum = "62948e14d923ea95ea2c7c86c71013138b66525b86bdc08d2dcc262bdb497b87"
 dependencies = [
  "memchr",
 ]
@@ -4915,22 +5571,26 @@ dependencies = [
 [[package]]
 name = "once_cell"
 version = "1.20.2"
+version = "1.20.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775"
+checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775"
 
 [[package]]
 name = "opaque-debug"
 version = "0.3.1"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381"
+checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381"
 
 [[package]]
 name = "openssl"
-version = "0.10.69"
+version = "0.10.68"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f5e534d133a060a3c19daec1eb3e98ec6f4685978834f2dbadfe2ec215bab64e"
+checksum = "6174bc48f102d208783c2c84bf931bb75927a617866870de8a4ea85597f871f5"
 dependencies = [
- "bitflags 2.8.0",
+ "bitflags 2.6.0",
  "cfg-if",
  "foreign-types",
  "libc",
@@ -4942,12 +5602,14 @@ dependencies = [
 [[package]]
 name = "openssl-macros"
 version = "0.1.1"
+version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
+checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
 dependencies = [
  "proc-macro2",
  "quote 1.0.38",
- "syn 2.0.96",
+ "syn 2.0.94",
 ]
 
 [[package]]
@@ -4959,8 +5621,10 @@ checksum = "d05e27ee213611ffe7d6348b942e8f942b37114c00cc03cec254295a4a17852e"
 [[package]]
 name = "openssl-sys"
 version = "0.9.104"
+version = "0.9.104"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "45abf306cbf99debc8195b66b7346498d7b10c210de50418b5ccd7ceba08c741"
+checksum = "45abf306cbf99debc8195b66b7346498d7b10c210de50418b5ccd7ceba08c741"
 dependencies = [
  "cc",
  "libc",
@@ -4976,24 +5640,26 @@ checksum = "ccd746e37177e1711c20dd619a1620f34f5c8b569c53590a72dedd5344d8924a"
 dependencies = [
  "dlv-list",
  "hashbrown 0.12.3",
+ "hashbrown 0.12.3",
 ]
 
 [[package]]
 name = "os_info"
-version = "3.9.2"
+version = "3.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e6520c8cc998c5741ee68ec1dc369fc47e5f0ea5320018ecf2a1ccd6328f48b"
+checksum = "eb6651f4be5e39563c4fe5cc8326349eb99a25d805a3493f791d5bfd0269e430"
 dependencies = [
  "log",
  "serde",
  "windows-sys 0.52.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
 name = "outref"
 version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a80800c0488c3a21695ea981a54918fbb37abf04f4d0720c453632255e2ff0e"
+checksum = "4030760ffd992bef45b0ae3f10ce1aba99e33464c90d14dd7c039884963ddc7a"
 
 [[package]]
 name = "overload"
@@ -5012,6 +5678,20 @@ dependencies = [
  "sha2",
 ]
 
+[[package]]
+name = "p256"
+version = "0.13.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c9863ad85fa8f4460f9c48cb909d38a0d689dba1f6f6988a5e3e0d31071bcd4b"
+dependencies = [
+ "ecdsa 0.16.9",
+ "elliptic-curve 0.13.8",
+ "primeorder",
+ "ecdsa 0.14.8",
+ "elliptic-curve 0.12.3",
+ "sha2",
+]
+
 [[package]]
 name = "p256"
 version = "0.13.2"
@@ -5027,9 +5707,14 @@ dependencies = [
 [[package]]
 name = "p384"
 version = "0.13.0"
+version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "70786f51bcc69f6a4c0360e063a4cac5419ef7c5cd5b3c99ad70f3be5ba79209"
+checksum = "70786f51bcc69f6a4c0360e063a4cac5419ef7c5cd5b3c99ad70f3be5ba79209"
 dependencies = [
+ "ecdsa 0.16.9",
+ "elliptic-curve 0.13.8",
+ "primeorder",
  "ecdsa 0.16.9",
  "elliptic-curve 0.13.8",
  "primeorder",
@@ -5039,14 +5724,18 @@ dependencies = [
 [[package]]
 name = "parking"
 version = "2.2.1"
+version = "2.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f38d5652c16fde515bb1ecef450ab0f6a219d619a7274976324d5e377f7dceba"
+checksum = "f38d5652c16fde515bb1ecef450ab0f6a219d619a7274976324d5e377f7dceba"
 
 [[package]]
 name = "parking_lot"
 version = "0.12.3"
+version = "0.12.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27"
+checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27"
 dependencies = [
  "lock_api",
  "parking_lot_core",
@@ -5055,14 +5744,17 @@ dependencies = [
 [[package]]
 name = "parking_lot_core"
 version = "0.9.10"
+version = "0.9.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8"
+checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8"
 dependencies = [
  "cfg-if",
  "libc",
  "redox_syscall",
  "smallvec",
  "windows-targets 0.52.6",
+ "windows-targets 0.52.6",
 ]
 
 [[package]]
@@ -5074,53 +5766,20 @@ checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a"
 [[package]]
 name = "pathdiff"
 version = "0.2.3"
+version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "df94ce210e5bc13cb6651479fa48d14f601d9858cfe0467f43ae157023b938d3"
 
-[[package]]
-name = "pbjson"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1030c719b0ec2a2d25a5df729d6cff1acf3cc230bf766f4f97833591f7577b90"
-dependencies = [
- "base64 0.21.7",
- "serde",
-]
-
-[[package]]
-name = "pbjson-build"
-version = "0.6.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2580e33f2292d34be285c5bc3dba5259542b083cfad6037b6d70345f24dcb735"
-dependencies = [
- "heck 0.4.1",
- "itertools 0.11.0",
- "prost",
- "prost-types",
-]
-
-[[package]]
-name = "pbjson-types"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "18f596653ba4ac51bdecbb4ef6773bc7f56042dc13927910de1684ad3d32aa12"
-dependencies = [
- "bytes 1.9.0",
- "chrono",
- "pbjson",
- "pbjson-build",
- "prost",
- "prost-build",
- "serde",
-]
-
 [[package]]
 name = "pbkdf2"
 version = "0.11.0"
+version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "83a0692ec44e4cf1ef28ca317f14f8f07da2d95ec3fa01f86e4467b725e60917"
+checksum = "83a0692ec44e4cf1ef28ca317f14f8f07da2d95ec3fa01f86e4467b725e60917"
 dependencies = [
  "digest",
+ "digest",
 ]
 
 [[package]]
@@ -5143,7 +5802,7 @@ dependencies = [
  "proc-macro2",
  "proc-macro2-diagnostics",
  "quote 1.0.38",
- "syn 2.0.96",
+ "syn 2.0.94",
 ]
 
 [[package]]
@@ -5152,6 +5811,7 @@ version = "0.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fd56cbd21fea48d0c440b41cd69c589faacade08c992d9a54e471b79d0fd13eb"
 dependencies = [
+ "base64 0.13.1",
  "base64 0.13.1",
  "once_cell",
  "regex",
@@ -5164,6 +5824,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a8835c273a76a90455d7344889b0964598e3316e2a79ede8e36f16bdcf2228b8"
 dependencies = [
  "base64 0.13.1",
+ "base64 0.13.1",
 ]
 
 [[package]]
@@ -5194,6 +5855,15 @@ dependencies = [
  "base64ct",
 ]
 
+[[package]]
+name = "pem-rfc7468"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "88b39c9bfcfc231068454382784bb460aae594343fb030d46e9f50a645418412"
+dependencies = [
+ "base64ct",
+]
+
 [[package]]
 name = "percent-encoding"
 version = "2.3.1"
@@ -5203,19 +5873,23 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
 [[package]]
 name = "pest"
 version = "2.7.15"
+version = "2.7.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8b7cafe60d6cf8e62e1b9b2ea516a089c008945bb5a275416789e7db0bc199dc"
+checksum = "8b7cafe60d6cf8e62e1b9b2ea516a089c008945bb5a275416789e7db0bc199dc"
 dependencies = [
  "memchr",
- "thiserror 2.0.11",
+ "thiserror 2.0.9",
  "ucd-trie",
 ]
 
 [[package]]
 name = "pest_derive"
 version = "2.7.15"
+version = "2.7.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "816518421cfc6887a0d62bf441b6ffb4536fcc926395a69e1a85852d4363f57e"
+checksum = "816518421cfc6887a0d62bf441b6ffb4536fcc926395a69e1a85852d4363f57e"
 dependencies = [
  "pest",
  "pest_generator",
@@ -5224,37 +5898,32 @@ dependencies = [
 [[package]]
 name = "pest_generator"
 version = "2.7.15"
+version = "2.7.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7d1396fd3a870fc7838768d171b4616d5c91f6cc25e377b673d714567d99377b"
+checksum = "7d1396fd3a870fc7838768d171b4616d5c91f6cc25e377b673d714567d99377b"
 dependencies = [
  "pest",
  "pest_meta",
  "proc-macro2",
  "quote 1.0.38",
- "syn 2.0.96",
+ "syn 2.0.94",
 ]
 
 [[package]]
 name = "pest_meta"
 version = "2.7.15"
+version = "2.7.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e1e58089ea25d717bfd31fb534e4f3afcc2cc569c70de3e239778991ea3b7dea"
+checksum = "e1e58089ea25d717bfd31fb534e4f3afcc2cc569c70de3e239778991ea3b7dea"
 dependencies = [
+ "once_cell",
  "once_cell",
  "pest",
  "sha2",
 ]
 
-[[package]]
-name = "petgraph"
-version = "0.6.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db"
-dependencies = [
- "fixedbitset",
- "indexmap 2.7.1",
-]
-
 [[package]]
 name = "phf"
 version = "0.10.1"
@@ -5324,7 +5993,7 @@ dependencies = [
  "phf_shared 0.11.3",
  "proc-macro2",
  "quote 1.0.38",
- "syn 2.0.96",
+ "syn 2.0.94",
 ]
 
 [[package]]
@@ -5353,22 +6022,22 @@ checksum = "5be167a7af36ee22fe3115051bc51f6e6c7054c9348e28deb4f49bd6f705a315"
 
 [[package]]
 name = "pin-project"
-version = "1.1.8"
+version = "1.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e2ec53ad785f4d35dac0adea7f7dc6f1bb277ad84a680c7afefeae05d1f5916"
+checksum = "be57f64e946e500c8ee36ef6331845d40a93055567ec57e8fae13efd33759b95"
 dependencies = [
  "pin-project-internal",
 ]
 
 [[package]]
 name = "pin-project-internal"
-version = "1.1.8"
+version = "1.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d56a66c0c55993aa927429d0f8a0abfd74f084e4d9c192cffed01e418d83eefb"
+checksum = "3c0f5fad0874fc7abcd4d750e76917eaebbecaa2c20bde22e1dbeeba8beb758c"
 dependencies = [
  "proc-macro2",
  "quote 1.0.38",
- "syn 2.0.96",
+ "syn 2.0.94",
 ]
 
 [[package]]
@@ -5379,9 +6048,9 @@ checksum = "257b64915a082f7811703966789728173279bdebb956b143dbcd23f6f970a777"
 
 [[package]]
 name = "pin-project-lite"
-version = "0.2.16"
+version = "0.2.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3b3cff922bd51709b605d9ead9aa71031d81447142d828eb4a6eba76fe619f9b"
+checksum = "915a1e146535de9163f3987b8944ed8cf49a18bb0056bcebcdcece385cece4ff"
 
 [[package]]
 name = "pin-utils"
@@ -5400,6 +6069,17 @@ dependencies = [
  "futures-io",
 ]
 
+[[package]]
+name = "piper"
+version = "0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "96c8c490f422ef9a4efd2cb5b42b76c8613d7e7dfc1caf667b8a3350a5acc066"
+dependencies = [
+ "atomic-waker",
+ "fastrand 2.3.0",
+ "futures-io",
+]
+
 [[package]]
 name = "pkcs1"
 version = "0.4.1"
@@ -5409,6 +6089,8 @@ dependencies = [
  "der 0.6.1",
  "pkcs8 0.9.0",
  "spki 0.6.0",
+ "pkcs8 0.9.0",
+ "spki 0.6.0",
  "zeroize",
 ]
 
@@ -5422,6 +6104,17 @@ dependencies = [
  "spki 0.6.0",
 ]
 
+[[package]]
+name = "pkcs8"
+version = "0.10.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7"
+dependencies = [
+ "der 0.7.9",
+ "spki 0.7.3",
+ "spki 0.6.0",
+]
+
 [[package]]
 name = "pkcs8"
 version = "0.10.2"
@@ -5435,35 +6128,45 @@ dependencies = [
 [[package]]
 name = "pkg-config"
 version = "0.3.31"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2"
+checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2"
 
 [[package]]
 name = "png"
 version = "0.17.16"
+version = "0.17.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "82151a2fc869e011c153adc57cf2789ccb8d9906ce52c0b39a6b5697749d7526"
+checksum = "82151a2fc869e011c153adc57cf2789ccb8d9906ce52c0b39a6b5697749d7526"
 dependencies = [
  "bitflags 1.3.2",
  "crc32fast",
  "fdeflate",
  "flate2",
  "miniz_oxide",
+ "miniz_oxide",
 ]
 
 [[package]]
 name = "polling"
 version = "2.8.0"
+version = "2.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4b2d323e8ca7996b3e23126511a523f7e62924d93ecd5ae73b333815b0eb3dce"
+checksum = "4b2d323e8ca7996b3e23126511a523f7e62924d93ecd5ae73b333815b0eb3dce"
 dependencies = [
+ "autocfg 1.4.0",
+ "bitflags 1.3.2",
  "autocfg 1.4.0",
  "bitflags 1.3.2",
  "cfg-if",
  "concurrent-queue",
+ "concurrent-queue",
  "libc",
  "log",
- "pin-project-lite 0.2.16",
+ "pin-project-lite 0.2.15",
  "windows-sys 0.48.0",
 ]
 
@@ -5476,7 +6179,7 @@ dependencies = [
  "cfg-if",
  "concurrent-queue",
  "hermit-abi 0.4.0",
- "pin-project-lite 0.2.16",
+ "pin-project-lite 0.2.15",
  "rustix",
  "tracing",
  "windows-sys 0.59.0",
@@ -5491,6 +6194,7 @@ dependencies = [
  "cfg-if",
  "cpufeatures",
  "opaque-debug",
+ "opaque-debug",
  "universal-hash",
 ]
 
@@ -5506,14 +6210,31 @@ version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391"
 
+[[package]]
+name = "portable-atomic"
+version = "1.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "280dc24453071f1b63954171985a0b0d30058d287960968b9b2aca264c8d4ee6"
+
+[[package]]
+name = "powerfmt"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391"
+
 [[package]]
 name = "ppv-lite86"
 version = "0.2.20"
+version = "0.2.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04"
 dependencies = [
  "zerocopy",
 ]
+checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04"
+dependencies = [
+ "zerocopy",
+]
 
 [[package]]
 name = "precomputed-hash"
@@ -5531,16 +6252,6 @@ dependencies = [
  "log",
 ]
 
-[[package]]
-name = "prettyplease"
-version = "0.2.29"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6924ced06e1f7dfe3fa48d57b9f74f55d8915f5036121bef647ef4b204895fac"
-dependencies = [
- "proc-macro2",
- "syn 2.0.96",
-]
-
 [[package]]
 name = "primeorder"
 version = "0.13.6"
@@ -5553,11 +6264,15 @@ dependencies = [
 [[package]]
 name = "proc-macro-crate"
 version = "1.3.1"
+version = "1.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919"
+checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919"
 dependencies = [
  "once_cell",
  "toml_edit 0.19.15",
+ "once_cell",
+ "toml_edit 0.19.15",
 ]
 
 [[package]]
@@ -5570,6 +6285,8 @@ dependencies = [
  "proc-macro2",
  "quote 1.0.38",
  "syn 1.0.109",
+ "quote 1.0.38",
+ "syn 1.0.109",
  "version_check",
 ]
 
@@ -5581,6 +6298,7 @@ checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869"
 dependencies = [
  "proc-macro2",
  "quote 1.0.38",
+ "quote 1.0.38",
  "version_check",
 ]
 
@@ -5603,14 +6321,14 @@ dependencies = [
  "proc-macro-error-attr2",
  "proc-macro2",
  "quote 1.0.38",
- "syn 2.0.96",
+ "syn 2.0.94",
 ]
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.93"
+version = "1.0.92"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "60946a68e5f9d28b0dc1c21bb8a97ee7d018a8b322fa57838ba31cc878e22d99"
+checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0"
 dependencies = [
  "unicode-ident",
 ]
@@ -5623,7 +6341,7 @@ checksum = "af066a9c399a26e020ada66a034357a868728e72cd426f3adcd35f80d88d88c8"
 dependencies = [
  "proc-macro2",
  "quote 1.0.38",
- "syn 2.0.96",
+ "syn 2.0.94",
  "version_check",
  "yansi",
 ]
@@ -5631,8 +6349,10 @@ dependencies = [
 [[package]]
 name = "profiling"
 version = "1.0.16"
+version = "1.0.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "afbdc74edc00b6f6a218ca6a5364d6226a259d4b8ea1af4a0ea063f27e179f4d"
+checksum = "afbdc74edc00b6f6a218ca6a5364d6226a259d4b8ea1af4a0ea063f27e179f4d"
 dependencies = [
  "profiling-procmacros",
 ]
@@ -5640,18 +6360,22 @@ dependencies = [
 [[package]]
 name = "profiling-procmacros"
 version = "1.0.16"
+version = "1.0.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a65f2e60fbf1063868558d69c6beacf412dc755f9fc020f514b7955fc914fe30"
+checksum = "a65f2e60fbf1063868558d69c6beacf412dc755f9fc020f514b7955fc914fe30"
 dependencies = [
  "quote 1.0.38",
- "syn 2.0.96",
+ "syn 2.0.94",
 ]
 
 [[package]]
 name = "prometheus"
 version = "0.13.4"
+version = "0.13.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3d33c28a30771f7f96db69893f78b857f7450d7e0237e9c8fc6427a81bae7ed1"
+checksum = "3d33c28a30771f7f96db69893f78b857f7450d7e0237e9c8fc6427a81bae7ed1"
 dependencies = [
  "cfg-if",
  "fnv",
@@ -5659,6 +6383,7 @@ dependencies = [
  "memchr",
  "parking_lot",
  "thiserror 1.0.69",
+ "thiserror 1.0.69",
 ]
 
 [[package]]
@@ -5672,10 +6397,10 @@ dependencies = [
 ]
 
 [[package]]
-name = "prost-build"
-version = "0.12.6"
+name = "quanta"
+version = "0.12.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22505a5c94da8e3b7c2996394d1c933236c4d743e81a410bcca4e6989fc066a4"
+checksum = "3bd1fe6824cea6538803de3ff1bc0cf3949024db3d43c9643024bfb33a807c0e"
 dependencies = [
  "bytes 1.9.0",
  "heck 0.5.0",
@@ -5750,8 +6475,10 @@ checksum = "7a6e920b65c65f10b2ae65c831a81a073a89edd28c7cce89475bff467ab4167a"
 [[package]]
 name = "quote"
 version = "1.0.38"
+version = "1.0.38"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0e4dccaaaf89514f546c693ddc140f729f958c247918a13380cccc6078391acc"
+checksum = "0e4dccaaaf89514f546c693ddc140f729f958c247918a13380cccc6078391acc"
 dependencies = [
  "proc-macro2",
 ]
@@ -5759,9 +6486,17 @@ dependencies = [
 [[package]]
 name = "quoted_printable"
 version = "0.4.8"
+version = "0.4.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5a3866219251662ec3b26fc217e3e05bf9c4f84325234dfb96bf0bf840889e49"
 
+[[package]]
+name = "radium"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09"
+checksum = "5a3866219251662ec3b26fc217e3e05bf9c4f84325234dfb96bf0bf840889e49"
+
 [[package]]
 name = "radium"
 version = "0.7.0"
@@ -5936,6 +6671,7 @@ dependencies = [
  "simd_helpers",
  "system-deps",
  "thiserror 1.0.69",
+ "thiserror 1.0.69",
  "v_frame",
  "wasm-bindgen",
 ]
@@ -5943,8 +6679,10 @@ dependencies = [
 [[package]]
 name = "ravif"
 version = "0.11.11"
+version = "0.11.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2413fd96bd0ea5cdeeb37eaf446a22e6ed7b981d792828721e74ded1980a45c6"
+checksum = "2413fd96bd0ea5cdeeb37eaf446a22e6ed7b981d792828721e74ded1980a45c6"
 dependencies = [
  "avif-serialize",
  "imgref",
@@ -5955,6 +6693,15 @@ dependencies = [
  "rgb",
 ]
 
+[[package]]
+name = "raw-cpuid"
+version = "11.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1ab240315c661615f2ee9f0f2cd32d5a7343a84d5ebcccb99d46e6637565e7b0"
+dependencies = [
+ "bitflags 2.6.0",
+]
+
 [[package]]
 name = "rayon"
 version = "1.10.0"
@@ -5986,20 +6733,22 @@ dependencies = [
 
 [[package]]
 name = "redis"
-version = "0.23.1"
-source = "git+https://github.com/revoltchat/redis-rs?rev=f8ca28ab85da59d2ccde526b4d2fb390eff5a5f9#f8ca28ab85da59d2ccde526b4d2fb390eff5a5f9"
+version = "0.23.3"
+source = "git+https://github.com/revoltchat/redis-rs?rev=523b2937367e17bd0073722bf6e23d06042cb4e4#523b2937367e17bd0073722bf6e23d06042cb4e4"
 dependencies = [
  "async-std",
  "async-trait",
  "bytes 1.9.0",
+ "bytes 1.9.0",
  "combine",
  "futures-util",
  "itoa",
  "percent-encoding",
- "pin-project-lite 0.2.16",
+ "pin-project-lite 0.2.15",
  "ryu",
  "sha1_smol",
- "tokio 1.43.0",
+ "socket2 0.4.10",
+ "tokio 1.42.0",
  "tokio-util",
  "url",
 ]
@@ -6015,6 +6764,7 @@ dependencies = [
  "mobc",
  "mobc-redis",
  "redis",
+ "redis",
  "rmp-serde",
  "serde",
  "serde_json",
@@ -6026,6 +6776,7 @@ version = "4.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9c31deddf734dc0a39d3112e73490e88b61a05e83e074d211f348404cee4d2c6"
 dependencies = [
+ "bytes 1.9.0",
  "bytes 1.9.0",
  "bytes-utils",
  "cookie-factory",
@@ -6037,17 +6788,21 @@ dependencies = [
 [[package]]
 name = "redox_syscall"
 version = "0.5.8"
+version = "0.5.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "03a862b389f93e68874fbf580b9de08dd02facb9a788ebadaf4a3fd33cf58834"
+checksum = "03a862b389f93e68874fbf580b9de08dd02facb9a788ebadaf4a3fd33cf58834"
 dependencies = [
- "bitflags 2.8.0",
+ "bitflags 2.6.0",
 ]
 
 [[package]]
 name = "ref-cast"
 version = "1.0.23"
+version = "1.0.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ccf0a6f84d5f1d581da8b41b47ec8600871962f2a528115b542b362d4b744931"
+checksum = "ccf0a6f84d5f1d581da8b41b47ec8600871962f2a528115b542b362d4b744931"
 dependencies = [
  "ref-cast-impl",
 ]
@@ -6055,23 +6810,28 @@ dependencies = [
 [[package]]
 name = "ref-cast-impl"
 version = "1.0.23"
+version = "1.0.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bcc303e793d3734489387d205e9b186fac9c6cfacedd98cbb2e8a5943595f3e6"
+checksum = "bcc303e793d3734489387d205e9b186fac9c6cfacedd98cbb2e8a5943595f3e6"
 dependencies = [
  "proc-macro2",
  "quote 1.0.38",
- "syn 2.0.96",
+ "syn 2.0.94",
 ]
 
 [[package]]
 name = "regex"
 version = "1.11.1"
+version = "1.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191"
+checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191"
 dependencies = [
  "aho-corasick",
  "memchr",
  "regex-automata 0.4.9",
+ "regex-automata 0.4.9",
  "regex-syntax 0.8.5",
 ]
 
@@ -6082,13 +6842,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132"
 dependencies = [
  "regex-syntax 0.6.29",
+ "regex-syntax 0.6.29",
 ]
 
 [[package]]
 name = "regex-automata"
 version = "0.4.9"
+version = "0.4.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908"
+checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -6104,8 +6867,10 @@ checksum = "53a49587ad06b26609c52e423de037e7f57f20d53535d66e08c695f347df952a"
 [[package]]
 name = "regex-syntax"
 version = "0.6.29"
+version = "0.6.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"
+checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"
 
 [[package]]
 name = "regex-syntax"
@@ -6116,9 +6881,13 @@ checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
 [[package]]
 name = "reqwest"
 version = "0.11.27"
+version = "0.11.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dd67538700a17451e7cba03ac727fb961abb7607553461627b97de0b89cf4a62"
+checksum = "dd67538700a17451e7cba03ac727fb961abb7607553461627b97de0b89cf4a62"
 dependencies = [
+ "base64 0.21.7",
+ "bytes 1.9.0",
  "base64 0.21.7",
  "bytes 1.9.0",
  "encoding_rs",
@@ -6128,6 +6897,8 @@ dependencies = [
  "http 0.2.12",
  "http-body 0.4.6",
  "hyper 0.14.32",
+ "http-body 0.4.6",
+ "hyper 0.14.32",
  "hyper-tls 0.5.0",
  "ipnet",
  "js-sys",
@@ -6135,40 +6906,49 @@ dependencies = [
  "mime",
  "native-tls",
  "once_cell",
+ "once_cell",
  "percent-encoding",
- "pin-project-lite 0.2.16",
+ "pin-project-lite 0.2.15",
  "rustls-pemfile 1.0.4",
  "serde",
  "serde_json",
  "serde_urlencoded",
  "sync_wrapper 0.1.2",
  "system-configuration 0.5.1",
- "tokio 1.43.0",
+ "tokio 1.42.0",
  "tokio-native-tls",
  "tower-service",
+ "tower-service",
  "url",
  "wasm-bindgen",
  "wasm-bindgen-futures",
  "web-sys",
  "winreg",
+ "winreg",
 ]
 
 [[package]]
 name = "reqwest"
 version = "0.12.12"
+version = "0.12.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "43e734407157c3c2034e0258f5e4473ddb361b1e85f95a66690d67264d7cd1da"
+checksum = "43e734407157c3c2034e0258f5e4473ddb361b1e85f95a66690d67264d7cd1da"
 dependencies = [
  "base64 0.22.1",
  "bytes 1.9.0",
+ "bytes 1.9.0",
  "encoding_rs",
  "futures-core",
  "futures-util",
  "h2 0.4.7",
  "http 1.2.0",
  "http-body 1.0.1",
+ "h2 0.4.7",
+ "http 1.2.0",
+ "http-body 1.0.1",
  "http-body-util",
- "hyper 1.6.0",
+ "hyper 1.5.2",
  "hyper-rustls 0.27.5",
  "hyper-tls 0.6.0",
  "hyper-util",
@@ -6179,22 +6959,24 @@ dependencies = [
  "native-tls",
  "once_cell",
  "percent-encoding",
- "pin-project-lite 0.2.16",
+ "pin-project-lite 0.2.15",
  "rustls-pemfile 2.2.0",
  "serde",
  "serde_json",
  "serde_urlencoded",
  "sync_wrapper 1.0.2",
  "system-configuration 0.6.1",
- "tokio 1.43.0",
+ "tokio 1.42.0",
  "tokio-native-tls",
  "tower",
+ "tower",
  "tower-service",
  "url",
  "wasm-bindgen",
  "wasm-bindgen-futures",
  "web-sys",
  "windows-registry",
+ "windows-registry",
 ]
 
 [[package]]
@@ -6215,6 +6997,7 @@ checksum = "4a325d5e8d1cebddd070b13f44cec8071594ab67d1012797c121f27a669b7958"
 dependencies = [
  "gif",
  "image-webp 0.1.3",
+ "image-webp 0.1.3",
  "log",
  "pico-args",
  "rgb",
@@ -6251,7 +7034,7 @@ dependencies = [
  "simdutf8",
  "strum_macros",
  "tempfile",
- "tokio 1.43.0",
+ "tokio 1.42.0",
  "tower-http",
  "tracing",
  "tracing-subscriber",
@@ -6274,6 +7057,7 @@ dependencies = [
  "futures",
  "log",
  "lru 0.7.8",
+ "lru 0.7.8",
  "lru_time_cache",
  "once_cell",
  "querystring",
@@ -6316,7 +7100,7 @@ dependencies = [
  "revolt-database",
  "revolt-files",
  "revolt-result",
- "tokio 1.40.0",
+ "tokio 1.42.0",
 ]
 
 [[package]]
@@ -6331,6 +7115,7 @@ dependencies = [
  "authifier",
  "axum",
  "base64 0.21.7",
+ "base64 0.21.7",
  "bson",
  "deadqueue",
  "decancer",
@@ -6339,12 +7124,14 @@ dependencies = [
  "indexmap 1.9.3",
  "isahc",
  "iso8601-timestamp 0.2.17",
+ "iso8601-timestamp 0.2.17",
  "linkify 0.8.1",
  "livekit-api",
  "livekit-protocol",
  "livekit-runtime",
  "log",
  "lru 0.11.1",
+ "lru 0.11.1",
  "mongodb",
  "nanoid",
  "once_cell",
@@ -6368,6 +7155,7 @@ dependencies = [
  "unicode-segmentation",
  "url-escape",
  "validator 0.16.1",
+ "validator 0.16.1",
  "web-push",
 ]
 
@@ -6377,6 +7165,7 @@ version = "0.8.4"
 dependencies = [
  "amqprs",
  "async-channel 1.9.0",
+ "async-channel 1.9.0",
  "async-std",
  "authifier",
  "bitfield",
@@ -6386,19 +7175,23 @@ dependencies = [
  "futures",
  "impl_ops",
  "iso8601-timestamp 0.2.17",
+ "iso8601-timestamp 0.2.17",
  "lettre",
  "linkify 0.6.0",
  "livekit-api",
  "livekit-protocol",
  "log",
  "lru 0.7.8",
+ "lru 0.7.8",
  "nanoid",
  "num_enum 0.5.11",
+ "num_enum 0.5.11",
  "once_cell",
  "rand 0.8.5",
  "redis-kiss",
  "regex",
  "reqwest 0.11.27",
+ "reqwest 0.11.27",
  "revolt-config",
  "revolt-database",
  "revolt-models",
@@ -6417,6 +7210,7 @@ dependencies = [
  "ulid 0.4.1",
  "url",
  "validator 0.16.1",
+ "validator 0.16.1",
  "vergen",
 ]
 
@@ -6456,6 +7250,7 @@ dependencies = [
  "moka",
  "regex",
  "reqwest 0.12.12",
+ "reqwest 0.12.12",
  "revolt-config",
  "revolt-files",
  "revolt-models",
@@ -6464,7 +7259,7 @@ dependencies = [
  "serde",
  "serde_json",
  "tempfile",
- "tokio 1.43.0",
+ "tokio 1.42.0",
  "tracing",
  "tracing-subscriber",
  "utoipa",
@@ -6475,8 +7270,10 @@ dependencies = [
 name = "revolt-models"
 version = "0.8.4"
 dependencies = [
+ "fancy-regex",
  "indexmap 1.9.3",
  "iso8601-timestamp 0.2.17",
+ "num_enum 0.6.1",
  "once_cell",
  "regex",
  "revolt-config",
@@ -6487,6 +7284,7 @@ dependencies = [
  "serde",
  "utoipa",
  "validator 0.16.1",
+ "validator 0.16.1",
 ]
 
 [[package]]
@@ -6539,16 +7337,19 @@ dependencies = [
  "fcm_v1",
  "isahc",
  "iso8601-timestamp 0.2.17",
+ "iso8601-timestamp 0.2.17",
  "log",
+ "pretty_env_logger",
  "revolt-config",
  "revolt-database",
  "revolt-models",
+ "revolt-presence",
  "revolt_a2",
  "revolt_optional_struct",
  "serde",
  "serde_json",
- "tokio 1.43.0",
- "ulid 1.1.4",
+ "tokio 1.42.0",
+ "ulid 1.1.3",
  "web-push",
 ]
 
@@ -6599,22 +7400,25 @@ version = "0.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "edbe1f79cb41271d3cd8f932d75dddeba963c19dc93d1ee6cbe0391b495ab2f5"
 dependencies = [
+ "base64 0.21.7",
  "base64 0.21.7",
  "erased-serde",
  "http 1.2.0",
+ "http 1.2.0",
  "http-body-util",
- "hyper 1.6.0",
+ "hyper 1.5.2",
  "hyper-rustls 0.26.0",
  "hyper-util",
  "parking_lot",
  "pem 3.0.4",
- "ring 0.17.8",
+ "ring",
  "rustls 0.22.4",
  "rustls-pemfile 2.2.0",
+ "rustls-pemfile 2.2.0",
  "serde",
  "serde_json",
  "thiserror 1.0.69",
- "tokio 1.43.0",
+ "tokio 1.42.0",
 ]
 
 [[package]]
@@ -6670,8 +7474,10 @@ dependencies = [
  "darling 0.13.4",
  "proc-macro2",
  "quote 1.0.38",
+ "quote 1.0.38",
  "rocket_http",
  "syn 1.0.109",
+ "syn 1.0.109",
 ]
 
 [[package]]
@@ -6704,21 +7510,6 @@ dependencies = [
  "bytemuck",
 ]
 
-[[package]]
-name = "ring"
-version = "0.16.20"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc"
-dependencies = [
- "cc",
- "libc",
- "once_cell",
- "spin 0.5.2",
- "untrusted 0.7.1",
- "web-sys",
- "winapi",
-]
-
 [[package]]
 name = "ring"
 version = "0.17.8"
@@ -6729,16 +7520,18 @@ dependencies = [
  "cfg-if",
  "getrandom",
  "libc",
- "spin 0.9.8",
- "untrusted 0.9.0",
+ "spin",
+ "untrusted",
  "windows-sys 0.52.0",
 ]
 
 [[package]]
 name = "rmp"
 version = "0.8.14"
+version = "0.8.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "228ed7c16fa39782c3b3468e974aec2795e9089153cd08ee2e9aefb3613334c4"
+checksum = "228ed7c16fa39782c3b3468e974aec2795e9089153cd08ee2e9aefb3613334c4"
 dependencies = [
  "byteorder",
  "num-traits",
@@ -6748,8 +7541,10 @@ dependencies = [
 [[package]]
 name = "rmp-serde"
 version = "1.3.0"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "52e599a477cf9840e92f2cde9a7189e67b42c57532749bf90aea6ec10facd4db"
+checksum = "52e599a477cf9840e92f2cde9a7189e67b42c57532749bf90aea6ec10facd4db"
 dependencies = [
  "byteorder",
  "rmp",
@@ -6765,18 +7560,20 @@ dependencies = [
  "async-stream",
  "async-trait",
  "atomic 0.5.3",
+ "atomic 0.5.3",
  "binascii",
  "bytes 1.9.0",
+ "bytes 1.9.0",
  "either",
  "figment",
  "futures",
- "indexmap 2.7.1",
+ "indexmap 2.7.0",
  "log",
  "memchr",
  "multer",
  "num_cpus",
  "parking_lot",
- "pin-project-lite 0.2.16",
+ "pin-project-lite 0.2.15",
  "rand 0.8.5",
  "ref-cast",
  "rocket_codegen",
@@ -6786,7 +7583,7 @@ dependencies = [
  "state",
  "tempfile",
  "time",
- "tokio 1.43.0",
+ "tokio 1.42.0",
  "tokio-stream",
  "tokio-util",
  "ubyte",
@@ -6796,12 +7593,13 @@ dependencies = [
 
 [[package]]
 name = "rocket_authifier"
-version = "1.0.9"
+version = "1.0.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "810753b79106c44a4e76247fc7576b660663133a9e8f4b0afeb303589ec51d59"
+checksum = "c2aa1bfaee106d088b78de7c3cc2a8ab2c9e05a0286b6b912f0b18ea656b329e"
 dependencies = [
  "authifier",
  "iso8601-timestamp 0.1.11",
+ "iso8601-timestamp 0.1.11",
  "revolt_okapi",
  "revolt_rocket_okapi",
  "rocket",
@@ -6818,11 +7616,12 @@ checksum = "575d32d7ec1a9770108c879fc7c47815a80073f96ca07ff9525a94fcede1dd46"
 dependencies = [
  "devise",
  "glob",
- "indexmap 2.7.1",
+ "indexmap 2.7.0",
  "proc-macro2",
  "quote 1.0.38",
+ "quote 1.0.38",
  "rocket_http",
- "syn 2.0.96",
+ "syn 2.0.94",
  "unicode-xid 0.2.6",
  "version_check",
 ]
@@ -6865,27 +7664,29 @@ dependencies = [
  "futures",
  "http 0.2.12",
  "hyper 0.14.32",
- "indexmap 2.7.1",
+ "indexmap 2.7.0",
  "log",
  "memchr",
  "pear",
  "percent-encoding",
- "pin-project-lite 0.2.16",
+ "pin-project-lite 0.2.15",
  "ref-cast",
  "serde",
  "smallvec",
  "stable-pattern",
  "state",
  "time",
- "tokio 1.43.0",
+ "tokio 1.42.0",
  "uncased",
 ]
 
 [[package]]
 name = "rocket_prometheus"
 version = "0.10.1"
+version = "0.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "76f429d654a6854abef0a5361235e847b6552d5d989c2fc8a312ba4aebd8837f"
+checksum = "76f429d654a6854abef0a5361235e847b6552d5d989c2fc8a312ba4aebd8837f"
 dependencies = [
  "prometheus",
  "rocket",
@@ -6897,6 +7698,7 @@ version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "88073939a61e5b7680558e6be56b419e208420c2adb92be54921fa6b72283f1a"
 dependencies = [
+ "base64 0.13.1",
  "base64 0.13.1",
  "bitflags 1.3.2",
  "serde",
@@ -6916,14 +7718,17 @@ checksum = "094052d5470cbcef561cb848a7209968c9f12dfa6d668f4bca048ac5de51099c"
 dependencies = [
  "byteorder",
  "digest",
+ "digest",
  "num-bigint-dig",
  "num-integer",
  "num-iter",
  "num-traits",
  "pkcs1",
  "pkcs8 0.9.0",
+ "pkcs8 0.9.0",
  "rand_core 0.6.4",
  "signature 1.6.4",
+ "signature 1.6.4",
  "smallvec",
  "subtle",
  "zeroize",
@@ -6932,9 +7737,12 @@ dependencies = [
 [[package]]
 name = "rust-argon2"
 version = "1.0.1"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a5885493fdf0be6cdff808d1533ce878d21cfa49c7086fa00c66355cd9141bfc"
+checksum = "a5885493fdf0be6cdff808d1533ce878d21cfa49c7086fa00c66355cd9141bfc"
 dependencies = [
+ "base64 0.21.7",
  "base64 0.21.7",
  "blake2b_simd",
  "constant_time_eq",
@@ -6954,17 +7762,10 @@ dependencies = [
 [[package]]
 name = "rustc-demangle"
 version = "0.1.24"
+version = "0.1.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f"
-
-[[package]]
-name = "rustc_version"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a"
-dependencies = [
- "semver 0.9.0",
-]
+checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f"
 
 [[package]]
 name = "rustc_version"
@@ -6972,42 +7773,31 @@ version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92"
 dependencies = [
- "semver 1.0.25",
+ "semver",
 ]
 
 [[package]]
 name = "rustc_version_runtime"
-version = "0.2.1"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d31b7153270ebf48bf91c65ae5b0c00e749c4cfad505f66530ac74950249582f"
+checksum = "2dd18cd2bae1820af0b6ad5e54f4a51d0f3fcc53b05f845675074efcc7af071d"
 dependencies = [
- "rustc_version 0.2.3",
- "semver 0.9.0",
+ "rustc_version",
+ "semver",
 ]
 
 [[package]]
 name = "rustix"
-version = "0.38.44"
+version = "0.38.42"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fdb5bc1ae2baa591800df16c9ca78619bf65c0488b41b96ccec5d11220d8c154"
+checksum = "f93dc38ecbab2eb790ff964bb77fa94faf256fd3e73285fd7ba0903b76bedb85"
 dependencies = [
  "bitflags 2.8.0",
  "errno",
  "libc",
  "linux-raw-sys",
  "windows-sys 0.59.0",
-]
-
-[[package]]
-name = "rustls"
-version = "0.20.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b80e3dec595989ea8510028f30c408a4630db12c9cbb8de34203b89d6577e99"
-dependencies = [
- "log",
- "ring 0.16.20",
- "sct",
- "webpki",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -7017,7 +7807,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3f56a14d1f48b391359b22f731fd4bd7e43c97f3c50eee276f3aa09c94784d3e"
 dependencies = [
  "log",
- "ring 0.17.8",
+ "ring",
  "rustls-webpki 0.101.7",
  "sct",
 ]
@@ -7029,7 +7819,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bf4ef73721ac7bcd79b2b315da7779d8fc09718c6b3d2d1b2d94850eb8c18432"
 dependencies = [
  "log",
- "ring 0.17.8",
+ "ring",
  "rustls-pki-types",
  "rustls-webpki 0.102.8",
  "subtle",
@@ -7038,9 +7828,9 @@ dependencies = [
 
 [[package]]
 name = "rustls"
-version = "0.23.21"
+version = "0.23.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f287924602bf649d949c63dc8ac8b235fa5387d394020705b80c4eb597ce5b8"
+checksum = "5065c3f250cbd332cd894be57c40fa52387247659b14a2d6041d121547903b1b"
 dependencies = [
  "once_cell",
  "rustls-pki-types",
@@ -7068,22 +7858,25 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c"
 dependencies = [
  "base64 0.21.7",
+ "base64 0.21.7",
 ]
 
 [[package]]
 name = "rustls-pemfile"
 version = "2.2.0"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dce314e5fee3f39953d46bb63bb8a46d40c2f8fb7cc5a3b6cab2bde9721d6e50"
+checksum = "dce314e5fee3f39953d46bb63bb8a46d40c2f8fb7cc5a3b6cab2bde9721d6e50"
 dependencies = [
  "rustls-pki-types",
 ]
 
 [[package]]
 name = "rustls-pki-types"
-version = "1.11.0"
+version = "1.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "917ce264624a4b4db1c364dcc35bfca9ded014d0a958cd47ad3e960e988ea51c"
+checksum = "d2bf47e6ff922db3825eb750c4e2ff784c6ff8fb9e13046ef6a1d1c5401b0b37"
 
 [[package]]
 name = "rustls-webpki"
@@ -7091,26 +7884,30 @@ version = "0.101.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765"
 dependencies = [
- "ring 0.17.8",
- "untrusted 0.9.0",
+ "ring",
+ "untrusted",
 ]
 
 [[package]]
 name = "rustls-webpki"
 version = "0.102.8"
+version = "0.102.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "64ca1bc8749bd4cf37b5ce386cc146580777b4e8572c7b97baf22c83f444bee9"
+checksum = "64ca1bc8749bd4cf37b5ce386cc146580777b4e8572c7b97baf22c83f444bee9"
 dependencies = [
- "ring 0.17.8",
+ "ring",
  "rustls-pki-types",
- "untrusted 0.9.0",
+ "untrusted",
 ]
 
 [[package]]
 name = "rustversion"
 version = "1.0.19"
+version = "1.0.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f7c45b9784283f1b2e7fb61b42047c2fd678ef0960d4f6f1eba131594cc369d4"
+checksum = "f7c45b9784283f1b2e7fb61b42047c2fd678ef0960d4f6f1eba131594cc369d4"
 
 [[package]]
 name = "rustybuzz"
@@ -7132,24 +7929,29 @@ dependencies = [
 
 [[package]]
 name = "ryu"
-version = "1.0.19"
+version = "1.0.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ea1a2d0a644769cc99faa24c3ad26b379b786fe7c36fd3c546254801650e6dd"
+checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f"
 
 [[package]]
 name = "schannel"
 version = "0.1.27"
+version = "0.1.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1f29ebaa345f945cec9fbbc532eb307f0fdad8161f281b6369539c8d84876b3d"
+checksum = "1f29ebaa345f945cec9fbbc532eb307f0fdad8161f281b6369539c8d84876b3d"
 dependencies = [
  "windows-sys 0.59.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
 name = "schemars"
 version = "0.8.21"
+version = "0.8.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "09c024468a378b7e36765cd36702b7a90cc3cba11654f6685c8f233408e89e92"
+checksum = "09c024468a378b7e36765cd36702b7a90cc3cba11654f6685c8f233408e89e92"
 dependencies = [
  "dyn-clone",
  "indexmap 1.9.3",
@@ -7161,26 +7963,33 @@ dependencies = [
 [[package]]
 name = "schemars_derive"
 version = "0.8.21"
+version = "0.8.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b1eee588578aff73f856ab961cd2f79e36bc45d7ded33a7562adba4667aecc0e"
+checksum = "b1eee588578aff73f856ab961cd2f79e36bc45d7ded33a7562adba4667aecc0e"
 dependencies = [
  "proc-macro2",
  "quote 1.0.38",
+ "quote 1.0.38",
  "serde_derive_internals",
- "syn 2.0.96",
+ "syn 2.0.94",
 ]
 
 [[package]]
 name = "scoped-tls"
 version = "1.0.1"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294"
+checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294"
 
 [[package]]
 name = "scopeguard"
 version = "1.2.0"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
+checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
 
 [[package]]
 name = "scraper"
@@ -7201,11 +8010,13 @@ dependencies = [
 [[package]]
 name = "sct"
 version = "0.7.1"
+version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414"
+checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414"
 dependencies = [
- "ring 0.17.8",
- "untrusted 0.9.0",
+ "ring",
+ "untrusted",
 ]
 
 [[package]]
@@ -7220,6 +8031,7 @@ version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3be24c1842290c45df0a7bf069e0c268a747ad05a192f2fd7dcfdbc1cba40928"
 dependencies = [
+ "base16ct 0.1.1",
  "base16ct 0.1.1",
  "der 0.6.1",
  "generic-array 0.14.7",
@@ -7228,6 +8040,22 @@ dependencies = [
  "zeroize",
 ]
 
+[[package]]
+name = "sec1"
+version = "0.7.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d3e97a565f76233a6003f9f5c54be1d9c5bdfa3eccfb189469f11ec4901c47dc"
+dependencies = [
+ "base16ct 0.2.0",
+ "der 0.7.9",
+ "generic-array 0.14.7",
+ "pkcs8 0.10.2",
+ "generic-array 0.14.7",
+ "pkcs8 0.9.0",
+ "subtle",
+ "zeroize",
+]
+
 [[package]]
 name = "sec1"
 version = "0.7.3"
@@ -7251,15 +8079,18 @@ dependencies = [
  "der 0.4.5",
  "pem 0.8.3",
  "thiserror 1.0.69",
+ "thiserror 1.0.69",
 ]
 
 [[package]]
 name = "security-framework"
 version = "2.11.1"
+version = "2.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02"
+checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02"
 dependencies = [
- "bitflags 2.8.0",
+ "bitflags 2.6.0",
  "core-foundation",
  "core-foundation-sys",
  "libc",
@@ -7268,9 +8099,9 @@ dependencies = [
 
 [[package]]
 name = "security-framework-sys"
-version = "2.14.0"
+version = "2.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49db231d56a190491cb4aeda9527f1ad45345af50b0851622a7adb8c03b01c32"
+checksum = "1863fd3768cd83c56a7f60faa4dc0d403f1b6df0a38c3c25f44b7894e45370d5"
 dependencies = [
  "core-foundation-sys",
  "libc",
@@ -7297,24 +8128,9 @@ dependencies = [
 
 [[package]]
 name = "semver"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403"
-dependencies = [
- "semver-parser",
-]
-
-[[package]]
-name = "semver"
-version = "1.0.25"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f79dfe2d285b0488816f30e700a7438c5a73d816b5b7d3ac72fbc48b0d185e03"
-
-[[package]]
-name = "semver-parser"
-version = "0.7.0"
+version = "1.0.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
+checksum = "3cb6eb87a131f756572d7fb904f6e7b68633f09cca868c5df1c4b8d1a694bbba"
 
 [[package]]
 name = "send_wrapper"
@@ -7325,27 +8141,32 @@ checksum = "cd0b0ec5f1c1ca621c432a25813d8d60c88abe6d3e08a3eb9cf37d97a0fe3d73"
 [[package]]
 name = "sentry"
 version = "0.31.8"
+version = "0.31.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6ce4b57f1b521f674df7a1d200be8ff5d74e3712020ee25b553146657b5377d5"
+checksum = "6ce4b57f1b521f674df7a1d200be8ff5d74e3712020ee25b553146657b5377d5"
 dependencies = [
  "httpdate",
  "native-tls",
  "reqwest 0.11.27",
+ "reqwest 0.11.27",
  "sentry-backtrace",
  "sentry-contexts",
  "sentry-core",
  "sentry-debug-images",
  "sentry-panic",
  "sentry-tracing",
- "tokio 1.43.0",
+ "tokio 1.42.0",
  "ureq",
 ]
 
 [[package]]
 name = "sentry-backtrace"
 version = "0.31.8"
+version = "0.31.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "58cc8d4e04a73de8f718dc703943666d03f25d3e9e4d0fb271ca0b8c76dfa00e"
+checksum = "58cc8d4e04a73de8f718dc703943666d03f25d3e9e4d0fb271ca0b8c76dfa00e"
 dependencies = [
  "backtrace",
  "once_cell",
@@ -7356,13 +8177,15 @@ dependencies = [
 [[package]]
 name = "sentry-contexts"
 version = "0.31.8"
+version = "0.31.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6436c1bad22cdeb02179ea8ef116ffc217797c028927def303bc593d9320c0d1"
+checksum = "6436c1bad22cdeb02179ea8ef116ffc217797c028927def303bc593d9320c0d1"
 dependencies = [
  "hostname",
  "libc",
  "os_info",
- "rustc_version 0.4.1",
+ "rustc_version",
  "sentry-core",
  "uname",
 ]
@@ -7370,8 +8193,10 @@ dependencies = [
 [[package]]
 name = "sentry-core"
 version = "0.31.8"
+version = "0.31.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "901f761681f97db3db836ef9e094acdd8756c40215326c194201941947164ef1"
+checksum = "901f761681f97db3db836ef9e094acdd8756c40215326c194201941947164ef1"
 dependencies = [
  "once_cell",
  "rand 0.8.5",
@@ -7383,8 +8208,10 @@ dependencies = [
 [[package]]
 name = "sentry-debug-images"
 version = "0.31.8"
+version = "0.31.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "afdb263e73d22f39946f6022ed455b7561b22ff5553aca9be3c6a047fa39c328"
+checksum = "afdb263e73d22f39946f6022ed455b7561b22ff5553aca9be3c6a047fa39c328"
 dependencies = [
  "findshlibs",
  "once_cell",
@@ -7394,8 +8221,10 @@ dependencies = [
 [[package]]
 name = "sentry-panic"
 version = "0.31.8"
+version = "0.31.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "74fbf1c163f8b6a9d05912e1b272afa27c652e8b47ea60cb9a57ad5e481eea99"
+checksum = "74fbf1c163f8b6a9d05912e1b272afa27c652e8b47ea60cb9a57ad5e481eea99"
 dependencies = [
  "sentry-backtrace",
  "sentry-core",
@@ -7404,8 +8233,10 @@ dependencies = [
 [[package]]
 name = "sentry-tracing"
 version = "0.31.8"
+version = "0.31.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "82eabcab0a047040befd44599a1da73d3adb228ff53b5ed9795ae04535577704"
+checksum = "82eabcab0a047040befd44599a1da73d3adb228ff53b5ed9795ae04535577704"
 dependencies = [
  "sentry-backtrace",
  "sentry-core",
@@ -7416,25 +8247,32 @@ dependencies = [
 [[package]]
 name = "sentry-types"
 version = "0.31.8"
+version = "0.31.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "da956cca56e0101998c8688bc65ce1a96f00673a0e58e663664023d4c7911e82"
+checksum = "da956cca56e0101998c8688bc65ce1a96f00673a0e58e663664023d4c7911e82"
 dependencies = [
  "debugid",
  "hex",
  "rand 0.8.5",
+ "rand 0.8.5",
  "serde",
  "serde_json",
  "thiserror 1.0.69",
+ "thiserror 1.0.69",
  "time",
  "url",
  "uuid",
+ "uuid",
 ]
 
 [[package]]
 name = "serde"
 version = "1.0.217"
+version = "1.0.217"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "02fc4265df13d6fa1d00ecff087228cc0a2b5f3c0e87e258d8b94a156e984c70"
+checksum = "02fc4265df13d6fa1d00ecff087228cc0a2b5f3c0e87e258d8b94a156e984c70"
 dependencies = [
  "serde_derive",
 ]
@@ -7442,8 +8280,10 @@ dependencies = [
 [[package]]
 name = "serde_bytes"
 version = "0.11.15"
+version = "0.11.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "387cc504cb06bb40a96c8e04e951fe01854cf6bc921053c954e4a606d9675c6a"
+checksum = "387cc504cb06bb40a96c8e04e951fe01854cf6bc921053c954e4a606d9675c6a"
 dependencies = [
  "serde",
 ]
@@ -7460,34 +8300,39 @@ dependencies = [
 [[package]]
 name = "serde_derive"
 version = "1.0.217"
+version = "1.0.217"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5a9bf7cf98d04a2b28aead066b7496853d4779c9cc183c440dbac457641e19a0"
+checksum = "5a9bf7cf98d04a2b28aead066b7496853d4779c9cc183c440dbac457641e19a0"
 dependencies = [
  "proc-macro2",
  "quote 1.0.38",
- "syn 2.0.96",
+ "syn 2.0.94",
 ]
 
 [[package]]
 name = "serde_derive_internals"
 version = "0.29.1"
+version = "0.29.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "18d26a20a969b9e3fdf2fc2d9f21eda6c40e2de84c9408bb5d3b05d499aae711"
+checksum = "18d26a20a969b9e3fdf2fc2d9f21eda6c40e2de84c9408bb5d3b05d499aae711"
 dependencies = [
  "proc-macro2",
  "quote 1.0.38",
- "syn 2.0.96",
+ "syn 2.0.94",
 ]
 
 [[package]]
 name = "serde_json"
-version = "1.0.137"
+version = "1.0.134"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "930cfb6e6abf99298aaad7d29abbef7a9999a9a8806a40088f55f0dcec03146b"
+checksum = "d00f4175c42ee48b15416f6193a959ba3a0d67fc699a0db9ad12df9f83991c7d"
 dependencies = [
- "indexmap 2.7.1",
+ "indexmap 2.7.0",
  "itoa",
  "memchr",
+ "memchr",
  "ryu",
  "serde",
 ]
@@ -7505,8 +8350,10 @@ dependencies = [
 [[package]]
 name = "serde_spanned"
 version = "0.6.8"
+version = "0.6.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "87607cb1398ed59d48732e575a4c28a7a8ebf2454b964fe3f224f2afc07909e1"
+checksum = "87607cb1398ed59d48732e575a4c28a7a8ebf2454b964fe3f224f2afc07909e1"
 dependencies = [
  "serde",
 ]
@@ -7525,24 +8372,32 @@ dependencies = [
 
 [[package]]
 name = "serde_with"
-version = "1.14.0"
+version = "3.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "678b5a069e50bf00ecd22d0cd8ddf7c236f68581b03db652061ed5eb13a312ff"
+checksum = "d6b6f7f2fcb69f747921f79f3926bd1e203fce4fef62c268dd3abfb6d86029aa"
 dependencies = [
+ "base64 0.22.1",
+ "chrono",
+ "hex",
+ "indexmap 1.9.3",
+ "indexmap 2.7.0",
  "serde",
+ "serde_derive",
+ "serde_json",
  "serde_with_macros",
+ "time",
 ]
 
 [[package]]
 name = "serde_with_macros"
-version = "1.5.2"
+version = "3.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e182d6ec6f05393cc0e5ed1bf81ad6db3a8feedf8ee515ecdd369809bcce8082"
+checksum = "8d00caa5193a3c8362ac2b73be6b9e768aa5a4b2f721d8f4b339600c3cb51f8e"
 dependencies = [
- "darling 0.13.4",
+ "darling 0.20.10",
  "proc-macro2",
  "quote 1.0.38",
- "syn 1.0.109",
+ "syn 2.0.94",
 ]
 
 [[package]]
@@ -7557,12 +8412,15 @@ dependencies = [
 [[package]]
 name = "sha-1"
 version = "0.10.1"
+version = "0.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f5058ada175748e33390e40e872bd0fe59a19f265d0158daa551c5a88a76009c"
+checksum = "f5058ada175748e33390e40e872bd0fe59a19f265d0158daa551c5a88a76009c"
 dependencies = [
  "cfg-if",
  "cpufeatures",
  "digest",
+ "digest",
 ]
 
 [[package]]
@@ -7574,13 +8432,16 @@ dependencies = [
  "cfg-if",
  "cpufeatures",
  "digest",
+ "digest",
 ]
 
 [[package]]
 name = "sha1_smol"
 version = "1.0.1"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bbfa15b3dddfee50a0fff136974b3e1bde555604ba463834a7eb7deb6417705d"
+checksum = "bbfa15b3dddfee50a0fff136974b3e1bde555604ba463834a7eb7deb6417705d"
 
 [[package]]
 name = "sha2"
@@ -7591,13 +8452,16 @@ dependencies = [
  "cfg-if",
  "cpufeatures",
  "digest",
+ "digest",
 ]
 
 [[package]]
 name = "sharded-slab"
 version = "0.1.7"
+version = "0.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6"
+checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6"
 dependencies = [
  "lazy_static",
 ]
@@ -7611,8 +8475,11 @@ checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
 [[package]]
 name = "signal-hook-registry"
 version = "1.4.2"
+name = "signal-hook-registry"
+version = "1.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1"
+checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1"
 dependencies = [
  "libc",
 ]
@@ -7620,19 +8487,27 @@ dependencies = [
 [[package]]
 name = "signature"
 version = "1.6.4"
+name = "signature"
+version = "1.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "74233d3b3b2f6d4b006dc19dee745e73e2a6bfb6f93607cd3b02bd5b00797d7c"
+checksum = "74233d3b3b2f6d4b006dc19dee745e73e2a6bfb6f93607cd3b02bd5b00797d7c"
 dependencies = [
  "digest",
  "rand_core 0.6.4",
+ "digest",
+ "rand_core 0.6.4",
 ]
 
 [[package]]
 name = "signature"
 version = "2.2.0"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de"
+checksum = "77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de"
 dependencies = [
+ "digest",
  "digest",
  "rand_core 0.6.4",
 ]
@@ -7650,13 +8525,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "95890f873bec569a0362c235787f3aca6e1e887302ba4840839bcc6459c42da6"
 dependencies = [
  "quote 1.0.38",
+ "quote 1.0.38",
 ]
 
 [[package]]
 name = "simdutf8"
 version = "0.1.5"
+version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e3a9fe34e3e7a50316060351f37187a3f546bce95496156754b601a5fa71b76e"
+checksum = "e3a9fe34e3e7a50316060351f37187a3f546bce95496156754b601a5fa71b76e"
 
 [[package]]
 name = "simplecss"
@@ -7682,11 +8560,16 @@ checksum = "56199f7ddabf13fe5074ce809e7d3f42b42ae711800501b5b16ea82ad029c39d"
 [[package]]
 name = "slab"
 version = "0.4.9"
+version = "0.4.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67"
 dependencies = [
  "autocfg 1.4.0",
 ]
+checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67"
+dependencies = [
+ "autocfg 1.4.0",
+]
 
 [[package]]
 name = "slotmap"
@@ -7703,6 +8586,7 @@ version = "0.5.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6d7400c0eff44aa2fcb5e31a5f24ba9716ed90138769e4977a2ba6014ae63eb5"
 dependencies = [
+ "async-channel 1.9.0",
  "async-channel 1.9.0",
  "futures-core",
  "futures-io",
@@ -7717,8 +8601,10 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 [[package]]
 name = "socket2"
 version = "0.4.10"
+version = "0.4.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9f7916fc008ca5542385b89a3d3ce689953c143e9304a9bf8beec1de48994c0d"
+checksum = "9f7916fc008ca5542385b89a3d3ce689953c143e9304a9bf8beec1de48994c0d"
 dependencies = [
  "libc",
  "winapi",
@@ -7727,19 +8613,16 @@ dependencies = [
 [[package]]
 name = "socket2"
 version = "0.5.8"
+version = "0.5.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c970269d99b64e60ec3bd6ad27270092a5394c4e309314b18ae3fe575695fbe8"
+checksum = "c970269d99b64e60ec3bd6ad27270092a5394c4e309314b18ae3fe575695fbe8"
 dependencies = [
  "libc",
  "windows-sys 0.52.0",
+ "windows-sys 0.52.0",
 ]
 
-[[package]]
-name = "spin"
-version = "0.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d"
-
 [[package]]
 name = "spin"
 version = "0.9.8"
@@ -7766,6 +8649,16 @@ dependencies = [
  "der 0.7.9",
 ]
 
+[[package]]
+name = "spki"
+version = "0.7.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d91ed6c858b01f942cd56b37a94b3e0a1798290327d1236e4d9cf4eaca44d29d"
+dependencies = [
+ "base64ct",
+ "der 0.7.9",
+]
+
 [[package]]
 name = "stable-pattern"
 version = "0.1.0"
@@ -7788,6 +8681,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2b8c4a4445d81357df8b1a650d0d0d6fbbbfe99d064aa5e02f3e4022061476d8"
 dependencies = [
  "loom 0.5.6",
+ "loom 0.5.6",
 ]
 
 [[package]]
@@ -7823,17 +8717,21 @@ dependencies = [
  "phf_shared 0.10.0",
  "proc-macro2",
  "quote 1.0.38",
+ "quote 1.0.38",
 ]
 
 [[package]]
 name = "stringprep"
 version = "0.1.5"
+version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7b4df3d392d81bd458a8a621b8bffbd2302a12ffe288a9d931670948749463b1"
+checksum = "7b4df3d392d81bd458a8a621b8bffbd2302a12ffe288a9d931670948749463b1"
 dependencies = [
  "unicode-bidi",
  "unicode-normalization",
  "unicode-properties",
+ "unicode-properties",
 ]
 
 [[package]]
@@ -7854,11 +8752,12 @@ version = "0.26.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4c6bee85a5a24955dc440386795aa378cd9cf82acd5f764469152d2270e581be"
 dependencies = [
- "heck 0.5.0",
+ "heck",
  "proc-macro2",
  "quote 1.0.38",
+ "quote 1.0.38",
  "rustversion",
- "syn 2.0.96",
+ "syn 2.0.94",
 ]
 
 [[package]]
@@ -7891,22 +8790,26 @@ dependencies = [
 [[package]]
 name = "syn"
 version = "1.0.109"
+version = "1.0.109"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
+checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
 dependencies = [
  "proc-macro2",
  "quote 1.0.38",
+ "quote 1.0.38",
  "unicode-ident",
 ]
 
 [[package]]
 name = "syn"
-version = "2.0.96"
+version = "2.0.94"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d5d0adab1ae378d7f53bdebc67a39f1f151407ef230f0ce2883572f5d8985c80"
+checksum = "987bc0be1cdea8b10216bd06e2ca407d40b9543468fafd3ddfb02f36e77f71f3"
 dependencies = [
  "proc-macro2",
  "quote 1.0.38",
+ "quote 1.0.38",
  "unicode-ident",
 ]
 
@@ -7918,7 +8821,7 @@ checksum = "b5dc35bb08dd1ca3dfb09dce91fd2d13294d6711c88897d9a9d60acf39bce049"
 dependencies = [
  "proc-macro2",
  "quote 1.0.38",
- "syn 2.0.96",
+ "syn 2.0.94",
 ]
 
 [[package]]
@@ -7930,11 +8833,16 @@ checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160"
 [[package]]
 name = "sync_wrapper"
 version = "1.0.2"
+version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0bf256ce5efdfa370213c1dabab5935a12e49f2c58d15e9eac2870d3b4f27263"
 dependencies = [
  "futures-core",
 ]
+checksum = "0bf256ce5efdfa370213c1dabab5935a12e49f2c58d15e9eac2870d3b4f27263"
+dependencies = [
+ "futures-core",
+]
 
 [[package]]
 name = "synom"
@@ -7965,14 +8873,16 @@ checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971"
 dependencies = [
  "proc-macro2",
  "quote 1.0.38",
- "syn 2.0.96",
+ "syn 2.0.94",
 ]
 
 [[package]]
 name = "sysinfo"
 version = "0.27.8"
+version = "0.27.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a902e9050fca0a5d6877550b769abd2bd1ce8c04634b941dbe2809735e1a1e33"
+checksum = "a902e9050fca0a5d6877550b769abd2bd1ce8c04634b941dbe2809735e1a1e33"
 dependencies = [
  "cfg-if",
  "core-foundation-sys",
@@ -7999,7 +8909,7 @@ version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3c879d448e9d986b661742763247d3693ed13609438cf3d006f51f5368a5ba6b"
 dependencies = [
- "bitflags 2.8.0",
+ "bitflags 2.6.0",
  "core-foundation",
  "system-configuration-sys 0.6.0",
 ]
@@ -8024,6 +8934,16 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "system-configuration-sys"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e1d1b10ced5ca923a1fcb8d03e96b8d3268065d724548c0211415ff6ac6bac4"
+dependencies = [
+ "core-foundation-sys",
+ "libc",
+]
+
 [[package]]
 name = "system-deps"
 version = "6.2.2"
@@ -8031,7 +8951,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a3e535eb8dded36d55ec13eddacd30dec501792ff23a0b1682c38601b8cf2349"
 dependencies = [
  "cfg-expr",
- "heck 0.5.0",
+ "heck",
  "pkg-config",
  "toml 0.8.19",
  "version-compare",
@@ -8055,6 +8975,12 @@ version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369"
 
+[[package]]
+name = "tap"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369"
+
 [[package]]
 name = "target-lexicon"
 version = "0.12.16"
@@ -8064,12 +8990,16 @@ checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1"
 [[package]]
 name = "tempfile"
 version = "3.15.0"
+version = "3.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9a8a559c81686f576e8cd0290cd2a24a2a9ad80c98b3478856500fcbd7acd704"
+checksum = "9a8a559c81686f576e8cd0290cd2a24a2a9ad80c98b3478856500fcbd7acd704"
 dependencies = [
  "cfg-if",
  "fastrand 2.3.0",
  "getrandom",
+ "fastrand 2.3.0",
+ "getrandom",
  "once_cell",
  "rustix",
  "windows-sys 0.59.0",
@@ -8089,8 +9019,10 @@ dependencies = [
 [[package]]
 name = "termcolor"
 version = "1.4.1"
+version = "1.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755"
+checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755"
 dependencies = [
  "winapi-util",
 ]
@@ -8098,49 +9030,56 @@ dependencies = [
 [[package]]
 name = "thiserror"
 version = "1.0.69"
+version = "1.0.69"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52"
+checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52"
 dependencies = [
  "thiserror-impl 1.0.69",
 ]
 
 [[package]]
 name = "thiserror"
-version = "2.0.11"
+version = "2.0.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d452f284b73e6d76dd36758a0c8684b1d5be31f92b89d07fd5822175732206fc"
+checksum = "f072643fd0190df67a8bab670c20ef5d8737177d6ac6b2e9a236cb096206b2cc"
 dependencies = [
- "thiserror-impl 2.0.11",
+ "thiserror-impl 2.0.9",
 ]
 
 [[package]]
 name = "thiserror-impl"
 version = "1.0.69"
+version = "1.0.69"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1"
+checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1"
 dependencies = [
  "proc-macro2",
  "quote 1.0.38",
- "syn 2.0.96",
+ "syn 2.0.94",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "2.0.11"
+version = "2.0.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26afc1baea8a989337eeb52b6e72a039780ce45c3edfcc9c5b9d112feeb173c2"
+checksum = "7b50fa271071aae2e6ee85f842e2e28ba8cd2c5fb67f11fcb1fd70b276f9e7d4"
 dependencies = [
  "proc-macro2",
  "quote 1.0.38",
- "syn 2.0.96",
+ "syn 2.0.94",
 ]
 
 [[package]]
 name = "thread_local"
 version = "1.1.8"
+version = "1.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c"
+checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c"
 dependencies = [
+ "cfg-if",
  "cfg-if",
  "once_cell",
 ]
@@ -8159,15 +9098,20 @@ dependencies = [
 [[package]]
 name = "time"
 version = "0.3.37"
+version = "0.3.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "35e7868883861bd0e56d9ac6efcaaca0d6d5d82a2a7ec8209ff492c07cf37b21"
+checksum = "35e7868883861bd0e56d9ac6efcaaca0d6d5d82a2a7ec8209ff492c07cf37b21"
 dependencies = [
+ "deranged",
  "deranged",
  "itoa",
  "libc",
  "num-conv",
+ "num-conv",
  "num_threads",
  "powerfmt",
+ "powerfmt",
  "serde",
  "time-core",
  "time-macros",
@@ -8176,15 +9120,20 @@ dependencies = [
 [[package]]
 name = "time-core"
 version = "0.1.2"
+version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3"
+checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3"
 
 [[package]]
 name = "time-macros"
 version = "0.2.19"
+version = "0.2.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2834e6017e3e5e4b9834939793b282bc03b37a3336245fa820e35e233e2a85de"
+checksum = "2834e6017e3e5e4b9834939793b282bc03b37a3336245fa820e35e233e2a85de"
 dependencies = [
+ "num-conv",
  "num-conv",
  "time-core",
 ]
@@ -8208,11 +9157,21 @@ dependencies = [
 name = "tiny-skia-path"
 version = "0.11.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c9e7fc0c2e86a30b117d0462aa261b72b7a99b7ebd7deb3a14ceda95c5bdc93"
+checksum = "9c9e7fc0c2e86a30b117d0462aa261b72b7a99b7ebd7deb3a14ceda95c5bdc93"
+dependencies = [
+ "arrayref",
+ "bytemuck",
+ "strict-num",
+]
+
+[[package]]
+name = "tinystr"
+version = "0.7.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9117f5d4db391c1cf6927e7bea3db74b9a1c1add8f7eda9ffd5364f40f57b82f"
 dependencies = [
- "arrayref",
- "bytemuck",
- "strict-num",
+ "displaydoc",
+ "zerovec",
 ]
 
 [[package]]
@@ -8228,8 +9187,10 @@ dependencies = [
 [[package]]
 name = "tinyvec"
 version = "1.8.1"
+version = "1.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "022db8904dfa342efe721985167e9fcd16c29b226db4397ed752a761cfce81e8"
+checksum = "022db8904dfa342efe721985167e9fcd16c29b226db4397ed752a761cfce81e8"
 dependencies = [
  "tinyvec_macros",
 ]
@@ -8237,8 +9198,10 @@ dependencies = [
 [[package]]
 name = "tinyvec_macros"
 version = "0.1.1"
+version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
+checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
 
 [[package]]
 name = "tokio"
@@ -8253,18 +9216,20 @@ dependencies = [
 
 [[package]]
 name = "tokio"
-version = "1.43.0"
+version = "1.42.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d61fa4ffa3de412bfea335c6ecff681de2b609ba3c77ef3e00e521813a9ed9e"
+checksum = "5cec9b21b0450273377fc97bd4c33a8acffc8c996c987a7c5b319a0083707551"
 dependencies = [
  "backtrace",
  "bytes 1.9.0",
+ "bytes 1.9.0",
  "libc",
  "mio",
  "parking_lot",
- "pin-project-lite 0.2.16",
+ "pin-project-lite 0.2.15",
  "signal-hook-registry",
  "socket2 0.5.8",
+ "socket2 0.5.8",
  "tokio-macros",
  "windows-sys 0.52.0",
 ]
@@ -8277,28 +9242,19 @@ checksum = "6e06d43f1345a3bcd39f6a56dbb7dcab2ba47e68e8ac134855e7e2bdbaf8cab8"
 dependencies = [
  "proc-macro2",
  "quote 1.0.38",
- "syn 2.0.96",
+ "syn 2.0.94",
 ]
 
 [[package]]
 name = "tokio-native-tls"
 version = "0.3.1"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2"
+checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2"
 dependencies = [
  "native-tls",
- "tokio 1.43.0",
-]
-
-[[package]]
-name = "tokio-rustls"
-version = "0.23.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c43ee83903113e03984cb9e5cebe6c04a5116269e900e3ddba8f068a62adda59"
-dependencies = [
- "rustls 0.20.9",
- "tokio 1.43.0",
- "webpki",
+ "tokio 1.42.0",
 ]
 
 [[package]]
@@ -8308,7 +9264,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081"
 dependencies = [
  "rustls 0.21.12",
- "tokio 1.43.0",
+ "tokio 1.42.0",
 ]
 
 [[package]]
@@ -8319,7 +9275,7 @@ checksum = "775e0c0f0adb3a2f22a00c4745d728b479985fc15ee7ca6a2608388c5569860f"
 dependencies = [
  "rustls 0.22.4",
  "rustls-pki-types",
- "tokio 1.43.0",
+ "tokio 1.42.0",
 ]
 
 [[package]]
@@ -8328,40 +9284,47 @@ version = "0.26.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5f6d0975eaace0cf0fcadee4e4aaa5da15b5c079146f2cffb67c113be122bf37"
 dependencies = [
- "rustls 0.23.21",
- "tokio 1.43.0",
+ "rustls 0.23.20",
+ "tokio 1.42.0",
 ]
 
 [[package]]
 name = "tokio-stream"
 version = "0.1.17"
+version = "0.1.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "eca58d7bba4a75707817a2c44174253f9236b2d5fbd055602e9d5c07c139a047"
+checksum = "eca58d7bba4a75707817a2c44174253f9236b2d5fbd055602e9d5c07c139a047"
 dependencies = [
  "futures-core",
- "pin-project-lite 0.2.16",
- "tokio 1.43.0",
+ "pin-project-lite 0.2.15",
+ "tokio 1.42.0",
 ]
 
 [[package]]
 name = "tokio-util"
 version = "0.7.13"
+version = "0.7.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d7fcaa8d55a2bdd6b83ace262b016eca0d79ee02818c5c1bcdf0305114081078"
+checksum = "d7fcaa8d55a2bdd6b83ace262b016eca0d79ee02818c5c1bcdf0305114081078"
 dependencies = [
+ "bytes 1.9.0",
  "bytes 1.9.0",
  "futures-core",
  "futures-io",
  "futures-sink",
- "pin-project-lite 0.2.16",
- "tokio 1.43.0",
+ "pin-project-lite 0.2.15",
+ "tokio 1.42.0",
 ]
 
 [[package]]
 name = "toml"
 version = "0.5.11"
+version = "0.5.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234"
+checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234"
 dependencies = [
  "serde",
 ]
@@ -8376,6 +9339,7 @@ dependencies = [
  "serde_spanned",
  "toml_datetime",
  "toml_edit 0.22.22",
+ "toml_edit 0.22.22",
 ]
 
 [[package]]
@@ -8390,10 +9354,12 @@ dependencies = [
 [[package]]
 name = "toml_edit"
 version = "0.19.15"
+version = "0.19.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421"
+checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421"
 dependencies = [
- "indexmap 2.7.1",
+ "indexmap 2.7.0",
  "toml_datetime",
  "winnow 0.5.40",
 ]
@@ -8404,36 +9370,42 @@ version = "0.22.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4ae48d6208a266e853d946088ed816055e556cc6028c5e8e2b84d9fa5dd7c7f5"
 dependencies = [
- "indexmap 2.7.1",
+ "indexmap 2.7.0",
  "serde",
  "serde_spanned",
  "toml_datetime",
- "winnow 0.6.25",
+ "winnow 0.6.21",
 ]
 
 [[package]]
 name = "totp-lite"
 version = "2.0.1"
+version = "2.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f8e43134db17199f7f721803383ac5854edd0d3d523cc34dba321d6acfbe76c3"
+checksum = "f8e43134db17199f7f721803383ac5854edd0d3d523cc34dba321d6acfbe76c3"
 dependencies = [
+ "digest",
  "digest",
  "hmac",
  "sha1",
+ "sha1",
  "sha2",
 ]
 
 [[package]]
 name = "tower"
 version = "0.5.2"
+version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d039ad9159c98b70ecfd540b2573b97f7f52c3e8d9f8ad57a24b916a536975f9"
+checksum = "d039ad9159c98b70ecfd540b2573b97f7f52c3e8d9f8ad57a24b916a536975f9"
 dependencies = [
  "futures-core",
  "futures-util",
- "pin-project-lite 0.2.16",
+ "pin-project-lite 0.2.15",
  "sync_wrapper 1.0.2",
- "tokio 1.43.0",
+ "tokio 1.42.0",
  "tower-layer",
  "tower-service",
  "tracing",
@@ -8445,12 +9417,12 @@ version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1e9cd434a998747dd2c4276bc96ee2e0c7a2eadf3cae88e52be55a05fa9053f5"
 dependencies = [
- "bitflags 2.8.0",
+ "bitflags 2.6.0",
  "bytes 1.9.0",
  "http 1.2.0",
  "http-body 1.0.1",
  "http-body-util",
- "pin-project-lite 0.2.16",
+ "pin-project-lite 0.2.15",
  "tower-layer",
  "tower-service",
 ]
@@ -8458,23 +9430,29 @@ dependencies = [
 [[package]]
 name = "tower-layer"
 version = "0.3.3"
+version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "121c2a6cda46980bb0fcd1647ffaf6cd3fc79a013de288782836f6df9c48780e"
+checksum = "121c2a6cda46980bb0fcd1647ffaf6cd3fc79a013de288782836f6df9c48780e"
 
 [[package]]
 name = "tower-service"
 version = "0.3.3"
+version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3"
+checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3"
 
 [[package]]
 name = "tracing"
 version = "0.1.41"
+version = "0.1.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "784e0ac535deb450455cbfa28a6f0df145ea1bb7ae51b821cf5e7927fdcfbdd0"
+checksum = "784e0ac535deb450455cbfa28a6f0df145ea1bb7ae51b821cf5e7927fdcfbdd0"
 dependencies = [
  "log",
- "pin-project-lite 0.2.16",
+ "pin-project-lite 0.2.15",
  "tracing-attributes",
  "tracing-core",
 ]
@@ -8482,19 +9460,23 @@ dependencies = [
 [[package]]
 name = "tracing-attributes"
 version = "0.1.28"
+version = "0.1.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "395ae124c09f9e6918a2310af6038fba074bcf474ac352496d5910dd59a2226d"
+checksum = "395ae124c09f9e6918a2310af6038fba074bcf474ac352496d5910dd59a2226d"
 dependencies = [
  "proc-macro2",
  "quote 1.0.38",
- "syn 2.0.96",
+ "syn 2.0.94",
 ]
 
 [[package]]
 name = "tracing-core"
 version = "0.1.33"
+version = "0.1.33"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e672c95779cf947c5311f83787af4fa8fffd12fb27e4993211a84bdfd9610f9c"
+checksum = "e672c95779cf947c5311f83787af4fa8fffd12fb27e4993211a84bdfd9610f9c"
 dependencies = [
  "once_cell",
  "valuable",
@@ -8513,23 +9495,30 @@ dependencies = [
 [[package]]
 name = "tracing-log"
 version = "0.2.0"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3"
+checksum = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3"
 dependencies = [
  "log",
  "once_cell",
+ "once_cell",
  "tracing-core",
 ]
 
 [[package]]
 name = "tracing-subscriber"
 version = "0.3.19"
+version = "0.3.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e8189decb5ac0fa7bc8b96b7cb9b2701d60d48805aca84a238004d665fcc4008"
+checksum = "e8189decb5ac0fa7bc8b96b7cb9b2701d60d48805aca84a238004d665fcc4008"
 dependencies = [
  "matchers",
  "nu-ansi-term",
  "once_cell",
+ "nu-ansi-term",
+ "once_cell",
  "regex",
  "sharded-slab",
  "smallvec",
@@ -8539,56 +9528,13 @@ dependencies = [
  "tracing-log",
 ]
 
-[[package]]
-name = "trust-dns-proto"
-version = "0.21.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c31f240f59877c3d4bb3b3ea0ec5a6a0cff07323580ff8c7a605cd7d08b255d"
-dependencies = [
- "async-trait",
- "cfg-if",
- "data-encoding",
- "enum-as-inner",
- "futures-channel",
- "futures-io",
- "futures-util",
- "idna 0.2.3",
- "ipnet",
- "lazy_static",
- "log",
- "rand 0.8.5",
- "smallvec",
- "thiserror 1.0.69",
- "tinyvec",
- "tokio 1.43.0",
- "url",
-]
-
-[[package]]
-name = "trust-dns-resolver"
-version = "0.21.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e4ba72c2ea84515690c9fcef4c6c660bb9df3036ed1051686de84605b74fd558"
-dependencies = [
- "cfg-if",
- "futures-util",
- "ipconfig",
- "lazy_static",
- "log",
- "lru-cache",
- "parking_lot",
- "resolv-conf",
- "smallvec",
- "thiserror 1.0.69",
- "tokio 1.43.0",
- "trust-dns-proto",
-]
-
 [[package]]
 name = "try-lock"
 version = "0.2.5"
+version = "0.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b"
+checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b"
 
 [[package]]
 name = "ttf-parser"
@@ -8602,18 +9548,24 @@ dependencies = [
 [[package]]
 name = "tungstenite"
 version = "0.17.3"
+version = "0.17.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e27992fd6a8c29ee7eef28fc78349aa244134e10ad447ce3b9f0ac0ed0fa4ce0"
+checksum = "e27992fd6a8c29ee7eef28fc78349aa244134e10ad447ce3b9f0ac0ed0fa4ce0"
 dependencies = [
+ "base64 0.13.1",
  "base64 0.13.1",
  "byteorder",
  "bytes 1.9.0",
+ "bytes 1.9.0",
  "http 0.2.12",
  "httparse",
  "log",
  "rand 0.8.5",
  "sha-1",
  "thiserror 1.0.69",
+ "sha-1",
+ "thiserror 1.0.69",
  "url",
  "utf-8",
 ]
@@ -8627,6 +9579,8 @@ dependencies = [
  "proc-macro2",
  "quote 1.0.38",
  "syn 1.0.109",
+ "quote 1.0.38",
+ "syn 1.0.109",
 ]
 
 [[package]]
@@ -8647,8 +9601,10 @@ dependencies = [
 [[package]]
 name = "ucd-trie"
 version = "0.1.7"
+version = "0.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2896d95c02a80c6d6a5d6e953d479f5ddf2dfdb6a244441010e373ac0fb88971"
+checksum = "2896d95c02a80c6d6a5d6e953d479f5ddf2dfdb6a244441010e373ac0fb88971"
 
 [[package]]
 name = "ulid"
@@ -8693,8 +9649,10 @@ dependencies = [
 [[package]]
 name = "uncased"
 version = "0.9.10"
+version = "0.9.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e1b88fcfe09e89d3866a5c11019378088af2d24c3fbd4f0543f96b479ec90697"
+checksum = "e1b88fcfe09e89d3866a5c11019378088af2d24c3fbd4f0543f96b479ec90697"
 dependencies = [
  "serde",
  "version_check",
@@ -8703,8 +9661,10 @@ dependencies = [
 [[package]]
 name = "unicase"
 version = "2.8.1"
+version = "2.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "75b844d17643ee918803943289730bec8aac480150456169e647ed0b576ba539"
+checksum = "75b844d17643ee918803943289730bec8aac480150456169e647ed0b576ba539"
 
 [[package]]
 name = "unicase_serde"
@@ -8719,8 +9679,10 @@ dependencies = [
 [[package]]
 name = "unicode-bidi"
 version = "0.3.18"
+version = "0.3.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5c1cb5db39152898a79168971543b1cb5020dff7fe43c8dc468b0885f5e29df5"
+checksum = "5c1cb5db39152898a79168971543b1cb5020dff7fe43c8dc468b0885f5e29df5"
 
 [[package]]
 name = "unicode-bidi-mirroring"
@@ -8736,15 +9698,17 @@ checksum = "260bc6647b3893a9a90668360803a15f96b85a5257b1c3a0c3daf6ae2496de42"
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.16"
+version = "1.0.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a210d160f08b701c8721ba1c726c11662f877ea6b7094007e1ca9a1041945034"
+checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83"
 
 [[package]]
 name = "unicode-normalization"
 version = "0.1.24"
+version = "0.1.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5033c97c4262335cded6d6fc3e5c18ab755e1a3dc96376350f3d8e9f009ad956"
+checksum = "5033c97c4262335cded6d6fc3e5c18ab755e1a3dc96376350f3d8e9f009ad956"
 dependencies = [
  "tinyvec",
 ]
@@ -8764,8 +9728,10 @@ checksum = "9fb421b350c9aff471779e262955939f565ec18b86c15364e6bdf0d662ca7c1f"
 [[package]]
 name = "unicode-segmentation"
 version = "1.12.0"
+version = "1.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493"
+checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493"
 
 [[package]]
 name = "unicode-vo"
@@ -8788,8 +9754,10 @@ checksum = "8c1f860d7d29cf02cb2f3f359fd35991af3d30bac52c57d265a3c461074cb4dc"
 [[package]]
 name = "unicode-xid"
 version = "0.2.6"
+version = "0.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853"
+checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853"
 
 [[package]]
 name = "universal-hash"
@@ -8801,12 +9769,6 @@ dependencies = [
  "subtle",
 ]
 
-[[package]]
-name = "untrusted"
-version = "0.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a"
-
 [[package]]
 name = "untrusted"
 version = "0.9.0"
@@ -8816,9 +9778,12 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1"
 [[package]]
 name = "ureq"
 version = "2.12.1"
+version = "2.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "02d1a66277ed75f640d608235660df48c8e3c19f3b4edb6a263315626cc3c01d"
+checksum = "02d1a66277ed75f640d608235660df48c8e3c19f3b4edb6a263315626cc3c01d"
 dependencies = [
+ "base64 0.22.1",
  "base64 0.22.1",
  "log",
  "native-tls",
@@ -8829,11 +9794,14 @@ dependencies = [
 [[package]]
 name = "url"
 version = "2.5.4"
+version = "2.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "32f8b686cadd1473f4bd0117a5d28d36b1ade384ea9b5069a1c40aefed7fda60"
+checksum = "32f8b686cadd1473f4bd0117a5d28d36b1ade384ea9b5069a1c40aefed7fda60"
 dependencies = [
  "form_urlencoded",
  "idna 1.0.3",
+ "idna 1.0.3",
  "percent-encoding",
  "serde",
 ]
@@ -8898,19 +9866,13 @@ version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be"
 
-[[package]]
-name = "utf8parse"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
-
 [[package]]
 name = "utoipa"
 version = "4.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c5afb1a60e207dca502682537fefcfd9921e71d0b83e9576060f09abc6efab23"
 dependencies = [
- "indexmap 2.7.1",
+ "indexmap 2.7.0",
  "serde",
  "serde_json",
  "utoipa-gen",
@@ -8919,15 +9881,18 @@ dependencies = [
 [[package]]
 name = "utoipa-gen"
 version = "4.3.1"
+version = "4.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "20c24e8ab68ff9ee746aad22d39b5535601e6416d1b0feeabf78be986a5c4392"
+checksum = "20c24e8ab68ff9ee746aad22d39b5535601e6416d1b0feeabf78be986a5c4392"
 dependencies = [
  "proc-macro-error",
  "proc-macro2",
  "quote 1.0.38",
+ "quote 1.0.38",
  "regex",
- "syn 2.0.96",
- "ulid 1.1.4",
+ "syn 2.0.94",
+ "ulid 1.1.3",
 ]
 
 [[package]]
@@ -8944,9 +9909,9 @@ dependencies = [
 
 [[package]]
 name = "uuid"
-version = "1.12.1"
+version = "1.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b3758f5e68192bb96cc8f9b7e2c2cfdabb435499a28499a42f8f984092adad4b"
+checksum = "f8c5f0a0af699448548ad1a2fbf920fb4bee257eae39953ba95cb84891a0446a"
 dependencies = [
  "getrandom",
  "serde",
@@ -8981,9 +9946,12 @@ dependencies = [
 [[package]]
 name = "validator"
 version = "0.16.1"
+version = "0.16.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b92f40481c04ff1f4f61f304d61793c7b56ff76ac1469f1beb199b1445b253bd"
+checksum = "b92f40481c04ff1f4f61f304d61793c7b56ff76ac1469f1beb199b1445b253bd"
 dependencies = [
+ "idna 0.4.0",
  "idna 0.4.0",
  "lazy_static",
  "regex",
@@ -9005,8 +9973,10 @@ dependencies = [
  "proc-macro-error",
  "proc-macro2",
  "quote 1.0.38",
+ "quote 1.0.38",
  "regex",
  "syn 1.0.109",
+ "syn 1.0.109",
  "validator_types",
 ]
 
@@ -9018,6 +9988,7 @@ checksum = "111abfe30072511849c5910134e8baf8dc05de4c0e5903d681cbd5c9c4d611e3"
 dependencies = [
  "proc-macro2",
  "syn 1.0.109",
+ "syn 1.0.109",
 ]
 
 [[package]]
@@ -9029,8 +10000,10 @@ checksum = "ba73ea9cf16a25df0c8caa16c51acb937d5712a8429db78a3ee29d5dcacd3a65"
 [[package]]
 name = "value-bag"
 version = "1.10.0"
+version = "1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3ef4c4aa54d5d05a279399bfa921ec387b7aba77caf7a682ae8d86785b8fdad2"
+checksum = "3ef4c4aa54d5d05a279399bfa921ec387b7aba77caf7a682ae8d86785b8fdad2"
 
 [[package]]
 name = "vcpkg"
@@ -9041,18 +10014,21 @@ checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426"
 [[package]]
 name = "vergen"
 version = "7.5.1"
+version = "7.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f21b881cd6636ece9735721cf03c1fe1e774fe258683d084bb2812ab67435749"
+checksum = "f21b881cd6636ece9735721cf03c1fe1e774fe258683d084bb2812ab67435749"
 dependencies = [
  "anyhow",
  "cfg-if",
  "enum-iterator",
  "getset",
  "git2",
- "rustc_version 0.4.1",
+ "rustc_version",
  "rustversion",
  "sysinfo",
  "thiserror 1.0.69",
+ "thiserror 1.0.69",
  "time",
 ]
 
@@ -9065,8 +10041,10 @@ checksum = "852e951cb7832cb45cb1169900d19760cfa39b82bc0ea9c0e5a14ae88411c98b"
 [[package]]
 name = "version_check"
 version = "0.9.5"
+version = "0.9.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a"
+checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a"
 
 [[package]]
 name = "vsimd"
@@ -9077,14 +10055,18 @@ checksum = "5c3082ca00d5a5ef149bb8b555a72ae84c9c59f7250f013ac822ac2e49b19c64"
 [[package]]
 name = "waker-fn"
 version = "1.2.0"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "317211a0dc0ceedd78fb2ca9a44aed3d7b9b26f81870d485c07122b4350673b7"
+checksum = "317211a0dc0ceedd78fb2ca9a44aed3d7b9b26f81870d485c07122b4350673b7"
 
 [[package]]
 name = "want"
 version = "0.3.1"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e"
+checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e"
 dependencies = [
  "try-lock",
 ]
@@ -9104,11 +10086,20 @@ dependencies = [
  "wasi",
 ]
 
+[[package]]
+name = "wasix"
+version = "0.12.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c1fbb4ef9bbca0c1170e0b00dd28abc9e3b68669821600cad1caaed606583c6d"
+dependencies = [
+ "wasi",
+]
+
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.100"
+version = "0.2.99"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1edc8929d7499fc4e8f0be2262a241556cfc54a0bea223790e71446f2aab1ef5"
+checksum = "a474f6281d1d70c17ae7aa6a613c87fce69a127e2624002df63dcb39d6cf6396"
 dependencies = [
  "cfg-if",
  "once_cell",
@@ -9118,74 +10109,77 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-backend"
-version = "0.2.100"
+version = "0.2.99"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f0a0651a5c2bc21487bde11ee802ccaf4c51935d0d3d42a6101f98161700bc6"
+checksum = "5f89bb38646b4f81674e8f5c3fb81b562be1fd936d84320f3264486418519c79"
 dependencies = [
  "bumpalo",
  "log",
  "proc-macro2",
  "quote 1.0.38",
- "syn 2.0.96",
+ "syn 2.0.94",
  "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-futures"
-version = "0.4.50"
+version = "0.4.49"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "555d470ec0bc3bb57890405e5d4322cc9ea83cebb085523ced7be4144dac1e61"
+checksum = "38176d9b44ea84e9184eff0bc34cc167ed044f816accfe5922e54d84cf48eca2"
 dependencies = [
  "cfg-if",
  "js-sys",
  "once_cell",
+ "once_cell",
  "wasm-bindgen",
  "web-sys",
 ]
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.100"
+version = "0.2.99"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7fe63fc6d09ed3792bd0897b314f53de8e16568c2b3f7982f468c0bf9bd0b407"
+checksum = "2cc6181fd9a7492eef6fef1f33961e3695e4579b9872a6f7c83aee556666d4fe"
 dependencies = [
+ "quote 1.0.38",
  "quote 1.0.38",
  "wasm-bindgen-macro-support",
 ]
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.100"
+version = "0.2.99"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de"
+checksum = "30d7a95b763d3c45903ed6c81f156801839e5ee968bb07e534c44df0fcd330c2"
 dependencies = [
  "proc-macro2",
  "quote 1.0.38",
- "syn 2.0.96",
+ "syn 2.0.94",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.100"
+version = "0.2.99"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a05d73b933a847d6cccdda8f838a22ff101ad9bf93e33684f39c1f5f0eece3d"
-dependencies = [
- "unicode-ident",
-]
+checksum = "943aab3fdaaa029a6e0271b35ea10b72b943135afe9bffca82384098ad0e06a6"
 
 [[package]]
 name = "web-push"
 version = "0.10.2"
+version = "0.10.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "49214685777c429ac44a92780983f4fadeecddd8c08c463d8196521e17e974bd"
+checksum = "49214685777c429ac44a92780983f4fadeecddd8c08c463d8196521e17e974bd"
 dependencies = [
  "async-trait",
  "base64 0.13.1",
+ "base64 0.13.1",
  "chrono",
  "ece",
  "futures-lite 1.13.0",
+ "futures-lite 1.13.0",
  "http 0.2.12",
  "isahc",
  "jwt-simple",
@@ -9199,9 +10193,9 @@ dependencies = [
 
 [[package]]
 name = "web-sys"
-version = "0.3.77"
+version = "0.3.76"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "33b6dd2ef9186f1f2072e409e99cd22a975331a6b3591b12c764e0e55c60d5d2"
+checksum = "04dd7223427d52553d3702c004d3b2fe07c148165faa56313cb00211e31c12bc"
 dependencies = [
  "js-sys",
  "wasm-bindgen",
@@ -9227,30 +10221,19 @@ dependencies = [
  "libwebp-sys",
 ]
 
-[[package]]
-name = "webpki"
-version = "0.22.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed63aea5ce73d0ff405984102c42de94fc55a6b75765d621c65262469b3c9b53"
-dependencies = [
- "ring 0.17.8",
- "untrusted 0.9.0",
-]
-
 [[package]]
 name = "webpki-roots"
-version = "0.22.6"
+version = "0.25.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6c71e40d7d2c34a5106301fb632274ca37242cd0c9d3e64dbece371a40a2d87"
-dependencies = [
- "webpki",
-]
+checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1"
 
 [[package]]
 name = "webpki-roots"
 version = "0.26.7"
+version = "0.26.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5d642ff16b7e79272ae451b7322067cdc17cadf68c23264be9d94a32319efe7e"
+checksum = "5d642ff16b7e79272ae451b7322067cdc17cadf68c23264be9d94a32319efe7e"
 dependencies = [
  "rustls-pki-types",
 ]
@@ -9264,8 +10247,10 @@ checksum = "53a85b86a771b1c87058196170769dd264f66c0782acf1ae6cc51bfd64b39082"
 [[package]]
 name = "widestring"
 version = "1.1.0"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7219d36b6eac893fa81e84ebe06485e7dcbb616177469b142df14f1f4deb1311"
+checksum = "7219d36b6eac893fa81e84ebe06485e7dcbb616177469b142df14f1f4deb1311"
 
 [[package]]
 name = "winapi"
@@ -9286,10 +10271,13 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
 [[package]]
 name = "winapi-util"
 version = "0.1.9"
+version = "0.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb"
+checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb"
 dependencies = [
  "windows-sys 0.59.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -9317,6 +10305,25 @@ dependencies = [
  "windows-targets 0.52.6",
 ]
 
+[[package]]
+name = "windows"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f"
+dependencies = [
+ "windows-targets 0.48.5",
+]
+
+[[package]]
+name = "windows"
+version = "0.58.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dd04d41d93c4992d421894c18c8b43496aa748dd4c081bac0dc93eb0489272b6"
+dependencies = [
+ "windows-core 0.58.0",
+ "windows-targets 0.52.6",
+]
+
 [[package]]
 name = "windows-core"
 version = "0.52.0"
@@ -9329,8 +10336,11 @@ dependencies = [
 [[package]]
 name = "windows-core"
 version = "0.58.0"
+name = "windows-core"
+version = "0.58.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6ba6d44ec8c2591c134257ce647b7ea6b20335bf6379a27dac5f1641fcf59f99"
+checksum = "6ba6d44ec8c2591c134257ce647b7ea6b20335bf6379a27dac5f1641fcf59f99"
 dependencies = [
  "windows-implement",
  "windows-interface",
@@ -9347,7 +10357,7 @@ checksum = "2bbd5b46c938e506ecbce286b6628a02171d56153ba733b6c741fc627ec9579b"
 dependencies = [
  "proc-macro2",
  "quote 1.0.38",
- "syn 2.0.96",
+ "syn 2.0.94",
 ]
 
 [[package]]
@@ -9358,7 +10368,7 @@ checksum = "053c4c462dc91d3b1504c6fe5a726dd15e216ba718e84a0e46a88fbe5ded3515"
 dependencies = [
  "proc-macro2",
  "quote 1.0.38",
- "syn 2.0.96",
+ "syn 2.0.94",
 ]
 
 [[package]]
@@ -9542,35 +10552,57 @@ checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
 [[package]]
 name = "winnow"
 version = "0.5.40"
+version = "0.5.40"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876"
+checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876"
 dependencies = [
  "memchr",
 ]
 
 [[package]]
 name = "winnow"
-version = "0.6.25"
+version = "0.6.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad699df48212c6cc6eb4435f35500ac6fd3b9913324f938aea302022ce19d310"
+checksum = "e6f5bb5257f2407a5425c6e749bfd9692192a73e70a6060516ac04f889087d68"
 dependencies = [
  "memchr",
+ "memchr",
 ]
 
 [[package]]
 name = "winreg"
 version = "0.50.0"
+version = "0.50.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1"
+checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1"
 dependencies = [
  "cfg-if",
  "windows-sys 0.48.0",
+ "cfg-if",
+ "windows-sys 0.48.0",
 ]
 
 [[package]]
 name = "write16"
 version = "1.0.0"
+name = "write16"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d1890f4022759daae28ed4fe62859b1236caebfc61ede2f63ed4e695f3f6d936"
+
+[[package]]
+name = "writeable"
+version = "0.5.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51"
+
+[[package]]
+name = "wyz"
+version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "05f360fc0b24296329c78fda852a1e9ae82de9cf7b27dae4b7f62f118f77b9ed"
 checksum = "d1890f4022759daae28ed4fe62859b1236caebfc61ede2f63ed4e695f3f6d936"
 
 [[package]]
@@ -9586,6 +10618,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "05f360fc0b24296329c78fda852a1e9ae82de9cf7b27dae4b7f62f118f77b9ed"
 dependencies = [
  "tap",
+ "tap",
 ]
 
 [[package]]
@@ -9638,7 +10671,7 @@ checksum = "2380878cad4ac9aac1e2435f3eb4020e8374b5f13c296cb75b4620ff8e229154"
 dependencies = [
  "proc-macro2",
  "quote 1.0.38",
- "syn 2.0.96",
+ "syn 2.0.94",
  "synstructure 0.13.1",
 ]
 
@@ -9651,9 +10684,11 @@ dependencies = [
  "anyhow",
  "async-trait",
  "base64 0.21.7",
+ "base64 0.21.7",
  "futures",
  "http 0.2.12",
  "hyper 0.14.32",
+ "hyper 0.14.32",
  "hyper-rustls 0.24.2",
  "itertools 0.12.1",
  "log",
@@ -9664,7 +10699,7 @@ dependencies = [
  "serde",
  "serde_json",
  "time",
- "tokio 1.43.0",
+ "tokio 1.42.0",
  "tower-service",
  "url",
 ]
@@ -9675,6 +10710,7 @@ version = "0.7.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0"
 dependencies = [
+ "byteorder",
  "byteorder",
  "zerocopy-derive",
 ]
@@ -9687,7 +10723,7 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e"
 dependencies = [
  "proc-macro2",
  "quote 1.0.38",
- "syn 2.0.96",
+ "syn 2.0.94",
 ]
 
 [[package]]
@@ -9707,13 +10743,14 @@ checksum = "595eed982f7d355beb85837f651fa22e90b3c044842dc7f2c2842c086f295808"
 dependencies = [
  "proc-macro2",
  "quote 1.0.38",
- "syn 2.0.96",
+ "syn 2.0.94",
  "synstructure 0.13.1",
 ]
 
 [[package]]
 name = "zeroize"
 version = "1.8.1"
+version = "1.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde"
 
@@ -9736,7 +10773,7 @@ checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6"
 dependencies = [
  "proc-macro2",
  "quote 1.0.38",
- "syn 2.0.96",
+ "syn 2.0.94",
 ]
 
 [[package]]
@@ -9757,13 +10794,10 @@ dependencies = [
 [[package]]
 name = "zune-jpeg"
 version = "0.4.14"
+version = "0.4.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "99a5bab8d7dedf81405c4bb1f2b83ea057643d9cb28778cea9eecddeedd2e028"
+checksum = "99a5bab8d7dedf81405c4bb1f2b83ea057643d9cb28778cea9eecddeedd2e028"
 dependencies = [
  "zune-core",
 ]
-
-[[patch.unused]]
-name = "redis"
-version = "0.22.3"
-source = "git+https://github.com/revoltchat/redis-rs?rev=1a41faf356fd21aebba71cea7eb7eb2653e5f0ef#1a41faf356fd21aebba71cea7eb7eb2653e5f0ef"
diff --git a/Cargo.toml b/Cargo.toml
index 0eaad88c6..6c69df099 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -11,11 +11,7 @@ members = [
 ]
 
 [patch.crates-io]
-redis22 = { package = "redis", version = "0.22.3", git = "https://github.com/revoltchat/redis-rs", rev = "1a41faf356fd21aebba71cea7eb7eb2653e5f0ef" }
-redis23 = { package = "redis", version = "0.23.1", git = "https://github.com/revoltchat/redis-rs", rev = "f8ca28ab85da59d2ccde526b4d2fb390eff5a5f9" }
-# authifier = { package = "authifier", version = "1.0.8", path = "../authifier/crates/authifier" }
-# rocket_authifier = { package = "rocket_authifier", version = "1.0.8", path = "../authifier/crates/rocket_authifier" }
-# rocket = { git = "https://github.com/rwf2/Rocket/", rev = "4dcd928" }
+redis23 = { package = "redis", version = "0.23.3", git = "https://github.com/revoltchat/redis-rs", rev = "523b2937367e17bd0073722bf6e23d06042cb4e4" }
 
 # I'm 99% sure this is overloading the GitHub worker
 # hence builds have been failing since, let's just
diff --git a/crates/bonfire/Cargo.toml b/crates/bonfire/Cargo.toml
index 30b695079..be3f6edc3 100644
--- a/crates/bonfire/Cargo.toml
+++ b/crates/bonfire/Cargo.toml
@@ -36,7 +36,7 @@ async-std = { version = "1.8.0", features = [
 ] }
 
 # core
-authifier = { version = "1.0.9" }
+authifier = { version = "1.0.10" }
 revolt-result = { path = "../core/result" }
 revolt-models = { path = "../core/models" }
 revolt-config = { path = "../core/config" }
diff --git a/crates/core/config/Revolt.toml b/crates/core/config/Revolt.toml
index d33b0e7cc..73b2bc9a6 100644
--- a/crates/core/config/Revolt.toml
+++ b/crates/core/config/Revolt.toml
@@ -76,13 +76,19 @@ max_concurrent_connections = 50
 # Usually they have to be, so that messages sent from one or the other get sent to everyone
 production = true
 
+# Changes how many users are processed in each chunk when resolving role/everyone mentions.
+# Increasing this will resolve mentions faster, but will consume more memory while resolving.
+mass_mention_chunk_size = 200
+
 # none of these should need changing
 exchange = "revolt.notifications"
 message_queue = "notifications.origin.message"
-fr_accepted_queue = "notifications.ingest.fr_accepted" # friend request accepted
-fr_received_queue = "notifications.ingest.fr_received" # friend request received
-generic_queue = "notifications.ingest.generic"         # generic messages (title + body)
-ack_queue = "notifications.process.ack"                # updates badges for apple devices
+mass_mention_queue = "notifications.origin.mass_mention" # handles messages that contain role or everyone mentions
+fr_accepted_queue = "notifications.ingest.fr_accepted"   # friend request accepted
+fr_received_queue = "notifications.ingest.fr_received"   # friend request received
+generic_queue = "notifications.ingest.generic"           # generic messages (title + body)
+ack_queue = "notifications.process.ack"                  # updates badges for apple devices
+
 
 [pushd.vapid]
 queue = "notifications.outbound.vapid"
@@ -181,6 +187,11 @@ default_bucket = "revolt-uploads"
 [features]
 # Feature gate options
 webhooks_enabled = false
+# Enable push notifications for mass pings (everyone, online, roles)
+# When false this will still ping in-client but will not send notifications from pushd
+mass_mentions_send_notifications = true
+# Can role/everyone pings be used at all
+mass_mentions_enabled = true
 
 [features.limits]
 
diff --git a/crates/core/config/src/lib.rs b/crates/core/config/src/lib.rs
index fa12b84b8..29174e7d4 100644
--- a/crates/core/config/src/lib.rs
+++ b/crates/core/config/src/lib.rs
@@ -201,7 +201,11 @@ pub struct Api {
 pub struct Pushd {
     pub production: bool,
     pub exchange: String,
+    pub mass_mention_chunk_size: usize,
+
+    // Queues
     pub message_queue: String,
+    pub mass_mention_queue: String,
     pub fr_accepted_queue: String,
     pub fr_received_queue: String,
     pub generic_queue: String,
@@ -228,6 +232,10 @@ impl Pushd {
         self.get_routing_key(self.message_queue.clone())
     }
 
+    pub fn get_mass_mention_routing_key(&self) -> String {
+        self.get_routing_key(self.mass_mention_queue.clone())
+    }
+
     pub fn get_fr_accepted_routing_key(&self) -> String {
         self.get_routing_key(self.fr_accepted_queue.clone())
     }
@@ -328,6 +336,9 @@ impl Default for FeaturesAdvanced {
 pub struct Features {
     pub limits: FeaturesLimitsCollection,
     pub webhooks_enabled: bool,
+    pub mass_mentions_send_notifications: bool,
+    pub mass_mentions_enabled: bool,
+
     #[serde(default)]
     pub advanced: FeaturesAdvanced,
 }
diff --git a/crates/core/database/Cargo.toml b/crates/core/database/Cargo.toml
index e47fc8d3e..9e277a3dc 100644
--- a/crates/core/database/Cargo.toml
+++ b/crates/core/database/Cargo.toml
@@ -64,7 +64,7 @@ redis-kiss = { version = "0.1.4" }
 
 # Database
 bson = { optional = true, version = "2.1.0" }
-mongodb = { optional = true, version = "2.1.0", default-features = false }
+mongodb = { optional = true, version = "3.1.0" }
 
 # Database Migration
 unicode-segmentation = "1.10.1"
@@ -96,7 +96,7 @@ web-push = "0.10.0"
 revolt_a2 = { version = "0.10", default-features = false, features = ["ring"] }
 
 # Authifier
-authifier = { version = "1.0.9", features = ["rocket_impl"] }
+authifier = { version = "1.0.10", features = ["rocket_impl"] }
 
 # RabbitMQ
 amqprs = { version = "1.7.0" }
diff --git a/crates/core/database/src/amqp/amqp.rs b/crates/core/database/src/amqp/amqp.rs
index 39b4820eb..b567c7f7c 100644
--- a/crates/core/database/src/amqp/amqp.rs
+++ b/crates/core/database/src/amqp/amqp.rs
@@ -170,6 +170,38 @@ impl AMQP {
             .await
     }
 
+    pub async fn mass_mention_message_sent(
+        &self,
+        server_id: String,
+        payload: Vec<PushNotification>,
+    ) -> Result<(), AMQPError> {
+        let config = revolt_config::config().await;
+
+        let payload = MassMessageSentPayload {
+            notifications: payload,
+            server_id,
+        };
+        let payload = to_string(&payload).unwrap();
+
+        let routing_key = config.pushd.get_mass_mention_routing_key();
+
+        debug!(
+            "Sending mass mention payload on channel {}: {}",
+            routing_key, payload
+        );
+
+        self.channel
+            .basic_publish(
+                BasicProperties::default()
+                    .with_content_type("application/json")
+                    .with_persistence(true)
+                    .finish(),
+                payload.into(),
+                BasicPublishArguments::new(&config.pushd.exchange, routing_key.as_str()),
+            )
+            .await
+    }
+
     pub async fn ack_message(
         &self,
         user_id: String,
diff --git a/crates/core/database/src/drivers/mongodb.rs b/crates/core/database/src/drivers/mongodb.rs
index 720f5a471..e12e60fb8 100644
--- a/crates/core/database/src/drivers/mongodb.rs
+++ b/crates/core/database/src/drivers/mongodb.rs
@@ -32,17 +32,17 @@ impl MongoDb {
     }
 
     /// Get a collection by its name
-    pub fn col<T>(&self, collection: &str) -> mongodb::Collection<T> {
+    pub fn col<T: Send + Sync>(&self, collection: &str) -> mongodb::Collection<T> {
         self.db().collection(collection)
     }
 
     /// Insert one document into a collection
-    pub async fn insert_one<T: Serialize>(
+    pub async fn insert_one<T: Serialize + Send + Sync>(
         &self,
         collection: &'static str,
         document: T,
     ) -> Result<InsertOneResult> {
-        self.col::<T>(collection).insert_one(document, None).await
+        self.col::<T>(collection).insert_one(document).await
     }
 
     /// Count documents by projection
@@ -52,7 +52,7 @@ impl MongoDb {
         projection: Document,
     ) -> Result<u64> {
         self.col::<Document>(collection)
-            .count_documents(projection, None)
+            .count_documents(projection)
             .await
     }
 
@@ -68,7 +68,8 @@ impl MongoDb {
     {
         Ok(self
             .col::<T>(collection)
-            .find(projection, options)
+            .find(projection)
+            .with_options(options)
             .await?
             .filter_map(|s| async {
                 if cfg!(debug_assertions) {
@@ -102,7 +103,8 @@ impl MongoDb {
         O: Into<Option<FindOneOptions>>,
     {
         self.col::<T>(collection)
-            .find_one(projection, options)
+            .find_one(projection)
+            .with_options(options)
             .await
     }
 
@@ -166,7 +168,7 @@ impl MongoDb {
         };
 
         self.col::<Document>(collection)
-            .update_one(projection, query, None)
+            .update_one(projection, query)
             .await
     }
 
@@ -201,7 +203,7 @@ impl MongoDb {
         projection: Document,
     ) -> Result<DeleteResult> {
         self.col::<Document>(collection)
-            .delete_one(projection, None)
+            .delete_one(projection)
             .await
     }
 
diff --git a/crates/core/database/src/events/rabbit.rs b/crates/core/database/src/events/rabbit.rs
index 613047521..0ae91be11 100644
--- a/crates/core/database/src/events/rabbit.rs
+++ b/crates/core/database/src/events/rabbit.rs
@@ -11,6 +11,12 @@ pub struct MessageSentPayload {
     pub users: Vec<String>,
 }
 
+#[derive(Serialize, Deserialize)]
+pub struct MassMessageSentPayload {
+    pub notifications: Vec<PushNotification>,
+    pub server_id: String,
+}
+
 #[derive(Serialize, Deserialize, Clone)]
 pub struct FRAcceptedPayload {
     pub accepted_user: User,
diff --git a/crates/core/database/src/models/admin_migrations/ops/mongodb.rs b/crates/core/database/src/models/admin_migrations/ops/mongodb.rs
index cdc684e93..703e378af 100644
--- a/crates/core/database/src/models/admin_migrations/ops/mongodb.rs
+++ b/crates/core/database/src/models/admin_migrations/ops/mongodb.rs
@@ -10,7 +10,7 @@ impl AbstractMigrations for MongoDb {
     #[cfg(test)]
     /// Drop the database
     async fn drop_database(&self) {
-        self.db().drop(None).await.ok();
+        self.db().drop().await.ok();
     }
 
     /// Migrate the database
@@ -18,7 +18,7 @@ impl AbstractMigrations for MongoDb {
         info!("Migrating the database.");
 
         let list = self
-            .list_database_names(None, None)
+            .list_database_names()
             .await
             .expect("Failed to fetch database names.");
 
diff --git a/crates/core/database/src/models/admin_migrations/ops/mongodb/init.rs b/crates/core/database/src/models/admin_migrations/ops/mongodb/init.rs
index ab25819b5..00fe26b8b 100644
--- a/crates/core/database/src/models/admin_migrations/ops/mongodb/init.rs
+++ b/crates/core/database/src/models/admin_migrations/ops/mongodb/init.rs
@@ -8,278 +8,254 @@ pub async fn create_database(db: &MongoDb) {
     info!("Creating database.");
     let db = db.db();
 
-    db.create_collection("accounts", None)
+    db.create_collection("accounts")
         .await
         .expect("Failed to create accounts collection.");
 
-    db.create_collection("users", None)
+    db.create_collection("users")
         .await
         .expect("Failed to create users collection.");
 
-    db.create_collection("channels", None)
+    db.create_collection("channels")
         .await
         .expect("Failed to create channels collection.");
 
-    db.create_collection("messages", None)
+    db.create_collection("messages")
         .await
         .expect("Failed to create messages collection.");
 
-    db.create_collection("servers", None)
+    db.create_collection("servers")
         .await
         .expect("Failed to create servers collection.");
 
-    db.create_collection("server_members", None)
+    db.create_collection("server_members")
         .await
         .expect("Failed to create server_members collection.");
 
-    db.create_collection("server_bans", None)
+    db.create_collection("server_bans")
         .await
         .expect("Failed to create server_bans collection.");
 
-    db.create_collection("channel_invites", None)
+    db.create_collection("channel_invites")
         .await
         .expect("Failed to create channel_invites collection.");
 
-    db.create_collection("channel_unreads", None)
+    db.create_collection("channel_unreads")
         .await
         .expect("Failed to create channel_unreads collection.");
 
-    db.create_collection("channel_webhooks", None)
+    db.create_collection("channel_webhooks")
         .await
         .expect("Failed to create channel_webhooks collection.");
 
-    db.create_collection("migrations", None)
+    db.create_collection("migrations")
         .await
         .expect("Failed to create migrations collection.");
 
-    db.create_collection("attachments", None)
+    db.create_collection("attachments")
         .await
         .expect("Failed to create attachments collection.");
 
-    db.create_collection("attachment_hashes", None)
+    db.create_collection("attachment_hashes")
         .await
         .expect("Failed to create attachment_hashes collection.");
 
-    db.create_collection("user_settings", None)
+    db.create_collection("user_settings")
         .await
         .expect("Failed to create user_settings collection.");
 
-    db.create_collection("safety_reports", None)
+    db.create_collection("safety_reports")
         .await
         .expect("Failed to create safety_reports collection.");
 
-    db.create_collection("safety_snapshots", None)
+    db.create_collection("safety_snapshots")
         .await
         .expect("Failed to create safety_snapshots collection.");
 
-    db.create_collection("safety_strikes", None)
+    db.create_collection("safety_strikes")
         .await
         .expect("Failed to create safety_strikes collection.");
 
-    db.create_collection("bots", None)
+    db.create_collection("bots")
         .await
         .expect("Failed to create bots collection.");
 
-    db.create_collection("ratelimit_events", None)
+    db.create_collection("ratelimit_events")
         .await
         .expect("Failed to create ratelimit_events collection.");
 
-    db.create_collection(
-        "pubsub",
-        CreateCollectionOptions::builder()
-            .capped(true)
-            .size(1_000_000)
-            .build(),
-    )
-    .await
-    .expect("Failed to create pubsub collection.");
+    db.create_collection("pubsub")
+        .with_options(
+            CreateCollectionOptions::builder()
+                .capped(true)
+                .size(1_000_000)
+                .build(),
+        )
+        .await
+        .expect("Failed to create pubsub collection.");
 
-    db.run_command(
-        doc! {
-            "createIndexes": "users",
-            "indexes": [
-                {
-                    "key": {
-                        "username": 1_i32
-                    },
-                    "name": "username",
-                    "unique": false,
-                    "collation": {
-                        "locale": "en",
-                        "strength": 2_i32
-                    }
+    db.run_command(doc! {
+        "createIndexes": "users",
+        "indexes": [
+            {
+                "key": {
+                    "username": 1_i32
                 },
-                {
-                    "key": {
-                        "username": 1_i32,
-                        "discriminator": 1_i32
-                    },
-                    "name": "username_discriminator",
-                    "unique": true,
-                    "collation": {
-                        "locale": "en",
-                        "strength": 2_i32
-                    }
+                "name": "username",
+                "unique": false,
+                "collation": {
+                    "locale": "en",
+                    "strength": 2_i32
                 }
-            ]
-        },
-        None,
-    )
+            },
+            {
+                "key": {
+                    "username": 1_i32,
+                    "discriminator": 1_i32
+                },
+                "name": "username_discriminator",
+                "unique": true,
+                "collation": {
+                    "locale": "en",
+                    "strength": 2_i32
+                }
+            }
+        ]
+    })
     .await
     .expect("Failed to create username index.");
 
-    db.run_command(
-        doc! {
-            "createIndexes": "messages",
-            "indexes": [
-                {
-                    "key": {
-                        "content": "text"
-                    },
-                    "name": "content"
+    db.run_command(doc! {
+        "createIndexes": "messages",
+        "indexes": [
+            {
+                "key": {
+                    "content": "text"
                 },
-                {
-                    "key": {
-                        "channel": 1_i32,
-                        "_id": 1_i32
-                    },
-                    "name": "channel_id_compound"
+                "name": "content"
+            },
+            {
+                "key": {
+                    "channel": 1_i32,
+                    "_id": 1_i32
                 },
-                {
-                    "key": {
-                        "author": 1_i32
-                    },
-                    "name": "author"
+                "name": "channel_id_compound"
+            },
+            {
+                "key": {
+                    "author": 1_i32
                 },
-                {
-                    "key": {
-                        "channel": 1_i32,
-                        "pinned": 1_i32
-                    },
-                    "name": "channel_pinned_compound"
+                "name": "author"
+            },
+            {
+                "key": {
+                    "channel": 1_i32,
+                    "pinned": 1_i32
                 },
-            ]
-        },
-        None,
-    )
+                "name": "channel_pinned_compound"
+            },
+        ]
+    })
     .await
     .expect("Failed to create message index.");
 
-    db.run_command(
-        doc! {
-            "createIndexes": "channel_unreads",
-            "indexes": [
-                {
-                    "key": {
-                        "_id.channel": 1_i32,
-                        "_id.user": 1_i32,
-                    },
-                    "name": "compound_id"
+    db.run_command(doc! {
+        "createIndexes": "channel_unreads",
+        "indexes": [
+            {
+                "key": {
+                    "_id.channel": 1_i32,
+                    "_id.user": 1_i32,
                 },
-                {
-                    "key": {
-                        "_id.user": 1_i32,
-                    },
-                    "name": "user_id"
-                }
-            ]
-        },
-        None,
-    )
+                "name": "compound_id"
+            },
+            {
+                "key": {
+                    "_id.user": 1_i32,
+                },
+                "name": "user_id"
+            }
+        ]
+    })
     .await
     .expect("Failed to create channel_unreads index.");
 
-    db.run_command(
-        doc! {
-            "createIndexes": "server_members",
-            "indexes": [
-                {
-                    "key": {
-                        "_id.server": 1_i32,
-                        "_id.user": 1_i32,
-                    },
-                    "name": "compound_id"
+    db.run_command(doc! {
+        "createIndexes": "server_members",
+        "indexes": [
+            {
+                "key": {
+                    "_id.server": 1_i32,
+                    "_id.user": 1_i32,
                 },
-                {
-                    "key": {
-                        "_id.user": 1_i32,
-                    },
-                    "name": "user_id"
-                }
-            ]
-        },
-        None,
-    )
+                "name": "compound_id"
+            },
+            {
+                "key": {
+                    "_id.user": 1_i32,
+                },
+                "name": "user_id"
+            }
+        ]
+    })
     .await
     .expect("Failed to create server_members index.");
 
-    db.run_command(
-        doc! {
-            "createIndexes": "attachments",
-            "indexes": [
-                {
-                    "key": {
-                        "hash": 1_i32
-                    },
-                    "name": "hash"
+    db.run_command(doc! {
+        "createIndexes": "attachments",
+        "indexes": [
+            {
+                "key": {
+                    "hash": 1_i32
                 },
-                {
-                    "key": {
-                        "used_for.id": 1_i32
-                    },
-                    "name": "used_for_id"
-                }
-            ]
-        },
-        None,
-    )
+                "name": "hash"
+            },
+            {
+                "key": {
+                    "used_for.id": 1_i32
+                },
+                "name": "used_for_id"
+            }
+        ]
+    })
     .await
     .expect("Failed to create attachments index.");
 
-    db.run_command(
-        doc! {
-            "createIndexes": "attachment_hashes",
-            "indexes": [
-                {
-                    "key": {
-                        "processed_hash": 1_i32
-                    },
-                    "name": "processed_hash"
-                }
-            ]
-        },
-        None,
-    )
+    db.run_command(doc! {
+        "createIndexes": "attachment_hashes",
+        "indexes": [
+            {
+                "key": {
+                    "processed_hash": 1_i32
+                },
+                "name": "processed_hash"
+            }
+        ]
+    })
     .await
     .expect("Failed to create attachment_hashes index.");
 
     db.collection("migrations")
-        .insert_one(
-            doc! {
-                "_id": 0_i32,
-                "revision": LATEST_REVISION
-            },
-            None,
-        )
+        .insert_one(doc! {
+            "_id": 0_i32,
+            "revision": LATEST_REVISION
+        })
         .await
         .expect("Failed to save migration info.");
 
-    db.run_command(
-        doc! {
-            "createIndexes": "ratelimit_events",
-            "indexes": [
-                {
-                    "key": {
-                        "_id": 1_i32,
-                        "target_id": 1_i32,
-                        "event_type": 1_i32,
-                    },
-                    "name": "compound_key"
-                }
-            ]
-        },
-        None,
-    )
+    db.run_command(doc! {
+        "createIndexes": "ratelimit_events",
+        "indexes": [
+            {
+                "key": {
+                    "_id": 1_i32,
+                    "target_id": 1_i32,
+                    "event_type": 1_i32,
+                },
+                "name": "compound_key"
+            }
+        ]
+    })
     .await
     .expect("Failed to create ratelimit_events index.");
 
diff --git a/crates/core/database/src/models/admin_migrations/ops/mongodb/scripts.rs b/crates/core/database/src/models/admin_migrations/ops/mongodb/scripts.rs
index f66adf143..d08b33745 100644
--- a/crates/core/database/src/models/admin_migrations/ops/mongodb/scripts.rs
+++ b/crates/core/database/src/models/admin_migrations/ops/mongodb/scripts.rs
@@ -26,7 +26,7 @@ pub const LATEST_REVISION: i32 = 33;
 pub async fn migrate_database(db: &MongoDb) {
     let migrations = db.col::<Document>("migrations");
     let data = migrations
-        .find_one(None, None)
+        .find_one(doc! {})
         .await
         .expect("Failed to fetch migration data.");
 
@@ -46,7 +46,6 @@ pub async fn migrate_database(db: &MongoDb) {
                         "revision": revision
                     }
                 },
-                None,
             )
             .await
             .expect("Failed to commit migration information.");
@@ -74,7 +73,6 @@ pub async fn run_migrations(db: &MongoDb, revision: i32) -> i32 {
             .update_many(
                 doc! { "attachment": { "$exists": 1_i32 } },
                 doc! { "$set": { "attachment.tag": "attachments", "attachment.size": 0_i32 } },
-                None,
             )
             .await
             .expect("Failed to update messages.");
@@ -83,7 +81,6 @@ pub async fn run_migrations(db: &MongoDb, revision: i32) -> i32 {
             .update_many(
                 doc! {},
                 doc! { "$set": { "tag": "attachments", "size": 0_i32 } },
-                None,
             )
             .await
             .expect("Failed to update attachments.");
@@ -93,7 +90,7 @@ pub async fn run_migrations(db: &MongoDb, revision: i32) -> i32 {
         info!("Running migration [revision 2 / 2021-05-08]: Add servers collection.");
 
         db.db()
-            .create_collection("servers", None)
+            .create_collection("servers")
             .await
             .expect("Failed to create servers collection.");
     }
@@ -103,12 +100,12 @@ pub async fn run_migrations(db: &MongoDb, revision: i32) -> i32 {
 
         let messages = db.col::<Document>("messages");
         let mut cursor = messages
-            .find(
-                doc! {
-                    "attachment": {
-                        "$exists": 1_i32
-                    }
-                },
+            .find(doc! {
+                "attachment": {
+                    "$exists": 1_i32
+                }
+            })
+            .with_options(
                 FindOptions::builder()
                     .projection(doc! {
                         "_id": 1_i32,
@@ -128,19 +125,18 @@ pub async fn run_migrations(db: &MongoDb, revision: i32) -> i32 {
                 .update_one(
                     doc! { "_id": id },
                     doc! { "$unset": { "attachment": 1_i32 }, "$set": { "attachments": attachments } },
-                    None,
                 )
                 .await
                 .unwrap();
         }
 
         db.db()
-            .create_collection("channel_unreads", None)
+            .create_collection("channel_unreads")
             .await
             .expect("Failed to create channel_unreads collection.");
 
         db.db()
-            .create_collection("user_settings", None)
+            .create_collection("user_settings")
             .await
             .expect("Failed to create user_settings collection.");
     }
@@ -149,17 +145,17 @@ pub async fn run_migrations(db: &MongoDb, revision: i32) -> i32 {
         info!("Running migration [revision 4 / 2021-06-01]: Add more server collections.");
 
         db.db()
-            .create_collection("server_members", None)
+            .create_collection("server_members")
             .await
             .expect("Failed to create server_members collection.");
 
         db.db()
-            .create_collection("server_bans", None)
+            .create_collection("server_bans")
             .await
             .expect("Failed to create server_bans collection.");
 
         db.db()
-            .create_collection("channel_invites", None)
+            .create_collection("channel_invites")
             .await
             .expect("Failed to create channel_invites collection.");
     }
@@ -182,7 +178,6 @@ pub async fn run_migrations(db: &MongoDb, revision: i32) -> i32 {
                 doc! {
                     "$set": to_document(&server).unwrap()
                 },
-                None,
             )
             .await
             .expect("Failed to migrate servers.");
@@ -192,20 +187,17 @@ pub async fn run_migrations(db: &MongoDb, revision: i32) -> i32 {
         info!("Running migration [revision 6 / 2021-07-09]: Add message text index.");
 
         db.db()
-            .run_command(
-                doc! {
-                    "createIndexes": "messages",
-                    "indexes": [
-                        {
-                            "key": {
-                                "content": "text"
-                            },
-                            "name": "content"
-                        }
-                    ]
-                },
-                None,
-            )
+            .run_command(doc! {
+                "createIndexes": "messages",
+                "indexes": [
+                    {
+                        "key": {
+                            "content": "text"
+                        },
+                        "name": "content"
+                    }
+                ]
+            })
             .await
             .expect("Failed to create message index.");
     }
@@ -214,7 +206,7 @@ pub async fn run_migrations(db: &MongoDb, revision: i32) -> i32 {
         info!("Running migration [revision 7 / 2021-08-11]: Add message text index.");
 
         db.db()
-            .create_collection("bots", None)
+            .create_collection("bots")
             .await
             .expect("Failed to create bots collection.");
     }
@@ -223,22 +215,15 @@ pub async fn run_migrations(db: &MongoDb, revision: i32) -> i32 {
         info!("Running migration [revision 8 / 2021-09-10]: Update to Authifier version 1.");
 
         db.db()
-            .run_command(
-                doc! {
-                    "dropIndexes": "accounts",
-                    "index": ["email", "email_normalised"]
-                },
-                None,
-            )
+            .run_command(doc! {
+                "dropIndexes": "accounts",
+                "index": ["email", "email_normalised"]
+            })
             .await
             .expect("Failed to delete legacy account indexes.");
 
         let col = db.col::<Document>("sessions");
-        let mut cursor = db
-            .col::<Document>("accounts")
-            .find(doc! {}, None)
-            .await
-            .unwrap();
+        let mut cursor = db.col::<Document>("accounts").find(doc! {}).await.unwrap();
 
         while let Some(doc) = cursor.next().await {
             if let Ok(account) = doc {
@@ -267,7 +252,7 @@ pub async fn run_migrations(db: &MongoDb, revision: i32) -> i32 {
                             doc.insert("subscription", sub);
                         }
 
-                        col.insert_one(doc, None).await.ok();
+                        col.insert_one(doc).await.ok();
                     }
                 } else {
                     info!("Account doesn't have any sessions!");
@@ -288,7 +273,6 @@ pub async fn run_migrations(db: &MongoDb, revision: i32) -> i32 {
                         }
                     }
                 },
-                None,
             )
             .await
             .unwrap();
@@ -297,11 +281,7 @@ pub async fn run_migrations(db: &MongoDb, revision: i32) -> i32 {
     if revision <= 9 {
         info!("Running migration [revision 9 / 2021-09-14]: Switch from last_message to last_message_id.");
 
-        let mut cursor = db
-            .col::<Document>("channels")
-            .find(doc! {}, None)
-            .await
-            .unwrap();
+        let mut cursor = db.col::<Document>("channels").find(doc! {}).await.unwrap();
 
         while let Some(doc) = cursor.next().await {
             if let Ok(channel) = doc {
@@ -340,7 +320,6 @@ pub async fn run_migrations(db: &MongoDb, revision: i32) -> i32 {
                                     "last_message": 1_i32,
                                 }
                             },
-                            None,
                         )
                         .await
                         .unwrap();
@@ -362,7 +341,6 @@ pub async fn run_migrations(db: &MongoDb, revision: i32) -> i32 {
                         "nonce": 1_i32,
                     }
                 },
-                None,
             )
             .await
             .unwrap();
@@ -375,7 +353,6 @@ pub async fn run_migrations(db: &MongoDb, revision: i32) -> i32 {
                         "nonce": 1_i32,
                     }
                 },
-                None,
             )
             .await
             .unwrap();
@@ -385,70 +362,61 @@ pub async fn run_migrations(db: &MongoDb, revision: i32) -> i32 {
         info!("Running migration [revision 11 / 2021-11-14]: Add indexes to database.");
 
         db.db()
-            .run_command(
-                doc! {
-                    "createIndexes": "messages",
-                    "indexes": [
-                        {
-                            "key": {
-                                "channel": 1_i32
-                            },
-                            "name": "channel"
-                        }
-                    ]
-                },
-                None,
-            )
+            .run_command(doc! {
+                "createIndexes": "messages",
+                "indexes": [
+                    {
+                        "key": {
+                            "channel": 1_i32
+                        },
+                        "name": "channel"
+                    }
+                ]
+            })
             .await
             .expect("Failed to create message index.");
 
         db.db()
-            .run_command(
-                doc! {
-                    "createIndexes": "channel_unreads",
-                    "indexes": [
-                        {
-                            "key": {
-                                "_id.channel": 1_i32,
-                                "_id.user": 1_i32,
-                            },
-                            "name": "compound_id"
+            .run_command(doc! {
+                "createIndexes": "channel_unreads",
+                "indexes": [
+                    {
+                        "key": {
+                            "_id.channel": 1_i32,
+                            "_id.user": 1_i32,
                         },
-                        {
-                            "key": {
-                                "_id.user": 1_i32,
-                            },
-                            "name": "user_id"
-                        }
-                    ]
-                },
-                None,
-            )
+                        "name": "compound_id"
+                    },
+                    {
+                        "key": {
+                            "_id.user": 1_i32,
+                        },
+                        "name": "user_id"
+                    }
+                ]
+            })
             .await
             .expect("Failed to create channel_unreads index.");
 
         db.db()
-            .run_command(
-                doc! {
-                    "createIndexes": "server_members",
-                    "indexes": [
-                        {
-                            "key": {
-                                "_id.server": 1_i32,
-                                "_id.user": 1_i32,
-                            },
-                            "name": "compound_id"
+            .run_command(doc! {
+                "createIndexes": "server_members",
+                "indexes": [
+                    {
+                        "key": {
+                            "_id.server": 1_i32,
+                            "_id.user": 1_i32,
                         },
-                        {
-                            "key": {
-                                "_id.user": 1_i32,
-                            },
-                            "name": "user_id"
-                        }
-                    ]
-                },
-                None,
-            )
+                        "name": "compound_id"
+                    },
+                    {
+                        "key": {
+                            "_id.user": 1_i32,
+                        },
+                        "name": "user_id"
+                    }
+                ]
+            })
             .await
             .expect("Failed to create server_members index.");
     }
@@ -457,21 +425,18 @@ pub async fn run_migrations(db: &MongoDb, revision: i32) -> i32 {
         info!("Running migration [revision 12 / 2021-11-21]: Add indexes to database.");
 
         db.db()
-            .run_command(
-                doc! {
-                    "createIndexes": "messages",
-                    "indexes": [
-                        {
-                            "key": {
-                                "channel": 1_i32,
-                                "_id": 1_i32
-                            },
-                            "name": "channel_id_compound"
-                        }
-                    ]
-                },
-                None,
-            )
+            .run_command(doc! {
+                "createIndexes": "messages",
+                "indexes": [
+                    {
+                        "key": {
+                            "channel": 1_i32,
+                            "_id": 1_i32
+                        },
+                        "name": "channel_id_compound"
+                    }
+                ]
+            })
             .await
             .expect("Failed to create message index.");
     }
@@ -485,7 +450,7 @@ pub async fn run_migrations(db: &MongoDb, revision: i32) -> i32 {
         async_std::task::sleep(Duration::from_secs(10)).await;
 
         let servers = db.col::<Document>("servers");
-        let mut cursor = servers.find(doc! {}, None).await.unwrap();
+        let mut cursor = servers.find(doc! {}).await.unwrap();
 
         while let Some(Ok(mut document)) = cursor.next().await {
             let id = document.get_str("_id").unwrap().to_string();
@@ -529,13 +494,13 @@ pub async fn run_migrations(db: &MongoDb, revision: i32) -> i32 {
             }
 
             servers
-                .update_one(doc! { "_id": id }, doc! { "$set": update }, None)
+                .update_one(doc! { "_id": id }, doc! { "$set": update })
                 .await
                 .unwrap();
         }
 
         let channels = db.col::<Document>("channels");
-        let mut cursor = channels.find(doc! {}, None).await.unwrap();
+        let mut cursor = channels.find(doc! {}).await.unwrap();
 
         while let Some(Ok(document)) = cursor.next().await {
             let id = document.get_str("_id").unwrap().to_string();
@@ -575,7 +540,7 @@ pub async fn run_migrations(db: &MongoDb, revision: i32) -> i32 {
             }
 
             channels
-                .update_one(doc! { "_id": id }, update, None)
+                .update_one(doc! { "_id": id }, update)
                 .await
                 .unwrap();
         }
@@ -596,7 +561,6 @@ pub async fn run_migrations(db: &MongoDb, revision: i32) -> i32 {
                         "content": "system"
                     }
                 },
-                None,
             )
             .await
             .unwrap();
@@ -621,25 +585,22 @@ pub async fn run_migrations(db: &MongoDb, revision: i32) -> i32 {
             .unwrap();
 
         db.db()
-            .create_collection("emojis", None)
+            .create_collection("emojis")
             .await
             .expect("Failed to create emojis collection.");
 
         db.db()
-            .run_command(
-                doc! {
-                    "createIndexes": "emojis",
-                    "indexes": [
-                        {
-                            "key": {
-                                "parent.id": 1_i32,
-                            },
-                            "name": "parent_id"
-                        }
-                    ]
-                },
-                None,
-            )
+            .run_command(doc! {
+                "createIndexes": "emojis",
+                "indexes": [
+                    {
+                        "key": {
+                            "parent.id": 1_i32,
+                        },
+                        "name": "parent_id"
+                    }
+                ]
+            })
             .await
             .expect("Failed to create emoji parent index.");
     }
@@ -652,10 +613,9 @@ pub async fn run_migrations(db: &MongoDb, revision: i32) -> i32 {
                 doc! {},
                 doc! {
                     "$set": {
-                        "joined_at": DateTime::now().to_rfc3339_string()
+                        "joined_at": DateTime::now().try_to_rfc3339_string().expect("Failed to convert the date to rfc3339")
                     }
                 },
-                None,
             )
             .await
             .expect("Failed to update server members.");
@@ -666,13 +626,10 @@ pub async fn run_migrations(db: &MongoDb, revision: i32) -> i32 {
 
         if db
             .db()
-            .run_command(
-                doc! {
-                    "dropIndexes": "messages",
-                    "index": ["channel"]
-                },
-                None,
-            )
+            .run_command(doc! {
+                "dropIndexes": "messages",
+                "index": ["channel"]
+            })
             .await
             .is_err()
         {
@@ -680,20 +637,17 @@ pub async fn run_migrations(db: &MongoDb, revision: i32) -> i32 {
         }
 
         db.db()
-            .run_command(
-                doc! {
-                    "createIndexes": "messages",
-                    "indexes": [
-                        {
-                            "key": {
-                                "author": 1_i32,
-                            },
-                            "name": "author"
-                        }
-                    ]
-                },
-                None,
-            )
+            .run_command(doc! {
+                "createIndexes": "messages",
+                "indexes": [
+                    {
+                        "key": {
+                            "author": 1_i32,
+                        },
+                        "name": "author"
+                    }
+                ]
+            })
             .await
             .expect("Failed to create messages author index.");
     }
@@ -703,35 +657,26 @@ pub async fn run_migrations(db: &MongoDb, revision: i32) -> i32 {
             "Running migration [revision 19 / 27-02-2023]: Create report / snapshot collections."
         );
 
-        db.db()
-            .create_collection("safety_reports", None)
-            .await
-            .unwrap();
+        db.db().create_collection("safety_reports").await.unwrap();
 
-        db.db()
-            .create_collection("safety_snapshots", None)
-            .await
-            .unwrap();
+        db.db().create_collection("safety_snapshots").await.unwrap();
     }
 
     if revision <= 20 {
         info!("Running migration [revision 20 / 28-02-2023]: Add index `snapshot.report_id`.");
 
         db.db()
-            .run_command(
-                doc! {
-                    "createIndexes": "safety_snapshots",
-                    "indexes": [
-                        {
-                            "key": {
-                                "report_id": 1_i32
-                            },
-                            "name": "report_id"
-                        }
-                    ]
-                },
-                None,
-            )
+            .run_command(doc! {
+                "createIndexes": "safety_snapshots",
+                "indexes": [
+                    {
+                        "key": {
+                            "report_id": 1_i32
+                        },
+                        "name": "report_id"
+                    }
+                ]
+            })
             .await
             .expect("Failed to create safety snapshot index.");
     }
@@ -739,10 +684,7 @@ pub async fn run_migrations(db: &MongoDb, revision: i32) -> i32 {
     if revision <= 21 {
         info!("Running migration [revision 21 / 31-05-2023]: Add collection `safety_strikes`.");
 
-        db.db()
-            .create_collection("safety_strikes", None)
-            .await
-            .unwrap();
+        db.db().create_collection("safety_strikes").await.unwrap();
     }
 
     if revision <= 22 {
@@ -756,7 +698,6 @@ pub async fn run_migrations(db: &MongoDb, revision: i32) -> i32 {
                         "moderator_id": "01EX2NCWQ0CHS3QJF0FEQS1GR4"
                     }
                 },
-                None,
             )
             .await
             .expect("Failed to update server members.");
@@ -766,13 +707,10 @@ pub async fn run_migrations(db: &MongoDb, revision: i32) -> i32 {
         info!("Running migration [revision 23 / 10-06-2023]: Generate discriminators for users.");
 
         db.db()
-            .run_command(
-                doc! {
-                    "dropIndexes": "users",
-                    "index": "username"
-                },
-                None,
-            )
+            .run_command(doc! {
+                "dropIndexes": "users",
+                "index": "username"
+            })
             .await
             .expect("Failed to drop existing username index.");
 
@@ -787,7 +725,7 @@ pub async fn run_migrations(db: &MongoDb, revision: i32) -> i32 {
 
         let users: Vec<UserInformation> = db
             .col::<UserInformation>("users")
-            .find(doc! {}, None)
+            .find(doc! {})
             .await
             .unwrap()
             .map(|doc| doc.expect("id and username"))
@@ -839,7 +777,6 @@ pub async fn run_migrations(db: &MongoDb, revision: i32) -> i32 {
                                 "discriminator": discriminator
                             }
                         },
-                        None,
                     )
                     .await
                     .unwrap();
@@ -887,7 +824,6 @@ pub async fn run_migrations(db: &MongoDb, revision: i32) -> i32 {
                                 "display_name": &info.username
                             }
                         },
-                        None,
                     )
                     .await
                     .unwrap();
@@ -898,43 +834,37 @@ pub async fn run_migrations(db: &MongoDb, revision: i32) -> i32 {
     if revision <= 24 {
         info!("Running migration [revision 24 / 09-06-2023]: Add collection `channel_webhooks` if not exists, update users index.");
 
-        db.db()
-            .create_collection("channel_webhooks", None)
-            .await
-            .ok();
+        db.db().create_collection("channel_webhooks").await.ok();
 
         db.db()
-            .run_command(
-                doc! {
-                    "createIndexes": "users",
-                    "indexes": [
-                        {
-                            "key": {
-                                "username": 1_i32
-                            },
-                            "name": "username",
-                            "unique": false,
-                            "collation": {
-                                "locale": "en",
-                                "strength": 2_i32
-                            }
+            .run_command(doc! {
+                "createIndexes": "users",
+                "indexes": [
+                    {
+                        "key": {
+                            "username": 1_i32
                         },
-                        {
-                            "key": {
-                                "username": 1_i32,
-                                "discriminator": 1_i32
-                            },
-                            "name": "username_discriminator",
-                            "unique": true,
-                            "collation": {
-                                "locale": "en",
-                                "strength": 2_i32
-                            }
+                        "name": "username",
+                        "unique": false,
+                        "collation": {
+                            "locale": "en",
+                            "strength": 2_i32
                         }
-                    ]
-                },
-                None,
-            )
+                    },
+                    {
+                        "key": {
+                            "username": 1_i32,
+                            "discriminator": 1_i32
+                        },
+                        "name": "username_discriminator",
+                        "unique": true,
+                        "collation": {
+                            "locale": "en",
+                            "strength": 2_i32
+                        }
+                    }
+                ]
+            })
             .await
             .expect("Failed to create username index.");
     };
@@ -950,7 +880,6 @@ pub async fn run_migrations(db: &MongoDb, revision: i32) -> i32 {
                         "permissions": *DEFAULT_WEBHOOK_PERMISSIONS as i64
                     }
                 },
-                None,
             )
             .await
             .expect("Failed to update webhooks.");
@@ -959,28 +888,22 @@ pub async fn run_migrations(db: &MongoDb, revision: i32) -> i32 {
     if revision <= 25 {
         info!("Running migration [revision 25 / 15-06-2023]: Add collection `ratelimit_events` with index.");
 
-        db.db()
-            .create_collection("ratelimit_events", None)
-            .await
-            .ok();
+        db.db().create_collection("ratelimit_events").await.ok();
 
         db.db()
-            .run_command(
-                doc! {
-                    "createIndexes": "ratelimit_events",
-                    "indexes": [
-                        {
-                            "key": {
-                                "_id": 1_i32,
-                                "target_id": 1_i32,
-                                "event_type": 1_i32,
-                            },
-                            "name": "compound_key"
-                        }
-                    ]
-                },
-                None,
-            )
+            .run_command(doc! {
+                "createIndexes": "ratelimit_events",
+                "indexes": [
+                    {
+                        "key": {
+                            "_id": 1_i32,
+                            "target_id": 1_i32,
+                            "event_type": 1_i32,
+                        },
+                        "name": "compound_key"
+                    }
+                ]
+            })
             .await
             .expect("Failed to create ratelimit_events index.");
     }
@@ -1017,12 +940,9 @@ pub async fn run_migrations(db: &MongoDb, revision: i32) -> i32 {
         let invites = db
             .db()
             .collection::<Outer>("channel_invites")
-            .find(
-                doc! {
-                    "type": { "$exists": false }
-                },
-                None,
-            )
+            .find(doc! {
+                "type": { "$exists": false }
+            })
             .await
             .expect("failed to find invites")
             .filter_map(|s| async { s.ok() })
@@ -1056,18 +976,15 @@ pub async fn run_migrations(db: &MongoDb, revision: i32) -> i32 {
         if !invites.is_empty() {
             db.db()
                 .collection("channel_invites")
-                .insert_many(invites, None)
+                .insert_many(invites)
                 .await
                 .expect("failed to insert corrected invite");
 
             db.db()
                 .collection::<Outer>("channel_invites")
-                .delete_many(
-                    doc! {
-                        "type": { "$exists": false }
-                    },
-                    None,
-                )
+                .delete_many(doc! {
+                    "type": { "$exists": false }
+                })
                 .await
                 .expect("failed to find invites");
         }
@@ -1077,21 +994,18 @@ pub async fn run_migrations(db: &MongoDb, revision: i32) -> i32 {
         info!("Running migration [revision 27 / 21-07-2024]: create message pinned index.");
 
         db.db()
-            .run_command(
-                doc! {
-                    "createIndexes": "messages",
-                    "indexes": [
-                        {
-                            "key": {
-                                "channel": 1_i32,
-                                "pinned": 1_i32
-                            },
-                            "name": "channel_pinned_compound"
-                        }
-                    ]
-                },
-                None,
-            )
+            .run_command(doc! {
+                "createIndexes": "messages",
+                "indexes": [
+                    {
+                        "key": {
+                            "channel": 1_i32,
+                            "pinned": 1_i32
+                        },
+                        "name": "channel_pinned_compound"
+                    }
+                ]
+            })
             .await
             .expect("Failed to create message index.");
     }
@@ -1099,44 +1013,35 @@ pub async fn run_migrations(db: &MongoDb, revision: i32) -> i32 {
     if revision <= 28 {
         info!("Running migration [revision 28 / 10-09-2024]: Add support for new Autumn.");
 
-        db.db()
-            .create_collection("attachment_hashes", None)
-            .await
-            .ok();
+        db.db().create_collection("attachment_hashes").await.ok();
 
         db.db()
-            .run_command(
-                doc! {
-                    "createIndexes": "attachments",
-                    "indexes": [
-                        {
-                            "key": {
-                                "hash": 1_i32
-                            },
-                            "name": "hash"
-                        }
-                    ]
-                },
-                None,
-            )
+            .run_command(doc! {
+                "createIndexes": "attachments",
+                "indexes": [
+                    {
+                        "key": {
+                            "hash": 1_i32
+                        },
+                        "name": "hash"
+                    }
+                ]
+            })
             .await
             .expect("Failed to create attachments index.");
 
         db.db()
-            .run_command(
-                doc! {
-                    "createIndexes": "attachment_hashes",
-                    "indexes": [
-                        {
-                            "key": {
-                                "processed_hash": 1_i32
-                            },
-                            "name": "processed_hash"
-                        }
-                    ]
-                },
-                None,
-            )
+            .run_command(doc! {
+                "createIndexes": "attachment_hashes",
+                "indexes": [
+                    {
+                        "key": {
+                            "processed_hash": 1_i32
+                        },
+                        "name": "processed_hash"
+                    }
+                ]
+            })
             .await
             .expect("Failed to create attachment_hashes index.");
     }
@@ -1147,20 +1052,17 @@ pub async fn run_migrations(db: &MongoDb, revision: i32) -> i32 {
         info!("Running migration [revision 30 / 29-09-2024]: Add index for used_for.id to attachments.");
 
         db.db()
-            .run_command(
-                doc! {
-                    "createIndexes": "attachments",
-                    "indexes": [
-                        {
-                            "key": {
-                                "used_for.id": 1_i32
-                            },
-                            "name": "used_for_id"
-                        }
-                    ]
-                },
-                None,
-            )
+            .run_command(doc! {
+                "createIndexes": "attachments",
+                "indexes": [
+                    {
+                        "key": {
+                            "used_for.id": 1_i32
+                        },
+                        "name": "used_for_id"
+                    }
+                ]
+            })
             .await
             .expect("Failed to create attachments index.");
     }
@@ -1177,7 +1079,7 @@ pub async fn run_migrations(db: &MongoDb, revision: i32) -> i32 {
         let webhooks = db
             .db()
             .collection::<WebhookShell>("channel_webhooks")
-            .find(doc! {}, None)
+            .find(doc! {})
             .await
             .expect("webhooks")
             .filter_map(|s| async { s.ok() })
@@ -1209,7 +1111,6 @@ pub async fn run_migrations(db: &MongoDb, revision: i32) -> i32 {
                                     "creator_id": creator_id
                                 }
                             },
-                            None,
                         )
                         .await
                         .expect("update webhook");
@@ -1220,7 +1121,7 @@ pub async fn run_migrations(db: &MongoDb, revision: i32) -> i32 {
                 }) => {
                     db.db()
                         .collection::<WebhookShell>("channel_webhooks")
-                        .delete_one(doc! { "_id": webhook._id }, None)
+                        .delete_one(doc! { "_id": webhook._id })
                         .await
                         .expect("failed to delete invalid webhook");
                 }
diff --git a/crates/core/database/src/models/channel_invites/ops/mongodb.rs b/crates/core/database/src/models/channel_invites/ops/mongodb.rs
index f6d55fff3..d628be8e6 100644
--- a/crates/core/database/src/models/channel_invites/ops/mongodb.rs
+++ b/crates/core/database/src/models/channel_invites/ops/mongodb.rs
@@ -24,12 +24,9 @@ impl AbstractChannelInvites for MongoDb {
     async fn fetch_invites_for_server(&self, server_id: &str) -> Result<Vec<Invite>> {
         Ok(self
             .col::<Invite>(COL)
-            .find(
-                doc! {
-                    "server": server_id,
-                },
-                None,
-            )
+            .find(doc! {
+                "server": server_id,
+            })
             .await
             .map_err(|_| create_database_error!("find", COL))?
             .filter_map(|s| async {
diff --git a/crates/core/database/src/models/channel_unreads/ops.rs b/crates/core/database/src/models/channel_unreads/ops.rs
index 6a6e98af3..6c91bf642 100644
--- a/crates/core/database/src/models/channel_unreads/ops.rs
+++ b/crates/core/database/src/models/channel_unreads/ops.rs
@@ -26,6 +26,14 @@ pub trait AbstractChannelUnreads: Sync + Send {
         message_ids: &[String],
     ) -> Result<()>;
 
+    /// Add a mention.
+    async fn add_mention_to_many_unreads<'a>(
+        &self,
+        channel_id: &str,
+        user_ids: &[String],
+        message_ids: &[String],
+    ) -> Result<()>;
+
     /// Fetch all unreads with mentions for a user.
     async fn fetch_unread_mentions(&self, user_id: &str) -> Result<Vec<ChannelUnread>>;
 
diff --git a/crates/core/database/src/models/channel_unreads/ops/mongodb.rs b/crates/core/database/src/models/channel_unreads/ops/mongodb.rs
index 76cead112..7225dc3dc 100644
--- a/crates/core/database/src/models/channel_unreads/ops/mongodb.rs
+++ b/crates/core/database/src/models/channel_unreads/ops/mongodb.rs
@@ -37,6 +37,8 @@ impl AbstractChannelUnreads for MongoDb {
                         "last_id": message_id
                     }
                 },
+            )
+            .with_options(
                 FindOneAndUpdateOptions::builder()
                     .upsert(true)
                     .return_document(ReturnDocument::After)
@@ -51,15 +53,12 @@ impl AbstractChannelUnreads for MongoDb {
         let current_time = Ulid::new().to_string();
 
         self.col::<Document>(COL)
-            .delete_many(
-                doc! {
-                    "_id.channel": {
-                        "$in": channel_ids
-                    },
-                    "_id.user": user_id
+            .delete_many(doc! {
+                "_id.channel": {
+                    "$in": channel_ids
                 },
-                None,
-            )
+                "_id.user": user_id
+            })
             .await
             .map_err(|_| create_database_error!("delete_many", COL))?;
 
@@ -77,7 +76,6 @@ impl AbstractChannelUnreads for MongoDb {
                         }
                     })
                     .collect::<Vec<Document>>(),
-                None,
             )
             .await
             .map(|_| ())
@@ -104,13 +102,42 @@ impl AbstractChannelUnreads for MongoDb {
                         }
                     }
                 },
-                UpdateOptions::builder().upsert(true).build(),
             )
+            .with_options(UpdateOptions::builder().upsert(true).build())
             .await
             .map(|_| ())
             .map_err(|_| create_database_error!("update_one", COL))
     }
 
+    /// Add a mention to multiple users.
+    async fn add_mention_to_many_unreads<'a>(
+        &self,
+        channel_id: &str,
+        user_ids: &[String],
+        message_ids: &[String],
+    ) -> Result<()> {
+        self.col::<Document>(COL)
+            .update_many(
+                doc! {
+                    "_id.channel": channel_id,
+                    "_id.user": {
+                        "$in": user_ids
+                    },
+                },
+                doc! {
+                    "$push": {
+                        "mentions": {
+                            "$each": message_ids
+                        }
+                    }
+                },
+            )
+            .with_options(UpdateOptions::builder().upsert(true).build())
+            .await
+            .map(|_| ())
+            .map_err(|_| create_database_error!("update_many", COL))
+    }
+
     /// Fetch all channel unreads for a user.
     async fn fetch_unreads(&self, user_id: &str) -> Result<Vec<ChannelUnread>> {
         query!(
diff --git a/crates/core/database/src/models/channel_unreads/ops/reference.rs b/crates/core/database/src/models/channel_unreads/ops/reference.rs
index 914ac95db..36969b8f9 100644
--- a/crates/core/database/src/models/channel_unreads/ops/reference.rs
+++ b/crates/core/database/src/models/channel_unreads/ops/reference.rs
@@ -78,6 +78,38 @@ impl AbstractChannelUnreads for ReferenceDb {
         Ok(())
     }
 
+    /// Add a mention to multiple users.
+    async fn add_mention_to_many_unreads<'a>(
+        &self,
+        channel_id: &str,
+        user_ids: &[String],
+        message_ids: &[String],
+    ) -> Result<()> {
+        let mut unreads = self.channel_unreads.lock().await;
+
+        for user_id in user_ids {
+            let key = ChannelCompositeKey {
+                channel: channel_id.to_string(),
+                user: user_id.to_string(),
+            };
+
+            if let Some(unread) = unreads.get_mut(&key) {
+                unread.mentions.replace(message_ids.to_vec());
+            } else {
+                unreads.insert(
+                    key.clone(),
+                    ChannelUnread {
+                        id: key,
+                        last_id: None,
+                        mentions: Some(message_ids.to_vec()),
+                    },
+                );
+            }
+        }
+
+        Ok(())
+    }
+
     async fn fetch_unread_mentions(&self, user_id: &str) -> Result<Vec<ChannelUnread>> {
         let unreads = self.channel_unreads.lock().await;
         Ok(unreads
diff --git a/crates/core/database/src/models/channel_webhooks/ops/mongodb.rs b/crates/core/database/src/models/channel_webhooks/ops/mongodb.rs
index 457e3b685..9e11d561a 100644
--- a/crates/core/database/src/models/channel_webhooks/ops/mongodb.rs
+++ b/crates/core/database/src/models/channel_webhooks/ops/mongodb.rs
@@ -24,12 +24,9 @@ impl AbstractWebhooks for MongoDb {
     async fn fetch_webhooks_for_channel(&self, channel_id: &str) -> Result<Vec<Webhook>> {
         Ok(self
             .col::<Webhook>(COL)
-            .find(
-                doc! {
-                    "channel_id": channel_id,
-                },
-                None,
-            )
+            .find(doc! {
+                "channel_id": channel_id,
+            })
             .await
             .map_err(|_| create_database_error!("find", COL))?
             .filter_map(|s| async {
diff --git a/crates/core/database/src/models/channels/ops/mongodb.rs b/crates/core/database/src/models/channels/ops/mongodb.rs
index c75fab536..79612f8d7 100644
--- a/crates/core/database/src/models/channels/ops/mongodb.rs
+++ b/crates/core/database/src/models/channels/ops/mongodb.rs
@@ -23,14 +23,11 @@ impl AbstractChannels for MongoDb {
     async fn fetch_channels<'a>(&self, ids: &'a [String]) -> Result<Vec<Channel>> {
         Ok(self
             .col::<Channel>(COL)
-            .find(
-                doc! {
-                    "_id": {
-                        "$in": ids
-                    }
-                },
-                None,
-            )
+            .find(doc! {
+                "_id": {
+                    "$in": ids
+                }
+            })
             .await
             .map_err(|_| create_database_error!("fetch", "channels"))?
             .filter_map(|s| async {
@@ -119,7 +116,6 @@ impl AbstractChannels for MongoDb {
                         "recipients": user
                     }
                 },
-                None,
             )
             .await
             .map(|_| ())
@@ -141,7 +137,6 @@ impl AbstractChannels for MongoDb {
                     "role_permissions.".to_owned() + role: permissions
                 }
                 },
-                None,
             )
             .await
             .map(|_| ())
@@ -179,7 +174,6 @@ impl AbstractChannels for MongoDb {
                         "recipients": user
                     }
                 },
-                None,
             )
             .await
             .map(|_| ())
@@ -253,7 +247,6 @@ impl AbstractChannels for MongoDb {
                         "_id": server.id
                     },
                     update,
-                    None,
                 )
                 .await
                 .map_err(|_| create_database_error!("update_one", "servers"))?;
@@ -274,23 +267,17 @@ impl MongoDb {
     pub async fn delete_associated_channel_objects(&self, id: Bson) -> Result<()> {
         // Delete all invites to these channels.
         self.col::<Document>("channel_invites")
-            .delete_many(
-                doc! {
-                    "channel": &id
-                },
-                None,
-            )
+            .delete_many(doc! {
+                "channel": &id
+            })
             .await
             .map_err(|_| create_database_error!("delete_many", "channel_invites"))?;
 
         // Delete unread message objects on channels.
         self.col::<Document>("channel_unreads")
-            .delete_many(
-                doc! {
-                    "_id.channel": &id
-                },
-                None,
-            )
+            .delete_many(doc! {
+                "_id.channel": &id
+            })
             .await
             .map_err(|_| create_database_error!("delete_many", "channel_unreads"))
             .map(|_| ())?;
@@ -299,12 +286,9 @@ impl MongoDb {
 
         // Delete all webhooks on this channel.
         self.col::<Document>("webhooks")
-            .delete_many(
-                doc! {
-                    "channel": &id
-                },
-                None,
-            )
+            .delete_many(doc! {
+                "channel": &id
+            })
             .await
             .map_err(|_| create_database_error!("delete_many", "webhooks"))
             .map(|_| ())
diff --git a/crates/core/database/src/models/emojis/ops/mongodb.rs b/crates/core/database/src/models/emojis/ops/mongodb.rs
index 168d3db76..6dd3137b7 100644
--- a/crates/core/database/src/models/emojis/ops/mongodb.rs
+++ b/crates/core/database/src/models/emojis/ops/mongodb.rs
@@ -60,7 +60,6 @@ impl AbstractEmojis for MongoDb {
                         }
                     }
                 },
-                None,
             )
             .await
             .map(|_| ())
diff --git a/crates/core/database/src/models/file_hashes/ops/mongodb.rs b/crates/core/database/src/models/file_hashes/ops/mongodb.rs
index 153cb72f1..e2f06067d 100644
--- a/crates/core/database/src/models/file_hashes/ops/mongodb.rs
+++ b/crates/core/database/src/models/file_hashes/ops/mongodb.rs
@@ -42,7 +42,6 @@ impl AbstractAttachmentHashes for MongoDb {
                         "iv": nonce
                     }
                 },
-                None,
             )
             .await
             .map(|_| ())
diff --git a/crates/core/database/src/models/files/ops/mongodb.rs b/crates/core/database/src/models/files/ops/mongodb.rs
index 43e8e946d..cd4241feb 100644
--- a/crates/core/database/src/models/files/ops/mongodb.rs
+++ b/crates/core/database/src/models/files/ops/mongodb.rs
@@ -110,7 +110,6 @@ impl AbstractAttachments for MongoDb {
                         "uploader_id": uploader_id
                     }
                 },
-                None,
             )
             .await
             .map_err(|_| create_database_error!("update_one", COL))?;
@@ -130,7 +129,6 @@ impl AbstractAttachments for MongoDb {
                         "reported": true
                     }
                 },
-                None,
             )
             .await
             .map(|_| ())
@@ -149,7 +147,6 @@ impl AbstractAttachments for MongoDb {
                         "deleted": true
                     }
                 },
-                None,
             )
             .await
             .map(|_| ())
@@ -170,7 +167,6 @@ impl AbstractAttachments for MongoDb {
                         "deleted": true
                     }
                 },
-                None,
             )
             .await
             .map(|_| ())
@@ -193,7 +189,6 @@ impl MongoDb {
                         "deleted": true
                     }
                 },
-                None,
             )
             .await
             .map(|_| ())
diff --git a/crates/core/database/src/models/messages/model.rs b/crates/core/database/src/models/messages/model.rs
index 92055cde6..d74f26281 100644
--- a/crates/core/database/src/models/messages/model.rs
+++ b/crates/core/database/src/models/messages/model.rs
@@ -5,9 +5,10 @@ use iso8601_timestamp::Timestamp;
 use revolt_config::{config, FeaturesLimits};
 use revolt_models::v0::{
     self, BulkMessageResponse, DataMessageSend, Embed, MessageAuthor, MessageFlags, MessageSort,
-    MessageWebhook, PushNotification, ReplyIntent, SendableEmbed, Text, RE_MENTION,
+    MessageWebhook, PushNotification, ReplyIntent, SendableEmbed, Text, RE_BLOCKS, RE_MENTION,
+    RE_ROLE_MENTION,
 };
-use revolt_permissions::{ChannelPermission, PermissionValue};
+use revolt_permissions::{calculate_channel_permissions, ChannelPermission, PermissionValue};
 use revolt_result::{ErrorType, Result};
 use ulid::Ulid;
 use validator::Validate;
@@ -15,7 +16,10 @@ use validator::Validate;
 use crate::{
     events::client::EventV1,
     tasks::{self, ack::AckEvent},
-    util::{bulk_permissions::BulkDatabasePermissionQuery, idempotency::IdempotencyKey},
+    util::{
+        bulk_permissions::BulkDatabasePermissionQuery, idempotency::IdempotencyKey,
+        permissions::DatabasePermissionQuery,
+    },
     Channel, Database, Emoji, File, User, AMQP,
 };
 
@@ -53,6 +57,9 @@ auto_derived_partial!(
         /// Array of user ids mentioned in this message
         #[serde(skip_serializing_if = "Option::is_none")]
         pub mentions: Option<Vec<String>>,
+        /// Array of role ids mentioned in this message
+        #[serde(skip_serializing_if = "Option::is_none")]
+        pub role_mentions: Option<Vec<String>>,
         /// Array of message ids this message is replying to
         #[serde(skip_serializing_if = "Option::is_none")]
         pub replies: Option<Vec<String>>,
@@ -71,7 +78,7 @@ auto_derived_partial!(
 
         /// Bitfield of message flags
         #[serde(skip_serializing_if = "Option::is_none")]
-        pub flags: Option<i32>,
+        pub flags: Option<u32>,
     },
     "PartialMessage"
 );
@@ -201,6 +208,30 @@ auto_derived!(
     }
 );
 
+pub struct MessageFlagsValue(pub u32);
+
+impl MessageFlagsValue {
+    pub fn has(&self, flag: MessageFlags) -> bool {
+        self.has_value(flag as u32)
+    }
+    pub fn has_value(&self, bit: u32) -> bool {
+        let mask = 1 << bit;
+        self.0 & mask == mask
+    }
+
+    pub fn set(&mut self, flag: MessageFlags, toggle: bool) -> &mut Self {
+        self.set_value(flag as u32, toggle)
+    }
+    pub fn set_value(&mut self, bit: u32, toggle: bool) -> &mut Self {
+        if toggle {
+            self.0 |= 1 << bit;
+        } else {
+            self.0 &= !(1 << bit);
+        }
+        self
+    }
+}
+
 #[allow(clippy::derivable_impls)]
 impl Default for Message {
     fn default() -> Self {
@@ -216,6 +247,7 @@ impl Default for Message {
             edited: None,
             embeds: None,
             mentions: None,
+            role_mentions: None,
             replies: None,
             reactions: Default::default(),
             interactions: Default::default(),
@@ -264,13 +296,43 @@ impl Message {
             return Err(create_error!(EmptyMessage));
         }
 
-        // Ensure flags are either not set or have permissible values
-        if let Some(flags) = &data.flags {
-            if flags != &0 && flags != &1 {
+        let allow_mass_mentions = allow_mentions && config.features.mass_mentions_enabled;
+
+        let mut mentions_everyone = false;
+        let mut mentions_online = false;
+        let mut suppress_notifications = false;
+
+        if let Some(raw_flags) = &data.flags {
+            if raw_flags > &7 {
+                // quick path to failure: bigger than all the bits combined
                 return Err(create_error!(InvalidProperty));
             }
+
+            // First step of mass mention resolution
+            let flags = MessageFlagsValue(*raw_flags);
+            suppress_notifications = flags.has(MessageFlags::SuppressNotifications);
+            mentions_everyone = allow_mentions && flags.has(MessageFlags::MentionsEveryone);
+            mentions_online = allow_mentions && flags.has(MessageFlags::MentionsOnline);
+
+            // Not a bot, and attempting to set mention flags
+            if user.as_ref().is_some_and(|u| u.bot.as_ref().is_none())
+                && (mentions_everyone || mentions_online)
+            {
+                return Err(create_error!(IsNotBot));
+            }
+
+            if mentions_everyone && mentions_online {
+                return Err(create_error!(InvalidFlagValue));
+            }
         }
 
+        let server_id = match channel {
+            Channel::TextChannel { ref server, .. } | Channel::VoiceChannel { ref server, .. } => {
+                Some(server.clone())
+            }
+            _ => None,
+        };
+
         // Ensure restrict_reactions is not specified without reactions list
         if let Some(interactions) = &data.interactions {
             if interactions.restrict_reactions {
@@ -304,19 +366,99 @@ impl Message {
                 .unwrap_or_default(),
             author: author_id,
             webhook: webhook.map(|w| w.into()),
-            flags: data.flags.map(|v| v as i32),
+            flags: data.flags,
             ..Default::default()
         };
 
         // Parse mentions in message.
         let mut mentions = HashSet::new();
-        if allow_mentions {
-            if let Some(content) = &data.content {
-                for capture in RE_MENTION.captures_iter(content) {
-                    if let Some(mention) = capture.get(1) {
-                        mentions.insert(mention.as_str().to_string());
+        let mut role_mentions = HashSet::new();
+        let mut role_model_mentions = vec![];
+
+        if let Some(raw_content) = &data.content {
+            // remove all codeblocks before running the mention regex
+            let modified_content = RE_BLOCKS.replace_all(raw_content, "");
+
+            for capture in RE_MENTION.captures_iter(&modified_content).flatten() {
+                if let Some(mention) = capture.get(1) {
+                    mentions.insert(mention.as_str().to_string());
+                }
+            }
+            if allow_mass_mentions && server_id.is_some() {
+                // Second step of mass mention resolution.
+                for capture in RE_ROLE_MENTION.captures_iter(&modified_content).flatten() {
+                    let raw = capture.get(0).expect("No capture?").as_str();
+                    if raw == "@everyone" {
+                        mentions_everyone = true;
+                        // Can't break early here since we want to capture any role ids
+                    } else if raw == "@online" {
+                        mentions_online = true;
+                    } else if let Some(role_match) = capture.get(1) {
+                        role_mentions.insert(role_match.as_str().to_string());
                     }
                 }
+
+                if !role_mentions.is_empty() {
+                    let server_data = db
+                        .fetch_server(server_id.unwrap().as_str())
+                        .await
+                        .expect("Failed to fetch server");
+
+                    role_mentions = role_mentions
+                        .iter()
+                        .filter(|role_id| server_data.roles.contains_key(*role_id))
+                        .cloned()
+                        .collect();
+
+                    role_model_mentions.extend(
+                        role_mentions
+                            .iter()
+                            .map(|role_id| server_data.roles.get(role_id).to_owned()),
+                    );
+                }
+            }
+        }
+
+        // Validate the user can perform a mass mention
+        if !config.features.mass_mentions_enabled
+            && (mentions_everyone || mentions_online || !role_mentions.is_empty())
+        {
+            mentions_everyone = false;
+            mentions_online = false;
+            role_mentions.clear();
+        } else if mentions_everyone || mentions_online || !role_mentions.is_empty() {
+            debug!(
+                "Mentioned everyone: {}, mentioned online: {}, mentioned roles: {:?}",
+                mentions_everyone, mentions_online, &role_mentions
+            );
+            if let Some(user) = match author {
+                MessageAuthor::User(user) => Some(Ok(user)),
+                MessageAuthor::System { .. } => Some(Err(())), // DISALLOWED
+                MessageAuthor::Webhook(..) => None,            // Bypass check
+            } {
+                if user.is_err() {
+                    return Err(create_error!(InvalidProperty));
+                }
+                let owned_user: User = user.unwrap().to_owned().into();
+
+                let mut query = DatabasePermissionQuery::new(db, &owned_user).channel(&channel);
+                let perms = calculate_channel_permissions(&mut query).await;
+
+                if (mentions_everyone || mentions_online)
+                    && !perms.has_channel_permission(ChannelPermission::MentionEveryone)
+                {
+                    return Err(create_error!(MissingPermission {
+                        permission: ChannelPermission::MentionEveryone.to_string()
+                    }));
+                }
+
+                if !role_mentions.is_empty()
+                    && !perms.has_channel_permission(ChannelPermission::MentionRoles)
+                {
+                    return Err(create_error!(MissingPermission {
+                        permission: ChannelPermission::MentionRoles.to_string()
+                    }));
+                }
             }
         }
 
@@ -366,6 +508,7 @@ impl Message {
                     let recipients_hash: HashSet<&String, RandomState> =
                         HashSet::from_iter(recipients);
                     mentions.retain(|m| recipients_hash.contains(m));
+                    role_mentions.clear();
                 }
                 Channel::TextChannel { ref server, .. }
                 | Channel::VoiceChannel { ref server, .. } => {
@@ -406,12 +549,27 @@ impl Message {
             message.mentions.replace(mentions.into_iter().collect());
         }
 
+        if !role_mentions.is_empty() {
+            message
+                .role_mentions
+                .replace(role_mentions.into_iter().collect());
+        }
+
         if !replies.is_empty() {
             message
                 .replies
                 .replace(replies.into_iter().collect::<Vec<String>>());
         }
 
+        // Calculate final message flags
+        let mut flag_value = MessageFlagsValue(0);
+        flag_value
+            .set(MessageFlags::SuppressNotifications, suppress_notifications)
+            .set(MessageFlags::MentionsEveryone, mentions_everyone)
+            .set(MessageFlags::MentionsOnline, mentions_online);
+
+        message.flags = Some(flag_value.0);
+
         // Add attachments to message.
         let mut attachments = vec![];
         if data
@@ -490,7 +648,12 @@ impl Message {
                 tasks::ack::queue_message(
                     self.channel.to_string(),
                     AckEvent::ProcessMessage {
-                        messages: vec![(None, self.clone(), mentions.clone(), true)],
+                        messages: vec![(
+                            None,
+                            self.clone(),
+                            mentions.clone(),
+                            self.has_suppressed_notifications(),
+                        )],
                     },
                 )
                 .await;
@@ -534,7 +697,9 @@ impl Message {
         )
         .await?;
 
-        if !self.has_suppressed_notifications() {
+        if !self.has_suppressed_notifications()
+            && (self.mentions.is_some() || self.contains_mass_push_mention())
+        {
             // send Push notifications
             tasks::ack::queue_message(
                 self.channel.to_string(),
@@ -557,7 +722,7 @@ impl Message {
                             }
                             _ => vec![],
                         },
-                        self.has_suppressed_notifications(),
+                        false, // branch already dictates this
                     )],
                 },
             )
@@ -594,13 +759,24 @@ impl Message {
     /// Whether this message has suppressed notifications
     pub fn has_suppressed_notifications(&self) -> bool {
         if let Some(flags) = self.flags {
-            flags & MessageFlags::SuppressNotifications as i32
-                == MessageFlags::SuppressNotifications as i32
+            flags & MessageFlags::SuppressNotifications as u32
+                == MessageFlags::SuppressNotifications as u32
         } else {
             false
         }
     }
 
+    pub fn contains_mass_push_mention(&self) -> bool {
+        let ping = if let Some(flags) = self.flags {
+            let flags = MessageFlagsValue(flags);
+            flags.has(MessageFlags::MentionsEveryone)
+        } else {
+            false
+        };
+
+        ping || self.role_mentions.is_some()
+    }
+
     /// Update message data
     pub async fn update(
         &mut self,
diff --git a/crates/core/database/src/models/messages/ops/mongodb.rs b/crates/core/database/src/models/messages/ops/mongodb.rs
index 721a3b7c9..449e71efd 100644
--- a/crates/core/database/src/models/messages/ops/mongodb.rs
+++ b/crates/core/database/src/models/messages/ops/mongodb.rs
@@ -228,7 +228,6 @@ impl AbstractMessages for MongoDb {
                     "_id": id
                 },
                 query,
-                None,
             )
             .await
             .map(|_| ())
@@ -247,7 +246,6 @@ impl AbstractMessages for MongoDb {
                         format!("reactions.{emoji}"): user
                     }
                 },
-                None,
             )
             .await
             .map(|_| ())
@@ -266,7 +264,6 @@ impl AbstractMessages for MongoDb {
                         format!("reactions.{emoji}"): user
                     }
                 },
-                None,
             )
             .await
             .map(|_| ())
@@ -285,7 +282,6 @@ impl AbstractMessages for MongoDb {
                         format!("reactions.{emoji}"): 1
                     }
                 },
-                None,
             )
             .await
             .map(|_| ())
@@ -300,15 +296,12 @@ impl AbstractMessages for MongoDb {
     /// Delete messages from a channel by their ids and corresponding channel id
     async fn delete_messages(&self, channel: &str, ids: &[String]) -> Result<()> {
         self.col::<Document>(COL)
-            .delete_many(
-                doc! {
-                    "channel": channel,
-                    "_id": {
-                        "$in": ids
-                    }
-                },
-                None,
-            )
+            .delete_many(doc! {
+                "channel": channel,
+                "_id": {
+                    "$in": ids
+                }
+            })
             .await
             .map(|_| ())
             .map_err(|_| create_database_error!("delete_many", COL))
@@ -362,7 +355,6 @@ impl MongoDb {
                             "deleted": true
                         }
                     },
-                    None,
                 )
                 .await
                 .map_err(|_| create_database_error!("update_many", "attachments"))?;
@@ -370,7 +362,7 @@ impl MongoDb {
 
         // And then delete said messages.
         self.col::<Document>(COL)
-            .delete_many(projection, None)
+            .delete_many(projection)
             .await
             .map(|_| ())
             .map_err(|_| create_database_error!("delete_many", COL))
diff --git a/crates/core/database/src/models/ratelimit_events/ops/mongodb.rs b/crates/core/database/src/models/ratelimit_events/ops/mongodb.rs
index ed6f0a1bf..29edd64d6 100644
--- a/crates/core/database/src/models/ratelimit_events/ops/mongodb.rs
+++ b/crates/core/database/src/models/ratelimit_events/ops/mongodb.rs
@@ -23,16 +23,13 @@ impl AbstractRatelimitEvents for MongoDb {
         count: usize,
     ) -> Result<bool> {
         self.col::<RatelimitEvent>(COL)
-            .count_documents(
-                doc! {
-                    "_id": {
-                        "$gte": Ulid::from_datetime(SystemTime::now() - period).to_string()
-                    },
-                    "target_id": target_id,
-                    "event_type": event_type.to_string()
+            .count_documents(doc! {
+                "_id": {
+                    "$gte": Ulid::from_datetime(SystemTime::now() - period).to_string()
                 },
-                None,
-            )
+                "target_id": target_id,
+                "event_type": event_type.to_string()
+            })
             .await
             .map(|c| c as usize >= count)
             .map_err(|_| create_database_error!("count_documents", COL))
diff --git a/crates/core/database/src/models/server_members/ops.rs b/crates/core/database/src/models/server_members/ops.rs
index 369f43e20..1d5a045f3 100644
--- a/crates/core/database/src/models/server_members/ops.rs
+++ b/crates/core/database/src/models/server_members/ops.rs
@@ -1,3 +1,4 @@
+use ::mongodb::SessionCursor;
 use revolt_result::Result;
 
 use crate::{FieldsMember, Member, MemberCompositeKey, PartialMember};
@@ -5,6 +6,66 @@ use crate::{FieldsMember, Member, MemberCompositeKey, PartialMember};
 mod mongodb;
 mod reference;
 
+#[derive(Debug)]
+pub enum ChunkedServerMembersGenerator {
+    #[cfg(feature = "mongodb")]
+    MongoDb {
+        session: ::mongodb::ClientSession,
+        cursor: Option<SessionCursor<Member>>,
+    },
+
+    Reference {
+        offset: i32,
+        data: Option<Vec<Member>>,
+    },
+}
+
+impl ChunkedServerMembersGenerator {
+    #[cfg(feature = "mongodb")]
+    pub fn new_mongo(session: ::mongodb::ClientSession, cursor: SessionCursor<Member>) -> Self {
+        ChunkedServerMembersGenerator::MongoDb {
+            session,
+            cursor: Some(cursor),
+        }
+    }
+
+    pub fn new_reference(data: Vec<Member>) -> Self {
+        ChunkedServerMembersGenerator::Reference {
+            offset: 0,
+            data: Some(data),
+        }
+    }
+
+    pub async fn next(&mut self) -> Option<Member> {
+        match self {
+            #[cfg(feature = "mongodb")]
+            ChunkedServerMembersGenerator::MongoDb { session, cursor } => {
+                if let Some(cursor) = cursor {
+                    let value = cursor.next(session).await;
+                    value.map(|val| val.expect("Failed to fetch the next member"))
+                } else {
+                    warn!("Attempted to access a (MongoDb) server member generator without first setting a cursor");
+                    None
+                }
+            }
+            ChunkedServerMembersGenerator::Reference { offset, data } => {
+                if let Some(data) = data {
+                    if data.len() as i32 >= *offset {
+                        None
+                    } else {
+                        let resp = &data[*offset as usize];
+                        *offset += 1;
+                        Some(resp.clone())
+                    }
+                } else {
+                    warn!("Attempted to access a (Reference) server member generator without first providing data");
+                    None
+                }
+            }
+        }
+    }
+}
+
 #[async_trait]
 pub trait AbstractServerMembers: Sync + Send {
     /// Insert a new server member into the database
@@ -16,6 +77,24 @@ pub trait AbstractServerMembers: Sync + Send {
     /// Fetch all members in a server
     async fn fetch_all_members<'a>(&self, server_id: &str) -> Result<Vec<Member>>;
 
+    /// Fetch all members in a server as an iterator
+    async fn fetch_all_members_chunked(
+        &self,
+        server_id: &str,
+    ) -> Result<ChunkedServerMembersGenerator>;
+
+    async fn fetch_all_members_with_roles(
+        &self,
+        server_id: &str,
+        roles: &[String],
+    ) -> Result<Vec<Member>>;
+
+    async fn fetch_all_members_with_roles_chunked(
+        &self,
+        server_id: &str,
+        roles: &[String],
+    ) -> Result<ChunkedServerMembersGenerator>;
+
     /// Fetch all memberships for a user
     async fn fetch_all_memberships<'a>(&self, user_id: &str) -> Result<Vec<Member>>;
 
diff --git a/crates/core/database/src/models/server_members/ops/mongodb.rs b/crates/core/database/src/models/server_members/ops/mongodb.rs
index a9de60a0a..5634eec79 100644
--- a/crates/core/database/src/models/server_members/ops/mongodb.rs
+++ b/crates/core/database/src/models/server_members/ops/mongodb.rs
@@ -1,10 +1,11 @@
 use futures::StreamExt;
+use mongodb::options::ReadConcern;
 use revolt_result::Result;
 
 use crate::{FieldsMember, Member, MemberCompositeKey, PartialMember};
 use crate::{IntoDocumentPath, MongoDb};
 
-use super::AbstractServerMembers;
+use super::{AbstractServerMembers, ChunkedServerMembersGenerator};
 
 static COL: &str = "server_members";
 
@@ -33,12 +34,65 @@ impl AbstractServerMembers for MongoDb {
     async fn fetch_all_members<'a>(&self, server_id: &str) -> Result<Vec<Member>> {
         Ok(self
             .col::<Member>(COL)
-            .find(
-                doc! {
-                    "_id.server": server_id
-                },
-                None,
-            )
+            .find(doc! {
+                "_id.server": server_id
+            })
+            .await
+            .map_err(|_| create_database_error!("find", COL))?
+            .filter_map(|s| async {
+                if cfg!(debug_assertions) {
+                    Some(s.unwrap())
+                } else {
+                    s.ok()
+                }
+            })
+            .collect()
+            .await)
+    }
+
+    /// Fetch all members in a server as a generator.
+    /// Uses config key pushd.mass_mention_chunk_size as the batch size.
+    async fn fetch_all_members_chunked(
+        &self,
+        server_id: &str,
+    ) -> Result<ChunkedServerMembersGenerator> {
+        let config = revolt_config::config().await;
+
+        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::<Member>(COL)
+            .find(doc! {
+                "_id.server": server_id
+            })
+            .session(&mut session)
+            .batch_size(config.pushd.mass_mention_chunk_size as u32)
+            .await
+            .map_err(|_| create_database_error!("find", COL))?;
+
+        Ok(ChunkedServerMembersGenerator::new_mongo(session, cursor))
+    }
+
+    async fn fetch_all_members_with_roles(
+        &self,
+        server_id: &str,
+        roles: &[String],
+    ) -> Result<Vec<Member>> {
+        Ok(self
+            .col::<Member>(COL)
+            .find(doc! {
+                "_id.server": server_id,
+                "roles": {"$in": roles}
+            })
             .await
             .map_err(|_| create_database_error!("find", COL))?
             .filter_map(|s| async {
@@ -52,16 +106,45 @@ impl AbstractServerMembers for MongoDb {
             .await)
     }
 
+    async fn fetch_all_members_with_roles_chunked(
+        &self,
+        server_id: &str,
+        roles: &[String],
+    ) -> Result<ChunkedServerMembersGenerator> {
+        let config = revolt_config::config().await;
+
+        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::<Member>(COL)
+            .find(doc! {
+                "_id.server": server_id,
+                "roles": {"$in": roles}
+            })
+            .session(&mut session)
+            .batch_size(config.pushd.mass_mention_chunk_size as u32)
+            .await
+            .map_err(|_| create_database_error!("find", COL))?;
+
+        return Ok(ChunkedServerMembersGenerator::new_mongo(session, cursor));
+    }
+
     /// Fetch all memberships for a user
     async fn fetch_all_memberships<'a>(&self, user_id: &str) -> Result<Vec<Member>> {
         Ok(self
             .col::<Member>(COL)
-            .find(
-                doc! {
-                    "_id.user": user_id
-                },
-                None,
-            )
+            .find(doc! {
+                "_id.user": user_id
+            })
             .await
             .map_err(|_| create_database_error!("find", COL))?
             .filter_map(|s| async {
@@ -79,15 +162,12 @@ impl AbstractServerMembers for MongoDb {
     async fn fetch_members<'a>(&self, server_id: &str, ids: &'a [String]) -> Result<Vec<Member>> {
         Ok(self
             .col::<Member>(COL)
-            .find(
-                doc! {
-                    "_id.server": server_id,
-                    "_id.user": {
-                        "$in": ids
-                    }
-                },
-                None,
-            )
+            .find(doc! {
+                "_id.server": server_id,
+                "_id.user": {
+                    "$in": ids
+                }
+            })
             .await
             .map_err(|_| create_database_error!("find", COL))?
             .filter_map(|s| async {
@@ -104,12 +184,9 @@ impl AbstractServerMembers for MongoDb {
     /// Fetch member count of a server
     async fn fetch_member_count(&self, server_id: &str) -> Result<usize> {
         self.col::<Member>(COL)
-            .count_documents(
-                doc! {
-                    "_id.server": server_id
-                },
-                None,
-            )
+            .count_documents(doc! {
+                "_id.server": server_id
+            })
             .await
             .map(|c| c as usize)
             .map_err(|_| create_database_error!("count_documents", COL))
@@ -118,12 +195,9 @@ impl AbstractServerMembers for MongoDb {
     /// Fetch server count of a user
     async fn fetch_server_count(&self, user_id: &str) -> Result<usize> {
         self.col::<Member>(COL)
-            .count_documents(
-                doc! {
-                    "_id.user": user_id
-                },
-                None,
-            )
+            .count_documents(doc! {
+                "_id.user": user_id
+            })
             .await
             .map(|c| c as usize)
             .map_err(|_| create_database_error!("count_documents", COL))
diff --git a/crates/core/database/src/models/server_members/ops/reference.rs b/crates/core/database/src/models/server_members/ops/reference.rs
index f038477ec..ac15d977f 100644
--- a/crates/core/database/src/models/server_members/ops/reference.rs
+++ b/crates/core/database/src/models/server_members/ops/reference.rs
@@ -3,7 +3,7 @@ use revolt_result::Result;
 use crate::ReferenceDb;
 use crate::{FieldsMember, Member, MemberCompositeKey, PartialMember};
 
-use super::AbstractServerMembers;
+use super::{AbstractServerMembers, ChunkedServerMembersGenerator};
 
 #[async_trait]
 impl AbstractServerMembers for ReferenceDb {
@@ -40,6 +40,70 @@ impl AbstractServerMembers for ReferenceDb {
             .collect())
     }
 
+    /// Fetch all members in a server as an iterator
+    async fn fetch_all_members_chunked(
+        &self,
+        server_id: &str,
+    ) -> Result<ChunkedServerMembersGenerator> {
+        let server_members = self.server_members.lock().await;
+
+        let members = server_members
+            .clone()
+            .into_values()
+            .filter(move |member| member.id.server == server_id)
+            .collect();
+
+        // this is inefficient as shit but its the reference db so its fine
+        Ok(ChunkedServerMembersGenerator::new_reference(members))
+    }
+
+    /// Fetch all members that have any of the roles given
+    async fn fetch_all_members_with_roles(
+        &self,
+        server_id: &str,
+        roles: &[String],
+    ) -> Result<Vec<Member>> {
+        let server_members = self.server_members.lock().await;
+
+        Ok(server_members
+            .clone()
+            .into_values()
+            .filter(|member| {
+                member.id.server == server_id
+                    && !member
+                        .roles
+                        .iter()
+                        .filter(|p| roles.contains(*p))
+                        .collect::<Vec<&String>>()
+                        .is_empty()
+            })
+            .collect())
+    }
+
+    async fn fetch_all_members_with_roles_chunked(
+        &self,
+        server_id: &str,
+        roles: &[String],
+    ) -> Result<ChunkedServerMembersGenerator> {
+        let server_members = self.server_members.lock().await;
+
+        let resp = server_members
+            .clone()
+            .into_values()
+            .filter(|member| {
+                member.id.server == server_id
+                    && !member
+                        .roles
+                        .iter()
+                        .filter(|p| roles.contains(*p))
+                        .collect::<Vec<&String>>()
+                        .is_empty()
+            })
+            .collect();
+
+        return Ok(ChunkedServerMembersGenerator::new_reference(resp));
+    }
+
     /// Fetch all memberships for a user
     async fn fetch_all_memberships<'a>(&self, user_id: &str) -> Result<Vec<Member>> {
         let server_members = self.server_members.lock().await;
diff --git a/crates/core/database/src/models/servers/ops/mongodb.rs b/crates/core/database/src/models/servers/ops/mongodb.rs
index e6bee03f2..958963c9c 100644
--- a/crates/core/database/src/models/servers/ops/mongodb.rs
+++ b/crates/core/database/src/models/servers/ops/mongodb.rs
@@ -25,14 +25,11 @@ impl AbstractServers for MongoDb {
     async fn fetch_servers<'a>(&self, ids: &'a [String]) -> Result<Vec<Server>> {
         Ok(self
             .col::<Server>(COL)
-            .find(
-                doc! {
-                    "_id": {
-                        "$in": ids
-                    }
-                },
-                None,
-            )
+            .find(doc! {
+                "_id": {
+                    "$in": ids
+                }
+            })
             .await
             .map_err(|_| create_database_error!("find", "servers"))?
             .filter_map(|s| async {
@@ -84,7 +81,6 @@ impl AbstractServers for MongoDb {
                             .map_err(|_| create_database_error!("to_document", "role"))?
                     }
                 },
-                None,
             )
             .await
             .map(|_| ())
@@ -125,7 +121,6 @@ impl AbstractServers for MongoDb {
                         "roles": &role_id
                     }
                 },
-                None,
             )
             .await
             .map_err(|_| create_database_error!("update_many", "server_members"))?;
@@ -140,7 +135,6 @@ impl AbstractServers for MongoDb {
                         "role_permissions.".to_owned() + role_id: 1_i32
                     }
                 },
-                None,
             )
             .await
             .map_err(|_| create_database_error!("update_one", "channels"))?;
@@ -155,7 +149,6 @@ impl AbstractServers for MongoDb {
                         "roles.".to_owned() + role_id: 1_i32
                     }
                 },
-                None,
             )
             .await
             .map(|_| ())
@@ -188,12 +181,9 @@ impl MongoDb {
         // Find all channels
         let channels: Vec<String> = self
             .col::<Document>("channels")
-            .find(
-                doc! {
-                    "server": server_id
-                },
-                None,
-            )
+            .find(doc! {
+                "server": server_id
+            })
             .await
             .map_err(|_| create_database_error!("find", "channels"))?
             .filter_map(|s| async {
@@ -225,19 +215,15 @@ impl MongoDb {
                         }
                     }
                 },
-                None,
             )
             .await
             .map_err(|_| create_database_error!("update_many", "emojis"))?;
 
         // Delete all channels.
         self.col::<Document>("channels")
-            .delete_many(
-                doc! {
-                    "server": &server_id
-                },
-                None,
-            )
+            .delete_many(doc! {
+                "server": &server_id
+            })
             .await
             .map_err(|_| create_database_error!("delete_many", "channels"))?;
 
@@ -248,12 +234,9 @@ impl MongoDb {
         // Delete members and bans.
         for with in &["server_members", "server_bans"] {
             self.col::<Document>(with)
-                .delete_many(
-                    doc! {
-                        "_id.server": &server_id
-                    },
-                    None,
-                )
+                .delete_many(doc! {
+                    "_id.server": &server_id
+                })
                 .await
                 .map_err(|_| create_database_error!("delete_many", with))?;
         }
diff --git a/crates/core/database/src/models/user_settings/ops/mongodb.rs b/crates/core/database/src/models/user_settings/ops/mongodb.rs
index 5de988322..cf5bd7622 100644
--- a/crates/core/database/src/models/user_settings/ops/mongodb.rs
+++ b/crates/core/database/src/models/user_settings/ops/mongodb.rs
@@ -53,8 +53,8 @@ impl AbstractUserSettings for MongoDb {
                 doc! {
                     "$set": set
                 },
-                UpdateOptions::builder().upsert(true).build(),
             )
+            .with_options(UpdateOptions::builder().upsert(true).build())
             .await
             .map(|_| ())
             .map_err(|_| create_database_error!("update_one", "user_settings"))
diff --git a/crates/core/database/src/models/users/ops/mongodb.rs b/crates/core/database/src/models/users/ops/mongodb.rs
index ae61b0297..000034c52 100644
--- a/crates/core/database/src/models/users/ops/mongodb.rs
+++ b/crates/core/database/src/models/users/ops/mongodb.rs
@@ -49,12 +49,9 @@ impl AbstractUsers for MongoDb {
     /// 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
-                },
-                None,
-            )
+            .find_one(doc! {
+                "token": token
+            })
             .await
             .map_err(|_| create_database_error!("find_one", "sessions"))?
             .ok_or_else(|| create_error!(InvalidSession))
@@ -64,14 +61,11 @@ impl AbstractUsers for MongoDb {
     async fn fetch_users<'a>(&self, ids: &'a [String]) -> Result<Vec<User>> {
         Ok(self
             .col::<User>(COL)
-            .find(
-                doc! {
-                    "_id": {
-                        "$in": ids
-                    }
-                },
-                None,
-            )
+            .find(doc! {
+                "_id": {
+                    "$in": ids
+                }
+            })
             .await
             .map_err(|_| create_database_error!("find", COL))?
             .filter_map(|s| async {
@@ -94,10 +88,10 @@ impl AbstractUsers for MongoDb {
 
         Ok(self
             .col::<UserDocument>(COL)
-            .find(
-                doc! {
-                    "username": username
-                },
+            .find(doc! {
+                "username": username
+            })
+            .with_options(
                 FindOptions::builder()
                     .collation(
                         Collation::builder()
@@ -122,15 +116,13 @@ impl AbstractUsers for MongoDb {
     async fn fetch_mutual_user_ids(&self, user_a: &str, user_b: &str) -> Result<Vec<String>> {
         Ok(self
             .col::<DocumentId>(COL)
-            .find(
-                doc! {
-                    "$and": [
-                        { "relations": { "$elemMatch": { "_id": &user_a, "status": "Friend" } } },
-                        { "relations": { "$elemMatch": { "_id": &user_b, "status": "Friend" } } }
-                    ]
-                },
-                FindOptions::builder().projection(doc! { "_id": 1 }).build(),
-            )
+            .find(doc! {
+                "$and": [
+                    { "relations": { "$elemMatch": { "_id": &user_a, "status": "Friend" } } },
+                    { "relations": { "$elemMatch": { "_id": &user_b, "status": "Friend" } } }
+                ]
+            })
+            .with_options(FindOptions::builder().projection(doc! { "_id": 1 }).build())
             .await
             .map_err(|_| create_database_error!("find", COL))?
             .filter_map(|s| async { s.ok() })
@@ -143,17 +135,15 @@ impl AbstractUsers for MongoDb {
     async fn fetch_mutual_channel_ids(&self, user_a: &str, user_b: &str) -> Result<Vec<String>> {
         Ok(self
             .col::<DocumentId>("channels")
-            .find(
-                doc! {
-                    "channel_type": {
-                        "$in": ["Group", "DirectMessage"]
-                    },
-                    "recipients": {
-                        "$all": [ user_a, user_b ]
-                    }
+            .find(doc! {
+                "channel_type": {
+                    "$in": ["Group", "DirectMessage"]
                 },
-                FindOptions::builder().projection(doc! { "_id": 1 }).build(),
-            )
+                "recipients": {
+                    "$all": [ user_a, user_b ]
+                }
+            })
+            .with_options(FindOptions::builder().projection(doc! { "_id": 1 }).build())
             .await
             .map_err(|_| create_database_error!("find", "channels"))?
             .filter_map(|s| async { s.ok() })
@@ -166,49 +156,46 @@ impl AbstractUsers for MongoDb {
     async fn fetch_mutual_server_ids(&self, user_a: &str, user_b: &str) -> Result<Vec<String>> {
         Ok(self
             .col::<DocumentId>("server_members")
-            .aggregate(
-                vec![
-                    doc! {
-                        "$match": {
-                            "_id.user": user_a
-                        }
-                    },
-                    doc! {
-                        "$lookup": {
-                            "from": "server_members",
-                            "as": "members",
-                            "let": {
-                                "server": "$_id.server"
-                            },
-                            "pipeline": [
-                                {
-                                    "$match": {
-                                        "$expr": {
-                                            "$and": [
-                                                { "$eq": [ "$_id.user", user_b ] },
-                                                { "$eq": [ "$_id.server", "$$server" ] }
-                                            ]
-                                        }
+            .aggregate(vec![
+                doc! {
+                    "$match": {
+                        "_id.user": user_a
+                    }
+                },
+                doc! {
+                    "$lookup": {
+                        "from": "server_members",
+                        "as": "members",
+                        "let": {
+                            "server": "$_id.server"
+                        },
+                        "pipeline": [
+                            {
+                                "$match": {
+                                    "$expr": {
+                                        "$and": [
+                                            { "$eq": [ "$_id.user", user_b ] },
+                                            { "$eq": [ "$_id.server", "$$server" ] }
+                                        ]
                                     }
                                 }
-                            ]
-                        }
-                    },
-                    doc! {
-                        "$match": {
-                            "members": {
-                                "$size": 1_i32
                             }
+                        ]
+                    }
+                },
+                doc! {
+                    "$match": {
+                        "members": {
+                            "$size": 1_i32
                         }
-                    },
-                    doc! {
-                        "$project": {
-                            "_id": "$_id.server"
-                        }
-                    },
-                ],
-                None,
-            )
+                    }
+                },
+                doc! {
+                    "$project": {
+                        "_id": "$_id.server"
+                    }
+                },
+            ])
             .await
             .map_err(|_| create_database_error!("aggregate", "server_members"))?
             .filter_map(|s| async { s.ok() })
@@ -284,7 +271,6 @@ impl AbstractUsers for MongoDb {
                         }
                     }
                 }],
-                None,
             )
             .await
             .map(|_| ())
@@ -305,7 +291,6 @@ impl AbstractUsers for MongoDb {
                         }
                     }
                 },
-                None,
             )
             .await
             .map(|_| ())
@@ -329,7 +314,6 @@ impl AbstractUsers for MongoDb {
                         "subscription": 1
                     }
                 },
-                None,
             )
             .await
             .map(|_| ())
diff --git a/crates/core/database/src/tasks/ack.rs b/crates/core/database/src/tasks/ack.rs
index 89971f661..1d2aff387 100644
--- a/crates/core/database/src/tasks/ack.rs
+++ b/crates/core/database/src/tasks/ack.rs
@@ -14,6 +14,7 @@ use validator::HasLen;
 use revolt_result::Result;
 
 use super::DelayedTask;
+use crate::Channel::{TextChannel, VoiceChannel};
 
 /// Enumeration of possible events
 #[derive(Debug, Eq, PartialEq)]
@@ -120,17 +121,22 @@ pub async fn handle_ack_event(
             );
 
             // find all the users we'll be notifying
-            messages
-                .iter()
-                .for_each(|(_, _, recipents, _)| users.extend(recipents.iter()));
+            messages.iter().for_each(|(_, _, recipents, _)| {
+                users.extend(recipents.iter());
+            });
 
             debug!("Found {} users to notify.", users.len());
 
             for user in users {
                 let message_ids: Vec<String> = messages
                     .iter()
-                    .filter(|(_, _, recipients, _)| recipients.contains(user))
-                    .map(|(_, message, _, _)| message.id.clone())
+                    .filter_map(|(_, message, recipients, _)| {
+                        if recipients.contains(user) {
+                            Some(message.id.clone())
+                        } else {
+                            None
+                        }
+                    })
                     .collect();
 
                 if !message_ids.is_empty() {
@@ -140,13 +146,18 @@ pub async fn handle_ack_event(
                 debug!("Added {} mentions for user {}", message_ids.len(), &user);
             }
 
-            for (push, _, recipients, silenced) in messages {
-                if *silenced || recipients.is_empty() || push.is_none() {
+            let mut mass_mentions = vec![];
+
+            for (push, message, recipients, silenced) in messages {
+                if *silenced
+                    || push.is_none()
+                    || (recipients.is_empty() && !message.contains_mass_push_mention())
+                {
                     debug!(
                         "Rejecting push: silenced: {}, recipient count: {}, push exists: {:?}",
                         *silenced,
                         recipients.length(),
-                        push
+                        push.is_some()
                     );
                     continue;
                 }
@@ -162,6 +173,35 @@ pub async fn handle_ack_event(
                 {
                     revolt_config::capture_error(&err);
                 }
+
+                if message.contains_mass_push_mention() {
+                    mass_mentions.push(push.clone().unwrap());
+                }
+            }
+
+            if !mass_mentions.is_empty() {
+                debug!(
+                    "Sending mass mention push event to AMQP; channel {}",
+                    &mass_mentions[0].message.channel
+                );
+
+                let channel = db
+                    .fetch_channel(&mass_mentions[0].message.channel)
+                    .await
+                    .expect("Failed to fetch channel from db");
+
+                match channel {
+                    TextChannel { server, .. } | VoiceChannel { server, .. } => {
+                        if let Err(err) =
+                            amqp.mass_mention_message_sent(server, mass_mentions).await
+                        {
+                            revolt_config::capture_error(&err);
+                        }
+                    }
+                    _ => {
+                        panic!("Unknown channel type when sending mass mention event");
+                    }
+                }
             }
         }
     };
@@ -192,7 +232,7 @@ pub async fn worker(db: Database, amqp: AMQP) {
                     revolt_config::capture_error(&err);
                     error!("{err:?} for {event:?}. ({user:?}, {channel})");
                 } else {
-                    info!("User {user:?} ack in {channel} with {event:?}");
+                    debug!("User {user:?} ack in {channel} with {event:?}");
                 }
             }
         }
@@ -224,6 +264,12 @@ pub async fn worker(db: Database, amqp: AMQP) {
                             // add the new message to the list of messages to be processed.
                             existing.append(new_data);
 
+                            // if the message contains a mass mention, do not delay it any further.
+                            if new_data[0].1.contains_mass_push_mention() {
+                                task.run_immediately();
+                                continue;
+                            }
+
                             // put a cap on the amount of messages that can be queued, for particularly active channels
                             if (existing.length() as u16)
                                 < revolt_config::config()
diff --git a/crates/core/database/src/tasks/mod.rs b/crates/core/database/src/tasks/mod.rs
index 81bfd4e1f..111d51068 100644
--- a/crates/core/database/src/tasks/mod.rs
+++ b/crates/core/database/src/tasks/mod.rs
@@ -26,6 +26,7 @@ pub fn start_workers(db: Database, amqp: AMQP) {
 /// Task with additional information on when it should run
 pub struct DelayedTask<T> {
     pub data: T,
+    run_now: bool,
     last_updated: Instant,
     first_seen: Instant,
 }
@@ -41,6 +42,7 @@ impl<T> DelayedTask<T> {
     pub fn new(data: T) -> Self {
         DelayedTask {
             data,
+            run_now: false,
             last_updated: Instant::now(),
             first_seen: Instant::now(),
         }
@@ -51,9 +53,15 @@ impl<T> DelayedTask<T> {
         self.last_updated = Instant::now()
     }
 
+    /// Flag the task to run right away, regardless of the time
+    pub fn run_immediately(&mut self) {
+        self.run_now = true
+    }
+
     /// Check if a task should run yet
     pub fn should_run(&self) -> bool {
-        self.first_seen.elapsed().as_secs() > EXPIRE_CONSTANT
+        self.run_now
+            || self.first_seen.elapsed().as_secs() > EXPIRE_CONSTANT
             || self.last_updated.elapsed().as_secs() > SAVE_CONSTANT
     }
 }
diff --git a/crates/core/database/src/util/bridge/v0.rs b/crates/core/database/src/util/bridge/v0.rs
index 3673411ec..250bbbd7e 100644
--- a/crates/core/database/src/util/bridge/v0.rs
+++ b/crates/core/database/src/util/bridge/v0.rs
@@ -491,6 +491,7 @@ impl crate::Message {
             edited: self.edited,
             embeds: self.embeds,
             mentions: self.mentions,
+            role_mentions: self.role_mentions,
             replies: self.replies,
             reactions: self.reactions,
             interactions: self.interactions.into(),
@@ -519,6 +520,7 @@ impl From<crate::PartialMessage> for PartialMessage {
             edited: value.edited,
             embeds: value.embeds,
             mentions: value.mentions,
+            role_mentions: value.role_mentions,
             replies: value.replies,
             reactions: value.reactions,
             interactions: value.interactions.map(Into::into),
diff --git a/crates/core/database/src/util/bulk_permissions.rs b/crates/core/database/src/util/bulk_permissions.rs
index e45269ca5..402607451 100644
--- a/crates/core/database/src/util/bulk_permissions.rs
+++ b/crates/core/database/src/util/bulk_permissions.rs
@@ -94,9 +94,28 @@ impl<'z> BulkDatabasePermissionQuery<'z> {
         }
     }
 
+    pub async fn from_channel_id(self, channel_id: String) -> BulkDatabasePermissionQuery<'z> {
+        let channel = self
+            .database
+            .fetch_channel(channel_id.as_str())
+            .await
+            .expect("Valid channel id");
+
+        drop(channel_id);
+
+        BulkDatabasePermissionQuery {
+            channel: Some(channel),
+            ..self
+        }
+    }
+
     pub fn members(self, members: &'z [Member]) -> BulkDatabasePermissionQuery {
         BulkDatabasePermissionQuery {
             members: Some(members.to_owned()),
+            cached_member_perms: None,
+            users: None,
+            cached_members: None,
+            cached_users: None,
             ..self
         }
     }
@@ -104,6 +123,10 @@ impl<'z> BulkDatabasePermissionQuery<'z> {
     pub fn users(self, users: &'z [User]) -> BulkDatabasePermissionQuery {
         BulkDatabasePermissionQuery {
             users: Some(users.to_owned()),
+            cached_member_perms: None,
+            members: None,
+            cached_members: None,
+            cached_users: None,
             ..self
         }
     }
diff --git a/crates/core/models/Cargo.toml b/crates/core/models/Cargo.toml
index b3bbd4093..1d4c5db04 100644
--- a/crates/core/models/Cargo.toml
+++ b/crates/core/models/Cargo.toml
@@ -24,9 +24,11 @@ revolt-config = { version = "0.8.4", path = "../config" }
 revolt-permissions = { version = "0.8.4", path = "../permissions" }
 
 # Utility
-regex = "1"
+regex = "1.11"
+fancy-regex = "0.14"
 indexmap = "1.9.3"
 once_cell = "1.17.1"
+num_enum = "0.6.1"
 
 # Rocket
 rocket = { optional = true, version = "0.5.0-rc.2", default-features = false }
diff --git a/crates/core/models/src/v0/messages.rs b/crates/core/models/src/v0/messages.rs
index 2897b4473..ebef99d9b 100644
--- a/crates/core/models/src/v0/messages.rs
+++ b/crates/core/models/src/v0/messages.rs
@@ -1,8 +1,8 @@
 use std::time::SystemTime;
 
+use fancy_regex::Regex;
 use indexmap::{IndexMap, IndexSet};
 use once_cell::sync::Lazy;
-use regex::Regex;
 use revolt_config::config;
 
 #[cfg(feature = "validator")]
@@ -18,6 +18,12 @@ use super::{Channel, Embed, File, Member, MessageWebhook, User, Webhook, RE_COLO
 pub static RE_MENTION: Lazy<Regex> =
     Lazy::new(|| Regex::new(r"<@([0-9A-HJKMNP-TV-Z]{26})>").unwrap());
 
+pub static RE_ROLE_MENTION: Lazy<Regex> =
+    Lazy::new(|| Regex::new(r"<%([0-9A-HJKMNP-TV-Z]{26})>|@online|@everyone").unwrap());
+
+pub static RE_BLOCKS: Lazy<Regex> =
+    Lazy::new(|| Regex::new(r"(?s)(?<!\\)(?:(```.+?(?<!\\)```)|`[^`\n\r]+?(?<!\\)`)").unwrap());
+
 auto_derived_partial!(
     /// Message
     pub struct Message {
@@ -58,6 +64,8 @@ auto_derived_partial!(
         /// Array of user ids mentioned in this message
         #[serde(skip_serializing_if = "Option::is_none")]
         pub mentions: Option<Vec<String>>,
+        /// Array of role ids mentioned in this message
+        pub role_mentions: Option<Vec<String>>,
         /// Array of message ids this message is replying to
         #[serde(skip_serializing_if = "Option::is_none")]
         pub replies: Option<Vec<String>>,
@@ -373,6 +381,11 @@ auto_derived!(
     pub enum MessageFlags {
         /// Message will not send push / desktop notifications
         SuppressNotifications = 1,
+        /// Message will mention all users who can see the channel
+        MentionsEveryone = 2,
+        /// Message will mention all users who are online and can see the channel.
+        /// This cannot be true if MentionsEveryone is true
+        MentionsOnline = 3,
     }
 
     /// Optional fields on message
diff --git a/crates/core/permissions/src/models/channel.rs b/crates/core/permissions/src/models/channel.rs
index 252fb35a4..9e9160263 100644
--- a/crates/core/permissions/src/models/channel.rs
+++ b/crates/core/permissions/src/models/channel.rs
@@ -92,8 +92,14 @@ pub enum ChannelPermission {
     /// Listen to other users
     Listen = 1 << 36,
 
+    // * Channel permissions two electric boogaloo
+    /// Mention everyone and online members
+    MentionEveryone = 1 << 37,
+    /// Mention roles
+    MentionRoles = 1 << 38,
+
     // * Misc. permissions
-    // % Bits 36 to 52: free area
+    // % Bits 38 to 52: free area
     // % Bits 53 to 64: do not use
 
     // * Grant all permissions
diff --git a/crates/core/result/src/axum.rs b/crates/core/result/src/axum.rs
index 68b880832..8750ef5f1 100644
--- a/crates/core/result/src/axum.rs
+++ b/crates/core/result/src/axum.rs
@@ -1,5 +1,4 @@
 use axum::{http::StatusCode, response::IntoResponse, Json};
-use rocket::http::Status;
 
 use crate::{Error, ErrorType};
 
@@ -52,6 +51,7 @@ impl IntoResponse for Error {
 
             ErrorType::ReachedMaximumBots => StatusCode::BAD_REQUEST,
             ErrorType::IsBot => StatusCode::BAD_REQUEST,
+            ErrorType::IsNotBot => StatusCode::BAD_REQUEST,
             ErrorType::BotIsPrivate => StatusCode::FORBIDDEN,
 
             ErrorType::CannotReportYourself => StatusCode::BAD_REQUEST,
@@ -80,6 +80,9 @@ impl IntoResponse for Error {
             ErrorType::NotAVoiceChannel => StatusCode::BAD_REQUEST,
             ErrorType::AlreadyConnected => StatusCode::BAD_REQUEST,
             ErrorType::UnknownNode => StatusCode::BAD_REQUEST,
+            ErrorType::InvalidFlagValue => StatusCode::BAD_REQUEST,
+            ErrorType::FeatureDisabled { .. } => StatusCode::BAD_REQUEST,
+
             ErrorType::ProxyError => StatusCode::BAD_REQUEST,
             ErrorType::FileTooSmall => StatusCode::UNPROCESSABLE_ENTITY,
             ErrorType::FileTooLarge { .. } => StatusCode::UNPROCESSABLE_ENTITY,
diff --git a/crates/core/result/src/lib.rs b/crates/core/result/src/lib.rs
index 2a3022557..9fcfcd284 100644
--- a/crates/core/result/src/lib.rs
+++ b/crates/core/result/src/lib.rs
@@ -122,6 +122,7 @@ pub enum ErrorType {
     // ? Bot related errors
     ReachedMaximumBots,
     IsBot,
+    IsNotBot,
     BotIsPrivate,
 
     // ? User safety related errors
@@ -149,6 +150,7 @@ pub enum ErrorType {
     InvalidCredentials,
     InvalidProperty,
     InvalidSession,
+    InvalidFlagValue,
     NotAuthenticated,
     DuplicateNonce,
     NotFound,
@@ -175,6 +177,11 @@ pub enum ErrorType {
 
     // ? Legacy errors
     VosoUnavailable,
+
+    // ? Feature flag disabled in the config
+    FeatureDisabled {
+        feature: String,
+    },
 }
 
 #[macro_export]
diff --git a/crates/core/result/src/rocket.rs b/crates/core/result/src/rocket.rs
index 6e5b55784..6e95ec241 100644
--- a/crates/core/result/src/rocket.rs
+++ b/crates/core/result/src/rocket.rs
@@ -42,6 +42,7 @@ impl<'r> Responder<'r, 'static> for Error {
             ErrorType::NotInGroup => Status::NotFound,
             ErrorType::AlreadyPinned => Status::BadRequest,
             ErrorType::NotPinned => Status::BadRequest,
+            ErrorType::InvalidFlagValue => Status::BadRequest,
 
             ErrorType::UnknownServer => Status::NotFound,
             ErrorType::InvalidRole => Status::NotFound,
@@ -57,6 +58,7 @@ impl<'r> Responder<'r, 'static> for Error {
 
             ErrorType::ReachedMaximumBots => Status::BadRequest,
             ErrorType::IsBot => Status::BadRequest,
+            ErrorType::IsNotBot => Status::BadRequest,
             ErrorType::BotIsPrivate => Status::Forbidden,
 
             ErrorType::CannotReportYourself => Status::BadRequest,
@@ -84,6 +86,8 @@ impl<'r> Responder<'r, 'static> for Error {
             ErrorType::AlreadyConnected => Status::BadRequest,
             ErrorType::NotConnected => Status::BadRequest,
             ErrorType::UnknownNode => Status::BadRequest,
+            ErrorType::FeatureDisabled { .. } => Status::BadRequest,
+
             ErrorType::ProxyError => Status::BadRequest,
             ErrorType::FileTooSmall => Status::UnprocessableEntity,
             ErrorType::FileTooLarge { .. } => Status::UnprocessableEntity,
diff --git a/crates/daemons/pushd/Cargo.toml b/crates/daemons/pushd/Cargo.toml
index dad79cf3d..441fa87f8 100644
--- a/crates/daemons/pushd/Cargo.toml
+++ b/crates/daemons/pushd/Cargo.toml
@@ -10,6 +10,9 @@ revolt-database = { version = "0.8.4", path = "../../core/database" }
 revolt-models = { version = "0.8.4", path = "../../core/models", features = [
     "validator",
 ] }
+revolt-presence = { version = "0.8.1", path = "../../core/presence", features = [
+    "redis-is-patched",
+] }
 
 amqprs = { version = "1.7.0" }
 fcm_v1 = "0.3.0"
@@ -20,9 +23,10 @@ tokio = "1.39.2"
 async-trait = "0.1.81"
 ulid = "1.0.0"
 
-authifier = "1.0.8"
+authifier = "1.0.10"
 
 log = "0.4.11"
+pretty_env_logger = "0.4.0"
 
 #serialization
 serde_json = "1"
diff --git a/crates/daemons/pushd/Pushd Flowchart.graffle b/crates/daemons/pushd/Pushd Flowchart.graffle
index 961d5ff61319007beb4e3d9008c648c11425f422..d15942df129b6560f014c7308ee479f31cbba40e 100644
GIT binary patch
literal 52601
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

literal 45755
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

diff --git a/crates/daemons/pushd/src/consumers/inbound/ack.rs b/crates/daemons/pushd/src/consumers/inbound/ack.rs
index b9fe08861..77dd5d444 100644
--- a/crates/daemons/pushd/src/consumers/inbound/ack.rs
+++ b/crates/daemons/pushd/src/consumers/inbound/ack.rs
@@ -71,8 +71,14 @@ impl AsyncConsumer for AckConsumer {
         #[allow(clippy::disallowed_methods)]
         let unreads = self.db.fetch_unread_mentions(&payload.user_id).await;
 
+        debug!("Processing unreads for {:}", &payload.user_id);
+
         if let Ok(u) = &unreads {
             if u.is_empty() {
+                debug!(
+                    "Discarding unread task (no mentions found) for {:}",
+                    &payload.user_id
+                );
                 return;
             }
         } else {
@@ -95,6 +101,10 @@ impl AsyncConsumer for AckConsumer {
                 .collect();
 
             if apple_sessions.is_empty() {
+                debug!(
+                    "Discarding unread task (no apn sessions found) for {:}",
+                    &payload.user_id
+                );
                 return;
             }
 
diff --git a/crates/daemons/pushd/src/consumers/inbound/mass_mention.rs b/crates/daemons/pushd/src/consumers/inbound/mass_mention.rs
new file mode 100644
index 000000000..a44dcb1e1
--- /dev/null
+++ b/crates/daemons/pushd/src/consumers/inbound/mass_mention.rs
@@ -0,0 +1,275 @@
+use std::{
+    collections::{HashMap, HashSet},
+    hash::RandomState,
+};
+
+use crate::consumers::inbound::internal::*;
+use amqprs::{
+    channel::{BasicPublishArguments, Channel},
+    connection::Connection,
+    consumer::AsyncConsumer,
+    BasicProperties, Deliver,
+};
+use async_trait::async_trait;
+use revolt_database::{
+    events::rabbit::*, util::bulk_permissions::BulkDatabasePermissionQuery, Database, Member,
+    MessageFlagsValue,
+};
+use revolt_models::v0::{MessageFlags, PushNotification};
+
+pub struct MassMessageConsumer {
+    #[allow(dead_code)]
+    db: Database,
+    authifier_db: authifier::Database,
+    conn: Option<Connection>,
+    channel: Option<Channel>,
+}
+
+impl Channeled for MassMessageConsumer {
+    fn get_connection(&self) -> Option<&Connection> {
+        if self.conn.is_none() {
+            None
+        } else {
+            Some(self.conn.as_ref().unwrap())
+        }
+    }
+
+    fn get_channel(&self) -> Option<&Channel> {
+        if self.channel.is_none() {
+            None
+        } else {
+            Some(self.channel.as_ref().unwrap())
+        }
+    }
+
+    fn set_connection(&mut self, conn: Connection) {
+        self.conn = Some(conn);
+    }
+
+    fn set_channel(&mut self, channel: Channel) {
+        self.channel = Some(channel)
+    }
+}
+
+impl MassMessageConsumer {
+    pub fn new(db: Database, authifier_db: authifier::Database) -> MassMessageConsumer {
+        MassMessageConsumer {
+            db,
+            authifier_db,
+            conn: None,
+            channel: None,
+        }
+    }
+
+    async fn fire_notification_for_users(&mut self, push: &PushNotification, users: &[String]) {
+        if let Ok(sessions) = self
+            .authifier_db
+            .find_sessions_with_subscription(users)
+            .await
+        {
+            let config = revolt_config::config().await;
+            for session in sessions {
+                if let Some(sub) = session.subscription {
+                    let mut sendable = PayloadToService {
+                        notification: PayloadKind::MessageNotification(push.clone()),
+                        token: sub.auth,
+                        user_id: session.user_id,
+                        session_id: session.id,
+                        extras: HashMap::new(),
+                    };
+
+                    let args: BasicPublishArguments;
+
+                    if sub.endpoint == "apn" {
+                        args = BasicPublishArguments::new(
+                            config.pushd.exchange.as_str(),
+                            config.pushd.apn.queue.as_str(),
+                        )
+                        .finish();
+                    } else if sub.endpoint == "fcm" {
+                        args = BasicPublishArguments::new(
+                            config.pushd.exchange.as_str(),
+                            config.pushd.fcm.queue.as_str(),
+                        )
+                        .finish();
+                    } else {
+                        // web push (vapid)
+                        args = BasicPublishArguments::new(
+                            config.pushd.exchange.as_str(),
+                            config.pushd.vapid.queue.as_str(),
+                        )
+                        .finish();
+                        sendable.extras.insert("p265dh".to_string(), sub.p256dh);
+                        sendable
+                            .extras
+                            .insert("endpoint".to_string(), sub.endpoint.clone());
+                    }
+
+                    let payload = serde_json::to_string(&sendable).unwrap();
+
+                    publish_message(self, payload.into(), args).await;
+                }
+            }
+        }
+    }
+}
+
+#[allow(unused_variables)]
+#[async_trait]
+impl AsyncConsumer for MassMessageConsumer {
+    /// This consumer handles adding mentions for all the users affected by a mass mention ping, and then sends out push notifications
+    async fn consume(
+        &mut self,
+        channel: &Channel,
+        deliver: Deliver,
+        basic_properties: BasicProperties,
+        content: Vec<u8>,
+    ) {
+        let config = revolt_config::config().await;
+        let content = String::from_utf8(content).unwrap();
+        let payload: MassMessageSentPayload = serde_json::from_str(content.as_str()).unwrap();
+
+        debug!("Received mass message event");
+
+        // We should only ever receive clumped messages from a single channel, so it's safe to reuse this many times.
+        let mut query: Option<BulkDatabasePermissionQuery<'_>> = None;
+        let query_db = self.db.clone();
+
+        for push in payload.notifications {
+            if query.is_none() {
+                query = Some(
+                    BulkDatabasePermissionQuery::from_server_id(&query_db, &payload.server_id)
+                        .await
+                        .from_channel_id(push.channel.id().to_string()) // wrong channel model, so fetch the right one
+                        .await,
+                );
+            }
+
+            let existing_mentions: HashSet<String, RandomState> =
+                if let Some(ref mentions) = push.message.mentions {
+                    HashSet::from_iter(mentions.iter().cloned())
+                } else {
+                    HashSet::new()
+                };
+
+            // KNOWN QUIRK: if you mention @online and role(s), the offline members with the role(s) wont get pinged
+            if let Some(ref query) = query {
+                let flags = MessageFlagsValue(push.message.flags);
+                if flags.has(MessageFlags::MentionsEveryone) {
+                    let mut db_query = self
+                        .db
+                        .fetch_all_members_chunked(&payload.server_id)
+                        .await
+                        .expect("Failed to fetch members from database");
+
+                    let mut exhausted = false;
+                    let ack_chnl = vec![push.channel.id().to_string()];
+                    loop {
+                        let mut chunk: Vec<Member> = vec![];
+                        for _ in 0..config.pushd.mass_mention_chunk_size {
+                            if let Some(member) = db_query.next().await {
+                                chunk.push(member);
+                            } else {
+                                exhausted = true;
+                                break;
+                            }
+                        }
+
+                        let userids: Vec<String> =
+                            chunk.iter().map(|member| member.id.user.clone()).collect();
+
+                        debug!("Userids in chunk: {:?}", userids);
+
+                        if let Err(err) = self
+                            .db
+                            .add_mention_to_many_unreads(push.channel.id(), &userids, &ack_chnl)
+                            .await
+                        {
+                            revolt_config::capture_error(&err);
+                        }
+
+                        // ignore anyone in this list
+                        let online_users = revolt_presence::filter_online(&userids).await;
+                        let target_users: Vec<String> = userids
+                            .iter()
+                            .filter(|id| {
+                                !online_users.contains(*id) && !existing_mentions.contains(*id)
+                            })
+                            .cloned()
+                            .collect();
+
+                        debug!(
+                            "Userids after filter: {:?} (online: {:?}",
+                            target_users, online_users
+                        );
+
+                        self.fire_notification_for_users(&push, &target_users).await;
+
+                        if exhausted {
+                            break;
+                        }
+                    }
+                } else if let Some(roles) = &push.message.role_mentions {
+                    // role mentions
+                    let _role_members = self
+                        .db
+                        .fetch_all_members_with_roles_chunked(&payload.server_id, roles)
+                        .await;
+
+                    debug!("role members: {:?}", _role_members);
+
+                    if _role_members.is_err() {
+                        revolt_config::capture_error(&_role_members.err().unwrap());
+                        return;
+                    }
+
+                    let mut role_members = _role_members.unwrap();
+                    let mut chunk = vec![];
+                    let mut exhausted = false;
+
+                    while !exhausted {
+                        chunk.clear();
+
+                        for _ in 0..config.pushd.mass_mention_chunk_size {
+                            if let Some(member) = role_members.next().await {
+                                chunk.push(member);
+                            } else {
+                                exhausted = true;
+                                break;
+                            }
+                        }
+
+                        let mut q = query.clone().members(&chunk);
+                        let viewing_members: Vec<String> = q
+                            .members_can_see_channel()
+                            .await
+                            .iter()
+                            .filter_map(|(uid, viewable)| {
+                                if *viewable && !existing_mentions.contains(uid) {
+                                    Some(uid.clone())
+                                } else {
+                                    None
+                                }
+                            })
+                            .collect();
+
+                        debug!("viewing members: {:?}", viewing_members);
+
+                        let online = revolt_presence::filter_online(&viewing_members).await;
+                        debug!("online: {:?}", online);
+
+                        let targets: Vec<String> = viewing_members
+                            .iter()
+                            .filter(|m| !online.contains(*m))
+                            .cloned()
+                            .collect();
+
+                        debug!("targets: {:?}", targets);
+
+                        self.fire_notification_for_users(&push, &targets).await;
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/crates/daemons/pushd/src/consumers/inbound/mod.rs b/crates/daemons/pushd/src/consumers/inbound/mod.rs
index a340143d7..9c3593367 100644
--- a/crates/daemons/pushd/src/consumers/inbound/mod.rs
+++ b/crates/daemons/pushd/src/consumers/inbound/mod.rs
@@ -3,4 +3,5 @@ pub mod fr_accepted;
 pub mod fr_received;
 pub mod generic;
 mod internal;
+pub mod mass_mention;
 pub mod message;
diff --git a/crates/daemons/pushd/src/consumers/outbound/apn.rs b/crates/daemons/pushd/src/consumers/outbound/apn.rs
index c7ac6c875..723826320 100644
--- a/crates/daemons/pushd/src/consumers/outbound/apn.rs
+++ b/crates/daemons/pushd/src/consumers/outbound/apn.rs
@@ -82,7 +82,7 @@ impl ApnsOutboundConsumer {
                 }
             }
 
-            println!("Got badge count for APN: {}", mention_count);
+            debug!("Got badge count for APN: {}", mention_count);
 
             return Some(mention_count);
         }
@@ -189,6 +189,10 @@ impl AsyncConsumer for ApnsOutboundConsumer {
                     data: BTreeMap::new(),
                 };
 
+                debug!(
+                    "Sending friend request received for user: {:}",
+                    &payload.user_id
+                );
                 resp = self.client.send(apn_payload).await;
             }
 
@@ -231,6 +235,10 @@ impl AsyncConsumer for ApnsOutboundConsumer {
                     data: BTreeMap::new(),
                 };
 
+                debug!(
+                    "Sending friend request accept for user: {:}",
+                    &payload.user_id
+                );
                 resp = self.client.send(apn_payload).await;
             }
             PayloadKind::Generic(alert) => {
@@ -260,6 +268,10 @@ impl AsyncConsumer for ApnsOutboundConsumer {
                     data: BTreeMap::new(),
                 };
 
+                debug!(
+                    "Sending generic notification for user: {:}",
+                    &payload.user_id
+                );
                 resp = self.client.send(apn_payload).await;
             }
 
@@ -295,6 +307,10 @@ impl AsyncConsumer for ApnsOutboundConsumer {
                     channel_name: alert.channel.name().unwrap_or(&title),
                 };
 
+                debug!(
+                    "Sending message notification for user: {:}",
+                    &payload.user_id
+                );
                 resp = self.client.send(apn_payload).await;
             }
             PayloadKind::BadgeUpdate(badge) => {
@@ -308,6 +324,7 @@ impl AsyncConsumer for ApnsOutboundConsumer {
                     data: BTreeMap::new(),
                 };
 
+                debug!("Sending badge update for user: {:}", &payload.user_id);
                 resp = self.client.send(apn_payload).await;
             }
         }
@@ -322,6 +339,10 @@ impl AsyncConsumer for ApnsOutboundConsumer {
                         }),
                     ..
                 }) => {
+                    info!(
+                        "Removing APNS subscription id {:} (user: {:}) due to invalid token",
+                        &payload.session_id, &payload.user_id
+                    );
                     if let Err(err) = self
                         .db
                         .remove_push_subscription_by_session_id(&payload.session_id)
diff --git a/crates/daemons/pushd/src/main.rs b/crates/daemons/pushd/src/main.rs
index c63b8d9a1..1560b049a 100644
--- a/crates/daemons/pushd/src/main.rs
+++ b/crates/daemons/pushd/src/main.rs
@@ -1,3 +1,6 @@
+#[macro_use]
+extern crate log;
+
 use amqprs::{
     channel::{
         BasicConsumeArguments, Channel, ExchangeDeclareArguments, QueueBindArguments,
@@ -14,7 +17,7 @@ mod consumers;
 use consumers::{
     inbound::{
         ack::AckConsumer, fr_accepted::FRAcceptedConsumer, fr_received::FRReceivedConsumer,
-        generic::GenericConsumer, message::MessageConsumer,
+        generic::GenericConsumer, mass_mention::MassMessageConsumer, message::MessageConsumer,
     },
     outbound::{apn::ApnsOutboundConsumer, fcm::FcmOutboundConsumer, vapid::VapidOutboundConsumer},
 };
@@ -22,6 +25,7 @@ use consumers::{
 #[tokio::main(flavor = "multi_thread", worker_threads = 2)]
 async fn main() {
     let config = config().await;
+    pretty_env_logger::init();
 
     // Setup database
     let db = revolt_database::DatabaseInfo::Auto.connect().await.unwrap();
@@ -96,6 +100,17 @@ async fn main() {
         .await,
     );
 
+    connections.push(
+        make_queue_and_consume(
+            &config,
+            &config.pushd.mass_mention_queue,
+            config.pushd.get_mass_mention_routing_key().as_str(),
+            None,
+            MassMessageConsumer::new(db.clone(), authifier.clone()),
+        )
+        .await,
+    );
+
     if !config.pushd.apn.pkcs8.is_empty() {
         connections.push(
             make_queue_and_consume(
@@ -223,11 +238,10 @@ where
         .manual_ack(false)
         .finish();
 
-    channel.basic_consume(consumer, args).await.unwrap();
-    log::info!(
-        "Consuming routing key {} as queue {}",
-        routing_key,
-        queue_name
+    let routing_key = channel.basic_consume(consumer, args).await.unwrap();
+    info!(
+        "Consuming routing key {} as queue {}, tag {}",
+        routing_key, queue_name, routing_key
     );
     (channel, connection)
 }
diff --git a/crates/delta/Cargo.toml b/crates/delta/Cargo.toml
index 0dc892574..10e85d9ad 100644
--- a/crates/delta/Cargo.toml
+++ b/crates/delta/Cargo.toml
@@ -55,7 +55,7 @@ lettre = "0.10.0-alpha.4"
 rocket = { version = "0.5.1", default-features = false, features = ["json"] }
 rocket_cors = { git = "https://github.com/lawliet89/rocket_cors", rev = "072d90359b23e9b291df6b672c07c93de9c46011" }
 rocket_empty = { version = "0.1.1", features = ["schema"] }
-rocket_authifier = { version = "1.0.9" }
+rocket_authifier = { version = "1.0.10" }
 rocket_prometheus = "0.10.0-rc.3"
 
 # spec generation
@@ -66,7 +66,7 @@ revolt_rocket_okapi = { version = "0.10.0", features = ["swagger"] }
 amqprs = { version = "1.7.0" }
 
 # core
-authifier = "1.0.9"
+authifier = "1.0.10"
 revolt-config = { path = "../core/config" }
 revolt-database = { path = "../core/database", features = [
     "rocket-impl",
diff --git a/crates/delta/src/routes/channels/message_send.rs b/crates/delta/src/routes/channels/message_send.rs
index 83f7a272e..86d33d796 100644
--- a/crates/delta/src/routes/channels/message_send.rs
+++ b/crates/delta/src/routes/channels/message_send.rs
@@ -117,10 +117,11 @@ mod test {
     use crate::{rocket, util::test::TestHarness};
     use revolt_database::{
         util::{idempotency::IdempotencyKey, reference::Reference},
-        Channel, Member, Message, PartialChannel, PartialMember, Role, Server,
+        Channel, Member, Message, MessageFlagsValue, PartialChannel, PartialMember, Role, Server,
     };
-    use revolt_models::v0::{self, DataCreateServerChannel};
+    use revolt_models::v0::{self, DataCreateServerChannel, MessageFlags};
     use revolt_permissions::{ChannelPermission, OverrideField};
+    use revolt_result::ErrorType;
 
     #[rocket::async_test]
     async fn message_mention_constraints() {
@@ -486,4 +487,193 @@ mod test {
         .await
         .expect_err("Created message with missing reply and none fail");
     }
+
+    #[rocket::async_test]
+    async fn mass_mentions_test() {
+        let harness = TestHarness::new().await;
+        let (_, _, user) = harness.new_user().await;
+        let (_, _, other_user) = harness.new_user().await;
+        let (server, _) = harness.new_server(&user).await;
+        let channel = harness.new_channel(&server).await;
+        let (role_id, mut role) = harness
+            .new_role(
+                &server,
+                1,
+                Some(OverrideField {
+                    a: (ChannelPermission::MentionEveryone as i64)
+                        | (ChannelPermission::MentionRoles as i64),
+                    d: 0,
+                }),
+            )
+            .await;
+        let (mut other_member, _) = Member::create(&harness.db, &server, &other_user, None)
+            .await
+            .expect("Failed to add test member");
+
+        // Send a message with an everyone and role mention.
+        // Should fail
+        let bad_message_with_mentions = Message::create_from_api(
+            &harness.db,
+            Some(&harness.amqp),
+            channel.clone(),
+            v0::DataMessageSend {
+                content: Some(format!("Mentioning @everyone and role <%{}>", &role_id)),
+                nonce: None,
+                attachments: None,
+                replies: None,
+                embeds: None,
+                masquerade: None,
+                interactions: None,
+                flags: None,
+            },
+            v0::MessageAuthor::User(
+                &other_user
+                    .clone()
+                    .into(&harness.db, Some(&other_user))
+                    .await,
+            ),
+            Some(
+                other_user
+                    .clone()
+                    .into(&harness.db, Some(&other_user))
+                    .await,
+            ),
+            Some(other_member.clone().into()),
+            other_user.limits().await,
+            IdempotencyKey::unchecked_from_string("1".to_string()),
+            false,
+            true,
+        )
+        .await
+        .expect_err("Should not have created message with everyone and role pings");
+
+        assert!(
+            matches!(
+                bad_message_with_mentions.error_type,
+                ErrorType::MissingPermission { .. }
+            ),
+            "Intentional permissions error did not return MissingPermission"
+        );
+
+        // Send a mass mention inside a codeblock.
+        // Should be undetected and therefor pass
+        let message_with_codeblock = Message::create_from_api(
+            &harness.db,
+            Some(&harness.amqp),
+            channel.clone(),
+            v0::DataMessageSend {
+                content: Some(format!("Mentioning `@everyone` and role `<%{}>`", &role_id)),
+                nonce: None,
+                attachments: None,
+                replies: None,
+                embeds: None,
+                masquerade: None,
+                interactions: None,
+                flags: None,
+            },
+            v0::MessageAuthor::User(
+                &other_user
+                    .clone()
+                    .into(&harness.db, Some(&other_user))
+                    .await,
+            ),
+            Some(
+                other_user
+                    .clone()
+                    .into(&harness.db, Some(&other_user))
+                    .await,
+            ),
+            Some(other_member.clone().into()),
+            other_user.limits().await,
+            IdempotencyKey::unchecked_from_string("1".to_string()),
+            false,
+            true,
+        )
+        .await
+        .expect("Failed to create message with everyone and role pings in codeblocks");
+
+        assert!(
+            message_with_codeblock.flags.is_none()
+                || !MessageFlagsValue(message_with_codeblock.flags.unwrap())
+                    .has(MessageFlags::MentionsEveryone),
+            "Message flags mentions everyone when inside codeblock",
+        );
+
+        assert!(
+            message_with_codeblock.role_mentions.is_none(),
+            "Role mentions detected when inside codeblock"
+        );
+
+        other_member.roles.push(role_id.clone());
+        harness
+            .db
+            .update_member(
+                &other_member.id,
+                &PartialMember {
+                    avatar: None,
+                    id: None,
+                    joined_at: None,
+                    nickname: None,
+                    roles: Some(vec![role_id.clone()]),
+                    timeout: None,
+                },
+                vec![],
+            )
+            .await
+            .expect("Failed to add role to user");
+
+        // Send a message with an everyone and role mention.
+        // Should succeed
+        let message_with_mentions = Message::create_from_api(
+            &harness.db,
+            Some(&harness.amqp),
+            channel.clone(),
+            v0::DataMessageSend {
+                content: Some(format!("Mentioning @everyone and role <%{}>", &role_id)),
+                nonce: None,
+                attachments: None,
+                replies: None,
+                embeds: None,
+                masquerade: None,
+                interactions: None,
+                flags: None,
+            },
+            v0::MessageAuthor::User(
+                &other_user
+                    .clone()
+                    .into(&harness.db, Some(&other_user))
+                    .await,
+            ),
+            Some(
+                other_user
+                    .clone()
+                    .into(&harness.db, Some(&other_user))
+                    .await,
+            ),
+            Some(other_member.clone().into()),
+            other_user.limits().await,
+            IdempotencyKey::unchecked_from_string("1".to_string()),
+            false,
+            true,
+        )
+        .await
+        .expect("Failed to create message with everyone and role pings");
+
+        assert!(
+            message_with_mentions.flags.is_some(),
+            "Message flags is None",
+        );
+
+        assert!(
+            MessageFlagsValue(message_with_mentions.flags.unwrap())
+                .has(MessageFlags::MentionsEveryone),
+            "Message flags does not mention everyone. Flag value is {}",
+            message_with_mentions.flags.unwrap()
+        );
+
+        assert!(
+            message_with_mentions.role_mentions.is_some(),
+            "Message has no role mentions"
+        );
+    }
 }
diff --git a/crates/delta/src/util/test.rs b/crates/delta/src/util/test.rs
index 88dcdd1a9..88bb6f420 100644
--- a/crates/delta/src/util/test.rs
+++ b/crates/delta/src/util/test.rs
@@ -5,11 +5,12 @@ use authifier::{
 use futures::StreamExt;
 use rand::Rng;
 use redis_kiss::redis::aio::PubSub;
-use revolt_database::util::idempotency::IdempotencyKey;
 use revolt_database::{
     events::client::EventV1, Channel, Database, Member, Message, Server, User, AMQP,
 };
+use revolt_database::{util::idempotency::IdempotencyKey, Role};
 use revolt_models::v0;
+use revolt_permissions::OverrideField;
 use rocket::http::Header;
 use rocket::local::asynchronous::{Client, LocalRequest, LocalResponse};
 
@@ -122,6 +123,28 @@ impl TestHarness {
         .expect("Failed to create test server")
     }
 
+    pub async fn new_role(
+        &self,
+        server: &Server,
+        rank: i64,
+        overrides: Option<OverrideField>,
+    ) -> (String, Role) {
+        let role = Role {
+            name: TestHarness::rand_string(),
+            permissions: overrides.unwrap_or(OverrideField { a: 0, d: 0 }),
+            rank,
+            colour: None,
+            hoist: false,
+        };
+
+        let id = role
+            .create(&self.db, &server.id)
+            .await
+            .expect("Failed to create test role");
+
+        (id, role)
+    }
+
     pub async fn new_channel(&self, server: &Server) -> Channel {
         Channel::create_server_channel(
             &self.db,

From a841df3b36126ebaa3890222754ced5002b47b32 Mon Sep 17 00:00:00 2001
From: Zomatree <me@zomatree.live>
Date: Tue, 22 Apr 2025 16:13:03 +0100
Subject: [PATCH 53/62] fix: show full branch name on github webhook messages

---
 .../routes/webhooks/webhook_execute_github.rs | 33 ++++++++++---------
 1 file changed, 17 insertions(+), 16 deletions(-)

diff --git a/crates/delta/src/routes/webhooks/webhook_execute_github.rs b/crates/delta/src/routes/webhooks/webhook_execute_github.rs
index a5b0d12b9..6d9c8b602 100644
--- a/crates/delta/src/routes/webhooks/webhook_execute_github.rs
+++ b/crates/delta/src/routes/webhooks/webhook_execute_github.rs
@@ -788,9 +788,7 @@ pub async fn webhook_execute_github(
             r#ref,
             ..
         }) => {
-            let Some(branch) = r#ref.split('/').nth(2) else {
-                return Ok(());
-            };
+            let branch = r#ref.split('/').skip(2).collect::<Vec<_>>().join("/");
 
             if forced {
                 let description = format!(
@@ -817,19 +815,22 @@ pub async fn webhook_execute_github(
                     commits.len(),
                     compare
                 );
-                let commit_description = commits
-                    .into_iter()
-                    .map(|commit| {
-                        format!(
-                            "[`{}`]({}) {} - {}",
-                            &commit.id[0..=7],
-                            commit.url,
-                            shorten_text(&commit.message, 50),
-                            commit.author.name
-                        )
-                    })
-                    .collect::<Vec<String>>()
-                    .join("\n");
+                let commit_description = shorten_text(
+                    &commits
+                        .into_iter()
+                        .map(|commit| {
+                            format!(
+                                "[`{}`]({}) {} - {}",
+                                &commit.id[0..=7],
+                                commit.url,
+                                shorten_text(&commit.message, 50),
+                                commit.author.name
+                            )
+                        })
+                        .collect::<Vec<String>>()
+                        .join("\n"),
+                        1000
+                );
 
                 SendableEmbed {
                     title: Some(event.sender.login),

From 02f18705f474dad10b961395cbbc3f3f516632ab Mon Sep 17 00:00:00 2001
From: Zomatree <me@zomatree.live>
Date: Tue, 22 Apr 2025 18:54:26 +0100
Subject: [PATCH 54/62] fix: dont leak invisible presence to others

---
 crates/core/database/src/util/bridge/v0.rs | 34 +++++++++++++++-------
 1 file changed, 23 insertions(+), 11 deletions(-)

diff --git a/crates/core/database/src/util/bridge/v0.rs b/crates/core/database/src/util/bridge/v0.rs
index 250bbbd7e..0d702efd8 100644
--- a/crates/core/database/src/util/bridge/v0.rs
+++ b/crates/core/database/src/util/bridge/v0.rs
@@ -1044,7 +1044,7 @@ impl crate::User {
                     })
                 ),
             status: if can_see_profile {
-                self.status.map(|status| status.into())
+                self.status.and_then(|status| status.into(true))
             } else {
                 None
             },
@@ -1106,7 +1106,7 @@ impl crate::User {
                     })
                 ),
             status: if can_see_profile {
-                self.status.map(|status| status.into())
+                self.status.and_then(|status| status.into(true))
             } else {
                 None
             },
@@ -1119,7 +1119,7 @@ impl crate::User {
     }
 
     /// Convert user object into user model without presence information
-    pub fn into_known_static<'a>(self, is_online: bool) -> User {
+    pub fn into_known_static(self, is_online: bool) -> User {
         User {
             username: self.username,
             discriminator: self.discriminator,
@@ -1135,7 +1135,7 @@ impl crate::User {
                         ..
                     })
                 ),
-            status: self.status.map(|status| status.into()),
+            status: self.status.and_then(|status| status.into(true)),
             flags: self.flags.unwrap_or_default() as u32,
             privileged: self.privileged,
             bot: self.bot.map(|bot| bot.into()),
@@ -1168,7 +1168,7 @@ impl crate::User {
                         ..
                     })
                 ),
-            status: self.status.map(|status| status.into()),
+            status: self.status.and_then(|status| status.into(true)),
             flags: self.flags.unwrap_or_default() as u32,
             privileged: self.privileged,
             bot: self.bot.map(|bot| bot.into()),
@@ -1219,7 +1219,7 @@ impl From<crate::PartialUser> for PartialUser {
                     .collect()
             }),
             badges: value.badges.map(|badges| badges as u32),
-            status: value.status.map(|status| status.into()),
+            status: value.status.and_then(|status| status.into(false)),
             flags: value.flags.map(|flags| flags as u32),
             privileged: value.privileged,
             bot: value.bot.map(|bot| bot.into()),
@@ -1308,11 +1308,23 @@ impl From<Presence> for crate::Presence {
     }
 }
 
-impl From<crate::UserStatus> for UserStatus {
-    fn from(value: crate::UserStatus) -> Self {
-        UserStatus {
-            text: value.text,
-            presence: value.presence.map(|presence| presence.into()),
+impl crate::UserStatus {
+    fn into(self, discard_invisible: bool) -> Option<UserStatus> {
+        let status = UserStatus {
+            text: self.text,
+            presence: self.presence.and_then(|presence| {
+                if discard_invisible && presence == crate::Presence::Invisible {
+                    None
+                } else {
+                    Some(presence.into())
+                }
+            }),
+        };
+
+        if status.text.is_none() && status.presence.is_none() {
+            None
+        } else {
+            Some(status)
         }
     }
 }

From cc9ff9a6322b0b51bafd8c5f0b23e54a069bd8df Mon Sep 17 00:00:00 2001
From: Zomatree <me@zomatree.live>
Date: Tue, 22 Apr 2025 19:44:30 +0100
Subject: [PATCH 55/62] fix: add back missing early adopter badge

---
 crates/bonfire/src/events/impl.rs             | 10 +++----
 crates/core/config/Revolt.toml                |  2 ++
 crates/core/config/src/lib.rs                 |  5 ++++
 .../core/database/src/models/users/model.rs   | 26 +++++++++++++++----
 crates/core/database/src/util/bridge/v0.rs    | 20 +++++++++-----
 .../delta/src/routes/channels/message_send.rs |  2 +-
 6 files changed, 48 insertions(+), 17 deletions(-)

diff --git a/crates/bonfire/src/events/impl.rs b/crates/bonfire/src/events/impl.rs
index 5be05c722..6605d46da 100644
--- a/crates/bonfire/src/events/impl.rs
+++ b/crates/bonfire/src/events/impl.rs
@@ -1,5 +1,6 @@
 use std::collections::HashSet;
 
+use futures::future::join_all;
 use revolt_database::{
     events::client::{EventV1, ReadyPayloadFields},
     util::permissions::DatabasePermissionQuery,
@@ -201,13 +202,12 @@ impl State {
             .collect();
 
         // Make all users appear from our perspective.
-        let mut users: Vec<v0::User> = users
+        let mut users: Vec<v0::User> = join_all(users
             .into_iter()
-            .map(|other_user| {
+            .map(|other_user| async {
                 let is_online = online_ids.contains(&other_user.id);
-                other_user.into_known(&user, is_online)
-            })
-            .collect();
+                other_user.into_known(&user, is_online).await
+            })).await;
 
         // Make sure we see our own user correctly.
         users.push(user.into_self(true).await);
diff --git a/crates/core/config/Revolt.toml b/crates/core/config/Revolt.toml
index 73b2bc9a6..469abe291 100644
--- a/crates/core/config/Revolt.toml
+++ b/crates/core/config/Revolt.toml
@@ -70,6 +70,8 @@ max_concurrent_connections = 50
 
 [api.livekit.nodes]
 
+[api.users]
+
 [pushd]
 # this changes the names of the queues to not overlap 
 # prod/beta if they happen to be on the same exchange/instance.
diff --git a/crates/core/config/src/lib.rs b/crates/core/config/src/lib.rs
index 29174e7d4..b6867de49 100644
--- a/crates/core/config/src/lib.rs
+++ b/crates/core/config/src/lib.rs
@@ -188,6 +188,10 @@ pub struct LiveKitNode {
     pub secret: String
 }
 
+pub struct ApiUsers {
+    pub early_adopter_cutoff: Option<u64>
+}
+
 #[derive(Deserialize, Debug, Clone)]
 pub struct Api {
     pub registration: ApiRegistration,
@@ -195,6 +199,7 @@ pub struct Api {
     pub security: ApiSecurity,
     pub workers: ApiWorkers,
     pub livekit: ApiLiveKit,
+    pub users: ApiUsers,
 }
 
 #[derive(Deserialize, Debug, Clone)]
diff --git a/crates/core/database/src/models/users/model.rs b/crates/core/database/src/models/users/model.rs
index 6768258e6..f52cf5ae2 100644
--- a/crates/core/database/src/models/users/model.rs
+++ b/crates/core/database/src/models/users/model.rs
@@ -3,12 +3,13 @@ use std::{collections::HashSet, str::FromStr, time::Duration};
 use crate::{events::client::EventV1, Database, File, RatelimitEvent, AMQP};
 
 use authifier::config::{EmailVerificationConfig, Template};
+use futures::future::join_all;
 use iso8601_timestamp::Timestamp;
 use once_cell::sync::Lazy;
 use rand::seq::SliceRandom;
 use redis_kiss::{get_connection, AsyncCommands};
 use revolt_config::{config, FeaturesLimits};
-use revolt_models::v0::{self, UserFlags};
+use revolt_models::v0::{self, UserFlags, UserBadges};
 use revolt_presence::filter_online;
 use revolt_result::{create_error, Result};
 use serde_json::json;
@@ -349,15 +350,16 @@ impl User {
     ) -> Result<Vec<v0::User>> {
         let online_ids = filter_online(ids).await;
 
-        Ok(db
+        Ok(join_all(
+            db
             .fetch_users(ids)
             .await?
             .into_iter()
-            .map(|user| {
+            .map(|user| async {
                 let is_online = online_ids.contains(&user.id);
-                user.into_known(perspective, is_online)
+                user.into_known(perspective, is_online).await
             })
-            .collect())
+        ).await)
     }
 
     /// Find a free discriminator for a given username
@@ -821,4 +823,18 @@ impl User {
         )
         .await
     }
+
+    /// Gets the user's badges along with calculating any dynamic badges
+    pub async fn get_badges(&self) -> u32 {
+        let config = config().await;
+        let badges = self.badges.unwrap_or_default() as u32;
+
+        if let Some(cutoff) = config.api.users.early_adopter_cutoff {
+            if Ulid::from_string(&self.id).unwrap().timestamp_ms() < cutoff {
+                return badges + UserBadges::EarlyAdopter as u32
+            };
+        };
+
+        badges
+    }
 }
diff --git a/crates/core/database/src/util/bridge/v0.rs b/crates/core/database/src/util/bridge/v0.rs
index 0d702efd8..ab6246e40 100644
--- a/crates/core/database/src/util/bridge/v0.rs
+++ b/crates/core/database/src/util/bridge/v0.rs
@@ -1015,6 +1015,8 @@ impl crate::User {
             (RelationshipStatus::None, false)
         };
 
+        let badges = self.get_badges().await;
+
         User {
             username: self.username,
             discriminator: self.discriminator,
@@ -1033,7 +1035,7 @@ impl crate::User {
             } else {
                 vec![]
             },
-            badges: self.badges.unwrap_or_default() as u32,
+            badges,
             online: can_see_profile
                 && revolt_presence::is_online(&self.id).await
                 && !matches!(
@@ -1059,7 +1061,7 @@ impl crate::User {
     /// Convert user object into user model assuming mutual connection
     ///
     /// Relations will never be included, i.e. when we process ourselves
-    pub fn into_known<'a, P>(self, perspective: P, is_online: bool) -> User
+    pub async fn into_known<'a, P>(self, perspective: P, is_online: bool) -> User
     where
         P: Into<Option<&'a crate::User>>,
     {
@@ -1089,13 +1091,15 @@ impl crate::User {
             (RelationshipStatus::None, false)
         };
 
+        let badges = self.get_badges().await;
+
         User {
             username: self.username,
             discriminator: self.discriminator,
             display_name: self.display_name,
             avatar: self.avatar.map(|file| file.into()),
             relations: vec![],
-            badges: self.badges.unwrap_or_default() as u32,
+            badges,
             online: can_see_profile
                 && is_online
                 && !matches!(
@@ -1119,14 +1123,16 @@ impl crate::User {
     }
 
     /// Convert user object into user model without presence information
-    pub fn into_known_static(self, is_online: bool) -> User {
+    pub async fn into_known_static<'a>(self, is_online: bool) -> User {
+        let badges = self.get_badges().await;
+
         User {
             username: self.username,
             discriminator: self.discriminator,
             display_name: self.display_name,
             avatar: self.avatar.map(|file| file.into()),
             relations: vec![],
-            badges: self.badges.unwrap_or_default() as u32,
+            badges,
             online: is_online
                 && !matches!(
                     self.status,
@@ -1145,6 +1151,8 @@ impl crate::User {
     }
 
     pub async fn into_self(self, force_online: bool) -> User {
+        let badges = self.get_badges().await;
+
         User {
             username: self.username,
             discriminator: self.discriminator,
@@ -1159,7 +1167,7 @@ impl crate::User {
                         .collect()
                 })
                 .unwrap_or_default(),
-            badges: self.badges.unwrap_or_default() as u32,
+            badges,
             online: (force_online || revolt_presence::is_online(&self.id).await)
                 && !matches!(
                     self.status,
diff --git a/crates/delta/src/routes/channels/message_send.rs b/crates/delta/src/routes/channels/message_send.rs
index 86d33d796..e0e8f3153 100644
--- a/crates/delta/src/routes/channels/message_send.rs
+++ b/crates/delta/src/routes/channels/message_send.rs
@@ -84,7 +84,7 @@ pub async fn message_send(
     // Create model user / members
     let model_user = user
         .clone()
-        .into_known_static(revolt_presence::is_online(&user.id).await);
+        .into_known_static(revolt_presence::is_online(&user.id).await).await;
 
     let model_member: Option<v0::Member> = query
         .member_ref()

From b96f07e6159f4380bd563feab5086d5615b8b19c Mon Sep 17 00:00:00 2001
From: Zomatree <me@zomatree.live>
Date: Tue, 29 Apr 2025 15:52:03 +0100
Subject: [PATCH 56/62] fix: update branch from main

---
 crates/core/config/src/lib.rs                               | 1 +
 .../src/models/admin_migrations/ops/mongodb/scripts.rs      | 6 ++----
 crates/core/permissions/src/models/channel.rs               | 6 ------
 crates/delta/src/util/test.rs                               | 3 ++-
 4 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/crates/core/config/src/lib.rs b/crates/core/config/src/lib.rs
index b6867de49..16c398370 100644
--- a/crates/core/config/src/lib.rs
+++ b/crates/core/config/src/lib.rs
@@ -188,6 +188,7 @@ pub struct LiveKitNode {
     pub secret: String
 }
 
+#[derive(Deserialize, Debug, Clone)]
 pub struct ApiUsers {
     pub early_adopter_cutoff: Option<u64>
 }
diff --git a/crates/core/database/src/models/admin_migrations/ops/mongodb/scripts.rs b/crates/core/database/src/models/admin_migrations/ops/mongodb/scripts.rs
index d08b33745..ea65c2af9 100644
--- a/crates/core/database/src/models/admin_migrations/ops/mongodb/scripts.rs
+++ b/crates/core/database/src/models/admin_migrations/ops/mongodb/scripts.rs
@@ -1141,8 +1141,7 @@ pub async fn run_migrations(db: &MongoDb, revision: i32) -> i32 {
                         "is_publishing": true,
                         "is_receiving": true
                     }
-                },
-                None,
+                }
             )
             .await
             .expect("Failed to update members");
@@ -1159,8 +1158,7 @@ pub async fn run_migrations(db: &MongoDb, revision: i32) -> i32 {
                         "channel_type": "TextChannel",
                         "voice": {}
                     }
-                },
-                None
+                }
             )
             .await
             .expect("Failed to update voice channels");
diff --git a/crates/core/permissions/src/models/channel.rs b/crates/core/permissions/src/models/channel.rs
index 17c014996..9e9160263 100644
--- a/crates/core/permissions/src/models/channel.rs
+++ b/crates/core/permissions/src/models/channel.rs
@@ -98,12 +98,6 @@ pub enum ChannelPermission {
     /// Mention roles
     MentionRoles = 1 << 38,
 
-    // * Channel permissions two electric boogaloo
-    /// Mention everyone and online members
-    MentionEveryone = 1 << 37,
-    /// Mention roles
-    MentionRoles = 1 << 38,
-
     // * Misc. permissions
     // % Bits 38 to 52: free area
     // % Bits 53 to 64: do not use
diff --git a/crates/delta/src/util/test.rs b/crates/delta/src/util/test.rs
index 88bb6f420..318784006 100644
--- a/crates/delta/src/util/test.rs
+++ b/crates/delta/src/util/test.rs
@@ -154,6 +154,7 @@ impl TestHarness {
                 name: "Test Channel".to_string(),
                 description: None,
                 nsfw: Some(false),
+                voice: None
             },
             true,
         )
@@ -220,7 +221,7 @@ impl TestHarness {
         }
 
         let mut stream = self.sub.on_message();
-        while let Some(Ok(item)) = stream.next().await {
+        while let Some(item) = stream.next().await {
             let msg_topic = item.get_channel_name();
             let payload: EventV1 = redis_kiss::decode_payload(&item).unwrap();
 

From 48e0b48ea90869c68e6ca67d0ee398022eb9b872 Mon Sep 17 00:00:00 2001
From: Zomatree <me@zomatree.live>
Date: Thu, 1 May 2025 16:58:35 +0100
Subject: [PATCH 57/62] fix: update branch from main

---
 Cargo.lock                                        | 4 ++--
 crates/core/database/src/models/messages/model.rs | 2 +-
 crates/core/database/src/voice/mod.rs             | 7 ++++++-
 crates/delta/src/routes/channels/message_send.rs  | 2 ++
 crates/delta/src/routes/invites/invite_fetch.rs   | 1 +
 5 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index ca5b8cd5a..668dad17b 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4451,10 +4451,10 @@ dependencies = [
  "fnv",
  "lazy_static",
  "proc-macro2",
- "quote 1.0.38",
+ "quote 1.0.40",
  "regex-syntax 0.8.5",
  "rustc_version",
- "syn 2.0.94",
+ "syn 2.0.101",
 ]
 
 [[package]]
diff --git a/crates/core/database/src/models/messages/model.rs b/crates/core/database/src/models/messages/model.rs
index 9eb85c2a7..a5bef95cd 100644
--- a/crates/core/database/src/models/messages/model.rs
+++ b/crates/core/database/src/models/messages/model.rs
@@ -477,7 +477,7 @@ impl Message {
         }
 
         // Validate the mentions go to users in the channel/server
-        if !mentions.is_empty() {
+        if !user_mentions.is_empty() {
             #[allow(deprecated)]
             match channel {
                 Channel::DirectMessage { ref recipients, .. }
diff --git a/crates/core/database/src/voice/mod.rs b/crates/core/database/src/voice/mod.rs
index 05eabdb78..077283d4e 100644
--- a/crates/core/database/src/voice/mod.rs
+++ b/crates/core/database/src/voice/mod.rs
@@ -244,9 +244,14 @@ pub async fn update_voice_state(
 pub async fn get_voice_channel_members(channel_id: &str) -> Result<Option<Vec<String>>> {
     get_connection()
         .await?
-        .smembers(format!("vc_members:{}", channel_id))
+        .smembers::<_, Option<Vec<String>>>(format!("vc_members:{}", channel_id))
         .await
         .to_internal_error()
+        .map(|opt| opt.and_then(|v| if v.is_empty() {
+            None
+        } else {
+            Some(v)
+        }))
 }
 
 pub async fn get_voice_state(
diff --git a/crates/delta/src/routes/channels/message_send.rs b/crates/delta/src/routes/channels/message_send.rs
index e0e8f3153..4f8c625b8 100644
--- a/crates/delta/src/routes/channels/message_send.rs
+++ b/crates/delta/src/routes/channels/message_send.rs
@@ -616,6 +616,8 @@ mod test {
                     nickname: None,
                     roles: Some(vec![role_id.clone()]),
                     timeout: None,
+                    can_publish: None,
+                    can_receive: None
                 },
                 vec![],
             )
diff --git a/crates/delta/src/routes/invites/invite_fetch.rs b/crates/delta/src/routes/invites/invite_fetch.rs
index fb89fd3b7..641741b9a 100644
--- a/crates/delta/src/routes/invites/invite_fetch.rs
+++ b/crates/delta/src/routes/invites/invite_fetch.rs
@@ -195,6 +195,7 @@ mod test {
                 name: "Voice Channel".to_string(),
                 description: None,
                 nsfw: Some(false),
+                voice: None
             },
             true,
         )

From ea1c165d80d683c1cf8adb6106c1446c2b4e3423 Mon Sep 17 00:00:00 2001
From: Zomatree <me@zomatree.live>
Date: Mon, 2 Jun 2025 02:11:51 +0100
Subject: [PATCH 58/62] Merge remote-tracking branch 'origin/main' into livekit

---
 .github/workflows/docker.yaml                 |  190 +--
 .vscode/settings.json                         |    4 +-
 Cargo.lock                                    | 1095 ++++++++---------
 Cargo.toml                                    |    7 +-
 Dockerfile                                    |    4 +-
 Dockerfile.useCurrentArch                     |    4 +-
 README.md                                     |   35 +-
 Revolt.toml                                   |    1 +
 crates/bindings/node/.gitignore               |    7 -
 crates/bindings/node/Cargo.toml               |   25 -
 crates/bindings/node/README.md                |   92 --
 crates/bindings/node/index.d.ts               |   84 --
 crates/bindings/node/package.json             |   36 -
 crates/bindings/node/pnpm-lock.yaml           |  117 --
 crates/bindings/node/src/lib.rs               |  221 ----
 crates/bindings/node/test.js                  |   53 -
 crates/bindings/package-lock.json             |    6 -
 crates/bonfire/Cargo.toml                     |    6 +-
 crates/bonfire/src/events/impl.rs             |   27 +-
 crates/bonfire/src/websocket.rs               |    2 +-
 crates/core/config/Cargo.toml                 |    8 +-
 crates/core/config/Revolt.toml                |    3 +
 crates/core/config/src/lib.rs                 |    6 +-
 crates/core/database/Cargo.toml               |   16 +-
 crates/core/database/src/drivers/mod.rs       |   27 +-
 crates/core/database/src/drivers/reference.rs |    5 +-
 crates/core/database/src/events/client.rs     |    4 +-
 .../admin_migrations/ops/mongodb/init.rs      |    4 +
 .../admin_migrations/ops/mongodb/scripts.rs   |   45 +-
 crates/core/database/src/models/bots/model.rs |    1 -
 .../src/models/channel_webhooks/model.rs      |    2 +-
 .../database/src/models/channels/model.rs     |   11 +-
 .../database/src/models/file_hashes/model.rs  |    2 +-
 .../database/src/models/messages/model.rs     |   23 +-
 crates/core/database/src/models/mod.rs        |    3 +
 .../database/src/models/policy_changes/mod.rs |    5 +
 .../src/models/policy_changes/model.rs        |   20 +
 .../database/src/models/policy_changes/ops.rs |   15 +
 .../src/models/policy_changes/ops/mongodb.rs  |   46 +
 .../models/policy_changes/ops/reference.rs    |   31 +
 .../src/models/safety_snapshots/model.rs      |    4 +-
 .../database/src/models/server_bans/model.rs  |    1 +
 .../src/models/server_members/model.rs        |    2 +-
 .../core/database/src/models/servers/model.rs |    2 +-
 .../core/database/src/models/users/model.rs   |   23 +-
 .../core/database/src/models/users/schema.rs  |    2 +-
 crates/core/database/src/tasks/ack.rs         |   56 +-
 crates/core/database/src/util/bridge/v0.rs    |   19 +-
 .../database/src/util/bulk_permissions.rs     |    6 +-
 crates/core/database/src/util/permissions.rs  |   26 +-
 .../database/templates/reset-existing.html    |  188 +++
 .../templates/reset-existing.original.html    |   41 +
 .../database/templates/reset-existing.txt     |   19 +
 crates/core/files/Cargo.toml                  |    6 +-
 crates/core/models/Cargo.toml                 |    6 +-
 crates/core/models/src/v0/messages.rs         |    2 +-
 crates/core/models/src/v0/mod.rs              |    2 +
 crates/core/models/src/v0/policy_changes.rs   |   16 +
 crates/core/parser/Cargo.toml                 |    6 +-
 crates/core/permissions/Cargo.toml            |    4 +-
 crates/core/presence/Cargo.toml               |    2 +-
 crates/core/result/Cargo.toml                 |    2 +-
 crates/daemons/crond/Cargo.toml               |   10 +-
 crates/daemons/pushd/Cargo.toml               |   17 +-
 .../src/consumers/inbound/fr_accepted.rs      |   45 +-
 .../src/consumers/inbound/fr_received.rs      |   45 +-
 .../pushd/src/consumers/inbound/generic.rs    |   45 +-
 .../src/consumers/inbound/mass_mention.rs     |   73 +-
 .../pushd/src/consumers/inbound/message.rs    |   45 +-
 .../pushd/src/consumers/outbound/apn.rs       |   45 +-
 .../pushd/src/consumers/outbound/fcm.rs       |   49 +-
 .../pushd/src/consumers/outbound/vapid.rs     |   94 +-
 crates/daemons/pushd/src/main.rs              |    6 +-
 crates/delta/Cargo.toml                       |    7 +-
 .../src/routes/channels/members_fetch.rs      |    1 -
 .../routes/channels/message_bulk_delete.rs    |    1 -
 .../delta/src/routes/channels/message_edit.rs |    1 -
 .../src/routes/channels/permissions_set.rs    |    1 -
 .../src/routes/customisation/emoji_delete.rs  |    3 +-
 crates/delta/src/routes/mod.rs                |    5 +-
 .../policy/acknowledge_policy_changes.rs      |   17 +
 crates/delta/src/routes/policy/mod.rs         |   11 +
 crates/delta/src/routes/servers/ban_create.rs |    4 +-
 .../src/routes/users/fetch_user_flags.rs      |    1 -
 .../routes/webhooks/webhook_execute_github.rs |    3 +-
 crates/services/autumn/Cargo.toml             |   10 +-
 crates/services/january/Cargo.toml            |   10 +-
 justfile                                      |    1 +
 scripts/build-image-layer.sh                  |   13 +-
 89 files changed, 1651 insertions(+), 1640 deletions(-)
 delete mode 100644 crates/bindings/node/.gitignore
 delete mode 100644 crates/bindings/node/Cargo.toml
 delete mode 100644 crates/bindings/node/README.md
 delete mode 100644 crates/bindings/node/index.d.ts
 delete mode 100644 crates/bindings/node/package.json
 delete mode 100644 crates/bindings/node/pnpm-lock.yaml
 delete mode 100644 crates/bindings/node/src/lib.rs
 delete mode 100644 crates/bindings/node/test.js
 delete mode 100644 crates/bindings/package-lock.json
 create mode 100644 crates/core/database/src/models/policy_changes/mod.rs
 create mode 100644 crates/core/database/src/models/policy_changes/model.rs
 create mode 100644 crates/core/database/src/models/policy_changes/ops.rs
 create mode 100644 crates/core/database/src/models/policy_changes/ops/mongodb.rs
 create mode 100644 crates/core/database/src/models/policy_changes/ops/reference.rs
 create mode 100644 crates/core/database/templates/reset-existing.html
 create mode 100644 crates/core/database/templates/reset-existing.original.html
 create mode 100644 crates/core/database/templates/reset-existing.txt
 create mode 100644 crates/core/models/src/v0/policy_changes.rs
 create mode 100644 crates/delta/src/routes/policy/acknowledge_policy_changes.rs
 create mode 100644 crates/delta/src/routes/policy/mod.rs

diff --git a/.github/workflows/docker.yaml b/.github/workflows/docker.yaml
index 761078765..fccaf6341 100644
--- a/.github/workflows/docker.yaml
+++ b/.github/workflows/docker.yaml
@@ -2,24 +2,13 @@ name: Docker Test & Publish
 
 on:
   push:
-    # branches:
-    #   - "main"
     tags:
       - "*"
-    paths-ignore:
-      - ".github/**"
-      - "!.github/workflows/docker.yml"
-      - ".vscode/**"
-      - "doc/**"
-      - ".gitignore"
-      - "LICENSE"
-      - "README"
   pull_request:
     branches:
       - "main"
     paths:
       - "Dockerfile"
-  workflow_dispatch:
 
 permissions:
   contents: read
@@ -27,8 +16,9 @@ permissions:
 
 jobs:
   base:
+    name: Test base image build
     runs-on: ubuntu-latest
-    name: Build base image
+    if: github.event_name == 'pull_request'
     steps:
       # Configure build environment
       - name: Checkout
@@ -36,33 +26,21 @@ jobs:
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v2
 
-      # Authenticate with GHCR
-      - name: Login to Github Container Registry
-        if: ${{ github.event_name != 'pull_request' }}
-        uses: docker/login-action@v2
-        with:
-          registry: ghcr.io
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
+      # Build the image
       - name: Build base image
         uses: docker/build-push-action@v4
         with:
           context: .
-          push: ${{ github.event_name != 'pull_request' }}
+          push: false
           platforms: linux/amd64,linux/arm64
           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
 
   publish:
-    needs: [base]
-    runs-on: ubuntu-latest
+    runs-on: self-hosted
     if: github.event_name != 'pull_request'
-    strategy:
-      matrix:
-        project: [delta, bonfire, autumn, january, pushd]
-    name: Build ${{ matrix.project }} image
+    name: Publish Docker images
     steps:
       # Configure build environment
       - name: Checkout
@@ -77,6 +55,7 @@ jobs:
           registry: docker.io
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
+
       - name: Login to Github Container Registry
         uses: docker/login-action@v2
         with:
@@ -84,58 +63,131 @@ jobs:
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
-      # Resolve the correct project
-      - uses: kanga333/variable-mapper@master
-        id: export
-        with:
-          key: "${{ matrix.project }}"
-          map: |
-            {
-              "delta": {
-                "path": "crates/delta",
-                "tag": "${{ github.repository_owner }}/server"
-              },
-              "bonfire": {
-                "path": "crates/bonfire",
-                "tag": "${{ github.repository_owner }}/bonfire"
-              },
-              "autumn": {
-                "path": "crates/services/autumn",
-                "tag": "${{ github.repository_owner }}/autumn"
-              },
-              "january": {
-                "path": "crates/services/january",
-                "tag": "${{ github.repository_owner }}/january"
-              },
-              "pushd": {
-                "path": "crates/daemons/pushd",
-                "tag": "${{ github.repository_owner }}/pushd"
-              },
-              "crond": {
-                "path": "crates/daemons/crond",
-                "tag": "${{ github.repository_owner }}/crond"
-              }
-            }
-          export_to: output
+      # Build the image
+      - name: Build base image
+        uses: docker/build-push-action@v4
+        with:
+          context: .
+          push: true
+          platforms: linux/amd64,linux/arm64
+          tags: ghcr.io/${{ github.repository_owner }}/base:latest
+
+      # revoltchat/server
+      - name: Docker meta
+        id: meta-delta
+        uses: docker/metadata-action@v4
+        with:
+          images: |
+            docker.io/revoltchat/server
+            ghcr.io/revoltchat/server
+      - name: Publish
+        uses: docker/build-push-action@v4
+        with:
+          context: .
+          push: true
+          platforms: linux/amd64,linux/arm64
+          file: crates/delta/Dockerfile
+          tags: ${{ steps.meta-delta.outputs.tags }}
+          build-args: |
+            BASE_IMAGE=ghcr.io/${{ github.repository_owner }}/base:latest
+          labels: ${{ steps.meta-delta.outputs.labels }}
+
+      # revoltchat/bonfire
+      - name: Docker meta
+        id: meta-bonfire
+        uses: docker/metadata-action@v4
+        with:
+          images: |
+            docker.io/revoltchat/bonfire
+            ghcr.io/revoltchat/bonfire
+      - name: Publish
+        uses: docker/build-push-action@v4
+        with:
+          context: .
+          push: true
+          platforms: linux/amd64,linux/arm64
+          file: crates/bonfire/Dockerfile
+          tags: ${{ steps.meta-bonfire.outputs.tags }}
+          build-args: |
+            BASE_IMAGE=ghcr.io/${{ github.repository_owner }}/base:latest
+          labels: ${{ steps.meta-bonfire.outputs.labels }}
+
+      # revoltchat/autumn
+      - name: Docker meta
+        id: meta-autumn
+        uses: docker/metadata-action@v4
+        with:
+          images: |
+            docker.io/revoltchat/autumn
+            ghcr.io/revoltchat/autumn
+      - name: Publish
+        uses: docker/build-push-action@v4
+        with:
+          context: .
+          push: true
+          platforms: linux/amd64,linux/arm64
+          file: crates/services/autumn/Dockerfile
+          tags: ${{ steps.meta-autumn.outputs.tags }}
+          build-args: |
+            BASE_IMAGE=ghcr.io/${{ github.repository_owner }}/base:latest
+          labels: ${{ steps.meta-autumn.outputs.labels }}
+
+      # revoltchat/january
+      - name: Docker meta
+        id: meta-january
+        uses: docker/metadata-action@v4
+        with:
+          images: |
+            docker.io/revoltchat/january
+            ghcr.io/revoltchat/january
+      - name: Publish
+        uses: docker/build-push-action@v4
+        with:
+          context: .
+          push: true
+          platforms: linux/amd64,linux/arm64
+          file: crates/services/january/Dockerfile
+          tags: ${{ steps.meta-january.outputs.tags }}
+          build-args: |
+            BASE_IMAGE=ghcr.io/${{ github.repository_owner }}/base:latest
+          labels: ${{ steps.meta-january.outputs.labels }}
 
-      # Configure metadata
+      # revoltchat/crond
       - name: Docker meta
-        id: meta
+        id: meta-crond
         uses: docker/metadata-action@v4
         with:
           images: |
-            docker.io/${{ steps.export.outputs.tag }}
-            ghcr.io/${{ steps.export.outputs.tag }}
+            docker.io/revoltchat/crond
+            ghcr.io/revoltchat/crond
+      - name: Publish
+        uses: docker/build-push-action@v4
+        with:
+          context: .
+          push: true
+          platforms: linux/amd64,linux/arm64
+          file: crates/daemons/crond/Dockerfile
+          tags: ${{ steps.meta-crond.outputs.tags }}
+          build-args: |
+            BASE_IMAGE=ghcr.io/${{ github.repository_owner }}/base:latest
+          labels: ${{ steps.meta-crond.outputs.labels }}
 
-      # Build crate image
+      # revoltchat/pushd
+      - name: Docker meta
+        id: meta-pushd
+        uses: docker/metadata-action@v4
+        with:
+          images: |
+            docker.io/revoltchat/pushd
+            ghcr.io/revoltchat/pushd
       - name: Publish
         uses: docker/build-push-action@v4
         with:
           context: .
           push: true
           platforms: linux/amd64,linux/arm64
-          file: ${{ steps.export.outputs.path }}/Dockerfile
-          tags: ${{ steps.meta.outputs.tags }}
+          file: crates/daemons/pushd/Dockerfile
+          tags: ${{ steps.meta-pushd.outputs.tags }}
           build-args: |
             BASE_IMAGE=ghcr.io/${{ github.repository_owner }}/base:latest
-          labels: ${{ steps.meta.outputs.labels }}
+          labels: ${{ steps.meta-pushd.outputs.labels }}
diff --git a/.vscode/settings.json b/.vscode/settings.json
index 7f8ecfcd4..707af02f7 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -1,6 +1,6 @@
 {
   "editor.formatOnSave": true,
-  "rust-analyzer.checkOnSave.command": "clippy",
+  "rust-analyzer.check.command": "clippy",
   "nixEnvSelector.suggestion": false,
   "nixEnvSelector.nixFile": "${workspaceFolder}/default.nix"
-}
\ No newline at end of file
+}
diff --git a/Cargo.lock b/Cargo.lock
index 668dad17b..be8edb591 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -65,15 +65,15 @@ dependencies = [
 
 [[package]]
 name = "ahash"
-version = "0.8.11"
+version = "0.8.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011"
+checksum = "5a15f179cd60c4584b8a8c596927aadc462e27f2ca70c04e0071964a73ba7a75"
 dependencies = [
  "cfg-if",
- "getrandom 0.2.16",
+ "getrandom 0.3.3",
  "once_cell",
  "version_check",
- "zerocopy 0.7.35",
+ "zerocopy",
 ]
 
 [[package]]
@@ -119,7 +119,7 @@ dependencies = [
  "bytes 1.10.1",
  "serde",
  "serde_bytes_ng",
- "tokio 1.44.2",
+ "tokio 1.45.1",
 ]
 
 [[package]]
@@ -142,6 +142,9 @@ name = "anyhow"
 version = "1.0.98"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e16d2d3311acee920a9eb8d33b8cbc1787ce4a264e85f964c2404b969bdcd487"
+dependencies = [
+ "backtrace",
+]
 
 [[package]]
 name = "arbitrary"
@@ -239,14 +242,14 @@ dependencies = [
  "futures-lite 2.6.0",
  "once_cell",
  "tokio 0.2.25",
- "tokio 1.44.2",
+ "tokio 1.45.1",
 ]
 
 [[package]]
 name = "async-io"
-version = "2.4.0"
+version = "2.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43a2b323ccce0a1d90b449fd71f2a06ca7faa7c54c2751f06c9bd851fc061059"
+checksum = "1237c0ae75a0f3765f58910ff9cdd0a12eeb39ab2f4c7de23262f337f0aacbb3"
 dependencies = [
  "async-lock 3.4.0",
  "cfg-if",
@@ -254,8 +257,8 @@ dependencies = [
  "futures-io",
  "futures-lite 2.6.0",
  "parking",
- "polling 3.7.4",
- "rustix 0.38.44",
+ "polling 3.8.0",
+ "rustix 1.0.7",
  "slab",
  "tracing",
  "windows-sys 0.59.0",
@@ -283,9 +286,9 @@ dependencies = [
 
 [[package]]
 name = "async-process"
-version = "2.3.0"
+version = "2.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "63255f1dc2381611000436537bbedfe83183faa303a5a0edaf191edef06526bb"
+checksum = "cde3f4e40e6021d7acffc90095cbd6dc54cb593903d1de5832f435eb274b85dc"
 dependencies = [
  "async-channel 2.3.1",
  "async-io",
@@ -296,7 +299,7 @@ dependencies = [
  "cfg-if",
  "event-listener 5.4.0",
  "futures-lite 2.6.0",
- "rustix 0.38.44",
+ "rustix 1.0.7",
  "tracing",
 ]
 
@@ -313,9 +316,9 @@ dependencies = [
 
 [[package]]
 name = "async-signal"
-version = "0.2.10"
+version = "0.2.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "637e00349800c0bdf8bfc21ebbc0b6524abea702b0da4168ac00d070d0c0b9f3"
+checksum = "d7605a4e50d4b06df3898d5a70bf5fde51ed9059b0434b73105193bc27acce0d"
 dependencies = [
  "async-io",
  "async-lock 3.4.0",
@@ -323,7 +326,7 @@ dependencies = [
  "cfg-if",
  "futures-core",
  "futures-io",
- "rustix 0.38.44",
+ "rustix 1.0.7",
  "signal-hook-registry",
  "slab",
  "windows-sys 0.59.0",
@@ -444,9 +447,9 @@ dependencies = [
 
 [[package]]
 name = "authifier"
-version = "1.0.12"
+version = "1.0.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43b1f94d08726258a899aa4ee827e6bf161513f1b78c8b25e47873d573d6ceee"
+checksum = "b1a03b810b342b4c584cdc1cfc40d1ec763b1d653ef4086f7494740f35d9e1f0"
 dependencies = [
  "async-std",
  "async-trait",
@@ -471,6 +474,7 @@ dependencies = [
  "schemars",
  "serde",
  "serde_json",
+ "sha1",
  "totp-lite",
  "ulid 0.5.0",
  "validator 0.15.0",
@@ -499,9 +503,9 @@ checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
 
 [[package]]
 name = "av1-grain"
-version = "0.2.3"
+version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6678909d8c5d46a42abcf571271e15fdbc0a225e3646cf23762cd415046c78bf"
+checksum = "4f3efb2ca85bc610acfa917b5aaa36f3fcbebed5b3182d7f877b02531c4b80c8"
 dependencies = [
  "anyhow",
  "arrayvec",
@@ -522,9 +526,9 @@ dependencies = [
 
 [[package]]
 name = "aws-config"
-version = "1.6.2"
+version = "1.6.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6fcc63c9860579e4cb396239570e979376e70aab79e496621748a09913f8b36"
+checksum = "02a18fd934af6ae7ca52410d4548b98eb895aab0f1ea417d168d85db1434a141"
 dependencies = [
  "aws-credential-types",
  "aws-runtime",
@@ -544,7 +548,7 @@ dependencies = [
  "http 1.3.1",
  "ring",
  "time",
- "tokio 1.44.2",
+ "tokio 1.45.1",
  "tracing",
  "url",
  "zeroize",
@@ -564,9 +568,9 @@ dependencies = [
 
 [[package]]
 name = "aws-lc-rs"
-version = "1.13.0"
+version = "1.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "19b756939cb2f8dc900aa6dcd505e6e2428e9cae7ff7b028c49e3946efa70878"
+checksum = "93fcc8f365936c834db5514fc45aee5b1202d677e6b40e48468aaaa8183ca8c7"
 dependencies = [
  "aws-lc-sys",
  "zeroize",
@@ -574,9 +578,9 @@ dependencies = [
 
 [[package]]
 name = "aws-lc-sys"
-version = "0.28.2"
+version = "0.29.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bfa9b6986f250236c27e5a204062434a773a13243d2ffc2955f37bdba4c5c6a1"
+checksum = "61b1d86e7705efe1be1b569bab41d4fa1e14e220b60a160f78de2db687add079"
 dependencies = [
  "bindgen",
  "cc",
@@ -612,9 +616,9 @@ dependencies = [
 
 [[package]]
 name = "aws-sdk-s3"
-version = "1.83.0"
+version = "1.90.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "51384750334005f40e1a334b0d54eca822a77eacdcf3c50fdf38f583c5eee7a2"
+checksum = "5934beb9403c562bd129a1de1bd51ab67209c05ddf3a4a8c86714120181c860f"
 dependencies = [
  "aws-credential-types",
  "aws-runtime",
@@ -637,7 +641,6 @@ dependencies = [
  "http 1.3.1",
  "http-body 0.4.6",
  "lru 0.12.5",
- "once_cell",
  "percent-encoding",
  "regex-lite",
  "sha2",
@@ -647,9 +650,9 @@ dependencies = [
 
 [[package]]
 name = "aws-sdk-sso"
-version = "1.65.0"
+version = "1.71.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8efec445fb78df585327094fcef4cad895b154b58711e504db7a93c41aa27151"
+checksum = "95a4fd09d6e863655d99cd2260f271c6d1030dc6bfad68e19e126d2e4c8ceb18"
 dependencies = [
  "aws-credential-types",
  "aws-runtime",
@@ -663,16 +666,15 @@ dependencies = [
  "bytes 1.10.1",
  "fastrand 2.3.0",
  "http 0.2.12",
- "once_cell",
  "regex-lite",
  "tracing",
 ]
 
 [[package]]
 name = "aws-sdk-ssooidc"
-version = "1.66.0"
+version = "1.72.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e49cca619c10e7b002dc8e66928ceed66ab7f56c1a3be86c5437bf2d8d89bba"
+checksum = "3224ab02ebb3074467a33d57caf6fcb487ca36f3697fdd381b0428dc72380696"
 dependencies = [
  "aws-credential-types",
  "aws-runtime",
@@ -686,16 +688,15 @@ dependencies = [
  "bytes 1.10.1",
  "fastrand 2.3.0",
  "http 0.2.12",
- "once_cell",
  "regex-lite",
  "tracing",
 ]
 
 [[package]]
 name = "aws-sdk-sts"
-version = "1.66.0"
+version = "1.72.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7420479eac0a53f776cc8f0d493841ffe58ad9d9783f3947be7265784471b47a"
+checksum = "f6933f189ed1255e78175fbd73fb200c0aae7240d220ed3346f567b0ddca3083"
 dependencies = [
  "aws-credential-types",
  "aws-runtime",
@@ -710,16 +711,15 @@ dependencies = [
  "aws-types",
  "fastrand 2.3.0",
  "http 0.2.12",
- "once_cell",
  "regex-lite",
  "tracing",
 ]
 
 [[package]]
 name = "aws-sigv4"
-version = "1.3.1"
+version = "1.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3503af839bd8751d0bdc5a46b9cac93a003a353e635b0c12cf2376b5b53e41ea"
+checksum = "3734aecf9ff79aa401a6ca099d076535ab465ff76b46440cf567c8e70b65dc13"
 dependencies = [
  "aws-credential-types",
  "aws-smithy-eventstream",
@@ -751,21 +751,19 @@ checksum = "1e190749ea56f8c42bf15dd76c65e14f8f765233e6df9b0506d9d934ebef867c"
 dependencies = [
  "futures-util",
  "pin-project-lite 0.2.16",
- "tokio 1.44.2",
+ "tokio 1.45.1",
 ]
 
 [[package]]
 name = "aws-smithy-checksums"
-version = "0.63.1"
+version = "0.63.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b65d21e1ba6f2cdec92044f904356a19f5ad86961acf015741106cdfafd747c0"
+checksum = "d2f77a921dbd2c78ebe70726799787c1d110a2245dd65e39b20923dfdfb2deee"
 dependencies = [
  "aws-smithy-http",
  "aws-smithy-types",
  "bytes 1.10.1",
- "crc32c",
- "crc32fast",
- "crc64fast-nvme",
+ "crc-fast",
  "hex",
  "http 0.2.12",
  "http-body 0.4.6",
@@ -810,28 +808,28 @@ dependencies = [
 
 [[package]]
 name = "aws-smithy-http-client"
-version = "1.0.1"
+version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8aff1159006441d02e57204bf57a1b890ba68bedb6904ffd2873c1c4c11c546b"
+checksum = "7e44697a9bded898dcd0b1cb997430d949b87f4f8940d91023ae9062bf218250"
 dependencies = [
  "aws-smithy-async",
  "aws-smithy-runtime-api",
  "aws-smithy-types",
- "h2 0.4.9",
+ "h2 0.4.10",
  "http 0.2.12",
  "http 1.3.1",
  "http-body 0.4.6",
  "hyper 0.14.32",
  "hyper 1.6.0",
  "hyper-rustls 0.24.2",
- "hyper-rustls 0.27.5",
+ "hyper-rustls 0.27.6",
  "hyper-util",
  "pin-project-lite 0.2.16",
  "rustls 0.21.12",
- "rustls 0.23.26",
+ "rustls 0.23.27",
  "rustls-native-certs 0.8.1",
  "rustls-pki-types",
- "tokio 1.44.2",
+ "tokio 1.45.1",
  "tower",
  "tracing",
 ]
@@ -884,7 +882,7 @@ dependencies = [
  "http-body 1.0.1",
  "pin-project-lite 0.2.16",
  "pin-utils",
- "tokio 1.44.2",
+ "tokio 1.45.1",
  "tracing",
 ]
 
@@ -900,7 +898,7 @@ dependencies = [
  "http 0.2.12",
  "http 1.3.1",
  "pin-project-lite 0.2.16",
- "tokio 1.44.2",
+ "tokio 1.45.1",
  "tracing",
  "zeroize",
 ]
@@ -927,7 +925,7 @@ dependencies = [
  "ryu",
  "serde",
  "time",
- "tokio 1.44.2",
+ "tokio 1.45.1",
  "tokio-util",
 ]
 
@@ -982,7 +980,7 @@ dependencies = [
  "serde_path_to_error",
  "serde_urlencoded",
  "sync_wrapper 1.0.2",
- "tokio 1.44.2",
+ "tokio 1.45.1",
  "tower",
  "tower-layer",
  "tower-service",
@@ -1060,7 +1058,7 @@ dependencies = [
  "futures-util",
  "tempfile",
  "thiserror 1.0.69",
- "tokio 1.44.2",
+ "tokio 1.45.1",
  "uuid",
 ]
 
@@ -1080,9 +1078,9 @@ dependencies = [
 
 [[package]]
 name = "backtrace"
-version = "0.3.74"
+version = "0.3.75"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d82cb332cdfaed17ae235a638438ac4d4839913cc2af585c3c6746e8f8bee1a"
+checksum = "6806a6321ec58106fea15becdad98371e28d92ccbc7c8f1b3b6dd724fe8f1002"
 dependencies = [
  "addr2line",
  "cfg-if",
@@ -1172,7 +1170,7 @@ version = "0.69.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "271383c67ccabffb7381723dea0672a673f292304fcb45c01cc648c7a8d58088"
 dependencies = [
- "bitflags 2.9.0",
+ "bitflags 2.9.1",
  "cexpr",
  "clang-sys",
  "itertools 0.12.1",
@@ -1191,9 +1189,9 @@ dependencies = [
 
 [[package]]
 name = "binstring"
-version = "0.1.6"
+version = "0.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a3a3c2603413428303761fae99d4b6d936404208221a44eba47d7c1e6dd03a3"
+checksum = "0669d5a35b64fdb5ab7fb19cae13148b6b5cbdf4b8247faf54ece47f699c8cef"
 
 [[package]]
 name = "bit_field"
@@ -1215,9 +1213,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
 [[package]]
 name = "bitflags"
-version = "2.9.0"
+version = "2.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c8214115b7bf84099f1309324e63141d4c5d7cc26862f97a0a857dbefe165bd"
+checksum = "1b8e56985ec62d17e9c1001dc89c88ecd7dc08e47eba5ec7c29c7b5eeecde967"
 
 [[package]]
 name = "bitstream-io"
@@ -1272,15 +1270,15 @@ dependencies = [
 
 [[package]]
 name = "bson"
-version = "2.14.0"
+version = "2.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af8113ff51309e2779e8785a246c10fb783e8c2452f134d6257fd71cc03ccd6c"
+checksum = "7969a9ba84b0ff843813e7249eed1678d9b6607ce5a3b8f0a47af3fcf7978e6e"
 dependencies = [
- "ahash 0.8.11",
+ "ahash 0.8.12",
  "base64 0.22.1",
  "bitvec",
  "getrandom 0.2.16",
- "getrandom 0.3.2",
+ "getrandom 0.3.3",
  "hex",
  "indexmap 2.9.0",
  "js-sys",
@@ -1359,7 +1357,7 @@ dependencies = [
  "instant",
  "once_cell",
  "thiserror 1.0.69",
- "tokio 1.44.2",
+ "tokio 1.45.1",
 ]
 
 [[package]]
@@ -1389,9 +1387,9 @@ checksum = "a2698f953def977c68f935bb0dfa959375ad4638570e969e2f1e9f433cbf1af6"
 
 [[package]]
 name = "cc"
-version = "1.2.20"
+version = "1.2.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "04da6a0d40b948dfc4fa8f5bbf402b0fc1a64a28dbf7d12ffd683550f2c1b63a"
+checksum = "d0fc897dc1e865cc67c0e05a836d9d3f1df3cbe442aa4a9473b18e12624a4951"
 dependencies = [
  "jobserver",
  "libc",
@@ -1515,7 +1513,7 @@ dependencies = [
  "futures-core",
  "memchr",
  "pin-project-lite 0.2.16",
- "tokio 1.44.2",
+ "tokio 1.45.1",
  "tokio-util",
 ]
 
@@ -1623,9 +1621,9 @@ dependencies = [
 
 [[package]]
 name = "core-foundation"
-version = "0.10.0"
+version = "0.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b55271e5c8c478ad3f38ad24ef34923091e0548492a266d19b3c0b4d82574c63"
+checksum = "b2a6cd9ae233e7f62ba4e9353e81a88df7fc8a5987b8d445b4d90c879bd156f6"
 dependencies = [
  "core-foundation-sys",
  "libc",
@@ -1657,9 +1655,9 @@ dependencies = [
 
 [[package]]
 name = "crc"
-version = "3.2.1"
+version = "3.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "69e6e4d7b33a94f0991c26729976b10ebde1d34c3ee82408fb536164fa10d636"
+checksum = "9710d3b3739c2e349eb44fe848ad0b7c8cb1e42bd87ee49371df2f7acaf3e675"
 dependencies = [
  "crc-catalog",
 ]
@@ -1671,19 +1669,24 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "19d374276b40fb8bbdee95aef7c7fa6b5316ec764510eb64b8dd0e2ed0d7e7f5"
 
 [[package]]
-name = "crc16"
-version = "0.4.0"
+name = "crc-fast"
+version = "1.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "338089f42c427b86394a5ee60ff321da23a5c89c9d89514c829687b26359fcff"
+checksum = "add8d3a4c789d77eeb0f0e3c1035f73610d017f9047e87db94f89c02a56d8fef"
+dependencies = [
+ "cc",
+ "crc",
+ "digest",
+ "libc",
+ "rand 0.9.1",
+ "regex",
+]
 
 [[package]]
-name = "crc32c"
-version = "0.6.8"
+name = "crc16"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3a47af21622d091a8f0fb295b88bc886ac74efcc613efc19f5d0b21de5c89e47"
-dependencies = [
- "rustc_version",
-]
+checksum = "338089f42c427b86394a5ee60ff321da23a5c89c9d89514c829687b26359fcff"
 
 [[package]]
 name = "crc32fast"
@@ -1694,15 +1697,6 @@ dependencies = [
  "cfg-if",
 ]
 
-[[package]]
-name = "crc64fast-nvme"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4955638f00a809894c947f85a024020a20815b65a5eea633798ea7924edab2b3"
-dependencies = [
- "crc",
-]
-
 [[package]]
 name = "crossbeam-channel"
 version = "0.5.15"
@@ -1812,9 +1806,9 @@ dependencies = [
 
 [[package]]
 name = "ct-codecs"
-version = "1.1.3"
+version = "1.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b916ba8ce9e4182696896f015e8a5ae6081b305f74690baa8465e35f5a142ea4"
+checksum = "9b10589d1a5e400d61f9f38f12f884cfd080ff345de8f17efda36fe0e4a02aa8"
 
 [[package]]
 name = "ctr"
@@ -1836,7 +1830,7 @@ dependencies = [
  "openssl-probe",
  "openssl-sys",
  "schannel",
- "socket2 0.5.9",
+ "socket2 0.5.10",
  "windows-sys 0.52.0",
 ]
 
@@ -1993,7 +1987,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "16a2561fd313df162315935989dceb8c99db4ee1933358270a57a3cfb8c957f3"
 dependencies = [
  "crossbeam-queue",
- "tokio 1.44.2",
+ "tokio 1.45.1",
 ]
 
 [[package]]
@@ -2079,9 +2073,9 @@ dependencies = [
 
 [[package]]
 name = "derive-where"
-version = "1.3.0"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2364b9aa47e460ce9bca6ac1777d14c98eef7e274eb077beed49f3adc94183ed"
+checksum = "e73f2692d4bd3cac41dca28934a39894200c9fabf49586d77d0e5954af1d7902"
 dependencies = [
  "proc-macro2",
  "quote 1.0.40",
@@ -2127,7 +2121,7 @@ version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b035a542cf7abf01f2e3c4d5a7acbaebfefe120ae4efc7bde3df98186e4b8af7"
 dependencies = [
- "bitflags 2.9.0",
+ "bitflags 2.9.1",
  "proc-macro2",
  "proc-macro2-diagnostics",
  "quote 1.0.40",
@@ -2384,9 +2378,9 @@ dependencies = [
 
 [[package]]
 name = "errno"
-version = "0.3.11"
+version = "0.3.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "976dd42dc7e85965fe702eb8164f21f450704bdde31faefd6471dba214cb594e"
+checksum = "cea14ef9355e3beab063703aa9dab15afd25f0667c341310c1e5274bb1d0da18"
 dependencies = [
  "libc",
  "windows-sys 0.59.0",
@@ -2566,9 +2560,9 @@ checksum = "d9c4f5dac5e15c24eb999c26181a6ca40b39fe946cbe4c263c7209467bc83af2"
 
 [[package]]
 name = "fontconfig-parser"
-version = "0.5.7"
+version = "0.5.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1fcfcd44ca6e90c921fee9fa665d530b21ef1327a4c1a6c5250ea44b776ada7"
+checksum = "bbc773e24e02d4ddd8395fd30dc147524273a83e54e0f312d986ea30de5f5646"
 dependencies = [
  "roxmltree",
 ]
@@ -2629,8 +2623,8 @@ dependencies = [
  "rand 0.8.5",
  "redis-protocol",
  "semver",
- "socket2 0.5.9",
- "tokio 1.44.2",
+ "socket2 0.5.10",
+ "tokio 1.45.1",
  "tokio-stream",
  "tokio-util",
  "url",
@@ -2749,7 +2743,7 @@ checksum = "45ec6fe3675af967e67c5536c0b9d44e34e6c52f86bedc4ea49c5317b8e94d06"
 dependencies = [
  "futures-channel",
  "futures-task",
- "tokio 1.44.2",
+ "tokio 1.45.1",
 ]
 
 [[package]]
@@ -2823,15 +2817,16 @@ dependencies = [
 
 [[package]]
 name = "generator"
-version = "0.8.4"
+version = "0.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc6bd114ceda131d3b1d665eba35788690ad37f5916457286b32ab6fd3c438dd"
+checksum = "d18470a76cb7f8ff746cf1f7470914f900252ec36bbc40b569d74b1258446827"
 dependencies = [
+ "cc",
  "cfg-if",
  "libc",
  "log",
  "rustversion",
- "windows 0.58.0",
+ "windows 0.61.1",
 ]
 
 [[package]]
@@ -2878,9 +2873,9 @@ dependencies = [
 
 [[package]]
 name = "getrandom"
-version = "0.3.2"
+version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "73fea8450eea4bac3940448fb7ae50d91f034f941199fcd9d909a5a07aa455f0"
+checksum = "26145e563e54f2cadc477553f1ec5ee650b00862f0a58bcd12cbdc5f0ea2d2f4"
 dependencies = [
  "cfg-if",
  "js-sys",
@@ -2995,16 +2990,16 @@ dependencies = [
  "http 0.2.12",
  "indexmap 2.9.0",
  "slab",
- "tokio 1.44.2",
+ "tokio 1.45.1",
  "tokio-util",
  "tracing",
 ]
 
 [[package]]
 name = "h2"
-version = "0.4.9"
+version = "0.4.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75249d144030531f8dee69fe9cea04d3edf809a017ae445e2abdff6629e86633"
+checksum = "a9421a676d1b147b16b82c9225157dc629087ef8ec4d5e2960f9437a90dac0a5"
 dependencies = [
  "atomic-waker",
  "bytes 1.10.1",
@@ -3014,7 +3009,7 @@ dependencies = [
  "http 1.3.1",
  "indexmap 2.9.0",
  "slab",
- "tokio 1.44.2",
+ "tokio 1.45.1",
  "tokio-util",
  "tracing",
 ]
@@ -3064,15 +3059,15 @@ version = "0.14.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"
 dependencies = [
- "ahash 0.8.11",
+ "ahash 0.8.12",
  "allocator-api2",
 ]
 
 [[package]]
 name = "hashbrown"
-version = "0.15.2"
+version = "0.15.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289"
+checksum = "84b26c544d002229e640969970a2e74021aadf6e2f96372b9c58eff97de08eb3"
 dependencies = [
  "allocator-api2",
  "equivalent",
@@ -3126,21 +3121,9 @@ dependencies = [
 
 [[package]]
 name = "hermit-abi"
-version = "0.3.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024"
-
-[[package]]
-name = "hermit-abi"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fbf6a919d6cf397374f7dfeeea91d974c7c0a7221d0d0f4f20d859d329e53fcc"
-
-[[package]]
-name = "hermit-abi"
-version = "0.5.0"
+version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fbd780fe5cc30f81464441920d82ac8740e2e46b29a6fad543ddd075229ce37e"
+checksum = "f154ce46856750ed433c8649605bf7ed2de3bc35fd9d2a9f30cddd873c80cb08"
 
 [[package]]
 name = "hex"
@@ -3167,7 +3150,7 @@ dependencies = [
  "rand 0.8.5",
  "thiserror 1.0.69",
  "tinyvec",
- "tokio 1.44.2",
+ "tokio 1.45.1",
  "tracing",
  "url",
 ]
@@ -3189,7 +3172,7 @@ dependencies = [
  "resolv-conf",
  "smallvec",
  "thiserror 1.0.69",
- "tokio 1.44.2",
+ "tokio 1.45.1",
  "tracing",
 ]
 
@@ -3219,18 +3202,18 @@ checksum = "18492c9f6f9a560e0d346369b665ad2bdbc89fa9bceca75796584e79042694c3"
 
 [[package]]
 name = "hmac-sha256"
-version = "1.1.8"
+version = "1.1.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4a8575493d277c9092b988c780c94737fb9fd8651a1001e16bee3eccfc1baedb"
+checksum = "ad6880c8d4a9ebf39c6e8b77007ce223f646a4d21ce29d99f70cb16420545425"
 dependencies = [
  "digest",
 ]
 
 [[package]]
 name = "hmac-sha512"
-version = "1.1.6"
+version = "1.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b0b3a0f572aa8389d325f5852b9e0a333a15b0f86ecccbb3fdb6e97cd86dc67c"
+checksum = "e89e8d20b3799fa526152a5301a771eaaad80857f83e01b23216ceaafb2d9280"
 dependencies = [
  "digest",
 ]
@@ -3255,17 +3238,6 @@ dependencies = [
  "winapi",
 ]
 
-[[package]]
-name = "hostname"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a56f203cd1c76362b69e3863fd987520ac36cf70a8c92627449b2f64a8cf7d65"
-dependencies = [
- "cfg-if",
- "libc",
- "windows-link",
-]
-
 [[package]]
 name = "html5ever"
 version = "0.27.0"
@@ -3374,8 +3346,8 @@ dependencies = [
  "httpdate",
  "itoa",
  "pin-project-lite 0.2.16",
- "socket2 0.5.9",
- "tokio 1.44.2",
+ "socket2 0.5.10",
+ "tokio 1.45.1",
  "tower-service",
  "tracing",
  "want",
@@ -3390,7 +3362,7 @@ dependencies = [
  "bytes 1.10.1",
  "futures-channel",
  "futures-util",
- "h2 0.4.9",
+ "h2 0.4.10",
  "http 1.3.1",
  "http-body 1.0.1",
  "httparse",
@@ -3398,7 +3370,7 @@ dependencies = [
  "itoa",
  "pin-project-lite 0.2.16",
  "smallvec",
- "tokio 1.44.2",
+ "tokio 1.45.1",
  "want",
 ]
 
@@ -3414,7 +3386,7 @@ dependencies = [
  "log",
  "rustls 0.21.12",
  "rustls-native-certs 0.6.3",
- "tokio 1.44.2",
+ "tokio 1.45.1",
  "tokio-rustls 0.24.1",
 ]
 
@@ -3430,26 +3402,25 @@ dependencies = [
  "hyper-util",
  "rustls 0.22.4",
  "rustls-pki-types",
- "tokio 1.44.2",
+ "tokio 1.45.1",
  "tokio-rustls 0.25.0",
  "tower-service",
- "webpki-roots 0.26.9",
+ "webpki-roots 0.26.11",
 ]
 
 [[package]]
 name = "hyper-rustls"
-version = "0.27.5"
+version = "0.27.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2d191583f3da1305256f22463b9bb0471acad48a4e534a5218b9963e9c1f59b2"
+checksum = "03a01595e11bdcec50946522c32dde3fc6914743000a68b93000965f2f02406d"
 dependencies = [
- "futures-util",
  "http 1.3.1",
  "hyper 1.6.0",
  "hyper-util",
- "rustls 0.23.26",
+ "rustls 0.23.27",
  "rustls-native-certs 0.8.1",
  "rustls-pki-types",
- "tokio 1.44.2",
+ "tokio 1.45.1",
  "tokio-rustls 0.26.2",
  "tower-service",
 ]
@@ -3463,7 +3434,7 @@ dependencies = [
  "bytes 1.10.1",
  "hyper 0.14.32",
  "native-tls",
- "tokio 1.44.2",
+ "tokio 1.45.1",
  "tokio-native-tls",
 ]
 
@@ -3478,29 +3449,35 @@ dependencies = [
  "hyper 1.6.0",
  "hyper-util",
  "native-tls",
- "tokio 1.44.2",
+ "tokio 1.45.1",
  "tokio-native-tls",
  "tower-service",
 ]
 
 [[package]]
 name = "hyper-util"
-version = "0.1.11"
+version = "0.1.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "497bbc33a26fdd4af9ed9c70d63f61cf56a938375fbb32df34db9b1cd6d643f2"
+checksum = "b1c293b6b3d21eca78250dc7dbebd6b9210ec5530e038cbfe0661b5c47ab06e8"
 dependencies = [
+ "base64 0.22.1",
  "bytes 1.10.1",
  "futures-channel",
+ "futures-core",
  "futures-util",
  "http 1.3.1",
  "http-body 1.0.1",
  "hyper 1.6.0",
+ "ipnet",
  "libc",
+ "percent-encoding",
  "pin-project-lite 0.2.16",
- "socket2 0.5.9",
- "tokio 1.44.2",
+ "socket2 0.5.10",
+ "system-configuration 0.6.1",
+ "tokio 1.45.1",
  "tower-service",
  "tracing",
+ "windows-registry",
 ]
 
 [[package]]
@@ -3515,7 +3492,7 @@ dependencies = [
  "js-sys",
  "log",
  "wasm-bindgen",
- "windows-core 0.61.0",
+ "windows-core",
 ]
 
 [[package]]
@@ -3529,21 +3506,22 @@ dependencies = [
 
 [[package]]
 name = "icu_collections"
-version = "1.5.0"
+version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "db2fa452206ebee18c4b5c2274dbf1de17008e874b4dc4f0aea9d01ca79e4526"
+checksum = "200072f5d0e3614556f94a9930d5dc3e0662a652823904c3a75dc3b0af7fee47"
 dependencies = [
  "displaydoc",
+ "potential_utf",
  "yoke",
  "zerofrom",
  "zerovec",
 ]
 
 [[package]]
-name = "icu_locid"
-version = "1.5.0"
+name = "icu_locale_core"
+version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "13acbb8371917fc971be86fc8057c41a64b521c184808a698c02acc242dbf637"
+checksum = "0cde2700ccaed3872079a65fb1a78f6c0a36c91570f28755dda67bc8f7d9f00a"
 dependencies = [
  "displaydoc",
  "litemap",
@@ -3552,31 +3530,11 @@ dependencies = [
  "zerovec",
 ]
 
-[[package]]
-name = "icu_locid_transform"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "01d11ac35de8e40fdeda00d9e1e9d92525f3f9d887cdd7aa81d727596788b54e"
-dependencies = [
- "displaydoc",
- "icu_locid",
- "icu_locid_transform_data",
- "icu_provider",
- "tinystr",
- "zerovec",
-]
-
-[[package]]
-name = "icu_locid_transform_data"
-version = "1.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7515e6d781098bf9f7205ab3fc7e9709d34554ae0b21ddbcb5febfa4bc7df11d"
-
 [[package]]
 name = "icu_normalizer"
-version = "1.5.0"
+version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "19ce3e0da2ec68599d193c93d088142efd7f9c5d6fc9b803774855747dc6a84f"
+checksum = "436880e8e18df4d7bbc06d58432329d6458cc84531f7ac5f024e93deadb37979"
 dependencies = [
  "displaydoc",
  "icu_collections",
@@ -3584,67 +3542,54 @@ dependencies = [
  "icu_properties",
  "icu_provider",
  "smallvec",
- "utf16_iter",
- "utf8_iter",
- "write16",
  "zerovec",
 ]
 
 [[package]]
 name = "icu_normalizer_data"
-version = "1.5.1"
+version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c5e8338228bdc8ab83303f16b797e177953730f601a96c25d10cb3ab0daa0cb7"
+checksum = "00210d6893afc98edb752b664b8890f0ef174c8adbb8d0be9710fa66fbbf72d3"
 
 [[package]]
 name = "icu_properties"
-version = "1.5.1"
+version = "2.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "93d6020766cfc6302c15dbbc9c8778c37e62c14427cb7f6e601d849e092aeef5"
+checksum = "016c619c1eeb94efb86809b015c58f479963de65bdb6253345c1a1276f22e32b"
 dependencies = [
  "displaydoc",
  "icu_collections",
- "icu_locid_transform",
+ "icu_locale_core",
  "icu_properties_data",
  "icu_provider",
- "tinystr",
+ "potential_utf",
+ "zerotrie",
  "zerovec",
 ]
 
 [[package]]
 name = "icu_properties_data"
-version = "1.5.1"
+version = "2.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85fb8799753b75aee8d2a21d7c14d9f38921b54b3dbda10f5a3c7a7b82dba5e2"
+checksum = "298459143998310acd25ffe6810ed544932242d3f07083eee1084d83a71bd632"
 
 [[package]]
 name = "icu_provider"
-version = "1.5.0"
+version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ed421c8a8ef78d3e2dbc98a973be2f3770cb42b606e3ab18d6237c4dfde68d9"
+checksum = "03c80da27b5f4187909049ee2d72f276f0d9f99a42c306bd0131ecfe04d8e5af"
 dependencies = [
  "displaydoc",
- "icu_locid",
- "icu_provider_macros",
+ "icu_locale_core",
  "stable_deref_trait",
  "tinystr",
  "writeable",
  "yoke",
  "zerofrom",
+ "zerotrie",
  "zerovec",
 ]
 
-[[package]]
-name = "icu_provider_macros"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6"
-dependencies = [
- "proc-macro2",
- "quote 1.0.40",
- "syn 2.0.101",
-]
-
 [[package]]
 name = "ident_case"
 version = "1.0.1"
@@ -3695,9 +3640,9 @@ dependencies = [
 
 [[package]]
 name = "idna_adapter"
-version = "1.2.0"
+version = "1.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "daca1df1c957320b2cf139ac61e7bd64fed304c5040df000a745aa1de3b4ef71"
+checksum = "3acae9609540aa318d1bc588455225fb2085b9ed0c4f6bd0d9d5bcd86f1a0344"
 dependencies = [
  "icu_normalizer",
  "icu_properties",
@@ -3788,7 +3733,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cea70ddb795996207ad57735b50c5982d8844f38ba9ee5f1aedcfb708a2aa11e"
 dependencies = [
  "equivalent",
- "hashbrown 0.15.2",
+ "hashbrown 0.15.3",
  "serde",
 ]
 
@@ -3842,7 +3787,7 @@ version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b58db92f96b720de98181bbbe63c831e87005ab460c1bf306eb2622b4707997f"
 dependencies = [
- "socket2 0.5.9",
+ "socket2 0.5.10",
  "widestring",
  "windows-sys 0.48.0",
  "winreg",
@@ -3854,13 +3799,23 @@ version = "2.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "469fb0b9cefa57e3ef31275ee7cacb78f2fdca44e4765491884a2b119d4eb130"
 
+[[package]]
+name = "iri-string"
+version = "0.7.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dbc5ebe9c3a1a7a5127f920a418f7585e9e758e911d0466ed004f393b0e380b2"
+dependencies = [
+ "memchr",
+ "serde",
+]
+
 [[package]]
 name = "is-terminal"
 version = "0.4.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e04d7f318608d35d4b61ddd75cbdaee86b023ebe2bd5a66ee0915f0bf93095a9"
 dependencies = [
- "hermit-abi 0.5.0",
+ "hermit-abi 0.5.1",
  "libc",
  "windows-sys 0.59.0",
 ]
@@ -3936,7 +3891,7 @@ version = "0.1.33"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "38f262f097c174adebe41eb73d66ae9c06b2844fb0da69969647bbddd9b0538a"
 dependencies = [
- "getrandom 0.3.2",
+ "getrandom 0.3.3",
  "libc",
 ]
 
@@ -4221,7 +4176,7 @@ dependencies = [
  "email_address",
  "fastrand 1.9.0",
  "futures-util",
- "hostname 0.3.1",
+ "hostname",
  "httpdate",
  "idna 0.3.0",
  "mime",
@@ -4230,7 +4185,7 @@ dependencies = [
  "once_cell",
  "quoted_printable",
  "socket2 0.4.10",
- "tokio 1.44.2",
+ "tokio 1.45.1",
 ]
 
 [[package]]
@@ -4263,19 +4218,19 @@ dependencies = [
 
 [[package]]
 name = "libloading"
-version = "0.8.6"
+version = "0.8.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fc2f4eb4bc735547cfed7c0a4922cbd04a4655978c09b54f1f7b228750664c34"
+checksum = "07033963ba89ebaf1584d767badaa2e8fcec21aedea6b8c0346d487d49c28667"
 dependencies = [
  "cfg-if",
- "windows-targets 0.52.6",
+ "windows-targets 0.53.0",
 ]
 
 [[package]]
 name = "libm"
-version = "0.2.13"
+version = "0.2.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c9627da5196e5d8ed0b0495e61e518847578da83483c37288316d9b2e03a7f72"
+checksum = "f9fbbcab51052fe104eb5e5d351cf728d30a5be1fe14d9be8a3b097481fb97de"
 
 [[package]]
 name = "libnghttp2-sys"
@@ -4347,15 +4302,15 @@ checksum = "cd945864f07fe9f5371a27ad7b52a172b4b499999f1d97574c9fa68373937e12"
 
 [[package]]
 name = "litemap"
-version = "0.7.5"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23fb14cb19457329c82206317a5663005a4d404783dc74f4252769b0d5f42856"
+checksum = "241eaef5fd12c88705a01fc1066c48c4b36e0dd4377dcdc7ec3942cea7a69956"
 
 [[package]]
 name = "livekit-api"
-version = "0.4.2"
+version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fcfd2e0622b4ef8a6d534c742071fcad52d4388047bd2182696dc080c8174d4e"
+checksum = "73fb2a1b706a08e27a951a9f2140746ff48be3d4e15ba3c80f9ef4c41ccd1d42"
 dependencies = [
  "base64 0.21.7",
  "http 0.2.12",
@@ -4377,9 +4332,9 @@ dependencies = [
 
 [[package]]
 name = "livekit-protocol"
-version = "0.3.9"
+version = "0.3.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0be4affc7654bf3f2c9571b02614ef27f436c5b68ee30db6151e8ab601f7e3fb"
+checksum = "5dc3a6cc2da425e0a0dd7e97795fe14b9215336c10a5df7f4a98a2948a41c76d"
 dependencies = [
  "futures-util",
  "livekit-runtime 0.4.0",
@@ -4390,7 +4345,7 @@ dependencies = [
  "prost-types",
  "serde",
  "thiserror 1.0.69",
- "tokio 1.44.2",
+ "tokio 1.45.1",
 ]
 
 [[package]]
@@ -4399,7 +4354,7 @@ version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6ae53eb874eb86e96e8ccffc31b5a00926d46174cbcb1c24ce4e57b1fcc5c8f6"
 dependencies = [
- "tokio 1.44.2",
+ "tokio 1.45.1",
  "tokio-stream",
 ]
 
@@ -4409,15 +4364,15 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "532e84c6cdc5fe774f2b5d9912597b5f3bea561927a48296d03e24549d21c3f6"
 dependencies = [
- "tokio 1.44.2",
+ "tokio 1.45.1",
  "tokio-stream",
 ]
 
 [[package]]
 name = "lock_api"
-version = "0.4.12"
+version = "0.4.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17"
+checksum = "96936507f153605bddfcda068dd804796c84324ed2510809e5b2a624c81da765"
 dependencies = [
  "autocfg 1.4.0",
  "scopeguard",
@@ -4488,7 +4443,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "419e0dc8046cb947daa77eb95ae174acfbddb7673b4151f56d1eed8e93fbfaca"
 dependencies = [
  "cfg-if",
- "generator 0.8.4",
+ "generator 0.8.5",
  "scoped-tls",
  "tracing",
  "tracing-subscriber",
@@ -4527,7 +4482,7 @@ version = "0.12.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "234cf4f4a04dc1f57e24b96cc0cd600cf2af460d4161ac5ecdd0af8e1f3b2a38"
 dependencies = [
- "hashbrown 0.15.2",
+ "hashbrown 0.15.3",
 ]
 
 [[package]]
@@ -4681,7 +4636,7 @@ version = "0.23.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3045b4193fbdc5b5681f32f11070da9be3609f189a79f3390706d42587f46bb5"
 dependencies = [
- "ahash 0.8.11",
+ "ahash 0.8.12",
  "portable-atomic",
 ]
 
@@ -4709,13 +4664,13 @@ dependencies = [
 
 [[package]]
 name = "mio"
-version = "1.0.3"
+version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2886843bf800fba2e3377cff24abf6379b4c4d5c6681eaf9ea5b0d15090450bd"
+checksum = "78bed444cc8a2160f01cbcf811ef18cac863ad68ae8ca62092e8db51d51c761c"
 dependencies = [
  "libc",
  "wasi 0.11.0+wasi-snapshot-preview1",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -4733,7 +4688,7 @@ dependencies = [
  "log",
  "metrics",
  "thiserror 1.0.69",
- "tokio 1.44.2",
+ "tokio 1.45.1",
  "tracing",
  "tracing-subscriber",
 ]
@@ -4806,12 +4761,12 @@ dependencies = [
  "serde_with",
  "sha-1",
  "sha2",
- "socket2 0.5.9",
+ "socket2 0.5.10",
  "stringprep",
  "strsim 0.11.1",
  "take_mut",
  "thiserror 1.0.69",
- "tokio 1.44.2",
+ "tokio 1.45.1",
  "tokio-rustls 0.24.1",
  "tokio-util",
  "typed-builder",
@@ -4845,16 +4800,16 @@ dependencies = [
  "memchr",
  "mime",
  "spin",
- "tokio 1.44.2",
+ "tokio 1.45.1",
  "tokio-util",
  "version_check",
 ]
 
 [[package]]
 name = "multimap"
-version = "0.10.0"
+version = "0.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "defc4c55412d89136f966bbb339008b474350e5e6e78d2714439c386b3137a03"
+checksum = "1d87ecb2933e8aeadb3e3a02b828fed80a7528047e68b4f424523a0981a3a084"
 
 [[package]]
 name = "mutate_once"
@@ -4888,43 +4843,6 @@ dependencies = [
  "tempfile",
 ]
 
-[[package]]
-name = "neon"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7d75440242411c87dc39847b0e33e961ec1f10326a9d8ecf9c1ea64a3b3c13dc"
-dependencies = [
- "getrandom 0.2.16",
- "libloading",
- "neon-macros",
- "once_cell",
- "semver",
- "send_wrapper",
- "smallvec",
-]
-
-[[package]]
-name = "neon-macros"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c6813fde79b646e47e7ad75f480aa80ef76a5d9599e2717407961531169ee38b"
-dependencies = [
- "quote 1.0.40",
- "syn 2.0.101",
- "syn-mid",
-]
-
-[[package]]
-name = "neon-serde4"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8778b4afaa506e067da24566623873c38797987be593232a4f9ad82c84bb3eb3"
-dependencies = [
- "neon",
- "num",
- "serde",
-]
-
 [[package]]
 name = "new_debug_unreachable"
 version = "1.0.6"
@@ -4966,19 +4884,6 @@ dependencies = [
  "winapi",
 ]
 
-[[package]]
-name = "num"
-version = "0.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "35bd024e8b2ff75562e5f34e7f4905839deb4b22955ef5e73d2fea1b9813cb23"
-dependencies = [
- "num-complex",
- "num-integer",
- "num-iter",
- "num-rational",
- "num-traits",
-]
-
 [[package]]
 name = "num-bigint"
 version = "0.4.6"
@@ -5006,15 +4911,6 @@ dependencies = [
  "zeroize",
 ]
 
-[[package]]
-name = "num-complex"
-version = "0.4.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "73f88a1307638156682bada9d7604135552957b7818057dcef22705b4d509495"
-dependencies = [
- "num-traits",
-]
-
 [[package]]
 name = "num-conv"
 version = "0.1.0"
@@ -5075,11 +4971,11 @@ dependencies = [
 
 [[package]]
 name = "num_cpus"
-version = "1.16.0"
+version = "1.17.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43"
+checksum = "91df4bbde75afed763b708b7eee1e8e7651e02d97f6d5dd763e89367e957b23b"
 dependencies = [
- "hermit-abi 0.3.9",
+ "hermit-abi 0.5.1",
  "libc",
 ]
 
@@ -5157,11 +5053,11 @@ checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381"
 
 [[package]]
 name = "openssl"
-version = "0.10.72"
+version = "0.10.73"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fedfea7d58a1f73118430a55da6a286e7b044961736ce96a16a17068ea25e5da"
+checksum = "8505734d46c8ab1e19a1dce3aef597ad87dcb4c37e7188231769bd6bd51cebf8"
 dependencies = [
- "bitflags 2.9.0",
+ "bitflags 2.9.1",
  "cfg-if",
  "foreign-types",
  "libc",
@@ -5189,9 +5085,9 @@ checksum = "d05e27ee213611ffe7d6348b942e8f942b37114c00cc03cec254295a4a17852e"
 
 [[package]]
 name = "openssl-sys"
-version = "0.9.107"
+version = "0.9.109"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8288979acd84749c744a9014b4382d42b8f7b2592847b5afb2ed29e5d16ede07"
+checksum = "90096e2e47630d78b7d1c20952dc621f957103f8bc2c8359ec81290d75238571"
 dependencies = [
  "cc",
  "libc",
@@ -5211,9 +5107,9 @@ dependencies = [
 
 [[package]]
 name = "os_info"
-version = "3.10.0"
+version = "3.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a604e53c24761286860eba4e2c8b23a0161526476b1de520139d69cdb85a6b5"
+checksum = "41fc863e2ca13dc2d5c34fb22ea4a588248ac14db929616ba65c45f21744b1e9"
 dependencies = [
  "log",
  "serde",
@@ -5275,9 +5171,9 @@ checksum = "f38d5652c16fde515bb1ecef450ab0f6a219d619a7274976324d5e377f7dceba"
 
 [[package]]
 name = "parking_lot"
-version = "0.12.3"
+version = "0.12.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27"
+checksum = "70d58bf43669b5795d1576d0641cfb6fbb2057bf629506267a92807158584a13"
 dependencies = [
  "lock_api",
  "parking_lot_core",
@@ -5285,9 +5181,9 @@ dependencies = [
 
 [[package]]
 name = "parking_lot_core"
-version = "0.9.10"
+version = "0.9.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8"
+checksum = "bc838d2a56b5b1a6c25f55575dfc605fabb63bb2365f6c2353ef9159aa69e4a5"
 dependencies = [
  "cfg-if",
  "libc",
@@ -5691,15 +5587,15 @@ dependencies = [
 
 [[package]]
 name = "polling"
-version = "3.7.4"
+version = "3.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a604568c3202727d1507653cb121dbd627a58684eb09a820fd746bee38b4442f"
+checksum = "b53a684391ad002dd6a596ceb6c74fd004fdce75f4be2e3f615068abbea5fd50"
 dependencies = [
  "cfg-if",
  "concurrent-queue",
- "hermit-abi 0.4.0",
+ "hermit-abi 0.5.1",
  "pin-project-lite 0.2.16",
- "rustix 0.38.44",
+ "rustix 1.0.7",
  "tracing",
  "windows-sys 0.59.0",
 ]
@@ -5722,6 +5618,15 @@ version = "1.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "350e9b48cbc6b0e028b0473b114454c6316e57336ee184ceab6e53f72c178b3e"
 
+[[package]]
+name = "potential_utf"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e5a7c30837279ca13e7c867e9e40053bc68740f988cb07f7ca6df43cc734b585"
+dependencies = [
+ "zerovec",
+]
+
 [[package]]
 name = "powerfmt"
 version = "0.2.0"
@@ -5734,7 +5639,7 @@ version = "0.2.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "85eae3c4ed2f50dcfe72643da4befc30deadb458a9b590d720cde2f2b1e97da9"
 dependencies = [
- "zerocopy 0.8.25",
+ "zerocopy",
 ]
 
 [[package]]
@@ -5755,9 +5660,9 @@ dependencies = [
 
 [[package]]
 name = "prettyplease"
-version = "0.2.32"
+version = "0.2.33"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "664ec5419c51e34154eec046ebcba56312d5a2fc3b09a06da188e1ad21afadf6"
+checksum = "9dee91521343f4c5c6a63edd65e54f31f5c92fe8978c40a4282f8372194c6a7d"
 dependencies = [
  "proc-macro2",
  "syn 2.0.101",
@@ -6096,7 +6001,7 @@ version = "0.9.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "99d9a13982dcf210057a8a78572b2217b667c3beacbf3a0d8b454f6f82837d38"
 dependencies = [
- "getrandom 0.3.2",
+ "getrandom 0.3.3",
 ]
 
 [[package]]
@@ -6257,7 +6162,7 @@ dependencies = [
  "ryu",
  "sha1_smol",
  "socket2 0.4.10",
- "tokio 1.44.2",
+ "tokio 1.45.1",
  "tokio-util",
  "url",
 ]
@@ -6294,11 +6199,11 @@ dependencies = [
 
 [[package]]
 name = "redox_syscall"
-version = "0.5.11"
+version = "0.5.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2f103c6d277498fbceb16e84d317e2a400f160f46904d5f5410848c829511a3"
+checksum = "928fca9cf2aa042393a8325b9ead81d2f0df4cb12e1e24cef072922ccd99c5af"
 dependencies = [
- "bitflags 2.9.0",
+ "bitflags 2.9.1",
 ]
 
 [[package]]
@@ -6401,7 +6306,7 @@ dependencies = [
  "serde_urlencoded",
  "sync_wrapper 0.1.2",
  "system-configuration 0.5.1",
- "tokio 1.44.2",
+ "tokio 1.45.1",
  "tokio-native-tls",
  "tower-service",
  "url",
@@ -6413,21 +6318,20 @@ dependencies = [
 
 [[package]]
 name = "reqwest"
-version = "0.12.15"
+version = "0.12.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d19c46a6fdd48bc4dab94b6103fccc55d34c67cc0ad04653aad4ea2a07cd7bbb"
+checksum = "e98ff6b0dbbe4d5a37318f433d4fc82babd21631f194d370409ceb2e40b2f0b5"
 dependencies = [
  "base64 0.22.1",
  "bytes 1.10.1",
  "encoding_rs",
  "futures-core",
- "futures-util",
- "h2 0.4.9",
+ "h2 0.4.10",
  "http 1.3.1",
  "http-body 1.0.1",
  "http-body-util",
  "hyper 1.6.0",
- "hyper-rustls 0.27.5",
+ "hyper-rustls 0.27.6",
  "hyper-tls 0.6.0",
  "hyper-util",
  "ipnet",
@@ -6438,31 +6342,27 @@ dependencies = [
  "once_cell",
  "percent-encoding",
  "pin-project-lite 0.2.16",
- "rustls-pemfile 2.2.0",
+ "rustls-pki-types",
  "serde",
  "serde_json",
  "serde_urlencoded",
  "sync_wrapper 1.0.2",
- "system-configuration 0.6.1",
- "tokio 1.44.2",
+ "tokio 1.45.1",
  "tokio-native-tls",
  "tower",
+ "tower-http 0.6.4",
  "tower-service",
  "url",
  "wasm-bindgen",
  "wasm-bindgen-futures",
  "web-sys",
- "windows-registry",
 ]
 
 [[package]]
 name = "resolv-conf"
-version = "0.7.1"
+version = "0.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "48375394603e3dd4b2d64371f7148fd8c7baa2680e28741f2cb8d23b59e3d4c4"
-dependencies = [
- "hostname 0.4.1",
-]
+checksum = "95325155c684b1c89f7765e30bc1c42e4a6da51ca513615660cb8a62ef9a88e3"
 
 [[package]]
 name = "resvg"
@@ -6483,7 +6383,7 @@ dependencies = [
 
 [[package]]
 name = "revolt-autumn"
-version = "0.8.4"
+version = "0.8.7"
 dependencies = [
  "axum",
  "axum-macros",
@@ -6508,8 +6408,8 @@ dependencies = [
  "simdutf8",
  "strum_macros",
  "tempfile",
- "tokio 1.44.2",
- "tower-http",
+ "tokio 1.45.1",
+ "tower-http 0.5.2",
  "tracing",
  "tracing-subscriber",
  "ulid 1.2.1",
@@ -6520,7 +6420,7 @@ dependencies = [
 
 [[package]]
 name = "revolt-bonfire"
-version = "0.8.4"
+version = "0.8.7"
 dependencies = [
  "async-channel 2.3.1",
  "async-std",
@@ -6550,7 +6450,7 @@ dependencies = [
 
 [[package]]
 name = "revolt-config"
-version = "0.8.4"
+version = "0.8.7"
 dependencies = [
  "async-std",
  "cached",
@@ -6561,24 +6461,25 @@ dependencies = [
  "pretty_env_logger",
  "revolt-result",
  "sentry",
+ "sentry-anyhow",
  "serde",
 ]
 
 [[package]]
 name = "revolt-crond"
-version = "0.8.4"
+version = "0.8.7"
 dependencies = [
  "log",
  "revolt-config",
  "revolt-database",
  "revolt-files",
  "revolt-result",
- "tokio 1.44.2",
+ "tokio 1.45.1",
 ]
 
 [[package]]
 name = "revolt-database"
-version = "0.8.4"
+version = "0.8.7"
 dependencies = [
  "amqprs",
  "async-lock 2.8.0",
@@ -6631,7 +6532,7 @@ dependencies = [
 
 [[package]]
 name = "revolt-delta"
-version = "0.8.4"
+version = "0.8.7"
 dependencies = [
  "amqprs",
  "async-channel 1.9.0",
@@ -6680,7 +6581,7 @@ dependencies = [
 
 [[package]]
 name = "revolt-files"
-version = "0.8.4"
+version = "0.8.7"
 dependencies = [
  "aes-gcm",
  "aws-config",
@@ -6703,7 +6604,7 @@ dependencies = [
 
 [[package]]
 name = "revolt-january"
-version = "0.8.4"
+version = "0.8.7"
 dependencies = [
  "async-recursion",
  "axum",
@@ -6713,7 +6614,7 @@ dependencies = [
  "mime",
  "moka",
  "regex",
- "reqwest 0.12.15",
+ "reqwest 0.12.18",
  "revolt-config",
  "revolt-files",
  "revolt-models",
@@ -6722,7 +6623,7 @@ dependencies = [
  "serde",
  "serde_json",
  "tempfile",
- "tokio 1.44.2",
+ "tokio 1.45.1",
  "tracing",
  "tracing-subscriber",
  "utoipa",
@@ -6731,7 +6632,7 @@ dependencies = [
 
 [[package]]
 name = "revolt-models"
-version = "0.8.4"
+version = "0.8.7"
 dependencies = [
  "indexmap 1.9.3",
  "iso8601-timestamp",
@@ -6748,29 +6649,16 @@ dependencies = [
  "validator 0.16.1",
 ]
 
-[[package]]
-name = "revolt-nodejs-bindings"
-version = "0.8.4"
-dependencies = [
- "async-std",
- "neon",
- "neon-serde4",
- "revolt-config",
- "revolt-database",
- "revolt-result",
- "serde",
-]
-
 [[package]]
 name = "revolt-parser"
-version = "0.1.0"
+version = "0.8.7"
 dependencies = [
  "logos",
 ]
 
 [[package]]
 name = "revolt-permissions"
-version = "0.8.4"
+version = "0.8.7"
 dependencies = [
  "async-std",
  "async-trait",
@@ -6785,7 +6673,7 @@ dependencies = [
 
 [[package]]
 name = "revolt-presence"
-version = "0.8.4"
+version = "0.8.7"
 dependencies = [
  "async-std",
  "log",
@@ -6796,9 +6684,10 @@ dependencies = [
 
 [[package]]
 name = "revolt-pushd"
-version = "0.8.4"
+version = "0.8.7"
 dependencies = [
  "amqprs",
+ "anyhow",
  "async-trait",
  "authifier",
  "base64 0.22.1",
@@ -6811,18 +6700,19 @@ dependencies = [
  "revolt-database",
  "revolt-models",
  "revolt-presence",
+ "revolt-result",
  "revolt_a2",
  "revolt_optional_struct",
  "serde",
  "serde_json",
- "tokio 1.44.2",
+ "tokio 1.45.1",
  "ulid 1.2.1",
  "web-push",
 ]
 
 [[package]]
 name = "revolt-result"
-version = "0.8.4"
+version = "0.8.7"
 dependencies = [
  "axum",
  "log",
@@ -6882,7 +6772,7 @@ dependencies = [
  "serde",
  "serde_json",
  "thiserror 1.0.69",
- "tokio 1.44.2",
+ "tokio 1.45.1",
 ]
 
 [[package]]
@@ -7038,7 +6928,7 @@ dependencies = [
  "state",
  "tempfile",
  "time",
- "tokio 1.44.2",
+ "tokio 1.45.1",
  "tokio-stream",
  "tokio-util",
  "ubyte",
@@ -7048,9 +6938,9 @@ dependencies = [
 
 [[package]]
 name = "rocket_authifier"
-version = "1.0.12"
+version = "1.0.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8a325016a62c2541a19bf4d74c93bfc16674526bcd49d94f2fdaa6f8b599e0b"
+checksum = "c1f98a5be96ac4144ee1adc809c1594e8212032b8a08d9bc4cef70735dfd976e"
 dependencies = [
  "authifier",
  "iso8601-timestamp",
@@ -7129,7 +7019,7 @@ dependencies = [
  "stable-pattern",
  "state",
  "time",
- "tokio 1.44.2",
+ "tokio 1.45.1",
  "uncased",
 ]
 
@@ -7240,7 +7130,7 @@ version = "0.38.44"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fdb5bc1ae2baa591800df16c9ca78619bf65c0488b41b96ccec5d11220d8c154"
 dependencies = [
- "bitflags 2.9.0",
+ "bitflags 2.9.1",
  "errno",
  "libc",
  "linux-raw-sys 0.4.15",
@@ -7249,11 +7139,11 @@ dependencies = [
 
 [[package]]
 name = "rustix"
-version = "1.0.5"
+version = "1.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d97817398dd4bb2e6da002002db259209759911da105da92bec29ccb12cf58bf"
+checksum = "c71e83d6afe7ff64890ec6b71d6a69bb8a610ab78ce364b3352876bb4c801266"
 dependencies = [
- "bitflags 2.9.0",
+ "bitflags 2.9.1",
  "errno",
  "libc",
  "linux-raw-sys 0.9.4",
@@ -7288,14 +7178,14 @@ dependencies = [
 
 [[package]]
 name = "rustls"
-version = "0.23.26"
+version = "0.23.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df51b5869f3a441595eac5e8ff14d486ff285f7b8c0df8770e49c3b56351f0f0"
+checksum = "730944ca083c1c233a75c09f199e973ca499344a2b7ba9e755c457e86fb4a321"
 dependencies = [
  "aws-lc-rs",
  "once_cell",
  "rustls-pki-types",
- "rustls-webpki 0.103.1",
+ "rustls-webpki 0.103.3",
  "subtle",
  "zeroize",
 ]
@@ -7344,9 +7234,12 @@ dependencies = [
 
 [[package]]
 name = "rustls-pki-types"
-version = "1.11.0"
+version = "1.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "917ce264624a4b4db1c364dcc35bfca9ded014d0a958cd47ad3e960e988ea51c"
+checksum = "229a4a4c221013e7e1f1a043678c5cc39fe5171437c88fb47151a21e6f5b5c79"
+dependencies = [
+ "zeroize",
+]
 
 [[package]]
 name = "rustls-webpki"
@@ -7371,9 +7264,9 @@ dependencies = [
 
 [[package]]
 name = "rustls-webpki"
-version = "0.103.1"
+version = "0.103.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fef8b8769aaccf73098557a87cd1816b4f9c7c16811c9c77142aa695c16f2c03"
+checksum = "e4a72fe2bcf7a6ac6fd7d0b9e5cb68aeb7d4c0a0271730218b3e92d43b4eb435"
 dependencies = [
  "aws-lc-rs",
  "ring",
@@ -7383,9 +7276,9 @@ dependencies = [
 
 [[package]]
 name = "rustversion"
-version = "1.0.20"
+version = "1.0.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eded382c5f5f786b989652c49544c4877d9f015cc22e145a5ea8ea66c2921cd2"
+checksum = "8a0d197bd2c9dc6e53b84da9556a69ba4cdfab8619eb41a8bd1cc2027a0f6b1d"
 
 [[package]]
 name = "rustybuzz"
@@ -7393,7 +7286,7 @@ version = "0.18.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c85d1ccd519e61834798eb52c4e886e8c2d7d698dd3d6ce0b1b47eb8557f1181"
 dependencies = [
- "bitflags 2.9.0",
+ "bitflags 2.9.1",
  "bytemuck",
  "core_maths",
  "log",
@@ -7463,7 +7356,7 @@ version = "0.20.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b90460b31bfe1fc07be8262e42c665ad97118d4585869de9345a84d501a9eaf0"
 dependencies = [
- "ahash 0.8.11",
+ "ahash 0.8.12",
  "cssparser",
  "ego-tree",
  "getopts",
@@ -7534,7 +7427,7 @@ version = "2.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02"
 dependencies = [
- "bitflags 2.9.0",
+ "bitflags 2.9.1",
  "core-foundation 0.9.4",
  "core-foundation-sys",
  "libc",
@@ -7547,8 +7440,8 @@ version = "3.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "271720403f46ca04f7ba6f55d438f8bd878d6b8ca0a1046e8228c4145bcbb316"
 dependencies = [
- "bitflags 2.9.0",
- "core-foundation 0.10.0",
+ "bitflags 2.9.1",
+ "core-foundation 0.10.1",
  "core-foundation-sys",
  "libc",
  "security-framework-sys",
@@ -7570,7 +7463,7 @@ version = "0.25.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4eb30575f3638fc8f6815f448d50cb1a2e255b0897985c8c59f4d37b72a07b06"
 dependencies = [
- "bitflags 2.9.0",
+ "bitflags 2.9.1",
  "cssparser",
  "derive_more",
  "fxhash",
@@ -7589,12 +7482,6 @@ version = "1.0.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "56e6fa9c48d24d85fb3de5ad847117517440f6beceb7798af16b4a87d616b8d0"
 
-[[package]]
-name = "send_wrapper"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd0b0ec5f1c1ca621c432a25813d8d60c88abe6d3e08a3eb9cf37d97a0fe3d73"
-
 [[package]]
 name = "sentry"
 version = "0.31.8"
@@ -7604,16 +7491,27 @@ dependencies = [
  "httpdate",
  "native-tls",
  "reqwest 0.11.27",
- "sentry-backtrace",
+ "sentry-backtrace 0.31.8",
  "sentry-contexts",
- "sentry-core",
+ "sentry-core 0.31.8",
  "sentry-debug-images",
  "sentry-panic",
  "sentry-tracing",
- "tokio 1.44.2",
+ "tokio 1.45.1",
  "ureq",
 ]
 
+[[package]]
+name = "sentry-anyhow"
+version = "0.38.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3c93cfb800654dc846ccbeb35254a2f6f194aaf7e187223fd90aeb7afafe722c"
+dependencies = [
+ "anyhow",
+ "sentry-backtrace 0.38.1",
+ "sentry-core 0.38.1",
+]
+
 [[package]]
 name = "sentry-backtrace"
 version = "0.31.8"
@@ -7623,7 +7521,18 @@ dependencies = [
  "backtrace",
  "once_cell",
  "regex",
- "sentry-core",
+ "sentry-core 0.31.8",
+]
+
+[[package]]
+name = "sentry-backtrace"
+version = "0.38.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8dace796060e4ad10e3d1405b122ae184a8b2e71dce05ae450e4f81b7686b0d9"
+dependencies = [
+ "backtrace",
+ "regex",
+ "sentry-core 0.38.1",
 ]
 
 [[package]]
@@ -7632,11 +7541,11 @@ version = "0.31.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6436c1bad22cdeb02179ea8ef116ffc217797c028927def303bc593d9320c0d1"
 dependencies = [
- "hostname 0.3.1",
+ "hostname",
  "libc",
  "os_info",
  "rustc_version",
- "sentry-core",
+ "sentry-core 0.31.8",
  "uname",
 ]
 
@@ -7648,7 +7557,18 @@ checksum = "901f761681f97db3db836ef9e094acdd8756c40215326c194201941947164ef1"
 dependencies = [
  "once_cell",
  "rand 0.8.5",
- "sentry-types",
+ "sentry-types 0.31.8",
+ "serde",
+ "serde_json",
+]
+
+[[package]]
+name = "sentry-core"
+version = "0.38.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7426d4beec270cfdbb50f85f0bb2ce176ea57eed0b11741182a163055a558187"
+dependencies = [
+ "sentry-types 0.38.1",
  "serde",
  "serde_json",
 ]
@@ -7661,7 +7581,7 @@ checksum = "afdb263e73d22f39946f6022ed455b7561b22ff5553aca9be3c6a047fa39c328"
 dependencies = [
  "findshlibs",
  "once_cell",
- "sentry-core",
+ "sentry-core 0.31.8",
 ]
 
 [[package]]
@@ -7670,8 +7590,8 @@ version = "0.31.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "74fbf1c163f8b6a9d05912e1b272afa27c652e8b47ea60cb9a57ad5e481eea99"
 dependencies = [
- "sentry-backtrace",
- "sentry-core",
+ "sentry-backtrace 0.31.8",
+ "sentry-core 0.31.8",
 ]
 
 [[package]]
@@ -7680,8 +7600,8 @@ version = "0.31.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "82eabcab0a047040befd44599a1da73d3adb228ff53b5ed9795ae04535577704"
 dependencies = [
- "sentry-backtrace",
- "sentry-core",
+ "sentry-backtrace 0.31.8",
+ "sentry-core 0.31.8",
  "tracing-core",
  "tracing-subscriber",
 ]
@@ -7703,6 +7623,23 @@ dependencies = [
  "uuid",
 ]
 
+[[package]]
+name = "sentry-types"
+version = "0.38.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "04b6c9287202294685cb1f749b944dbbce8160b81a1061ecddc073025fed129f"
+dependencies = [
+ "debugid",
+ "hex",
+ "rand 0.9.1",
+ "serde",
+ "serde_json",
+ "thiserror 2.0.12",
+ "time",
+ "url",
+ "uuid",
+]
+
 [[package]]
 name = "serde"
 version = "1.0.219"
@@ -7865,9 +7802,9 @@ checksum = "bbfa15b3dddfee50a0fff136974b3e1bde555604ba463834a7eb7deb6417705d"
 
 [[package]]
 name = "sha2"
-version = "0.10.8"
+version = "0.10.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8"
+checksum = "a7507d819769d01a365ab707794a4084392c824f54a7a6a7862f8c3d0892b283"
 dependencies = [
  "cfg-if",
  "cpufeatures",
@@ -8007,9 +7944,9 @@ dependencies = [
 
 [[package]]
 name = "socket2"
-version = "0.5.9"
+version = "0.5.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4f5fd57c80058a56cf5c777ab8a126398ece8e442983605d280a44ce79d0edef"
+checksum = "e22376abed350d73dd1cd119b57ffccad95b4e585a7cda43e286245ce23c0678"
 dependencies = [
  "libc",
  "windows-sys 0.52.0",
@@ -8184,17 +8121,6 @@ dependencies = [
  "unicode-ident",
 ]
 
-[[package]]
-name = "syn-mid"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b5dc35bb08dd1ca3dfb09dce91fd2d13294d6711c88897d9a9d60acf39bce049"
-dependencies = [
- "proc-macro2",
- "quote 1.0.40",
- "syn 2.0.101",
-]
-
 [[package]]
 name = "sync_wrapper"
 version = "0.1.2"
@@ -8233,9 +8159,9 @@ dependencies = [
 
 [[package]]
 name = "synstructure"
-version = "0.13.1"
+version = "0.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971"
+checksum = "728a70f3dbaf5bab7f0c4b1ac8d7ae5ea60a4b5549c8a5914361c99147a709d2"
 dependencies = [
  "proc-macro2",
  "quote 1.0.40",
@@ -8273,7 +8199,7 @@ version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3c879d448e9d986b661742763247d3693ed13609438cf3d006f51f5368a5ba6b"
 dependencies = [
- "bitflags 2.9.0",
+ "bitflags 2.9.1",
  "core-foundation 0.9.4",
  "system-configuration-sys 0.6.0",
 ]
@@ -8337,14 +8263,14 @@ checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1"
 
 [[package]]
 name = "tempfile"
-version = "3.19.1"
+version = "3.20.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7437ac7763b9b123ccf33c338a5cc1bac6f69b45a136c19bdd8a65e3916435bf"
+checksum = "e8a64e3985349f2441a1a9ef0b853f869006c3855f2cda6862a94d26ebb9d6a1"
 dependencies = [
  "fastrand 2.3.0",
- "getrandom 0.3.2",
+ "getrandom 0.3.3",
  "once_cell",
- "rustix 1.0.5",
+ "rustix 1.0.7",
  "windows-sys 0.59.0",
 ]
 
@@ -8499,9 +8425,9 @@ dependencies = [
 
 [[package]]
 name = "tinystr"
-version = "0.7.6"
+version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9117f5d4db391c1cf6927e7bea3db74b9a1c1add8f7eda9ffd5364f40f57b82f"
+checksum = "5d4f6d1145dcb577acf783d4e601bc1d76a13337bb54e6233add580b07344c8b"
 dependencies = [
  "displaydoc",
  "zerovec",
@@ -8535,9 +8461,9 @@ dependencies = [
 
 [[package]]
 name = "tokio"
-version = "1.44.2"
+version = "1.45.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6b88822cbe49de4185e3a4cbf8321dd487cf5fe0c5c65695fef6346371e9c48"
+checksum = "75ef51a33ef1da925cea3e4eb122833cb377c61439ca401b770f54902b806779"
 dependencies = [
  "backtrace",
  "bytes 1.10.1",
@@ -8546,7 +8472,7 @@ dependencies = [
  "parking_lot",
  "pin-project-lite 0.2.16",
  "signal-hook-registry",
- "socket2 0.5.9",
+ "socket2 0.5.10",
  "tokio-macros",
  "windows-sys 0.52.0",
 ]
@@ -8569,7 +8495,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2"
 dependencies = [
  "native-tls",
- "tokio 1.44.2",
+ "tokio 1.45.1",
 ]
 
 [[package]]
@@ -8579,7 +8505,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081"
 dependencies = [
  "rustls 0.21.12",
- "tokio 1.44.2",
+ "tokio 1.45.1",
 ]
 
 [[package]]
@@ -8590,7 +8516,7 @@ checksum = "775e0c0f0adb3a2f22a00c4745d728b479985fc15ee7ca6a2608388c5569860f"
 dependencies = [
  "rustls 0.22.4",
  "rustls-pki-types",
- "tokio 1.44.2",
+ "tokio 1.45.1",
 ]
 
 [[package]]
@@ -8599,8 +8525,8 @@ version = "0.26.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8e727b36a1a0e8b74c376ac2211e40c2c8af09fb4013c60d910495810f008e9b"
 dependencies = [
- "rustls 0.23.26",
- "tokio 1.44.2",
+ "rustls 0.23.27",
+ "tokio 1.45.1",
 ]
 
 [[package]]
@@ -8611,7 +8537,7 @@ checksum = "eca58d7bba4a75707817a2c44174253f9236b2d5fbd055602e9d5c07c139a047"
 dependencies = [
  "futures-core",
  "pin-project-lite 0.2.16",
- "tokio 1.44.2",
+ "tokio 1.45.1",
 ]
 
 [[package]]
@@ -8625,7 +8551,7 @@ dependencies = [
  "futures-io",
  "futures-sink",
  "pin-project-lite 0.2.16",
- "tokio 1.44.2",
+ "tokio 1.45.1",
 ]
 
 [[package]]
@@ -8680,7 +8606,7 @@ dependencies = [
  "serde_spanned",
  "toml_datetime",
  "toml_write",
- "winnow 0.7.7",
+ "winnow 0.7.10",
 ]
 
 [[package]]
@@ -8711,7 +8637,7 @@ dependencies = [
  "futures-util",
  "pin-project-lite 0.2.16",
  "sync_wrapper 1.0.2",
- "tokio 1.44.2",
+ "tokio 1.45.1",
  "tower-layer",
  "tower-service",
  "tracing",
@@ -8723,7 +8649,7 @@ version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1e9cd434a998747dd2c4276bc96ee2e0c7a2eadf3cae88e52be55a05fa9053f5"
 dependencies = [
- "bitflags 2.9.0",
+ "bitflags 2.9.1",
  "bytes 1.10.1",
  "http 1.3.1",
  "http-body 1.0.1",
@@ -8733,6 +8659,24 @@ dependencies = [
  "tower-service",
 ]
 
+[[package]]
+name = "tower-http"
+version = "0.6.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0fdb0c213ca27a9f57ab69ddb290fd80d970922355b83ae380b395d3986b8a2e"
+dependencies = [
+ "bitflags 2.9.1",
+ "bytes 1.10.1",
+ "futures-util",
+ "http 1.3.1",
+ "http-body 1.0.1",
+ "iri-string",
+ "pin-project-lite 0.2.16",
+ "tower",
+ "tower-layer",
+ "tower-service",
+]
+
 [[package]]
 name = "tower-layer"
 version = "0.3.3"
@@ -8902,6 +8846,7 @@ checksum = "220b18413e1fe5e85a5580b22f44241f82404a66c792c9f3c9eda74c52d9a22e"
 dependencies = [
  "chrono",
  "rand 0.8.5",
+ "serde",
 ]
 
 [[package]]
@@ -9113,12 +9058,6 @@ version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9"
 
-[[package]]
-name = "utf16_iter"
-version = "1.0.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c8232dd3cdaed5356e0f716d285e4b40b932ac434100fe9b7e0e8e935b9e6246"
-
 [[package]]
 name = "utf8_iter"
 version = "1.0.4"
@@ -9165,11 +9104,11 @@ dependencies = [
 
 [[package]]
 name = "uuid"
-version = "1.16.0"
+version = "1.17.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "458f7a779bf54acc9f347480ac654f68407d3aab21269a6e3c9f922acd9e2da9"
+checksum = "3cf4199d1e5d15ddd86a694e4d0dffa9c323ce759fea589f00fef9d81cc1931d"
 dependencies = [
- "getrandom 0.3.2",
+ "getrandom 0.3.3",
  "js-sys",
  "serde",
  "wasm-bindgen",
@@ -9467,18 +9406,27 @@ checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1"
 
 [[package]]
 name = "webpki-roots"
-version = "0.26.9"
+version = "0.26.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "29aad86cec885cafd03e8305fd727c418e970a521322c91688414d5b8efba16b"
+checksum = "521bc38abb08001b01866da9f51eb7c5d647a19260e00054a8c7fd5f9e57f7a9"
+dependencies = [
+ "webpki-roots 1.0.0",
+]
+
+[[package]]
+name = "webpki-roots"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2853738d1cc4f2da3a225c18ec6c3721abb31961096e9dbf5ab35fa88b19cfdb"
 dependencies = [
  "rustls-pki-types",
 ]
 
 [[package]]
 name = "weezl"
-version = "0.1.8"
+version = "0.1.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "53a85b86a771b1c87058196170769dd264f66c0782acf1ae6cc51bfd64b39082"
+checksum = "a751b3277700db47d3e574514de2eced5e54dc8a5436a3bf7a0b248b2cee16f3"
 
 [[package]]
 name = "which"
@@ -9540,49 +9488,48 @@ dependencies = [
 
 [[package]]
 name = "windows"
-version = "0.58.0"
+version = "0.61.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd04d41d93c4992d421894c18c8b43496aa748dd4c081bac0dc93eb0489272b6"
+checksum = "c5ee8f3d025738cb02bad7868bbb5f8a6327501e870bf51f1b455b0a2454a419"
 dependencies = [
- "windows-core 0.58.0",
- "windows-targets 0.52.6",
+ "windows-collections",
+ "windows-core",
+ "windows-future",
+ "windows-link",
+ "windows-numerics",
 ]
 
 [[package]]
-name = "windows-core"
-version = "0.58.0"
+name = "windows-collections"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ba6d44ec8c2591c134257ce647b7ea6b20335bf6379a27dac5f1641fcf59f99"
+checksum = "3beeceb5e5cfd9eb1d76b381630e82c4241ccd0d27f1a39ed41b2760b255c5e8"
 dependencies = [
- "windows-implement 0.58.0",
- "windows-interface 0.58.0",
- "windows-result 0.2.0",
- "windows-strings 0.1.0",
- "windows-targets 0.52.6",
+ "windows-core",
 ]
 
 [[package]]
 name = "windows-core"
-version = "0.61.0"
+version = "0.61.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4763c1de310c86d75a878046489e2e5ba02c649d185f21c67d4cf8a56d098980"
+checksum = "c0fdd3ddb90610c7638aa2b3a3ab2904fb9e5cdbecc643ddb3647212781c4ae3"
 dependencies = [
- "windows-implement 0.60.0",
- "windows-interface 0.59.1",
+ "windows-implement",
+ "windows-interface",
  "windows-link",
- "windows-result 0.3.2",
- "windows-strings 0.4.0",
+ "windows-result",
+ "windows-strings 0.4.2",
 ]
 
 [[package]]
-name = "windows-implement"
-version = "0.58.0"
+name = "windows-future"
+version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2bbd5b46c938e506ecbce286b6628a02171d56153ba733b6c741fc627ec9579b"
+checksum = "fc6a41e98427b19fe4b73c550f060b59fa592d7d686537eebf9385621bfbad8e"
 dependencies = [
- "proc-macro2",
- "quote 1.0.40",
- "syn 2.0.101",
+ "windows-core",
+ "windows-link",
+ "windows-threading",
 ]
 
 [[package]]
@@ -9596,17 +9543,6 @@ dependencies = [
  "syn 2.0.101",
 ]
 
-[[package]]
-name = "windows-interface"
-version = "0.58.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "053c4c462dc91d3b1504c6fe5a726dd15e216ba718e84a0e46a88fbe5ded3515"
-dependencies = [
- "proc-macro2",
- "quote 1.0.40",
- "syn 2.0.101",
-]
-
 [[package]]
 name = "windows-interface"
 version = "0.59.1"
@@ -9625,44 +9561,35 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "76840935b766e1b0a05c0066835fb9ec80071d4c09a16f6bd5f7e655e3c14c38"
 
 [[package]]
-name = "windows-registry"
-version = "0.4.0"
+name = "windows-numerics"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4286ad90ddb45071efd1a66dfa43eb02dd0dfbae1545ad6cc3c51cf34d7e8ba3"
+checksum = "9150af68066c4c5c07ddc0ce30421554771e528bde427614c61038bc2c92c2b1"
 dependencies = [
- "windows-result 0.3.2",
- "windows-strings 0.3.1",
- "windows-targets 0.53.0",
+ "windows-core",
+ "windows-link",
 ]
 
 [[package]]
-name = "windows-result"
-version = "0.2.0"
+name = "windows-registry"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d1043d8214f791817bab27572aaa8af63732e11bf84aa21a45a78d6c317ae0e"
+checksum = "4286ad90ddb45071efd1a66dfa43eb02dd0dfbae1545ad6cc3c51cf34d7e8ba3"
 dependencies = [
- "windows-targets 0.52.6",
+ "windows-result",
+ "windows-strings 0.3.1",
+ "windows-targets 0.53.0",
 ]
 
 [[package]]
 name = "windows-result"
-version = "0.3.2"
+version = "0.3.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c64fd11a4fd95df68efcfee5f44a294fe71b8bc6a91993e2791938abcc712252"
+checksum = "56f42bd332cc6c8eac5af113fc0c1fd6a8fd2aa08a0119358686e5160d0586c6"
 dependencies = [
  "windows-link",
 ]
 
-[[package]]
-name = "windows-strings"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4cd9b125c486025df0eabcb585e62173c6c9eddcec5d117d3b6e8c30e2ee4d10"
-dependencies = [
- "windows-result 0.2.0",
- "windows-targets 0.52.6",
-]
-
 [[package]]
 name = "windows-strings"
 version = "0.3.1"
@@ -9674,9 +9601,9 @@ dependencies = [
 
 [[package]]
 name = "windows-strings"
-version = "0.4.0"
+version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a2ba9642430ee452d5a7aa78d72907ebe8cfda358e8cb7918a2050581322f97"
+checksum = "56e6c93f3a0c3b36176cb1327a4958a0353d5d166c2a35cb268ace15e91d3b57"
 dependencies = [
  "windows-link",
 ]
@@ -9755,6 +9682,15 @@ dependencies = [
  "windows_x86_64_msvc 0.53.0",
 ]
 
+[[package]]
+name = "windows-threading"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b66463ad2e0ea3bbf808b7f1d371311c80e115c0b71d60efc142cafbcfb057a6"
+dependencies = [
+ "windows-link",
+]
+
 [[package]]
 name = "windows_aarch64_gnullvm"
 version = "0.48.5"
@@ -9904,9 +9840,9 @@ dependencies = [
 
 [[package]]
 name = "winnow"
-version = "0.7.7"
+version = "0.7.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6cb8234a863ea0e8cd7284fcdd4f145233eb00fee02bbdd9861aec44e6477bc5"
+checksum = "c06928c8748d81b05c9be96aad92e1b6ff01833332f281e8cfca3be4b35fc9ec"
 dependencies = [
  "memchr",
 ]
@@ -9927,20 +9863,14 @@ version = "0.39.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6f42320e61fe2cfd34354ecb597f86f413484a798ba44a8ca1165c58d42da6c1"
 dependencies = [
- "bitflags 2.9.0",
+ "bitflags 2.9.1",
 ]
 
-[[package]]
-name = "write16"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d1890f4022759daae28ed4fe62859b1236caebfc61ede2f63ed4e695f3f6d936"
-
 [[package]]
 name = "writeable"
-version = "0.5.5"
+version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51"
+checksum = "ea2f10b9bb0928dfb1b42b65e1f9e36f7f54dbdf08457afefb38afcdec4fa2bb"
 
 [[package]]
 name = "wyz"
@@ -9983,9 +9913,9 @@ dependencies = [
 
 [[package]]
 name = "yoke"
-version = "0.7.5"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "120e6aef9aa629e3d4f52dc8cc43a015c7724194c97dfaf45180d2daf2b77f40"
+checksum = "5f41bb01b8226ef4bfd589436a297c53d118f65921786300e427be8d487695cc"
 dependencies = [
  "serde",
  "stable_deref_trait",
@@ -9995,14 +9925,14 @@ dependencies = [
 
 [[package]]
 name = "yoke-derive"
-version = "0.7.5"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2380878cad4ac9aac1e2435f3eb4020e8374b5f13c296cb75b4620ff8e229154"
+checksum = "38da3c9736e16c5d3c8c597a9aaa5d1fa565d0532ae05e27c24aa62fb32c0ab6"
 dependencies = [
  "proc-macro2",
  "quote 1.0.40",
  "syn 2.0.101",
- "synstructure 0.13.1",
+ "synstructure 0.13.2",
 ]
 
 [[package]]
@@ -10027,38 +9957,18 @@ dependencies = [
  "serde",
  "serde_json",
  "time",
- "tokio 1.44.2",
+ "tokio 1.45.1",
  "tower-service",
  "url",
 ]
 
-[[package]]
-name = "zerocopy"
-version = "0.7.35"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0"
-dependencies = [
- "zerocopy-derive 0.7.35",
-]
-
 [[package]]
 name = "zerocopy"
 version = "0.8.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a1702d9583232ddb9174e01bb7c15a2ab8fb1bc6f227aa1233858c351a3ba0cb"
 dependencies = [
- "zerocopy-derive 0.8.25",
-]
-
-[[package]]
-name = "zerocopy-derive"
-version = "0.7.35"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e"
-dependencies = [
- "proc-macro2",
- "quote 1.0.40",
- "syn 2.0.101",
+ "zerocopy-derive",
 ]
 
 [[package]]
@@ -10090,7 +10000,7 @@ dependencies = [
  "proc-macro2",
  "quote 1.0.40",
  "syn 2.0.101",
- "synstructure 0.13.1",
+ "synstructure 0.13.2",
 ]
 
 [[package]]
@@ -10099,11 +10009,22 @@ version = "1.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde"
 
+[[package]]
+name = "zerotrie"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "36f0bbd478583f79edad978b407914f61b2972f5af6fa089686016be8f9af595"
+dependencies = [
+ "displaydoc",
+ "yoke",
+ "zerofrom",
+]
+
 [[package]]
 name = "zerovec"
-version = "0.10.4"
+version = "0.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aa2b893d79df23bfb12d5461018d408ea19dfafe76c2c7ef6d4eba614f8ff079"
+checksum = "4a05eb080e015ba39cc9e23bbe5e7fb04d5fb040350f99f34e338d5fdd294428"
 dependencies = [
  "yoke",
  "zerofrom",
@@ -10112,9 +10033,9 @@ dependencies = [
 
 [[package]]
 name = "zerovec-derive"
-version = "0.10.3"
+version = "0.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6"
+checksum = "5b96237efa0c878c64bd89c436f661be4e46b2f3eff1ebb976f7ef2321d2f58f"
 dependencies = [
  "proc-macro2",
  "quote 1.0.40",
diff --git a/Cargo.toml b/Cargo.toml
index 6c69df099..19808e67a 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -6,7 +6,6 @@ members = [
     "crates/bonfire",
     "crates/core/*",
     "crates/services/*",
-    "crates/bindings/*",
     "crates/daemons/*",
 ]
 
@@ -16,6 +15,6 @@ redis23 = { package = "redis", version = "0.23.3", git = "https://github.com/rev
 # I'm 99% sure this is overloading the GitHub worker
 # hence builds have been failing since, let's just
 # disable it for now. In the future, we could use this
-# if we were rolling our own CI.
-# [profile.release]
-# lto = true
+# if we were rolling our own CI (that is now).
+[profile.release]
+lto = true
diff --git a/Dockerfile b/Dockerfile
index c75748c20..524e7e0e9 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,5 @@
 # Build Stage
-FROM --platform="${BUILDPLATFORM}" rust:1.77.2-slim-bookworm
+FROM --platform="${BUILDPLATFORM}" rust:1.86.0-slim-bookworm
 USER 0:0
 WORKDIR /home/rust/src
 
@@ -17,13 +17,13 @@ RUN sh /tmp/build-image-layer.sh tools
 
 # Build all dependencies
 COPY Cargo.toml Cargo.lock ./
-COPY crates/bindings/node/Cargo.toml ./crates/bindings/node/
 COPY crates/bonfire/Cargo.toml ./crates/bonfire/
 COPY crates/delta/Cargo.toml ./crates/delta/
 COPY crates/core/config/Cargo.toml ./crates/core/config/
 COPY crates/core/database/Cargo.toml ./crates/core/database/
 COPY crates/core/files/Cargo.toml ./crates/core/files/
 COPY crates/core/models/Cargo.toml ./crates/core/models/
+COPY crates/core/parser/Cargo.toml ./crates/core/parser/
 COPY crates/core/permissions/Cargo.toml ./crates/core/permissions/
 COPY crates/core/presence/Cargo.toml ./crates/core/presence/
 COPY crates/core/result/Cargo.toml ./crates/core/result/
diff --git a/Dockerfile.useCurrentArch b/Dockerfile.useCurrentArch
index 54b508ef7..f36c08081 100644
--- a/Dockerfile.useCurrentArch
+++ b/Dockerfile.useCurrentArch
@@ -1,5 +1,5 @@
 # Build Stage
-FROM rust:1.77.2-slim-bookworm
+FROM rust:1.86.0-slim-bookworm
 USER 0:0
 WORKDIR /home/rust/src
 
@@ -13,13 +13,13 @@ COPY scripts/build-image-layer.sh /tmp/
 
 # Build all dependencies
 COPY Cargo.toml Cargo.lock ./
-COPY crates/bindings/node/Cargo.toml ./crates/bindings/node/
 COPY crates/bonfire/Cargo.toml ./crates/bonfire/
 COPY crates/delta/Cargo.toml ./crates/delta/
 COPY crates/core/config/Cargo.toml ./crates/core/config/
 COPY crates/core/database/Cargo.toml ./crates/core/database/
 COPY crates/core/files/Cargo.toml ./crates/core/files/
 COPY crates/core/models/Cargo.toml ./crates/core/models/
+COPY crates/core/parser/Cargo.toml ./crates/core/parser/
 COPY crates/core/permissions/Cargo.toml ./crates/core/permissions/
 COPY crates/core/presence/Cargo.toml ./crates/core/presence/
 COPY crates/core/result/Cargo.toml ./crates/core/result/
diff --git a/README.md b/README.md
index d0894dee7..1973ee201 100644
--- a/README.md
+++ b/README.md
@@ -12,32 +12,31 @@
 The services and libraries that power the Revolt service.<br/>
 <br/>
 
-| Crate              | Path                                               | Description                              |                                                                                                                                                                                                                                                                                                           |
-| ------------------ | -------------------------------------------------- | ---------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| `core/config`      | [crates/core/config](crates/core/config)           | Core: Configuration                      | ![Crates.io Version](https://img.shields.io/crates/v/revolt-config) ![Crates.io Version](https://img.shields.io/crates/msrv/revolt-config) ![Crates.io Version](https://img.shields.io/crates/size/revolt-config) ![Crates.io License](https://img.shields.io/crates/l/revolt-config)                     |
-| `core/database`    | [crates/core/database](crates/core/database)       | Core: Database Implementation            | ![Crates.io Version](https://img.shields.io/crates/v/revolt-database) ![Crates.io Version](https://img.shields.io/crates/msrv/revolt-database) ![Crates.io Version](https://img.shields.io/crates/size/revolt-database) ![Crates.io License](https://img.shields.io/crates/l/revolt-database)             |
-| `core/files`       | [crates/core/files](crates/core/files)             | Core: S3 and encryption subroutines      | ![Crates.io Version](https://img.shields.io/crates/v/revolt-files) ![Crates.io Version](https://img.shields.io/crates/msrv/revolt-files) ![Crates.io Version](https://img.shields.io/crates/size/revolt-files) ![Crates.io License](https://img.shields.io/crates/l/revolt-files)                         |
-| `core/models`      | [crates/core/models](crates/core/models)           | Core: API Models                         | ![Crates.io Version](https://img.shields.io/crates/v/revolt-models) ![Crates.io Version](https://img.shields.io/crates/msrv/revolt-models) ![Crates.io Version](https://img.shields.io/crates/size/revolt-models) ![Crates.io License](https://img.shields.io/crates/l/revolt-models)                     |
-| `core/permissions` | [crates/core/permissions](crates/core/permissions) | Core: Permission Logic                   | ![Crates.io Version](https://img.shields.io/crates/v/revolt-permissions) ![Crates.io Version](https://img.shields.io/crates/msrv/revolt-permissions) ![Crates.io Version](https://img.shields.io/crates/size/revolt-permissions) ![Crates.io License](https://img.shields.io/crates/l/revolt-permissions) |
-| `core/presence`    | [crates/core/presence](crates/core/presence)       | Core: User Presence                      | ![Crates.io Version](https://img.shields.io/crates/v/revolt-presence) ![Crates.io Version](https://img.shields.io/crates/msrv/revolt-presence) ![Crates.io Version](https://img.shields.io/crates/size/revolt-presence) ![Crates.io License](https://img.shields.io/crates/l/revolt-presence)             |
-| `core/result`      | [crates/core/result](crates/core/result)           | Core: Result and Error types             | ![Crates.io Version](https://img.shields.io/crates/v/revolt-result) ![Crates.io Version](https://img.shields.io/crates/msrv/revolt-result) ![Crates.io Version](https://img.shields.io/crates/size/revolt-result) ![Crates.io License](https://img.shields.io/crates/l/revolt-result)                     |
-| `delta`            | [crates/delta](crates/delta)                       | REST API server                          | ![License](https://img.shields.io/badge/license-AGPL--3.0--or--later-blue)                                                                                                                                                                                                                                |
-| `bonfire`          | [crates/bonfire](crates/bonfire)                   | WebSocket events server                  | ![License](https://img.shields.io/badge/license-AGPL--3.0--or--later-blue)                                                                                                                                                                                                                                |
-| `services/january` | [crates/services/january](crates/services/january) | Proxy server                             | ![License](https://img.shields.io/badge/license-AGPL--3.0--or--later-blue)                                                                                                                                                                                                                                |
-| `services/autumn`  | [crates/services/autumn](crates/services/autumn)   | File server                              | ![License](https://img.shields.io/badge/license-AGPL--3.0--or--later-blue)                                                                                                                                                                                                                                |
-| `bindings/node`    | [crates/bindings/node](crates/bindings/node)       | Node.js bindings for the Revolt software | ![License](https://img.shields.io/badge/license-AGPL--3.0--or--later-blue)                                                                                                                                                                                                                                |
-| `daemons/crond`    | [crates/daemons/crond](crates/daemons/crond)       | Timed data clean up daemon server        | ![License](https://img.shields.io/badge/license-AGPL--3.0--or--later-blue)                                                                                                                                                                                                                                |
-| `daemons/pushd`    | [crates/daemons/pushd](crates/daemons/pushd)       | Push notification daemon server          | ![License](https://img.shields.io/badge/license-AGPL--3.0--or--later-blue)                                                                                                                                                                                                                                |
+| Crate              | Path                                               | Description                         |                                                                                                                                                                                                                                                                                                           |
+| ------------------ | -------------------------------------------------- | ----------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| `core/config`      | [crates/core/config](crates/core/config)           | Core: Configuration                 | ![Crates.io Version](https://img.shields.io/crates/v/revolt-config) ![Crates.io Version](https://img.shields.io/crates/msrv/revolt-config) ![Crates.io Version](https://img.shields.io/crates/size/revolt-config) ![Crates.io License](https://img.shields.io/crates/l/revolt-config)                     |
+| `core/database`    | [crates/core/database](crates/core/database)       | Core: Database Implementation       | ![Crates.io Version](https://img.shields.io/crates/v/revolt-database) ![Crates.io Version](https://img.shields.io/crates/msrv/revolt-database) ![Crates.io Version](https://img.shields.io/crates/size/revolt-database) ![Crates.io License](https://img.shields.io/crates/l/revolt-database)             |
+| `core/files`       | [crates/core/files](crates/core/files)             | Core: S3 and encryption subroutines | ![Crates.io Version](https://img.shields.io/crates/v/revolt-files) ![Crates.io Version](https://img.shields.io/crates/msrv/revolt-files) ![Crates.io Version](https://img.shields.io/crates/size/revolt-files) ![Crates.io License](https://img.shields.io/crates/l/revolt-files)                         |
+| `core/models`      | [crates/core/models](crates/core/models)           | Core: API Models                    | ![Crates.io Version](https://img.shields.io/crates/v/revolt-models) ![Crates.io Version](https://img.shields.io/crates/msrv/revolt-models) ![Crates.io Version](https://img.shields.io/crates/size/revolt-models) ![Crates.io License](https://img.shields.io/crates/l/revolt-models)                     |
+| `core/permissions` | [crates/core/permissions](crates/core/permissions) | Core: Permission Logic              | ![Crates.io Version](https://img.shields.io/crates/v/revolt-permissions) ![Crates.io Version](https://img.shields.io/crates/msrv/revolt-permissions) ![Crates.io Version](https://img.shields.io/crates/size/revolt-permissions) ![Crates.io License](https://img.shields.io/crates/l/revolt-permissions) |
+| `core/presence`    | [crates/core/presence](crates/core/presence)       | Core: User Presence                 | ![Crates.io Version](https://img.shields.io/crates/v/revolt-presence) ![Crates.io Version](https://img.shields.io/crates/msrv/revolt-presence) ![Crates.io Version](https://img.shields.io/crates/size/revolt-presence) ![Crates.io License](https://img.shields.io/crates/l/revolt-presence)             |
+| `core/result`      | [crates/core/result](crates/core/result)           | Core: Result and Error types        | ![Crates.io Version](https://img.shields.io/crates/v/revolt-result) ![Crates.io Version](https://img.shields.io/crates/msrv/revolt-result) ![Crates.io Version](https://img.shields.io/crates/size/revolt-result) ![Crates.io License](https://img.shields.io/crates/l/revolt-result)                     |
+| `delta`            | [crates/delta](crates/delta)                       | REST API server                     | ![License](https://img.shields.io/badge/license-AGPL--3.0--or--later-blue)                                                                                                                                                                                                                                |
+| `bonfire`          | [crates/bonfire](crates/bonfire)                   | WebSocket events server             | ![License](https://img.shields.io/badge/license-AGPL--3.0--or--later-blue)                                                                                                                                                                                                                                |
+| `services/january` | [crates/services/january](crates/services/january) | Proxy server                        | ![License](https://img.shields.io/badge/license-AGPL--3.0--or--later-blue)                                                                                                                                                                                                                                |
+| `services/autumn`  | [crates/services/autumn](crates/services/autumn)   | File server                         | ![License](https://img.shields.io/badge/license-AGPL--3.0--or--later-blue)                                                                                                                                                                                                                                |
+| `daemons/crond`    | [crates/daemons/crond](crates/daemons/crond)       | Timed data clean up daemon server   | ![License](https://img.shields.io/badge/license-AGPL--3.0--or--later-blue)                                                                                                                                                                                                                                |
+| `daemons/pushd`    | [crates/daemons/pushd](crates/daemons/pushd)       | Push notification daemon server     | ![License](https://img.shields.io/badge/license-AGPL--3.0--or--later-blue)                                                                                                                                                                                                                                |
 
 </div>
 <br/>
 
 ## Minimum Supported Rust Version
 
-Rust 1.76 or higher.
+Rust 1.86.0 or higher.
 
 > [!CAUTION]
-> The events server has a significant performance regression between Rust 1.77.2 and 1.78.0 onwards, see [issue #341](https://github.com/revoltchat/backend/issues/341).
+> The events server has a significant performance regression between Rust 1.77.2 and 1.78.0 onwards, see [issue #341](https://github.com/revoltchat/backend/issues/341). This is currently solved by build time options but we are looking for a proper fix.
 
 ## Development Guide
 
diff --git a/Revolt.toml b/Revolt.toml
index 2f7988c9d..76f908f38 100644
--- a/Revolt.toml
+++ b/Revolt.toml
@@ -43,6 +43,7 @@ from_address = "development@revolt.chat"
 reply_to = "support@revolt.chat"
 port = 14025
 use_tls = false
+use_starttls = false
 
 [api.livekit]
 
diff --git a/crates/bindings/node/.gitignore b/crates/bindings/node/.gitignore
deleted file mode 100644
index c76a159c7..000000000
--- a/crates/bindings/node/.gitignore
+++ /dev/null
@@ -1,7 +0,0 @@
-target
-index.node
-**/node_modules
-**/.DS_Store
-npm-debug.log*
-cargo.log
-cross.log
diff --git a/crates/bindings/node/Cargo.toml b/crates/bindings/node/Cargo.toml
deleted file mode 100644
index e2cfba1ce..000000000
--- a/crates/bindings/node/Cargo.toml
+++ /dev/null
@@ -1,25 +0,0 @@
-[package]
-name = "revolt-nodejs-bindings"
-version = "0.8.4"
-description = "Node.js bindings for the Revolt software"
-authors = ["Paul Makles <me@insrt.uk>"]
-license = "MIT"
-edition = "2021"
-exclude = ["index.node"]
-
-[lib]
-crate-type = ["cdylib"]
-
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
-[dependencies]
-neon = "1.0.0"
-neon-serde4 = "1.0.0"
-
-serde = { version = "1", features = ["derive"] }
-
-async-std = "1.12.0"
-
-revolt-config = { version = "0.8.4", path = "../../core/config" }
-revolt-result = { version = "0.8.4", path = "../../core/result" }
-revolt-database = { version = "0.8.4", path = "../../core/database" }
diff --git a/crates/bindings/node/README.md b/crates/bindings/node/README.md
deleted file mode 100644
index f2ccee6ee..000000000
--- a/crates/bindings/node/README.md
+++ /dev/null
@@ -1,92 +0,0 @@
-# revolt.node
-
-**revolt.node:** Node.js bindings for the Revolt software
-
-This project was bootstrapped by [create-neon](https://www.npmjs.com/package/create-neon).
-
-## Building revolt.node
-
-Building revolt.node requires a [supported version of Node and Rust](https://github.com/neon-bindings/neon#platform-support).
-
-To run the build, run:
-
-```sh
-$ npm run build
-```
-
-This command uses the [@neon-rs/cli](https://www.npmjs.com/package/@neon-rs/cli) utility to assemble the binary Node addon from the output of `cargo`.
-
-## Exploring revolt.node
-
-After building revolt.node, you can explore its exports at the Node console:
-
-```sh
-$ npm i
-$ npm run build
-$ node
-> require('.').hello()
-'hello node'
-```
-
-## Available Scripts
-
-In the project directory, you can run:
-
-#### `npm install`
-
-Installs the project, including running `npm run build`.
-
-#### `npm run build`
-
-Builds the Node addon (`index.node`) from source, generating a release build with `cargo --release`.
-
-Additional [`cargo build`](https://doc.rust-lang.org/cargo/commands/cargo-build.html) arguments may be passed to `npm run build` and similar commands. For example, to enable a [cargo feature](https://doc.rust-lang.org/cargo/reference/features.html):
-
-```
-npm run build -- --feature=beetle
-```
-
-#### `npm run debug`
-
-Similar to `npm run build` but generates a debug build with `cargo`.
-
-#### `npm run cross`
-
-Similar to `npm run build` but uses [cross-rs](https://github.com/cross-rs/cross) to cross-compile for another platform. Use the [`CARGO_BUILD_TARGET`](https://doc.rust-lang.org/cargo/reference/config.html#buildtarget) environment variable to select the build target.
-
-#### `npm test`
-
-Runs the unit tests by calling `cargo test`. You can learn more about [adding tests to your Rust code](https://doc.rust-lang.org/book/ch11-01-writing-tests.html) from the [Rust book](https://doc.rust-lang.org/book/).
-
-## Project Layout
-
-The directory structure of this project is:
-
-```
-revolt.node/
-├── Cargo.toml
-├── README.md
-├── src/
-|   └── lib.rs
-├── index.node
-├── package.json
-└── target/
-```
-
-| Entry          | Purpose                                                                                                                                  |
-|----------------|------------------------------------------------------------------------------------------------------------------------------------------|
-| `Cargo.toml`   | The Cargo [manifest file](https://doc.rust-lang.org/cargo/reference/manifest.html), which informs the `cargo` command.                   |
-| `README.md`    | This file.                                                                                                                               |
-| `src/`         | The directory tree containing the Rust source code for the project.                                                                      |
-| `lib.rs`       | Entry point for the Rust source code.                                                                                                          |
-| `index.node`   | The main module, a [Node addon](https://nodejs.org/api/addons.html) generated by the build and pointed to by `"main"` in `package.json`. |
-| `package.json` | The npm [manifest file](https://docs.npmjs.com/cli/v7/configuring-npm/package-json), which informs the `npm` command.                    |
-| `target/`      | Binary artifacts generated by the Rust build.                                                                                            |
-
-## Learn More
-
-Learn more about:
-
-- [Neon](https://neon-bindings.com).
-- [Rust](https://www.rust-lang.org).
-- [Node](https://nodejs.org).
diff --git a/crates/bindings/node/index.d.ts b/crates/bindings/node/index.d.ts
deleted file mode 100644
index 0417ba4d1..000000000
--- a/crates/bindings/node/index.d.ts
+++ /dev/null
@@ -1,84 +0,0 @@
-import { Channel, User } from "revolt-api";
-
-/**
- * Opaque type for Revolt database
- */
-export declare interface Database {}
-
-/**
- * Opaque type for Revolt database
- */
-export declare interface OpaqueUser {}
-
-/**
- * Error type from Revolt backend
- */
-export declare interface Err {
-  type: string;
-  location: string;
-}
-
-/**
- * Initialises background tasks and logging, must be called before anything else!
- * Can be called multiple times!
- */
-export declare function init();
-
-/**
- * Gets a new handle to the Revolt database
- * @returns {Database} Handle
- */
-export declare function database(): Database;
-
-/**
- * Fetch user from database
- * @param {string} userId User's ID
- * @this {Database}
- */
-export declare function database_fetch_user(userId: string): OpaqueUser;
-
-/**
- * Fetch user from database
- * @param {string} username Username
- * @param {string} discriminator Discriminator
- * @this {Database}
- */
-export declare function database_fetch_user_by_username(
-  username: string,
-  discriminator: string
-): OpaqueUser;
-
-/**
- * Gets model data as JSON
- * @this {OpaqueUser}
- */
-export declare function model_data(): User;
-
-/**
- * Gets error if the model failed to fetch
- * @this {OpaqueUser}
- */
-export declare function model_error(): Err;
-
-/**
- * Open a direct message channel between two users
- * @param {string} userA User A ID
- * @param {string} userB User B ID
- * @returns Existing or newly created channel
- */
-export declare function proc_channels_create_dm(
-  userA: string,
-  userB: string
-): Promise<Channel & { error: Err }>;
-
-/**
- * Suspend a user
- * @param {string} user User
- * @param {number} duration Duration (in days), set to 0 for indefinite
- * @param {string} reason Pipe-separated list of reasons (e.g. reason1|reason2|reason3)
- */
-export declare function proc_users_suspend(
-  user: OpaqueUser,
-  duration: number,
-  reason: string
-): Promise<{ error: Err }>;
diff --git a/crates/bindings/node/package.json b/crates/bindings/node/package.json
deleted file mode 100644
index 70768a860..000000000
--- a/crates/bindings/node/package.json
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-  "name": "revolt-nodejs-bindings",
-  "version": "0.7.15-rev0.0.3",
-  "description": "Node.js bindings for the Revolt software",
-  "main": "index.node",
-  "scripts": {
-    "test": "cargo test",
-    "cargo-build": "cargo build --message-format=json > cargo.log",
-    "cross-build": "cross build --message-format=json > cross.log",
-    "postcargo-build": "neon dist < cargo.log",
-    "postcross-build": "neon dist -m /target < cross.log",
-    "debug": "npm run cargo-build --",
-    "build": "npm run cargo-build -- --release",
-    "cross": "npm run cross-build -- --release"
-  },
-  "author": "Paul Makles",
-  "license": "AGPL-3.0",
-  "devDependencies": {
-    "@neon-rs/cli": "0.1.73"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/revoltchat/backend"
-  },
-  "keywords": [
-    "revolt",
-    "chat"
-  ],
-  "bugs": {
-    "url": "https://github.com/revoltchat/backend/issues"
-  },
-  "homepage": "https://github.com/revoltchat/backend#readme",
-  "dependencies": {
-    "revolt-api": "^0.7.15"
-  }
-}
\ No newline at end of file
diff --git a/crates/bindings/node/pnpm-lock.yaml b/crates/bindings/node/pnpm-lock.yaml
deleted file mode 100644
index 1d623ad9c..000000000
--- a/crates/bindings/node/pnpm-lock.yaml
+++ /dev/null
@@ -1,117 +0,0 @@
-lockfileVersion: '6.0'
-
-settings:
-  autoInstallPeers: true
-  excludeLinksFromLockfile: false
-
-dependencies:
-  revolt-api:
-    specifier: ^0.7.15
-    version: 0.7.15
-
-devDependencies:
-  '@neon-rs/cli':
-    specifier: 0.1.73
-    version: 0.1.73
-
-packages:
-
-  /@cargo-messages/android-arm-eabi@0.1.72:
-    resolution: {integrity: sha512-gGZxIM1mj+Y5x+ULND6ZCNr7f70OJi9wDlycSK8hGONy9wrChN6JAIHryddC5cqcwlYAoQ6IDcDFElnhAYbybA==}
-    cpu: [arm]
-    os: [android]
-    requiresBuild: true
-    dev: true
-    optional: true
-
-  /@cargo-messages/darwin-arm64@0.1.72:
-    resolution: {integrity: sha512-EAzN5MLaXPljZKZDO5qR+aBs44eSq2ZbEnS7AI/FziE3MzeXbrGOS3fLba5+7yWPFXJyZolXzePm8N1EBv8ovg==}
-    cpu: [arm64]
-    os: [darwin]
-    requiresBuild: true
-    dev: true
-    optional: true
-
-  /@cargo-messages/darwin-x64@0.1.72:
-    resolution: {integrity: sha512-RLo6j8s3nYbjdd1LDct4wamfChyRit7zokUuxtIYCu9XOlltkN5vnj1vwnrPvoqCMZ/7CbbuHFwSTn9A71de/w==}
-    cpu: [x64]
-    os: [darwin]
-    requiresBuild: true
-    dev: true
-    optional: true
-
-  /@cargo-messages/linux-arm-gnueabihf@0.1.72:
-    resolution: {integrity: sha512-tHsRshuzfjrX6SDW3jg6al8vMNLTMgczGnVYl5RuBZf/yrAUuwe30KxA9ge6w6mW6Ox797DyBchzAc9OLgTgmQ==}
-    cpu: [arm]
-    os: [linux]
-    requiresBuild: true
-    dev: true
-    optional: true
-
-  /@cargo-messages/linux-x64-gnu@0.1.72:
-    resolution: {integrity: sha512-VGtL6CCnUbhsP4aYuBNT5kfrAL7o0qjrxw97a+ax13t+nJd26tVEEIKHMu5drvvS/Nm/hn7sLT8zMnnCv0pvHg==}
-    cpu: [x64]
-    os: [linux]
-    requiresBuild: true
-    dev: true
-    optional: true
-
-  /@cargo-messages/win32-arm64-msvc@0.1.72:
-    resolution: {integrity: sha512-V93Cgz39K+yqa3MveNbhh29pYCp8izK5uEavjPoxlNxAbsMCWH+s0verGDdUcfGxjR1H2V7oZ4FszPqR2SqMRQ==}
-    cpu: [arm64]
-    os: [win32]
-    requiresBuild: true
-    dev: true
-    optional: true
-
-  /@cargo-messages/win32-x64-msvc@0.1.72:
-    resolution: {integrity: sha512-knz3uSrO0OSbq3U5VWfCY8FB4NsM43BOWLZ7x4sfaMOC1XWv+IyvDdkLe6DhJx8KUw46KIAimYs9YROrp6l46Q==}
-    cpu: [x64]
-    os: [win32]
-    requiresBuild: true
-    dev: true
-    optional: true
-
-  /@neon-rs/cli@0.1.73:
-    resolution: {integrity: sha512-1kv8S/feB6UQWQQwsnGfkSkEBOtlFDNExnioL81E2BwvUWgjQPaseHgpi2EpWVgsPUgur5eBm4QowmlpWkD4/w==}
-    hasBin: true
-    optionalDependencies:
-      '@cargo-messages/android-arm-eabi': 0.1.72
-      '@cargo-messages/darwin-arm64': 0.1.72
-      '@cargo-messages/darwin-x64': 0.1.72
-      '@cargo-messages/linux-arm-gnueabihf': 0.1.72
-      '@cargo-messages/linux-x64-gnu': 0.1.72
-      '@cargo-messages/win32-arm64-msvc': 0.1.72
-      '@cargo-messages/win32-x64-msvc': 0.1.72
-    dev: true
-
-  /axios@0.26.1:
-    resolution: {integrity: sha512-fPwcX4EvnSHuInCMItEhAGnaSEXRBjtzh9fOtsE6E1G6p7vl7edEeZe11QHf18+6+9gR5PbKV/sGKNaD8YaMeA==}
-    dependencies:
-      follow-redirects: 1.15.6
-    transitivePeerDependencies:
-      - debug
-    dev: false
-
-  /follow-redirects@1.15.6:
-    resolution: {integrity: sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA==}
-    engines: {node: '>=4.0'}
-    peerDependencies:
-      debug: '*'
-    peerDependenciesMeta:
-      debug:
-        optional: true
-    dev: false
-
-  /lodash.defaultsdeep@4.6.1:
-    resolution: {integrity: sha512-3j8wdDzYuWO3lM3Reg03MuQR957t287Rpcxp1njpEa8oDrikb+FwGdW3n+FELh/A6qib6yPit0j/pv9G/yeAqA==}
-    dev: false
-
-  /revolt-api@0.7.15:
-    resolution: {integrity: sha512-rWRnjBFvoXt/RHRxHg9KuP+x1Jk61KdsOpKOczVJg5tIqGDmqp/6QZHw5rJTtG+wCH3Ah3YKwY+MM5NHfg1W3Q==}
-    dependencies:
-      axios: 0.26.1
-      lodash.defaultsdeep: 4.6.1
-    transitivePeerDependencies:
-      - debug
-    dev: false
diff --git a/crates/bindings/node/src/lib.rs b/crates/bindings/node/src/lib.rs
deleted file mode 100644
index 85b391834..000000000
--- a/crates/bindings/node/src/lib.rs
+++ /dev/null
@@ -1,221 +0,0 @@
-#[macro_use]
-extern crate serde;
-
-use std::sync::OnceLock;
-
-use neon::prelude::*;
-use revolt_database::{Database, DatabaseInfo};
-
-fn js_init(mut cx: FunctionContext) -> JsResult<JsUndefined> {
-    // static INIT: OnceLock<()> = OnceLock::new();
-    // if INIT.get().is_none() {
-    //     INIT.get_or_init(|| {
-    //         async_std::task::block_on(async {
-    //             revolt_config::configure!(api);
-
-    //             match DatabaseInfo::Auto.connect().await {
-    //                 Ok(db) => {
-    //                     let authifier_db = db.clone().to_authifier().await.database;
-    //                     revolt_database::tasks::start_workers(db, authifier_db);
-    //                     Ok(())
-    //                 }
-    //                 Err(err) => Err(err),
-    //             }
-    //         })
-    //         .or_else(|err| cx.throw_error(err))
-    //         .unwrap();
-    //     });
-    // }
-
-    Ok(cx.undefined())
-}
-
-struct DatabaseBinding(Database, Channel);
-impl Finalize for DatabaseBinding {}
-impl DatabaseBinding {
-    fn take(&self) -> (Database, Channel) {
-        (self.0.clone(), self.1.clone())
-    }
-}
-
-fn js_database(mut cx: FunctionContext) -> JsResult<JsBox<DatabaseBinding>> {
-    let db = async_std::task::block_on(DatabaseInfo::Auto.connect())
-        .or_else(|err| cx.throw_error(err))?;
-
-    let channel = cx.channel();
-    Ok(cx.boxed(DatabaseBinding(db, channel)))
-}
-
-// Implementations for models
-#[derive(Clone)]
-#[allow(clippy::large_enum_variant)]
-enum Model {
-    User(revolt_database::User),
-    Error(revolt_result::Error),
-}
-
-impl Model {
-    fn give(&self) -> Model {
-        self.clone()
-    }
-}
-
-impl Finalize for Model {}
-
-macro_rules! shim_boxed {
-    ($cx: ident, $name: ident, $model: ident, $( $variable: ident $type: ident $id: expr )+, $cmd: ident, $( $arg: expr, )+) => {
-        fn $name(mut cx: FunctionContext) -> JsResult<JsPromise> {
-            $(
-                let $variable = cx.argument::<$type>($id)?.value(&mut cx);
-            )+
-
-            let (db, channel) = cx.this::<JsBox<DatabaseBinding>>()?.take();
-            let (deferred, promise) = cx.promise();
-
-            async_std::task::spawn(async move {
-                let result = db.$cmd($($arg,)+).await;
-                deferred.settle_with(&channel, move |mut cx| {
-                    Ok(cx.boxed(match result {
-                        Ok(value) => Model::$model(value),
-                        Err(error) => Model::Error(error)
-                    }))
-                })
-            });
-
-            Ok(promise)
-        }
-
-        $cx.export_function(stringify!($name), $name)?;
-    };
-}
-
-fn js_data(mut cx: FunctionContext) -> JsResult<JsValue> {
-    match cx.this::<JsBox<Model>>()?.give() {
-        Model::Error(_) => neon_serde4::to_value(&mut cx, &None::<()>),
-        Model::User(user) => neon_serde4::to_value(&mut cx, &user),
-    }
-    .or_else(|e| cx.throw_error(e.to_string()))
-}
-
-fn js_error(mut cx: FunctionContext) -> JsResult<JsValue> {
-    let value = match cx.this::<JsBox<Model>>()?.give() {
-        Model::Error(err) => Some(err),
-        _ => None,
-    };
-
-    neon_serde4::to_value(&mut cx, &value).or_else(|e| cx.throw_error(e.to_string()))
-}
-
-// Basic data implementation
-#[derive(Serialize, Deserialize)]
-struct ResultBinding<T> {
-    #[serde(flatten)]
-    value: Option<T>,
-    error: Option<revolt_result::Error>,
-}
-
-macro_rules! shim {
-    ($cx: ident, $name: ident, $( $variable: ident $type: ident $id: expr )*, $( $model: ident $modelType: ident $modelId: expr )*, | $db: ident | $closure: expr, $( $arg: expr, )+) => {
-        fn $name(mut cx: FunctionContext) -> JsResult<JsPromise> {
-            $(
-                let $variable = cx.argument::<$type>($id)?.value(&mut cx);
-            )*
-
-            $(
-                let mut $model = if let Model::$modelType(value) = cx.argument::<JsBox<Model>>($modelId)?.give() {
-                    value
-                } else {
-                    unreachable!()
-                };
-            )*
-
-            let (db, channel) = cx.this::<JsBox<DatabaseBinding>>()?.take();
-            let (deferred, promise) = cx.promise();
-
-            async_std::task::spawn(async move {
-                #[allow(clippy::redundant_closure_call)]
-                let result = (|$db: $crate::Database| $closure)(db.clone()).await;
-                deferred.settle_with(&channel, move |mut cx| {
-                    neon_serde4::to_value(
-                        &mut cx,
-                        &match result {
-                            Ok(value) => ResultBinding {
-                                value: Some(value),
-                                error: None,
-                            },
-                            Err(error) => ResultBinding {
-                                value: None,
-                                error: Some(error),
-                            },
-                        },
-                    )
-                    .or_else(|e| cx.throw_error(e.to_string()))
-                })
-            });
-
-            Ok(promise)
-        }
-
-        $cx.export_function(stringify!($name), $name)?;
-    };
-}
-
-#[neon::main]
-fn main(mut cx: ModuleContext) -> NeonResult<()> {
-    // initialise required background stuff
-    cx.export_function("init", js_init)?;
-
-    // database & model stuff
-    cx.export_function("database", js_database)?;
-    cx.export_function("model_data", js_data)?;
-    cx.export_function("model_error", js_error)?;
-
-    shim_boxed!(
-        cx,
-        database_fetch_user,
-        User,
-        user_id JsString 0,
-        fetch_user,
-        &user_id,
-    );
-
-    shim_boxed!(
-        cx,
-        database_fetch_user_by_username,
-        User,
-        username JsString 0
-        discriminator JsString 1,
-        fetch_user_by_username,
-        &username, &discriminator,
-    );
-
-    // procedure calls
-    shim!(
-        cx,
-        proc_channels_create_dm,
-        user_a JsString 0
-        user_b JsString 1,
-        ,
-        |db| async move {
-            let user_a = db.fetch_user(&user_a).await?;
-            let user_b = db.fetch_user(&user_b).await?;
-            revolt_database::Channel::create_dm(&db, &user_a, &user_b).await
-        },
-        &userA, &userB,
-    );
-
-    shim!(
-        cx,
-        proc_users_suspend,
-        duration JsNumber 1
-        reason JsString 2,
-        user User 0,
-        |db| async move {
-            let duration = duration as usize;
-            user.suspend(&db, if duration == 0 { None } else { Some(duration) }, Some(reason.split('|').map(|x| x.to_owned()).collect())).await
-        },
-        &user,
-    );
-
-    Ok(())
-}
diff --git a/crates/bindings/node/test.js b/crates/bindings/node/test.js
deleted file mode 100644
index d8f601747..000000000
--- a/crates/bindings/node/test.js
+++ /dev/null
@@ -1,53 +0,0 @@
-const Internal = require(".");
-
-// playing around with class wrapper, not practical
-class Model {
-  constructor(model) {
-    this.model = model;
-  }
-
-  data() {
-    return Internal.model_data.bind(this.model)();
-  }
-
-  error() {
-    return Internal.model_error.bind(this.model)();
-  }
-}
-
-class User extends Model {
-  constructor(db, user) {
-    super(user);
-    this.db = db;
-  }
-}
-
-class Database {
-  constructor() {
-    this.db = Internal.database();
-  }
-
-  async fetchUser(userId) {
-    return new User(
-      this,
-      await Internal.database_fetch_user.bind(this.db)(userId)
-    );
-  }
-
-  async fetchUserByUsername(username, discriminator) {
-    return new User(
-      this,
-      await Internal.database_fetch_user_by_username.bind(this.db)(
-        username,
-        discriminator
-      )
-    );
-  }
-}
-
-const db = new Database();
-db.fetchUserByUsername("dos", "7624").then((user) => console.info(user.data()));
-db.fetchUserByUsername("dos", "1111").then((user) => console.info(user.data()));
-db.fetchUserByUsername("dos", "1111").then((user) =>
-  console.info(user.error())
-);
diff --git a/crates/bindings/package-lock.json b/crates/bindings/package-lock.json
deleted file mode 100644
index 9376d3a95..000000000
--- a/crates/bindings/package-lock.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "name": "bindings",
-  "lockfileVersion": 3,
-  "requires": true,
-  "packages": {}
-}
diff --git a/crates/bonfire/Cargo.toml b/crates/bonfire/Cargo.toml
index be3f6edc3..1f38becfb 100644
--- a/crates/bonfire/Cargo.toml
+++ b/crates/bonfire/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "revolt-bonfire"
-version = "0.8.4"
+version = "0.8.7"
 license = "AGPL-3.0-or-later"
 edition = "2021"
 
@@ -36,12 +36,12 @@ async-std = { version = "1.8.0", features = [
 ] }
 
 # core
-authifier = { version = "1.0.10" }
+authifier = { version = "1.0.15" }
 revolt-result = { path = "../core/result" }
 revolt-models = { path = "../core/models" }
 revolt-config = { path = "../core/config" }
 revolt-database = { path = "../core/database" }
-revolt-permissions = { version = "0.8.4", path = "../core/permissions" }
+revolt-permissions = { version = "0.8.7", path = "../core/permissions" }
 revolt-presence = { path = "../core/presence", features = ["redis-is-patched"] }
 
 # redis
diff --git a/crates/bonfire/src/events/impl.rs b/crates/bonfire/src/events/impl.rs
index 6605d46da..e2bd14566 100644
--- a/crates/bonfire/src/events/impl.rs
+++ b/crates/bonfire/src/events/impl.rs
@@ -103,6 +103,18 @@ impl State {
         let user = self.clone_user();
         self.cache.is_bot = user.bot.is_some();
 
+        // Fetch pending policy changes.
+        let policy_changes = if user.bot.is_some() {
+            vec![]
+        } else {
+            db.fetch_policy_changes()
+                .await?
+                .into_iter()
+                .filter(|policy| policy.created_time > user.last_acknowledged_policy_change)
+                .map(Into::into)
+                .collect()
+        };
+
         // Find all relationships to the user.
         let mut user_ids: HashSet<String> = user
             .relations
@@ -178,7 +190,7 @@ impl State {
             .iter()
             .find(|e| matches!(e, ReadyPayloadFields::UserSettings(_)))
         {
-            Some(db.fetch_user_settings(&user.id, &keys).await?)
+            Some(db.fetch_user_settings(&user.id, keys).await?)
         } else {
             None
         };
@@ -202,12 +214,11 @@ impl State {
             .collect();
 
         // Make all users appear from our perspective.
-        let mut users: Vec<v0::User> = join_all(users
-            .into_iter()
-            .map(|other_user| async {
-                let is_online = online_ids.contains(&other_user.id);
-                other_user.into_known(&user, is_online).await
-            })).await;
+        let mut users: Vec<v0::User> = join_all(users.into_iter().map(|other_user| async {
+            let is_online = online_ids.contains(&other_user.id);
+            other_user.into_known(&user, is_online).await
+        }))
+        .await;
 
         // Make sure we see our own user correctly.
         users.push(user.into_self(true).await);
@@ -273,6 +284,8 @@ impl State {
 
             user_settings,
             channel_unreads: channel_unreads.map(|vec| vec.into_iter().map(Into::into).collect()),
+
+            policy_changes,
         })
     }
 
diff --git a/crates/bonfire/src/websocket.rs b/crates/bonfire/src/websocket.rs
index 810befbf9..dbebfdbd2 100644
--- a/crates/bonfire/src/websocket.rs
+++ b/crates/bonfire/src/websocket.rs
@@ -3,7 +3,7 @@ use std::{collections::HashSet, net::SocketAddr, sync::Arc};
 use async_tungstenite::WebSocketStream;
 use authifier::AuthifierEvent;
 use fred::{
-    error::{RedisError, RedisErrorKind},
+    error::RedisErrorKind,
     interfaces::{ClientLike, EventInterface, PubsubInterface},
     types::RedisConfig,
 };
diff --git a/crates/core/config/Cargo.toml b/crates/core/config/Cargo.toml
index 00c8a00c2..7254866f1 100644
--- a/crates/core/config/Cargo.toml
+++ b/crates/core/config/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "revolt-config"
-version = "0.8.4"
+version = "0.8.7"
 edition = "2021"
 license = "MIT"
 authors = ["Paul Makles <me@insrt.uk>"]
@@ -9,9 +9,10 @@ description = "Revolt Backend: Configuration"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [features]
+anyhow = ["dep:sentry-anyhow"]
 report-macros = ["revolt-result"]
 test = ["async-std"]
-default = ["test"]
+default = ["test", "anyhow"]
 
 [dependencies]
 # Utility
@@ -32,6 +33,7 @@ pretty_env_logger = "0.4.0"
 
 # Sentry
 sentry = "0.31.5"
+sentry-anyhow = { version = "0.38.1", optional = true }
 
 # Core
-revolt-result = { version = "0.8.4", path = "../result", optional = true }
+revolt-result = { version = "0.8.7", path = "../result", optional = true }
diff --git a/crates/core/config/Revolt.toml b/crates/core/config/Revolt.toml
index 469abe291..e3e8ec977 100644
--- a/crates/core/config/Revolt.toml
+++ b/crates/core/config/Revolt.toml
@@ -56,6 +56,8 @@ authifier_shield_key = ""
 voso_legacy_token = ""
 # Whether services are behind the Cloudflare network
 trust_cloudflare = false
+# easypwned endpoint
+easypwned = ""
 
 [api.security.captcha]
 # hCaptcha configuration
@@ -279,4 +281,5 @@ events = ""
 voice_ingress = ""
 files = ""
 proxy = ""
+pushd = ""
 crond = ""
diff --git a/crates/core/config/src/lib.rs b/crates/core/config/src/lib.rs
index 16c398370..d5b1d187a 100644
--- a/crates/core/config/src/lib.rs
+++ b/crates/core/config/src/lib.rs
@@ -7,6 +7,7 @@ use once_cell::sync::Lazy;
 use serde::Deserialize;
 
 pub use sentry::{capture_error, capture_message, Level};
+pub use sentry_anyhow::capture_anyhow;
 
 #[cfg(feature = "report-macros")]
 #[macro_export]
@@ -122,6 +123,7 @@ pub struct ApiSmtp {
     pub reply_to: Option<String>,
     pub port: Option<i32>,
     pub use_tls: Option<bool>,
+    pub use_starttls: Option<bool>,
 }
 
 #[derive(Deserialize, Debug, Clone)]
@@ -167,6 +169,7 @@ pub struct ApiSecurity {
     pub voso_legacy_token: String,
     pub captcha: ApiSecurityCaptcha,
     pub trust_cloudflare: bool,
+    pub easypwned: String,
 }
 
 #[derive(Deserialize, Debug, Clone)]
@@ -190,7 +193,7 @@ pub struct LiveKitNode {
 
 #[derive(Deserialize, Debug, Clone)]
 pub struct ApiUsers {
-    pub early_adopter_cutoff: Option<u64>
+    pub early_adopter_cutoff: Option<u64>,
 }
 
 #[derive(Deserialize, Debug, Clone)]
@@ -356,6 +359,7 @@ pub struct Sentry {
     pub voice_ingress: String,
     pub files: String,
     pub proxy: String,
+    pub pushd: String,
     pub crond: String,
 }
 
diff --git a/crates/core/database/Cargo.toml b/crates/core/database/Cargo.toml
index e6f0eafef..61119d242 100644
--- a/crates/core/database/Cargo.toml
+++ b/crates/core/database/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "revolt-database"
-version = "0.8.4"
+version = "0.8.7"
 edition = "2021"
 license = "AGPL-3.0-or-later"
 authors = ["Paul Makles <me@insrt.uk>"]
@@ -24,19 +24,19 @@ default = ["mongodb", "async-std-runtime", "tasks"]
 
 [dependencies]
 # Core
-revolt-config = { version = "0.8.4", path = "../config", features = [
+revolt-config = { version = "0.8.7", path = "../config", features = [
     "report-macros",
 ] }
-revolt-result = { version = "0.8.4", path = "../result" }
-revolt-models = { version = "0.8.4", path = "../models", features = [
+revolt-result = { version = "0.8.7", path = "../result" }
+revolt-models = { version = "0.8.7", path = "../models", features = [
     "validator",
 ] }
-revolt-presence = { version = "0.8.4", path = "../presence" }
-revolt-permissions = { version = "0.8.4", path = "../permissions", features = [
+revolt-presence = { version = "0.8.7", path = "../presence" }
+revolt-permissions = { version = "0.8.7", path = "../permissions", features = [
     "serde",
     "bson",
 ] }
-revolt-parser = { version = "0.1.0", path = "../parser" }
+revolt-parser = { version = "0.8.7", path = "../parser" }
 
 # Utility
 log = "0.4"
@@ -97,7 +97,7 @@ web-push = "0.10.0"
 revolt_a2 = { version = "0.10", default-features = false, features = ["ring"] }
 
 # Authifier
-authifier = { version = "1.0.10", features = ["rocket_impl"] }
+authifier = { version = "1.0.15", features = ["rocket_impl"] }
 
 # RabbitMQ
 amqprs = { version = "1.7.0" }
diff --git a/crates/core/database/src/drivers/mod.rs b/crates/core/database/src/drivers/mod.rs
index f3ffbede2..e05734847 100644
--- a/crates/core/database/src/drivers/mod.rs
+++ b/crates/core/database/src/drivers/mod.rs
@@ -3,6 +3,7 @@ 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;
@@ -102,6 +103,13 @@ impl Database {
         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 {
@@ -118,6 +126,7 @@ impl Database {
                         ),
                         port: config.api.smtp.port,
                         use_tls: config.api.smtp.use_tls,
+                        use_starttls: config.api.smtp.use_starttls,
                     },
                     expiry: Default::default(),
                     templates: if config.production {
@@ -134,6 +143,15 @@ impl Database {
                                 url: format!("{}/login/reset/", config.hosts.app),
                                 html: Some(include_str!("../../templates/reset.html").into()),
                             },
+                            reset_existing: Template {
+                                title: "You already have a Revolt 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(),
@@ -156,9 +174,16 @@ impl Database {
                                 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(),
+                                text: include_str!("../../templates/deletion.whitelabel.txt")
+                                    .into(),
                                 url: format!("{}/delete/", config.hosts.app),
                                 html: None,
                             },
diff --git a/crates/core/database/src/drivers/reference.rs b/crates/core/database/src/drivers/reference.rs
index 6d2436663..e02eae644 100644
--- a/crates/core/database/src/drivers/reference.rs
+++ b/crates/core/database/src/drivers/reference.rs
@@ -4,8 +4,8 @@ use futures::lock::Mutex;
 
 use crate::{
     Bot, Channel, ChannelCompositeKey, ChannelUnread, Emoji, File, FileHash, Invite, Member,
-    MemberCompositeKey, Message, RatelimitEvent, Report, Server, ServerBan, Snapshot, User,
-    UserSettings, Webhook,
+    MemberCompositeKey, Message, PolicyChange, RatelimitEvent, Report, Server, ServerBan, Snapshot,
+    User, UserSettings, Webhook,
 };
 
 database_derived!(
@@ -21,6 +21,7 @@ database_derived!(
         pub file_hashes: Arc<Mutex<HashMap<String, FileHash>>>,
         pub files: Arc<Mutex<HashMap<String, File>>>,
         pub messages: Arc<Mutex<HashMap<String, Message>>>,
+        pub policy_changes: Arc<Mutex<HashMap<String, PolicyChange>>>,
         pub ratelimit_events: Arc<Mutex<HashMap<String, RatelimitEvent>>>,
         pub user_settings: Arc<Mutex<HashMap<String, UserSettings>>>,
         pub users: Arc<Mutex<HashMap<String, User>>>,
diff --git a/crates/core/database/src/events/client.rs b/crates/core/database/src/events/client.rs
index 22ef110fa..3937b3b33 100644
--- a/crates/core/database/src/events/client.rs
+++ b/crates/core/database/src/events/client.rs
@@ -3,7 +3,7 @@ use revolt_result::Error;
 use serde::{Deserialize, Serialize};
 
 use revolt_models::v0::{
-    AppendMessage, Channel, ChannelUnread, ChannelVoiceState, Emoji, FieldsChannel, FieldsMember, FieldsMessage, FieldsRole, FieldsServer, FieldsUser, FieldsWebhook, Member, MemberCompositeKey, Message, PartialChannel, PartialMember, PartialMessage, PartialRole, PartialServer, PartialUser, PartialUserVoiceState, PartialWebhook, RemovalIntention, Report, Server, User, UserSettings, UserVoiceState, Webhook
+    AppendMessage, Channel, ChannelUnread, ChannelVoiceState, Emoji, FieldsChannel, FieldsMember, FieldsMessage, FieldsRole, FieldsServer, FieldsUser, FieldsWebhook, Member, MemberCompositeKey, Message, PartialChannel, PartialMember, PartialMessage, PartialRole, PartialServer, PartialUser, PartialUserVoiceState, PartialWebhook, PolicyChange, RemovalIntention, Report, Server, User, UserSettings, UserVoiceState, Webhook
 };
 
 use crate::Database;
@@ -62,6 +62,8 @@ pub enum EventV1 {
         user_settings: Option<UserSettings>,
         #[serde(skip_serializing_if = "Option::is_none")]
         channel_unreads: Option<Vec<ChannelUnread>>,
+
+        policy_changes: Vec<PolicyChange>,
     },
 
     /// Ping response
diff --git a/crates/core/database/src/models/admin_migrations/ops/mongodb/init.rs b/crates/core/database/src/models/admin_migrations/ops/mongodb/init.rs
index 00fe26b8b..4a422cbba 100644
--- a/crates/core/database/src/models/admin_migrations/ops/mongodb/init.rs
+++ b/crates/core/database/src/models/admin_migrations/ops/mongodb/init.rs
@@ -64,6 +64,10 @@ pub async fn create_database(db: &MongoDb) {
         .await
         .expect("Failed to create user_settings collection.");
 
+    db.create_collection("policy_changes")
+        .await
+        .expect("Failed to create policy_changes collection.");
+
     db.create_collection("safety_reports")
         .await
         .expect("Failed to create safety_reports collection.");
diff --git a/crates/core/database/src/models/admin_migrations/ops/mongodb/scripts.rs b/crates/core/database/src/models/admin_migrations/ops/mongodb/scripts.rs
index ea65c2af9..72b03dbfe 100644
--- a/crates/core/database/src/models/admin_migrations/ops/mongodb/scripts.rs
+++ b/crates/core/database/src/models/admin_migrations/ops/mongodb/scripts.rs
@@ -5,10 +5,11 @@ use crate::{
         bson::{doc, from_bson, from_document, to_document, Bson, DateTime, Document},
         options::FindOptions,
     },
-    AbstractChannels, AbstractServers, Channel, Invite, MongoDb, DISCRIMINATOR_SEARCH_SPACE,
+    AbstractChannels, AbstractServers, Channel, Invite, MongoDb, User, DISCRIMINATOR_SEARCH_SPACE,
 };
-use bson::oid::ObjectId;
+use bson::{oid::ObjectId, to_bson};
 use futures::StreamExt;
+use iso8601_timestamp::Timestamp;
 use rand::seq::SliceRandom;
 use revolt_permissions::DEFAULT_WEBHOOK_PERMISSIONS;
 use revolt_result::{Error, ErrorType};
@@ -21,7 +22,7 @@ struct MigrationInfo {
     revision: i32,
 }
 
-pub const LATEST_REVISION: i32 = 33;
+pub const LATEST_REVISION: i32 = 43; // MUST BE +1 to last migration
 
 pub async fn migrate_database(db: &MongoDb) {
     let migrations = db.col::<Document>("migrations");
@@ -1131,6 +1132,42 @@ pub async fn run_migrations(db: &MongoDb, revision: i32) -> i32 {
     }
 
     if revision <= 32 {
+        info!(
+            "Running migration [revision 32 / 12-05-2025]: (Authifier) Add last_seen to sessions."
+        );
+
+        let db = authifier::Database::MongoDb(authifier::database::MongoDb(db.db()));
+        db.run_migration(authifier::Migration::M2025_02_20AddLastSeenToSession)
+            .await
+            .unwrap();
+    }
+
+    if revision <= 40 {
+        info!(
+            "Running migration [revision |> 40 / 30-05-2025]: Set last policy acknowlegement date to now and create policy changes collection."
+        );
+
+        db.db()
+            .create_collection("policy_changes")
+            .await
+            .expect("Failed to create policy_changes collection.");
+
+        db.db()
+            .collection::<User>("users")
+            .update_many(
+                doc! {},
+                doc! {
+                    "$set": {
+                        "last_acknowledged_policy_change": to_bson(&Timestamp::now_utc())
+                            .expect("failed to serialise timestamp")
+                    }
+                },
+            )
+            .await
+            .expect("failed to update users");
+    }
+
+    if revision <= 41 {
         info!("Running migration [revision 32 / 26-01-2025]: Add `is_publishing` and `is_receiving` to members");
 
         db.col::<Document>("server_members")
@@ -1147,7 +1184,7 @@ pub async fn run_migrations(db: &MongoDb, revision: i32) -> i32 {
             .expect("Failed to update members");
     }
 
-    if revision <= 33 {
+    if revision <= 42 {
         info!("Running migration [revision 33 / 29-04-2025]: Convert all `VoiceChannel`'s into `TextChannel` ");
 
         db.col::<Document>("channels")
diff --git a/crates/core/database/src/models/bots/model.rs b/crates/core/database/src/models/bots/model.rs
index 0a7960491..24c56bb1b 100644
--- a/crates/core/database/src/models/bots/model.rs
+++ b/crates/core/database/src/models/bots/model.rs
@@ -1,4 +1,3 @@
-use revolt_config::config;
 use revolt_result::Result;
 use ulid::Ulid;
 
diff --git a/crates/core/database/src/models/channel_webhooks/model.rs b/crates/core/database/src/models/channel_webhooks/model.rs
index b163cbfeb..cdf94db43 100644
--- a/crates/core/database/src/models/channel_webhooks/model.rs
+++ b/crates/core/database/src/models/channel_webhooks/model.rs
@@ -142,7 +142,7 @@ mod tests {
                 ..Default::default()
             };
 
-            db.insert_webhook(&webhook).await.unwrap();
+            webhook.create(&db).await.unwrap();
 
             let mut updated_webhook = webhook.clone();
             updated_webhook
diff --git a/crates/core/database/src/models/channels/model.rs b/crates/core/database/src/models/channels/model.rs
index 797da5afd..1c1edafd2 100644
--- a/crates/core/database/src/models/channels/model.rs
+++ b/crates/core/database/src/models/channels/model.rs
@@ -338,13 +338,10 @@ impl Channel {
 
             db.insert_channel(&channel).await?;
 
-            match &channel {
-                Channel::DirectMessage { .. } => {
-                    let event = EventV1::ChannelCreate(channel.clone().into());
-                    event.clone().private(user_a.id.clone()).await;
-                    event.private(user_b.id.clone()).await;
-                }
-                _ => {}
+            if let Channel::DirectMessage { .. } = &channel {
+                let event = EventV1::ChannelCreate(channel.clone().into());
+                event.clone().private(user_a.id.clone()).await;
+                event.private(user_b.id.clone()).await;
             };
 
             Ok(channel)
diff --git a/crates/core/database/src/models/file_hashes/model.rs b/crates/core/database/src/models/file_hashes/model.rs
index 46a249f0f..cec7a39db 100644
--- a/crates/core/database/src/models/file_hashes/model.rs
+++ b/crates/core/database/src/models/file_hashes/model.rs
@@ -28,7 +28,7 @@ auto_derived_partial!(
         /// Size of this file (in bytes)
         pub size: isize,
     },
-    "PartialFile"
+    "PartialFileHash"
 );
 
 auto_derived!(
diff --git a/crates/core/database/src/models/messages/model.rs b/crates/core/database/src/models/messages/model.rs
index a5bef95cd..458eb927a 100644
--- a/crates/core/database/src/models/messages/model.rs
+++ b/crates/core/database/src/models/messages/model.rs
@@ -5,7 +5,7 @@ use iso8601_timestamp::Timestamp;
 use revolt_config::{config, FeaturesLimits};
 use revolt_models::v0::{
     self, BulkMessageResponse, DataMessageSend, Embed, MessageAuthor, MessageFlags, MessageSort,
-    MessageWebhook, PushNotification, ReplyIntent, SendableEmbed, Text
+    MessageWebhook, PushNotification, ReplyIntent, SendableEmbed, Text,
 };
 use revolt_permissions::{calculate_channel_permissions, ChannelPermission, PermissionValue};
 use revolt_result::{ErrorType, Result};
@@ -288,9 +288,9 @@ impl Message {
             .map_err(|_| create_error!(InvalidOperation))?;
 
         // Check the message is not empty
-        if (data.content.as_ref().map_or(true, |v| v.is_empty()))
-            && (data.attachments.as_ref().map_or(true, |v| v.is_empty()))
-            && (data.embeds.as_ref().map_or(true, |v| v.is_empty()))
+        if (data.content.as_ref().is_none_or(|v| v.is_empty()))
+            && (data.attachments.as_ref().is_none_or(|v| v.is_empty()))
+            && (data.embeds.as_ref().is_none_or(|v| v.is_empty()))
         {
             return Err(create_error!(EmptyMessage));
         }
@@ -384,7 +384,7 @@ impl Message {
             mut user_mentions,
             mut role_mentions,
             mut mentions_everyone,
-            mut mentions_online
+            mut mentions_online,
         } = message_mentions;
 
         if allow_mass_mentions && server_id.is_some() && !role_mentions.is_empty() {
@@ -492,7 +492,9 @@ impl Message {
 
                     let valid_members = db.fetch_members(server.as_str(), &mentions_vec[..]).await;
                     if let Ok(valid_members) = valid_members {
-                        let valid_mentions = HashSet::<&String, RandomState>::from_iter(valid_members.iter().map(|m| &m.id.user));
+                        let valid_mentions = HashSet::<&String, RandomState>::from_iter(
+                            valid_members.iter().map(|m| &m.id.user),
+                        );
 
                         user_mentions.retain(|m| valid_mentions.contains(m)); // quick pass, validate mentions are in the server
 
@@ -506,7 +508,8 @@ impl Message {
                                     .members_can_see_channel()
                                     .await;
 
-                            user_mentions.retain(|m| *member_channel_view_perms.get(m).unwrap_or(&false));
+                            user_mentions
+                                .retain(|m| *member_channel_view_perms.get(m).unwrap_or(&false));
                         }
                     } else {
                         revolt_config::capture_error(&valid_members.unwrap_err());
@@ -520,7 +523,9 @@ impl Message {
         }
 
         if !user_mentions.is_empty() {
-            message.mentions.replace(user_mentions.into_iter().collect());
+            message
+                .mentions
+                .replace(user_mentions.into_iter().collect());
         }
 
         if !role_mentions.is_empty() {
@@ -654,7 +659,7 @@ impl Message {
     pub async fn send(
         &mut self,
         db: &Database,
-        amqp: Option<&AMQP>, // this is optional mostly for tests.
+        _amqp: Option<&AMQP>, // this is optional mostly for tests.
         author: MessageAuthor<'_>,
         user: Option<v0::User>,
         member: Option<v0::Member>,
diff --git a/crates/core/database/src/models/mod.rs b/crates/core/database/src/models/mod.rs
index 671c7abbb..181a30c09 100644
--- a/crates/core/database/src/models/mod.rs
+++ b/crates/core/database/src/models/mod.rs
@@ -8,6 +8,7 @@ mod emojis;
 mod file_hashes;
 mod files;
 mod messages;
+mod policy_changes;
 mod ratelimit_events;
 mod safety_reports;
 mod safety_snapshots;
@@ -27,6 +28,7 @@ pub use emojis::*;
 pub use file_hashes::*;
 pub use files::*;
 pub use messages::*;
+pub use policy_changes::*;
 pub use ratelimit_events::*;
 pub use safety_reports::*;
 pub use safety_snapshots::*;
@@ -51,6 +53,7 @@ pub trait AbstractDatabase:
     + file_hashes::AbstractAttachmentHashes
     + files::AbstractAttachments
     + messages::AbstractMessages
+    + policy_changes::AbstractPolicyChange
     + ratelimit_events::AbstractRatelimitEvents
     + safety_reports::AbstractReport
     + safety_snapshots::AbstractSnapshot
diff --git a/crates/core/database/src/models/policy_changes/mod.rs b/crates/core/database/src/models/policy_changes/mod.rs
new file mode 100644
index 000000000..4d801b73e
--- /dev/null
+++ b/crates/core/database/src/models/policy_changes/mod.rs
@@ -0,0 +1,5 @@
+mod model;
+mod ops;
+
+pub use model::*;
+pub use ops::*;
diff --git a/crates/core/database/src/models/policy_changes/model.rs b/crates/core/database/src/models/policy_changes/model.rs
new file mode 100644
index 000000000..541095054
--- /dev/null
+++ b/crates/core/database/src/models/policy_changes/model.rs
@@ -0,0 +1,20 @@
+use iso8601_timestamp::Timestamp;
+
+auto_derived!(
+    /// Platform policy change
+    pub struct PolicyChange {
+        /// Unique Id
+        #[serde(rename = "_id")]
+        pub id: String,
+
+        /// Time at which this policy was created
+        pub created_time: Timestamp,
+        /// Time at which this policy is effective
+        pub effective_time: Timestamp,
+
+        /// Message shown to users
+        pub description: String,
+        /// URL with details about changes
+        pub url: String,
+    }
+);
diff --git a/crates/core/database/src/models/policy_changes/ops.rs b/crates/core/database/src/models/policy_changes/ops.rs
new file mode 100644
index 000000000..2692a81f4
--- /dev/null
+++ b/crates/core/database/src/models/policy_changes/ops.rs
@@ -0,0 +1,15 @@
+use revolt_result::Result;
+
+use crate::PolicyChange;
+
+mod mongodb;
+mod reference;
+
+#[async_trait]
+pub trait AbstractPolicyChange: Sync + Send {
+    /// Fetch all policy changes
+    async fn fetch_policy_changes(&self) -> Result<Vec<PolicyChange>>;
+
+    /// Acknowledge policy changes
+    async fn acknowledge_policy_changes(&self, user_id: &str) -> Result<()>;
+}
diff --git a/crates/core/database/src/models/policy_changes/ops/mongodb.rs b/crates/core/database/src/models/policy_changes/ops/mongodb.rs
new file mode 100644
index 000000000..fb70646fc
--- /dev/null
+++ b/crates/core/database/src/models/policy_changes/ops/mongodb.rs
@@ -0,0 +1,46 @@
+use bson::to_bson;
+use iso8601_timestamp::Timestamp;
+use revolt_result::Result;
+
+use crate::MongoDb;
+use crate::PolicyChange;
+use crate::User;
+
+use super::AbstractPolicyChange;
+
+static COL: &str = "policy_changes";
+
+#[async_trait]
+impl AbstractPolicyChange for MongoDb {
+    /// Fetch all policy changes
+    async fn fetch_policy_changes(&self) -> Result<Vec<PolicyChange>> {
+        query!(self, find, COL, doc! {})
+    }
+
+    /// Acknowledge policy changes
+    async fn acknowledge_policy_changes(&self, user_id: &str) -> Result<()> {
+        let latest_policy = self
+            .fetch_policy_changes()
+            .await?
+            .into_iter()
+            .map(|policy| policy.created_time)
+            .max()
+            .unwrap_or(Timestamp::UNIX_EPOCH);
+
+        self.col::<User>("users")
+            .update_one(
+                doc! {
+                    "_id": user_id
+                },
+                doc! {
+                    "$set": {
+                        "last_acknowledged_policy_change": to_bson(&latest_policy)
+                            .map_err(|_| create_database_error!("to_bson", "timestamp"))?
+                    }
+                },
+            )
+            .await
+            .map(|_| ())
+            .map_err(|_| create_database_error!("update_one", COL))
+    }
+}
diff --git a/crates/core/database/src/models/policy_changes/ops/reference.rs b/crates/core/database/src/models/policy_changes/ops/reference.rs
new file mode 100644
index 000000000..e9745e449
--- /dev/null
+++ b/crates/core/database/src/models/policy_changes/ops/reference.rs
@@ -0,0 +1,31 @@
+use iso8601_timestamp::Timestamp;
+use revolt_result::Result;
+
+use crate::PolicyChange;
+use crate::ReferenceDb;
+
+use super::AbstractPolicyChange;
+
+#[async_trait]
+impl AbstractPolicyChange for ReferenceDb {
+    /// Fetch all policy changes
+    async fn fetch_policy_changes(&self) -> Result<Vec<PolicyChange>> {
+        let policy_changes = self.policy_changes.lock().await;
+        Ok(policy_changes.values().cloned().collect())
+    }
+
+    /// Acknowledge policy changes
+    async fn acknowledge_policy_changes(&self, user_id: &str) -> Result<()> {
+        let mut users = self.users.lock().await;
+        let user = users.get_mut(user_id).expect("user doesn't exist");
+        user.last_acknowledged_policy_change = self
+            .fetch_policy_changes()
+            .await?
+            .into_iter()
+            .map(|policy| policy.created_time)
+            .max()
+            .unwrap_or(Timestamp::UNIX_EPOCH);
+
+        Ok(())
+    }
+}
diff --git a/crates/core/database/src/models/safety_snapshots/model.rs b/crates/core/database/src/models/safety_snapshots/model.rs
index e82ab3882..e277f3a92 100644
--- a/crates/core/database/src/models/safety_snapshots/model.rs
+++ b/crates/core/database/src/models/safety_snapshots/model.rs
@@ -85,8 +85,8 @@ impl SnapshotContent {
         Ok((
             SnapshotContent::Message {
                 message,
-                prior_context: prior_context.into_iter().map(Into::into).collect(),
-                leading_context: leading_context.into_iter().map(Into::into).collect(),
+                prior_context: prior_context.into_iter().collect(),
+                leading_context: leading_context.into_iter().collect(),
             },
             files,
         ))
diff --git a/crates/core/database/src/models/server_bans/model.rs b/crates/core/database/src/models/server_bans/model.rs
index 46e8a889f..51044efea 100644
--- a/crates/core/database/src/models/server_bans/model.rs
+++ b/crates/core/database/src/models/server_bans/model.rs
@@ -13,6 +13,7 @@ auto_derived!(
     }
 );
 
+#[allow(clippy::disallowed_methods)]
 impl ServerBan {
     /// Create ban
     pub async fn create(
diff --git a/crates/core/database/src/models/server_members/model.rs b/crates/core/database/src/models/server_members/model.rs
index da33644f3..4e8521f19 100644
--- a/crates/core/database/src/models/server_members/model.rs
+++ b/crates/core/database/src/models/server_members/model.rs
@@ -180,7 +180,7 @@ impl Member {
     }
 
     /// Update member data
-    pub async fn update<'a>(
+    pub async fn update(
         &mut self,
         db: &Database,
         partial: PartialMember,
diff --git a/crates/core/database/src/models/servers/model.rs b/crates/core/database/src/models/servers/model.rs
index 67c4daedb..33cfa7134 100644
--- a/crates/core/database/src/models/servers/model.rs
+++ b/crates/core/database/src/models/servers/model.rs
@@ -285,7 +285,7 @@ impl Role {
     }
 
     /// Update server data
-    pub async fn update<'a>(
+    pub async fn update(
         &mut self,
         db: &Database,
         server_id: &str,
diff --git a/crates/core/database/src/models/users/model.rs b/crates/core/database/src/models/users/model.rs
index f52cf5ae2..881cee309 100644
--- a/crates/core/database/src/models/users/model.rs
+++ b/crates/core/database/src/models/users/model.rs
@@ -9,7 +9,7 @@ use once_cell::sync::Lazy;
 use rand::seq::SliceRandom;
 use redis_kiss::{get_connection, AsyncCommands};
 use revolt_config::{config, FeaturesLimits};
-use revolt_models::v0::{self, UserFlags, UserBadges};
+use revolt_models::v0::{self, UserBadges, UserFlags};
 use revolt_presence::filter_online;
 use revolt_result::{create_error, Result};
 use serde_json::json;
@@ -58,6 +58,8 @@ auto_derived_partial!(
         /// Time until user is unsuspended
         #[serde(skip_serializing_if = "Option::is_none")]
         pub suspended_until: Option<Timestamp>,
+        /// Last acknowledged policy change
+        pub last_acknowledged_policy_change: Timestamp,
     },
     "PartialUser"
 );
@@ -179,6 +181,7 @@ impl Default for User {
             privileged: Default::default(),
             bot: Default::default(),
             suspended_until: Default::default(),
+            last_acknowledged_policy_change: Timestamp::UNIX_EPOCH,
         }
     }
 }
@@ -201,6 +204,7 @@ impl User {
             id: account_id.into().unwrap_or_else(|| Ulid::new().to_string()),
             discriminator: User::find_discriminator(db, &username, None).await?,
             username,
+            last_acknowledged_policy_change: Timestamp::now_utc(),
             ..Default::default()
         };
 
@@ -350,16 +354,13 @@ impl User {
     ) -> Result<Vec<v0::User>> {
         let online_ids = filter_online(ids).await;
 
-        Ok(join_all(
-            db
-            .fetch_users(ids)
-            .await?
-            .into_iter()
-            .map(|user| async {
+        Ok(
+            join_all(db.fetch_users(ids).await?.into_iter().map(|user| async {
                 let is_online = online_ids.contains(&user.id);
                 user.into_known(perspective, is_online).await
-            })
-        ).await)
+            }))
+            .await,
+        )
     }
 
     /// Find a free discriminator for a given username
@@ -653,7 +654,7 @@ impl User {
     }
 
     /// Update user data
-    pub async fn update<'a>(
+    pub async fn update(
         &mut self,
         db: &Database,
         partial: PartialUser,
@@ -831,7 +832,7 @@ impl User {
 
         if let Some(cutoff) = config.api.users.early_adopter_cutoff {
             if Ulid::from_string(&self.id).unwrap().timestamp_ms() < cutoff {
-                return badges + UserBadges::EarlyAdopter as u32
+                return badges + UserBadges::EarlyAdopter as u32;
             };
         };
 
diff --git a/crates/core/database/src/models/users/schema.rs b/crates/core/database/src/models/users/schema.rs
index d887b8950..28f5e42e5 100644
--- a/crates/core/database/src/models/users/schema.rs
+++ b/crates/core/database/src/models/users/schema.rs
@@ -6,7 +6,7 @@ use revolt_rocket_okapi::{
 
 use crate::User;
 
-impl<'r> OpenApiFromRequest<'r> for User {
+impl OpenApiFromRequest<'_> for User {
     fn from_request_input(
         _gen: &mut OpenApiGenerator,
         _name: String,
diff --git a/crates/core/database/src/tasks/ack.rs b/crates/core/database/src/tasks/ack.rs
index 1d2aff387..c12e41f3c 100644
--- a/crates/core/database/src/tasks/ack.rs
+++ b/crates/core/database/src/tasks/ack.rs
@@ -3,8 +3,8 @@ use crate::{Database, Message, AMQP};
 
 use deadqueue::limited::Queue;
 use once_cell::sync::Lazy;
+use revolt_config::capture_message;
 use revolt_models::v0::PushNotification;
-use rocket::form::validate::Contains;
 use std::{
     collections::{HashMap, HashSet},
     time::Duration,
@@ -65,6 +65,7 @@ pub async fn queue_ack(channel: String, user: String, event: AckEvent) {
     );
 }
 
+/// Do not add more than one message per event.
 pub async fn queue_message(channel: String, event: AckEvent) {
     Q.try_push(Data {
         channel,
@@ -114,7 +115,7 @@ pub async fn handle_ack_event(
         }
         AckEvent::ProcessMessage { messages } => {
             let mut users: HashSet<&String> = HashSet::new();
-            debug!(
+            info!(
                 "Processing {} messages from channel {}",
                 messages.len(),
                 messages[0].1.channel
@@ -125,7 +126,7 @@ pub async fn handle_ack_event(
                 users.extend(recipents.iter());
             });
 
-            debug!("Found {} users to notify.", users.len());
+            info!("Found {} users to notify.", users.len());
 
             for user in users {
                 let message_ids: Vec<String> = messages
@@ -143,7 +144,7 @@ pub async fn handle_ack_event(
                     db.add_mention_to_unread(channel, user, &message_ids)
                         .await?;
                 }
-                debug!("Added {} mentions for user {}", message_ids.len(), &user);
+                info!("Added {} mentions for user {}", message_ids.len(), &user);
             }
 
             let mut mass_mentions = vec![];
@@ -232,7 +233,7 @@ pub async fn worker(db: Database, amqp: AMQP) {
                     revolt_config::capture_error(&err);
                     error!("{err:?} for {event:?}. ({user:?}, {channel})");
                 } else {
-                    debug!("User {user:?} ack in {channel} with {event:?}");
+                    info!("User {user:?} ack in {channel} with {event:?}");
                 }
             }
         }
@@ -247,6 +248,8 @@ pub async fn worker(db: Database, amqp: AMQP) {
             mut event,
         }) = Q.try_pop()
         {
+            info!("Took next ack from queue, now {} remaining", Q.len());
+
             let key: (Option<String>, String, u8) = (
                 user,
                 channel,
@@ -261,24 +264,31 @@ pub async fn worker(db: Database, amqp: AMQP) {
                         if let AckEvent::ProcessMessage { messages: existing } =
                             &mut task.data.event
                         {
-                            // add the new message to the list of messages to be processed.
-                            existing.append(new_data);
-
-                            // if the message contains a mass mention, do not delay it any further.
-                            if new_data[0].1.contains_mass_push_mention() {
-                                task.run_immediately();
-                                continue;
-                            }
-
-                            // put a cap on the amount of messages that can be queued, for particularly active channels
-                            if (existing.length() as u16)
-                                < revolt_config::config()
-                                    .await
-                                    .features
-                                    .advanced
-                                    .process_message_delay_limit
-                            {
-                                task.delay();
+                            if let Some(new_event) = new_data.pop() {
+                                // if the message contains a mass mention, do not delay it any further.
+                                if new_event.1.contains_mass_push_mention() {
+                                    // add the new message to the list of messages to be processed.
+                                    existing.push(new_event);
+                                    task.run_immediately();
+                                    continue;
+                                }
+
+                                existing.push(new_event);
+
+                                // put a cap on the amount of messages that can be queued, for particularly active channels
+                                if (existing.length() as u16)
+                                    < revolt_config::config()
+                                        .await
+                                        .features
+                                        .advanced
+                                        .process_message_delay_limit
+                                {
+                                    task.delay();
+                                }
+                            } else {
+                                let err_msg = format!("Got zero-length message event: {event:?}");
+                                capture_message(&err_msg, revolt_config::Level::Warning);
+                                info!("{err_msg}")
                             }
                         } else {
                             panic!("Somehow got an ack message in the add mention arm");
diff --git a/crates/core/database/src/util/bridge/v0.rs b/crates/core/database/src/util/bridge/v0.rs
index ab6246e40..6e658245d 100644
--- a/crates/core/database/src/util/bridge/v0.rs
+++ b/crates/core/database/src/util/bridge/v0.rs
@@ -1,7 +1,8 @@
+use iso8601_timestamp::Timestamp;
 use revolt_models::v0::*;
 use revolt_permissions::{calculate_user_permissions, UserPermission};
 
-use crate::{util::permissions::DatabasePermissionQuery, Database, FileUsedFor};
+use crate::{util::permissions::DatabasePermissionQuery, Database};
 
 impl crate::Bot {
     pub fn into_public_bot(self, user: crate::User) -> PublicBot {
@@ -496,7 +497,7 @@ impl crate::Message {
             reactions: self.reactions,
             interactions: self.interactions.into(),
             masquerade: self.masquerade.map(Into::into),
-            flags: self.flags.map(|flags| flags as u32).unwrap_or_default(),
+            flags: self.flags.unwrap_or_default(),
             pinned: self.pinned,
         }
     }
@@ -525,7 +526,7 @@ impl From<crate::PartialMessage> for PartialMessage {
             reactions: value.reactions,
             interactions: value.interactions.map(Into::into),
             masquerade: value.masquerade.map(Into::into),
-            flags: value.flags.map(|flags| flags as u32),
+            flags: value.flags,
             pinned: value.pinned,
         }
     }
@@ -606,6 +607,17 @@ impl From<Masquerade> for crate::Masquerade {
     }
 }
 
+impl From<crate::PolicyChange> for PolicyChange {
+    fn from(value: crate::PolicyChange) -> Self {
+        PolicyChange {
+            created_time: value.created_time,
+            effective_time: value.effective_time,
+            description: value.description,
+            url: value.url,
+        }
+    }
+}
+
 impl From<crate::Report> for Report {
     fn from(value: crate::Report) -> Self {
         Report {
@@ -1209,6 +1221,7 @@ impl From<User> for crate::User {
             privileged: value.privileged,
             bot: value.bot.map(Into::into),
             suspended_until: None,
+            last_acknowledged_policy_change: Timestamp::UNIX_EPOCH,
         }
     }
 }
diff --git a/crates/core/database/src/util/bulk_permissions.rs b/crates/core/database/src/util/bulk_permissions.rs
index 402607451..99dda7e6c 100644
--- a/crates/core/database/src/util/bulk_permissions.rs
+++ b/crates/core/database/src/util/bulk_permissions.rs
@@ -87,7 +87,7 @@ impl<'z> BulkDatabasePermissionQuery<'z> {
         }
     }
 
-    pub fn channel(self, channel: &'z Channel) -> BulkDatabasePermissionQuery {
+    pub fn channel(self, channel: &'z Channel) -> BulkDatabasePermissionQuery<'z> {
         BulkDatabasePermissionQuery {
             channel: Some(channel.clone()),
             ..self
@@ -109,7 +109,7 @@ impl<'z> BulkDatabasePermissionQuery<'z> {
         }
     }
 
-    pub fn members(self, members: &'z [Member]) -> BulkDatabasePermissionQuery {
+    pub fn members(self, members: &'z [Member]) -> BulkDatabasePermissionQuery<'z> {
         BulkDatabasePermissionQuery {
             members: Some(members.to_owned()),
             cached_member_perms: None,
@@ -120,7 +120,7 @@ impl<'z> BulkDatabasePermissionQuery<'z> {
         }
     }
 
-    pub fn users(self, users: &'z [User]) -> BulkDatabasePermissionQuery {
+    pub fn users(self, users: &'z [User]) -> BulkDatabasePermissionQuery<'z> {
         BulkDatabasePermissionQuery {
             users: Some(users.to_owned()),
             cached_member_perms: None,
diff --git a/crates/core/database/src/util/permissions.rs b/crates/core/database/src/util/permissions.rs
index e3254e66d..f5414396c 100644
--- a/crates/core/database/src/util/permissions.rs
+++ b/crates/core/database/src/util/permissions.rs
@@ -308,16 +308,14 @@ impl PermissionQuery for DatabasePermissionQuery<'_> {
 
     /// Are we a recipient of this channel?
     async fn are_we_part_of_the_channel(&mut self) -> bool {
-        if let Some(channel) = &self.channel {
-            match channel {
-                Cow::Borrowed(Channel::DirectMessage { recipients, .. })
-                | Cow::Owned(Channel::DirectMessage { recipients, .. })
-                | Cow::Borrowed(Channel::Group { recipients, .. })
-                | Cow::Owned(Channel::Group { recipients, .. }) => {
-                    recipients.contains(&self.perspective.id)
-                }
-                _ => false,
-            }
+        if let Some(
+            Cow::Borrowed(Channel::DirectMessage { recipients, .. })
+            | Cow::Owned(Channel::DirectMessage { recipients, .. })
+            | Cow::Borrowed(Channel::Group { recipients, .. })
+            | Cow::Owned(Channel::Group { recipients, .. }),
+        ) = &self.channel
+        {
+            recipients.contains(&self.perspective.id)
         } else {
             false
         }
@@ -424,7 +422,7 @@ impl<'a> DatabasePermissionQuery<'a> {
     }
 
     /// Use user
-    pub fn user(self, user: &'a User) -> DatabasePermissionQuery {
+    pub fn user(self, user: &'a User) -> DatabasePermissionQuery<'a> {
         DatabasePermissionQuery {
             user: Some(Cow::Borrowed(user)),
             ..self
@@ -432,7 +430,7 @@ impl<'a> DatabasePermissionQuery<'a> {
     }
 
     /// Use channel
-    pub fn channel(self, channel: &'a Channel) -> DatabasePermissionQuery {
+    pub fn channel(self, channel: &'a Channel) -> DatabasePermissionQuery<'a> {
         DatabasePermissionQuery {
             channel: Some(Cow::Borrowed(channel)),
             ..self
@@ -440,7 +438,7 @@ impl<'a> DatabasePermissionQuery<'a> {
     }
 
     /// Use server
-    pub fn server(self, server: &'a Server) -> DatabasePermissionQuery {
+    pub fn server(self, server: &'a Server) -> DatabasePermissionQuery<'a> {
         DatabasePermissionQuery {
             server: Some(Cow::Borrowed(server)),
             ..self
@@ -448,7 +446,7 @@ impl<'a> DatabasePermissionQuery<'a> {
     }
 
     /// Use member
-    pub fn member(self, member: &'a Member) -> DatabasePermissionQuery {
+    pub fn member(self, member: &'a Member) -> DatabasePermissionQuery<'a> {
         DatabasePermissionQuery {
             member: Some(Cow::Borrowed(member)),
             ..self
diff --git a/crates/core/database/templates/reset-existing.html b/crates/core/database/templates/reset-existing.html
new file mode 100644
index 000000000..00ef782b6
--- /dev/null
+++ b/crates/core/database/templates/reset-existing.html
@@ -0,0 +1,188 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html>
+  <head>
+    <!-- Compiled with Bootstrap Email version: 1.5.1 --><meta http-equiv="x-ua-compatible" content="ie=edge">
+    <meta name="x-apple-disable-message-reformatting">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <meta name="format-detection" content="telephone=no, date=no, address=no, email=no">
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+    <style type="text/css">
+      body,table,td{font-family:Helvetica,Arial,sans-serif !important}.ExternalClass{width:100%}.ExternalClass,.ExternalClass p,.ExternalClass span,.ExternalClass font,.ExternalClass td,.ExternalClass div{line-height:150%}a{text-decoration:none}*{color:inherit}a[x-apple-data-detectors],u+#body a,#MessageViewBody a{color:inherit;text-decoration:none;font-size:inherit;font-family:inherit;font-weight:inherit;line-height:inherit}img{-ms-interpolation-mode:bicubic}table:not([class^=s-]){font-family:Helvetica,Arial,sans-serif;mso-table-lspace:0pt;mso-table-rspace:0pt;border-spacing:0px;border-collapse:collapse}table:not([class^=s-]) td{border-spacing:0px;border-collapse:collapse}@media screen and (max-width: 600px){.w-full,.w-full>tbody>tr>td{width:100% !important}.w-24,.w-24>tbody>tr>td{width:96px !important}.p-lg-10:not(table),.p-lg-10:not(.btn)>tbody>tr>td,.p-lg-10.btn td a{padding:0 !important}.p-3:not(table),.p-3:not(.btn)>tbody>tr>td,.p-3.btn td a{padding:12px !important}.p-6:not(table),.p-6:not(.btn)>tbody>tr>td,.p-6.btn td a{padding:24px !important}*[class*=s-lg-]>tbody>tr>td{font-size:0 !important;line-height:0 !important;height:0 !important}.s-4>tbody>tr>td{font-size:16px !important;line-height:16px !important;height:16px !important}.s-6>tbody>tr>td{font-size:24px !important;line-height:24px !important;height:24px !important}.s-10>tbody>tr>td{font-size:40px !important;line-height:40px !important;height:40px !important}}
+    </style>
+  </head>
+  <body class="bg-light" style="outline: 0; width: 100%; min-width: 100%; height: 100%; -webkit-text-size-adjust: 100%; -ms-text-size-adjust: 100%; font-family: Helvetica, Arial, sans-serif; line-height: 24px; font-weight: normal; font-size: 16px; -moz-box-sizing: border-box; -webkit-box-sizing: border-box; box-sizing: border-box; color: #000000; margin: 0; padding: 0; border-width: 0;" bgcolor="#f7fafc">
+    <table class="bg-light body" valign="top" role="presentation" border="0" cellpadding="0" cellspacing="0" style="outline: 0; width: 100%; min-width: 100%; height: 100%; -webkit-text-size-adjust: 100%; -ms-text-size-adjust: 100%; font-family: Helvetica, Arial, sans-serif; line-height: 24px; font-weight: normal; font-size: 16px; -moz-box-sizing: border-box; -webkit-box-sizing: border-box; box-sizing: border-box; color: #000000; margin: 0; padding: 0; border-width: 0;" bgcolor="#f7fafc">
+      <tbody>
+        <tr>
+          <td valign="top" style="line-height: 24px; font-size: 16px; margin: 0;" align="left" bgcolor="#f7fafc">
+            <table class="container" role="presentation" border="0" cellpadding="0" cellspacing="0" style="width: 100%;">
+              <tbody>
+                <tr>
+                  <td align="center" style="line-height: 24px; font-size: 16px; margin: 0; padding: 0 16px;">
+                    <!--[if (gte mso 9)|(IE)]>
+                      <table align="center" role="presentation">
+                        <tbody>
+                          <tr>
+                            <td width="600">
+                    <![endif]-->
+                    <table align="center" role="presentation" border="0" cellpadding="0" cellspacing="0" style="width: 100%; max-width: 600px; margin: 0 auto;">
+                      <tbody>
+                        <tr>
+                          <td style="line-height: 24px; font-size: 16px; margin: 0;" align="left">
+                            <table class="s-10 w-full" role="presentation" border="0" cellpadding="0" cellspacing="0" style="width: 100%;" width="100%">
+                              <tbody>
+                                <tr>
+                                  <td style="line-height: 40px; font-size: 40px; width: 100%; height: 40px; margin: 0;" align="left" width="100%" height="40">
+                                    &#160;
+                                  </td>
+                                </tr>
+                              </tbody>
+                            </table>
+                            <table class="ax-center" role="presentation" align="center" border="0" cellpadding="0" cellspacing="0" style="margin: 0 auto;">
+                              <tbody>
+                                <tr>
+                                  <td style="line-height: 24px; font-size: 16px; margin: 0;" align="left">
+                                    <img class="w-24" src="https://app.revolt.chat/assets/logo_round.png" style="height: auto; line-height: 100%; outline: none; text-decoration: none; display: block; width: 96px; border-style: none; border-width: 0;" width="96">
+                                  </td>
+                                </tr>
+                              </tbody>
+                            </table>
+                            <table class="s-10 w-full" role="presentation" border="0" cellpadding="0" cellspacing="0" style="width: 100%;" width="100%">
+                              <tbody>
+                                <tr>
+                                  <td style="line-height: 40px; font-size: 40px; width: 100%; height: 40px; margin: 0;" align="left" width="100%" height="40">
+                                    &#160;
+                                  </td>
+                                </tr>
+                              </tbody>
+                            </table>
+                            <table class="card p-6 p-lg-10 space-y-4" role="presentation" border="0" cellpadding="0" cellspacing="0" style="border-radius: 6px; border-collapse: separate !important; width: 100%; overflow: hidden; border: 1px solid #e2e8f0;" bgcolor="#ffffff">
+                              <tbody>
+                                <tr>
+                                  <td style="line-height: 24px; font-size: 16px; width: 100%; margin: 0; padding: 40px;" align="left" bgcolor="#ffffff">
+                                    <h1 class="h3 fw-700" style="padding-top: 0; padding-bottom: 0; font-weight: 700 !important; vertical-align: baseline; font-size: 28px; line-height: 33.6px; margin: 0;" align="left">Password Reset</h1>
+                                    <table class="s-4 w-full" role="presentation" border="0" cellpadding="0" cellspacing="0" style="width: 100%;" width="100%">
+                                      <tbody>
+                                        <tr>
+                                          <td style="line-height: 16px; font-size: 16px; width: 100%; height: 16px; margin: 0;" align="left" width="100%" height="16">
+                                            &#160;
+                                          </td>
+                                        </tr>
+                                      </tbody>
+                                    </table>
+                                    <p class="" style="line-height: 24px; font-size: 16px; width: 100%; margin: 0;" align="left">
+                                      You tried to create a new account with or try to re-verify this email
+                                      but there is already an existing verified account under this email.
+                                    </p>
+                                    <table class="s-4 w-full" role="presentation" border="0" cellpadding="0" cellspacing="0" style="width: 100%;" width="100%">
+                                      <tbody>
+                                        <tr>
+                                          <td style="line-height: 16px; font-size: 16px; width: 100%; height: 16px; margin: 0;" align="left" width="100%" height="16">
+                                            &#160;
+                                          </td>
+                                        </tr>
+                                      </tbody>
+                                    </table>
+                                    <p class="" style="line-height: 24px; font-size: 16px; width: 100%; margin: 0;" align="left">
+                                      If you wish, you can now proceed to reset the password on it, click
+                                      below to continue.
+                                    </p>
+                                    <table class="s-4 w-full" role="presentation" border="0" cellpadding="0" cellspacing="0" style="width: 100%;" width="100%">
+                                      <tbody>
+                                        <tr>
+                                          <td style="line-height: 16px; font-size: 16px; width: 100%; height: 16px; margin: 0;" align="left" width="100%" height="16">
+                                            &#160;
+                                          </td>
+                                        </tr>
+                                      </tbody>
+                                    </table>
+                                    <table class="btn btn-primary p-3 fw-700" role="presentation" border="0" cellpadding="0" cellspacing="0" style="border-radius: 6px; border-collapse: separate !important; font-weight: 700 !important;">
+                                      <tbody>
+                                        <tr>
+                                          <td style="line-height: 24px; font-size: 16px; border-radius: 6px; font-weight: 700 !important; margin: 0;" align="center" bgcolor="#0d6efd">
+                                            <a href="{{url}}" style="color: #ffffff; font-size: 16px; font-family: Helvetica, Arial, sans-serif; text-decoration: none; border-radius: 6px; line-height: 20px; display: block; font-weight: 700 !important; white-space: nowrap; background-color: #0d6efd; padding: 12px; border: 1px solid #0d6efd;">Reset</a>
+                                          </td>
+                                        </tr>
+                                      </tbody>
+                                    </table>
+                                  </td>
+                                </tr>
+                              </tbody>
+                            </table>
+                            <table class="s-6 w-full" role="presentation" border="0" cellpadding="0" cellspacing="0" style="width: 100%;" width="100%">
+                              <tbody>
+                                <tr>
+                                  <td style="line-height: 24px; font-size: 24px; width: 100%; height: 24px; margin: 0;" align="left" width="100%" height="24">
+                                    &#160;
+                                  </td>
+                                </tr>
+                              </tbody>
+                            </table>
+                            <div class="text-muted text-center" style="color: #718096;" align="center">
+                              This email is intended for {{email}}<br>
+                              Sent from Revolt<br>
+                              Made in Europe
+                            </div>
+                            <table class="s-6 w-full" role="presentation" border="0" cellpadding="0" cellspacing="0" style="width: 100%;" width="100%">
+                              <tbody>
+                                <tr>
+                                  <td style="line-height: 24px; font-size: 24px; width: 100%; height: 24px; margin: 0;" align="left" width="100%" height="24">
+                                    &#160;
+                                  </td>
+                                </tr>
+                              </tbody>
+                            </table>
+                            <table class="s-6 w-full" role="presentation" border="0" cellpadding="0" cellspacing="0" style="width: 100%;" width="100%">
+                              <tbody>
+                                <tr>
+                                  <td style="line-height: 24px; font-size: 24px; width: 100%; height: 24px; margin: 0;" align="left" width="100%" height="24">
+                                    &#160;
+                                  </td>
+                                </tr>
+                              </tbody>
+                            </table>
+                            <table class="ax-center" role="presentation" align="center" border="0" cellpadding="0" cellspacing="0" style="margin: 0 auto;">
+                              <tbody>
+                                <tr>
+                                  <td style="line-height: 24px; font-size: 16px; margin: 0;" align="left">
+                                    <div class="text-muted text-xs" style="color: #718096; font-size: 12px; line-height: 14.4px;">
+                                      Revolt Platforms Ltd. is a company incorporated and registered under the
+                                      laws of England and Wales.<br>
+                                      Registered Company Number: 16260658<br>
+                                      Registered Office:<br>
+                                      Suite 5703 Unit 3A, 34-35 Hatton Garden,<br>
+                                      Holborn, United Kingdom, EC1N 8DX
+                                    </div>
+                                  </td>
+                                </tr>
+                              </tbody>
+                            </table>
+                            <table class="s-6 w-full" role="presentation" border="0" cellpadding="0" cellspacing="0" style="width: 100%;" width="100%">
+                              <tbody>
+                                <tr>
+                                  <td style="line-height: 24px; font-size: 24px; width: 100%; height: 24px; margin: 0;" align="left" width="100%" height="24">
+                                    &#160;
+                                  </td>
+                                </tr>
+                              </tbody>
+                            </table>
+                          </td>
+                        </tr>
+                      </tbody>
+                    </table>
+                    <!--[if (gte mso 9)|(IE)]>
+                    </td>
+                  </tr>
+                </tbody>
+              </table>
+                    <![endif]-->
+                  </td>
+                </tr>
+              </tbody>
+            </table>
+          </td>
+        </tr>
+      </tbody>
+    </table>
+  </body>
+</html>
diff --git a/crates/core/database/templates/reset-existing.original.html b/crates/core/database/templates/reset-existing.original.html
new file mode 100644
index 000000000..1273a69c4
--- /dev/null
+++ b/crates/core/database/templates/reset-existing.original.html
@@ -0,0 +1,41 @@
+<html>
+  <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <style>
+      /* Add custom classes and styles that you want inlined here */
+    </style>
+  </head>
+  <body class="bg-light">
+    <div class="container">
+      <img
+        class="ax-center my-10 w-24"
+        src="https://app.revolt.chat/assets/logo_round.png"
+      />
+      <div class="card p-6 p-lg-10 space-y-4">
+        <h1 class="h3 fw-700">Password Reset</h1>
+        <p>
+          You tried to create a new account with or try to re-verify this email
+          but there is already an existing verified account under this email.
+        </p>
+        <p>
+          If you wish, you can now proceed to reset the password on it, click
+          below to continue.
+        </p>
+        <a class="btn btn-primary p-3 fw-700" href="{{url}}">Reset</a>
+      </div>
+      <div class="text-muted text-center my-6">
+        This email is intended for {{email}}<br />
+        Sent from Revolt<br />
+        Made in Europe
+      </div>
+      <div class="text-muted text-xs my-6 ax-center">
+        Revolt Platforms Ltd. is a company incorporated and registered under the
+        laws of England and Wales.<br />
+        Registered Company Number: 16260658<br />
+        Registered Office:<br />
+        Suite 5703 Unit 3A, 34-35 Hatton Garden,<br />
+        Holborn, United Kingdom, EC1N 8DX
+      </div>
+    </div>
+  </body>
+</html>
diff --git a/crates/core/database/templates/reset-existing.txt b/crates/core/database/templates/reset-existing.txt
new file mode 100644
index 000000000..8c8fc9edc
--- /dev/null
+++ b/crates/core/database/templates/reset-existing.txt
@@ -0,0 +1,19 @@
+You tried to create a new account with or try
+to re-verify this email but there is already
+an existing verified account under this email.
+
+If you wish, you can now proceed to reset the
+password on it, click below to continue.
+
+Please navigate to: {{url}}
+
+This email is intended for {{email}}
+Sent by Revolt
+Made in Europe
+
+Revolt Platforms Ltd. is a company incorporated and registered under the laws of England and Wales.
+
+Registration Number: 16260658
+Registered Office:
+Suite 5703 Unit 3A, 34-35 Hatton Garden,
+Holborn, United Kingdom, EC1N 8DX
diff --git a/crates/core/files/Cargo.toml b/crates/core/files/Cargo.toml
index e83031365..4dfadeedc 100644
--- a/crates/core/files/Cargo.toml
+++ b/crates/core/files/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "revolt-files"
-version = "0.8.4"
+version = "0.8.7"
 edition = "2021"
 license = "AGPL-3.0-or-later"
 authors = ["Paul Makles <me@insrt.uk>"]
@@ -20,10 +20,10 @@ typenum = "1.17.0"
 aws-config = "1.5.5"
 aws-sdk-s3 = { version = "1.46.0", features = ["behavior-version-latest"] }
 
-revolt-config = { version = "0.8.4", path = "../config", features = [
+revolt-config = { version = "0.8.7", path = "../config", features = [
     "report-macros",
 ] }
-revolt-result = { version = "0.8.4", path = "../result" }
+revolt-result = { version = "0.8.7", path = "../result" }
 
 # image processing
 jxl-oxide = "0.8.1"
diff --git a/crates/core/models/Cargo.toml b/crates/core/models/Cargo.toml
index c2c667bec..6c9dcf805 100644
--- a/crates/core/models/Cargo.toml
+++ b/crates/core/models/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "revolt-models"
-version = "0.8.4"
+version = "0.8.7"
 edition = "2021"
 license = "MIT"
 authors = ["Paul Makles <me@insrt.uk>"]
@@ -20,8 +20,8 @@ default = ["serde", "partials", "rocket"]
 
 [dependencies]
 # Core
-revolt-config = { version = "0.8.4", path = "../config" }
-revolt-permissions = { version = "0.8.4", path = "../permissions" }
+revolt-config = { version = "0.8.7", path = "../config" }
+revolt-permissions = { version = "0.8.7", path = "../permissions" }
 
 # Utility
 regex = "1.11"
diff --git a/crates/core/models/src/v0/messages.rs b/crates/core/models/src/v0/messages.rs
index aaf9dc78e..442d4e5b5 100644
--- a/crates/core/models/src/v0/messages.rs
+++ b/crates/core/models/src/v0/messages.rs
@@ -401,7 +401,7 @@ impl Interactions {
     }
 }
 
-impl<'a> MessageAuthor<'a> {
+impl MessageAuthor<'_> {
     pub fn id(&self) -> &str {
         match self {
             MessageAuthor::User(user) => &user.id,
diff --git a/crates/core/models/src/v0/mod.rs b/crates/core/models/src/v0/mod.rs
index 78540e325..0468493b8 100644
--- a/crates/core/models/src/v0/mod.rs
+++ b/crates/core/models/src/v0/mod.rs
@@ -7,6 +7,7 @@ mod embeds;
 mod emojis;
 mod files;
 mod messages;
+mod policy_changes;
 mod safety_reports;
 mod server_bans;
 mod server_members;
@@ -23,6 +24,7 @@ pub use embeds::*;
 pub use emojis::*;
 pub use files::*;
 pub use messages::*;
+pub use policy_changes::*;
 pub use safety_reports::*;
 pub use server_bans::*;
 pub use server_members::*;
diff --git a/crates/core/models/src/v0/policy_changes.rs b/crates/core/models/src/v0/policy_changes.rs
new file mode 100644
index 000000000..267618dea
--- /dev/null
+++ b/crates/core/models/src/v0/policy_changes.rs
@@ -0,0 +1,16 @@
+use iso8601_timestamp::Timestamp;
+
+auto_derived!(
+    /// Platform policy change
+    pub struct PolicyChange {
+        /// Time at which this policy was created
+        pub created_time: Timestamp,
+        /// Time at which this policy is effective
+        pub effective_time: Timestamp,
+
+        /// Message shown to users
+        pub description: String,
+        /// URL with details about changes
+        pub url: String,
+    }
+);
diff --git a/crates/core/parser/Cargo.toml b/crates/core/parser/Cargo.toml
index f9b0c7009..3c0a15b59 100644
--- a/crates/core/parser/Cargo.toml
+++ b/crates/core/parser/Cargo.toml
@@ -1,7 +1,9 @@
 [package]
 name = "revolt-parser"
-version = "0.1.0"
+version = "0.8.7"
 edition = "2021"
+license = "AGPL-3.0-or-later"
+description = "Revolt Backend: Message Parser"
 
 [dependencies]
-logos = { version = "*" }
\ No newline at end of file
+logos = { version = "0.15" }
diff --git a/crates/core/permissions/Cargo.toml b/crates/core/permissions/Cargo.toml
index f2ffb04ca..c4eb7262f 100644
--- a/crates/core/permissions/Cargo.toml
+++ b/crates/core/permissions/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "revolt-permissions"
-version = "0.8.4"
+version = "0.8.7"
 edition = "2021"
 license = "MIT"
 authors = ["Paul Makles <me@insrt.uk>"]
@@ -21,7 +21,7 @@ async-std = { version = "1.8.0", features = ["attributes"] }
 
 [dependencies]
 # Core
-revolt-result = { version = "0.8.4", path = "../result" }
+revolt-result = { version = "0.8.7", path = "../result" }
 
 # Utility
 auto_ops = "0.3.0"
diff --git a/crates/core/presence/Cargo.toml b/crates/core/presence/Cargo.toml
index 3470514f1..7ecb776ad 100644
--- a/crates/core/presence/Cargo.toml
+++ b/crates/core/presence/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "revolt-presence"
-version = "0.8.4"
+version = "0.8.7"
 edition = "2021"
 license = "AGPL-3.0-or-later"
 authors = ["Paul Makles <me@insrt.uk>"]
diff --git a/crates/core/result/Cargo.toml b/crates/core/result/Cargo.toml
index b62d3dbf3..816f5baad 100644
--- a/crates/core/result/Cargo.toml
+++ b/crates/core/result/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "revolt-result"
-version = "0.8.4"
+version = "0.8.7"
 edition = "2021"
 license = "MIT"
 authors = ["Paul Makles <me@insrt.uk>"]
diff --git a/crates/daemons/crond/Cargo.toml b/crates/daemons/crond/Cargo.toml
index d394df0d8..413a810ef 100644
--- a/crates/daemons/crond/Cargo.toml
+++ b/crates/daemons/crond/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "revolt-crond"
-version = "0.8.4"
+version = "0.8.7"
 license = "AGPL-3.0-or-later"
 authors = ["Paul Makles <me@insrt.uk>"]
 edition = "2021"
@@ -16,7 +16,7 @@ log = "0.4"
 tokio = { version = "1" }
 
 # Core
-revolt-database = { version = "0.8.4", path = "../../core/database" }
-revolt-result = { version = "0.8.4", path = "../../core/result" }
-revolt-config = { version = "0.8.4", path = "../../core/config" }
-revolt-files = { version = "0.8.4", path = "../../core/files" }
+revolt-database = { version = "0.8.7", path = "../../core/database" }
+revolt-result = { version = "0.8.7", path = "../../core/result" }
+revolt-config = { version = "0.8.7", path = "../../core/config" }
+revolt-files = { version = "0.8.7", path = "../../core/files" }
diff --git a/crates/daemons/pushd/Cargo.toml b/crates/daemons/pushd/Cargo.toml
index 441fa87f8..7800c4fd0 100644
--- a/crates/daemons/pushd/Cargo.toml
+++ b/crates/daemons/pushd/Cargo.toml
@@ -1,19 +1,24 @@
 [package]
 name = "revolt-pushd"
-version = "0.8.4"
+version = "0.8.7"
 edition = "2021"
 license = "AGPL-3.0-or-later"
 
 [dependencies]
-revolt-config = { version = "0.8.4", path = "../../core/config" }
-revolt-database = { version = "0.8.4", path = "../../core/database" }
-revolt-models = { version = "0.8.4", path = "../../core/models", features = [
+revolt-result = { version = "0.8.7", path = "../../core/result" }
+revolt-config = { version = "0.8.7", path = "../../core/config", features = [
+    "report-macros",
+] }
+revolt-database = { version = "0.8.7", path = "../../core/database" }
+revolt-models = { version = "0.8.7", path = "../../core/models", features = [
     "validator",
 ] }
-revolt-presence = { version = "0.8.1", path = "../../core/presence", features = [
+revolt-presence = { version = "0.8.7", path = "../../core/presence", features = [
     "redis-is-patched",
 ] }
 
+anyhow = { version = "1.0.98" }
+
 amqprs = { version = "1.7.0" }
 fcm_v1 = "0.3.0"
 web-push = "0.10.0"
@@ -23,7 +28,7 @@ tokio = "1.39.2"
 async-trait = "0.1.81"
 ulid = "1.0.0"
 
-authifier = "1.0.10"
+authifier = "1.0.15"
 
 log = "0.4.11"
 pretty_env_logger = "0.4.0"
diff --git a/crates/daemons/pushd/src/consumers/inbound/fr_accepted.rs b/crates/daemons/pushd/src/consumers/inbound/fr_accepted.rs
index ff084a83a..d525138c5 100644
--- a/crates/daemons/pushd/src/consumers/inbound/fr_accepted.rs
+++ b/crates/daemons/pushd/src/consumers/inbound/fr_accepted.rs
@@ -7,6 +7,7 @@ use amqprs::{
     consumer::AsyncConsumer,
     BasicProperties, Deliver,
 };
+use anyhow::Result;
 use async_trait::async_trait;
 use log::debug;
 use revolt_database::{events::rabbit::*, Database};
@@ -54,21 +55,16 @@ impl FRAcceptedConsumer {
             channel: None,
         }
     }
-}
 
-#[allow(unused_variables)]
-#[async_trait]
-impl AsyncConsumer for FRAcceptedConsumer {
-    /// This consumer handles delegating messages into their respective platform queues.
-    async fn consume(
+    async fn consume_event(
         &mut self,
-        channel: &Channel,
-        deliver: Deliver,
-        basic_properties: BasicProperties,
+        _channel: &Channel,
+        _deliver: Deliver,
+        _basic_properties: BasicProperties,
         content: Vec<u8>,
-    ) {
-        let content = String::from_utf8(content).unwrap();
-        let payload: FRAcceptedPayload = serde_json::from_str(content.as_str()).unwrap();
+    ) -> Result<()> {
+        let content = String::from_utf8(content)?;
+        let payload: FRAcceptedPayload = serde_json::from_str(content.as_str())?;
 
         debug!("Received FR accept event");
 
@@ -111,11 +107,34 @@ impl AsyncConsumer for FRAcceptedConsumer {
                             .insert("endpoint".to_string(), sub.endpoint.clone());
                     }
 
-                    let payload = serde_json::to_string(&sendable).unwrap();
+                    let payload = serde_json::to_string(&sendable)?;
 
                     publish_message(self, payload.into(), args).await;
                 }
             }
         }
+
+        Ok(())
+    }
+}
+
+#[allow(unused_variables)]
+#[async_trait]
+impl AsyncConsumer for FRAcceptedConsumer {
+    /// This consumer handles delegating messages into their respective platform queues.
+    async fn consume(
+        &mut self,
+        channel: &Channel,
+        deliver: Deliver,
+        basic_properties: BasicProperties,
+        content: Vec<u8>,
+    ) {
+        if let Err(err) = self
+            .consume_event(channel, deliver, basic_properties, content)
+            .await
+        {
+            revolt_config::capture_anyhow(&err);
+            eprintln!("Failed to process friend request accepted event: {err:?}");
+        }
     }
 }
diff --git a/crates/daemons/pushd/src/consumers/inbound/fr_received.rs b/crates/daemons/pushd/src/consumers/inbound/fr_received.rs
index c52dfec1b..f64bc92b8 100644
--- a/crates/daemons/pushd/src/consumers/inbound/fr_received.rs
+++ b/crates/daemons/pushd/src/consumers/inbound/fr_received.rs
@@ -7,6 +7,7 @@ use amqprs::{
     consumer::AsyncConsumer,
     BasicProperties, Deliver,
 };
+use anyhow::Result;
 use async_trait::async_trait;
 use log::debug;
 use revolt_database::{events::rabbit::*, Database};
@@ -54,21 +55,16 @@ impl FRReceivedConsumer {
             channel: None,
         }
     }
-}
 
-#[allow(unused_variables)]
-#[async_trait]
-impl AsyncConsumer for FRReceivedConsumer {
-    /// This consumer handles delegating messages into their respective platform queues.
-    async fn consume(
+    async fn consume_event(
         &mut self,
-        channel: &Channel,
-        deliver: Deliver,
-        basic_properties: BasicProperties,
+        _channel: &Channel,
+        _deliver: Deliver,
+        _basic_properties: BasicProperties,
         content: Vec<u8>,
-    ) {
-        let content = String::from_utf8(content).unwrap();
-        let payload: FRReceivedPayload = serde_json::from_str(content.as_str()).unwrap();
+    ) -> Result<()> {
+        let content = String::from_utf8(content)?;
+        let payload: FRReceivedPayload = serde_json::from_str(content.as_str())?;
 
         debug!("Received FR received event");
 
@@ -111,11 +107,34 @@ impl AsyncConsumer for FRReceivedConsumer {
                             .insert("endpoint".to_string(), sub.endpoint.clone());
                     }
 
-                    let payload = serde_json::to_string(&sendable).unwrap();
+                    let payload = serde_json::to_string(&sendable)?;
 
                     publish_message(self, payload.into(), args).await;
                 }
             }
         }
+
+        Ok(())
+    }
+}
+
+#[allow(unused_variables)]
+#[async_trait]
+impl AsyncConsumer for FRReceivedConsumer {
+    /// This consumer handles delegating messages into their respective platform queues.
+    async fn consume(
+        &mut self,
+        channel: &Channel,
+        deliver: Deliver,
+        basic_properties: BasicProperties,
+        content: Vec<u8>,
+    ) {
+        if let Err(err) = self
+            .consume_event(channel, deliver, basic_properties, content)
+            .await
+        {
+            revolt_config::capture_anyhow(&err);
+            eprintln!("Failed to process friend request received event: {err:?}");
+        }
     }
 }
diff --git a/crates/daemons/pushd/src/consumers/inbound/generic.rs b/crates/daemons/pushd/src/consumers/inbound/generic.rs
index 58070f664..aa3950d71 100644
--- a/crates/daemons/pushd/src/consumers/inbound/generic.rs
+++ b/crates/daemons/pushd/src/consumers/inbound/generic.rs
@@ -7,6 +7,7 @@ use amqprs::{
     consumer::AsyncConsumer,
     BasicProperties, Deliver,
 };
+use anyhow::Result;
 use async_trait::async_trait;
 use log::debug;
 use revolt_database::{events::rabbit::*, Database};
@@ -54,21 +55,16 @@ impl GenericConsumer {
             channel: None,
         }
     }
-}
 
-#[allow(unused_variables)]
-#[async_trait]
-impl AsyncConsumer for GenericConsumer {
-    /// This consumer handles delegating messages into their respective platform queues.
-    async fn consume(
+    async fn consume_event(
         &mut self,
-        channel: &Channel,
-        deliver: Deliver,
-        basic_properties: BasicProperties,
+        _channel: &Channel,
+        _deliver: Deliver,
+        _basic_properties: BasicProperties,
         content: Vec<u8>,
-    ) {
-        let content = String::from_utf8(content).unwrap();
-        let payload: MessageSentPayload = serde_json::from_str(content.as_str()).unwrap();
+    ) -> Result<()> {
+        let content = String::from_utf8(content)?;
+        let payload: MessageSentPayload = serde_json::from_str(content.as_str())?;
 
         debug!("Received message event on origin");
 
@@ -117,11 +113,34 @@ impl AsyncConsumer for GenericConsumer {
                             .insert("endpoint".to_string(), sub.endpoint.clone());
                     }
 
-                    let payload = serde_json::to_string(&sendable).unwrap();
+                    let payload = serde_json::to_string(&sendable)?;
 
                     publish_message(self, payload.into(), args).await;
                 }
             }
         }
+
+        Ok(())
+    }
+}
+
+#[allow(unused_variables)]
+#[async_trait]
+impl AsyncConsumer for GenericConsumer {
+    /// This consumer handles delegating messages into their respective platform queues.
+    async fn consume(
+        &mut self,
+        channel: &Channel,
+        deliver: Deliver,
+        basic_properties: BasicProperties,
+        content: Vec<u8>,
+    ) {
+        if let Err(err) = self
+            .consume_event(channel, deliver, basic_properties, content)
+            .await
+        {
+            revolt_config::capture_anyhow(&err);
+            eprintln!("Failed to process generic event: {err:?}");
+        }
     }
 }
diff --git a/crates/daemons/pushd/src/consumers/inbound/mass_mention.rs b/crates/daemons/pushd/src/consumers/inbound/mass_mention.rs
index a44dcb1e1..bf5dd453a 100644
--- a/crates/daemons/pushd/src/consumers/inbound/mass_mention.rs
+++ b/crates/daemons/pushd/src/consumers/inbound/mass_mention.rs
@@ -10,6 +10,7 @@ use amqprs::{
     consumer::AsyncConsumer,
     BasicProperties, Deliver,
 };
+use anyhow::Result;
 use async_trait::async_trait;
 use revolt_database::{
     events::rabbit::*, util::bulk_permissions::BulkDatabasePermissionQuery, Database, Member,
@@ -61,7 +62,11 @@ impl MassMessageConsumer {
         }
     }
 
-    async fn fire_notification_for_users(&mut self, push: &PushNotification, users: &[String]) {
+    async fn fire_notification_for_users(
+        &mut self,
+        push: &PushNotification,
+        users: &[String],
+    ) -> Result<()> {
         if let Ok(sessions) = self
             .authifier_db
             .find_sessions_with_subscription(users)
@@ -105,29 +110,26 @@ impl MassMessageConsumer {
                             .insert("endpoint".to_string(), sub.endpoint.clone());
                     }
 
-                    let payload = serde_json::to_string(&sendable).unwrap();
+                    let payload = serde_json::to_string(&sendable)?;
 
                     publish_message(self, payload.into(), args).await;
                 }
             }
         }
+
+        Ok(())
     }
-}
 
-#[allow(unused_variables)]
-#[async_trait]
-impl AsyncConsumer for MassMessageConsumer {
-    /// This consumer handles adding mentions for all the users affected by a mass mention ping, and then sends out push notifications
-    async fn consume(
+    async fn consume_event(
         &mut self,
-        channel: &Channel,
-        deliver: Deliver,
-        basic_properties: BasicProperties,
+        _channel: &Channel,
+        _deliver: Deliver,
+        _basic_properties: BasicProperties,
         content: Vec<u8>,
-    ) {
+    ) -> Result<()> {
         let config = revolt_config::config().await;
-        let content = String::from_utf8(content).unwrap();
-        let payload: MassMessageSentPayload = serde_json::from_str(content.as_str()).unwrap();
+        let content = String::from_utf8(content)?;
+        let payload: MassMessageSentPayload = serde_json::from_str(content.as_str())?;
 
         debug!("Received mass message event");
 
@@ -159,8 +161,7 @@ impl AsyncConsumer for MassMessageConsumer {
                     let mut db_query = self
                         .db
                         .fetch_all_members_chunked(&payload.server_id)
-                        .await
-                        .expect("Failed to fetch members from database");
+                        .await?;
 
                     let mut exhausted = false;
                     let ack_chnl = vec![push.channel.id().to_string()];
@@ -203,7 +204,8 @@ impl AsyncConsumer for MassMessageConsumer {
                             target_users, online_users
                         );
 
-                        self.fire_notification_for_users(&push, &target_users).await;
+                        self.fire_notification_for_users(&push, &target_users)
+                            .await?;
 
                         if exhausted {
                             break;
@@ -211,19 +213,11 @@ impl AsyncConsumer for MassMessageConsumer {
                     }
                 } else if let Some(roles) = &push.message.role_mentions {
                     // role mentions
-                    let _role_members = self
+                    let mut role_members = self
                         .db
                         .fetch_all_members_with_roles_chunked(&payload.server_id, roles)
-                        .await;
+                        .await?;
 
-                    debug!("role members: {:?}", _role_members);
-
-                    if _role_members.is_err() {
-                        revolt_config::capture_error(&_role_members.err().unwrap());
-                        return;
-                    }
-
-                    let mut role_members = _role_members.unwrap();
                     let mut chunk = vec![];
                     let mut exhausted = false;
 
@@ -266,10 +260,33 @@ impl AsyncConsumer for MassMessageConsumer {
 
                         debug!("targets: {:?}", targets);
 
-                        self.fire_notification_for_users(&push, &targets).await;
+                        self.fire_notification_for_users(&push, &targets).await?;
                     }
                 }
             }
         }
+
+        Ok(())
+    }
+}
+
+#[allow(unused_variables)]
+#[async_trait]
+impl AsyncConsumer for MassMessageConsumer {
+    /// This consumer handles adding mentions for all the users affected by a mass mention ping, and then sends out push notifications
+    async fn consume(
+        &mut self,
+        channel: &Channel,
+        deliver: Deliver,
+        basic_properties: BasicProperties,
+        content: Vec<u8>,
+    ) {
+        if let Err(err) = self
+            .consume_event(channel, deliver, basic_properties, content)
+            .await
+        {
+            revolt_config::capture_anyhow(&err);
+            eprintln!("Failed to process mass message event: {err:?}");
+        }
     }
 }
diff --git a/crates/daemons/pushd/src/consumers/inbound/message.rs b/crates/daemons/pushd/src/consumers/inbound/message.rs
index 99e61cbd5..6b9d00fe3 100644
--- a/crates/daemons/pushd/src/consumers/inbound/message.rs
+++ b/crates/daemons/pushd/src/consumers/inbound/message.rs
@@ -7,6 +7,7 @@ use amqprs::{
     consumer::AsyncConsumer,
     BasicProperties, Deliver,
 };
+use anyhow::Result;
 use async_trait::async_trait;
 use log::debug;
 use revolt_database::{events::rabbit::*, Database};
@@ -54,21 +55,16 @@ impl MessageConsumer {
             channel: None,
         }
     }
-}
 
-#[allow(unused_variables)]
-#[async_trait]
-impl AsyncConsumer for MessageConsumer {
-    /// This consumer handles delegating messages into their respective platform queues.
-    async fn consume(
+    async fn consume_event(
         &mut self,
-        channel: &Channel,
-        deliver: Deliver,
-        basic_properties: BasicProperties,
+        _channel: &Channel,
+        _deliver: Deliver,
+        _basic_properties: BasicProperties,
         content: Vec<u8>,
-    ) {
-        let content = String::from_utf8(content).unwrap();
-        let payload: MessageSentPayload = serde_json::from_str(content.as_str()).unwrap();
+    ) -> Result<()> {
+        let content = String::from_utf8(content)?;
+        let payload: MessageSentPayload = serde_json::from_str(content.as_str())?;
 
         debug!("Received message event on origin");
 
@@ -117,11 +113,34 @@ impl AsyncConsumer for MessageConsumer {
                             .insert("endpoint".to_string(), sub.endpoint.clone());
                     }
 
-                    let payload = serde_json::to_string(&sendable).unwrap();
+                    let payload = serde_json::to_string(&sendable)?;
 
                     publish_message(self, payload.into(), args).await;
                 }
             }
         }
+
+        Ok(())
+    }
+}
+
+#[allow(unused_variables)]
+#[async_trait]
+impl AsyncConsumer for MessageConsumer {
+    /// This consumer handles delegating messages into their respective platform queues.
+    async fn consume(
+        &mut self,
+        channel: &Channel,
+        deliver: Deliver,
+        basic_properties: BasicProperties,
+        content: Vec<u8>,
+    ) {
+        if let Err(err) = self
+            .consume_event(channel, deliver, basic_properties, content)
+            .await
+        {
+            revolt_config::capture_anyhow(&err);
+            eprintln!("Failed to process message event: {err:?}");
+        }
     }
 }
diff --git a/crates/daemons/pushd/src/consumers/outbound/apn.rs b/crates/daemons/pushd/src/consumers/outbound/apn.rs
index 723826320..cf8cea17d 100644
--- a/crates/daemons/pushd/src/consumers/outbound/apn.rs
+++ b/crates/daemons/pushd/src/consumers/outbound/apn.rs
@@ -1,6 +1,7 @@
 use std::{borrow::Cow, collections::BTreeMap, io::Cursor};
 
 use amqprs::{channel::Channel as AmqpChannel, consumer::AsyncConsumer, BasicProperties, Deliver};
+use anyhow::{anyhow, Result};
 use async_trait::async_trait;
 use base64::{
     engine::{self},
@@ -123,20 +124,16 @@ impl ApnsOutboundConsumer {
 
         Ok(ApnsOutboundConsumer { db, client })
     }
-}
 
-#[allow(unused_variables)]
-#[async_trait]
-impl AsyncConsumer for ApnsOutboundConsumer {
-    async fn consume(
+    async fn consume_event(
         &mut self,
-        channel: &AmqpChannel,
-        deliver: Deliver,
-        basic_properties: BasicProperties,
+        _channel: &AmqpChannel,
+        _deliver: Deliver,
+        _basic_properties: BasicProperties,
         content: Vec<u8>,
-    ) {
-        let content = String::from_utf8(content).unwrap();
-        let payload: PayloadToService = serde_json::from_str(content.as_str()).unwrap();
+    ) -> Result<()> {
+        let content = String::from_utf8(content)?;
+        let payload: PayloadToService = serde_json::from_str(content.as_str())?;
 
         let payload_options = NotificationOptions {
             apns_id: None,
@@ -160,7 +157,7 @@ impl AsyncConsumer for ApnsOutboundConsumer {
                             alert.from_user.username, alert.from_user.discriminator
                         )))
                         .clone()
-                        .unwrap(),
+                        .ok_or_else(|| anyhow!("missing name"))?,
                 )];
 
                 let apn_payload = Payload {
@@ -206,7 +203,7 @@ impl AsyncConsumer for ApnsOutboundConsumer {
                             alert.accepted_user.username, alert.accepted_user.discriminator
                         )))
                         .clone()
-                        .unwrap(),
+                        .ok_or_else(|| anyhow!("missing name"))?,
                 )];
 
                 let apn_payload = Payload {
@@ -356,5 +353,27 @@ impl AsyncConsumer for ApnsOutboundConsumer {
                 }
             }
         }
+
+        Ok(())
+    }
+}
+
+#[allow(unused_variables)]
+#[async_trait]
+impl AsyncConsumer for ApnsOutboundConsumer {
+    async fn consume(
+        &mut self,
+        channel: &AmqpChannel,
+        deliver: Deliver,
+        basic_properties: BasicProperties,
+        content: Vec<u8>,
+    ) {
+        if let Err(err) = self
+            .consume_event(channel, deliver, basic_properties, content)
+            .await
+        {
+            revolt_config::capture_anyhow(&err);
+            eprintln!("Failed to process APN event: {err:?}");
+        }
     }
 }
diff --git a/crates/daemons/pushd/src/consumers/outbound/fcm.rs b/crates/daemons/pushd/src/consumers/outbound/fcm.rs
index a22708d87..10e174d4c 100644
--- a/crates/daemons/pushd/src/consumers/outbound/fcm.rs
+++ b/crates/daemons/pushd/src/consumers/outbound/fcm.rs
@@ -2,6 +2,7 @@ use std::{collections::HashMap, time::Duration};
 
 use amqprs::{channel::Channel as AmqpChannel, consumer::AsyncConsumer, BasicProperties, Deliver};
 
+use anyhow::{anyhow, bail, Result};
 use async_trait::async_trait;
 use fcm_v1::{
     android::AndroidConfig,
@@ -65,22 +66,16 @@ impl FcmOutboundConsumer {
             ),
         })
     }
-}
 
-#[allow(unused_variables)]
-#[async_trait]
-impl AsyncConsumer for FcmOutboundConsumer {
-    async fn consume(
+    async fn consume_event(
         &mut self,
-        channel: &AmqpChannel,
-        deliver: Deliver,
-        basic_properties: BasicProperties,
+        _channel: &AmqpChannel,
+        _deliver: Deliver,
+        _basic_properties: BasicProperties,
         content: Vec<u8>,
-    ) {
-        let content = String::from_utf8(content).unwrap();
-        let payload: PayloadToService = serde_json::from_str(content.as_str()).unwrap();
-
-        let config = revolt_config::config().await;
+    ) -> Result<()> {
+        let content = String::from_utf8(content)?;
+        let payload: PayloadToService = serde_json::from_str(content.as_str())?;
 
         #[allow(clippy::needless_late_init)]
         let resp: Result<Message, FcmError>;
@@ -95,7 +90,7 @@ impl AsyncConsumer for FcmOutboundConsumer {
                         alert.from_user.username, alert.from_user.discriminator
                     )))
                     .clone()
-                    .unwrap();
+                    .ok_or_else(|| anyhow!("missing name"))?;
 
                 let mut data = HashMap::new();
                 data.insert(
@@ -123,7 +118,7 @@ impl AsyncConsumer for FcmOutboundConsumer {
                         alert.accepted_user.username, alert.accepted_user.discriminator
                     )))
                     .clone()
-                    .unwrap();
+                    .ok_or_else(|| anyhow!("missing name"))?;
 
                 let mut data: HashMap<String, Value> = HashMap::new();
                 data.insert(
@@ -176,7 +171,7 @@ impl AsyncConsumer for FcmOutboundConsumer {
             }
 
             PayloadKind::BadgeUpdate(_) => {
-                panic!("FCM cannot handle badge updates, and they should not be sent here.")
+                bail!("FCM cannot handle badge updates and they should not be sent here.");
             }
         }
 
@@ -196,5 +191,27 @@ impl AsyncConsumer for FcmOutboundConsumer {
                 }
             }
         }
+
+        Ok(())
+    }
+}
+
+#[allow(unused_variables)]
+#[async_trait]
+impl AsyncConsumer for FcmOutboundConsumer {
+    async fn consume(
+        &mut self,
+        channel: &AmqpChannel,
+        deliver: Deliver,
+        basic_properties: BasicProperties,
+        content: Vec<u8>,
+    ) {
+        if let Err(err) = self
+            .consume_event(channel, deliver, basic_properties, content)
+            .await
+        {
+            revolt_config::capture_anyhow(&err);
+            eprintln!("Failed to process FCM event: {err:?}");
+        }
     }
 }
diff --git a/crates/daemons/pushd/src/consumers/outbound/vapid.rs b/crates/daemons/pushd/src/consumers/outbound/vapid.rs
index fb735d5eb..92ce6e569 100644
--- a/crates/daemons/pushd/src/consumers/outbound/vapid.rs
+++ b/crates/daemons/pushd/src/consumers/outbound/vapid.rs
@@ -2,13 +2,13 @@ use std::collections::HashMap;
 
 use amqprs::{channel::Channel as AmqpChannel, consumer::AsyncConsumer, BasicProperties, Deliver};
 
+use anyhow::{anyhow, bail, Result};
 use async_trait::async_trait;
 use base64::{
     engine::{self},
     Engine as _,
 };
 use revolt_database::{events::rabbit::*, Database};
-// use revolt_models::v0::{Channel, PushNotification};
 use web_push::{
     ContentEncoding, IsahcWebPushClient, SubscriptionInfo, SubscriptionKeys, VapidSignatureBuilder,
     WebPushClient, WebPushError, WebPushMessageBuilder,
@@ -21,11 +21,11 @@ pub struct VapidOutboundConsumer {
 }
 
 impl VapidOutboundConsumer {
-    pub async fn new(db: Database) -> Result<VapidOutboundConsumer, &'static str> {
+    pub async fn new(db: Database) -> Result<VapidOutboundConsumer> {
         let config = revolt_config::config().await;
 
         if config.pushd.vapid.private_key.is_empty() | config.pushd.vapid.public_key.is_empty() {
-            return Err("No Vapid keys present");
+            bail!("no Vapid keys present");
         }
 
         let web_push_private_key = engine::general_purpose::URL_SAFE_NO_PAD
@@ -38,28 +38,30 @@ impl VapidOutboundConsumer {
             pkey: web_push_private_key,
         })
     }
-}
 
-#[allow(unused_variables)]
-#[async_trait]
-impl AsyncConsumer for VapidOutboundConsumer {
-    async fn consume(
+    async fn consume_event(
         &mut self,
-        channel: &AmqpChannel,
-        deliver: Deliver,
-        basic_properties: BasicProperties,
+        _channel: &AmqpChannel,
+        _deliver: Deliver,
+        _basic_properties: BasicProperties,
         content: Vec<u8>,
-    ) {
-        let content = String::from_utf8(content).unwrap();
-        let payload: PayloadToService = serde_json::from_str(content.as_str()).unwrap();
-
-        let config = revolt_config::config().await;
+    ) -> Result<()> {
+        let content = String::from_utf8(content)?;
+        let payload: PayloadToService = serde_json::from_str(content.as_str())?;
 
         let subscription = SubscriptionInfo {
-            endpoint: payload.extras.get("endpoint").unwrap().clone(),
+            endpoint: payload
+                .extras
+                .get("endpoint")
+                .ok_or_else(|| anyhow!("missing endpoint"))?
+                .clone(),
             keys: SubscriptionKeys {
                 auth: payload.token,
-                p256dh: payload.extras.get("p256dh").unwrap().clone(),
+                p256dh: payload
+                    .extras
+                    .get("p256dh")
+                    .ok_or_else(|| anyhow!("missing p256dh"))?
+                    .clone(),
             },
         };
 
@@ -76,12 +78,12 @@ impl AsyncConsumer for VapidOutboundConsumer {
                         alert.from_user.username, alert.from_user.discriminator
                     )))
                     .clone()
-                    .unwrap();
+                    .ok_or_else(|| anyhow!("missing name"))?;
 
                 let mut body = HashMap::new();
                 body.insert("body", format!("{} sent you a friend request", name));
 
-                payload_body = serde_json::to_string(&body).unwrap();
+                payload_body = serde_json::to_string(&body)?;
             }
             PayloadKind::FRAccepted(alert) => {
                 let name = alert
@@ -92,21 +94,21 @@ impl AsyncConsumer for VapidOutboundConsumer {
                         alert.accepted_user.username, alert.accepted_user.discriminator
                     )))
                     .clone()
-                    .unwrap();
+                    .ok_or_else(|| anyhow!("missing name"))?;
 
                 let mut body = HashMap::new();
                 body.insert("body", format!("{} accepted your friend request", name));
 
-                payload_body = serde_json::to_string(&body).unwrap();
+                payload_body = serde_json::to_string(&body)?;
             }
             PayloadKind::Generic(alert) => {
-                payload_body = serde_json::to_string(&alert).unwrap();
+                payload_body = serde_json::to_string(&alert)?;
             }
             PayloadKind::MessageNotification(alert) => {
-                payload_body = serde_json::to_string(&alert).unwrap();
+                payload_body = serde_json::to_string(&alert)?;
             }
             PayloadKind::BadgeUpdate(_) => {
-                panic!("Vapid cannot handle badge updates, and they should not be sent here.")
+                bail!("Vapid cannot handle badge updates and they should not be sent here.");
             }
         }
 
@@ -122,28 +124,40 @@ impl AsyncConsumer for VapidOutboundConsumer {
                         Ok(msg) => {
                             if let Err(err) = self.client.send(msg).await {
                                 if err == WebPushError::Unauthorized {
-                                    if let Err(err) = self
-                                        .db
+                                    self.db
                                         .remove_push_subscription_by_session_id(&payload.session_id)
-                                        .await
-                                    {
-                                        revolt_config::capture_error(&err);
-                                    }
+                                        .await?;
                                 }
                             }
+
+                            Ok(())
                         }
-                        Err(err) => {
-                            revolt_config::capture_error(&err);
-                        }
+                        Err(err) => Err(err.into()),
                     }
                 }
-                Err(err) => {
-                    revolt_config::capture_error(&err);
-                }
+                Err(err) => Err(err.into()),
             },
-            Err(err) => {
-                revolt_config::capture_error(&err);
-            }
+            Err(err) => Err(err.into()),
+        }
+    }
+}
+
+#[allow(unused_variables)]
+#[async_trait]
+impl AsyncConsumer for VapidOutboundConsumer {
+    async fn consume(
+        &mut self,
+        channel: &AmqpChannel,
+        deliver: Deliver,
+        basic_properties: BasicProperties,
+        content: Vec<u8>,
+    ) {
+        if let Err(err) = self
+            .consume_event(channel, deliver, basic_properties, content)
+            .await
+        {
+            revolt_config::capture_anyhow(&err);
+            eprintln!("Failed to process Vapid event: {err:?}");
         }
     }
 }
diff --git a/crates/daemons/pushd/src/main.rs b/crates/daemons/pushd/src/main.rs
index 1560b049a..78845a634 100644
--- a/crates/daemons/pushd/src/main.rs
+++ b/crates/daemons/pushd/src/main.rs
@@ -24,8 +24,8 @@ use consumers::{
 
 #[tokio::main(flavor = "multi_thread", worker_threads = 2)]
 async fn main() {
-    let config = config().await;
-    pretty_env_logger::init();
+    // Configure logging and environment
+    revolt_config::configure!(pushd);
 
     // Setup database
     let db = revolt_database::DatabaseInfo::Auto.connect().await.unwrap();
@@ -52,6 +52,8 @@ async fn main() {
     // This'll require some interesting shimming if we need to add more events once this is in prod (different payloads between prod and test),
     // but that sounds like a problem for future us.
 
+    let config = config().await;
+
     // inbound: generic
     connections.push(
         make_queue_and_consume(
diff --git a/crates/delta/Cargo.toml b/crates/delta/Cargo.toml
index 10e85d9ad..9663c4109 100644
--- a/crates/delta/Cargo.toml
+++ b/crates/delta/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "revolt-delta"
-version = "0.8.4"
+version = "0.8.7"
 license = "AGPL-3.0-or-later"
 authors = ["Paul Makles <paulmakles@gmail.com>"]
 edition = "2018"
@@ -52,10 +52,11 @@ async-std = { version = "1.8.0", features = [
 lettre = "0.10.0-alpha.4"
 
 # web
+
 rocket = { version = "0.5.1", default-features = false, features = ["json"] }
 rocket_cors = { git = "https://github.com/lawliet89/rocket_cors", rev = "072d90359b23e9b291df6b672c07c93de9c46011" }
 rocket_empty = { version = "0.1.1", features = ["schema"] }
-rocket_authifier = { version = "1.0.10" }
+rocket_authifier = { version = "1.0.15" }
 rocket_prometheus = "0.10.0-rc.3"
 
 # spec generation
@@ -66,7 +67,7 @@ revolt_rocket_okapi = { version = "0.10.0", features = ["swagger"] }
 amqprs = { version = "1.7.0" }
 
 # core
-authifier = "1.0.10"
+authifier = "1.0.15"
 revolt-config = { path = "../core/config" }
 revolt-database = { path = "../core/database", features = [
     "rocket-impl",
diff --git a/crates/delta/src/routes/channels/members_fetch.rs b/crates/delta/src/routes/channels/members_fetch.rs
index 64a14a9b5..4a6688bf1 100644
--- a/crates/delta/src/routes/channels/members_fetch.rs
+++ b/crates/delta/src/routes/channels/members_fetch.rs
@@ -1,4 +1,3 @@
-use futures::future::join_all;
 use revolt_database::{
     util::{permissions::DatabasePermissionQuery, reference::Reference},
     Channel, Database, User,
diff --git a/crates/delta/src/routes/channels/message_bulk_delete.rs b/crates/delta/src/routes/channels/message_bulk_delete.rs
index 6cb2b37a6..446b1e264 100644
--- a/crates/delta/src/routes/channels/message_bulk_delete.rs
+++ b/crates/delta/src/routes/channels/message_bulk_delete.rs
@@ -8,7 +8,6 @@ use revolt_permissions::{calculate_channel_permissions, ChannelPermission};
 use revolt_result::{create_error, Result};
 use rocket::{serde::json::Json, State};
 use rocket_empty::EmptyResponse;
-use serde::Deserialize;
 use validator::Validate;
 
 /// # Bulk Delete Messages
diff --git a/crates/delta/src/routes/channels/message_edit.rs b/crates/delta/src/routes/channels/message_edit.rs
index 3662ee63e..2b5d24f71 100644
--- a/crates/delta/src/routes/channels/message_edit.rs
+++ b/crates/delta/src/routes/channels/message_edit.rs
@@ -1,5 +1,4 @@
 use iso8601_timestamp::Timestamp;
-use revolt_config::config;
 use revolt_database::{
     tasks,
     util::{permissions::DatabasePermissionQuery, reference::Reference},
diff --git a/crates/delta/src/routes/channels/permissions_set.rs b/crates/delta/src/routes/channels/permissions_set.rs
index e35645406..d5ba55cf4 100644
--- a/crates/delta/src/routes/channels/permissions_set.rs
+++ b/crates/delta/src/routes/channels/permissions_set.rs
@@ -5,7 +5,6 @@ use revolt_models::v0;
 use revolt_permissions::{calculate_channel_permissions, ChannelPermission, Override};
 use revolt_result::{create_error, Result};
 use rocket::{serde::json::Json, State};
-use serde::Deserialize;
 
 /// # Set Role Permission
 ///
diff --git a/crates/delta/src/routes/customisation/emoji_delete.rs b/crates/delta/src/routes/customisation/emoji_delete.rs
index 53cbb8371..05d89eb0f 100644
--- a/crates/delta/src/routes/customisation/emoji_delete.rs
+++ b/crates/delta/src/routes/customisation/emoji_delete.rs
@@ -3,7 +3,7 @@ use revolt_database::{
     Database, EmojiParent, User,
 };
 use revolt_permissions::{calculate_server_permissions, ChannelPermission};
-use revolt_result::{create_error, Result};
+use revolt_result::Result;
 
 use rocket::State;
 use rocket_empty::EmptyResponse;
@@ -18,7 +18,6 @@ pub async fn delete_emoji(
     user: User,
     emoji_id: Reference,
 ) -> Result<EmptyResponse> {
-
     // Fetch the emoji
     let emoji = emoji_id.as_emoji(db).await?;
 
diff --git a/crates/delta/src/routes/mod.rs b/crates/delta/src/routes/mod.rs
index 5107e7c26..9643a3657 100644
--- a/crates/delta/src/routes/mod.rs
+++ b/crates/delta/src/routes/mod.rs
@@ -1,4 +1,4 @@
-use revolt_config::{config, Settings};
+use revolt_config::Settings;
 use revolt_rocket_okapi::{revolt_okapi::openapi3::OpenApi, settings::OpenApiSettings};
 pub use rocket::http::Status;
 pub use rocket::response::Redirect;
@@ -9,6 +9,7 @@ mod channels;
 mod customisation;
 mod invites;
 mod onboard;
+mod policy;
 mod push;
 mod root;
 mod safety;
@@ -36,6 +37,7 @@ pub fn mount(config: Settings, mut rocket: Rocket<Build>) -> Rocket<Build> {
             "/auth/session" => rocket_authifier::routes::session::routes(),
             "/auth/mfa" => rocket_authifier::routes::mfa::routes(),
             "/onboard" => onboard::routes(),
+            "/policy" => policy::routes(),
             "/push" => push::routes(),
             "/sync" => sync::routes(),
             "/webhooks" => webhooks::routes()
@@ -56,6 +58,7 @@ pub fn mount(config: Settings, mut rocket: Rocket<Build>) -> Rocket<Build> {
             "/auth/session" => rocket_authifier::routes::session::routes(),
             "/auth/mfa" => rocket_authifier::routes::mfa::routes(),
             "/onboard" => onboard::routes(),
+            "/policy" => policy::routes(),
             "/push" => push::routes(),
             "/sync" => sync::routes()
         };
diff --git a/crates/delta/src/routes/policy/acknowledge_policy_changes.rs b/crates/delta/src/routes/policy/acknowledge_policy_changes.rs
new file mode 100644
index 000000000..062dc32c4
--- /dev/null
+++ b/crates/delta/src/routes/policy/acknowledge_policy_changes.rs
@@ -0,0 +1,17 @@
+use revolt_database::{events::client::EventV1, Database, Report, Snapshot, SnapshotContent, User};
+use revolt_models::v0::{ReportStatus, ReportedContent};
+use revolt_result::{create_error, Result};
+use serde::Deserialize;
+use ulid::Ulid;
+use validator::Validate;
+
+use rocket::{serde::json::Json, State};
+
+/// # Acknowledge Policy Changes
+///
+/// Accept/acknowledge changes to platform policy.
+#[openapi(tag = "Policy")]
+#[post("/acknowledge")]
+pub async fn acknowledge_policy_changes(db: &State<Database>, user: User) -> Result<()> {
+    db.acknowledge_policy_changes(&user.id).await
+}
diff --git a/crates/delta/src/routes/policy/mod.rs b/crates/delta/src/routes/policy/mod.rs
new file mode 100644
index 000000000..77831b1f9
--- /dev/null
+++ b/crates/delta/src/routes/policy/mod.rs
@@ -0,0 +1,11 @@
+use revolt_rocket_okapi::revolt_okapi::openapi3::OpenApi;
+use rocket::Route;
+
+mod acknowledge_policy_changes;
+
+pub fn routes() -> (Vec<Route>, OpenApi) {
+    openapi_get_routes_spec![
+        // Policy
+        acknowledge_policy_changes::acknowledge_policy_changes,
+    ]
+}
diff --git a/crates/delta/src/routes/servers/ban_create.rs b/crates/delta/src/routes/servers/ban_create.rs
index 26881a306..6e530b1a4 100644
--- a/crates/delta/src/routes/servers/ban_create.rs
+++ b/crates/delta/src/routes/servers/ban_create.rs
@@ -5,9 +5,7 @@ use revolt_database::{
 };
 use revolt_models::v0;
 
-use revolt_permissions::{
-    calculate_server_permissions, ChannelPermission,
-};
+use revolt_permissions::{calculate_server_permissions, ChannelPermission};
 use revolt_result::{create_error, Result};
 use rocket::{serde::json::Json, State};
 use validator::Validate;
diff --git a/crates/delta/src/routes/users/fetch_user_flags.rs b/crates/delta/src/routes/users/fetch_user_flags.rs
index 39c731d06..92377a577 100644
--- a/crates/delta/src/routes/users/fetch_user_flags.rs
+++ b/crates/delta/src/routes/users/fetch_user_flags.rs
@@ -2,7 +2,6 @@ use revolt_database::{util::reference::Reference, Database};
 use revolt_models::v0;
 use revolt_result::Result;
 use rocket::{serde::json::Json, State};
-use serde::Serialize;
 
 /// # Fetch User Flags
 ///
diff --git a/crates/delta/src/routes/webhooks/webhook_execute_github.rs b/crates/delta/src/routes/webhooks/webhook_execute_github.rs
index 6d9c8b602..ae7ff40c2 100644
--- a/crates/delta/src/routes/webhooks/webhook_execute_github.rs
+++ b/crates/delta/src/routes/webhooks/webhook_execute_github.rs
@@ -588,6 +588,7 @@ pub enum PullRequestEvent {
 #[derive(Debug)]
 #[allow(clippy::large_enum_variant)]
 pub enum BaseEvent {
+    #[allow(dead_code)]
     Star(StarEvent),
     Ping,
     Push(PushEvent),
@@ -829,7 +830,7 @@ pub async fn webhook_execute_github(
                         })
                         .collect::<Vec<String>>()
                         .join("\n"),
-                        1000
+                    1000,
                 );
 
                 SendableEmbed {
diff --git a/crates/services/autumn/Cargo.toml b/crates/services/autumn/Cargo.toml
index dc2424131..36446c015 100644
--- a/crates/services/autumn/Cargo.toml
+++ b/crates/services/autumn/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "revolt-autumn"
-version = "0.8.4"
+version = "0.8.7"
 edition = "2021"
 license = "AGPL-3.0-or-later"
 
@@ -43,12 +43,12 @@ tracing = "0.1"
 tracing-subscriber = { version = "0.3", features = ["env-filter"] }
 
 # Core crates
-revolt-files = { version = "0.8.4", path = "../../core/files" }
-revolt-config = { version = "0.8.4", path = "../../core/config" }
-revolt-database = { version = "0.8.4", path = "../../core/database", features = [
+revolt-files = { version = "0.8.7", path = "../../core/files" }
+revolt-config = { version = "0.8.7", path = "../../core/config" }
+revolt-database = { version = "0.8.7", path = "../../core/database", features = [
     "axum-impl",
 ] }
-revolt-result = { version = "0.8.4", path = "../../core/result", features = [
+revolt-result = { version = "0.8.7", path = "../../core/result", features = [
     "utoipa",
     "axum",
 ] }
diff --git a/crates/services/january/Cargo.toml b/crates/services/january/Cargo.toml
index 01b6f4022..3566d2a0f 100644
--- a/crates/services/january/Cargo.toml
+++ b/crates/services/january/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "revolt-january"
-version = "0.8.4"
+version = "0.8.7"
 edition = "2021"
 license = "AGPL-3.0-or-later"
 
@@ -32,13 +32,13 @@ tracing = "0.1"
 tracing-subscriber = { version = "0.3", features = ["env-filter"] }
 
 # Core crates
-revolt-config = { version = "0.8.4", path = "../../core/config" }
-revolt-models = { version = "0.8.4", path = "../../core/models" }
-revolt-result = { version = "0.8.4", path = "../../core/result", features = [
+revolt-config = { version = "0.8.7", path = "../../core/config" }
+revolt-models = { version = "0.8.7", path = "../../core/models" }
+revolt-result = { version = "0.8.7", path = "../../core/result", features = [
     "utoipa",
     "axum",
 ] }
-revolt-files = { version = "0.8.4", path = "../../core/files" }
+revolt-files = { version = "0.8.7", path = "../../core/files" }
 
 # Axum / web server
 axum = { version = "0.7.5" }
diff --git a/justfile b/justfile
index e093afded..e7bd0f000 100644
--- a/justfile
+++ b/justfile
@@ -1,4 +1,5 @@
 publish:
+    cargo publish --package revolt-parser
     cargo publish --package revolt-config
     cargo publish --package revolt-result
     cargo publish --package revolt-files
diff --git a/scripts/build-image-layer.sh b/scripts/build-image-layer.sh
index 064ee7564..0a0fa32b7 100644
--- a/scripts/build-image-layer.sh
+++ b/scripts/build-image-layer.sh
@@ -22,13 +22,13 @@ tools() {
 
 deps() {
   mkdir -p \
-    crates/bindings/node/src \
     crates/bonfire/src \
     crates/delta/src \
     crates/core/config/src \
     crates/core/database/src \
     crates/core/files/src \
     crates/core/models/src \
+    crates/core/parser/src \
     crates/core/permissions/src \
     crates/core/presence/src \
     crates/core/result/src \
@@ -44,19 +44,19 @@ deps() {
     tee crates/daemons/crond/src/main.rs |
     tee crates/daemons/pushd/src/main.rs
   echo '' |
-    tee crates/bindings/node/src/lib.rs |
     tee crates/core/config/src/lib.rs |
     tee crates/core/database/src/lib.rs |
     tee crates/core/files/src/lib.rs |
     tee crates/core/models/src/lib.rs |
+    tee crates/core/parser/src/lib.rs |
     tee crates/core/permissions/src/lib.rs |
     tee crates/core/presence/src/lib.rs |
     tee crates/core/result/src/lib.rs
   
   if [ -z "$TARGETARCH" ]; then
-    cargo build --locked --release
+    cargo build -j 10 --locked --release
   else
-    cargo build --locked --release --target "${BUILD_TARGET}"
+    cargo build -j 10 --locked --release --target "${BUILD_TARGET}"
   fi
 }
 
@@ -69,14 +69,15 @@ apps() {
     crates/core/config/src/lib.rs \
     crates/core/database/src/lib.rs \
     crates/core/models/src/lib.rs \
+    crates/core/parser/src/lib.rs \
     crates/core/permissions/src/lib.rs \
     crates/core/presence/src/lib.rs \
     crates/core/result/src/lib.rs
   
   if [ -z "$TARGETARCH" ]; then
-    cargo build --locked --release
+    cargo build -j 10 --locked --release
   else
-    cargo build --locked --release --target "${BUILD_TARGET}"
+    cargo build -j 10 --locked --release --target "${BUILD_TARGET}"
     mv target _target && mv _target/"${BUILD_TARGET}" target
   fi
 }

From 3dbf3bb7a0e74c86c362b0e18a1bf53cf3b3bbca Mon Sep 17 00:00:00 2001
From: Zomatree <me@zomatree.live>
Date: Thu, 5 Jun 2025 14:14:19 +0100
Subject: [PATCH 59/62] feat: private livekit nodes

---
 crates/core/config/src/lib.rs   |  6 +++++-
 crates/delta/src/routes/root.rs | 21 ++++++++++++---------
 2 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/crates/core/config/src/lib.rs b/crates/core/config/src/lib.rs
index d5b1d187a..f15f17fb9 100644
--- a/crates/core/config/src/lib.rs
+++ b/crates/core/config/src/lib.rs
@@ -188,7 +188,11 @@ pub struct LiveKitNode {
     pub lat: f64,
     pub lon: f64,
     pub key: String,
-    pub secret: String
+    pub secret: String,
+
+    // whether to hide the node in the nodes list
+    #[serde(default)]
+    pub private: bool,
 }
 
 #[derive(Deserialize, Debug, Clone)]
diff --git a/crates/delta/src/routes/root.rs b/crates/delta/src/routes/root.rs
index 6b42497c9..ffdbdee25 100644
--- a/crates/delta/src/routes/root.rs
+++ b/crates/delta/src/routes/root.rs
@@ -115,15 +115,18 @@ pub async fn root() -> Result<Json<RevoltConfig>> {
             },
             livekit: VoiceFeature {
                 enabled: !config.hosts.livekit.is_empty(),
-                nodes: config.api.livekit.nodes.iter().map(|(name, value)| {
-                    VoiceNode {
-                        name: name.clone(),
-                        lat: value.lat,
-                        lon: value.lon,
-                        public_url: config.hosts.livekit.get(name).expect("Missing corresponding host for voice node").clone()
-                    }
-                })
-                .collect()
+                nodes: config.api.livekit.nodes
+                    .iter()
+                    .filter(|(_, node)| !node.private)
+                    .map(|(name, value)| {
+                        VoiceNode {
+                            name: name.clone(),
+                            lat: value.lat,
+                            lon: value.lon,
+                            public_url: config.hosts.livekit.get(name).expect("Missing corresponding host for voice node").clone()
+                        }
+                    })
+                    .collect()
             },
         },
         ws: config.hosts.events,

From 901ac56154ec8ad83917b884035dd96d97be71c7 Mon Sep 17 00:00:00 2001
From: Zomatree <me@zomatree.live>
Date: Thu, 5 Jun 2025 17:26:37 +0100
Subject: [PATCH 60/62] fix: remove node from channel voice state

---
 crates/core/database/src/voice/mod.rs | 4 +---
 crates/core/models/src/v0/channels.rs | 6 ++----
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/crates/core/database/src/voice/mod.rs b/crates/core/database/src/voice/mod.rs
index 077283d4e..a01bf492c 100644
--- a/crates/core/database/src/voice/mod.rs
+++ b/crates/core/database/src/voice/mod.rs
@@ -293,7 +293,6 @@ pub async fn get_channel_voice_state(channel: &Channel) -> Result<Option<v0::Cha
 
     if let Some(members) = members {
         let mut participants = Vec::with_capacity(members.len());
-        let node = get_channel_node(channel.id()).await?.unwrap();
 
         for user_id in members {
             if let Some(voice_state) = get_voice_state(channel.id(), server, &user_id).await? {
@@ -307,8 +306,7 @@ pub async fn get_channel_voice_state(channel: &Channel) -> Result<Option<v0::Cha
 
         Ok(Some(v0::ChannelVoiceState {
             id: channel.id().to_string(),
-            participants,
-            node
+            participants
         }))
     } else {
         Ok(None)
diff --git a/crates/core/models/src/v0/channels.rs b/crates/core/models/src/v0/channels.rs
index b08de26b2..5a70449ba 100644
--- a/crates/core/models/src/v0/channels.rs
+++ b/crates/core/models/src/v0/channels.rs
@@ -316,7 +316,7 @@ auto_derived!(
         /// Token for authenticating with the voice server
         pub token: String,
         /// Url of the livekit server to connect to
-        pub url: String
+        pub url: String,
     }
 
     /// Voice state for a channel
@@ -324,13 +324,11 @@ auto_derived!(
         pub id: String,
         /// The states of the users who are connected to the channel
         pub participants: Vec<UserVoiceState>,
-        /// The node's node which the channel is currently using
-        pub node: String
     }
 
     /// Join a voice channel
     pub struct DataJoinCall {
-        pub node: Option<String>
+        pub node: Option<String>,
     }
 
 );

From 95ca735b7bf543a36abdb06541cd94c7225db74f Mon Sep 17 00:00:00 2001
From: Zomatree <me@zomatree.live>
Date: Sun, 8 Jun 2025 02:33:35 +0100
Subject: [PATCH 61/62] fix: get_voice_state has incorrect unique_key and
 allowed_sources should be lowercase

---
 crates/core/database/src/voice/mod.rs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/crates/core/database/src/voice/mod.rs b/crates/core/database/src/voice/mod.rs
index a01bf492c..eb7ffdf1f 100644
--- a/crates/core/database/src/voice/mod.rs
+++ b/crates/core/database/src/voice/mod.rs
@@ -102,11 +102,11 @@ pub fn get_allowed_sources(permissions: PermissionValue) -> Vec<&'static str> {
     let mut allowed_sources = Vec::new();
 
     if permissions.has(ChannelPermission::Speak as u64) {
-        allowed_sources.push("MICROPHONE")
+        allowed_sources.push("microphone")
     };
 
     if permissions.has(ChannelPermission::Video as u64) {
-        allowed_sources.extend(["CAMERA", "SCREEN_SHARE", "SCREEN_SHARE_AUDIO"]);
+        allowed_sources.extend(["camera", "screen_share", "screen_share_audio"]);
     };
 
     allowed_sources
@@ -259,7 +259,7 @@ pub async fn get_voice_state(
     server_id: Option<&str>,
     user_id: &str,
 ) -> Result<Option<UserVoiceState>> {
-    let unique_key = format!("{}:{user_id}", server_id.unwrap_or(channel_id));
+    let unique_key = format!("{}:{}", user_id, server_id.unwrap_or(channel_id));
 
     let (is_publishing, is_receiving, screensharing, camera) = get_connection()
         .await?

From eb4897542866548f7c825a17812398723ec0b933 Mon Sep 17 00:00:00 2001
From: Zomatree <me@zomatree.live>
Date: Tue, 1 Jul 2025 20:22:53 +0100
Subject: [PATCH 62/62] chore: bump livekit dep

---
 crates/core/database/Cargo.toml         |  6 +++---
 crates/core/database/src/voice/mod.rs   | 18 +++++-------------
 crates/daemons/voice-ingress/Cargo.toml |  6 +++---
 crates/delta/Cargo.toml                 |  4 ++--
 4 files changed, 13 insertions(+), 21 deletions(-)

diff --git a/crates/core/database/Cargo.toml b/crates/core/database/Cargo.toml
index a574409e0..7794b0d70 100644
--- a/crates/core/database/Cargo.toml
+++ b/crates/core/database/Cargo.toml
@@ -103,6 +103,6 @@ authifier = { version = "1.0.15", features = ["rocket_impl"] }
 amqprs = { version = "1.7.0" }
 
 # Voice
-livekit-api = "0.4.1"
-livekit-protocol = "0.3.6"
-livekit-runtime = { version = "0.3.1", features = ["tokio"] }
\ No newline at end of file
+livekit-api = "0.4.4"
+livekit-protocol = "0.4.0"
+livekit-runtime = { version = "0.3.1", features = ["tokio"] }
diff --git a/crates/core/database/src/voice/mod.rs b/crates/core/database/src/voice/mod.rs
index eb7ffdf1f..ea41a3fd0 100644
--- a/crates/core/database/src/voice/mod.rs
+++ b/crates/core/database/src/voice/mod.rs
@@ -40,9 +40,7 @@ pub async fn set_channel_node(channel: &str, node: &str) -> Result<()> {
         .await?
         .set(format!("node:{channel}"), node)
         .await
-        .to_internal_error()?;
-
-    Ok(())
+        .to_internal_error()
 }
 
 pub async fn get_channel_node(channel: &str) -> Result<Option<String>> {
@@ -144,7 +142,7 @@ pub async fn create_voice_state(
             voice_state.screensharing,
         )
         .set(format!("camera:{unique_key}"), voice_state.camera)
-        .query_async(&mut get_connection().await?.into_inner())
+        .query_async::<_, ()>(&mut get_connection().await?.into_inner())
         .await
         .to_internal_error()?;
 
@@ -170,9 +168,7 @@ pub async fn delete_voice_state(
         ])
         .query_async(&mut get_connection().await?.into_inner())
         .await
-        .to_internal_error()?;
-
-    Ok(())
+        .to_internal_error()
 }
 
 pub async fn update_voice_state_tracks(
@@ -236,9 +232,7 @@ pub async fn update_voice_state(
     pipeline
         .query_async(&mut get_connection().await?.into_inner())
         .await
-        .to_internal_error()?;
-
-    Ok(())
+        .to_internal_error()
 }
 
 pub async fn get_voice_channel_members(channel_id: &str) -> Result<Option<Vec<String>>> {
@@ -322,9 +316,7 @@ pub async fn move_user(user: &str, from: &str, to: &str) -> Result<()> {
             user,
         )
         .await
-        .to_internal_error()?;
-
-    Ok(())
+        .to_internal_error()
 }
 
 pub async fn sync_voice_permissions(db: &Database, voice_client: &VoiceClient, channel: &Channel, server: Option<&Server>, role_id: Option<&str>) -> Result<()> {
diff --git a/crates/daemons/voice-ingress/Cargo.toml b/crates/daemons/voice-ingress/Cargo.toml
index 93eee95bd..21393e26d 100644
--- a/crates/daemons/voice-ingress/Cargo.toml
+++ b/crates/daemons/voice-ingress/Cargo.toml
@@ -39,6 +39,6 @@ revolt-database = { path = "../../core/database" }
 revolt-permissions = { path = "../../core/permissions" }
 
 # voice
-livekit-api = "0.4.1"
-livekit-protocol = "0.3.6"
-livekit-runtime = { version = "0.3.1", features = ["tokio"] }
\ No newline at end of file
+livekit-api = "0.4.4"
+livekit-protocol = "0.4.0"
+livekit-runtime = { version = "0.3.1", features = ["tokio"] }
diff --git a/crates/delta/Cargo.toml b/crates/delta/Cargo.toml
index 20844b95b..05ac9115a 100644
--- a/crates/delta/Cargo.toml
+++ b/crates/delta/Cargo.toml
@@ -83,8 +83,8 @@ revolt-result = { path = "../core/result", features = ["rocket", "okapi"] }
 revolt-permissions = { path = "../core/permissions", features = ["schemas"] }
 
 # voice
-livekit-api = "0.4.1"
-livekit-protocol = "0.3.6"
+livekit-api = "0.4.4"
+livekit-protocol = "0.4.0"
 
 [build-dependencies]
 vergen = "7.5.0"