TudbuT/conduit
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'joinfix' into 'next'

Browse source 
improvement: randomize server order for alias joins

See merge request famedly/conduit!491
This commit is contained in:
Timo Kösters 2023-06-28 15:47:36 +00:00
commit 6a6f8e80f1
2 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/api/client_server/alias.rs
View file

@ -1,4 +1,5 @@
use crate::{services, Error, Result, Ruma}; use crate::{services, Error, Result, Ruma};
use rand::seq::SliceRandom;
use regex::Regex; use regex::Regex;
use ruma::{ use ruma::{
api::{ api::{
@ -90,10 +91,10 @@ pub(crate) async fn get_alias_helper(
) )
.await?; .await?;
return Ok(get_alias::v3::Response::new( let mut servers = response.servers;
response.room_id, servers.shuffle(&mut rand::thread_rng());
response.servers,
)); return Ok(get_alias::v3::Response::new(response.room_id, servers));
} }
let mut room_id = None; let mut room_id = None;

2
src/api/client_server/membership.rs
View file

@ -112,7 +112,7 @@ pub async fn join_room_by_id_or_alias_route(
Err(room_alias) => { Err(room_alias) => {
let response = get_alias_helper(room_alias).await?; let response = get_alias_helper(room_alias).await?;
(response.servers.into_iter().collect(), response.room_id) (response.servers, response.room_id)
} }
}; };