From 3d7d28fba7ae6147eb9ebb9780fc40a310664455 Mon Sep 17 00:00:00 2001 From: Olivia Lee Date: Sat, 2 Aug 2025 17:59:35 -0700 Subject: [PATCH] Bump ruma to 5aebd8f81fc70226940c1a46eb57ef298230d34f (SupportedVersions refactor) --- Cargo.lock | 30 +++++++++++++++--------------- Cargo.toml | 2 +- src/api/appservice_server.rs | 7 +++++-- src/api/server_server.rs | 7 +++++-- src/service/pusher.rs | 6 +++++- 5 files changed, 31 insertions(+), 21 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 6c7c97d8..9a9e4e93 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2441,8 +2441,8 @@ dependencies = [ [[package]] name = "ruma" -version = "0.12.2" -source = "git+https://github.com/ruma/ruma.git?rev=c4f467781a7ef330dc0b7eb5d0d0cad77ebc3337#c4f467781a7ef330dc0b7eb5d0d0cad77ebc3337" +version = "0.12.3" +source = "git+https://github.com/ruma/ruma.git?rev=5aebd8f81fc70226940c1a46eb57ef298230d34f#5aebd8f81fc70226940c1a46eb57ef298230d34f" dependencies = [ "assign", "js_int", @@ -2460,8 +2460,8 @@ dependencies = [ [[package]] name = "ruma-appservice-api" -version = "0.12.1" -source = "git+https://github.com/ruma/ruma.git?rev=c4f467781a7ef330dc0b7eb5d0d0cad77ebc3337#c4f467781a7ef330dc0b7eb5d0d0cad77ebc3337" +version = "0.12.2" +source = "git+https://github.com/ruma/ruma.git?rev=5aebd8f81fc70226940c1a46eb57ef298230d34f#5aebd8f81fc70226940c1a46eb57ef298230d34f" dependencies = [ "js_int", "ruma-common", @@ -2472,8 +2472,8 @@ dependencies = [ [[package]] name = "ruma-client-api" -version = "0.20.2" -source = "git+https://github.com/ruma/ruma.git?rev=c4f467781a7ef330dc0b7eb5d0d0cad77ebc3337#c4f467781a7ef330dc0b7eb5d0d0cad77ebc3337" +version = "0.20.3" +source = "git+https://github.com/ruma/ruma.git?rev=5aebd8f81fc70226940c1a46eb57ef298230d34f#5aebd8f81fc70226940c1a46eb57ef298230d34f" dependencies = [ "as_variant", "assign", @@ -2496,7 +2496,7 @@ dependencies = [ [[package]] name = "ruma-common" version = "0.15.2" -source = "git+https://github.com/ruma/ruma.git?rev=c4f467781a7ef330dc0b7eb5d0d0cad77ebc3337#c4f467781a7ef330dc0b7eb5d0d0cad77ebc3337" +source = "git+https://github.com/ruma/ruma.git?rev=5aebd8f81fc70226940c1a46eb57ef298230d34f#5aebd8f81fc70226940c1a46eb57ef298230d34f" dependencies = [ "as_variant", "base64", @@ -2526,8 +2526,8 @@ dependencies = [ [[package]] name = "ruma-events" -version = "0.30.2" -source = "git+https://github.com/ruma/ruma.git?rev=c4f467781a7ef330dc0b7eb5d0d0cad77ebc3337#c4f467781a7ef330dc0b7eb5d0d0cad77ebc3337" +version = "0.30.3" +source = "git+https://github.com/ruma/ruma.git?rev=5aebd8f81fc70226940c1a46eb57ef298230d34f#5aebd8f81fc70226940c1a46eb57ef298230d34f" dependencies = [ "as_variant", "indexmap 2.10.0", @@ -2550,7 +2550,7 @@ dependencies = [ [[package]] name = "ruma-federation-api" version = "0.11.1" -source = "git+https://github.com/ruma/ruma.git?rev=c4f467781a7ef330dc0b7eb5d0d0cad77ebc3337#c4f467781a7ef330dc0b7eb5d0d0cad77ebc3337" +source = "git+https://github.com/ruma/ruma.git?rev=5aebd8f81fc70226940c1a46eb57ef298230d34f#5aebd8f81fc70226940c1a46eb57ef298230d34f" dependencies = [ "bytes", "headers", @@ -2572,7 +2572,7 @@ dependencies = [ [[package]] name = "ruma-identifiers-validation" version = "0.10.1" -source = "git+https://github.com/ruma/ruma.git?rev=c4f467781a7ef330dc0b7eb5d0d0cad77ebc3337#c4f467781a7ef330dc0b7eb5d0d0cad77ebc3337" +source = "git+https://github.com/ruma/ruma.git?rev=5aebd8f81fc70226940c1a46eb57ef298230d34f#5aebd8f81fc70226940c1a46eb57ef298230d34f" dependencies = [ "js_int", "thiserror 2.0.12", @@ -2581,7 +2581,7 @@ dependencies = [ [[package]] name = "ruma-macros" version = "0.15.1" -source = "git+https://github.com/ruma/ruma.git?rev=c4f467781a7ef330dc0b7eb5d0d0cad77ebc3337#c4f467781a7ef330dc0b7eb5d0d0cad77ebc3337" +source = "git+https://github.com/ruma/ruma.git?rev=5aebd8f81fc70226940c1a46eb57ef298230d34f#5aebd8f81fc70226940c1a46eb57ef298230d34f" dependencies = [ "cfg-if", "proc-macro-crate", @@ -2596,7 +2596,7 @@ dependencies = [ [[package]] name = "ruma-push-gateway-api" version = "0.11.0" -source = "git+https://github.com/ruma/ruma.git?rev=c4f467781a7ef330dc0b7eb5d0d0cad77ebc3337#c4f467781a7ef330dc0b7eb5d0d0cad77ebc3337" +source = "git+https://github.com/ruma/ruma.git?rev=5aebd8f81fc70226940c1a46eb57ef298230d34f#5aebd8f81fc70226940c1a46eb57ef298230d34f" dependencies = [ "js_int", "ruma-common", @@ -2608,7 +2608,7 @@ dependencies = [ [[package]] name = "ruma-signatures" version = "0.17.1" -source = "git+https://github.com/ruma/ruma.git?rev=c4f467781a7ef330dc0b7eb5d0d0cad77ebc3337#c4f467781a7ef330dc0b7eb5d0d0cad77ebc3337" +source = "git+https://github.com/ruma/ruma.git?rev=5aebd8f81fc70226940c1a46eb57ef298230d34f#5aebd8f81fc70226940c1a46eb57ef298230d34f" dependencies = [ "base64", "ed25519-dalek", @@ -2624,7 +2624,7 @@ dependencies = [ [[package]] name = "ruma-state-res" version = "0.13.0" -source = "git+https://github.com/ruma/ruma.git?rev=c4f467781a7ef330dc0b7eb5d0d0cad77ebc3337#c4f467781a7ef330dc0b7eb5d0d0cad77ebc3337" +source = "git+https://github.com/ruma/ruma.git?rev=5aebd8f81fc70226940c1a46eb57ef298230d34f#5aebd8f81fc70226940c1a46eb57ef298230d34f" dependencies = [ "js_int", "ruma-common", diff --git a/Cargo.toml b/Cargo.toml index 3c722659..92c95947 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -145,7 +145,7 @@ xdg = "2.5.2" [dependencies.ruma] git = "https://github.com/ruma/ruma.git" -rev = "c4f467781a7ef330dc0b7eb5d0d0cad77ebc3337" +rev = "5aebd8f81fc70226940c1a46eb57ef298230d34f" features = [ "compat-server-signing-key-version", "compat-empty-string-null", diff --git a/src/api/appservice_server.rs b/src/api/appservice_server.rs index 117d1914..ba2c4652 100644 --- a/src/api/appservice_server.rs +++ b/src/api/appservice_server.rs @@ -3,7 +3,7 @@ use std::{fmt::Debug, mem, time::Duration}; use bytes::BytesMut; use ruma::api::{ appservice::Registration, IncomingResponse, MatrixVersion, OutgoingRequest, - SendAccessToken, + SendAccessToken, SupportedVersions, }; use tracing::warn; @@ -31,7 +31,10 @@ where .try_into_http_request::( &destination, SendAccessToken::IfRequired(hs_token), - &[MatrixVersion::V1_0], + &SupportedVersions { + versions: [MatrixVersion::V1_0].into_iter().collect(), + features: vec![], + }, ) .unwrap() .map(BytesMut::freeze); diff --git a/src/api/server_server.rs b/src/api/server_server.rs index 39b208f0..aab20c89 100644 --- a/src/api/server_server.rs +++ b/src/api/server_server.rs @@ -42,7 +42,7 @@ use ruma::{ }, }, EndpointError, IncomingResponse, MatrixVersion, OutgoingRequest, - OutgoingResponse, SendAccessToken, + OutgoingResponse, SendAccessToken, SupportedVersions, }, directory::{Filter, RoomNetwork}, events::{ @@ -199,7 +199,10 @@ where .try_into_http_request::>( &actual_destination_str, SendAccessToken::IfRequired(""), - &[MatrixVersion::V1_11], + &SupportedVersions { + versions: [MatrixVersion::V1_11].into_iter().collect(), + features: vec![], + }, ) .map_err(|error| { warn!( diff --git a/src/service/pusher.rs b/src/service/pusher.rs index 8f58cea8..c55090d1 100644 --- a/src/service/pusher.rs +++ b/src/service/pusher.rs @@ -11,6 +11,7 @@ use ruma::{ }, }, IncomingResponse, MatrixVersion, OutgoingRequest, SendAccessToken, + SupportedVersions, }, events::{ room::power_levels::RoomPowerLevelsEventContent, AnySyncTimelineEvent, @@ -78,7 +79,10 @@ impl Service { .try_into_http_request::( &destination, SendAccessToken::IfRequired(""), - &[MatrixVersion::V1_0], + &SupportedVersions { + versions: [MatrixVersion::V1_0].into_iter().collect(), + features: vec![], + }, ) .map_err(|error| { warn!(%error, %destination, "Failed to find destination");