Format code.

src/database/entities/message.rs

@@ -20,42 +20,29 @@ use web_push::{
 #[derive(Serialize, Deserialize, Debug, Clone)]
 #[serde(tag = "type")]
 pub enum MessageEmbed {
-    Dummy
+    Dummy,
 }
 
 #[derive(Serialize, Deserialize, Debug, Clone)]
 #[serde(tag = "type")]
 pub enum SystemMessage {
     #[serde(rename = "text")]
-    Text {
+    Text { content: String },
-        content: String
-    },
     #[serde(rename = "user_added")]
-    UserAdded {
+    UserAdded { id: String, by: String },
-        id: String,
-        by: String
-    },
     #[serde(rename = "user_remove")]
-    UserRemove {
+    UserRemove { id: String, by: String },
-        id: String,
-        by: String
-    },
     #[serde(rename = "user_left")]
-    UserLeft {
+    UserLeft { id: String },
-        id: String
-    },
     #[serde(rename = "channel_renamed")]
-    ChannelRenamed {
+    ChannelRenamed { name: String, by: String },
-        name: String,
-        by: String
-    },
 }
 
 #[derive(Serialize, Deserialize, Debug, Clone)]
 #[serde(untagged)]
 pub enum Content {
     Text(String),
-    SystemMessage(SystemMessage)
+    SystemMessage(SystemMessage),
 }
 
 #[derive(Serialize, Deserialize, Debug, Clone)]
@@ -87,7 +74,7 @@ impl Message {
             content,
             attachment: None,
             edited: None,
-            embeds: None
+            embeds: None,
         }
     }
 
@@ -174,7 +161,7 @@ impl Message {
         }
 
         // Fetch their corresponding sessions.
