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

respond with actual servers for /_matrix/federation/v1/query/directory requests instead of just us

Browse source 
aka be spec compliant

Signed-off-by: strawberry <strawberry@puppygock.gay>
This commit is contained in:
strawberry 2024-04-07 22:49:52 -04:00 • committed by June
parent 973fed155e
commit 40596634c4
1 changed files with 23 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

24
src/api/server_server.rs
View file

@ -9,6 +9,7 @@ use std::{
use axum::{response::IntoResponse, Json}; use axum::{response::IntoResponse, Json};
use get_profile_information::v1::ProfileField; use get_profile_information::v1::ProfileField;
use rand::seq::SliceRandom;
use ruma::{ use ruma::{
api::{ api::{
client::error::ErrorKind, client::error::ErrorKind,
@ -1423,9 +1424,30 @@ pub async fn get_room_information_route(
.resolve_local_alias(&body.room_alias)? .resolve_local_alias(&body.room_alias)?
.ok_or(Error::BadRequest(ErrorKind::NotFound, "Room alias not found."))?; .ok_or(Error::BadRequest(ErrorKind::NotFound, "Room alias not found."))?;
let mut servers: Vec<OwnedServerName> = services()
.rooms
.state_cache
.room_servers(&room_id)
.filter_map(Result::ok)
.collect::<Vec<_>>();
servers.sort_unstable();
servers.dedup();
servers.shuffle(&mut rand::thread_rng());
// insert our server as the very first choice if in list
if let Some(server_index) = servers
.iter()
.position(|server| server == services().globals.server_name())
{
servers.remove(server_index);
servers.insert(0, services().globals.server_name().to_owned());
}
Ok(get_room_information::v1::Response { Ok(get_room_information::v1::Response {
room_id, room_id,
servers: vec![services().globals.server_name().to_owned()], // TODO: add more than just us servers,
}) })
} }