Run cargo fmt, add root preflight.

src/database/channel.rs

@@ -1,11 +1,11 @@
 use super::get_collection;
 
-use serde::{Deserialize, Serialize};
-use rocket::request::FromParam;
-use std::sync::{Arc, Mutex};
-use mongodb::bson::{Bson, doc, from_bson};
-use rocket::http::RawStr;
 use lru::LruCache;
+use mongodb::bson::{doc, from_bson, Bson};
+use rocket::http::RawStr;
+use rocket::request::FromParam;
+use serde::{Deserialize, Serialize};
+use std::sync::{Arc, Mutex};
 
 #[derive(Serialize, Deserialize, Debug, Clone)]
 pub struct LastMessage {
@@ -41,7 +41,8 @@ pub struct Channel {
 }
 
 lazy_static! {
-    static ref CACHE: Arc<Mutex<LruCache<String, Channel>>> = Arc::new(Mutex::new(LruCache::new(4_000_000)));
+    static ref CACHE: Arc<Mutex<LruCache<String, Channel>>> =
+        Arc::new(Mutex::new(LruCache::new(4_000_000)));
 }
 
 pub fn fetch_channel(id: &str) -> Result<Option<Channel>, String> {
@@ -63,7 +64,7 @@ pub fn fetch_channel(id: &str) -> Result<Option<Channel>, String> {
             if let Ok(channel) = from_bson(Bson::Document(doc)) as Result<Channel, _> {
                 let mut cache = CACHE.lock().unwrap();
                 cache.put(id.to_string(), channel.clone());
-    
+
                 Ok(Some(channel))
             } else {
                 Err("Failed to deserialize channel!".to_string())
@@ -84,7 +85,7 @@ pub fn fetch_channels(ids: &Vec<String>) -> Result<Option<Vec<Channel>>, String>
         if let Ok(mut cache) = CACHE.lock() {
             for gid in ids {
                 let existing = cache.get(gid);
-    
+
                 if let Some(channel) = existing {
                     channels.push((*channel).clone());
                 } else {
@@ -97,7 +98,7 @@ pub fn fetch_channels(ids: &Vec<String>) -> Result<Option<Vec<Channel>>, String>
     }
 
     if missing.len() == 0 {
-        return Ok(Some(channels))
+        return Ok(Some(channels));
     }
 
     let col = get_collection("channels");
@@ -109,7 +110,7 @@ pub fn fetch_channels(ids: &Vec<String>) -> Result<Option<Vec<Channel>>, String>
                     cache.put(channel.id.clone(), channel.clone());
                     channels.push(channel);
                 } else {
-                    return Err("Failed to deserialize channel!".to_string())
+                    return Err("Failed to deserialize channel!".to_string());
                 }
             } else {
                 return Err("Failed to fetch channel.".to_string());
@@ -148,7 +149,7 @@ impl<'r> FromParam<'r> for Channel {
         let c = Channel {
             id: "potato".to_string(),
             channel_type: 0,
-    
+
             active: None,
             last_message: None,
             description: None,

src/database/guild.rs

@@ -1,11 +1,11 @@
 use super::get_collection;
 
-use serde::{Deserialize, Serialize};
-use rocket::request::FromParam;
-use std::sync::{Arc, Mutex};
-use mongodb::bson::{Bson, doc, from_bson};
-use rocket::http::RawStr;
 use lru::LruCache;
+use mongodb::bson::{doc, from_bson, Bson};
+use rocket::http::RawStr;
+use rocket::request::FromParam;
+use serde::{Deserialize, Serialize};
+use std::sync::{Arc, Mutex};
 
 #[derive(Serialize, Deserialize, Debug, Clone)]
 pub struct MemberRef {
@@ -49,7 +49,8 @@ pub struct Guild {
 }
 
 lazy_static! {
-    static ref CACHE: Arc<Mutex<LruCache<String, Guild>>> = Arc::new(Mutex::new(LruCache::new(4_000_000)));
+    static ref CACHE: Arc<Mutex<LruCache<String, Guild>>> =
+        Arc::new(Mutex::new(LruCache::new(4_000_000)));
 }
 
 pub fn fetch_guild(id: &str) -> Result<Option<Guild>, String> {
@@ -71,7 +72,7 @@ pub fn fetch_guild(id: &str) -> Result<Option<Guild>, String> {
             if let Ok(guild) = from_bson(Bson::Document(doc)) as Result<Guild, _> {
                 let mut cache = CACHE.lock().unwrap();
                 cache.put(id.to_string(), guild.clone());
-    
+
                 Ok(Some(guild))
             } else {
                 Err("Failed to deserialize guild!".to_string())

src/database/message.rs

@@ -1,15 +1,15 @@
+use super::get_collection;
+use crate::database::channel::Channel;
+use crate::notifications;
 use crate::notifications::events::message::Create;
 use crate::notifications::events::Notification;
 use crate::routes::channel::ChannelType;
-use crate::database::channel::Channel;
-use super::get_collection;
-use crate::notifications;
 
-use mongodb::bson::{doc, to_bson, Bson, DateTime};
-use serde::{Deserialize, Serialize};
-use rocket::request::FromParam;
 use mongodb::bson::from_bson;
+use mongodb::bson::{doc, to_bson, Bson, DateTime};
 use rocket::http::RawStr;
+use rocket::request::FromParam;
+use serde::{Deserialize, Serialize};
 
 #[derive(Serialize, Deserialize, Debug)]
 pub struct PreviousEntry {

src/database/mod.rs

@@ -1,5 +1,5 @@
-use mongodb::sync::{Client, Collection, Database};
 use mongodb::bson::doc;
+use mongodb::sync::{Client, Collection, Database};
 use std::env;
 
 use once_cell::sync::OnceCell;
@@ -10,7 +10,11 @@ pub fn connect() {
         Client::with_uri_str(&env::var("DB_URI").expect("DB_URI not in environment variables!"))
             .expect("Failed to init db connection.");
 
-    client.database("revolt").collection("migrations").find(doc! { }, None).expect("Failed to get migration data from database.");
+    client
+        .database("revolt")
+        .collection("migrations")
+        .find(doc! {}, None)
+        .expect("Failed to get migration data from database.");
 
     DBCONN.set(client).unwrap();
 }

src/database/permissions.rs

@@ -1,6 +1,6 @@
 use super::mutual::has_mutual_connection;
 use crate::database::channel::Channel;
-use crate::database::guild::{Guild, Member, get_member, fetch_guild};
+use crate::database::guild::{fetch_guild, get_member, Guild, Member};
 use crate::database::user::UserRelationship;
 use crate::guards::auth::UserRef;
 

src/guards/auth.rs

@@ -1,4 +1,4 @@
-use mongodb::bson::{Bson, doc, from_bson, Document};
+use mongodb::bson::{doc, from_bson, Bson, Document};
 use mongodb::options::FindOneOptions;
 use rocket::http::{RawStr, Status};
 use rocket::request::{self, FromParam, FromRequest, Request};

src/main.rs

@@ -9,11 +9,11 @@ extern crate bitfield;
 #[macro_use]
 extern crate lazy_static;
 
-pub mod notifications;
 pub mod database;
-pub mod guards;
-pub mod routes;
 pub mod email;
+pub mod guards;
+pub mod notifications;
+pub mod routes;
 pub mod util;
 
 use dotenv;

src/notifications/state.rs

@@ -1,8 +1,8 @@
 use crate::database;
 use crate::util::vec_to_set;
 
-use mongodb::bson::doc;
 use hashbrown::{HashMap, HashSet};
+use mongodb::bson::doc;
 use mongodb::options::FindOneOptions;
 use once_cell::sync::OnceCell;
 use std::sync::RwLock;

src/routes/account.rs

@@ -4,9 +4,9 @@ use crate::email;
 use crate::util::gen_token;
 
 use bcrypt::{hash, verify};
-use mongodb::bson::{doc, from_bson, Bson};
 use chrono::prelude::*;
 use database::user::User;
+use mongodb::bson::{doc, from_bson, Bson};
 use rocket_contrib::json::Json;
 use serde::{Deserialize, Serialize};
 use ulid::Ulid;
@@ -140,9 +140,7 @@ pub fn verify_email(code: String) -> Response {
 
             email::send_welcome_email(target.to_string(), user.username);
 
-            Response::Redirect(
+            Response::Redirect(super::Redirect::to("https://app.revolt.chat"))
-                super::Redirect::to("https://app.revolt.chat"),
-            )
         }
     } else {
         Response::BadRequest(json!({ "error": "Invalid code." }))

src/routes/channel.rs

@@ -1,7 +1,7 @@
 use super::Response;
 use crate::database::{
-    self, get_relationship, get_relationship_internal, message::Message, Permission,
+    self, channel::Channel, get_relationship, get_relationship_internal, message::Message,
-    PermissionCalculator, Relationship, channel::Channel
+    Permission, PermissionCalculator, Relationship,
 };
 use crate::guards::auth::UserRef;
 use crate::notifications::{
@@ -10,8 +10,8 @@ use crate::notifications::{
 };
 use crate::util::vec_to_set;
 
-use mongodb::bson::{doc, from_bson, Bson};
 use chrono::prelude::*;
+use mongodb::bson::{doc, from_bson, Bson};
 use mongodb::options::FindOptions;
 use num_enum::TryFromPrimitive;
 use rocket::request::Form;
@@ -145,15 +145,15 @@ pub fn channel(user: UserRef, target: Channel) -> Option<Response> {
                 "description": 1,
                 "owner": 1,
             }) {*/
-                Some(Response::Success(json!({
+            Some(Response::Success(json!({
-                    "id": target.id,
+                "id": target.id,
-                    "type": target.channel_type,
+                "type": target.channel_type,
-                    "last_message": target.last_message,
+                "last_message": target.last_message,
-                    "recipients": target.recipients,
+                "recipients": target.recipients,
-                    "name": target.name,
+                "name": target.name,
-                    "owner": target.owner,
+                "owner": target.owner,
-                    "description": target.description,
+                "description": target.description,
-                })))
+            })))
             /*} else {
                 None
             }*/
@@ -163,13 +163,13 @@ pub fn channel(user: UserRef, target: Channel) -> Option<Response> {
                 "name": 1,
                 "description": 1,
             }) {*/
-                Some(Response::Success(json!({
+            Some(Response::Success(json!({
-                    "id": target.id,
+                "id": target.id,
-                    "type": target.channel_type,
+                "type": target.channel_type,
-                    "guild": target.guild,
+                "guild": target.guild,
-                    "name": target.name,
+                "name": target.name,
-                    "description": target.description,
+                "description": target.description,
-                })))
+            })))
             /*} else {
                 None
             }*/

src/routes/guild.rs

@@ -1,7 +1,9 @@
 use super::channel::ChannelType;
 use super::Response;
-use crate::database::{self, channel::Channel, channel::fetch_channel, Permission, PermissionCalculator};
 use crate::database::guild::{get_invite, get_member, Guild};
+use crate::database::{
+    self, channel::fetch_channel, channel::Channel, Permission, PermissionCalculator,
+};
 use crate::guards::auth::UserRef;
 use crate::notifications::{
     self,
@@ -106,9 +108,7 @@ pub fn guild(user: UserRef, target: Guild) -> Option<Response> {
             let mut channels = vec![];
             for item in results {
                 if let Ok(entry) = item {
-                    if let Ok(channel) =
+                    if let Ok(channel) = from_bson(Bson::Document(entry)) as Result<Channel, _> {
-                        from_bson(Bson::Document(entry)) as Result<Channel, _>
-                    {
                         channels.push(json!({
                             "id": channel.id,
                             "name": channel.name,
@@ -265,11 +265,7 @@ pub struct CreateChannel {
 
 /// create a new channel
 #[post("/<target>/channels", data = "<info>")]
-pub fn create_channel(
+pub fn create_channel(user: UserRef, target: Guild, info: Json<CreateChannel>) -> Option<Response> {
-    user: UserRef,
-    target: Guild,
-    info: Json<CreateChannel>,
-) -> Option<Response> {
     let (permissions, _) = with_permissions!(user, target);
 
     if !permissions.get_manage_channels() {
@@ -451,8 +447,8 @@ pub fn fetch_invite(user: UserRef, code: String) -> Response {
                 } else {
                     Response::NotFound(json!({ "error": "Channel does not exist." }))
                 }
-            },
+            }
-            Err(err) => Response::InternalServerError(json!({ "error": err }))
+            Err(err) => Response::InternalServerError(json!({ "error": err })),
         }
     } else {
         Response::NotFound(json!({ "error": "Failed to fetch invite or code is invalid." }))

src/routes/mod.rs

@@ -63,7 +63,7 @@ impl<'a> rocket::response::Responder<'a> for Permission {
 
 pub fn mount(rocket: Rocket) -> Rocket {
     rocket
-        .mount("/", routes![root::root, root::teapot])
+        .mount("/", routes![root::root, root::root_preflight, root::teapot])
         .mount(
             "/account",
             routes![

src/routes/root.rs

@@ -10,6 +10,11 @@ pub fn root() -> Response {
     }))
 }
 
+#[options("/")]
+pub fn root_preflight() -> Response {
+    Response::Result(super::Status::Ok)
+}
+
 /// I'm a teapot.
 #[delete("/")]
 pub fn teapot() -> Response {

src/routes/user.rs

@@ -8,7 +8,7 @@ use crate::notifications::{
 use crate::routes::channel;
 
 use mongodb::bson::doc;
-use mongodb::options::{Collation, FindOptions, FindOneOptions};
+use mongodb::options::{Collation, FindOneOptions, FindOptions};
 use rocket_contrib::json::Json;
 use serde::{Deserialize, Serialize};
 use ulid::Ulid;
@@ -61,13 +61,8 @@ pub fn query(user: UserRef, query: Json<UserQuery>) -> Response {
     if let Ok(result) = col.find_one(
         doc! { "username": query.username.clone() },
         FindOneOptions::builder()
-            .collation(
+            .collation(Collation::builder().locale("en").strength(2).build())
-                Collation::builder()
+            .build(),
-                    .locale("en")
-                    .strength(2)
-                    .build()
-            )
-            .build()
     ) {
         if let Some(doc) = result {
             let id = doc.get_str("_id").unwrap();