From 96fd18f679c3f4ca8546f6dbf63d435ac092565d Mon Sep 17 00:00:00 2001
From: Paul Makles <paulmakles@gmail.com>
Date: Tue, 4 Jan 2022 20:08:04 +0000
Subject: [PATCH] chore: remove limitations on private channels

---
 set_version.sh                                 | 2 +-
 src/routes/channels/permissions_set.rs         | 5 ++---
 src/routes/channels/permissions_set_default.rs | 2 +-
 src/routes/servers/permissions_set.rs          | 6 ++----
 src/routes/servers/permissions_set_default.rs  | 6 ++----
 src/version.rs                                 | 2 +-
 6 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/set_version.sh b/set_version.sh
index 7b9e9d62..5cc542c5 100755
--- a/set_version.sh
+++ b/set_version.sh
@@ -1,3 +1,3 @@
 #!/bin/bash
-export version=0.5.3-alpha.13
+export version=0.5.3-alpha.15
 echo "pub const VERSION: &str = \"${version}\";" > src/version.rs
diff --git a/src/routes/channels/permissions_set.rs b/src/routes/channels/permissions_set.rs
index 785e9c54..a9e6cf9d 100644
--- a/src/routes/channels/permissions_set.rs
+++ b/src/routes/channels/permissions_set.rs
@@ -4,9 +4,8 @@ use serde::{Serialize, Deserialize};
 use validator::Contains;
 
 use crate::database::*;
-use crate::database::permissions::channel::ChannelPermission;
-use crate::notifications::events::ClientboundNotification;
 use crate::util::result::{Error, Result, EmptyResponse};
+use crate::notifications::events::ClientboundNotification;
 
 #[derive(Serialize, Deserialize)]
 pub struct Data {
@@ -34,7 +33,7 @@ pub async fn req(user: User, target: Ref, role: String, data: Json<Data>) -> Res
                 return Err(Error::NotFound);
             }
 
-            let permissions: u32 = ChannelPermission::View as u32 | data.permissions;
+            let permissions: u32 = data.permissions;
 
             get_collection("channels")
             .update_one(
diff --git a/src/routes/channels/permissions_set_default.rs b/src/routes/channels/permissions_set_default.rs
index 41589bbe..7890681f 100644
--- a/src/routes/channels/permissions_set_default.rs
+++ b/src/routes/channels/permissions_set_default.rs
@@ -63,7 +63,7 @@ pub async fn req(user: User, target: Ref, data: Json<Data>) -> Result<EmptyRespo
                 return Err(Error::MissingPermission);
             }
 
-            let permissions: u32 = ChannelPermission::View as u32 | data.permissions;
+            let permissions: u32 = data.permissions;
 
             get_collection("channels")
                 .update_one(
diff --git a/src/routes/servers/permissions_set.rs b/src/routes/servers/permissions_set.rs
index 4626dcab..99072432 100644
--- a/src/routes/servers/permissions_set.rs
+++ b/src/routes/servers/permissions_set.rs
@@ -3,8 +3,6 @@ use rocket::serde::json::Json;
 use serde::{Serialize, Deserialize};
 
 use crate::database::*;
-use crate::database::permissions::channel::ChannelPermission;
-use crate::database::permissions::server::ServerPermission;
 use crate::notifications::events::ClientboundNotification;
 use crate::util::result::{Error, Result, EmptyResponse};
 
@@ -36,8 +34,8 @@ pub async fn req(user: User, target: Ref, role_id: String, data: Json<Data>) ->
         return Err(Error::NotFound);
     }
 
-    let server_permissions: u32 = ServerPermission::View as u32 | data.permissions.server;
-    let channel_permissions: u32 = ChannelPermission::View as u32 | data.permissions.channel;
+    let server_permissions: u32 = data.permissions.server;
+    let channel_permissions: u32 = data.permissions.channel;
 
     get_collection("servers")
         .update_one(
diff --git a/src/routes/servers/permissions_set_default.rs b/src/routes/servers/permissions_set_default.rs
index 52e03545..0e52918b 100644
--- a/src/routes/servers/permissions_set_default.rs
+++ b/src/routes/servers/permissions_set_default.rs
@@ -3,8 +3,6 @@ use rocket::serde::json::Json;
 use serde::{Serialize, Deserialize};
 
 use crate::database::*;
-use crate::database::permissions::channel::ChannelPermission;
-use crate::database::permissions::server::ServerPermission;
 use crate::notifications::events::ClientboundNotification;
 use crate::util::result::{Error, Result, EmptyResponse};
 
@@ -32,8 +30,8 @@ pub async fn req(user: User, target: Ref, data: Json<Data>) -> Result<EmptyRespo
         return Err(Error::MissingPermission);
     }
 
-    let server_permissions: u32 = ServerPermission::View as u32 | data.permissions.server;
-    let channel_permissions: u32 = ChannelPermission::View as u32 | data.permissions.channel;
+    let server_permissions: u32 = data.permissions.server;
+    let channel_permissions: u32 = data.permissions.channel;
 
     get_collection("servers")
         .update_one(
diff --git a/src/version.rs b/src/version.rs
index e3168e31..d71b5b9a 100644
--- a/src/version.rs
+++ b/src/version.rs
@@ -1 +1 @@
-pub const VERSION: &str = "0.5.3-alpha.13";
+pub const VERSION: &str = "0.5.3-alpha.15";