diff --git a/Cargo.lock b/Cargo.lock index a8a6ae0a..cf08509f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3173,7 +3173,7 @@ dependencies = [ [[package]] name = "ruma" version = "0.10.1" -source = "git+https://github.com/girlbossceo/ruwuma?rev=30a08ff7be779df6858036c3f01f3ba64c1ee785#30a08ff7be779df6858036c3f01f3ba64c1ee785" +source = "git+https://github.com/girlbossceo/ruwuma?rev=ac37db212aed236d4c415cfecb96aa42cfebc6d9#ac37db212aed236d4c415cfecb96aa42cfebc6d9" dependencies = [ "assign", "js_int", @@ -3195,7 +3195,7 @@ dependencies = [ [[package]] name = "ruma-appservice-api" version = "0.10.0" -source = "git+https://github.com/girlbossceo/ruwuma?rev=30a08ff7be779df6858036c3f01f3ba64c1ee785#30a08ff7be779df6858036c3f01f3ba64c1ee785" +source = "git+https://github.com/girlbossceo/ruwuma?rev=ac37db212aed236d4c415cfecb96aa42cfebc6d9#ac37db212aed236d4c415cfecb96aa42cfebc6d9" dependencies = [ "js_int", "ruma-common", @@ -3207,7 +3207,7 @@ dependencies = [ [[package]] name = "ruma-client-api" version = "0.18.0" -source = "git+https://github.com/girlbossceo/ruwuma?rev=30a08ff7be779df6858036c3f01f3ba64c1ee785#30a08ff7be779df6858036c3f01f3ba64c1ee785" +source = "git+https://github.com/girlbossceo/ruwuma?rev=ac37db212aed236d4c415cfecb96aa42cfebc6d9#ac37db212aed236d4c415cfecb96aa42cfebc6d9" dependencies = [ "as_variant", "assign", @@ -3230,7 +3230,7 @@ dependencies = [ [[package]] name = "ruma-common" version = "0.13.0" -source = "git+https://github.com/girlbossceo/ruwuma?rev=30a08ff7be779df6858036c3f01f3ba64c1ee785#30a08ff7be779df6858036c3f01f3ba64c1ee785" +source = "git+https://github.com/girlbossceo/ruwuma?rev=ac37db212aed236d4c415cfecb96aa42cfebc6d9#ac37db212aed236d4c415cfecb96aa42cfebc6d9" dependencies = [ "as_variant", "base64 0.22.1", @@ -3261,7 +3261,7 @@ dependencies = [ [[package]] name = "ruma-events" version = "0.28.1" -source = "git+https://github.com/girlbossceo/ruwuma?rev=30a08ff7be779df6858036c3f01f3ba64c1ee785#30a08ff7be779df6858036c3f01f3ba64c1ee785" +source = "git+https://github.com/girlbossceo/ruwuma?rev=ac37db212aed236d4c415cfecb96aa42cfebc6d9#ac37db212aed236d4c415cfecb96aa42cfebc6d9" dependencies = [ "as_variant", "indexmap 2.7.0", @@ -3286,7 +3286,7 @@ dependencies = [ [[package]] name = "ruma-federation-api" version = "0.9.0" -source = "git+https://github.com/girlbossceo/ruwuma?rev=30a08ff7be779df6858036c3f01f3ba64c1ee785#30a08ff7be779df6858036c3f01f3ba64c1ee785" +source = "git+https://github.com/girlbossceo/ruwuma?rev=ac37db212aed236d4c415cfecb96aa42cfebc6d9#ac37db212aed236d4c415cfecb96aa42cfebc6d9" dependencies = [ "bytes", "http", @@ -3304,7 +3304,7 @@ dependencies = [ [[package]] name = "ruma-identifiers-validation" version = "0.9.5" -source = "git+https://github.com/girlbossceo/ruwuma?rev=30a08ff7be779df6858036c3f01f3ba64c1ee785#30a08ff7be779df6858036c3f01f3ba64c1ee785" +source = "git+https://github.com/girlbossceo/ruwuma?rev=ac37db212aed236d4c415cfecb96aa42cfebc6d9#ac37db212aed236d4c415cfecb96aa42cfebc6d9" dependencies = [ "js_int", "thiserror 2.0.7", @@ -3313,7 +3313,7 @@ dependencies = [ [[package]] name = "ruma-identity-service-api" version = "0.9.0" -source = "git+https://github.com/girlbossceo/ruwuma?rev=30a08ff7be779df6858036c3f01f3ba64c1ee785#30a08ff7be779df6858036c3f01f3ba64c1ee785" +source = "git+https://github.com/girlbossceo/ruwuma?rev=ac37db212aed236d4c415cfecb96aa42cfebc6d9#ac37db212aed236d4c415cfecb96aa42cfebc6d9" dependencies = [ "js_int", "ruma-common", @@ -3323,7 +3323,7 @@ dependencies = [ [[package]] name = "ruma-macros" version = "0.13.0" -source = "git+https://github.com/girlbossceo/ruwuma?rev=30a08ff7be779df6858036c3f01f3ba64c1ee785#30a08ff7be779df6858036c3f01f3ba64c1ee785" +source = "git+https://github.com/girlbossceo/ruwuma?rev=ac37db212aed236d4c415cfecb96aa42cfebc6d9#ac37db212aed236d4c415cfecb96aa42cfebc6d9" dependencies = [ "cfg-if", "proc-macro-crate", @@ -3338,7 +3338,7 @@ dependencies = [ [[package]] name = "ruma-push-gateway-api" version = "0.9.0" -source = "git+https://github.com/girlbossceo/ruwuma?rev=30a08ff7be779df6858036c3f01f3ba64c1ee785#30a08ff7be779df6858036c3f01f3ba64c1ee785" +source = "git+https://github.com/girlbossceo/ruwuma?rev=ac37db212aed236d4c415cfecb96aa42cfebc6d9#ac37db212aed236d4c415cfecb96aa42cfebc6d9" dependencies = [ "js_int", "ruma-common", @@ -3350,7 +3350,7 @@ dependencies = [ [[package]] name = "ruma-server-util" version = "0.3.0" -source = "git+https://github.com/girlbossceo/ruwuma?rev=30a08ff7be779df6858036c3f01f3ba64c1ee785#30a08ff7be779df6858036c3f01f3ba64c1ee785" +source = "git+https://github.com/girlbossceo/ruwuma?rev=ac37db212aed236d4c415cfecb96aa42cfebc6d9#ac37db212aed236d4c415cfecb96aa42cfebc6d9" dependencies = [ "headers", "http", @@ -3363,7 +3363,7 @@ dependencies = [ [[package]] name = "ruma-signatures" version = "0.15.0" -source = "git+https://github.com/girlbossceo/ruwuma?rev=30a08ff7be779df6858036c3f01f3ba64c1ee785#30a08ff7be779df6858036c3f01f3ba64c1ee785" +source = "git+https://github.com/girlbossceo/ruwuma?rev=ac37db212aed236d4c415cfecb96aa42cfebc6d9#ac37db212aed236d4c415cfecb96aa42cfebc6d9" dependencies = [ "base64 0.22.1", "ed25519-dalek", @@ -3379,7 +3379,7 @@ dependencies = [ [[package]] name = "ruma-state-res" version = "0.11.0" -source = "git+https://github.com/girlbossceo/ruwuma?rev=30a08ff7be779df6858036c3f01f3ba64c1ee785#30a08ff7be779df6858036c3f01f3ba64c1ee785" +source = "git+https://github.com/girlbossceo/ruwuma?rev=ac37db212aed236d4c415cfecb96aa42cfebc6d9#ac37db212aed236d4c415cfecb96aa42cfebc6d9" dependencies = [ "futures-util", "js_int", diff --git a/Cargo.toml b/Cargo.toml index 805c7d7c..a59dcfcd 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -336,7 +336,7 @@ version = "0.1.2" [workspace.dependencies.ruma] git = "https://github.com/girlbossceo/ruwuma" #branch = "conduwuit-changes" -rev = "30a08ff7be779df6858036c3f01f3ba64c1ee785" +rev = "ac37db212aed236d4c415cfecb96aa42cfebc6d9" features = [ "compat", "rand", diff --git a/src/service/rooms/event_handler/acl_check.rs b/src/service/rooms/event_handler/acl_check.rs index ef12a25c..714b6fc1 100644 --- a/src/service/rooms/event_handler/acl_check.rs +++ b/src/service/rooms/event_handler/acl_check.rs @@ -6,7 +6,7 @@ use ruma::{ /// Returns Ok if the acl allows the server #[implement(super::Service)] -#[tracing::instrument(skip_all)] +#[tracing::instrument(skip_all, level = "debug")] pub async fn acl_check(&self, server_name: &ServerName, room_id: &RoomId) -> Result { let Ok(acl_event_content) = self .services diff --git a/src/service/rooms/event_handler/resolve_state.rs b/src/service/rooms/event_handler/resolve_state.rs index b47111d9..0e4b919d 100644 --- a/src/service/rooms/event_handler/resolve_state.rs +++ b/src/service/rooms/event_handler/resolve_state.rs @@ -114,7 +114,7 @@ pub async fn state_resolution( &self, room_version: &RoomVersionId, state_sets: &[StateMap], - auth_chain_sets: &Vec>, + auth_chain_sets: &[HashSet], ) -> Result> { //TODO: ??? let _lock = self.services.globals.stateres_mutex.lock();