magmaus3/continuwuity
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

use string::EMPTY; minor formatting and misc cleanups

Browse source 
Signed-off-by: Jason Volk <jason@zemos.net>
This commit is contained in:
Jason Volk 2024-10-13 00:57:08 +00:00 • committed by strawberry
parent 89b5c4ee1c
commit 1a09eb0f02
2 changed files with 15 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/api/client/membership.rs
View file

@ -658,13 +658,16 @@ pub async fn join_room_by_id_helper(
});
}
if services
let server_in_room = services
.rooms
.state_cache
.server_in_room(services.globals.server_name(), room_id)
.await || servers.is_empty()
|| (servers.len() == 1 && services.globals.server_is_ours(&servers[0]))
{
.await;
let local_join =
server_in_room || servers.is_empty() || (servers.len() == 1 && services.globals.server_is_ours(&servers[0]));
if local_join {
join_room_by_id_helper_local(services, sender_user, room_id, reason, servers, third_party_signed, state_lock)
.boxed()
.await