chore: switch to method chaining over macro

fixes #392

Cargo.toml

@@ -11,6 +11,8 @@ members = [
 
 [patch.crates-io]
 redis23 = { package = "redis", version = "0.23.3", git = "https://github.com/revoltchat/redis-rs", rev = "523b2937367e17bd0073722bf6e23d06042cb4e4" }
+#authifier = { package = "authifier", version = "1.0.10", path = "../authifier/crates/authifier" }
+#rocket_authifier = { package = "rocket_authifier", version = "1.0.10", path = "../authifier/crates/rocket_authifier" }
 
 # I'm 99% sure this is overloading the GitHub worker
 # hence builds have been failing since, let's just

README.md

@@ -114,7 +114,8 @@ If you'd like to change anything, create a `Revolt.overrides.toml` file and spec
 > And corresponding Revolt configuration:
 >
 > ```toml
-> # Revolt.overrides.toml
+> #     Revolt.overrides.toml
+> # and Revolt.test-overrides.toml
 > [database]
 > mongodb = "mongodb://127.0.0.1:14017"
 > redis = "redis://127.0.0.1:14079/"

clippy.toml

@@ -26,3 +26,7 @@ disallowed-methods = [
     # Prefer to use Object::delete(&self)
     "revolt_database::models::bots::ops::AbstractBots::delete_bot",
 ]
+
+disallowed-types = [
+    "rocket::serde::json::Json",
+]

compose.yml

@@ -34,7 +34,7 @@ services:
       - minio
     entrypoint: >
       /bin/sh -c "while ! /usr/bin/mc ready minio; do
-        /usr/bin/mc config host add minio http://minio:9000 minioautumn minioautumn;
+        /usr/bin/mc alias set minio http://minio:9000 minioautumn minioautumn;
         echo 'Waiting minio...' && sleep 1;
       done; /usr/bin/mc mb minio/revolt-uploads; exit 0;"
 

crates/bonfire/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "revolt-bonfire"
-version = "0.8.7"
+version = "0.8.8"
 license = "AGPL-3.0-or-later"
 edition = "2021"
 
@@ -37,11 +37,11 @@ async-std = { version = "1.8.0", features = [
 
 # core
 authifier = { version = "1.0.15" }
-revolt-result = { path = "../core/result" }
+revolt-result = { path = "../core/result", features = ["sentry"] }
 revolt-models = { path = "../core/models" }
 revolt-config = { path = "../core/config" }
 revolt-database = { path = "../core/database" }
-revolt-permissions = { version = "0.8.7", path = "../core/permissions" }
+revolt-permissions = { version = "0.8.8", path = "../core/permissions" }
 revolt-presence = { path = "../core/presence", features = ["redis-is-patched"] }
 
 # redis

crates/bonfire/src/config.rs

@@ -1,7 +1,7 @@
 use async_tungstenite::tungstenite::{handshake, Message};
 use futures::channel::oneshot::Sender;
 use revolt_database::events::client::ReadyPayloadFields;
-use revolt_result::{create_error, Result};
+use revolt_result::{create_error, Result, ToRevoltError};
 use serde::{Deserialize, Serialize};
 
 /// Enumeration of supported protocol formats
@@ -38,16 +38,22 @@ impl ProtocolConfiguration {
         match self.format {
             ProtocolFormat::Json => {
                 if let Message::Text(text) = msg {
-                    serde_json::from_str(text).map_err(|_| create_error!(InternalError))
+                    // Log the error in-case we make a breaking change to the payload
+
+                    serde_json::from_str(text)
+                        .capture_error()
+                        .map_err(|_| create_error!(UnprocessableEntity))
                 } else {
-                    Err(create_error!(InternalError))
+                    Err(create_error!(UnprocessableEntity))
                 }
             }
             ProtocolFormat::Msgpack => {
                 if let Message::Binary(buf) = msg {
-                    rmp_serde::from_slice(buf).map_err(|_| create_error!(InternalError))
+                    rmp_serde::from_slice(buf)
+                        .capture_error()
+                        .map_err(|_| create_error!(UnprocessableEntity))
                 } else {
-                    Err(create_error!(InternalError))
+                    Err(create_error!(UnprocessableEntity))
                 }
             }
         }

crates/bonfire/src/websocket.rs

@@ -14,9 +14,9 @@ use futures::{
     FutureExt, SinkExt, StreamExt, TryStreamExt,
 };
 use redis_kiss::{PayloadType, REDIS_PAYLOAD_TYPE, REDIS_URI};
-use revolt_config::report_internal_error;
 use revolt_database::{
     events::{client::EventV1, server::ClientMessage},
+    iso8601_timestamp::Timestamp,
     Database, User, UserHint,
 };
 use revolt_presence::{create_session, delete_session};
@@ -26,7 +26,7 @@ use async_std::{
     sync::{Mutex, RwLock},
     task::spawn,
 };
-use revolt_result::create_error;
+use revolt_result::{create_error, ToRevoltError};
 use sentry::Level;
 
 use crate::config::{ProtocolConfiguration, WebsocketHandshakeCallback};
@@ -100,26 +100,30 @@ pub async fn client(db: &'static Database, stream: TcpStream, addr: SocketAddr)
 
     info!("User {addr:?} authenticated as @{}", user.username);
 
+    db.update_session_last_seen(&session_id, Timestamp::now_utc())
+        .await
+        .ok();
+
     // Create local state.
     let mut state = State::from(user, session_id);
     let user_id = state.cache.user_id.clone();
 
     // Notify socket we have authenticated.
-    if report_internal_error!(write.send(config.encode(&EventV1::Authenticated)).await).is_err() {
+    if write.send(config.encode(&EventV1::Authenticated)).await.to_internal_error().is_err() {
         return;
     }
 
     // Download required data to local cache and send Ready payload.
-    let ready_payload = match report_internal_error!(
-        state
+    let ready_payload = match state
             .generate_ready_payload(db, config.get_ready_payload_fields())
             .await
-    ) {
+            .to_internal_error()
+    {
         Ok(ready_payload) => ready_payload,
         Err(_) => return,
     };
 
-    if report_internal_error!(write.send(config.encode(&ready_payload)).await).is_err() {
+    if write.send(config.encode(&ready_payload)).await.to_internal_error().is_err() {
         return;
     }
 
@@ -214,14 +218,15 @@ async fn listener(
     write: &Mutex<WsWriter>,
 ) {
     let redis_config = RedisConfig::from_url(&REDIS_URI).unwrap();
-    let subscriber = match report_internal_error!(
-        fred::types::Builder::from_config(redis_config).build_subscriber_client()
-    ) {
+    let subscriber = match fred::types::Builder::from_config(redis_config)
+        .build_subscriber_client()
+        .to_internal_error()
+    {
         Ok(subscriber) => subscriber,
         Err(_) => return,
     };
 
-    if report_internal_error!(subscriber.init().await).is_err() {
+    if subscriber.init().await.to_internal_error().is_err() {
         return;
     }
 
@@ -244,13 +249,13 @@ async fn listener(
         // Check for state changes for subscriptions.
         match state.apply_state().await {
             SubscriptionStateChange::Reset => {
-                if report_internal_error!(subscriber.unsubscribe_all().await).is_err() {
+                if subscriber.unsubscribe_all().await.to_internal_error().is_err() {
                     break 'out;
                 }
 
                 let subscribed = state.subscribed.read().await;
                 for id in subscribed.iter() {
-                    if report_internal_error!(subscriber.subscribe(id).await).is_err() {
+                    if subscriber.subscribe(id).await.to_internal_error().is_err() {
                         break 'out;
                     }
                 }
@@ -263,7 +268,7 @@ async fn listener(
                     #[cfg(debug_assertions)]
                     info!("{addr:?} unsubscribing from {id}");
 
-                    if report_internal_error!(subscriber.unsubscribe(id).await).is_err() {
+                    if subscriber.unsubscribe(id).await.to_internal_error().is_err() {
                         break 'out;
                     }
                 }
@@ -272,7 +277,7 @@ async fn listener(
                     #[cfg(debug_assertions)]
                     info!("{addr:?} subscribing to {id}");
 
-                    if report_internal_error!(subscriber.subscribe(id).await).is_err() {
+                    if subscriber.subscribe(id).await.to_internal_error().is_err() {
                         break 'out;
                     }
                 }
@@ -297,7 +302,7 @@ async fn listener(
             _ = t2 => {},
             message = t1 => {
                 // Handle incoming events.
-                let message = match report_internal_error!(message) {
+                let message = match message.to_internal_error() {
                     Ok(message) => message,
                     Err(_) => break 'out
                 };
@@ -306,15 +311,15 @@ async fn listener(
                     PayloadType::Json => message
                         .value
                         .as_str()
-                        .and_then(|s| report_internal_error!(serde_json::from_str::<EventV1>(s.as_ref())).ok()),
+                        .and_then(|s| serde_json::from_str::<EventV1>(s.as_ref()).to_internal_error().ok()),
                     PayloadType::Msgpack => message
                         .value
                         .as_bytes()
-                        .and_then(|b| report_internal_error!(rmp_serde::from_slice::<EventV1>(b)).ok()),
+                        .and_then(|b| rmp_serde::from_slice::<EventV1>(b).to_internal_error().ok()),
                     PayloadType::Bincode => message
                         .value
                         .as_bytes()
-                        .and_then(|b| report_internal_error!(bincode::deserialize::<EventV1>(b)).ok()),
+                        .and_then(|b| bincode::deserialize::<EventV1>(b).to_internal_error().ok()),
                 };
 
                 let Some(mut event) = event else {
@@ -374,7 +379,7 @@ async fn listener(
         }
     }
 
-    report_internal_error!(subscriber.quit().await).ok();
+    subscriber.quit().await.to_internal_error().ok();
 }
 
 #[allow(clippy::too_many_arguments)]

crates/core/config/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "revolt-config"
-version = "0.8.7"
+version = "0.8.8"
 edition = "2021"
 license = "MIT"
 authors = ["Paul Makles <me@insrt.uk>"]
@@ -11,8 +11,9 @@ description = "Revolt Backend: Configuration"
 [features]
 anyhow = ["dep:sentry-anyhow"]
 report-macros = ["revolt-result"]
+sentry = ["dep:sentry"]
 test = ["async-std"]
-default = ["test", "anyhow"]
+default = ["test", "sentry"]
 
 [dependencies]
 # Utility
@@ -32,8 +33,8 @@ log = "0.4.14"
 pretty_env_logger = "0.4.0"
 
 # Sentry
-sentry = "0.31.5"
+sentry = { version = "0.31.5", optional = true }
 sentry-anyhow = { version = "0.38.1", optional = true }
 
 # Core
-revolt-result = { version = "0.8.7", path = "../result", optional = true }
+revolt-result = { version = "0.8.8", path = "../result", optional = true }

crates/core/config/src/lib.rs

@@ -6,10 +6,12 @@ use futures_locks::RwLock;
 use once_cell::sync::Lazy;
 use serde::Deserialize;
 
+#[cfg(feature = "sentry")]
 pub use sentry::{capture_error, capture_message, Level};
+#[cfg(feature = "anyhow")]
 pub use sentry_anyhow::capture_anyhow;
 
-#[cfg(feature = "report-macros")]
+#[cfg(all(feature = "report-macros", feature = "sentry"))]
 #[macro_export]
 macro_rules! report_error {
     ( $expr: expr, $error: ident $( $tt:tt )? ) => {
@@ -24,7 +26,7 @@ macro_rules! report_error {
     };
 }
 
-#[cfg(feature = "report-macros")]
+#[cfg(all(feature = "report-macros", feature = "sentry"))]
 #[macro_export]
 macro_rules! capture_internal_error {
     ( $expr: expr ) => {
@@ -35,7 +37,7 @@ macro_rules! capture_internal_error {
     };
 }
 
-#[cfg(feature = "report-macros")]
+#[cfg(all(feature = "report-macros", feature = "sentry"))]
 #[macro_export]
 macro_rules! report_internal_error {
     ( $expr: expr ) => {
@@ -60,6 +62,9 @@ static CONFIG_SEARCH_PATHS: [&str; 3] = [
     "/Revolt.toml",
 ];
 
+/// Path to search for test overrides
+static TEST_OVERRIDE_PATH: &str = "Revolt.test-overrides.toml";
+
 /// Configuration builder
 static CONFIG_BUILDER: Lazy<RwLock<Config>> = Lazy::new(|| {
     RwLock::new({
@@ -73,6 +78,20 @@ static CONFIG_BUILDER: Lazy<RwLock<Config>> = Lazy::new(|| {
                 include_str!("../Revolt.test.toml"),
                 FileFormat::Toml,
             ));
+
+            // recursively search upwards for an overrides file (if there is one)
+            if let Ok(cwd) = std::env::current_dir() {
+                let mut path = Some(cwd.as_path());
+                while let Some(current_path) = path {
+                    let target_path = current_path.join(TEST_OVERRIDE_PATH);
+                    if target_path.exists() {
+                        builder = builder
+                            .add_source(File::new(target_path.to_str().unwrap(), FileFormat::Toml));
+                    }
+
+                    path = current_path.parent();
+                }
+            }
         }
 
         for path in CONFIG_SEARCH_PATHS {
@@ -388,6 +407,11 @@ pub async fn read() -> Config {
 pub async fn config() -> Settings {
     let mut config = read().await.try_deserialize::<Settings>().unwrap();
 
+    // inject REDIS_URI for redis-kiss library
+    if std::env::var("REDIS_URL").is_err() {
+        std::env::set_var("REDIS_URI", config.database.redis.clone());
+    }
+
     // auto-detect production nodes
     if config.hosts.api.contains("https") && config.hosts.api.contains("revolt.chat") {
         config.production = true;
@@ -397,6 +421,7 @@ pub async fn config() -> Settings {
 }
 
 /// Configure logging and common Rust variables
+#[cfg(feature = "sentry")]
 pub async fn setup_logging(release: &'static str, dsn: String) -> Option<sentry::ClientInitGuard> {
     if std::env::var("RUST_LOG").is_err() {
         std::env::set_var("RUST_LOG", "info");
@@ -406,12 +431,6 @@ pub async fn setup_logging(release: &'static str, dsn: String) -> Option<sentry:
         std::env::set_var("ROCKET_ADDRESS", "0.0.0.0");
     }
 
-    if std::env::var("REDIS_URL").is_err() {
-        // Configure redis-kiss library
-        let config = config().await;
-        std::env::set_var("REDIS_URI", config.database.redis);
-    }
-
     pretty_env_logger::init();
     log::info!("Starting {release}");
 
@@ -428,6 +447,7 @@ pub async fn setup_logging(release: &'static str, dsn: String) -> Option<sentry:
     }
 }
 
+#[cfg(feature = "sentry")]
 #[macro_export]
 macro_rules! configure {
     ($application: ident) => {

crates/core/database/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "revolt-database"
-version = "0.8.7"
+version = "0.8.8"
 edition = "2021"
 license = "AGPL-3.0-or-later"
 authors = ["Paul Makles <me@insrt.uk>"]
@@ -10,12 +10,12 @@ description = "Revolt Backend: Database Implementation"
 
 [features]
 # Databases
-mongodb = ["dep:mongodb", "bson"]
+mongodb = ["dep:mongodb", "bson", "authifier/database-mongodb"]
 
 # ... Other
 tasks = ["isahc", "linkify", "url-escape"]
-async-std-runtime = ["async-std"]
-rocket-impl = ["rocket", "schemars", "revolt_okapi", "revolt_rocket_okapi"]
+async-std-runtime = ["async-std", "authifier/async-std-runtime"]
+rocket-impl = ["rocket", "schemars", "revolt_okapi", "revolt_rocket_okapi", "authifier/rocket_impl"]
 axum-impl = ["axum"]
 redis-is-patched = ["revolt-presence/redis-is-patched"]
 
@@ -24,19 +24,19 @@ default = ["mongodb", "async-std-runtime", "tasks"]
 
 [dependencies]
 # Core
-revolt-config = { version = "0.8.7", path = "../config", features = [
+revolt-config = { version = "0.8.8", path = "../config", features = [
     "report-macros",
 ] }
-revolt-result = { version = "0.8.7", path = "../result" }
-revolt-models = { version = "0.8.7", path = "../models", features = [
+revolt-result = { version = "0.8.8", path = "../result" }
+revolt-models = { version = "0.8.8", path = "../models", features = [
     "validator",
 ] }
-revolt-presence = { version = "0.8.7", path = "../presence" }
-revolt-permissions = { version = "0.8.7", path = "../permissions", features = [
+revolt-presence = { version = "0.8.8", path = "../presence" }
+revolt-permissions = { version = "0.8.8", path = "../permissions", features = [
     "serde",
     "bson",
 ] }
-revolt-parser = { version = "0.8.7", path = "../parser" }
+revolt-parser = { version = "0.8.8", path = "../parser" }
 
 # Utility
 log = "0.4"
@@ -91,13 +91,8 @@ rocket = { version = "0.5.1", default-features = false, features = [
 revolt_okapi = { version = "0.9.1", optional = true }
 revolt_rocket_okapi = { version = "0.10.0", optional = true }
 
-# Notifications
-fcm_v1 = "0.3.0"
-web-push = "0.10.0"
-revolt_a2 = { version = "0.10", default-features = false, features = ["ring"] }
-
 # Authifier
-authifier = { version = "1.0.15", features = ["rocket_impl"] }
+authifier = { version = "1.0.15" }
 
 # RabbitMQ
 amqprs = { version = "1.7.0" }

crates/core/database/fixtures/group_with_members.json

@@ -3,18 +3,21 @@
     "_object_type": "User",
     "_id": "__ID:0__",
     "username": "Owner",
+    "last_acknowledged_policy_change": "2025-06-07T04:04:48+0000",
     "discriminator": "0001"
   },
   {
     "_object_type": "User",
     "_id": "__ID:1__",
     "username": "Member",
+    "last_acknowledged_policy_change": "2025-06-07T04:04:48+0000",
     "discriminator": "0001"
   },
   {
     "_object_type": "User",
     "_id": "__ID:2__",
     "username": "Member",
+    "last_acknowledged_policy_change": "2025-06-07T04:04:48+0000",
     "discriminator": "0002"
   },
   {
@@ -23,6 +26,9 @@
     "channel_type": "Group",
     "name": "My Group",
     "owner": "__ID:0__",
-    "recipients": ["__ID:0__", "__ID:1__"]
+    "recipients": [
+      "__ID:0__",
+      "__ID:1__"
+    ]
   }
-]
+]

crates/core/database/fixtures/server_with_roles.json

@@ -3,18 +3,21 @@
     "_object_type": "User",
     "_id": "__ID:0__",
     "username": "Owner",
+    "last_acknowledged_policy_change": "2025-06-07T04:04:48+0000",
     "discriminator": "0001"
   },
   {
     "_object_type": "User",
     "_id": "__ID:1__",
     "username": "Moderator",
+    "last_acknowledged_policy_change": "2025-06-07T04:04:48+0000",
     "discriminator": "0001"
   },
   {
     "_object_type": "User",
     "_id": "__ID:2__",
     "username": "User",
+    "last_acknowledged_policy_change": "2025-06-07T04:04:48+0000",
     "discriminator": "0001"
   },
   {
@@ -39,7 +42,9 @@
     "_id": "__ID:4__",
     "owner": "__ID:0__",
     "name": "Server",
-    "channels": ["__ID:3__"],
+    "channels": [
+      "__ID:3__"
+    ],
     "roles": {
       "__ID:5__": {
         "name": "Moderator",
@@ -47,7 +52,7 @@
           "a": 545270208,
           "d": 0
         },
-        "rank": 3
+        "rank": 1
       },
       "__ID:6__": {
         "name": "Owner",
@@ -66,7 +71,9 @@
       "user": "__ID:0__",
       "server": "__ID:4__"
     },
-    "roles": ["__ID:6__"],
+    "roles": [
+      "__ID:6__"
+    ],
     "joined_at": 1698318340195
   },
   {
@@ -75,7 +82,9 @@
       "user": "__ID:1__",
       "server": "__ID:4__"
     },
-    "roles": ["__ID:5__"],
+    "roles": [
+      "__ID:5__"
+    ],
     "joined_at": 1698318340195
   },
   {
@@ -86,4 +95,4 @@
     },
     "joined_at": 1698318340195
   }
-]
+]

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

@@ -1,3 +1,4 @@
+#[cfg(feature = "mongodb")]
 mod mongodb;
 mod reference;
 
@@ -13,6 +14,7 @@ use authifier::Authifier;
 use rand::Rng;
 use revolt_config::config;
 
+#[cfg(feature = "mongodb")]
 pub use self::mongodb::*;
 pub use self::reference::*;
 
@@ -25,8 +27,10 @@ pub enum DatabaseInfo {
     /// Use the mock database
     Reference,
     /// Connect to MongoDB
+    #[cfg(feature = "mongodb")]
     MongoDb { uri: String, database_name: String },
     /// Use existing MongoDB connection
+    #[cfg(feature = "mongodb")]
     MongoDbFromClient(::mongodb::Client, String),
 }
 
@@ -36,6 +40,7 @@ pub enum Database {
     /// Mock database
     Reference(ReferenceDb),
     /// MongoDB database
+    #[cfg(feature = "mongodb")]
     MongoDb(MongoDb),
 }
 
@@ -45,7 +50,7 @@ impl DatabaseInfo {
     pub async fn connect(self) -> Result<Database, String> {
         let config = config().await;
 
-        Ok(match self {
+        match self {
             DatabaseInfo::Auto => {
                 if std::env::var("TEST_DB").is_ok() {
                     DatabaseInfo::Test(format!(
@@ -53,16 +58,20 @@ impl DatabaseInfo {
                         rand::thread_rng().gen_range(1_000_000..10_000_000)
                     ))
                     .connect()
-                    .await?
+                    .await
                 } else if !config.database.mongodb.is_empty() {
-                    DatabaseInfo::MongoDb {
+                    #[cfg(feature = "mongodb")]
+                    return DatabaseInfo::MongoDb {
                         uri: config.database.mongodb,
                         database_name: "revolt".to_string(),
                     }
                     .connect()
-                    .await?
+                    .await;
+
+                    #[cfg(not(feature = "mongodb"))]
+                    return Err("MongoDB not enabled.".to_string())
                 } else {
-                    DatabaseInfo::Reference.connect().await?
+                    DatabaseInfo::Reference.connect().await
                 }
             }
             DatabaseInfo::Test(database_name) => {
@@ -70,30 +79,36 @@ impl DatabaseInfo {
                     .expect("`TEST_DB` environment variable should be set to REFERENCE or MONGODB")
                     .as_str()
                 {
-                    "REFERENCE" => DatabaseInfo::Reference.connect().await?,
+                    "REFERENCE" => DatabaseInfo::Reference.connect().await,
                     "MONGODB" => {
-                        DatabaseInfo::MongoDb {
+                        #[cfg(feature = "mongodb")]
+                        return DatabaseInfo::MongoDb {
                             uri: config.database.mongodb,
                             database_name,
                         }
                         .connect()
-                        .await?
+                        .await;
+
+                        #[cfg(not(feature = "mongodb"))]
+                        return Err("MongoDB not enabled.".to_string())
                     }
                     _ => unreachable!("must specify REFERENCE or MONGODB"),
                 }
             }
-            DatabaseInfo::Reference => Database::Reference(Default::default()),
+            DatabaseInfo::Reference => Ok(Database::Reference(Default::default())),
+            #[cfg(feature = "mongodb")]
             DatabaseInfo::MongoDb { uri, database_name } => {
                 let client = ::mongodb::Client::with_uri_str(uri)
                     .await
                     .map_err(|_| "Failed to init db connection.".to_string())?;
 
-                Database::MongoDb(MongoDb(client, database_name))
+                Ok(Database::MongoDb(MongoDb(client, database_name)))
             }
+            #[cfg(feature = "mongodb")]
             DatabaseInfo::MongoDbFromClient(client, database_name) => {
-                Database::MongoDb(MongoDb(client, database_name))
+                Ok(Database::MongoDb(MongoDb(client, database_name)))
             }
-        })
+        }
     }
 }
 
@@ -219,12 +234,16 @@ impl Database {
         Authifier {
             database: match self {
                 Database::Reference(_) => Default::default(),
+                #[cfg(feature = "mongodb")]
                 Database::MongoDb(MongoDb(client, _)) => authifier::Database::MongoDb(
                     authifier::database::MongoDb(client.database("revolt")),
                 ),
             },
             config: auth_config,
+            #[cfg(feature = "tasks")]
             event_channel: Some(crate::tasks::authifier_relay::sender()),
+            #[cfg(not(feature = "tasks"))]
+            event_channel: None,
         }
     }
 }

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

@@ -10,7 +10,6 @@ use serde::de::DeserializeOwned;
 use serde::Serialize;
 
 database_derived!(
-    #[cfg(feature = "mongodb")]
     /// MongoDB implementation
     pub struct MongoDb(pub ::mongodb::Client, pub String);
 );

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

@@ -165,6 +165,9 @@ pub enum EventV1 {
     /// Server role deleted
     ServerRoleDelete { id: String, role_id: String },
 
+    /// Server roles ranks updated
+    ServerRoleRanksUpdate { id: String, ranks: Vec<String> },
+
     /// Update existing user
     UserUpdate {
         id: String,

crates/core/database/src/lib.rs

@@ -25,6 +25,9 @@ pub use mongodb;
 #[macro_use]
 extern crate bson;
 
+#[cfg(not(feature = "async-std-runtime"))]
+compile_error!("async-std-runtime feature must be enabled.");
+
 #[macro_export]
 #[cfg(debug_assertions)]
 macro_rules! query {
@@ -103,6 +106,7 @@ pub mod util;
 pub use models::*;
 
 pub mod events;
+#[cfg(feature = "tasks")]
 pub mod tasks;
 
 mod amqp;

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

@@ -1,3 +1,4 @@
+#[cfg(feature = "mongodb")]
 mod mongodb;
 mod reference;
 

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

@@ -1,4 +1,8 @@
-use std::{collections::HashSet, ops::BitXor, time::Duration};
+use std::{
+    collections::{HashMap, HashSet},
+    ops::BitXor,
+    time::Duration,
+};
 
 use crate::{
     mongodb::{
@@ -22,7 +26,7 @@ struct MigrationInfo {
     revision: i32,
 }
 
-pub const LATEST_REVISION: i32 = 41; // MUST BE +1 to last migration
+pub const LATEST_REVISION: i32 = 42; // MUST BE +1 to last migration
 
 pub async fn migrate_database(db: &MongoDb) {
     let migrations = db.col::<Document>("migrations");
@@ -1165,6 +1169,63 @@ pub async fn run_migrations(db: &MongoDb, revision: i32) -> i32 {
             .expect("failed to update users");
     }
 
+    if revision <= 41 {
+        info!(
+            "Running migration [revision 41 / 05-06-2025]: convert role ranks to uniform numbers."
+        );
+
+        #[derive(Serialize, Deserialize, Clone)]
+        struct Role {
+            pub rank: i64,
+        }
+
+        #[derive(Serialize, Deserialize, Clone)]
+        struct Server {
+            #[serde(rename = "_id")]
+            pub id: String,
+            #[serde(default = "HashMap::<String, Role>::new")]
+            pub roles: HashMap<String, Role>,
+        }
+
+        let mut servers = db
+            .db()
+            .collection::<Server>("servers")
+            .find(doc! {
+                "roles": {
+                    "$exists": true,
+                    "$ne": []
+                }
+            })
+            .await
+            .unwrap()
+            .filter_map(|s| async { s.ok() })
+            .boxed();
+
+        while let Some(server) = servers.next().await {
+            let mut ordered_roles = server.roles.clone().into_iter().collect::<Vec<_>>();
+            ordered_roles.sort_by(|(_, role_a), (_, role_b)| role_a.rank.cmp(&role_b.rank));
+            let ordered_roles = ordered_roles
+                .into_iter()
+                .map(|(id, _)| id)
+                .collect::<Vec<_>>();
+
+            let mut doc = doc! {};
+
+            for id in server.roles.keys() {
+                doc.insert(
+                    format!("roles.{id}.rank"),
+                    ordered_roles.iter().position(|x| id == x).unwrap() as i64,
+                );
+            }
+
+            db.db()
+                .collection::<Server>("servers")
+                .update_one(doc! { "_id": &server.id }, doc! { "$set": doc })
+                .await
+                .unwrap();
+        }
+    }
+
     // Reminder to update LATEST_REVISION when adding new migrations.
     LATEST_REVISION.max(revision)
 }

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

@@ -2,6 +2,7 @@ use revolt_result::Result;
 
 use crate::{Bot, FieldsBot, PartialBot};
 
+#[cfg(feature = "mongodb")]
 mod mongodb;
 mod reference;
 

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

@@ -2,6 +2,7 @@ use revolt_result::Result;
 
 use crate::Invite;
 
+#[cfg(feature = "mongodb")]
 mod mongodb;
 mod reference;
 

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

@@ -2,6 +2,7 @@ use revolt_result::Result;
 
 use crate::ChannelUnread;
 
+#[cfg(feature = "mongodb")]
 mod mongodb;
 mod reference;
 

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

@@ -2,6 +2,7 @@ use revolt_result::Result;
 
 use crate::{FieldsWebhook, PartialWebhook, Webhook};
 
+#[cfg(feature = "mongodb")]
 mod mongodb;
 mod reference;
 

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

@@ -8,10 +8,13 @@ use serde::{Deserialize, Serialize};
 use ulid::Ulid;
 
 use crate::{
-    events::client::EventV1, tasks::ack::AckEvent, Database, File, IntoDocumentPath, PartialServer,
+    events::client::EventV1, Database, File, PartialServer,
     Server, SystemMessage, User, AMQP,
 };
 
+#[cfg(feature = "mongodb")]
+use crate::IntoDocumentPath;
+
 auto_derived!(
     #[serde(tag = "channel_type")]
     pub enum Channel {
@@ -646,10 +649,11 @@ impl Channel {
         .private(user.to_string())
         .await;
 
+        #[cfg(feature = "tasks")]
         crate::tasks::ack::queue_ack(
             self.id().to_string(),
             user.to_string(),
-            AckEvent::AckMessage {
+            crate::tasks::ack::AckEvent::AckMessage {
                 id: message.to_string(),
             },
         )
@@ -766,6 +770,7 @@ impl Channel {
     }
 }
 
+#[cfg(feature = "mongodb")]
 impl IntoDocumentPath for FieldsChannel {
     fn as_path(&self) -> Option<&'static str> {
         Some(match self {

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

@@ -1,5 +1,7 @@
 use crate::{revolt_result::Result, Channel, FieldsChannel, PartialChannel};
 use revolt_permissions::OverrideField;
+
+#[cfg(feature = "mongodb")]
 mod mongodb;
 mod reference;
 

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

@@ -2,6 +2,7 @@ use revolt_result::Result;
 
 use crate::Emoji;
 
+#[cfg(feature = "mongodb")]
 mod mongodb;
 mod reference;
 

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

@@ -2,6 +2,7 @@ use revolt_result::Result;
 
 use crate::FileHash;
 
+#[cfg(feature = "mongodb")]
 mod mongodb;
 mod reference;
 

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

@@ -4,6 +4,7 @@ use crate::File;
 
 use super::FileUsedFor;
 
+#[cfg(feature = "mongodb")]
 mod mongodb;
 mod reference;
 

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

@@ -1,7 +1,7 @@
 use bson::to_document;
 use bson::Document;
-use revolt_config::report_internal_error;
 use revolt_result::Result;
+use revolt_result::ToRevoltError;
 
 use crate::File;
 use crate::FileUsedFor;
@@ -106,7 +106,7 @@ impl AbstractAttachments for MongoDb {
                 },
                 doc! {
                     "$set": {
-                        "used_for": report_internal_error!(to_document(&used_for))?,
+                        "used_for": to_document(&used_for).to_internal_error()?,
                         "uploader_id": uploader_id
                     }
                 },

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

@@ -10,11 +10,9 @@ use revolt_models::v0::{
 use revolt_permissions::{calculate_channel_permissions, ChannelPermission, PermissionValue};
 use revolt_result::{ErrorType, Result};
 use ulid::Ulid;
-use validator::Validate;
 
 use crate::{
     events::client::EventV1,
-    tasks::{self, ack::AckEvent},
     util::{
         bulk_permissions::BulkDatabasePermissionQuery, idempotency::IdempotencyKey,
         permissions::DatabasePermissionQuery,
@@ -22,6 +20,9 @@ use crate::{
     Channel, Database, Emoji, File, User, AMQP,
 };
 
+#[cfg(feature = "tasks")]
+use crate::tasks::{self, ack::AckEvent};
+
 auto_derived_partial!(
     /// Message
     pub struct Message {
@@ -487,31 +488,28 @@ impl Message {
                 | Channel::VoiceChannel { ref server, .. } => {
                     let mentions_vec = Vec::from_iter(user_mentions.iter().cloned());
 
-                    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_members = db.fetch_members(server.as_str(), &mentions_vec[..]).await?;
 
-                        user_mentions.retain(|m| valid_mentions.contains(m)); // quick pass, validate mentions are in the server
+                    let valid_mentions = HashSet::<&String, RandomState>::from_iter(
+                        valid_members.iter().map(|m| &m.id.user),
+                    );
 
-                        if !user_mentions.is_empty() {
-                            // if there are still mentions, drill down to a channel-level
-                            let member_channel_view_perms =
-                                BulkDatabasePermissionQuery::from_server_id(db, server)
-                                    .await
-                                    .channel(&channel)
-                                    .members(&valid_members)
-                                    .members_can_see_channel()
-                                    .await;
+                    user_mentions.retain(|m| valid_mentions.contains(m)); // quick pass, validate mentions are in the server
 
-                            user_mentions
-                                .retain(|m| *member_channel_view_perms.get(m).unwrap_or(&false));
-                        }
-                    } else {
-                        revolt_config::capture_error(&valid_members.unwrap_err());
-                        return Err(create_error!(InternalError));
+                    if !user_mentions.is_empty() {
+                        // if there are still mentions, drill down to a channel-level
+                        let member_channel_view_perms =
+                            BulkDatabasePermissionQuery::from_server_id(db, server)
+                                .await
+                                .channel(&channel)
+                                .members(&valid_members)
+                                .members_can_see_channel()
+                                .await;
+
+                        user_mentions
+                            .retain(|m| *member_channel_view_perms.get(m).unwrap_or(&false));
                     }
+
                 }
                 Channel::SavedMessages { .. } => {
                     user_mentions.clear();
@@ -616,9 +614,11 @@ impl Message {
             .await;
 
         // Update last_message_id
+        #[cfg(feature = "tasks")]
         tasks::last_message_id::queue(self.channel.to_string(), self.id.to_string(), is_dm).await;
 
         // Add mentions for affected users
+        #[cfg(feature = "tasks")]
         if !mentions_elsewhere {
             if let Some(mentions) = &self.mentions {
                 tasks::ack::queue_message(
@@ -637,6 +637,7 @@ impl Message {
         }
 
         // Generate embeds
+        #[cfg(feature = "tasks")]
         if generate_embeds {
             if let Some(content) = &self.content {
                 tasks::process_embeds::queue(
@@ -673,10 +674,12 @@ impl Message {
         )
         .await?;
 
+
         if !self.has_suppressed_notifications()
             && (self.mentions.is_some() || self.contains_mass_push_mention())
         {
             // send Push notifications
+            #[cfg(feature = "tasks")]
             tasks::ack::queue_message(
                 self.channel.to_string(),
                 AckEvent::ProcessMessage {
@@ -710,12 +713,6 @@ impl Message {
 
     /// Create text embed from sendable embed
     pub async fn create_embed(&self, db: &Database, embed: SendableEmbed) -> Result<Embed> {
-        embed.validate().map_err(|error| {
-            create_error!(FailedValidation {
-                error: error.to_string()
-            })
-        })?;
-
         let media = if let Some(id) = embed.media {
             Some(File::use_attachment(db, &id, &self.id, &self.author).await?)
         } else {

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

@@ -2,6 +2,7 @@ use revolt_result::Result;
 
 use crate::{AppendMessage, FieldsMessage, Message, MessageQuery, PartialMessage};
 
+#[cfg(feature = "mongodb")]
 mod mongodb;
 mod reference;
 

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

@@ -38,7 +38,10 @@ pub use servers::*;
 pub use user_settings::*;
 pub use users::*;
 
-use crate::{Database, MongoDb, ReferenceDb};
+use crate::{Database, ReferenceDb};
+
+#[cfg(feature = "mongodb")]
+use crate::MongoDb;
 
 pub trait AbstractDatabase:
     Sync
@@ -66,6 +69,8 @@ pub trait AbstractDatabase:
 }
 
 impl AbstractDatabase for ReferenceDb {}
+
+#[cfg(feature = "mongodb")]
 impl AbstractDatabase for MongoDb {}
 
 impl std::ops::Deref for Database {
@@ -74,6 +79,7 @@ impl std::ops::Deref for Database {
     fn deref(&self) -> &Self::Target {
         match &self {
             Database::Reference(dummy) => dummy,
+            #[cfg(feature = "mongodb")]
             Database::MongoDb(mongo) => mongo,
         }
     }

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

@@ -2,6 +2,7 @@ use revolt_result::Result;
 
 use crate::PolicyChange;
 
+#[cfg(feature = "mongodb")]
 mod mongodb;
 mod reference;
 

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

@@ -1,6 +1,8 @@
 use std::time::Duration;
 
 use crate::{revolt_result::Result, RatelimitEvent, RatelimitEventType};
+
+#[cfg(feature = "mongodb")]
 mod mongodb;
 mod reference;
 

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

@@ -2,6 +2,7 @@ use revolt_result::Result;
 
 use crate::Report;
 
+#[cfg(feature = "mongodb")]
 mod mongodb;
 mod reference;
 

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

@@ -2,6 +2,7 @@ use revolt_result::Result;
 
 use crate::Snapshot;
 
+#[cfg(feature = "mongodb")]
 mod mongodb;
 mod reference;
 

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

@@ -2,6 +2,7 @@ use revolt_result::Result;
 
 use crate::{MemberCompositeKey, ServerBan};
 
+#[cfg(feature = "mongodb")]
 mod mongodb;
 mod reference;
 

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

@@ -1,16 +1,20 @@
-use ::mongodb::SessionCursor;
+#[cfg(feature = "mongodb")]
+use ::mongodb::{ClientSession, SessionCursor};
+
 use revolt_result::Result;
 
 use crate::{FieldsMember, Member, MemberCompositeKey, PartialMember};
 
+#[cfg(feature = "mongodb")]
 mod mongodb;
 mod reference;
 
 #[derive(Debug)]
+#[allow(clippy::large_enum_variant)]
 pub enum ChunkedServerMembersGenerator {
     #[cfg(feature = "mongodb")]
     MongoDb {
-        session: ::mongodb::ClientSession,
+        session: ClientSession,
         cursor: Option<SessionCursor<Member>>,
     },
 
@@ -22,7 +26,7 @@ pub enum ChunkedServerMembersGenerator {
 
 impl ChunkedServerMembersGenerator {
     #[cfg(feature = "mongodb")]
-    pub fn new_mongo(session: ::mongodb::ClientSession, cursor: SessionCursor<Member>) -> Self {
+    pub fn new_mongo(session: ClientSession, cursor: SessionCursor<Member>) -> Self {
         ChunkedServerMembersGenerator::MongoDb {
             session,
             cursor: Some(cursor),

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

@@ -181,7 +181,7 @@ impl Server {
     }
 
     /// Update server data
-    pub async fn update<'a>(
+    pub async fn update(
         &mut self,
         db: &Database,
         partial: PartialServer,
@@ -228,6 +228,13 @@ impl Server {
         }
     }
 
+    /// Ordered roles list
+    pub fn ordered_roles(&self) -> Vec<(String, Role)> {
+        let mut ordered_roles = self.roles.clone().into_iter().collect::<Vec<_>>();
+        ordered_roles.sort_by(|(_, role_a), (_, role_b)| role_a.rank.cmp(&role_b.rank));
+        ordered_roles
+    }
+
     /// Set role permission on a server
     pub async fn set_role_permission(
         &mut self,
@@ -253,6 +260,37 @@ impl Server {
             Err(create_error!(NotFound))
         }
     }
+
+    /// Reorders the server's roles rankings
+    pub async fn set_role_ordering(&mut self, db: &Database, new_order: Vec<String>) -> Result<()> {
+        // New order must always contain every role
+        debug_assert_eq!(self.roles.len(), new_order.len());
+
+        // Set the role's ranks to the positions in the vec
+        for (rank, id) in new_order.iter().enumerate() {
+            self.roles.get_mut(id).unwrap().rank = rank as i64;
+        }
+
+        db.update_server(
+            &self.id,
+            &PartialServer {
+                roles: Some(self.roles.clone()),
+                ..Default::default()
+            },
+            Vec::new(),
+        )
+        .await?;
+
+        // Publish bulk update event
+        EventV1::ServerRoleRanksUpdate {
+            id: self.id.clone(),
+            ranks: new_order,
+        }
+        .p(self.id.clone())
+        .await;
+
+        Ok(())
+    }
 }
 
 impl Role {

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

@@ -2,6 +2,7 @@ use revolt_result::Result;
 
 use crate::{FieldsRole, FieldsServer, PartialRole, PartialServer, Role, Server};
 
+#[cfg(feature = "mongodb")]
 mod mongodb;
 mod reference;
 

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

@@ -2,6 +2,7 @@ use revolt_result::Result;
 
 use crate::UserSettings;
 
+#[cfg(feature = "mongodb")]
 mod mongodb;
 mod reference;
 

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

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

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

@@ -705,6 +705,8 @@ impl User {
         duration_days: Option<usize>,
         reason: Option<Vec<String>>,
     ) -> Result<()> {
+        // TODO: authifier Error should implement Error
+
         let authifier = db.clone().to_authifier().await;
         let mut account = authifier
             .database

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

@@ -1,8 +1,10 @@
 use authifier::models::Session;
+use iso8601_timestamp::Timestamp;
 use revolt_result::Result;
 
 use crate::{FieldsUser, PartialUser, RelationshipStatus, User};
 
+#[cfg(feature = "mongodb")]
 mod mongodb;
 mod reference;
 
@@ -61,4 +63,6 @@ pub trait AbstractUsers: Sync + Send {
 
     /// Remove push subscription for a session by session id (TODO: remove)
     async fn remove_push_subscription_by_session_id(&self, session_id: &str) -> Result<()>;
+
+    async fn update_session_last_seen(&self, session_id: &str, when: Timestamp) -> Result<()>;
 }

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

@@ -1,6 +1,7 @@
 use ::mongodb::options::{Collation, CollationStrength, FindOneOptions, FindOptions};
 use authifier::models::Session;
 use futures::StreamExt;
+use iso8601_timestamp::Timestamp;
 use revolt_result::Result;
 
 use crate::DocumentId;
@@ -211,16 +212,34 @@ impl AbstractUsers for MongoDb {
         partial: &PartialUser,
         remove: Vec<FieldsUser>,
     ) -> Result<()> {
-        query!(
-            self,
-            update_one_by_id,
-            COL,
-            id,
-            partial,
-            remove.iter().map(|x| x as &dyn IntoDocumentPath).collect(),
-            None
-        )
-        .map(|_| ())
+        if remove.contains(&FieldsUser::StatusText) && partial.status.is_some() {
+            // stupid-ass workaround to fix mongo conflicting the same item
+            let _: Result<()> = query!(
+                self,
+                update_one_by_id,
+                COL,
+                id,
+                PartialUser {
+                    ..Default::default()
+                },
+                remove.iter().map(|x| x as &dyn IntoDocumentPath).collect(),
+                None
+            )
+            .map(|_| ());
+
+            query!(self, update_one_by_id, COL, id, partial, vec![], None).map(|_| ())
+        } else {
+            query!(
+                self,
+                update_one_by_id,
+                COL,
+                id,
+                partial,
+                remove.iter().map(|x| x as &dyn IntoDocumentPath).collect(),
+                None
+            )
+            .map(|_| ())
+        }
     }
 
     /// Set relationship with another user
@@ -317,7 +336,26 @@ impl AbstractUsers for MongoDb {
             )
             .await
             .map(|_| ())
-            .map_err(|_| create_database_error!("update_one", COL))
+            .map_err(|_| create_database_error!("update_one", "sessions"))
+    }
+
+    async fn update_session_last_seen(&self, session_id: &str, when: Timestamp) -> Result<()> {
+        let formatted: &str = &when.format();
+
+        self.col::<Session>("sessions")
+            .update_one(
+                doc! {
+                    "_id": session_id
+                },
+                doc! {
+                    "$set": {
+                        "last_seen": formatted
+                    }
+                },
+            )
+            .await
+            .map(|_| ())
+            .map_err(|_| create_database_error!("update_one", "sessions"))
     }
 }
 

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

@@ -1,4 +1,5 @@
 use authifier::models::Session;
+use iso8601_timestamp::Timestamp;
 use revolt_result::Result;
 
 use crate::{FieldsUser, PartialUser, RelationshipStatus, User};
@@ -168,4 +169,8 @@ impl AbstractUsers for ReferenceDb {
     async fn remove_push_subscription_by_session_id(&self, _session_id: &str) -> Result<()> {
         todo!()
     }
+
+    async fn update_session_last_seen(&self, _session_id: &str, _when: Timestamp) -> Result<()> {
+        todo!()
+    }
 }

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

@@ -38,6 +38,7 @@ impl<'r> FromRequest<'r> for User {
         if let Some(user) = user {
             Outcome::Success(user.clone())
         } else {
+            request.local_cache(|| Some(create_error!(InvalidSession)));
             Outcome::Error((Status::Unauthorized, authifier::Error::InvalidSession))
         }
     }

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

@@ -4,7 +4,7 @@ use once_cell::sync::Lazy;
 
 use crate::events::client::EventV1;
 
-static Q: Lazy<(Sender<AuthifierEvent>, Receiver<AuthifierEvent>)> = Lazy::new(|| unbounded());
+static Q: Lazy<(Sender<AuthifierEvent>, Receiver<AuthifierEvent>)> = Lazy::new(unbounded);
 
 /// Get sender
 pub fn sender() -> Sender<AuthifierEvent> {

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

@@ -15,8 +15,7 @@ impl crate::Bot {
             avatar: user.avatar.map(|x| x.id).unwrap_or_default(),
             description: user
                 .profile
-                .map(|profile| profile.content)
-                .flatten()
+                .and_then(|profile| profile.content)
                 .unwrap_or_default(),
         }
     }
@@ -1114,7 +1113,7 @@ impl crate::User {
     }
 
     /// Convert user object into user model without presence information
-    pub async fn into_known_static<'a>(self, is_online: bool) -> User {
+    pub async fn into_known_static(self, is_online: bool) -> User {
         let badges = self.get_badges().await;
 
         User {

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

@@ -54,7 +54,7 @@ use revolt_rocket_okapi::{
 use schemars::schema::{InstanceType, SchemaObject, SingleOrVec};
 
 #[cfg(feature = "rocket-impl")]
-impl<'r> OpenApiFromRequest<'r> for IdempotencyKey {
+impl OpenApiFromRequest<'_> for IdempotencyKey {
     fn from_request_input(
         _gen: &mut OpenApiGenerator,
         _name: String,
@@ -113,6 +113,8 @@ impl<'r> FromRequest<'r> for IdempotencyKey {
             let idempotency = IdempotencyKey { key };
             let mut cache = TOKEN_CACHE.lock().await;
             if cache.get(&idempotency.key).is_some() {
+                request.local_cache(|| Some(create_error!(DuplicateNonce)));
+
                 return Outcome::Error((Status::Conflict, create_error!(DuplicateNonce)));
             }
 

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

@@ -104,7 +104,7 @@ impl PermissionQuery for DatabasePermissionQuery<'_> {
                 .unwrap_or_default();
 
             self.cached_mutual_connection = Some(value);
-            matches!(value, true)
+            value
         } else {
             false
         }

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

@@ -14,41 +14,40 @@ use crate::{
 };
 
 /// Reference to some object in the database
-#[derive(Serialize, Deserialize)]
-pub struct Reference {
+pub struct Reference<'a> {
     /// Id of object
-    pub id: String,
+    pub id: &'a str,
 }
 
-impl Reference {
+impl<'a> Reference<'a> {
     /// Create a Ref from an unchecked string
-    pub fn from_unchecked(id: String) -> Reference {
+    pub fn from_unchecked(id: &'a str) -> Reference<'a> {
         Reference { id }
     }
 
     /// Fetch ban from Ref
     pub async fn as_ban(&self, db: &Database, server: &str) -> Result<ServerBan> {
-        db.fetch_ban(server, &self.id).await
+        db.fetch_ban(server, self.id).await
     }
 
     /// Fetch bot from Ref
     pub async fn as_bot(&self, db: &Database) -> Result<Bot> {
-        db.fetch_bot(&self.id).await
+        db.fetch_bot(self.id).await
     }
 
     /// Fetch emoji from Ref
     pub async fn as_emoji(&self, db: &Database) -> Result<Emoji> {
-        db.fetch_emoji(&self.id).await
+        db.fetch_emoji(self.id).await
     }
 
     /// Fetch channel from Ref
     pub async fn as_channel(&self, db: &Database) -> Result<Channel> {
-        db.fetch_channel(&self.id).await
+        db.fetch_channel(self.id).await
     }
 
     /// Fetch invite from Ref or create invite to server if discoverable
     pub async fn as_invite(&self, db: &Database) -> Result<Invite> {
-        if ulid::Ulid::from_str(&self.id).is_ok() {
+        if ulid::Ulid::from_str(self.id).is_ok() {
             let server = self.as_server(db).await?;
             if !server.discoverable {
                 return Err(create_error!(NotFound));
@@ -65,18 +64,18 @@ impl Reference {
                     .ok_or(create_error!(NotFound))?,
             })
         } else {
-            db.fetch_invite(&self.id).await
+            db.fetch_invite(self.id).await
         }
     }
 
     /// Fetch message from Ref
     pub async fn as_message(&self, db: &Database) -> Result<Message> {
-        db.fetch_message(&self.id).await
+        db.fetch_message(self.id).await
     }
 
     /// Fetch message from Ref and validate channel
     pub async fn as_message_in_channel(&self, db: &Database, channel: &str) -> Result<Message> {
-        let msg = db.fetch_message(&self.id).await?;
+        let msg = db.fetch_message(self.id).await?;
         if msg.channel != channel {
             return Err(create_error!(NotFound));
         }
@@ -86,36 +85,36 @@ impl Reference {
 
     /// Fetch member from Ref
     pub async fn as_member(&self, db: &Database, server: &str) -> Result<Member> {
-        db.fetch_member(server, &self.id).await
+        db.fetch_member(server, self.id).await
     }
 
     /// Fetch server from Ref
     pub async fn as_server(&self, db: &Database) -> Result<Server> {
-        db.fetch_server(&self.id).await
+        db.fetch_server(self.id).await
     }
 
     /// Fetch user from Ref
     pub async fn as_user(&self, db: &Database) -> Result<User> {
-        db.fetch_user(&self.id).await
+        db.fetch_user(self.id).await
     }
 
     /// Fetch webhook from Ref
     pub async fn as_webhook(&self, db: &Database) -> Result<Webhook> {
-        db.fetch_webhook(&self.id).await
+        db.fetch_webhook(self.id).await
     }
 }
 
 #[cfg(feature = "rocket-impl")]
-impl<'r> FromParam<'r> for Reference {
+impl<'r> FromParam<'r> for Reference<'r> {
     type Error = &'r str;
 
     fn from_param(param: &'r str) -> Result<Self, Self::Error> {
-        Ok(Reference::from_unchecked(param.into()))
+        Ok(Reference::from_unchecked(param))
     }
 }
 
 #[cfg(feature = "rocket-impl")]
-impl JsonSchema for Reference {
+impl<'a> JsonSchema for Reference<'a> {
     fn schema_name() -> String {
         "Id".to_string()
     }

crates/core/files/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "revolt-files"
-version = "0.8.7"
+version = "0.8.8"
 edition = "2021"
 license = "AGPL-3.0-or-later"
 authors = ["Paul Makles <me@insrt.uk>"]
@@ -14,16 +14,16 @@ imagesize = "0.13.0"
 tempfile = "3.12.0"
 
 base64 = "0.22.1"
-aes-gcm = "0.10.3"
+aes-gcm = { version = "0.10.3", features = ["std"] }
 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.7", path = "../config", features = [
+revolt-config = { version = "0.8.8", path = "../config", features = [
     "report-macros",
 ] }
-revolt-result = { version = "0.8.7", path = "../result" }
+revolt-result = { version = "0.8.8", path = "../result", features = ["sentry"] }
 
 # image processing
 jxl-oxide = "0.8.1"

crates/core/files/src/lib.rs

@@ -6,7 +6,7 @@ use aes_gcm::{
 };
 use image::{DynamicImage, ImageBuffer};
 use revolt_config::{config, report_internal_error, FilesS3};
-use revolt_result::{create_error, Result};
+use revolt_result::{create_error, Result, ToRevoltError};
 
 use aws_sdk_s3::{
     config::{Credentials, Region},
@@ -55,13 +55,12 @@ pub async fn fetch_from_s3(bucket_id: &str, path: &str, nonce: &str) -> Result<V
 
     // Send a request for the file
     let mut obj =
-        report_internal_error!(client.get_object().bucket(bucket_id).key(path).send().await)?;
+        client.get_object().bucket(bucket_id).key(path).send().await.to_internal_error()?;
 
     // Read the file from remote
     let mut buf = vec![];
     while let Some(bytes) = obj.body.next().await {
-        let data = report_internal_error!(bytes)?;
-        report_internal_error!(buf.write_all(&data))?;
+        buf.write_all(&bytes.to_internal_error()?).to_internal_error()?;
         // is there a more efficient way to do this?
         // we just want the Vec<u8>
     }
@@ -78,7 +77,7 @@ pub async fn fetch_from_s3(bucket_id: &str, path: &str, nonce: &str) -> Result<V
     // Decrypt the file
     create_cipher(&config.files.encryption_key)
         .decrypt_in_place(nonce, b"", &mut buf)
-        .map_err(|_| create_error!(InternalError))?;
+        .to_internal_error()?;
 
     Ok(buf)
 }
@@ -97,18 +96,17 @@ pub async fn upload_to_s3(bucket_id: &str, path: &str, buf: &[u8]) -> Result<Str
     // Encrypt the file in place
     create_cipher(&config.files.encryption_key)
         .encrypt_in_place(&nonce, b"", &mut buf)
-        .map_err(|_| create_error!(InternalError))?;
+        .to_internal_error()?;
 
     // Upload the file to remote
-    report_internal_error!(
-        client
-            .put_object()
-            .bucket(bucket_id)
-            .key(path)
-            .body(buf.into())
-            .send()
-            .await
-    )?;
+    client
+        .put_object()
+        .bucket(bucket_id)
+        .key(path)
+        .body(buf.into())
+        .send()
+        .await
+        .to_internal_error()?;
 
     Ok(BASE64_STANDARD.encode(nonce))
 }
@@ -118,14 +116,13 @@ 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
-    )?;
+    client
+        .delete_object()
+        .bucket(bucket_id)
+        .key(path)
+        .send()
+        .await
+        .to_internal_error()?;
 
     Ok(())
 }
@@ -145,8 +142,7 @@ pub fn image_size(f: &NamedTempFile) -> Option<(usize, usize)> {
 pub fn image_size_vec(v: &[u8], mime: &str) -> Option<(usize, usize)> {
     match mime {
         "image/svg+xml" => {
-            let tree =
-                report_internal_error!(usvg::Tree::from_data(v, &Default::default())).ok()?;
+            let tree = usvg::Tree::from_data(v, &Default::default()).to_internal_error().ok()?;
 
             let size = tree.size();
             Some((size.width() as usize, size.height() as usize))
@@ -221,9 +217,9 @@ pub fn decode_image<R: Read + BufRead + Seek>(reader: &mut R, mime: &str) -> Res
         "image/svg+xml" => {
             // usvg doesn't support Read trait so copy to buffer
             let mut buf = Vec::new();
-            report_internal_error!(reader.read_to_end(&mut buf))?;
+            reader.read_to_end(&mut buf).to_internal_error()?;
 
-            let tree = report_internal_error!(usvg::Tree::from_data(&buf, &Default::default()))?;
+            let tree = usvg::Tree::from_data(&buf, &Default::default()).to_internal_error()?;
             let size = tree.size();
             let mut pixmap = Pixmap::new(size.width() as u32, size.height() as u32)
                 .ok_or_else(|| create_error!(ImageProcessingFailed))?;
@@ -241,10 +237,11 @@ pub fn decode_image<R: Read + BufRead + Seek>(reader: &mut R, mime: &str) -> Res
             ))
         }
         // Check if we can read using image-rs crate
-        _ => report_internal_error!(report_internal_error!(
-            image::ImageReader::new(reader).with_guessed_format()
-        )?
-        .decode()),
+        _ => image::ImageReader::new(reader)
+            .with_guessed_format()
+            .to_internal_error()?
+            .decode()
+            .to_internal_error()
     }
 }
 

crates/core/models/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "revolt-models"
-version = "0.8.7"
+version = "0.8.8"
 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.7", path = "../config" }
-revolt-permissions = { version = "0.8.7", path = "../permissions" }
+revolt-config = { version = "0.8.8", path = "../config" }
+revolt-permissions = { version = "0.8.8", path = "../permissions" }
 
 # Utility
 regex = "1.11"

crates/core/models/src/v0/bots.rs

@@ -132,8 +132,8 @@ auto_derived!(
         #[cfg_attr(feature = "validator", validate(length(min = 1, max = 2048)))]
         pub interactions_url: Option<String>,
         /// Fields to remove from bot object
-        #[cfg_attr(feature = "validator", validate(length(min = 1)))]
-        pub remove: Option<Vec<FieldsBot>>,
+        #[cfg_attr(feature = "serde", serde(default))]
+        pub remove: Vec<FieldsBot>,
     }
 
     /// Where we are inviting a bot to

crates/core/models/src/v0/channels.rs

@@ -207,7 +207,7 @@ auto_derived!(
 
         /// Fields to remove from channel
         #[cfg_attr(feature = "serde", serde(default))]
-        pub remove: Option<Vec<FieldsChannel>>,
+        pub remove: Vec<FieldsChannel>,
     }
 
     /// Create new group
@@ -310,14 +310,14 @@ impl Channel {
     /// This returns a Result because the recipient name can't be determined here without a db call,
     /// which can't be done since this is models, which can't reference the database crate.
     ///
-    /// If it returns Err, you need to fetch the name from the db.
-    pub fn name(&self) -> Result<&str, ()> {
+    /// If it returns None, you need to fetch the name from the db.
+    pub fn name(&self) -> Option<&str> {
         match self {
-            Channel::DirectMessage { .. } => Err(()),
-            Channel::SavedMessages { .. } => Ok("Saved Messages"),
+            Channel::DirectMessage { .. } => None,
+            Channel::SavedMessages { .. } => Some("Saved Messages"),
             Channel::TextChannel { name, .. }
             | Channel::Group { name, .. }
-            | Channel::VoiceChannel { name, .. } => Ok(name),
+            | Channel::VoiceChannel { name, .. } => Some(name),
         }
     }
 }

crates/core/models/src/v0/messages.rs

@@ -215,7 +215,7 @@ auto_derived!(
     #[derive(Default)]
     #[cfg_attr(feature = "validator", derive(Validate))]
     pub struct SendableEmbed {
-        #[cfg_attr(feature = "validator", validate(length(min = 1, max = 128)))]
+        #[cfg_attr(feature = "validator", validate(length(min = 1, max = 256)))]
         pub icon_url: Option<String>,
         #[cfg_attr(feature = "validator", validate(length(min = 1, max = 256)))]
         pub url: Option<String>,

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

@@ -7,6 +7,7 @@ mod embeds;
 mod emojis;
 mod files;
 mod messages;
+mod onboard;
 mod policy_changes;
 mod safety_reports;
 mod server_bans;
@@ -24,6 +25,7 @@ pub use embeds::*;
 pub use emojis::*;
 pub use files::*;
 pub use messages::*;
+pub use onboard::*;
 pub use policy_changes::*;
 pub use safety_reports::*;
 pub use server_bans::*;

crates/core/models/src/v0/onboard.rs

@@ -0,0 +1,15 @@
+auto_derived!(
+    /// # New User Data
+    #[derive(validator::Validate)]
+    pub struct DataOnboard {
+        /// New username which will be used to identify the user on the platform
+        #[validate(length(min = 2, max = 32), regex = "super::RE_USERNAME")]
+        pub username: String,
+    }
+
+    /// # Onboarding Status
+    pub struct DataHello {
+        /// Whether onboarding is required
+        pub onboarding: bool,
+    }
+);

crates/core/models/src/v0/safety_reports.rs

@@ -1,6 +1,17 @@
 use iso8601_timestamp::Timestamp;
 
 auto_derived!(
+    /// # Report Data
+    #[derive(validator::Validate)]
+    pub struct DataReportContent {
+        /// Content being reported
+        pub content: ReportedContent,
+        /// Additional report description
+        #[validate(length(min = 0, max = 1000))]
+        #[serde(default)]
+        pub additional_context: String,
+    }
+
     /// User-generated platform moderation report
     pub struct Report {
         /// Unique Id

crates/core/models/src/v0/server_members.rs

@@ -124,7 +124,7 @@ auto_derived!(
         /// 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>>,
+        #[cfg_attr(feature = "serde", serde(default))]
+        pub remove: Vec<FieldsMember>,
     }
 );

crates/core/models/src/v0/servers.rs

@@ -1,4 +1,4 @@
-use super::{Channel, File, RE_COLOUR};
+use super::{Channel, File, Member, User, RE_COLOUR};
 
 use revolt_permissions::{Override, OverrideField};
 use std::collections::HashMap;
@@ -175,6 +175,8 @@ auto_derived!(
         /// Ranking position
         ///
         /// Smaller values take priority.
+        ///
+        /// **Removed** - no effect, use the edit server role positions route
         pub rank: Option<i64>,
     }
 
@@ -247,8 +249,8 @@ auto_derived!(
         pub analytics: Option<bool>,
 
         /// Fields to remove from server object
-        #[cfg_attr(feature = "validator", validate(length(min = 1)))]
-        pub remove: Option<Vec<FieldsServer>>,
+        #[cfg_attr(feature = "serde", serde(default))]
+        pub remove: Vec<FieldsServer>,
     }
 
     /// New role information
@@ -267,11 +269,11 @@ auto_derived!(
         pub hoist: Option<bool>,
         /// Ranking position
         ///
-        /// Smaller values take priority.
+        /// **Removed** - no effect, use the edit server role positions route
         pub rank: Option<i64>,
         /// Fields to remove from role object
-        #[cfg_attr(feature = "validator", validate(length(min = 1)))]
-        pub remove: Option<Vec<FieldsRole>>,
+        #[cfg_attr(feature = "serde", serde(default))]
+        pub remove: Vec<FieldsRole>,
     }
 
     /// New role permissions
@@ -286,4 +288,27 @@ auto_derived!(
         /// Whether to not send a leave message
         pub leave_silently: Option<bool>,
     }
+
+    /// New role positions
+    pub struct DataEditRoleRanks {
+        pub ranks: Vec<String>,
+    }
+
+    /// # Query Parameters
+    #[derive(FromForm)]
+    pub struct OptionsQueryMembers {
+        /// String to search for
+        pub query: String,
+
+        /// Discourage use of this API
+        pub experimental_api: bool,
+    }
+
+    /// # Query members by name
+    pub struct MemberQueryResponse {
+        /// List of members
+        pub members: Vec<Member>,
+        /// List of users
+        pub users: Vec<User>,
+    }
 );

crates/core/models/src/v0/users.rs

@@ -245,8 +245,8 @@ auto_derived!(
         pub flags: Option<i32>,
 
         /// Fields to remove from user object
-        #[cfg_attr(feature = "validator", validate(length(min = 1)))]
-        pub remove: Option<Vec<FieldsUser>>,
+        #[cfg_attr(feature = "serde", serde(default))]
+        pub remove: Vec<FieldsUser>,
     }
 
     /// User flag reponse
@@ -275,6 +275,17 @@ auto_derived!(
         /// Username and discriminator combo separated by #
         pub username: String,
     }
+
+    /// # Username Information
+    #[derive(Validate)]
+    pub struct DataChangeUsername {
+        /// New username
+        #[validate(length(min = 2, max = 32), regex = "super::RE_USERNAME")]
+        pub username: String,
+        /// Current account password
+        #[validate(length(min = 8, max = 1024))]
+        pub password: String,
+    }
 );
 
 pub trait CheckRelationship {

crates/core/parser/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "revolt-parser"
-version = "0.8.7"
+version = "0.8.8"
 edition = "2021"
 license = "AGPL-3.0-or-later"
 description = "Revolt Backend: Message Parser"

crates/core/permissions/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "revolt-permissions"
-version = "0.8.7"
+version = "0.8.8"
 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.7", path = "../result" }
+revolt-result = { version = "0.8.8", path = "../result" }
 
 # Utility
 auto_ops = "0.3.0"

crates/core/presence/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "revolt-presence"
-version = "0.8.7"
+version = "0.8.8"
 edition = "2021"
 license = "AGPL-3.0-or-later"
 authors = ["Paul Makles <me@insrt.uk>"]
@@ -15,6 +15,9 @@ redis-is-patched = []
 # Async
 async-std = { version = "1.8.0", features = ["attributes"] }
 
+# Config for loading Redis URI
+revolt-config = { version = "0.8.8", path = "../config" }
+
 [dependencies]
 # Utility
 log = "0.4.17"

crates/core/presence/src/lib.rs

@@ -197,6 +197,8 @@ mod tests {
 
     #[async_std::test]
     async fn it_works() {
+        revolt_config::config().await;
+
         // Clear the region before we start the tests:
         clear_region(None).await;
 

crates/core/result/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "revolt-result"
-version = "0.8.7"
+version = "0.8.8"
 edition = "2021"
 license = "MIT"
 authors = ["Paul Makles <me@insrt.uk>"]
@@ -15,6 +15,7 @@ utoipa = ["dep:utoipa"]
 rocket = ["dep:rocket", "dep:serde_json"]
 axum = ["dep:axum", "dep:serde_json"]
 okapi = ["dep:revolt_rocket_okapi", "dep:revolt_okapi", "schemas"]
+sentry = ["dep:sentry"]
 
 default = ["serde"]
 
@@ -34,3 +35,6 @@ revolt_okapi = { version = "0.9.1", optional = true }
 
 # Axum
 axum = { version = "0.7.5", optional = true }
+
+# Sentry
+sentry = { version = "0.31.5", optional = true }

crates/core/result/src/axum.rs

@@ -2,10 +2,9 @@ use axum::{http::StatusCode, response::IntoResponse, Json};
 
 use crate::{Error, ErrorType};
 
-/// HTTP response builder for Error enum
-impl IntoResponse for Error {
-    fn into_response(self) -> axum::response::Response {
-        let status = match self.error_type {
+impl Error {
+    pub fn axum_status(&self) -> StatusCode {
+        match self.error_type {
             ErrorType::LabelMe => StatusCode::INTERNAL_SERVER_ERROR,
 
             ErrorType::AlreadyOnboarded => StatusCode::FORBIDDEN,
@@ -70,11 +69,15 @@ impl IntoResponse for Error {
             ErrorType::InvalidProperty => StatusCode::BAD_REQUEST,
             ErrorType::InvalidSession => StatusCode::UNAUTHORIZED,
             ErrorType::NotAuthenticated => StatusCode::UNAUTHORIZED,
+            ErrorType::Conflict => StatusCode::CONFLICT,
             ErrorType::DuplicateNonce => StatusCode::CONFLICT,
             ErrorType::VosoUnavailable => StatusCode::BAD_REQUEST,
             ErrorType::NotFound => StatusCode::NOT_FOUND,
             ErrorType::NoEffect => StatusCode::OK,
-            ErrorType::FailedValidation { .. } => StatusCode::BAD_REQUEST,
+            ErrorType::IOError => StatusCode::BAD_REQUEST,
+            ErrorType::UnprocessableEntity => StatusCode::UNPROCESSABLE_ENTITY,
+            ErrorType::DeserializationError { .. } => StatusCode::UNPROCESSABLE_ENTITY,
+            ErrorType::FailedValidation { .. } => StatusCode::UNPROCESSABLE_ENTITY,
             ErrorType::InvalidFlagValue => StatusCode::BAD_REQUEST,
             ErrorType::FeatureDisabled { .. } => StatusCode::BAD_REQUEST,
 
@@ -84,8 +87,13 @@ impl IntoResponse for Error {
             ErrorType::FileTypeNotAllowed => StatusCode::BAD_REQUEST,
             ErrorType::ImageProcessingFailed => StatusCode::INTERNAL_SERVER_ERROR,
             ErrorType::NoEmbedData => StatusCode::BAD_REQUEST,
-        };
-
-        (status, Json(&self)).into_response()
+        }
+    }
+}
+
+/// HTTP response builder for Error enum
+impl IntoResponse for Error {
+    fn into_response(self) -> axum::response::Response {
+        (self.axum_status(), Json(&self)).into_response()
     }
 }

crates/core/result/src/lib.rs

@@ -1,3 +1,4 @@
+use std::panic::Location;
 use std::fmt::Display;
 
 #[cfg(feature = "serde")]
@@ -151,9 +152,15 @@ pub enum ErrorType {
     InvalidSession,
     InvalidFlagValue,
     NotAuthenticated,
+    Conflict,
     DuplicateNonce,
     NotFound,
     NoEffect,
+    IOError,
+    UnprocessableEntity,
+    DeserializationError {
+        error: String,
+    },
     FailedValidation {
         error: String,
     },
@@ -174,7 +181,7 @@ pub enum ErrorType {
     // ? Feature flag disabled in the config
     FeatureDisabled {
         feature: String,
-    },
+    }
 }
 
 #[macro_export]
@@ -197,6 +204,62 @@ macro_rules! create_database_error {
     };
 }
 
+pub trait ToRevoltError<T>: Sized {
+    fn capture_error(self) -> Self;
+
+    #[track_caller]
+    fn to_internal_error(self) -> Result<T, Error>;
+}
+
+impl<T, E: std::error::Error> ToRevoltError<T> for Result<T, E> {
+    fn capture_error(self) -> Self {
+
+        #[allow(unused_variables)]
+        self.inspect_err(|e| {
+            #[cfg(feature = "sentry")]
+            sentry::capture_error(e);
+        })
+    }
+
+    #[track_caller]
+    fn to_internal_error(self) -> Result<T, Error> {
+        let loc = Location::caller();
+
+        self
+            .capture_error()
+            .map_err(|_| {
+                Error {
+                    error_type: ErrorType::InternalError,
+                    location: format!("{}:{}:{}", loc.file(), loc.line(), loc.column())
+                }
+            })
+    }
+}
+
+impl<T: std::error::Error> ToRevoltError<T> for Option<T> {
+    fn capture_error(self) -> Self {
+        #[allow(unused_variables)]
+        self.inspect(|e| {
+            #[cfg(feature = "sentry")]
+            sentry::capture_error(e);
+        })
+    }
+
+    #[track_caller]
+    fn to_internal_error(self) -> Result<T, Error> {
+        let loc = Location::caller();
+
+        self
+        .capture_error()
+        .ok_or_else(|| {
+            Error {
+                error_type: ErrorType::InternalError,
+                location: format!("{}:{}:{}", loc.file(), loc.line(), loc.column())
+            }
+        })
+    }
+}
+
 #[cfg(test)]
 mod tests {
     use crate::ErrorType;

crates/core/result/src/rocket.rs

@@ -8,10 +8,9 @@ use rocket::{
 
 use crate::{Error, ErrorType};
 
-/// HTTP response builder for Error enum
-impl<'r> Responder<'r, 'static> for Error {
-    fn respond_to(self, _: &'r Request<'_>) -> response::Result<'static> {
-        let status = match self.error_type {
+impl Error {
+    pub fn rocket_status(&self) -> Status {
+        match self.error_type {
             ErrorType::LabelMe => Status::InternalServerError,
 
             ErrorType::AlreadyOnboarded => Status::Forbidden,
@@ -77,11 +76,15 @@ impl<'r> Responder<'r, 'static> for Error {
             ErrorType::InvalidProperty => Status::BadRequest,
             ErrorType::InvalidSession => Status::Unauthorized,
             ErrorType::NotAuthenticated => Status::Unauthorized,
+            ErrorType::Conflict => Status::Conflict,
             ErrorType::DuplicateNonce => Status::Conflict,
             ErrorType::VosoUnavailable => Status::BadRequest,
             ErrorType::NotFound => Status::NotFound,
             ErrorType::NoEffect => Status::Ok,
-            ErrorType::FailedValidation { .. } => Status::BadRequest,
+            ErrorType::IOError => Status::BadRequest,
+            ErrorType::UnprocessableEntity => Status::UnprocessableEntity,
+            ErrorType::DeserializationError { .. } => Status::UnprocessableEntity,
+            ErrorType::FailedValidation { .. } => Status::UnprocessableEntity,
             ErrorType::FeatureDisabled { .. } => Status::BadRequest,
 
             ErrorType::ProxyError => Status::BadRequest,
@@ -90,8 +93,13 @@ impl<'r> Responder<'r, 'static> for Error {
             ErrorType::FileTypeNotAllowed => Status::BadRequest,
             ErrorType::ImageProcessingFailed => Status::InternalServerError,
             ErrorType::NoEmbedData => Status::BadRequest,
-        };
+        }
+    }
+}
 
+/// HTTP response builder for Error enum
+impl<'r> Responder<'r, 'static> for Error {
+    fn respond_to(self, _: &'r Request<'_>) -> response::Result<'static> {
         // Serialize the error data structure into JSON.
         let string = serde_json::to_string(&self).unwrap();
 
@@ -99,7 +107,7 @@ impl<'r> Responder<'r, 'static> for Error {
         Response::build()
             .sized_body(string.len(), Cursor::new(string))
             .header(ContentType::new("application", "json"))
-            .status(status)
+            .status(self.rocket_status())
             .ok()
     }
 }

crates/daemons/crond/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "revolt-crond"
-version = "0.8.7"
+version = "0.8.8"
 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.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" }
+revolt-database = { version = "0.8.8", path = "../../core/database" }
+revolt-result = { version = "0.8.8", path = "../../core/result" }
+revolt-config = { version = "0.8.8", path = "../../core/config" }
+revolt-files = { version = "0.8.8", path = "../../core/files" }

crates/daemons/crond/src/main.rs

@@ -1,19 +1,32 @@
-use revolt_config::configure;
-use revolt_database::DatabaseInfo;
+use std::{future::Future, time::Duration};
+
+use revolt_config::{configure, capture_error};
+use revolt_database::{Database, DatabaseInfo};
 use revolt_result::Result;
 use tasks::{file_deletion, prune_dangling_files};
-use tokio::try_join;
+use tokio::{join, time::sleep};
 
 pub mod tasks;
 
+pub async fn cron_task_wrapper<Fut: Future<Output = Result<()>>>(func: fn(Database) -> Fut, db: Database) {
+    loop {
+        if let Err(error) = func(db.clone()).await {
+            log::error!("cron task failed unexpectidly: {error:?}\nRetrying after 60s");
+            capture_error(&error);
+        }
+
+        sleep(Duration::from_secs(60)).await;
+    }
+}
+
 #[tokio::main]
-async fn main() -> Result<()> {
+async fn main() {
     configure!(crond);
 
     let db = DatabaseInfo::Auto.connect().await.expect("database");
-    try_join!(
-        file_deletion::task(db.clone()),
-        prune_dangling_files::task(db)
-    )
-    .map(|_| ())
+
+    join!(
+        cron_task_wrapper(file_deletion::task, db.clone()),
+        cron_task_wrapper(prune_dangling_files::task, db.clone()),
+    );
 }

crates/daemons/pushd/Cargo.toml

@@ -1,19 +1,20 @@
 [package]
 name = "revolt-pushd"
-version = "0.8.7"
+version = "0.8.8"
 edition = "2021"
 license = "AGPL-3.0-or-later"
 
 [dependencies]
-revolt-result = { version = "0.8.7", path = "../../core/result" }
-revolt-config = { version = "0.8.7", path = "../../core/config", features = [
+revolt-result = { version = "0.8.8", path = "../../core/result" }
+revolt-config = { version = "0.8.8", path = "../../core/config", features = [
     "report-macros",
+    "anyhow"
 ] }
-revolt-database = { version = "0.8.7", path = "../../core/database" }
-revolt-models = { version = "0.8.7", path = "../../core/models", features = [
+revolt-database = { version = "0.8.8", path = "../../core/database" }
+revolt-models = { version = "0.8.8", path = "../../core/models", features = [
     "validator",
 ] }
-revolt-presence = { version = "0.8.7", path = "../../core/presence", features = [
+revolt-presence = { version = "0.8.8", path = "../../core/presence", features = [
     "redis-is-patched",
 ] }
 

crates/daemons/pushd/src/consumers/inbound/ack.rs

@@ -123,24 +123,26 @@ impl AsyncConsumer for AckConsumer {
                     token: session.subscription.as_ref().unwrap().auth.clone(),
                     extras: Default::default(),
                 };
-                let raw_service_payload = serde_json::to_string(&service_payload);
 
-                if let Ok(p) = raw_service_payload {
-                    let args = BasicPublishArguments::new(
-                        config.pushd.exchange.as_str(),
-                        config.pushd.apn.queue.as_str(),
-                    )
-                    .finish();
+                match serde_json::to_string(&service_payload) {
+                    Ok(p) => {
+                        let args = BasicPublishArguments::new(
+                            config.pushd.exchange.as_str(),
+                            config.pushd.apn.queue.as_str(),
+                        )
+                        .finish();
 
-                    log::debug!(
-                        "Publishing ack to apn session {}",
-                        session.subscription.as_ref().unwrap().auth
-                    );
+                        log::debug!(
+                            "Publishing ack to apn session {}",
+                            session.subscription.as_ref().unwrap().auth
+                        );
 
-                    publish_message(self, p.into(), args).await;
-                } else {
-                    log::warn!("Failed to serialize ack badge update payload!");
-                    revolt_config::capture_error(&raw_service_payload.unwrap_err());
+                        publish_message(self, p.into(), args).await;
+                    },
+                    Err(e) => {
+                        log::warn!("Failed to serialize ack badge update payload!");
+                        revolt_config::capture_error(&e);
+                    }
                 }
             }
         }

crates/delta/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "revolt-delta"
-version = "0.8.7"
+version = "0.8.8"
 license = "AGPL-3.0-or-later"
 authors = ["Paul Makles <paulmakles@gmail.com>"]
 edition = "2018"
@@ -79,7 +79,7 @@ revolt-models = { path = "../core/models", features = [
     "rocket",
 ] }
 revolt-presence = { path = "../core/presence" }
-revolt-result = { path = "../core/result", features = ["rocket", "okapi"] }
+revolt-result = { path = "../core/result", features = ["rocket", "okapi", "sentry"] }
 revolt-permissions = { path = "../core/permissions", features = ["schemas"] }
 
 [build-dependencies]

crates/delta/fixtures/server_with_many_roles.json

@@ -0,0 +1,114 @@
+[
+  {
+    "_object_type": "User",
+    "_id": "__ID:0__",
+    "username": "Owner",
+    "last_acknowledged_policy_change": "2025-06-07T04:04:48+0000",
+    "discriminator": "0001"
+  },
+  {
+    "_object_type": "User",
+    "_id": "__ID:1__",
+    "username": "Moderator",
+    "last_acknowledged_policy_change": "2025-06-07T04:04:48+0000",
+    "discriminator": "0001"
+  },
+  {
+    "_object_type": "User",
+    "_id": "__ID:2__",
+    "username": "User",
+    "last_acknowledged_policy_change": "2025-06-07T04:04:48+0000",
+    "discriminator": "0001"
+  },
+  {
+    "_object_type": "Channel",
+    "_id": "__ID:3__",
+    "channel_type": "TextChannel",
+    "name": "General",
+    "server": "__ID:4__",
+    "default_permissions": {
+      "a": 0,
+      "d": 1048576
+    },
+    "role_permissions": {
+      "__ID:5__": {
+        "a": 1048576,
+        "d": 0
+      }
+    }
+  },
+  {
+    "_object_type": "Server",
+    "_id": "__ID:4__",
+    "owner": "__ID:0__",
+    "name": "Server",
+    "channels": [
+      "__ID:3__"
+    ],
+    "roles": {
+      "__ID:5__": {
+        "name": "Moderator",
+        "permissions": {
+          "a": 545270216,
+          "d": 0
+        },
+        "rank": 1
+      },
+      "__ID:6__": {
+        "name": "Owner",
+        "permissions": {
+          "a": 0,
+          "d": 0
+        },
+        "rank": 0
+      },
+      "__ID:7__": {
+        "name": "Lower Rank 1",
+        "permissions": {
+          "a": 0,
+          "d": 0
+        },
+        "rank": 2
+      },
+      "__ID:8__": {
+        "name": "Lower Rank 2",
+        "permissions": {
+          "a": 0,
+          "d": 0
+        },
+        "rank": 2
+      }
+    },
+    "default_permissions": 4000322560
+  },
+  {
+    "_object_type": "ServerMember",
+    "_id": {
+      "user": "__ID:0__",
+      "server": "__ID:4__"
+    },
+    "roles": [
+      "__ID:6__"
+    ],
+    "joined_at": 1698318340195
+  },
+  {
+    "_object_type": "ServerMember",
+    "_id": {
+      "user": "__ID:1__",
+      "server": "__ID:4__"
+    },
+    "roles": [
+      "__ID:5__"
+    ],
+    "joined_at": 1698318340195
+  },
+  {
+    "_object_type": "ServerMember",
+    "_id": {
+      "user": "__ID:2__",
+      "server": "__ID:4__"
+    },
+    "joined_at": 1698318340195
+  }
+]

crates/delta/src/main.rs

@@ -135,6 +135,7 @@ pub async fn web() -> Rocket<Build> {
         .manage(cors.clone())
         .attach(util::ratelimiter::RatelimitFairing)
         .attach(cors)
+        .register("/", util::catchers::all_catchers())
         .configure(rocket::Config {
             limits: rocket::data::Limits::default().limit("string", 5.megabytes()),
             address: Ipv4Addr::new(0, 0, 0, 0).into(),

crates/delta/src/routes/bots/create.rs

@@ -1,9 +1,8 @@
+use crate::util::json::{Json, Validate};
 use revolt_database::{Bot, Database, User};
 use revolt_models::v0;
-use revolt_result::{create_error, Result};
-use rocket::serde::json::Json;
+use revolt_result::Result;
 use rocket::State;
-use validator::Validate;
 
 /// # Create Bot
 ///
@@ -13,14 +12,9 @@ use validator::Validate;
 pub async fn create_bot(
     db: &State<Database>,
     user: User,
-    info: Json<v0::DataCreateBot>,
+    info: Validate<Json<v0::DataCreateBot>>,
 ) -> Result<Json<v0::BotWithUserResponse>> {
-    let info = info.into_inner();
-    info.validate().map_err(|error| {
-        create_error!(FailedValidation {
-            error: error.to_string()
-        })
-    })?;
+    let info = info.into_inner().into_inner();
 
     let (bot, user) = Bot::create(db, info.name, &user, None).await?;
     Ok(Json(v0::BotWithUserResponse {

crates/delta/src/routes/bots/delete.rs

@@ -11,7 +11,7 @@ use rocket_empty::EmptyResponse;
 pub async fn delete_bot(
     db: &State<Database>,
     user: User,
-    target: Reference,
+    target: Reference<'_>,
 ) -> Result<EmptyResponse> {
     let bot = target.as_bot(db).await?;
     if bot.owner != user.id {

crates/delta/src/routes/bots/edit.rs

@@ -3,8 +3,7 @@ use revolt_models::v0::{self, DataEditBot};
 use revolt_result::{create_error, Result};
 use rocket::State;
 
-use rocket::serde::json::Json;
-use validator::Validate;
+use crate::util::json::{Json, Validate};
 
 /// # Edit Bot
 ///
@@ -14,15 +13,10 @@ use validator::Validate;
 pub async fn edit_bot(
     db: &State<Database>,
     user: User,
-    target: Reference,
-    data: Json<DataEditBot>,
+    target: Reference<'_>,
+    data: Validate<Json<DataEditBot>>,
 ) -> Result<Json<v0::BotWithUserResponse>> {
-    let data = data.into_inner();
-    data.validate().map_err(|error| {
-        create_error!(FailedValidation {
-            error: error.to_string()
-        })
-    })?;
+    let data = data.into_inner().into_inner();
 
     let mut bot = target.as_bot(db).await?;
     if bot.owner != user.id {
@@ -37,7 +31,7 @@ pub async fn edit_bot(
     if data.public.is_none()
         && data.analytics.is_none()
         && data.interactions_url.is_none()
-        && data.remove.is_none()
+        && data.remove.is_empty()
     {
         return Ok(Json(v0::BotWithUserResponse {
             bot: bot.into(),
@@ -64,7 +58,6 @@ pub async fn edit_bot(
         db,
         partial,
         remove
-            .unwrap_or_default()
             .into_iter()
             .map(|v| v.into())
             .collect(),
@@ -100,7 +93,7 @@ mod test {
             .body(
                 json!(v0::DataEditBot {
                     public: Some(true),
-                    remove: Some(vec![FieldsBot::Token]),
+                    remove: vec![FieldsBot::Token],
                     ..Default::default()
                 })
                 .to_string(),

crates/delta/src/routes/bots/fetch.rs

@@ -1,7 +1,8 @@
 use revolt_database::{util::reference::Reference, Database, User};
 use revolt_models::v0::FetchBotResponse;
 use revolt_result::{create_error, Result};
-use rocket::{serde::json::Json, State};
+use rocket::State;
+use crate::util::json::Json;
 
 /// # Fetch Bot
 ///
@@ -11,7 +12,7 @@ use rocket::{serde::json::Json, State};
 pub async fn fetch_bot(
     db: &State<Database>,
     user: User,
-    bot: Reference,
+    bot: Reference<'_>,
 ) -> Result<Json<FetchBotResponse>> {
     if user.bot.is_some() {
         return Err(create_error!(IsBot));

crates/delta/src/routes/bots/fetch_owned.rs

@@ -2,7 +2,7 @@ use futures::future::join_all;
 use revolt_database::{Database, User};
 use revolt_models::v0::OwnedBotsResponse;
 use revolt_result::Result;
-use rocket::serde::json::Json;
+use crate::util::json::Json;
 use rocket::State;
 
 /// # Fetch Owned Bots

crates/delta/src/routes/bots/fetch_public.rs

@@ -2,7 +2,7 @@ use revolt_database::{util::reference::Reference, Database, User};
 use revolt_models::v0::PublicBot;
 use revolt_result::{create_error, Result};
 
-use rocket::serde::json::Json;
+use crate::util::json::Json;
 use rocket::State;
 
 /// # Fetch Public Bot
@@ -13,10 +13,10 @@ use rocket::State;
 pub async fn fetch_public_bot(
     db: &State<Database>,
     user: Option<User>,
-    target: Reference,
+    target: Reference<'_>,
 ) -> Result<Json<PublicBot>> {
-    let bot = db.fetch_bot(&target.id).await?;
-    if !bot.public && user.map_or(true, |x| x.id != bot.owner) {
+    let bot = db.fetch_bot(target.id).await?;
+    if !bot.public && user.is_none_or(|x| x.id != bot.owner) {
         return Err(create_error!(NotFound));
     }
 

crates/delta/src/routes/bots/invite.rs

@@ -8,7 +8,7 @@ use revolt_permissions::{
 use revolt_result::{create_error, Result};
 use rocket::State;
 
-use rocket::serde::json::Json;
+use crate::util::json::Json;
 use rocket_empty::EmptyResponse;
 
 /// # Invite Bot
@@ -20,7 +20,7 @@ pub async fn invite_bot(
     db: &State<Database>,
     amqp: &State<AMQP>,
     user: User,
-    target: Reference,
+    target: Reference<'_>,
     dest: Json<v0::InviteBotDestination>,
 ) -> Result<EmptyResponse> {
     if user.bot.is_some() {

crates/delta/src/routes/channels/channel_ack.rs

@@ -15,8 +15,8 @@ use rocket_empty::EmptyResponse;
 pub async fn ack(
     db: &State<Database>,
     user: User,
-    target: Reference,
-    message: Reference,
+    target: Reference<'_>,
+    message: Reference<'_>,
 ) -> Result<EmptyResponse> {
     if user.bot.is_some() {
         return Err(create_error!(IsBot));
@@ -29,7 +29,7 @@ pub async fn ack(
         .throw_if_lacking_channel_permission(ChannelPermission::ViewChannel)?;
 
     channel
-        .ack(&user.id, &message.id)
+        .ack(&user.id, message.id)
         .await
         .map(|_| EmptyResponse)
 }

crates/delta/src/routes/channels/channel_delete.rs

@@ -17,7 +17,7 @@ pub async fn delete(
     db: &State<Database>,
     amqp: &State<AMQP>,
     user: User,
-    target: Reference,
+    target: Reference<'_>,
     options: v0::OptionsChannelDelete,
 ) -> Result<EmptyResponse> {
     let mut channel = target.as_channel(db).await?;

crates/delta/src/routes/channels/channel_edit.rs

@@ -5,8 +5,8 @@ use revolt_database::{
 use revolt_models::v0;
 use revolt_permissions::{calculate_channel_permissions, ChannelPermission};
 use revolt_result::{create_error, Result};
-use rocket::{serde::json::Json, State};
-use validator::Validate;
+use rocket::State;
+use crate::util::json::{Json, Validate};
 
 /// # Edit Channel
 ///
@@ -17,15 +17,10 @@ pub async fn edit(
     db: &State<Database>,
     amqp: &State<AMQP>,
     user: User,
-    target: Reference,
-    data: Json<v0::DataEditChannel>,
+    target: Reference<'_>,
+    data: Validate<Json<v0::DataEditChannel>>,
 ) -> Result<Json<v0::Channel>> {
-    let data = data.into_inner();
-    data.validate().map_err(|error| {
-        create_error!(FailedValidation {
-            error: error.to_string()
-        })
-    })?;
+    let data = data.into_inner().into_inner();
 
     let mut channel = target.as_channel(db).await?;
     let mut query = DatabasePermissionQuery::new(db, &user).channel(&channel);
@@ -38,7 +33,7 @@ pub async fn edit(
         && data.icon.is_none()
         && data.nsfw.is_none()
         && data.owner.is_none()
-        && data.remove.is_none()
+        && data.remove.is_empty()
     {
         return Ok(Json(channel.into()));
     }
@@ -112,23 +107,21 @@ pub async fn edit(
             nsfw,
             ..
         } => {
-            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?;
-                    }
+            if data.remove.contains(&v0::FieldsChannel::Icon) {
+                if let Some(icon) = &icon {
+                    db.mark_attachment_as_deleted(&icon.id).await?;
                 }
+            }
 
-                for field in fields {
-                    match field {
-                        v0::FieldsChannel::Description => {
-                            description.take();
-                        }
-                        v0::FieldsChannel::Icon => {
-                            icon.take();
-                        }
-                        _ => {}
+            for field in &data.remove {
+                match field {
+                    v0::FieldsChannel::Description => {
+                        description.take();
                     }
+                    v0::FieldsChannel::Icon => {
+                        icon.take();
+                    }
+                    _ => {}
                 }
             }
 
@@ -214,11 +207,7 @@ pub async fn edit(
                 .update(
                     db,
                     partial,
-                    data.remove
-                        .unwrap_or_default()
-                        .into_iter()
-                        .map(|f| f.into())
-                        .collect(),
+                    data.remove.into_iter().map(|f| f.into()).collect(),
                 )
                 .await?;
         }

crates/delta/src/routes/channels/channel_fetch.rs

@@ -6,7 +6,8 @@ use revolt_database::{
 use revolt_models::v0;
 use revolt_permissions::{calculate_channel_permissions, ChannelPermission};
 use revolt_result::Result;
-use rocket::{serde::json::Json, State};
+use rocket::State;
+use crate::util::json::Json;
 
 /// # Fetch Channel
 ///
@@ -16,7 +17,7 @@ use rocket::{serde::json::Json, State};
 pub async fn fetch(
     db: &State<Database>,
     user: User,
-    target: Reference,
+    target: Reference<'_>,
 ) -> Result<Json<v0::Channel>> {
     let channel = target.as_channel(db).await?;
 

crates/delta/src/routes/channels/group_add_member.rs

@@ -17,8 +17,8 @@ pub async fn add_member(
     db: &State<Database>,
     amqp: &State<AMQP>,
     user: User,
-    group_id: Reference,
-    member_id: Reference,
+    group_id: Reference<'_>,
+    member_id: Reference<'_>,
 ) -> Result<EmptyResponse> {
     if user.bot.is_some() {
         return Err(create_error!(IsBot));

crates/delta/src/routes/channels/group_create.rs

@@ -2,9 +2,8 @@ use revolt_database::{Channel, Database, RelationshipStatus, User};
 use revolt_models::v0;
 use revolt_result::{create_error, Result};
 
-use rocket::serde::json::Json;
+use crate::util::json::{Json, Validate};
 use rocket::State;
-use validator::Validate;
 
 /// # Create Group
 ///
@@ -14,18 +13,13 @@ use validator::Validate;
 pub async fn create_group(
     db: &State<Database>,
     user: User,
-    data: Json<v0::DataCreateGroup>,
+    data: Validate<Json<v0::DataCreateGroup>>,
 ) -> Result<Json<v0::Channel>> {
     if user.bot.is_some() {
         return Err(create_error!(IsBot));
     }
 
-    let data = data.into_inner();
-    data.validate().map_err(|error| {
-        create_error!(FailedValidation {
-            error: error.to_string()
-        })
-    })?;
+    let data = data.into_inner().into_inner();
 
     for target in &data.users {
         match user.relationship_with(target) {

crates/delta/src/routes/channels/group_remove_member.rs

@@ -14,8 +14,8 @@ pub async fn remove_member(
     db: &State<Database>,
     amqp: &State<AMQP>,
     user: User,
-    target: Reference,
-    member: Reference,
+    target: Reference<'_>,
+    member: Reference<'_>,
 ) -> Result<EmptyResponse> {
     if user.bot.is_some() {
         return Err(create_error!(IsBot));

crates/delta/src/routes/channels/invite_create.rs

@@ -6,7 +6,8 @@ use revolt_models::v0;
 use revolt_permissions::{calculate_channel_permissions, ChannelPermission};
 
 use revolt_result::{create_error, Result};
-use rocket::{serde::json::Json, State};
+use rocket::State;
+use crate::util::json::Json;
 
 /// # Create Invite
 ///
@@ -18,7 +19,7 @@ use rocket::{serde::json::Json, State};
 pub async fn create_invite(
     db: &State<Database>,
     user: User,
-    target: Reference,
+    target: Reference<'_>,
 ) -> Result<Json<v0::Invite>> {
     if user.bot.is_some() {
         return Err(create_error!(IsBot));

crates/delta/src/routes/channels/members_fetch.rs

@@ -5,7 +5,8 @@ use revolt_database::{
 use revolt_models::v0;
 use revolt_permissions::{calculate_channel_permissions, ChannelPermission};
 use revolt_result::{create_error, Result};
-use rocket::{serde::json::Json, State};
+use rocket::State;
+use crate::util::json::Json;
 
 /// # Fetch Group Members
 ///
@@ -17,7 +18,7 @@ use rocket::{serde::json::Json, State};
 pub async fn fetch_members(
     db: &State<Database>,
     user: User,
-    target: Reference,
+    target: Reference<'_>,
 ) -> Result<Json<Vec<v0::User>>> {
     let channel = target.as_channel(db).await?;
     let mut query = DatabasePermissionQuery::new(db, &user).channel(&channel);

crates/delta/src/routes/channels/message_bulk_delete.rs

@@ -6,9 +6,9 @@ use revolt_database::{
 use revolt_models::v0;
 use revolt_permissions::{calculate_channel_permissions, ChannelPermission};
 use revolt_result::{create_error, Result};
-use rocket::{serde::json::Json, State};
+use rocket::State;
 use rocket_empty::EmptyResponse;
-use validator::Validate;
+use crate::util::json::{Json, Validate};
 
 /// # Bulk Delete Messages
 ///
@@ -22,15 +22,10 @@ use validator::Validate;
 pub async fn bulk_delete_messages(
     db: &State<Database>,
     user: User,
-    target: Reference,
-    options: Json<v0::OptionsBulkDelete>,
+    target: Reference<'_>,
+    options: Validate<Json<v0::OptionsBulkDelete>>,
 ) -> Result<EmptyResponse> {
-    let options = options.into_inner();
-    options.validate().map_err(|error| {
-        create_error!(FailedValidation {
-            error: error.to_string()
-        })
-    })?;
+    let options = options.into_inner().into_inner();
 
     for id in &options.ids {
         if ulid::Ulid::from_string(id)
@@ -51,7 +46,7 @@ pub async fn bulk_delete_messages(
         .await
         .throw_if_lacking_channel_permission(ChannelPermission::ManageMessages)?;
 
-    Message::bulk_delete(db, &target.id, options.ids)
+    Message::bulk_delete(db, target.id, options.ids)
         .await
         .map(|_| EmptyResponse)
 }

crates/delta/src/routes/channels/message_clear_reactions.rs

@@ -17,8 +17,8 @@ use rocket_empty::EmptyResponse;
 pub async fn clear_reactions(
     db: &State<Database>,
     user: User,
-    target: Reference,
-    msg: Reference,
+    target: Reference<'_>,
+    msg: Reference<'_>,
 ) -> Result<EmptyResponse> {
     let channel = target.as_channel(db).await?;
     let mut query = DatabasePermissionQuery::new(db, &user).channel(&channel);

crates/delta/src/routes/channels/message_delete.rs

@@ -15,10 +15,10 @@ use rocket_empty::EmptyResponse;
 pub async fn delete(
     db: &State<Database>,
     user: User,
-    target: Reference,
-    msg: Reference,
+    target: Reference<'_>,
+    msg: Reference<'_>,
 ) -> Result<EmptyResponse> {
-    let message = msg.as_message_in_channel(db, &target.id).await?;
+    let message = msg.as_message_in_channel(db, target.id).await?;
 
     if message.author != user.id {
         let channel = target.as_channel(db).await?;

crates/delta/src/routes/channels/message_edit.rs

@@ -7,8 +7,8 @@ use revolt_database::{
 use revolt_models::v0::{self, Embed};
 use revolt_permissions::{calculate_channel_permissions, ChannelPermission};
 use revolt_result::{create_error, Result};
-use rocket::{serde::json::Json, State};
-use validator::Validate;
+use rocket::State;
+use crate::util::json::{Json, Validate};
 
 /// # Edit Message
 ///
@@ -18,16 +18,11 @@ use validator::Validate;
 pub async fn edit(
     db: &State<Database>,
     user: User,
-    target: Reference,
-    msg: Reference,
-    edit: Json<v0::DataEditMessage>,
+    target: Reference<'_>,
+    msg: Reference<'_>,
+    edit: Validate<Json<v0::DataEditMessage>>,
 ) -> Result<Json<v0::Message>> {
-    let edit = edit.into_inner();
-    edit.validate().map_err(|error| {
-        create_error!(FailedValidation {
-            error: error.to_string()
-        })
-    })?;
+    let edit = edit.into_inner().into_inner();
 
     Message::validate_sum(
         &edit.content,

crates/delta/src/routes/channels/message_fetch.rs

@@ -5,7 +5,8 @@ use revolt_database::{
 use revolt_models::v0;
 use revolt_permissions::{calculate_channel_permissions, ChannelPermission};
 use revolt_result::{create_error, Result};
-use rocket::{serde::json::Json, State};
+use rocket::State;
+use crate::util::json::Json;
 
 /// # Fetch Message
 ///
@@ -15,8 +16,8 @@ use rocket::{serde::json::Json, State};
 pub async fn fetch(
     db: &State<Database>,
     user: User,
-    target: Reference,
-    msg: Reference,
+    target: Reference<'_>,
+    msg: Reference<'_>,
 ) -> Result<Json<v0::Message>> {
     let channel = target.as_channel(db).await?;
     let mut query = DatabasePermissionQuery::new(db, &user).channel(&channel);