Run cargo fmt.

src/database/entities/server.rs

@@ -1,10 +1,10 @@
 use crate::database::*;
 use crate::notifications::events::ClientboundNotification;
 use crate::util::result::{Error, Result};
-use mongodb::bson::Document;
-use mongodb::bson::doc;
 use futures::StreamExt;
+use mongodb::bson::doc;
 use mongodb::bson::to_document;
+use mongodb::bson::Document;
 use mongodb::options::FindOptions;
 use rocket_contrib::json::JsonValue;
 use serde::{Deserialize, Serialize};
@@ -194,7 +194,10 @@ impl Server {
                 with: "server",
             })?;
 
-        ClientboundNotification::ServerDelete { id: self.id.clone() }.publish(self.id.clone());
+        ClientboundNotification::ServerDelete {
+            id: self.id.clone(),
+        }
+        .publish(self.id.clone());
 
         if let Some(attachment) = &self.icon {
             attachment.delete().await?;
@@ -240,15 +243,16 @@ impl Server {
                     "_id.server": &self.id,
                     "_id.user": &id
                 },
-                None
+                None,
             )
             .await
             .map_err(|_| Error::DatabaseError {
                 operation: "find_one",
                 with: "server_bans",
             })?
-            .is_some() {
+            .is_some()
-            return Err(Error::Banned)
+        {
+            return Err(Error::Banned);
         }
 
         get_collection("server_members")
@@ -269,7 +273,7 @@ impl Server {
 
         ClientboundNotification::ServerMemberJoin {
             id: self.id.clone(),
-            user: id.to_string()
+            user: id.to_string(),
         }
         .publish(self.id.clone());
 
@@ -296,7 +300,7 @@ impl Server {
         if result.deleted_count > 0 {
             ClientboundNotification::ServerMemberLeave {
                 id: self.id.clone(),
-                user: id.to_string()
+                user: id.to_string(),
             }
             .publish(self.id.clone());
         }

src/database/guards/reference.rs

@@ -78,10 +78,12 @@ impl Ref {
             })?
             .ok_or_else(|| Error::NotFound)?;
 
-        Ok(from_document::<Member>(doc).map_err(|_| Error::DatabaseError {
+        Ok(
+            from_document::<Member>(doc).map_err(|_| Error::DatabaseError {
                 operation: "from_document",
                 with: "server_member",
-        })?)
+            })?,
+        )
     }
 
     pub async fn fetch_ban(&self, server: &str) -> Result<Ban> {

src/database/permissions/server.rs

@@ -52,7 +52,9 @@ impl<'a> PermissionCalculator<'a> {
         if self.perspective.id == server.owner {
             Ok(u32::MAX)
         } else {
-            Ok(ServerPermission::View + ServerPermission::ChangeNickname + ServerPermission::ChangeAvatar)
+            Ok(ServerPermission::View
+                + ServerPermission::ChangeNickname
+                + ServerPermission::ChangeAvatar)
         }
     }
 

src/notifications/events.rs

@@ -53,7 +53,7 @@ pub enum RemoveServerField {
 #[derive(Serialize, Deserialize, Debug, Clone)]
 pub enum RemoveMemberField {
     Nickname,
-    Avatar
+    Avatar,
 }
 
 #[derive(Serialize, Deserialize, Debug, Clone)]
@@ -216,35 +216,23 @@ pub async fn posthandle_hook(notification: &ClientboundNotification) {
             get_hive().hive.drop_topic(&id).ok();
         }
         ClientboundNotification::ChannelGroupLeave { id, user } => {
-            get_hive()
+            get_hive().hive.unsubscribe(user, id).ok();
-                .hive
-                .unsubscribe(user, id)
-                .ok();
         }
         ClientboundNotification::ServerDelete { id } => {
             get_hive().hive.drop_topic(&id).ok();
         }
         ClientboundNotification::ServerMemberLeave { id, user } => {
-            get_hive()
+            get_hive().hive.unsubscribe(user, id).ok();
-                .hive
-                .unsubscribe(user, id)
-                .ok();
 
             if let Ok(server) = Ref::from_unchecked(id.clone()).fetch_server().await {
                 for channel in server.channels {
-                    get_hive()
+                    get_hive().hive.unsubscribe(user, &channel).ok();
-                        .hive
-                        .unsubscribe(user, &channel)
-                        .ok();
                 }
             }
         }
         ClientboundNotification::UserRelationship { id, user, status } => {
             if status == &RelationshipStatus::None {
-                get_hive()
+                get_hive().hive.unsubscribe(id, &user.id).ok();
-                    .hive
-                    .unsubscribe(id, &user.id)
-                    .ok();
             }
         }
         _ => {}

src/routes/channels/edit_channel.rs

@@ -45,8 +45,7 @@ pub async fn req(user: User, target: Ref, data: Json<Data>) -> Result<()> {
     }
 
     match &target {
-        Channel::Group { id, icon, .. } |
+        Channel::Group { id, icon, .. } | Channel::TextChannel { id, icon, .. } => {
-        Channel::TextChannel { id, icon, .. } => {
             let mut set = doc! {};
             let mut unset = doc! {};
 

src/routes/invites/invite_delete.rs

@@ -21,8 +21,8 @@ pub async fn req(user: User, target: Ref) -> Result<()> {
                 }
 
                 target.delete().await
-            },
+            }
-            _ => unreachable!()
+            _ => unreachable!(),
         }
     }
 }

src/routes/invites/invite_fetch.rs

@@ -18,8 +18,8 @@ pub enum InviteResponse {
         channel_description: Option<String>,
         user_name: String,
         #[serde(skip_serializing_if = "Option::is_none")]
-        user_avatar: Option<File>
+        user_avatar: Option<File>,
-    }
+    },
 }
 
 #[get("/<target>")]
