move room creation config check higher up
dont bother wasting resources if we know we arent even allowed to make the room to begin with Signed-off-by: strawberry <strawberry@puppygock.gay>
This commit is contained in:
parent
ead9a58dce
commit
2980af6490
1 changed files with 10 additions and 11 deletions
|
@ -52,7 +52,16 @@ pub async fn create_room_route(
|
||||||
|
|
||||||
let sender_user = body.sender_user.as_ref().expect("user is authenticated");
|
let sender_user = body.sender_user.as_ref().expect("user is authenticated");
|
||||||
|
|
||||||
let room_id = RoomId::new(services().globals.server_name());
|
if !services().globals.allow_room_creation()
|
||||||
|
&& !&body.from_appservice
|
||||||
|
&& !services().users.is_admin(sender_user)?
|
||||||
|
{
|
||||||
|
return Err(Error::BadRequest(
|
||||||
|
ErrorKind::Forbidden,
|
||||||
|
"Room creation has been disabled.",
|
||||||
|
));
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
services().rooms.short.get_or_create_shortroomid(&room_id)?;
|
services().rooms.short.get_or_create_shortroomid(&room_id)?;
|
||||||
|
|
||||||
|
@ -67,16 +76,6 @@ pub async fn create_room_route(
|
||||||
);
|
);
|
||||||
let state_lock = mutex_state.lock().await;
|
let state_lock = mutex_state.lock().await;
|
||||||
|
|
||||||
if !services().globals.allow_room_creation()
|
|
||||||
&& !body.from_appservice
|
|
||||||
&& !services().users.is_admin(sender_user)?
|
|
||||||
{
|
|
||||||
return Err(Error::BadRequest(
|
|
||||||
ErrorKind::Forbidden,
|
|
||||||
"Room creation has been disabled.",
|
|
||||||
));
|
|
||||||
}
|
|
||||||
|
|
||||||
let alias: Option<OwnedRoomAliasId> =
|
let alias: Option<OwnedRoomAliasId> =
|
||||||
body.room_alias_name
|
body.room_alias_name
|
||||||
.as_ref()
|
.as_ref()
|
||||||
|
|
Loading…
Add table
Reference in a new issue