From 2cf8ce2a7d346d711de3ff028d9ec59f062c44ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?K=C3=A9vin=20Commaille?= Date: Tue, 3 Mar 2026 19:09:45 +0100 Subject: [PATCH] Upgrade Ruma after breaking change of InvitationRecipient MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Kévin Commaille --- Cargo.lock | 18 +++++++++--------- Cargo.toml | 2 +- crates/matrix-sdk/src/room/mod.rs | 7 +++++-- 3 files changed, 15 insertions(+), 12 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 25ab57f49..bbf213628 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4742,7 +4742,7 @@ dependencies = [ [[package]] name = "ruma" version = "0.14.1" -source = "git+https://github.com/ruma/ruma?rev=1bd55759b8ee083736d239b357c97ec82d12bba1#1bd55759b8ee083736d239b357c97ec82d12bba1" +source = "git+https://github.com/ruma/ruma?rev=2cbb9709cd4e7d59838da55a8405638f045076c0#2cbb9709cd4e7d59838da55a8405638f045076c0" dependencies = [ "assign", "js_int", @@ -4760,7 +4760,7 @@ dependencies = [ [[package]] name = "ruma-client-api" version = "0.22.1" -source = "git+https://github.com/ruma/ruma?rev=1bd55759b8ee083736d239b357c97ec82d12bba1#1bd55759b8ee083736d239b357c97ec82d12bba1" +source = "git+https://github.com/ruma/ruma?rev=2cbb9709cd4e7d59838da55a8405638f045076c0#2cbb9709cd4e7d59838da55a8405638f045076c0" dependencies = [ "as_variant", "assign", @@ -4783,7 +4783,7 @@ dependencies = [ [[package]] name = "ruma-common" version = "0.17.1" -source = "git+https://github.com/ruma/ruma?rev=1bd55759b8ee083736d239b357c97ec82d12bba1#1bd55759b8ee083736d239b357c97ec82d12bba1" +source = "git+https://github.com/ruma/ruma?rev=2cbb9709cd4e7d59838da55a8405638f045076c0#2cbb9709cd4e7d59838da55a8405638f045076c0" dependencies = [ "as_variant", "base64", @@ -4816,7 +4816,7 @@ dependencies = [ [[package]] name = "ruma-events" version = "0.32.1" -source = "git+https://github.com/ruma/ruma?rev=1bd55759b8ee083736d239b357c97ec82d12bba1#1bd55759b8ee083736d239b357c97ec82d12bba1" +source = "git+https://github.com/ruma/ruma?rev=2cbb9709cd4e7d59838da55a8405638f045076c0#2cbb9709cd4e7d59838da55a8405638f045076c0" dependencies = [ "as_variant", "indexmap", @@ -4843,7 +4843,7 @@ dependencies = [ [[package]] name = "ruma-federation-api" version = "0.13.1" -source = "git+https://github.com/ruma/ruma?rev=1bd55759b8ee083736d239b357c97ec82d12bba1#1bd55759b8ee083736d239b357c97ec82d12bba1" +source = "git+https://github.com/ruma/ruma?rev=2cbb9709cd4e7d59838da55a8405638f045076c0#2cbb9709cd4e7d59838da55a8405638f045076c0" dependencies = [ "headers", "http", @@ -4864,7 +4864,7 @@ dependencies = [ [[package]] name = "ruma-html" version = "0.6.0" -source = "git+https://github.com/ruma/ruma?rev=1bd55759b8ee083736d239b357c97ec82d12bba1#1bd55759b8ee083736d239b357c97ec82d12bba1" +source = "git+https://github.com/ruma/ruma?rev=2cbb9709cd4e7d59838da55a8405638f045076c0#2cbb9709cd4e7d59838da55a8405638f045076c0" dependencies = [ "as_variant", "html5ever", @@ -4875,7 +4875,7 @@ dependencies = [ [[package]] name = "ruma-identifiers-validation" version = "0.12.0" -source = "git+https://github.com/ruma/ruma?rev=1bd55759b8ee083736d239b357c97ec82d12bba1#1bd55759b8ee083736d239b357c97ec82d12bba1" +source = "git+https://github.com/ruma/ruma?rev=2cbb9709cd4e7d59838da55a8405638f045076c0#2cbb9709cd4e7d59838da55a8405638f045076c0" dependencies = [ "js_int", "thiserror 2.0.17", @@ -4884,7 +4884,7 @@ dependencies = [ [[package]] name = "ruma-macros" version = "0.17.1" -source = "git+https://github.com/ruma/ruma?rev=1bd55759b8ee083736d239b357c97ec82d12bba1#1bd55759b8ee083736d239b357c97ec82d12bba1" +source = "git+https://github.com/ruma/ruma?rev=2cbb9709cd4e7d59838da55a8405638f045076c0#2cbb9709cd4e7d59838da55a8405638f045076c0" dependencies = [ "as_variant", "cfg-if", @@ -4900,7 +4900,7 @@ dependencies = [ [[package]] name = "ruma-signatures" version = "0.19.0" -source = "git+https://github.com/ruma/ruma?rev=1bd55759b8ee083736d239b357c97ec82d12bba1#1bd55759b8ee083736d239b357c97ec82d12bba1" +source = "git+https://github.com/ruma/ruma?rev=2cbb9709cd4e7d59838da55a8405638f045076c0#2cbb9709cd4e7d59838da55a8405638f045076c0" dependencies = [ "base64", "ed25519-dalek", diff --git a/Cargo.toml b/Cargo.toml index 2077da3d8..845185c19 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -70,7 +70,7 @@ rand = { version = "0.8.5", default-features = false, features = ["std", "std_rn regex = { version = "1.12.2", default-features = false } reqwest = { version = "0.12.24", default-features = false } rmp-serde = { version = "1.3.0", default-features = false } -ruma = { git = "https://github.com/ruma/ruma", rev = "1bd55759b8ee083736d239b357c97ec82d12bba1", features = [ +ruma = { git = "https://github.com/ruma/ruma", rev = "2cbb9709cd4e7d59838da55a8405638f045076c0", features = [ "client-api-c", "compat-unset-avatar", "compat-upload-signatures", diff --git a/crates/matrix-sdk/src/room/mod.rs b/crates/matrix-sdk/src/room/mod.rs index 88fa702d6..844e566f6 100644 --- a/crates/matrix-sdk/src/room/mod.rs +++ b/crates/matrix-sdk/src/room/mod.rs @@ -85,7 +85,10 @@ use ruma::{ filter::LazyLoadOptions, membership::{ Invite3pid, ban_user, forget_room, get_member_events, - invite_user::{self, v3::InvitationRecipient}, + invite_user::{ + self, + v3::{InvitationRecipient, InviteUserId}, + }, kick_user, leave_room, unban_user, }, message::send_message_event, @@ -2001,7 +2004,7 @@ impl Room { shared_room_history::share_room_history(self, user_id.to_owned()).await?; } - let recipient = InvitationRecipient::UserId { user_id: user_id.to_owned() }; + let recipient = InvitationRecipient::UserId(InviteUserId::new(user_id.to_owned())); let request = invite_user::v3::Request::new(self.room_id().to_owned(), recipient); self.client.send(request).await?;