Servers: Ban and unban users +

ban list.

src/database/entities/server.rs

@@ -30,7 +30,7 @@ pub struct Member {
 pub struct Ban {
     #[serde(rename = "_id")]
     pub id: MemberCompositeKey,
-    pub reason: String,
+    pub reason: Option<String>,
 }
 
 #[derive(Serialize, Deserialize, Debug, Clone)]
@@ -234,6 +234,23 @@ impl Server {
     }
 
     pub async fn join_member(&self, id: &str) -> Result<()> {
+        if get_collection("server_bans")
+            .find_one(
+                doc! {
+                    "_id.server": &self.id,
+                    "_id.user": &id
+                },
+                None
+            )
+            .await
+            .map_err(|_| Error::DatabaseError {
+                operation: "find_one",
+                with: "server_bans",
+            })?
+            .is_some() {
+            return Err(Error::Banned)
+        }
+
         get_collection("server_members")
             .insert_one(
                 doc! {
@@ -260,7 +277,7 @@ impl Server {
     }
 
     pub async fn remove_member(&self, id: &str) -> Result<()> {
-        get_collection("server_members")
+        let result = get_collection("server_members")
             .delete_one(
                 doc! {
                     "_id": {
@@ -276,11 +293,13 @@ impl Server {
                 with: "server_members",
             })?;
         
-        ClientboundNotification::ServerMemberLeave {
-            id: self.id.clone(),
-            user: id.to_string()
+        if result.deleted_count > 0 {
+            ClientboundNotification::ServerMemberLeave {
+                id: self.id.clone(),
+                user: id.to_string()
+            }
+            .publish(self.id.clone());
         }
-        .publish(self.id.clone());
 
         Ok(())
     }

src/database/guards/reference.rs

@@ -25,7 +25,7 @@ impl Ref {
         Ok(r)
     }
 
-    pub async fn fetch<T: DeserializeOwned>(&self, collection: &'static str) -> Result<T> {
+    async fn fetch<T: DeserializeOwned>(&self, collection: &'static str) -> Result<T> {
         let doc = get_collection(&collection)
             .find_one(
                 doc! {
@@ -84,6 +84,28 @@ impl Ref {
         })?)
     }
 
+    pub async fn fetch_ban(&self, server: &str) -> Result<Ban> {
+        let doc = get_collection("server_bans")
+            .find_one(
+                doc! {
+                    "_id.user": &self.id,
+                    "_id.server": server
+                },
+                None,
+            )
+            .await
+            .map_err(|_| Error::DatabaseError {
+                operation: "find_one",
+                with: "server_ban",
+            })?
+            .ok_or_else(|| Error::NotFound)?;
+
+        Ok(from_document::<Ban>(doc).map_err(|_| Error::DatabaseError {
+            operation: "from_document",
+            with: "server_ban",
+        })?)
+    }
+
     pub async fn fetch_message(&self, channel: &Channel) -> Result<Message> {
         let message: Message = self.fetch("messages").await?;
         if &message.channel != channel.id() {

src/database/permissions/server.rs

@@ -12,7 +12,9 @@ pub enum ServerPermission {
     ManageMembers   = 0b00000000000000000000000000000010, // 2
     ManageChannels  = 0b00000000000000000000000000000100, // 4
     ManageServer    = 0b00000000000000000000000000001000, // 8
-    // 8 bits of space
+    KickMembers     = 0b00000000000000000000000000010000, // 16
+    BanMembers      = 0b00000000000000000000000000100000, // 32
+    // 6 bits of space
     ChangeNickname  = 0b00000000000000000001000000000000, // 4096
     ManageNicknames = 0b00000000000000000010000000000000, // 8192
     ChangeAvatar    = 0b00000000000000000100000000000000, // 16392
@@ -30,6 +32,8 @@ bitfield! {
     pub get_manage_members, _: 30;
     pub get_manage_channels, _: 29;
     pub get_manage_server, _: 28;
+    pub get_kick_members, _: 27;
+    pub get_ban_members, _: 26;
 
     pub get_change_nickname, _: 19;
     pub get_manage_nicknames, _: 18;