backups/grapevine
1
0
Fork 0
mirror of https://gitlab.computer.surgery/matrix/grapevine.git synced 2025-12-16 23:31:24 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update ruma to 0.12.2

Browse source
This commit is contained in:
Lambda 2025-04-17 17:34:49 +00:00 • committed by Olivia Lee
parent 48ecf50973
commit d425ba72f8
No known key found for this signature in database
GPG key ID: 54D568A15B9CD1F9
8 changed files with 36 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.cargo/config.toml Normal file
View file

@ -0,0 +1,2 @@
[env]
RUMA_UNSTABLE_EXHAUSTIVE_TYPES = "1"

60
Cargo.lock generated
View file

@ -2480,8 +2480,8 @@ dependencies = [
[[package]] [[package]]
name = "ruma" name = "ruma"
version = "0.11.1" version = "0.12.2"
source = "git+https://github.com/ruma/ruma?rev=bd33b9a38fbf4aea0413f947469be916f120032e#bd33b9a38fbf4aea0413f947469be916f120032e" source = "git+https://gitlab.computer.surgery/matrix/ruma.git?rev=ruma-0.12.2%2Bgrapevine-1#4208e8c4c8c2b0e7686aefcdbebf7f2f1d08ee29"
dependencies = [ dependencies = [
"assign", "assign",
"js_int", "js_int",
@ -2491,7 +2491,6 @@ dependencies = [
"ruma-common", "ruma-common",
"ruma-events", "ruma-events",
"ruma-federation-api", "ruma-federation-api",
"ruma-identity-service-api",
"ruma-push-gateway-api", "ruma-push-gateway-api",
"ruma-server-util", "ruma-server-util",
"ruma-signatures", "ruma-signatures",
@ -2501,8 +2500,8 @@ dependencies = [
[[package]] [[package]]
name = "ruma-appservice-api" name = "ruma-appservice-api"
version = "0.11.0" version = "0.12.1"
source = "git+https://github.com/ruma/ruma?rev=bd33b9a38fbf4aea0413f947469be916f120032e#bd33b9a38fbf4aea0413f947469be916f120032e" source = "git+https://gitlab.computer.surgery/matrix/ruma.git?rev=ruma-0.12.2%2Bgrapevine-1#4208e8c4c8c2b0e7686aefcdbebf7f2f1d08ee29"
dependencies = [ dependencies = [
"js_int", "js_int",
"ruma-common", "ruma-common",
@ -2513,8 +2512,8 @@ dependencies = [
[[package]] [[package]]
name = "ruma-client-api" name = "ruma-client-api"
version = "0.19.0" version = "0.20.2"
source = "git+https://github.com/ruma/ruma?rev=bd33b9a38fbf4aea0413f947469be916f120032e#bd33b9a38fbf4aea0413f947469be916f120032e" source = "git+https://gitlab.computer.surgery/matrix/ruma.git?rev=ruma-0.12.2%2Bgrapevine-1#4208e8c4c8c2b0e7686aefcdbebf7f2f1d08ee29"
dependencies = [ dependencies = [
"as_variant", "as_variant",
"assign", "assign",
@ -2536,13 +2535,14 @@ dependencies = [
[[package]] [[package]]
name = "ruma-common" name = "ruma-common"
version = "0.14.1" version = "0.15.2"
source = "git+https://github.com/ruma/ruma?rev=bd33b9a38fbf4aea0413f947469be916f120032e#bd33b9a38fbf4aea0413f947469be916f120032e" source = "git+https://gitlab.computer.surgery/matrix/ruma.git?rev=ruma-0.12.2%2Bgrapevine-1#4208e8c4c8c2b0e7686aefcdbebf7f2f1d08ee29"
dependencies = [ dependencies = [
"as_variant", "as_variant",
"base64 0.22.1", "base64 0.22.1",
"bytes", "bytes",
"form_urlencoded", "form_urlencoded",
"getrandom 0.2.15",
"http", "http",
"indexmap 2.8.0", "indexmap 2.8.0",
"js_int", "js_int",
@ -2566,8 +2566,8 @@ dependencies = [
[[package]] [[package]]
name = "ruma-events" name = "ruma-events"
version = "0.29.1" version = "0.30.2"
source = "git+https://github.com/ruma/ruma?rev=bd33b9a38fbf4aea0413f947469be916f120032e#bd33b9a38fbf4aea0413f947469be916f120032e" source = "git+https://gitlab.computer.surgery/matrix/ruma.git?rev=ruma-0.12.2%2Bgrapevine-1#4208e8c4c8c2b0e7686aefcdbebf7f2f1d08ee29"
dependencies = [ dependencies = [
"as_variant", "as_variant",
"indexmap 2.8.0", "indexmap 2.8.0",
@ -2589,8 +2589,8 @@ dependencies = [
[[package]] [[package]]
name = "ruma-federation-api" name = "ruma-federation-api"
version = "0.10.0" version = "0.11.1"
source = "git+https://github.com/ruma/ruma?rev=bd33b9a38fbf4aea0413f947469be916f120032e#bd33b9a38fbf4aea0413f947469be916f120032e" source = "git+https://gitlab.computer.surgery/matrix/ruma.git?rev=ruma-0.12.2%2Bgrapevine-1#4208e8c4c8c2b0e7686aefcdbebf7f2f1d08ee29"
dependencies = [ dependencies = [
"bytes", "bytes",
"http", "http",
@ -2607,27 +2607,17 @@ dependencies = [
[[package]] [[package]]
name = "ruma-identifiers-validation" name = "ruma-identifiers-validation"
version = "0.10.0" version = "0.10.1"
source = "git+https://github.com/ruma/ruma?rev=bd33b9a38fbf4aea0413f947469be916f120032e#bd33b9a38fbf4aea0413f947469be916f120032e" source = "git+https://gitlab.computer.surgery/matrix/ruma.git?rev=ruma-0.12.2%2Bgrapevine-1#4208e8c4c8c2b0e7686aefcdbebf7f2f1d08ee29"
dependencies = [ dependencies = [
"js_int", "js_int",
"thiserror 2.0.12", "thiserror 2.0.12",
] ]
[[package]]
name = "ruma-identity-service-api"
version = "0.10.0"
source = "git+https://github.com/ruma/ruma?rev=bd33b9a38fbf4aea0413f947469be916f120032e#bd33b9a38fbf4aea0413f947469be916f120032e"
dependencies = [
"js_int",
"ruma-common",
"serde",
]
[[package]] [[package]]
name = "ruma-macros" name = "ruma-macros"
version = "0.14.0" version = "0.15.1"
source = "git+https://github.com/ruma/ruma?rev=bd33b9a38fbf4aea0413f947469be916f120032e#bd33b9a38fbf4aea0413f947469be916f120032e" source = "git+https://gitlab.computer.surgery/matrix/ruma.git?rev=ruma-0.12.2%2Bgrapevine-1#4208e8c4c8c2b0e7686aefcdbebf7f2f1d08ee29"
dependencies = [ dependencies = [
"cfg-if", "cfg-if",
"proc-macro-crate", "proc-macro-crate",
@ -2641,8 +2631,8 @@ dependencies = [
[[package]] [[package]]
name = "ruma-push-gateway-api" name = "ruma-push-gateway-api"
version = "0.10.0" version = "0.11.0"
source = "git+https://github.com/ruma/ruma?rev=bd33b9a38fbf4aea0413f947469be916f120032e#bd33b9a38fbf4aea0413f947469be916f120032e" source = "git+https://gitlab.computer.surgery/matrix/ruma.git?rev=ruma-0.12.2%2Bgrapevine-1#4208e8c4c8c2b0e7686aefcdbebf7f2f1d08ee29"
dependencies = [ dependencies = [
"js_int", "js_int",
"ruma-common", "ruma-common",
@ -2653,8 +2643,8 @@ dependencies = [
[[package]] [[package]]
name = "ruma-server-util" name = "ruma-server-util"
version = "0.4.0" version = "0.5.0"
source = "git+https://github.com/ruma/ruma?rev=bd33b9a38fbf4aea0413f947469be916f120032e#bd33b9a38fbf4aea0413f947469be916f120032e" source = "git+https://gitlab.computer.surgery/matrix/ruma.git?rev=ruma-0.12.2%2Bgrapevine-1#4208e8c4c8c2b0e7686aefcdbebf7f2f1d08ee29"
dependencies = [ dependencies = [
"headers", "headers",
"http", "http",
@ -2666,8 +2656,8 @@ dependencies = [
[[package]] [[package]]
name = "ruma-signatures" name = "ruma-signatures"
version = "0.16.0" version = "0.17.1"
source = "git+https://github.com/ruma/ruma?rev=bd33b9a38fbf4aea0413f947469be916f120032e#bd33b9a38fbf4aea0413f947469be916f120032e" source = "git+https://gitlab.computer.surgery/matrix/ruma.git?rev=ruma-0.12.2%2Bgrapevine-1#4208e8c4c8c2b0e7686aefcdbebf7f2f1d08ee29"
dependencies = [ dependencies = [
"base64 0.22.1", "base64 0.22.1",
"ed25519-dalek", "ed25519-dalek",
@ -2682,8 +2672,8 @@ dependencies = [
[[package]] [[package]]
name = "ruma-state-res" name = "ruma-state-res"
version = "0.12.0" version = "0.13.0"
source = "git+https://github.com/ruma/ruma?rev=bd33b9a38fbf4aea0413f947469be916f120032e#bd33b9a38fbf4aea0413f947469be916f120032e" source = "git+https://gitlab.computer.surgery/matrix/ruma.git?rev=ruma-0.12.2%2Bgrapevine-1#4208e8c4c8c2b0e7686aefcdbebf7f2f1d08ee29"
dependencies = [ dependencies = [
"js_int", "js_int",
"ruma-common", "ruma-common",

2
Cargo.toml
View file

@ -121,7 +121,7 @@ regex = "1.11.1"
reqwest = { version = "0.12.15", default-features = false, features = ["http2", "rustls-tls-native-roots", "socks"] } reqwest = { version = "0.12.15", default-features = false, features = ["http2", "rustls-tls-native-roots", "socks"] }
ring = "0.17.14" ring = "0.17.14"
rocksdb = { package = "rust-rocksdb", version = "0.36.0", features = ["lz4", "multi-threaded-cf", "zstd"], optional = true } rocksdb = { package = "rust-rocksdb", version = "0.36.0", features = ["lz4", "multi-threaded-cf", "zstd"], optional = true }
ruma = { git = "https://github.com/ruma/ruma", rev = "bd33b9a38fbf4aea0413f947469be916f120032e", features = ["compat", "rand", "appservice-api-c", "client-api", "federation-api", "push-gateway-api-c", "server-util", "state-res", "unstable-msc2448", "unstable-msc3575", "unstable-exhaustive-types", "ring-compat", "unstable-unspecified" ] } ruma = { git = "https://gitlab.computer.surgery/matrix/ruma.git", rev = "ruma-0.12.2+grapevine-1", features = ["compat", "rand", "appservice-api-c", "client-api", "federation-api", "push-gateway-api-c", "server-util", "state-res", "unstable-msc2448", "unstable-msc3575", "ring-compat", "unstable-unspecified" ] }
rusqlite = { version = "0.34.0", optional = true, features = ["bundled"] } rusqlite = { version = "0.34.0", optional = true, features = ["bundled"] }
rustls = { version = "0.23.25", default-features = false, features = ["ring", "log", "logging", "std", "tls12"] } rustls = { version = "0.23.25", default-features = false, features = ["ring", "log", "logging", "std", "tls12"] }
sd-notify = { version = "0.4.5", optional = true } sd-notify = { version = "0.4.5", optional = true }

1
nix/pkgs/default/default.nix
View file

@ -77,6 +77,7 @@ let
# Keep sorted # Keep sorted
include = [ include = [
".cargo/config.toml"
"Cargo.lock" "Cargo.lock"
"Cargo.toml" "Cargo.toml"
"src" "src"

1
src/api/server_server.rs
View file

@ -1901,6 +1901,7 @@ pub(crate) async fn create_invite_route(
.event_id() .event_id()
.as_bytes()])) .as_bytes()]))
.into(), .into(),
ephemeral: Vec::new(),
}, },
) )
.await?; .await?;

3
src/service/pusher.rs
View file

@ -263,8 +263,7 @@ impl Service {
pusher.ids.app_id.clone(), pusher.ids.app_id.clone(),
pusher.ids.pushkey.clone(), pusher.ids.pushkey.clone(),
); );
device.data.default_payload = http.default_payload.clone(); device.data = http.clone().into();
device.data.format.clone_from(&http.format);
// Tweaks are only added if the format is NOT event_id_only // Tweaks are only added if the format is NOT event_id_only
if !event_id_only { if !event_id_only {

5
src/service/sending.rs
View file

@ -775,7 +775,9 @@ async fn handle_appservice_event(
); );
} }
SendingEventType::Edu(_) => { SendingEventType::Edu(_) => {
// Appservices don't need EDUs (?) // TODO: send EDUs in
// `appservice::event::push_events::v1::Request::ephemeral` if
// enabled in registration
} }
} }
} }
@ -796,6 +798,7 @@ async fn handle_appservice_event(
SendingEventType::Pdu(b) => b.as_bytes(), SendingEventType::Pdu(b) => b.as_bytes(),
}))) })))
.into(), .into(),
ephemeral: Vec::new(),
}, },
) )
.await?; .await?;

2
src/utils/error.rs
View file

@ -67,7 +67,7 @@ pub(crate) enum Error {
BadDatabase(&'static str), BadDatabase(&'static str),
#[error("uiaa")] #[error("uiaa")]
Uiaa(UiaaInfo), Uiaa(UiaaInfo),
#[error("{0}: {1}")] #[error("{}: {}", .0.errcode(), .1)]
BadRequest(ErrorKind, &'static str), BadRequest(ErrorKind, &'static str),
// This is only needed for when a room alias already exists // This is only needed for when a room alias already exists
#[error("{0}")] #[error("{0}")]