studio/tuwunel
2
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Bump Ruma.

Browse Source 
Signed-off-by: Jason Volk <jason@zemos.net>
This commit is contained in:
Jason Volk
2025-09-25 03:57:50 +00:00
parent 85b3de055d
commit 377b7166f0
3 changed files with 38 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
Cargo.lock generated
View File

@@ -2129,11 +2129,11 @@ dependencies = [
[[package]] [[package]]
name = "js_option" name = "js_option"
version = "0.1.1" version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "68421373957a1593a767013698dbf206e2b221eefe97a44d98d18672ff38423c" checksum = "c7dd3e281add16813cf673bf74a32249b0aa0d1c8117519a17b3ada5e8552b3c"
dependencies = [ dependencies = [
"serde", "serde_core",
] ]
[[package]] [[package]]
@@ -3430,8 +3430,8 @@ dependencies = [
[[package]] [[package]]
name = "ruma" name = "ruma"
version = "0.12.6" version = "0.13.0"
source = "git+https://github.com/matrix-construct/ruma?rev=5682b88cf1bcaf0f47805d614b476b242ef075d4#5682b88cf1bcaf0f47805d614b476b242ef075d4" source = "git+https://github.com/matrix-construct/ruma?rev=b245c8cb8ab07ebbf7bc250b40385334c3fbf146#b245c8cb8ab07ebbf7bc250b40385334c3fbf146"
dependencies = [ dependencies = [
"assign", "assign",
"js_int", "js_int",
@@ -3449,8 +3449,8 @@ dependencies = [
[[package]] [[package]]
name = "ruma-appservice-api" name = "ruma-appservice-api"
version = "0.12.2" version = "0.13.0"
source = "git+https://github.com/matrix-construct/ruma?rev=5682b88cf1bcaf0f47805d614b476b242ef075d4#5682b88cf1bcaf0f47805d614b476b242ef075d4" source = "git+https://github.com/matrix-construct/ruma?rev=b245c8cb8ab07ebbf7bc250b40385334c3fbf146#b245c8cb8ab07ebbf7bc250b40385334c3fbf146"
dependencies = [ dependencies = [
"js_int", "js_int",
"ruma-common", "ruma-common",
@@ -3461,8 +3461,8 @@ dependencies = [
[[package]] [[package]]
name = "ruma-client-api" name = "ruma-client-api"
version = "0.20.4" version = "0.21.0"
source = "git+https://github.com/matrix-construct/ruma?rev=5682b88cf1bcaf0f47805d614b476b242ef075d4#5682b88cf1bcaf0f47805d614b476b242ef075d4" source = "git+https://github.com/matrix-construct/ruma?rev=b245c8cb8ab07ebbf7bc250b40385334c3fbf146#b245c8cb8ab07ebbf7bc250b40385334c3fbf146"
dependencies = [ dependencies = [
"as_variant", "as_variant",
"assign", "assign",
@@ -3484,8 +3484,8 @@ dependencies = [
[[package]] [[package]]
name = "ruma-common" name = "ruma-common"
version = "0.15.4" version = "0.16.0"
source = "git+https://github.com/matrix-construct/ruma?rev=5682b88cf1bcaf0f47805d614b476b242ef075d4#5682b88cf1bcaf0f47805d614b476b242ef075d4" source = "git+https://github.com/matrix-construct/ruma?rev=b245c8cb8ab07ebbf7bc250b40385334c3fbf146#b245c8cb8ab07ebbf7bc250b40385334c3fbf146"
dependencies = [ dependencies = [
"as_variant", "as_variant",
"base64", "base64",
@@ -3517,8 +3517,8 @@ dependencies = [
[[package]] [[package]]
name = "ruma-events" name = "ruma-events"
version = "0.30.5" version = "0.31.0"
source = "git+https://github.com/matrix-construct/ruma?rev=5682b88cf1bcaf0f47805d614b476b242ef075d4#5682b88cf1bcaf0f47805d614b476b242ef075d4" source = "git+https://github.com/matrix-construct/ruma?rev=b245c8cb8ab07ebbf7bc250b40385334c3fbf146#b245c8cb8ab07ebbf7bc250b40385334c3fbf146"
dependencies = [ dependencies = [
"as_variant", "as_variant",
"indexmap", "indexmap",
@@ -3543,8 +3543,8 @@ dependencies = [
[[package]] [[package]]
name = "ruma-federation-api" name = "ruma-federation-api"
version = "0.11.2" version = "0.12.0"
source = "git+https://github.com/matrix-construct/ruma?rev=5682b88cf1bcaf0f47805d614b476b242ef075d4#5682b88cf1bcaf0f47805d614b476b242ef075d4" source = "git+https://github.com/matrix-construct/ruma?rev=b245c8cb8ab07ebbf7bc250b40385334c3fbf146#b245c8cb8ab07ebbf7bc250b40385334c3fbf146"
dependencies = [ dependencies = [
"bytes", "bytes",
"headers", "headers",
@@ -3565,8 +3565,8 @@ dependencies = [
[[package]] [[package]]
name = "ruma-identifiers-validation" name = "ruma-identifiers-validation"
version = "0.10.1" version = "0.11.0"
source = "git+https://github.com/matrix-construct/ruma?rev=5682b88cf1bcaf0f47805d614b476b242ef075d4#5682b88cf1bcaf0f47805d614b476b242ef075d4" source = "git+https://github.com/matrix-construct/ruma?rev=b245c8cb8ab07ebbf7bc250b40385334c3fbf146#b245c8cb8ab07ebbf7bc250b40385334c3fbf146"
dependencies = [ dependencies = [
"js_int", "js_int",
"thiserror 2.0.16", "thiserror 2.0.16",
@@ -3574,8 +3574,8 @@ dependencies = [
[[package]] [[package]]
name = "ruma-macros" name = "ruma-macros"
version = "0.15.2" version = "0.16.0"
source = "git+https://github.com/matrix-construct/ruma?rev=5682b88cf1bcaf0f47805d614b476b242ef075d4#5682b88cf1bcaf0f47805d614b476b242ef075d4" source = "git+https://github.com/matrix-construct/ruma?rev=b245c8cb8ab07ebbf7bc250b40385334c3fbf146#b245c8cb8ab07ebbf7bc250b40385334c3fbf146"
dependencies = [ dependencies = [
"cfg-if", "cfg-if",
"proc-macro-crate", "proc-macro-crate",
@@ -3584,13 +3584,13 @@ dependencies = [
"ruma-identifiers-validation", "ruma-identifiers-validation",
"serde", "serde",
"syn", "syn",
"toml 0.8.23", "toml 0.9.7",
] ]
[[package]] [[package]]
name = "ruma-push-gateway-api" name = "ruma-push-gateway-api"
version = "0.11.0" version = "0.12.0"
source = "git+https://github.com/matrix-construct/ruma?rev=5682b88cf1bcaf0f47805d614b476b242ef075d4#5682b88cf1bcaf0f47805d614b476b242ef075d4" source = "git+https://github.com/matrix-construct/ruma?rev=b245c8cb8ab07ebbf7bc250b40385334c3fbf146#b245c8cb8ab07ebbf7bc250b40385334c3fbf146"
dependencies = [ dependencies = [
"js_int", "js_int",
"ruma-common", "ruma-common",
@@ -3601,8 +3601,8 @@ dependencies = [
[[package]] [[package]]
name = "ruma-signatures" name = "ruma-signatures"
version = "0.17.1" version = "0.18.0"
source = "git+https://github.com/matrix-construct/ruma?rev=5682b88cf1bcaf0f47805d614b476b242ef075d4#5682b88cf1bcaf0f47805d614b476b242ef075d4" source = "git+https://github.com/matrix-construct/ruma?rev=b245c8cb8ab07ebbf7bc250b40385334c3fbf146#b245c8cb8ab07ebbf7bc250b40385334c3fbf146"
dependencies = [ dependencies = [
"base64", "base64",
"ed25519-dalek", "ed25519-dalek",

3
Cargo.toml
View File

@@ -308,7 +308,7 @@ default-features = false
[workspace.dependencies.ruma] [workspace.dependencies.ruma]
git = "https://github.com/matrix-construct/ruma" git = "https://github.com/matrix-construct/ruma"
rev = "5682b88cf1bcaf0f47805d614b476b242ef075d4" rev = "b245c8cb8ab07ebbf7bc250b40385334c3fbf146"
features = [ features = [
"__compat", "__compat",
"appservice-api-c", "appservice-api-c",
@@ -338,6 +338,7 @@ features = [
"unstable-msc4133", "unstable-msc4133",
"unstable-msc4186", "unstable-msc4186",
"unstable-msc4203", # sending to-device events to appservices "unstable-msc4203", # sending to-device events to appservices
"unstable-msc4310",
"unstable-msc4311", "unstable-msc4311",
"unstable-extensible-events", "unstable-extensible-events",
"unstable-hydra", "unstable-hydra",

26
src/api/client/membership/members.rs
View File

@@ -2,7 +2,7 @@ use axum::extract::State;
use futures::{FutureExt, StreamExt, pin_mut}; use futures::{FutureExt, StreamExt, pin_mut};
use ruma::{ use ruma::{
api::client::membership::{ api::client::membership::{
get_member_events::{self, v3::MembershipEventFilter}, get_member_events::{self},
joined_members::{self, v3::RoomMember}, joined_members::{self, v3::RoomMember},
}, },
events::{ events::{
@@ -94,9 +94,7 @@ pub(crate) async fn joined_members_route(
.ready_filter_map(Result::ok) .ready_filter_map(Result::ok)
.ready_filter(|((ty, _), _)| *ty == StateEventType::RoomMember) .ready_filter(|((ty, _), _)| *ty == StateEventType::RoomMember)
.map(at!(1)) .map(at!(1))
.ready_filter_map(|pdu| { .ready_filter_map(|pdu| membership_filter(pdu, Some(&MembershipState::Join), None))
membership_filter(pdu, Some(&MembershipEventFilter::Join), None)
})
.ready_filter_map(|pdu| { .ready_filter_map(|pdu| {
let content = pdu.get_content::<RoomMemberEventContent>().ok()?; let content = pdu.get_content::<RoomMemberEventContent>().ok()?;
let sender = pdu.sender().to_owned(); let sender = pdu.sender().to_owned();
@@ -115,22 +113,22 @@ pub(crate) async fn joined_members_route(
fn membership_filter<Pdu: Event>( fn membership_filter<Pdu: Event>(
pdu: Pdu, pdu: Pdu,
for_membership: Option<&MembershipEventFilter>, for_membership: Option<&MembershipState>,
not_membership: Option<&MembershipEventFilter>, not_membership: Option<&MembershipState>,
) -> Option<impl Event> { ) -> Option<impl Event> {
let membership_state_filter = match for_membership { let membership_state_filter = match for_membership {
| Some(MembershipEventFilter::Ban) => MembershipState::Ban, | Some(MembershipState::Ban) => MembershipState::Ban,
| Some(MembershipEventFilter::Invite) => MembershipState::Invite, | Some(MembershipState::Invite) => MembershipState::Invite,
| Some(MembershipEventFilter::Knock) => MembershipState::Knock, | Some(MembershipState::Knock) => MembershipState::Knock,
| Some(MembershipEventFilter::Leave) => MembershipState::Leave, | Some(MembershipState::Leave) => MembershipState::Leave,
| Some(_) | None => MembershipState::Join, | Some(_) | None => MembershipState::Join,
}; };
let not_membership_state_filter = match not_membership { let not_membership_state_filter = match not_membership {
| Some(MembershipEventFilter::Ban) => MembershipState::Ban, | Some(MembershipState::Ban) => MembershipState::Ban,
| Some(MembershipEventFilter::Invite) => MembershipState::Invite, | Some(MembershipState::Invite) => MembershipState::Invite,
| Some(MembershipEventFilter::Join) => MembershipState::Join, | Some(MembershipState::Join) => MembershipState::Join,
| Some(MembershipEventFilter::Knock) => MembershipState::Knock, | Some(MembershipState::Knock) => MembershipState::Knock,
| Some(_) | None => MembershipState::Leave, | Some(_) | None => MembershipState::Leave,
}; };