feat(perms): consistently throw correct permissions

This commit is contained in:
Paul Makles
2022-02-22 21:41:12 +00:00
parent 7befd77c5b
commit 4c40c6c2cc
33 changed files with 134 additions and 264 deletions

View File

@@ -3,7 +3,7 @@ use revolt_quark::{
server::{FieldsRole, PartialRole, Role},
User,
},
perms, Db, Error, Ref, Result,
perms, Db, Error, Permission, Ref, Result,
};
use rocket::serde::json::Json;
@@ -35,14 +35,10 @@ pub async fn req(
.map_err(|error| Error::FailedValidation { error })?;
let mut server = target.as_server(db).await?;
if !perms(&user)
perms(&user)
.server(&server)
.calc(db)
.await
.can_manage_roles()
{
return Err(Error::NotFound);
}
.throw_permission(db, Permission::ManageRole)
.await?;
if let Some(mut role) = server.roles.remove(&role_id) {
let Data {