From a62580d1fbcbb356f714c3227a5c9f64a2a6d3f2 Mon Sep 17 00:00:00 2001 From: Ginger Date: Wed, 22 Apr 2026 09:34:56 -0400 Subject: [PATCH] refactor: Switch back to upstream Ruma --- Cargo.lock | 22 +++++++++++----------- Cargo.toml | 4 ++-- src/api/server/make_join.rs | 2 +- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index c7032446d..83460b4ec 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4548,7 +4548,7 @@ dependencies = [ [[package]] name = "ruma" version = "0.14.1" -source = "git+https://github.com/gingershaped/ruwuma.git?rev=ce7ea072a3d47f1e674bb4badcb2af15b30e4088#ce7ea072a3d47f1e674bb4badcb2af15b30e4088" +source = "git+https://github.com/ruma/ruma.git?rev=985dec87f235f169b3adddf3a7d37f590403e6e9#985dec87f235f169b3adddf3a7d37f590403e6e9" dependencies = [ "assign", "js_int", @@ -4567,7 +4567,7 @@ dependencies = [ [[package]] name = "ruma-appservice-api" version = "0.14.1" -source = "git+https://github.com/gingershaped/ruwuma.git?rev=ce7ea072a3d47f1e674bb4badcb2af15b30e4088#ce7ea072a3d47f1e674bb4badcb2af15b30e4088" +source = "git+https://github.com/ruma/ruma.git?rev=985dec87f235f169b3adddf3a7d37f590403e6e9#985dec87f235f169b3adddf3a7d37f590403e6e9" dependencies = [ "js_int", "ruma-common", @@ -4579,7 +4579,7 @@ dependencies = [ [[package]] name = "ruma-client-api" version = "0.22.1" -source = "git+https://github.com/gingershaped/ruwuma.git?rev=ce7ea072a3d47f1e674bb4badcb2af15b30e4088#ce7ea072a3d47f1e674bb4badcb2af15b30e4088" +source = "git+https://github.com/ruma/ruma.git?rev=985dec87f235f169b3adddf3a7d37f590403e6e9#985dec87f235f169b3adddf3a7d37f590403e6e9" dependencies = [ "as_variant", "assign", @@ -4601,7 +4601,7 @@ dependencies = [ [[package]] name = "ruma-common" version = "0.17.1" -source = "git+https://github.com/gingershaped/ruwuma.git?rev=ce7ea072a3d47f1e674bb4badcb2af15b30e4088#ce7ea072a3d47f1e674bb4badcb2af15b30e4088" +source = "git+https://github.com/ruma/ruma.git?rev=985dec87f235f169b3adddf3a7d37f590403e6e9#985dec87f235f169b3adddf3a7d37f590403e6e9" dependencies = [ "as_variant", "base64 0.22.1", @@ -4634,7 +4634,7 @@ dependencies = [ [[package]] name = "ruma-events" version = "0.32.1" -source = "git+https://github.com/gingershaped/ruwuma.git?rev=ce7ea072a3d47f1e674bb4badcb2af15b30e4088#ce7ea072a3d47f1e674bb4badcb2af15b30e4088" +source = "git+https://github.com/ruma/ruma.git?rev=985dec87f235f169b3adddf3a7d37f590403e6e9#985dec87f235f169b3adddf3a7d37f590403e6e9" dependencies = [ "as_variant", "indexmap", @@ -4655,7 +4655,7 @@ dependencies = [ [[package]] name = "ruma-federation-api" version = "0.13.1" -source = "git+https://github.com/gingershaped/ruwuma.git?rev=ce7ea072a3d47f1e674bb4badcb2af15b30e4088#ce7ea072a3d47f1e674bb4badcb2af15b30e4088" +source = "git+https://github.com/ruma/ruma.git?rev=985dec87f235f169b3adddf3a7d37f590403e6e9#985dec87f235f169b3adddf3a7d37f590403e6e9" dependencies = [ "bytes", "headers", @@ -4678,7 +4678,7 @@ dependencies = [ [[package]] name = "ruma-identifiers-validation" version = "0.12.0" -source = "git+https://github.com/gingershaped/ruwuma.git?rev=ce7ea072a3d47f1e674bb4badcb2af15b30e4088#ce7ea072a3d47f1e674bb4badcb2af15b30e4088" +source = "git+https://github.com/ruma/ruma.git?rev=985dec87f235f169b3adddf3a7d37f590403e6e9#985dec87f235f169b3adddf3a7d37f590403e6e9" dependencies = [ "js_int", "thiserror 2.0.18", @@ -4687,7 +4687,7 @@ dependencies = [ [[package]] name = "ruma-macros" version = "0.17.1" -source = "git+https://github.com/gingershaped/ruwuma.git?rev=ce7ea072a3d47f1e674bb4badcb2af15b30e4088#ce7ea072a3d47f1e674bb4badcb2af15b30e4088" +source = "git+https://github.com/ruma/ruma.git?rev=985dec87f235f169b3adddf3a7d37f590403e6e9#985dec87f235f169b3adddf3a7d37f590403e6e9" dependencies = [ "as_variant", "cfg-if", @@ -4703,7 +4703,7 @@ dependencies = [ [[package]] name = "ruma-push-gateway-api" version = "0.13.0" -source = "git+https://github.com/gingershaped/ruwuma.git?rev=ce7ea072a3d47f1e674bb4badcb2af15b30e4088#ce7ea072a3d47f1e674bb4badcb2af15b30e4088" +source = "git+https://github.com/ruma/ruma.git?rev=985dec87f235f169b3adddf3a7d37f590403e6e9#985dec87f235f169b3adddf3a7d37f590403e6e9" dependencies = [ "js_int", "ruma-common", @@ -4715,7 +4715,7 @@ dependencies = [ [[package]] name = "ruma-signatures" version = "0.19.0" -source = "git+https://github.com/gingershaped/ruwuma.git?rev=ce7ea072a3d47f1e674bb4badcb2af15b30e4088#ce7ea072a3d47f1e674bb4badcb2af15b30e4088" +source = "git+https://github.com/ruma/ruma.git?rev=985dec87f235f169b3adddf3a7d37f590403e6e9#985dec87f235f169b3adddf3a7d37f590403e6e9" dependencies = [ "base64 0.22.1", "ed25519-dalek", @@ -4731,7 +4731,7 @@ dependencies = [ [[package]] name = "ruma-state-res" version = "0.15.0" -source = "git+https://github.com/gingershaped/ruwuma.git?rev=ce7ea072a3d47f1e674bb4badcb2af15b30e4088#ce7ea072a3d47f1e674bb4badcb2af15b30e4088" +source = "git+https://github.com/ruma/ruma.git?rev=985dec87f235f169b3adddf3a7d37f590403e6e9#985dec87f235f169b3adddf3a7d37f590403e6e9" dependencies = [ "js_int", "ruma-common", diff --git a/Cargo.toml b/Cargo.toml index 339004d12..e5aac9695 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -346,8 +346,8 @@ version = "1.1.1" # Used for matrix spec type definitions and helpers [workspace.dependencies.ruma] # version = "0.14.1" -git = "https://github.com/gingershaped/ruwuma.git" -rev = "ce7ea072a3d47f1e674bb4badcb2af15b30e4088" +git = "https://github.com/ruma/ruma.git" +rev = "985dec87f235f169b3adddf3a7d37f590403e6e9" features = [ "appservice-api-c", "client-api", diff --git a/src/api/server/make_join.rs b/src/api/server/make_join.rs index a7a6e84dc..26a8ec7e7 100644 --- a/src/api/server/make_join.rs +++ b/src/api/server/make_join.rs @@ -252,7 +252,7 @@ pub(crate) async fn user_can_perform_restricted_join( return Ok(true); } }, - | other if other.as_str() == "fi.mau.spam_checker" => + | other if other.rule_type() == "fi.mau.spam_checker" => return match services .antispam .meowlnir_accept_make_join(room_id.to_owned(), user_id.to_owned())