From 377b7166f0c4d5e93e548acc860067205d7af695 Mon Sep 17 00:00:00 2001 From: Jason Volk Date: Thu, 25 Sep 2025 03:57:50 +0000 Subject: [PATCH] Bump Ruma. Signed-off-by: Jason Volk --- Cargo.lock | 48 ++++++++++++++-------------- Cargo.toml | 3 +- src/api/client/membership/members.rs | 26 +++++++-------- 3 files changed, 38 insertions(+), 39 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index c2559522..fa47a871 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2129,11 +2129,11 @@ dependencies = [ [[package]] name = "js_option" -version = "0.1.1" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68421373957a1593a767013698dbf206e2b221eefe97a44d98d18672ff38423c" +checksum = "c7dd3e281add16813cf673bf74a32249b0aa0d1c8117519a17b3ada5e8552b3c" dependencies = [ - "serde", + "serde_core", ] [[package]] @@ -3430,8 +3430,8 @@ dependencies = [ [[package]] name = "ruma" -version = "0.12.6" -source = "git+https://github.com/matrix-construct/ruma?rev=5682b88cf1bcaf0f47805d614b476b242ef075d4#5682b88cf1bcaf0f47805d614b476b242ef075d4" +version = "0.13.0" +source = "git+https://github.com/matrix-construct/ruma?rev=b245c8cb8ab07ebbf7bc250b40385334c3fbf146#b245c8cb8ab07ebbf7bc250b40385334c3fbf146" dependencies = [ "assign", "js_int", @@ -3449,8 +3449,8 @@ dependencies = [ [[package]] name = "ruma-appservice-api" -version = "0.12.2" -source = "git+https://github.com/matrix-construct/ruma?rev=5682b88cf1bcaf0f47805d614b476b242ef075d4#5682b88cf1bcaf0f47805d614b476b242ef075d4" +version = "0.13.0" +source = "git+https://github.com/matrix-construct/ruma?rev=b245c8cb8ab07ebbf7bc250b40385334c3fbf146#b245c8cb8ab07ebbf7bc250b40385334c3fbf146" dependencies = [ "js_int", "ruma-common", @@ -3461,8 +3461,8 @@ dependencies = [ [[package]] name = "ruma-client-api" -version = "0.20.4" -source = "git+https://github.com/matrix-construct/ruma?rev=5682b88cf1bcaf0f47805d614b476b242ef075d4#5682b88cf1bcaf0f47805d614b476b242ef075d4" +version = "0.21.0" +source = "git+https://github.com/matrix-construct/ruma?rev=b245c8cb8ab07ebbf7bc250b40385334c3fbf146#b245c8cb8ab07ebbf7bc250b40385334c3fbf146" dependencies = [ "as_variant", "assign", @@ -3484,8 +3484,8 @@ dependencies = [ [[package]] name = "ruma-common" -version = "0.15.4" -source = "git+https://github.com/matrix-construct/ruma?rev=5682b88cf1bcaf0f47805d614b476b242ef075d4#5682b88cf1bcaf0f47805d614b476b242ef075d4" +version = "0.16.0" +source = "git+https://github.com/matrix-construct/ruma?rev=b245c8cb8ab07ebbf7bc250b40385334c3fbf146#b245c8cb8ab07ebbf7bc250b40385334c3fbf146" dependencies = [ "as_variant", "base64", @@ -3517,8 +3517,8 @@ dependencies = [ [[package]] name = "ruma-events" -version = "0.30.5" -source = "git+https://github.com/matrix-construct/ruma?rev=5682b88cf1bcaf0f47805d614b476b242ef075d4#5682b88cf1bcaf0f47805d614b476b242ef075d4" +version = "0.31.0" +source = "git+https://github.com/matrix-construct/ruma?rev=b245c8cb8ab07ebbf7bc250b40385334c3fbf146#b245c8cb8ab07ebbf7bc250b40385334c3fbf146" dependencies = [ "as_variant", "indexmap", @@ -3543,8 +3543,8 @@ dependencies = [ [[package]] name = "ruma-federation-api" -version = "0.11.2" -source = "git+https://github.com/matrix-construct/ruma?rev=5682b88cf1bcaf0f47805d614b476b242ef075d4#5682b88cf1bcaf0f47805d614b476b242ef075d4" +version = "0.12.0" +source = "git+https://github.com/matrix-construct/ruma?rev=b245c8cb8ab07ebbf7bc250b40385334c3fbf146#b245c8cb8ab07ebbf7bc250b40385334c3fbf146" dependencies = [ "bytes", "headers", @@ -3565,8 +3565,8 @@ dependencies = [ [[package]] name = "ruma-identifiers-validation" -version = "0.10.1" -source = "git+https://github.com/matrix-construct/ruma?rev=5682b88cf1bcaf0f47805d614b476b242ef075d4#5682b88cf1bcaf0f47805d614b476b242ef075d4" +version = "0.11.0" +source = "git+https://github.com/matrix-construct/ruma?rev=b245c8cb8ab07ebbf7bc250b40385334c3fbf146#b245c8cb8ab07ebbf7bc250b40385334c3fbf146" dependencies = [ "js_int", "thiserror 2.0.16", @@ -3574,8 +3574,8 @@ dependencies = [ [[package]] name = "ruma-macros" -version = "0.15.2" -source = "git+https://github.com/matrix-construct/ruma?rev=5682b88cf1bcaf0f47805d614b476b242ef075d4#5682b88cf1bcaf0f47805d614b476b242ef075d4" +version = "0.16.0" +source = "git+https://github.com/matrix-construct/ruma?rev=b245c8cb8ab07ebbf7bc250b40385334c3fbf146#b245c8cb8ab07ebbf7bc250b40385334c3fbf146" dependencies = [ "cfg-if", "proc-macro-crate", @@ -3584,13 +3584,13 @@ dependencies = [ "ruma-identifiers-validation", "serde", "syn", - "toml 0.8.23", + "toml 0.9.7", ] [[package]] name = "ruma-push-gateway-api" -version = "0.11.0" -source = "git+https://github.com/matrix-construct/ruma?rev=5682b88cf1bcaf0f47805d614b476b242ef075d4#5682b88cf1bcaf0f47805d614b476b242ef075d4" +version = "0.12.0" +source = "git+https://github.com/matrix-construct/ruma?rev=b245c8cb8ab07ebbf7bc250b40385334c3fbf146#b245c8cb8ab07ebbf7bc250b40385334c3fbf146" dependencies = [ "js_int", "ruma-common", @@ -3601,8 +3601,8 @@ dependencies = [ [[package]] name = "ruma-signatures" -version = "0.17.1" -source = "git+https://github.com/matrix-construct/ruma?rev=5682b88cf1bcaf0f47805d614b476b242ef075d4#5682b88cf1bcaf0f47805d614b476b242ef075d4" +version = "0.18.0" +source = "git+https://github.com/matrix-construct/ruma?rev=b245c8cb8ab07ebbf7bc250b40385334c3fbf146#b245c8cb8ab07ebbf7bc250b40385334c3fbf146" dependencies = [ "base64", "ed25519-dalek", diff --git a/Cargo.toml b/Cargo.toml index 1b7eb457..09a8f43b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -308,7 +308,7 @@ default-features = false [workspace.dependencies.ruma] git = "https://github.com/matrix-construct/ruma" -rev = "5682b88cf1bcaf0f47805d614b476b242ef075d4" +rev = "b245c8cb8ab07ebbf7bc250b40385334c3fbf146" features = [ "__compat", "appservice-api-c", @@ -338,6 +338,7 @@ features = [ "unstable-msc4133", "unstable-msc4186", "unstable-msc4203", # sending to-device events to appservices + "unstable-msc4310", "unstable-msc4311", "unstable-extensible-events", "unstable-hydra", diff --git a/src/api/client/membership/members.rs b/src/api/client/membership/members.rs index 9598e912..2db47c28 100644 --- a/src/api/client/membership/members.rs +++ b/src/api/client/membership/members.rs @@ -2,7 +2,7 @@ use axum::extract::State; use futures::{FutureExt, StreamExt, pin_mut}; use ruma::{ api::client::membership::{ - get_member_events::{self, v3::MembershipEventFilter}, + get_member_events::{self}, joined_members::{self, v3::RoomMember}, }, events::{ @@ -94,9 +94,7 @@ pub(crate) async fn joined_members_route( .ready_filter_map(Result::ok) .ready_filter(|((ty, _), _)| *ty == StateEventType::RoomMember) .map(at!(1)) - .ready_filter_map(|pdu| { - membership_filter(pdu, Some(&MembershipEventFilter::Join), None) - }) + .ready_filter_map(|pdu| membership_filter(pdu, Some(&MembershipState::Join), None)) .ready_filter_map(|pdu| { let content = pdu.get_content::().ok()?; let sender = pdu.sender().to_owned(); @@ -115,22 +113,22 @@ pub(crate) async fn joined_members_route( fn membership_filter( pdu: Pdu, - for_membership: Option<&MembershipEventFilter>, - not_membership: Option<&MembershipEventFilter>, + for_membership: Option<&MembershipState>, + not_membership: Option<&MembershipState>, ) -> Option { let membership_state_filter = match for_membership { - | Some(MembershipEventFilter::Ban) => MembershipState::Ban, - | Some(MembershipEventFilter::Invite) => MembershipState::Invite, - | Some(MembershipEventFilter::Knock) => MembershipState::Knock, - | Some(MembershipEventFilter::Leave) => MembershipState::Leave, + | Some(MembershipState::Ban) => MembershipState::Ban, + | Some(MembershipState::Invite) => MembershipState::Invite, + | Some(MembershipState::Knock) => MembershipState::Knock, + | Some(MembershipState::Leave) => MembershipState::Leave, | Some(_) | None => MembershipState::Join, }; let not_membership_state_filter = match not_membership { - | Some(MembershipEventFilter::Ban) => MembershipState::Ban, - | Some(MembershipEventFilter::Invite) => MembershipState::Invite, - | Some(MembershipEventFilter::Join) => MembershipState::Join, - | Some(MembershipEventFilter::Knock) => MembershipState::Knock, + | Some(MembershipState::Ban) => MembershipState::Ban, + | Some(MembershipState::Invite) => MembershipState::Invite, + | Some(MembershipState::Join) => MembershipState::Join, + | Some(MembershipState::Knock) => MembershipState::Knock, | Some(_) | None => MembershipState::Leave, };