bump ruma and declare support for unstable MSC3026 (busy presence state)

a938640491

Signed-off-by: strawberry <strawberry@puppygock.gay>
This commit is contained in:
strawberry 2024-04-05 17:54:38 -04:00 committed by June
parent db8e7e5382
commit e4a987cf80
3 changed files with 38 additions and 17 deletions

24
Cargo.lock generated
View file

@ -2244,7 +2244,7 @@ dependencies = [
[[package]] [[package]]
name = "ruma" name = "ruma"
version = "0.9.4" 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 = [ dependencies = [
"assign", "assign",
"js_int", "js_int",
@ -2264,7 +2264,7 @@ dependencies = [
[[package]] [[package]]
name = "ruma-appservice-api" name = "ruma-appservice-api"
version = "0.9.0" 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 = [ dependencies = [
"js_int", "js_int",
"ruma-common", "ruma-common",
@ -2276,7 +2276,7 @@ dependencies = [
[[package]] [[package]]
name = "ruma-client-api" name = "ruma-client-api"
version = "0.17.4" 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 = [ dependencies = [
"as_variant", "as_variant",
"assign", "assign",
@ -2295,7 +2295,7 @@ dependencies = [
[[package]] [[package]]
name = "ruma-common" name = "ruma-common"
version = "0.12.1" 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 = [ dependencies = [
"as_variant", "as_variant",
"base64 0.21.7", "base64 0.21.7",
@ -2325,7 +2325,7 @@ dependencies = [
[[package]] [[package]]
name = "ruma-events" name = "ruma-events"
version = "0.27.11" 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 = [ dependencies = [
"as_variant", "as_variant",
"indexmap", "indexmap",
@ -2347,7 +2347,7 @@ dependencies = [
[[package]] [[package]]
name = "ruma-federation-api" name = "ruma-federation-api"
version = "0.8.0" 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 = [ dependencies = [
"js_int", "js_int",
"ruma-common", "ruma-common",
@ -2359,7 +2359,7 @@ dependencies = [
[[package]] [[package]]
name = "ruma-identifiers-validation" name = "ruma-identifiers-validation"
version = "0.9.3" 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 = [ dependencies = [
"js_int", "js_int",
"thiserror", "thiserror",
@ -2368,7 +2368,7 @@ dependencies = [
[[package]] [[package]]
name = "ruma-identity-service-api" name = "ruma-identity-service-api"
version = "0.8.0" 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 = [ dependencies = [
"js_int", "js_int",
"ruma-common", "ruma-common",
@ -2378,7 +2378,7 @@ dependencies = [
[[package]] [[package]]
name = "ruma-macros" name = "ruma-macros"
version = "0.12.0" 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 = [ dependencies = [
"once_cell", "once_cell",
"proc-macro-crate", "proc-macro-crate",
@ -2393,7 +2393,7 @@ dependencies = [
[[package]] [[package]]
name = "ruma-push-gateway-api" name = "ruma-push-gateway-api"
version = "0.8.0" 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 = [ dependencies = [
"js_int", "js_int",
"ruma-common", "ruma-common",
@ -2405,7 +2405,7 @@ dependencies = [
[[package]] [[package]]
name = "ruma-signatures" name = "ruma-signatures"
version = "0.14.0" 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 = [ dependencies = [
"base64 0.21.7", "base64 0.21.7",
"ed25519-dalek", "ed25519-dalek",
@ -2421,7 +2421,7 @@ dependencies = [
[[package]] [[package]]
name = "ruma-state-res" name = "ruma-state-res"
version = "0.10.0" 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 = [ dependencies = [
"itertools 0.11.0", "itertools 0.11.0",
"js_int", "js_int",

View file

@ -171,7 +171,18 @@ features = ["rt-tokio"]
version = "0.32.2" version = "0.32.2"
optional = true optional = true
default-features = false 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] [dependencies.sentry-tracing]
version = "0.32.2" version = "0.32.2"
optional = true optional = true
@ -229,6 +240,7 @@ features = ["env", "toml"]
git = "https://github.com/girlbossceo/ruma" git = "https://github.com/girlbossceo/ruma"
#rev = "c988b5ff158ede9c10aeffc76ad5e31604f19ddb" #rev = "c988b5ff158ede9c10aeffc76ad5e31604f19ddb"
branch = "conduwuit-changes" branch = "conduwuit-changes"
#path = "../ruma/crates/ruma"
features = [ features = [
"compat", "compat",
"rand", "rand",
@ -242,9 +254,10 @@ features = [
"unstable-exhaustive-types", "unstable-exhaustive-types",
"ring-compat", "ring-compat",
"unstable-unspecified", "unstable-unspecified",
"unstable-msc2870",
"unstable-msc3061",
"unstable-msc2867", "unstable-msc2867",
"unstable-msc2870",
"unstable-msc3026",
"unstable-msc3061",
"unstable-extensible-events", "unstable-extensible-events",
] ]
@ -292,7 +305,14 @@ hyperlocal = { git = "https://github.com/softprops/hyperlocal", rev = "2ee4d1496
[features] [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_sqlite = ["sqlite"]
backend_rocksdb = ["rocksdb"] backend_rocksdb = ["rocksdb"]
rocksdb = ["rust-rocksdb", "num_cpus"] rocksdb = ["rust-rocksdb", "num_cpus"]

View file

@ -40,8 +40,9 @@ pub async fn get_supported_versions_route(
("org.matrix.e2e_cross_signing".to_owned(), true), ("org.matrix.e2e_cross_signing".to_owned(), true),
("org.matrix.msc2285.stable".to_owned(), true), ("org.matrix.msc2285.stable".to_owned(), true),
("org.matrix.msc2836".to_owned(), true), ("org.matrix.msc2836".to_owned(), true),
("org.matrix.msc3827".to_owned(), true),
("org.matrix.msc2946".to_owned(), true), ("org.matrix.msc2946".to_owned(), true),
("org.matrix.msc3827".to_owned(), true),
("org.matrix.msc3026.busy_presence".to_owned(), true),
]), ]),
}; };