feat: implement new permissions hierarchy

src/routes/channels/permissions_set.rs

@@ -3,12 +3,12 @@ use serde::{Deserialize, Serialize};
 
 use revolt_quark::{
     models::{Channel, User},
-    perms, Db, Permission, Ref, Result,
+    perms, Db, OverrideField, Permission, Ref, Result,
 };
 
 #[derive(Serialize, Deserialize)]
 pub struct Data {
-    permissions: u32,
+    permissions: OverrideField,
 }
 
 #[put("/<target>/permissions/<role>", data = "<data>", rank = 2)]

src/routes/channels/permissions_set_default.rs

@@ -3,16 +3,20 @@ use serde::{Deserialize, Serialize};
 
 use revolt_quark::{
     models::{channel::PartialChannel, Channel, User},
-    perms, Db, Error, Permission, Ref, Result,
+    perms, Db, Error, Override, Permission, Ref, Result,
 };
 
 #[derive(Serialize, Deserialize)]
-pub struct Data {
+#[serde(untagged)]
-    permissions: u32,
+pub enum Data {
+    Value { permissions: u64 },
+    Field { permissions: Override },
 }
 
 #[put("/<target>/permissions/default", data = "<data>", rank = 1)]
 pub async fn req(db: &Db, user: User, target: Ref, data: Json<Data>) -> Result<Json<Channel>> {
+    let data = data.into_inner();
+
     let mut channel = target.as_channel(db).await?;
     perms(&user)
         .channel(&channel)
@@ -21,30 +25,38 @@ pub async fn req(db: &Db, user: User, target: Ref, data: Json<Data>) -> Result<J
 
     match &channel {
         Channel::Group { .. } => {
-            channel
+            if let Data::Value { permissions } = data {
-                .update(
+                channel
-                    db,
+                    .update(
-                    PartialChannel {
+                        db,
-                        permissions: Some(data.permissions as i32),
+                        PartialChannel {
-                        ..Default::default()
+                            permissions: Some(permissions as i64),
-                    },
+                            ..Default::default()
-                    vec![],
+                        },
-                )
+                        vec![],
-                .await?;
+                    )
+                    .await?;
+            } else {
+                return Err(Error::InvalidOperation);
+            }
         }
         Channel::TextChannel { .. } | Channel::VoiceChannel { .. } => {
             // ! FIXME_PERMISSIONS
 
-            channel
+            if let Data::Field { permissions } = data {
-                .update(
+                channel
-                    db,
+                    .update(
-                    PartialChannel {
+                        db,
-                        default_permissions: Some(data.permissions as i32),
+                        PartialChannel {
-                        ..Default::default()
+                            default_permissions: Some(permissions.into()),
-                    },
+                            ..Default::default()
-                    vec![],
+                        },
-                )
+                        vec![],
-                .await?;
+                    )
+                    .await?;
+            } else {
+                return Err(Error::InvalidOperation);
+            }
         }
         _ => return Err(Error::InvalidOperation),
     }

src/routes/servers/permissions_set.rs

@@ -3,18 +3,12 @@ use serde::{Deserialize, Serialize};
 
 use revolt_quark::{
     models::{Server, User},
-    perms, Db, Permission, Ref, Result,
+    perms, Db, Override, Permission, Ref, Result,
 };
 
-#[derive(Serialize, Deserialize)]
-pub struct Values {
-    server: u32,
-    channel: u32,
-}
-
 #[derive(Serialize, Deserialize)]
 pub struct Data {
-    permissions: Values,
+    permissions: Override,
 }
 
 #[put("/<target>/permissions/<role_id>", data = "<data>", rank = 2)]
@@ -25,6 +19,8 @@ pub async fn req(
     role_id: String,
     data: Json<Data>,
 ) -> Result<Json<Server>> {
+    let data = data.into_inner();
+
     let mut server = target.as_server(db).await?;
     perms(&user)
         .server(&server)
@@ -34,14 +30,7 @@ pub async fn req(
     // ! FIXME_PERMISSIONS
 
     server
-        .set_role_permission(
+        .set_role_permission(db, &role_id, data.permissions.into())
-            db,
-            &role_id,
-            &(
-                data.permissions.server as i32,
-                data.permissions.channel as i32,
-            ),
-        )
         .await?;
 
     Ok(Json(server))

src/routes/servers/permissions_set_default.rs

@@ -6,15 +6,9 @@ use revolt_quark::{
     perms, Db, Permission, Ref, Result,
 };
 
-#[derive(Serialize, Deserialize)]
-pub struct Values {
-    server: u32,
-    channel: u32,
-}
-
 #[derive(Serialize, Deserialize)]
 pub struct Data {
-    permissions: Values,
+    permissions: u64,
 }
 
 #[put("/<target>/permissions/default", data = "<data>", rank = 1)]
@@ -33,10 +27,7 @@ pub async fn req(db: &Db, user: User, target: Ref, data: Json<Data>) -> Result<J
         .update(
             db,
             PartialServer {
-                default_permissions: Some((
+                default_permissions: Some(data.permissions as i64),
-                    data.permissions.server as i32,
-                    data.permissions.channel as i32,
-                )),
                 ..Default::default()
             },
             vec![],

src/routes/servers/roles_create.rs

@@ -27,7 +27,6 @@ pub async fn req(db: &Db, user: User, target: Ref, data: Json<Data>) -> Result<V
 
     let role = Role {
         name: data.name,
-        permissions: (0_i32, 0_i32),
         ..Default::default()
     };
 

src/routes/servers/server_create.rs

@@ -2,7 +2,7 @@ use std::collections::HashMap;
 
 use revolt_quark::{
     models::{server_member::MemberCompositeKey, Channel, Member, Server, User},
-    Db, Error, Result,
+    Db, Error, Result, DEFAULT_PERMISSION_SERVER,
 };
 
 use rocket::serde::json::Json;
@@ -66,7 +66,7 @@ pub async fn req(db: &Db, user: User, info: Json<Data>) -> Result<Json<Server>>
         description,
         channels: vec![channel_id],
         nsfw: nsfw.unwrap_or(false),
-        default_permissions: (0_i32, 0_i32),
+        default_permissions: *DEFAULT_PERMISSION_SERVER as i64,
         ..Default::default()
     };