git-mirrors/continuwuity
1
0
Fork 0
mirror of https://forgejo.ellis.link/continuwuation/continuwuity.git synced 2025-09-09 13:53:03 +02:00
Code Issues Projects Releases Packages Wiki Activity

feat: Only inject vias when manual ones aren't provided during join

Browse source
This commit is contained in:
nexy7574 2025-07-31 17:48:30 +01:00 • committed by nex
commit 76b93e252d
1 changed files with 26 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

49
src/api/client/membership/join.rs
View file

@ -156,31 +156,34 @@ pub(crate) async fn join_room_by_id_or_alias_route(
.await?; .await?;
let mut servers = body.via.clone(); let mut servers = body.via.clone();
servers.extend( if servers.is_empty() {
services debug!("No via servers provided for join, injecting some.");
.rooms servers.extend(
.state_cache services
.servers_invite_via(&room_id) .rooms
.map(ToOwned::to_owned) .state_cache
.collect::<Vec<_>>() .servers_invite_via(&room_id)
.await, .map(ToOwned::to_owned)
); .collect::<Vec<_>>()
.await,
);
servers.extend( servers.extend(
services services
.rooms .rooms
.state_cache .state_cache
.invite_state(sender_user, &room_id) .invite_state(sender_user, &room_id)
.await .await
.unwrap_or_default() .unwrap_or_default()
.iter() .iter()
.filter_map(|event| event.get_field("sender").ok().flatten()) .filter_map(|event| event.get_field("sender").ok().flatten())
.filter_map(|sender: &str| UserId::parse(sender).ok()) .filter_map(|sender: &str| UserId::parse(sender).ok())
.map(|user| user.server_name().to_owned()), .map(|user| user.server_name().to_owned()),
); );
if let Some(server) = room_id.server_name() { if let Some(server) = room_id.server_name() {
servers.push(server.to_owned()); servers.push(server.to_owned());
}
} }
servers.sort_unstable(); servers.sort_unstable();