-        let mut cursor = get_collection("accounts")
+        if let Ok(mut cursor) = get_collection("accounts")
             .find(
                 doc! {
                     "_id": {
@@ -189,8 +176,7 @@ impl Message {
                     .build(),
             )
             .await
-            .unwrap(); // !FIXME
+        {
-
             let mut subscriptions = vec![];
             while let Some(result) = cursor.next().await {
                 if let Ok(doc) = result {
@@ -202,7 +188,8 @@ impl Message {
                                     let p256dh = sub.get_str("p256dh").unwrap().to_string();
                                     let auth = sub.get_str("auth").unwrap().to_string();
 
-                                subscriptions.push(SubscriptionInfo::new(endpoint, p256dh, auth));
+                                    subscriptions
+                                        .push(SubscriptionInfo::new(endpoint, p256dh, auth));
                                 }
                             }
                         }
@@ -212,7 +199,8 @@ impl Message {
 
             if subscriptions.len() > 0 {
                 let client = WebPushClient::new();
-            let key = base64::decode_config(VAPID_PRIVATE_KEY.clone(), base64::URL_SAFE).unwrap();
+                let key =
+                    base64::decode_config(VAPID_PRIVATE_KEY.clone(), base64::URL_SAFE).unwrap();
 
                 for subscription in subscriptions {
                     let mut builder = WebPushMessageBuilder::new(&subscription).unwrap();
@@ -226,6 +214,7 @@ impl Message {
                     client.send(m).await.ok();
                 }
             }
+        }
 
         Ok(())
     }
@@ -255,7 +244,7 @@ impl Message {
                             "deleted": true
                         }
                     },
-                    None
+                    None,
                 )
                 .await
                 .map_err(|_| Error::DatabaseError {

src/database/entities/user.rs

@@ -1,12 +1,12 @@
 use mongodb::bson::doc;
-use serde::{Deserialize, Serialize};
 use mongodb::options::{Collation, FindOneOptions};
+use serde::{Deserialize, Serialize};
 
-use crate::database::*;
-use validator::Validate;
-use crate::util::result::{Error, Result};
-use crate::notifications::websocket::is_online;
 use crate::database::permissions::user::UserPermissions;
+use crate::database::*;
+use crate::notifications::websocket::is_online;
+use crate::util::result::{Error, Result};
+use validator::Validate;
 
 #[derive(Serialize, Deserialize, Debug, Clone, PartialEq)]
 pub enum RelationshipStatus {
@@ -37,14 +37,14 @@ pub enum Badge {
 pub struct UserStatus {
     #[validate(length(min = 1, max = 128))]
     #[serde(skip_serializing_if = "Option::is_none")]
-    text: Option<String>
+    text: Option<String>,
 }
 
 #[derive(Validate, Serialize, Deserialize, Debug)]
 pub struct UserProfile {
     #[validate(length(min = 1, max = 2000))]
     #[serde(skip_serializing_if = "Option::is_none")]
-    content: Option<String>
+    content: Option<String>,
 }
 
 #[derive(Serialize, Deserialize, Debug)]
@@ -101,7 +101,7 @@ impl User {
     /// Utility function for checking claimed usernames.
     pub async fn is_username_taken(username: &str) -> Result<bool> {
         if username == "revolt" && username == "admin" {
-            return Ok(true)
+            return Ok(true);
         }
 
         if get_collection("users")

src/database/permissions/channel.rs

@@ -56,7 +56,9 @@ impl<'a> PermissionCalculator<'a> {
                         let perms = self.for_user(recipient).await?;
 
                         if perms.get_send_message() {
-                            return Ok(ChannelPermission::View + ChannelPermission::SendMessage + ChannelPermission::VoiceCall);
+                            return Ok(ChannelPermission::View
+                                + ChannelPermission::SendMessage
+                                + ChannelPermission::VoiceCall);
                         }
 
                         return Ok(ChannelPermission::View as u32);
@@ -71,7 +73,10 @@ impl<'a> PermissionCalculator<'a> {
                     .find(|x| *x == &self.perspective.id)
                     .is_some()
                 {
-                    Ok(ChannelPermission::View + ChannelPermission::SendMessage + ChannelPermission::ManageChannel + ChannelPermission::VoiceCall)
+                    Ok(ChannelPermission::View
+                        + ChannelPermission::SendMessage
+                        + ChannelPermission::ManageChannel
+                        + ChannelPermission::VoiceCall)
                 } else {
                     Ok(0)
                 }

src/notifications/events.rs

@@ -26,12 +26,8 @@ pub enum WebSocketError {
 #[serde(tag = "type")]
 pub enum ServerboundNotification {
     Authenticate(Session),
-    BeginTyping {
+    BeginTyping { channel: String },
-        channel: String
+    EndTyping { channel: String },
-    },
-    EndTyping {
-        channel: String
-    }
 }
 
 #[derive(Serialize, Deserialize, Debug)]
@@ -71,11 +67,11 @@ pub enum ClientboundNotification {
     },
     ChannelStartTyping {
         id: String,
-        user: String
+        user: String,
     },
     ChannelStopTyping {
         id: String,
-        user: String
+        user: String,
     },
 
     UserUpdate {

src/notifications/websocket.rs

@@ -171,7 +171,7 @@ async fn accept(stream: TcpStream) {
 
                             ClientboundNotification::ChannelStartTyping {
                                 id: channel.clone(),
-                                user
+                                user,
                             }
                             .publish(channel)
                             .await
@@ -194,7 +194,7 @@ async fn accept(stream: TcpStream) {
 
                             ClientboundNotification::ChannelStopTyping {
                                 id: channel.clone(),
-                                user
+                                user,
                             }
                             .publish(channel)
                             .await

src/routes/channels/delete_channel.rs

@@ -102,7 +102,7 @@ pub async fn req(user: User, target: Ref) -> Result<()> {
             Message::create(
                 "00000000000000000000000000".to_string(),
                 id.clone(),
-                Content::SystemMessage(SystemMessage::UserLeft { id: user.id })
+                Content::SystemMessage(SystemMessage::UserLeft { id: user.id }),
             )
             .publish(&target)
             .await

src/routes/channels/edit_channel.rs

@@ -1,11 +1,11 @@
 use crate::database::*;
-use crate::util::result::{Error, Result};
 use crate::notifications::events::ClientboundNotification;
+use crate::util::result::{Error, Result};
 
 use mongodb::bson::{doc, to_document};
-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 {
@@ -23,7 +23,7 @@ pub async fn req(user: User, target: Ref, info: Json<Data>) -> Result<()> {
         .map_err(|error| Error::FailedValidation { error })?;
 
     if info.name.is_none() && info.description.is_none() {
-        return Ok(())
+        return Ok(());
     }
 
     let target = target.fetch_channel().await?;
@@ -49,7 +49,7 @@ pub async fn req(user: User, target: Ref, info: Json<Data>) -> Result<()> {
 
             ClientboundNotification::ChannelUpdate {
                 id: id.clone(),
-                data: json!(info.0)
+                data: json!(info.0),
             }
             .publish(id.clone())
             .await
@@ -59,7 +59,10 @@ pub async fn req(user: User, target: Ref, info: Json<Data>) -> Result<()> {
                 Message::create(
                     "00000000000000000000000000".to_string(),
                     id.clone(),
-                    Content::SystemMessage(SystemMessage::ChannelRenamed { name: name.clone(), by: user.id })
+                    Content::SystemMessage(SystemMessage::ChannelRenamed {
+                        name: name.clone(),
+                        by: user.id,
+                    }),
                 )
                 .publish(&target)
                 .await
@@ -68,6 +71,6 @@ pub async fn req(user: User, target: Ref, info: Json<Data>) -> Result<()> {
 
             Ok(())
         }
-        _ => Err(Error::InvalidOperation)
+        _ => Err(Error::InvalidOperation),
     }
 }

src/routes/channels/group_add_member.rs

@@ -59,7 +59,10 @@ pub async fn req(user: User, target: Ref, member: Ref) -> Result<()> {
         Message::create(
             "00000000000000000000000000".to_string(),
             id.clone(),
-            Content::SystemMessage(SystemMessage::UserAdded { id: member.id, by: user.id })
+            Content::SystemMessage(SystemMessage::UserAdded {
+                id: member.id,
+                by: user.id,
+            }),
         )
         .publish(&channel)
         .await

src/routes/channels/group_remove_member.rs

@@ -56,7 +56,10 @@ pub async fn req(user: User, target: Ref, member: Ref) -> Result<()> {
         Message::create(
             "00000000000000000000000000".to_string(),
             id.clone(),
-            Content::SystemMessage(SystemMessage::UserRemove { id: member.id, by: user.id })
+            Content::SystemMessage(SystemMessage::UserRemove {
+                id: member.id,
+                by: user.id,
+            }),
         )
         .publish(&channel)
         .await

src/routes/channels/join_call.rs

@@ -1,19 +1,19 @@
 use crate::database::*;
 use crate::util::result::{Error, Result};
-use crate::util::variables::{USE_VOSO, VOSO_URL, VOSO_MANAGE_TOKEN};
+use crate::util::variables::{USE_VOSO, VOSO_MANAGE_TOKEN, VOSO_URL};
 
-use serde::{Serialize, Deserialize};
 use rocket_contrib::json::JsonValue;
+use serde::{Deserialize, Serialize};
 
 #[derive(Serialize, Deserialize)]
 struct CreateUserResponse {
-    token: String
+    token: String,
 }
 
 #[post("/<target>/join_call")]
 pub async fn req(user: User, target: Ref) -> Result<JsonValue> {
     if !*USE_VOSO {
-        return Err(Error::VosoUnavailable)
+        return Err(Error::VosoUnavailable);
     }
 
     let target = target.fetch_channel().await?;
@@ -23,7 +23,7 @@ pub async fn req(user: User, target: Ref) -> Result<JsonValue> {
         .await?;
 
     if !perm.get_voice_call() {
-        return Err(Error::MissingPermission)
+        return Err(Error::MissingPermission);
     }
 
     // To join a call:
@@ -32,38 +32,50 @@ pub async fn req(user: User, target: Ref) -> Result<JsonValue> {
     let client = reqwest::Client::new();
     let result = client
         .get(&format!("{}/room/{}", *VOSO_URL, target.id()))
-        .header(reqwest::header::AUTHORIZATION, VOSO_MANAGE_TOKEN.to_string())
+        .header(
+            reqwest::header::AUTHORIZATION,
+            VOSO_MANAGE_TOKEN.to_string(),
+        )
         .send()
         .await;
 
     match result {
         Err(_) => return Err(Error::VosoUnavailable),
-        Ok(result) => {
+        Ok(result) => match result.status() {
-            match result.status() {
             reqwest::StatusCode::OK => (),
             reqwest::StatusCode::NOT_FOUND => {
                 if let Err(_) = client
                     .post(&format!("{}/room/{}", *VOSO_URL, target.id()))
-                        .header(reqwest::header::AUTHORIZATION, VOSO_MANAGE_TOKEN.to_string())
+                    .header(
+                        reqwest::header::AUTHORIZATION,
+                        VOSO_MANAGE_TOKEN.to_string(),
+                    )
                     .send()
-                    .await {
+                    .await
-                        return Err(Error::VosoUnavailable)
+                {
+                    return Err(Error::VosoUnavailable);
                 }
+            }
+            _ => return Err(Error::VosoUnavailable),
         },
-                _ => return Err(Error::VosoUnavailable)
-            }
-        }
     }
 
     // Then create a user for the room.
     if let Ok(response) = client
-        .post(&format!("{}/room/{}/user/{}", *VOSO_URL, target.id(), user.id))
+        .post(&format!(
-        .header(reqwest::header::AUTHORIZATION, VOSO_MANAGE_TOKEN.to_string())
+            "{}/room/{}/user/{}",
+            *VOSO_URL,
+            target.id(),
+            user.id
+        ))
+        .header(
+            reqwest::header::AUTHORIZATION,
+            VOSO_MANAGE_TOKEN.to_string(),
+        )
         .send()
-    .await {
-        let res: CreateUserResponse = response.json()
         .await
-            .map_err(|_| Error::InvalidOperation)?;
+    {
+        let res: CreateUserResponse = response.json().await.map_err(|_| Error::InvalidOperation)?;
 
         Ok(json!(res))
     } else {

src/routes/channels/message_send.rs

@@ -119,7 +119,7 @@ pub async fn req(user: User, target: Ref, message: Json<Data>) -> Result<JsonVal
         attachment,
         nonce: Some(message.nonce.clone()),
         edited: None,
-        embeds: None
+        embeds: None,
     };
 
     msg.clone().publish(&target).await?;

src/routes/onboard/complete.rs

@@ -28,10 +28,11 @@ pub async fn req(session: Session, user: Option<User>, data: Json<Data>) -> Resu
         .map_err(|error| Error::FailedValidation { error })?;
 
     if User::is_username_taken(&data.username).await? {
-        return Err(Error::UsernameTaken)
+        return Err(Error::UsernameTaken);
     }
 
-    get_collection("users").insert_one(
+    get_collection("users")
+        .insert_one(
             doc! {
                 "_id": session.user_id,
                 "username": &data.username

src/routes/root.rs

@@ -1,6 +1,6 @@
 use crate::util::variables::{
-    AUTUMN_URL, DISABLE_REGISTRATION, EXTERNAL_WS_URL, HCAPTCHA_SITEKEY, INVITE_ONLY, USE_AUTUMN, APP_URL,
+    APP_URL, AUTUMN_URL, DISABLE_REGISTRATION, EXTERNAL_WS_URL, HCAPTCHA_SITEKEY, INVITE_ONLY,
-    USE_EMAIL, USE_HCAPTCHA, VAPID_PUBLIC_KEY, USE_VOSO, VOSO_URL, VOSO_WS_HOST
+    USE_AUTUMN, USE_EMAIL, USE_HCAPTCHA, USE_VOSO, VAPID_PUBLIC_KEY, VOSO_URL, VOSO_WS_HOST,
 };
 
 use mongodb::bson::doc;

src/routes/users/change_username.rs

@@ -1,14 +1,14 @@
 use crate::database::*;
-use crate::util::result::{Error, Result};
 use crate::notifications::events::ClientboundNotification;
+use crate::util::result::{Error, Result};
 
+use mongodb::bson::doc;
 use rauth::auth::{Auth, Session};
 use regex::Regex;
-use mongodb::bson::doc;
 use rocket::State;
-use validator::Validate;
 use rocket_contrib::json::Json;
-use serde::{Serialize, Deserialize};
+use serde::{Deserialize, Serialize};
+use validator::Validate;
 
 // ! FIXME: should be global somewhere; maybe use config(?)
 lazy_static! {
@@ -24,7 +24,12 @@ pub struct Data {
 }
 
 #[patch("/username", data = "<data>")]
-pub async fn req(auth: State<'_, Auth>, session: Session, user: User, data: Json<Data>) -> Result<()> {
+pub async fn req(
+    auth: State<'_, Auth>,
+    session: Session,
+    user: User,
+    data: Json<Data>,
+) -> Result<()> {
     data.validate()
         .map_err(|error| Error::FailedValidation { error })?;
 
@@ -35,24 +40,23 @@ pub async fn req(auth: State<'_, Auth>, session: Session, user: User, data: Json
     let mut set = doc! {};
     if let Some(username) = &data.username {
         if User::is_username_taken(&username).await? {
-            return Err(Error::UsernameTaken)
+            return Err(Error::UsernameTaken);
         }
 
         set.insert("username", username.clone());
     }
 
     get_collection("users")
-    .update_one(
+        .update_one(doc! { "_id": &user.id }, doc! { "$set": set }, None)
-        doc! { "_id": &user.id },
-        doc! { "$set": set },
-        None
-    )
         .await
-    .map_err(|_| Error::DatabaseError { operation: "update_one", with: "user" })?;
+        .map_err(|_| Error::DatabaseError {
+            operation: "update_one",
+            with: "user",
+        })?;
 
     ClientboundNotification::UserUpdate {
         id: user.id.clone(),
-        data: json!(data.0)
+        data: json!(data.0),
     }
     .publish(user.id.clone())
     .await

src/routes/users/edit_user.rs

@@ -1,18 +1,18 @@
 use crate::database::*;
-use crate::util::result::{Error, Result};
 use crate::notifications::events::ClientboundNotification;
+use crate::util::result::{Error, Result};
 
 use mongodb::bson::{doc, to_document};
-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 {
     #[serde(skip_serializing_if = "Option::is_none")]
     status: Option<UserStatus>,
     #[serde(skip_serializing_if = "Option::is_none")]
-    profile: Option<UserProfile>
+    profile: Option<UserProfile>,
 }
 
 #[patch("/", data = "<data>")]
@@ -31,7 +31,7 @@ pub async fn req(user: User, data: Json<Data>) -> Result<()> {
 
     ClientboundNotification::UserUpdate {
         id: user.id.clone(),
-        data: json!(data.0)
+        data: json!(data.0),
     }
     .publish(user.id.clone())
     .await