@@ -28,14 +28,18 @@ pub async fn req(target: Ref) -> Result<JsonValue> {
 
     match target {
         Invite::Server {
-            channel,
+            channel, creator, ..
-            creator,
-            ..
         } => {
             let channel = Ref::from_unchecked(channel).fetch_channel().await?;
             let creator = Ref::from_unchecked(creator).fetch_user().await?;
 
-            if let Channel::TextChannel { server, name, description, .. } = channel {
+            if let Channel::TextChannel {
+                server,
+                name,
+                description,
+                ..
+            } = channel
+            {
                 let server = Ref::from_unchecked(server).fetch_server().await?;
 
                 Ok(json!(InviteResponse::Server {

src/routes/invites/invite_join.rs

@@ -8,10 +8,7 @@ pub async fn req(user: User, target: Ref) -> Result<JsonValue> {
     let target = target.fetch_invite().await?;
 
     match target {
-        Invite::Server {
+        Invite::Server { channel, .. } => {
-            channel,
-            ..
-        } => {
             let channel = Ref::from_unchecked(channel).fetch_channel().await?;
             let server = if let Channel::TextChannel { server, .. } = &channel {
                 Ref::from_unchecked(server.clone()).fetch_server().await?

src/routes/servers/ban_create.rs

@@ -2,9 +2,9 @@ use crate::database::*;
 use crate::util::result::{Error, Result};
 
 use mongodb::bson::doc;
-use validator::Validate;
 use rocket_contrib::json::Json;
-use serde::{Serialize, Deserialize};
+use serde::{Deserialize, Serialize};
+use validator::Validate;
 
 #[derive(Validate, Serialize, Deserialize)]
 pub struct Data {
@@ -42,14 +42,11 @@ pub async fn req(user: User, server: Ref, target: Ref, data: Json<Data>) -> Resu
     }
 
     get_collection("server_bans")
-        .insert_one(
+        .insert_one(document, None)
-            document,
-            None
-        )
         .await
         .map_err(|_| Error::DatabaseError {
             operation: "insert_one",
-            with: "server_ban"
+            with: "server_ban",
         })?;
 
     server.remove_member(&target.id).await

src/routes/servers/ban_list.rs

@@ -2,8 +2,8 @@ use crate::database::*;
 use crate::util::result::{Error, Result};
 
 use futures::StreamExt;
-use rocket_contrib::json::JsonValue;
 use mongodb::bson::{doc, from_document};
+use rocket_contrib::json::JsonValue;
 
 #[get("/<target>/bans")]
 pub async fn req(user: User, target: Ref) -> Result<JsonValue> {

src/routes/servers/ban_remove.rs

@@ -17,11 +17,11 @@ pub async fn req(user: User, server: Ref, target: Ref) -> Result<()> {
     }
 
     if target.id == user.id {
-        return Err(Error::InvalidOperation)
+        return Err(Error::InvalidOperation);
     }
 
     if target.id == server.owner {
-        return Err(Error::MissingPermission)
+        return Err(Error::MissingPermission);
     }
 
     let target = target.fetch_ban(&server.id).await?;
@@ -31,12 +31,12 @@ pub async fn req(user: User, server: Ref, target: Ref) -> Result<()> {
                 "_id.server": &server.id,
                 "_id.user": &target.id.user
             },
-            None
+            None,
         )
         .await
         .map_err(|_| Error::DatabaseError {
             operation: "delete_one",
-            with: "server_ban"
+            with: "server_ban",
         })?;
 
     Ok(())

src/routes/servers/invites_fetch.rs

@@ -1,10 +1,10 @@
 use crate::database::*;
 use crate::util::result::{Error, Result};
 
-use rocket_contrib::json::JsonValue;
-use serde::{Serialize, Deserialize};
-use mongodb::bson::{doc, from_document};
 use futures::StreamExt;
+use mongodb::bson::{doc, from_document};
+use rocket_contrib::json::JsonValue;
+use serde::{Deserialize, Serialize};
 
 #[derive(Serialize, Deserialize, Debug, Clone)]
 pub struct ServerInvite {

src/routes/servers/member_edit.rs

@@ -21,8 +21,7 @@ pub async fn req(user: User, server: Ref, target: String, data: Json<Data>) -> R
     data.validate()
         .map_err(|error| Error::FailedValidation { error })?;
 
-    if data.nickname.is_none() && data.avatar.is_none() && data.remove.is_none()
+    if data.nickname.is_none() && data.avatar.is_none() && data.remove.is_none() {
-    {
         return Ok(());
     }
 
@@ -35,30 +34,31 @@ pub async fn req(user: User, server: Ref, target: String, data: Json<Data>) -> R
         .await?;
 
     if target.id.user == user.id {
-        if (data.nickname.is_some() && !perm.get_change_nickname()) ||
+        if (data.nickname.is_some() && !perm.get_change_nickname())
-            (data.avatar.is_some() && !perm.get_change_avatar()) {
+            || (data.avatar.is_some() && !perm.get_change_avatar())
-            return Err(Error::MissingPermission)
+        {
+            return Err(Error::MissingPermission);
         }
 
         if let Some(remove) = &data.remove {
             if match remove {
                 RemoveMemberField::Avatar => !perm.get_change_avatar(),
-                RemoveMemberField::Nickname => !perm.get_change_nickname()
+                RemoveMemberField::Nickname => !perm.get_change_nickname(),
             } {
-                return Err(Error::MissingPermission)
+                return Err(Error::MissingPermission);
             }
         }
     } else {
         if data.avatar.is_some() || (data.nickname.is_some() && !perm.get_manage_nicknames()) {
-            return Err(Error::MissingPermission)
+            return Err(Error::MissingPermission);
         }
 
         if let Some(remove) = &data.remove {
             if match remove {
                 RemoveMemberField::Avatar => !perm.get_remove_avatars(),
-                RemoveMemberField::Nickname => !perm.get_manage_nicknames()
+                RemoveMemberField::Nickname => !perm.get_manage_nicknames(),
             } {
-                return Err(Error::MissingPermission)
+                return Err(Error::MissingPermission);
             }
         }
     }
@@ -84,7 +84,8 @@ pub async fn req(user: User, server: Ref, target: String, data: Json<Data>) -> R
     }
 
     if let Some(attachment_id) = &data.avatar {
-        let attachment = File::find_and_use(&attachment_id, "avatars", "user", &target.id.user).await?;
+        let attachment =
+            File::find_and_use(&attachment_id, "avatars", "user", &target.id.user).await?;
         set.insert(
             "avatar",
             to_document(&attachment).map_err(|_| Error::DatabaseError {
@@ -107,7 +108,11 @@ pub async fn req(user: User, server: Ref, target: String, data: Json<Data>) -> R
 
     if operations.len() > 0 {
         get_collection("server_members")
-            .update_one(doc! { "_id.server": &server.id, "_id.user": &target.id.user }, operations, None)
+            .update_one(
+                doc! { "_id.server": &server.id, "_id.user": &target.id.user },
+                operations,
+                None,
+            )
             .await
             .map_err(|_| Error::DatabaseError {
                 operation: "update_one",

src/routes/servers/member_fetch_all.rs

@@ -2,8 +2,8 @@ use crate::database::*;
 use crate::util::result::{Error, Result};
 
 use futures::StreamExt;
+use mongodb::bson::{doc, from_document, Document};
 use rocket_contrib::json::JsonValue;
-use mongodb::bson::{Document, doc, from_document};
 
 // ! FIXME: this is a temporary route while permissions are being worked on.
 

src/routes/servers/member_remove.rs

@@ -13,16 +13,16 @@ pub async fn req(user: User, target: Ref, member: String) -> Result<()> {
         .await?;
 
     if !perm.get_manage_members() {
-        return Err(Error::MissingPermission)
+        return Err(Error::MissingPermission);
     }
 
     let member = Ref::from(member)?.fetch_member(&target.id).await?;
     if member.id.user == user.id {
-        return Err(Error::InvalidOperation)
+        return Err(Error::InvalidOperation);
     }
 
     if target.id == target.owner {
-        return Err(Error::MissingPermission)
+        return Err(Error::MissingPermission);
     }
 
     target.remove_member(&member.id.user).await

src/routes/servers/mod.rs

@@ -2,19 +2,19 @@ use rocket::Route;
 
 mod server_create;
 mod server_delete;
-mod server_fetch;
 mod server_edit;
+mod server_fetch;
 
 mod channel_create;
 
+mod member_edit;
+mod member_fetch;
 mod member_fetch_all;
 mod member_remove;
-mod member_fetch;
-mod member_edit;
 
 mod ban_create;
-mod ban_remove;
 mod ban_list;
+mod ban_remove;
 
 mod invites_fetch;