fix: switch to new permissions enum

This commit is contained in:
Paul Makles
2022-02-22 20:34:23 +00:00
parent aab85fa143
commit 7befd77c5b
37 changed files with 128 additions and 174 deletions

View File

@@ -3,7 +3,7 @@ use serde::{Deserialize, Serialize};
use revolt_quark::{
models::{channel::PartialChannel, Channel, User},
perms, ChannelPermission, Db, Error, Ref, Result,
perms, Db, Error, Permission, Ref, Result,
};
#[derive(Serialize, Deserialize)]
@@ -16,13 +16,11 @@ pub async fn req(db: &Db, user: User, target: Ref, data: Json<Data>) -> Result<J
let mut channel = target.as_channel(db).await?;
if !perms(&user)
.channel(&channel)
.calc_channel(db)
.calc(db)
.await
.get_manage_channel()
.can_manage_permissions()
{
return Err(Error::MissingPermission {
permission: ChannelPermission::ManageChannel as i32,
});
return Error::from_permission(Permission::ManagePermissions);
}
match &channel {
@@ -39,6 +37,8 @@ pub async fn req(db: &Db, user: User, target: Ref, data: Json<Data>) -> Result<J
.await?;
}
Channel::TextChannel { .. } | Channel::VoiceChannel { .. } => {
// ! FIXME_PERMISSIONS
channel
.update(
db,