feat(permissions): apply permissions on set channel routes

src/routes/channels/permissions_set.rs

@@ -1,35 +1,51 @@
 use rocket::serde::json::Json;
-use serde::{Deserialize, Serialize};
+use serde::Deserialize;
 
 use revolt_quark::{
     models::{Channel, User},
-    perms, Db, OverrideField, Permission, Ref, Result,
+    perms, Db, Error, Override, Permission, Ref, Result,
 };
 
-#[derive(Serialize, Deserialize)]
+#[derive(Deserialize)]
 pub struct Data {
-    permissions: OverrideField,
+    permissions: Override,
 }
 
-#[put("/<target>/permissions/<role>", data = "<data>", rank = 2)]
+#[put("/<target>/permissions/<role_id>", data = "<data>", rank = 2)]
 pub async fn req(
     db: &Db,
     user: User,
     target: Ref,
-    role: String,
+    role_id: String,
     data: Json<Data>,
 ) -> Result<Json<Channel>> {
     let mut channel = target.as_channel(db).await?;
-    perms(&user)
+    let mut permissions = perms(&user).channel(&channel);
-        .channel(&channel)
+
+    permissions
         .throw_permission_and_view_channel(db, Permission::ManagePermissions)
         .await?;
 
-    // ! FIXME_PERMISSIONS
+    if let Some(server) = permissions.server.get() {
+        if let Some(role) = server.roles.get(&role_id) {
+            if role.rank <= permissions.get_member_rank().unwrap_or(i64::MIN) {
+                return Err(Error::NotElevated);
+            }
 
-    channel
+            let current_value: Override = role.permissions.into();
-        .set_role_permission(db, &role, data.permissions)
+            permissions
-        .await?;
+                .throw_permission_override(db, current_value, data.permissions)
+                .await?;
 
-    Ok(Json(channel))
+            channel
+                .set_role_permission(db, &role_id, data.permissions.into())
+                .await?;
+
+            Ok(Json(channel))
+        } else {
+            Err(Error::NotFound)
+        }
+    } else {
+        Err(Error::InvalidOperation)
+    }
 }

src/routes/channels/permissions_set_default.rs

@@ -1,12 +1,12 @@
 use rocket::serde::json::Json;
-use serde::{Deserialize, Serialize};
+use serde::Deserialize;
 
 use revolt_quark::{
     models::{channel::PartialChannel, Channel, User},
     perms, Db, Error, Override, Permission, Ref, Result,
 };
 
-#[derive(Serialize, Deserialize)]
+#[derive(Deserialize)]
 #[serde(untagged)]
 pub enum Data {
     Value { permissions: u64 },
@@ -18,9 +18,9 @@ pub async fn req(db: &Db, user: User, target: Ref, data: Json<Data>) -> Result<J
     let data = data.into_inner();
 
     let mut channel = target.as_channel(db).await?;
-    perms(&user)
+    let mut perm = perms(&user).channel(&channel);
-        .channel(&channel)
+
-        .throw_permission_and_view_channel(db, Permission::ManagePermissions)
+    perm.throw_permission_and_view_channel(db, Permission::ManagePermissions)
         .await?;
 
     match &channel {
@@ -40,10 +40,22 @@ pub async fn req(db: &Db, user: User, target: Ref, data: Json<Data>) -> Result<J
                 return Err(Error::InvalidOperation);
             }
         }
-        Channel::TextChannel { .. } | Channel::VoiceChannel { .. } => {
+        Channel::TextChannel {
-            // ! FIXME_PERMISSIONS
+            default_permissions,
-
+            ..
+        }
+        | Channel::VoiceChannel {
+            default_permissions,
+            ..
+        } => {
             if let Data::Field { permissions } = data {
+                perm.throw_permission_override(
+                    db,
+                    default_permissions.map(|x| x.into()),
+                    permissions,
+                )
+                .await?;
+
                 channel
                     .update(
                         db,

src/routes/servers/permissions_set.rs

@@ -1,12 +1,12 @@
 use rocket::serde::json::Json;
-use serde::{Deserialize, Serialize};
+use serde::Deserialize;
 
 use revolt_quark::{
     models::{Server, User},
     perms, Db, Error, Override, Permission, Ref, Result,
 };
 
-#[derive(Serialize, Deserialize)]
+#[derive(Deserialize)]
 pub struct Data {
     permissions: Override,
 }
@@ -34,20 +34,10 @@ pub async fn req(
             return Err(Error::NotElevated);
         }
 
-        if !permissions
-            .has_permission_value(db, data.permissions.allows())
-            .await?
-        {
-            return Err(Error::CannotGiveMissingPermissions);
-        }
-
         let current_value: Override = current_value.into();
-        if !permissions
+        permissions
-            .has_permission_value(db, current_value.denies() & (!data.permissions.denies()))
+            .throw_permission_override(db, current_value, data.permissions)
-            .await?
+            .await?;
-        {
-            return Err(Error::CannotGiveMissingPermissions);
-        }
 
         server
             .set_role_permission(db, &role_id, data.permissions.into())

src/routes/servers/permissions_set_default.rs

@@ -1,12 +1,12 @@
 use rocket::serde::json::Json;
-use serde::{Deserialize, Serialize};
+use serde::Deserialize;
 
 use revolt_quark::{
     models::{server::PartialServer, Server, User},
-    perms, Db, Error, Permission, Ref, Result,
+    perms, Db, Permission, Ref, Result,
 };
 
-#[derive(Serialize, Deserialize)]
+#[derive(Deserialize)]
 pub struct Data {
     permissions: u64,
 }
@@ -22,12 +22,9 @@ pub async fn req(db: &Db, user: User, target: Ref, data: Json<Data>) -> Result<J
         .throw_permission(db, Permission::ManagePermissions)
         .await?;
 
-    if !permissions
+    permissions
-        .has_permission_value(db, data.permissions)
+        .throw_permission_value(db, data.permissions)
-        .await?
+        .await?;
-    {
-        return Err(Error::CannotGiveMissingPermissions);
-    }
 
     server
         .update(