Merge branch 'nyaaori/admin-check' into 'next'

Implement admin check and add config option for allowing room creation

See merge request famedly/conduit!211
This commit is contained in:
Timo Kösters 2021-10-15 10:47:55 +00:00
commit 335027e739
4 changed files with 34 additions and 1 deletions

View file

@ -61,6 +61,16 @@ pub async fn create_room_route(
);
let state_lock = mutex_state.lock().await;
if !db.globals.allow_room_creation()
&& !body.from_appservice
&& !db.users.is_admin(sender_user, &db.rooms, &db.globals)?
{
return Err(Error::BadRequest(
ErrorKind::Forbidden,
"Room creation has been disabled.",
));
}
let alias: Option<RoomAliasId> =
body.room_alias_name
.as_ref()