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

Simplify return type of most route handlers

Browse source
This commit is contained in:
Jonas Platte 2022-01-22 16:58:32 +01:00
parent 77a87881c9
commit 5fa9190117
No known key found for this signature in database
GPG key ID: 7D261D771D915378
38 changed files with 358 additions and 414 deletions
Download patch file Download diff file Expand all files Collapse all files

21
src/client_server/alias.rs
View file

@ -1,4 +1,4 @@
use crate::{database::DatabaseGuard, ConduitResult, Database, Error, Ruma};
use crate::{database::DatabaseGuard, Database, Error, Result, Ruma};
use regex::Regex;
use ruma::{
api::{
@ -19,7 +19,7 @@ use ruma::{
pub async fn create_alias_route(
db: DatabaseGuard,
body: Ruma<create_alias::Request<'_>>,
) -> ConduitResult<create_alias::Response> {
) -> Result<create_alias::Response> {
if body.room_alias.server_name() != db.globals.server_name() {
return Err(Error::BadRequest(
ErrorKind::InvalidParam,
@ -36,7 +36,7 @@ pub async fn create_alias_route(
db.flush()?;
Ok(create_alias::Response::new().into())
Ok(create_alias::Response::new())
}
/// # `DELETE /_matrix/client/r0/directory/room/{roomAlias}`
@ -49,7 +49,7 @@ pub async fn create_alias_route(
pub async fn delete_alias_route(
db: DatabaseGuard,
body: Ruma<delete_alias::Request<'_>>,
) -> ConduitResult<delete_alias::Response> {
) -> Result<delete_alias::Response> {
if body.room_alias.server_name() != db.globals.server_name() {
return Err(Error::BadRequest(
ErrorKind::InvalidParam,
@ -63,7 +63,7 @@ pub async fn delete_alias_route(
db.flush()?;
Ok(delete_alias::Response::new().into())
Ok(delete_alias::Response::new())
}
/// # `GET /_matrix/client/r0/directory/room/{roomAlias}`
@ -75,14 +75,14 @@ pub async fn delete_alias_route(
pub async fn get_alias_route(
db: DatabaseGuard,
body: Ruma<get_alias::Request<'_>>,
) -> ConduitResult<get_alias::Response> {
) -> Result<get_alias::Response> {
get_alias_helper(&db, &body.room_alias).await
}
pub(crate) async fn get_alias_helper(
db: &Database,
room_alias: &RoomAliasId,
) -> ConduitResult<get_alias::Response> {
) -> Result<get_alias::Response> {
if room_alias.server_name() != db.globals.server_name() {
let response = db
.sending
@ -93,7 +93,7 @@ pub(crate) async fn get_alias_helper(
)
.await?;
return Ok(get_alias::Response::new(response.room_id, response.servers).into());
return Ok(get_alias::Response::new(response.room_id, response.servers));
}
let mut room_id = None;
@ -144,5 +144,8 @@ pub(crate) async fn get_alias_helper(
}
};
Ok(get_alias::Response::new(room_id, vec![db.globals.server_name().to_owned()]).into())
Ok(get_alias::Response::new(
room_id,
vec![db.globals.server_name().to_owned()],
))
}