From e4a987cf80c09b580710fd73bd19d592b8c75c9d Mon Sep 17 00:00:00 2001 From: strawberry Date: Fri, 5 Apr 2024 17:54:38 -0400 Subject: [PATCH] bump ruma and declare support for unstable MSC3026 (busy presence state) https://github.com/girlbossceo/ruma/commit/a938640491bf2bf98196cecd4102c5749f89a554 Signed-off-by: strawberry --- Cargo.lock | 24 ++++++++++++------------ Cargo.toml | 28 ++++++++++++++++++++++++---- src/api/client_server/unversioned.rs | 3 ++- 3 files changed, 38 insertions(+), 17 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index eb28bb2e..fe2a4f4f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2244,7 +2244,7 @@ dependencies = [ [[package]] name = "ruma" version = "0.9.4" -source = "git+https://github.com/girlbossceo/ruma?branch=conduwuit-changes#eb970d044d86949f47bc14ad2badd74a590a9ef8" +source = "git+https://github.com/girlbossceo/ruma?branch=conduwuit-changes#a938640491bf2bf98196cecd4102c5749f89a554" dependencies = [ "assign", "js_int", @@ -2264,7 +2264,7 @@ dependencies = [ [[package]] name = "ruma-appservice-api" version = "0.9.0" -source = "git+https://github.com/girlbossceo/ruma?branch=conduwuit-changes#eb970d044d86949f47bc14ad2badd74a590a9ef8" +source = "git+https://github.com/girlbossceo/ruma?branch=conduwuit-changes#a938640491bf2bf98196cecd4102c5749f89a554" dependencies = [ "js_int", "ruma-common", @@ -2276,7 +2276,7 @@ dependencies = [ [[package]] name = "ruma-client-api" version = "0.17.4" -source = "git+https://github.com/girlbossceo/ruma?branch=conduwuit-changes#eb970d044d86949f47bc14ad2badd74a590a9ef8" +source = "git+https://github.com/girlbossceo/ruma?branch=conduwuit-changes#a938640491bf2bf98196cecd4102c5749f89a554" dependencies = [ "as_variant", "assign", @@ -2295,7 +2295,7 @@ dependencies = [ [[package]] name = "ruma-common" version = "0.12.1" -source = "git+https://github.com/girlbossceo/ruma?branch=conduwuit-changes#eb970d044d86949f47bc14ad2badd74a590a9ef8" +source = "git+https://github.com/girlbossceo/ruma?branch=conduwuit-changes#a938640491bf2bf98196cecd4102c5749f89a554" dependencies = [ "as_variant", "base64 0.21.7", @@ -2325,7 +2325,7 @@ dependencies = [ [[package]] name = "ruma-events" version = "0.27.11" -source = "git+https://github.com/girlbossceo/ruma?branch=conduwuit-changes#eb970d044d86949f47bc14ad2badd74a590a9ef8" +source = "git+https://github.com/girlbossceo/ruma?branch=conduwuit-changes#a938640491bf2bf98196cecd4102c5749f89a554" dependencies = [ "as_variant", "indexmap", @@ -2347,7 +2347,7 @@ dependencies = [ [[package]] name = "ruma-federation-api" version = "0.8.0" -source = "git+https://github.com/girlbossceo/ruma?branch=conduwuit-changes#eb970d044d86949f47bc14ad2badd74a590a9ef8" +source = "git+https://github.com/girlbossceo/ruma?branch=conduwuit-changes#a938640491bf2bf98196cecd4102c5749f89a554" dependencies = [ "js_int", "ruma-common", @@ -2359,7 +2359,7 @@ dependencies = [ [[package]] name = "ruma-identifiers-validation" version = "0.9.3" -source = "git+https://github.com/girlbossceo/ruma?branch=conduwuit-changes#eb970d044d86949f47bc14ad2badd74a590a9ef8" +source = "git+https://github.com/girlbossceo/ruma?branch=conduwuit-changes#a938640491bf2bf98196cecd4102c5749f89a554" dependencies = [ "js_int", "thiserror", @@ -2368,7 +2368,7 @@ dependencies = [ [[package]] name = "ruma-identity-service-api" version = "0.8.0" -source = "git+https://github.com/girlbossceo/ruma?branch=conduwuit-changes#eb970d044d86949f47bc14ad2badd74a590a9ef8" +source = "git+https://github.com/girlbossceo/ruma?branch=conduwuit-changes#a938640491bf2bf98196cecd4102c5749f89a554" dependencies = [ "js_int", "ruma-common", @@ -2378,7 +2378,7 @@ dependencies = [ [[package]] name = "ruma-macros" version = "0.12.0" -source = "git+https://github.com/girlbossceo/ruma?branch=conduwuit-changes#eb970d044d86949f47bc14ad2badd74a590a9ef8" +source = "git+https://github.com/girlbossceo/ruma?branch=conduwuit-changes#a938640491bf2bf98196cecd4102c5749f89a554" dependencies = [ "once_cell", "proc-macro-crate", @@ -2393,7 +2393,7 @@ dependencies = [ [[package]] name = "ruma-push-gateway-api" version = "0.8.0" -source = "git+https://github.com/girlbossceo/ruma?branch=conduwuit-changes#eb970d044d86949f47bc14ad2badd74a590a9ef8" +source = "git+https://github.com/girlbossceo/ruma?branch=conduwuit-changes#a938640491bf2bf98196cecd4102c5749f89a554" dependencies = [ "js_int", "ruma-common", @@ -2405,7 +2405,7 @@ dependencies = [ [[package]] name = "ruma-signatures" version = "0.14.0" -source = "git+https://github.com/girlbossceo/ruma?branch=conduwuit-changes#eb970d044d86949f47bc14ad2badd74a590a9ef8" +source = "git+https://github.com/girlbossceo/ruma?branch=conduwuit-changes#a938640491bf2bf98196cecd4102c5749f89a554" dependencies = [ "base64 0.21.7", "ed25519-dalek", @@ -2421,7 +2421,7 @@ dependencies = [ [[package]] name = "ruma-state-res" version = "0.10.0" -source = "git+https://github.com/girlbossceo/ruma?branch=conduwuit-changes#eb970d044d86949f47bc14ad2badd74a590a9ef8" +source = "git+https://github.com/girlbossceo/ruma?branch=conduwuit-changes#a938640491bf2bf98196cecd4102c5749f89a554" dependencies = [ "itertools 0.11.0", "js_int", diff --git a/Cargo.toml b/Cargo.toml index 8efdb2d4..5f7a3fde 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -171,7 +171,18 @@ features = ["rt-tokio"] version = "0.32.2" optional = true default-features = false -features = ["backtrace", "contexts", "debug-images", "panic", "rustls", "tower", "tower-http", "tracing", "reqwest", "log"] +features = [ + "backtrace", + "contexts", + "debug-images", + "panic", + "rustls", + "tower", + "tower-http", + "tracing", + "reqwest", + "log", +] [dependencies.sentry-tracing] version = "0.32.2" optional = true @@ -229,6 +240,7 @@ features = ["env", "toml"] git = "https://github.com/girlbossceo/ruma" #rev = "c988b5ff158ede9c10aeffc76ad5e31604f19ddb" branch = "conduwuit-changes" +#path = "../ruma/crates/ruma" features = [ "compat", "rand", @@ -242,9 +254,10 @@ features = [ "unstable-exhaustive-types", "ring-compat", "unstable-unspecified", - "unstable-msc2870", - "unstable-msc3061", "unstable-msc2867", + "unstable-msc2870", + "unstable-msc3026", + "unstable-msc3061", "unstable-extensible-events", ] @@ -292,7 +305,14 @@ hyperlocal = { git = "https://github.com/softprops/hyperlocal", rev = "2ee4d1496 [features] -default = ["backend_rocksdb", "systemd", "element_hacks", "sentry_telemetry", "gzip_compression", "brotli_compression"] +default = [ + "backend_rocksdb", + "systemd", + "element_hacks", + "sentry_telemetry", + "gzip_compression", + "brotli_compression", +] backend_sqlite = ["sqlite"] backend_rocksdb = ["rocksdb"] rocksdb = ["rust-rocksdb", "num_cpus"] diff --git a/src/api/client_server/unversioned.rs b/src/api/client_server/unversioned.rs index 43b05d03..1a530b6e 100644 --- a/src/api/client_server/unversioned.rs +++ b/src/api/client_server/unversioned.rs @@ -40,8 +40,9 @@ pub async fn get_supported_versions_route( ("org.matrix.e2e_cross_signing".to_owned(), true), ("org.matrix.msc2285.stable".to_owned(), true), ("org.matrix.msc2836".to_owned(), true), - ("org.matrix.msc3827".to_owned(), true), ("org.matrix.msc2946".to_owned(), true), + ("org.matrix.msc3827".to_owned(), true), + ("org.matrix.msc3026.busy_presence".to_owned(), true), ]), };