Start work on notifications from client, cargo fmt

src/database/entities/channel.rs

@@ -1,6 +1,9 @@
-use serde::{Deserialize, Serialize};
-use crate::{database::get_collection, util::result::{Error, Result}};
+use crate::{
+    database::get_collection,
+    util::result::{Error, Result},
+};
 use mongodb::bson::to_document;
+use serde::{Deserialize, Serialize};
 
 /*#[derive(Serialize, Deserialize, Debug, Clone)]
 pub struct LastMessage {
@@ -38,7 +41,7 @@ pub enum Channel {
     SavedMessages {
         #[serde(rename = "_id")]
         id: String,
-        user: String
+        user: String,
     },
     DirectMessage {
         #[serde(rename = "_id")]
@@ -53,20 +56,25 @@ pub enum Channel {
         owner: String,
         description: String,
         recipients: Vec<String>,
-    }
+    },
 }
 
 impl Channel {
     pub async fn save(&self) -> Result<()> {
         get_collection("channels")
             .insert_one(
-                to_document(&self)
-                    .map_err(|_| Error::DatabaseError { operation: "to_bson", with: "channel" })?,
-                None
+                to_document(&self).map_err(|_| Error::DatabaseError {
+                    operation: "to_bson",
+                    with: "channel",
+                })?,
+                None,
             )
             .await
-            .map_err(|_| Error::DatabaseError { operation: "insert_one", with: "channel" })?;
-        
+            .map_err(|_| Error::DatabaseError {
+                operation: "insert_one",
+                with: "channel",
+            })?;
+
         Ok(())
     }
 }

src/database/entities/mod.rs

@@ -1,9 +1,9 @@
 mod channel;
-mod message;
 mod guild;
+mod message;
 mod user;
 
 pub use channel::*;
-pub use message::*;
 pub use guild::*;
+pub use message::*;
 pub use user::*;

src/database/entities/user.rs

@@ -1,10 +1,10 @@
+use crate::database::get_collection;
+use crate::database::guards::reference::Ref;
 use mongodb::bson::{doc, from_bson, Bson};
 use rauth::auth::Session;
 use rocket::http::Status;
-use serde::{Deserialize, Serialize};
-use crate::database::guards::reference::Ref;
-use crate::database::get_collection;
 use rocket::request::{self, FromRequest, Outcome, Request};
+use serde::{Deserialize, Serialize};
 
 #[derive(Serialize, Deserialize, Debug, Clone)]
 pub enum RelationshipStatus {
@@ -14,7 +14,7 @@ pub enum RelationshipStatus {
     Outgoing,
     Incoming,
     Blocked,
-    BlockedOther
+    BlockedOther,
 }
 
 #[derive(Serialize, Deserialize, Debug)]
@@ -44,24 +44,29 @@ impl<'a, 'r> FromRequest<'a, 'r> for User {
             .find_one(
                 doc! {
                     "_id": &session.user_id
-                }, None
+                },
+                None,
             )
-            .await {
+            .await
+        {
             if let Some(doc) = result {
-                Outcome::Success(
-                    from_bson(Bson::Document(doc)).unwrap()
-                )
+                Outcome::Success(from_bson(Bson::Document(doc)).unwrap())
             } else {
                 Outcome::Failure((Status::Forbidden, rauth::util::Error::InvalidSession))
             }
         } else {
-            Outcome::Failure((Status::InternalServerError, rauth::util::Error::DatabaseError))
+            Outcome::Failure((
+                Status::InternalServerError,
+                rauth::util::Error::DatabaseError,
+            ))
         }
     }
 }
 
 impl User {
     pub fn as_ref(&self) -> Ref {
-        Ref { id: self.id.to_string() }
+        Ref {
+            id: self.id.to_string(),
+        }
     }
 }