improvement: try out multiple servers when joining remote rooms

This commit is contained in:
Timo Kösters 2020-09-14 11:00:31 +02:00
parent 1f292c09f2
commit c5313b3e8f
No known key found for this signature in database
GPG key ID: 24DA7517711A2BA4
5 changed files with 65 additions and 48 deletions

View file

@ -19,7 +19,7 @@ use ruma::{
room::{avatar, canonical_alias, guest_access, history_visibility, name, topic},
EventType,
},
Raw,
Raw, ServerName,
};
#[cfg(feature = "conduit_bin")]
@ -65,9 +65,9 @@ pub async fn get_public_rooms_route(
) -> ConduitResult<get_public_rooms::Response> {
let response = get_public_rooms_filtered_helper(
&db,
body.body.server.as_deref(),
body.body.limit,
body.body.since.as_deref(),
body.server.as_deref(),
body.limit,
body.since.as_deref(),
None, // This is not used
None, // This is not used
)
@ -119,7 +119,7 @@ pub async fn get_room_visibility_route(
pub async fn get_public_rooms_filtered_helper(
db: &Database,
server: Option<&str>,
server: Option<&ServerName>,
limit: Option<js_int::UInt>,
since: Option<&str>,
_filter: Option<IncomingFilter>,
@ -131,7 +131,7 @@ pub async fn get_public_rooms_filtered_helper(
{
let response = server_server::send_request(
&db,
other_server.to_owned(),
other_server,
federation::directory::get_public_rooms::v1::Request {
limit,
since: since.as_deref(),