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

use macro for error constructions

Browse source 
Signed-off-by: Jason Volk <jason@zemos.net>
This commit is contained in:
Jason Volk 2024-12-18 03:32:58 +00:00 • committed by strawberry
parent 4d46df2af5
commit 60a952508e
1 changed files with 12 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

35
src/service/rooms/alias/mod.rs
View file

@ -5,12 +5,11 @@ use std::sync::Arc;
use conduwuit::{ use conduwuit::{
err, err,
utils::{stream::TryIgnore, ReadyExt}, utils::{stream::TryIgnore, ReadyExt},
Err, Error, Result, Err, Result,
}; };
use database::{Deserialized, Ignore, Interfix, Map}; use database::{Deserialized, Ignore, Interfix, Map};
use futures::{Stream, StreamExt}; use futures::{Stream, StreamExt, TryFutureExt};
use ruma::{ use ruma::{
api::client::error::ErrorKind,
events::{ events::{
room::power_levels::{RoomPowerLevels, RoomPowerLevelsEventContent}, room::power_levels::{RoomPowerLevels, RoomPowerLevelsEventContent},
StateEventType, StateEventType,
@ -72,10 +71,7 @@ impl Service {
if alias == self.services.globals.admin_alias if alias == self.services.globals.admin_alias
&& user_id != self.services.globals.server_user && user_id != self.services.globals.server_user
{ {
return Err(Error::BadRequest( return Err!(Request(Forbidden("Only the server user can set this alias")));
ErrorKind::forbidden(),
"Only the server user can set this alias",
));
} }
// Comes first as we don't want a stuck alias // Comes first as we don't want a stuck alias
@ -220,7 +216,7 @@ impl Service {
} }
// Checking whether the user is able to change canonical aliases of the room // Checking whether the user is able to change canonical aliases of the room
if let Ok(content) = self if let Ok(power_levels) = self
.services .services
.state_accessor .state_accessor
.room_state_get_content::<RoomPowerLevelsEventContent>( .room_state_get_content::<RoomPowerLevelsEventContent>(
@ -228,10 +224,12 @@ impl Service {
&StateEventType::RoomPowerLevels, &StateEventType::RoomPowerLevels,
"", "",
) )
.map_ok(RoomPowerLevels::from)
.await .await
{ {
return Ok(RoomPowerLevels::from(content) return Ok(
.user_can_send_state(user_id, StateEventType::RoomCanonicalAlias)); power_levels.user_can_send_state(user_id, StateEventType::RoomCanonicalAlias)
);
} }
// If there is no power levels event, only the room creator can change // If there is no power levels event, only the room creator can change
@ -291,18 +289,12 @@ impl Service {
.globals .globals
.server_is_ours(room_alias.server_name()) .server_is_ours(room_alias.server_name())
{ {
return Err(Error::BadRequest( return Err!(Request(InvalidParam("Alias is from another server.")));
ErrorKind::InvalidParam,
"Alias is from another server.",
));
} }
if let Some(ref info) = appservice_info { if let Some(info) = appservice_info {
if !info.aliases.is_match(room_alias.as_str()) { if !info.aliases.is_match(room_alias.as_str()) {
return Err(Error::BadRequest( return Err!(Request(Exclusive("Room alias is not in namespace.")));
ErrorKind::Exclusive,
"Room alias is not in namespace.",
));
} }
} else if self } else if self
.services .services
@ -310,10 +302,7 @@ impl Service {
.is_exclusive_alias(room_alias) .is_exclusive_alias(room_alias)
.await .await
{ {
return Err(Error::BadRequest( return Err!(Request(Exclusive("Room alias reserved by appservice.")));
ErrorKind::Exclusive,
"Room alias reserved by appservice.",
));
} }
Ok(()) Ok(())