rzerres/conduit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update ruma

Browse Source
This commit is contained in:
Jonas Platte
2020-08-12 23:32:39 +02:00
parent 4b3d6e736f
commit 75ea0b3163
14 changed files with 152 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/client_server/alias.rs
View File

@@ -14,7 +14,7 @@ use rocket::{delete, get, put};
)]
pub fn create_alias_route(
db: State<'_, Database>,
body: Ruma<create_alias::Request>,
body: Ruma<create_alias::IncomingRequest>,
) -> ConduitResult<create_alias::Response> {
if db.rooms.id_from_alias(&body.room_alias)?.is_some() {
return Err(Error::Conflict("Alias already exists."));
@@ -32,7 +32,7 @@ pub fn create_alias_route(
)]
pub fn delete_alias_route(
db: State<'_, Database>,
body: Ruma<delete_alias::Request>,
body: Ruma<delete_alias::IncomingRequest>,
) -> ConduitResult<delete_alias::Response> {
db.rooms.set_alias(&body.room_alias, None, &db.globals)?;
@@ -45,7 +45,7 @@ pub fn delete_alias_route(
)]
pub fn get_alias_route(
db: State<'_, Database>,
body: Ruma<get_alias::Request>,
body: Ruma<get_alias::IncomingRequest>,
) -> ConduitResult<get_alias::Response> {
if body.room_alias.server_name() != db.globals.server_name() {
todo!("ask remote server");