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

feat: first steps towards joining rooms over federation

Browse source
This commit is contained in:
Timo 2020-08-14 11:31:31 +02:00
parent f40f1d9f75
commit 04eee089e0
No known key found for this signature in database
GPG key ID: 24DA7517711A2BA4
10 changed files with 291 additions and 143 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/client_server/alias.rs
View file

@ -1,9 +1,9 @@
use super::State;
use crate::{ConduitResult, Database, Error, Ruma};
use ruma::api::client::{
use crate::{ConduitResult, Database, Error, Ruma, server_server};
use ruma::api::{federation, client::{
error::ErrorKind,
r0::alias::{create_alias, delete_alias, get_alias},
};
}};
#[cfg(feature = "conduit_bin")]
use rocket::{delete, get, put};
@ -43,12 +43,25 @@ pub fn delete_alias_route(
feature = "conduit_bin",
get("/_matrix/client/r0/directory/room/<_>", data = "<body>")
)]
pub fn get_alias_route(
pub async fn get_alias_route(
db: State<'_, Database>,
body: Ruma<get_alias::IncomingRequest>,
) -> ConduitResult<get_alias::Response> {
if body.room_alias.server_name() != db.globals.server_name() {
todo!("ask remote server");
let response = server_server::send_request(
&db,
body.room_alias.server_name().to_string(),
federation::query::get_room_information::v1::Request {
room_alias: body.room_alias.to_string(),
},
)
.await?;
return Ok(get_alias::Response {
room_id: response.room_id,
servers: response.servers,
}
.into());
}
let room_id = db