feat: implement channel invites, perms, group create, members fetch

chore: when you accidentally run fmt

src/routes/users/add_friend.rs

@@ -1,9 +1,9 @@
 use revolt_quark::models::User;
-use revolt_quark::{Result, Database};
+use revolt_quark::{Database, Result};
 
 use mongodb::bson::doc;
-use rocket::State;
 use rocket::serde::json::Json;
+use rocket::State;
 
 #[put("/<username>/friend")]
 pub async fn req(db: &State<Database>, user: User, username: String) -> Result<Json<User>> {

src/routes/users/block_user.rs

@@ -1,9 +1,9 @@
 use revolt_quark::models::User;
-use revolt_quark::{Result, Database};
+use revolt_quark::{Database, Result};
 
 use mongodb::bson::doc;
-use rocket::State;
 use rocket::serde::json::Json;
+use rocket::State;
 
 #[put("/<username>/block")]
 pub async fn req(db: &State<Database>, user: User, username: String) -> Result<Json<User>> {

src/routes/users/change_username.rs

@@ -1,7 +1,7 @@
-use revolt_quark::{Error, EmptyResponse, Result, models::User, Database};
 use crate::util::regex::RE_USERNAME;
 use mongodb::bson::doc;
 use rauth::entities::Account;
+use revolt_quark::{models::User, Database, EmptyResponse, Error, Result};
 use rocket::{serde::json::Json, State};
 use serde::{Deserialize, Serialize};
 use validator::Validate;
@@ -22,6 +22,10 @@ pub async fn req(
     data: Json<Data>,
 ) -> Result<EmptyResponse> {
     let data = data.into_inner();
-    account.verify_password(&data.password).map_err(|_| Error::InvalidCredentials)?;
-    user.update_username(db, data.username).await.map(|_| EmptyResponse)
+    account
+        .verify_password(&data.password)
+        .map_err(|_| Error::InvalidCredentials)?;
+    user.update_username(db, data.username)
+        .await
+        .map(|_| EmptyResponse)
 }

src/routes/users/edit_user.rs

@@ -1,13 +1,13 @@
 //! Edit currently authenticated user.
 
+use revolt_quark::models::user::{FieldsUser, PartialUser, User};
 use revolt_quark::models::File;
-use revolt_quark::{Error, Result, Database};
-use revolt_quark::models::user::{FieldsUser, User, PartialUser};
+use revolt_quark::{Database, Error, Result};
 
 use mongodb::bson::doc;
 use revolt_quark::models::user::UserStatus;
-use rocket::State;
 use rocket::serde::json::Json;
+use rocket::State;
 use serde::{Deserialize, Serialize};
 use validator::Validate;
 
@@ -36,10 +36,15 @@ pub struct Data {
 #[patch("/@me", data = "<data>")]
 pub async fn req(db: &State<Database>, mut user: User, data: Json<Data>) -> Result<Json<User>> {
     let data = data.into_inner();
-    data.validate().map_err(|error| Error::FailedValidation { error })?;
+    data.validate()
+        .map_err(|error| Error::FailedValidation { error })?;
 
-    if data.status.is_none() && data.profile.is_none() && data.avatar.is_none() && data.remove.is_none() {
-        return Ok(Json(user))
+    if data.status.is_none()
+        && data.profile.is_none()
+        && data.avatar.is_none()
+        && data.remove.is_none()
+    {
+        return Ok(Json(user));
     }
 
     if let Some(fields) = &data.remove {
@@ -97,6 +102,7 @@ pub async fn req(db: &State<Database>, mut user: User, data: Json<Data>) -> Resu
         user.profile = partial.profile.clone();
     }
 
-    db.update_user(&user.id, &partial, data.remove.unwrap_or_default()).await?;
+    db.update_user(&user.id, &partial, data.remove.unwrap_or_default())
+        .await?;
     Ok(Json(user.foreign()))
 }

src/routes/users/fetch_dms.rs

@@ -1,8 +1,11 @@
 //! Fetch direct messages that the current user is involved in
-//! 
+//!
 //! This includes group DMs and "active" 1:1 DMs.
 
-use revolt_quark::{Result, models::{Channel, User}, Database};
+use revolt_quark::{
+    models::{Channel, User},
+    Database, Result,
+};
 
 use mongodb::bson::doc;
 use rocket::{serde::json::Json, State};

src/routes/users/fetch_profile.rs

@@ -1,9 +1,12 @@
 //! Fetch another user's profile
-//! 
+//!
 //! Will fail if the authenticated user does not
 //! have permission to access the other user's profile.
 
-use revolt_quark::{Ref, Result, Error, models::{User, user::UserProfile}, perms, Database};
+use revolt_quark::{
+    models::{user::UserProfile, User},
+    perms, Database, Error, Ref, Result,
+};
 
 use rocket::{serde::json::Json, State};
 
@@ -11,7 +14,12 @@ use rocket::{serde::json::Json, State};
 pub async fn req(db: &State<Database>, user: User, target: Ref) -> Result<Json<UserProfile>> {
     let target = target.as_user(db).await?;
 
-    if perms(&user).user(&target).calc_user(db).await.get_view_profile() {
+    if perms(&user)
+        .user(&target)
+        .calc_user(db)
+        .await
+        .get_view_profile()
+    {
         Ok(Json(target.profile.unwrap_or_default()))
     } else {
         Err(Error::NotFound)

src/routes/users/fetch_self.rs

@@ -1,11 +1,11 @@
-//! Fetch the currently authenticated session's user account
-
-use revolt_quark::Result;
-use revolt_quark::models::User;
-
-use rocket::serde::json::Json;
-
-#[get("/@me")]
-pub async fn req(user: User) -> Result<Json<User>> {
-    Ok(Json(user.foreign()))
-}
+//! Fetch the currently authenticated session's user account
+
+use revolt_quark::models::User;
+use revolt_quark::Result;
+
+use rocket::serde::json::Json;
+
+#[get("/@me")]
+pub async fn req(user: User) -> Result<Json<User>> {
+    Ok(Json(user.foreign()))
+}

src/routes/users/fetch_user.rs

@@ -1,16 +1,16 @@
 //! Fetch another user
-//! 
+//!
 //! Will fail if the authenticated user does not
 //! have permission to access the other user.
 
-use revolt_quark::{Ref, Result, Error, models::User, perms, Database};
+use revolt_quark::{models::User, perms, Database, Error, Ref, Result};
 
 use rocket::{serde::json::Json, State};
 
 #[get("/<target>")]
 pub async fn req(db: &State<Database>, user: User, target: Ref) -> Result<Json<User>> {
     let target = target.as_user(db).await?;
-    
+
     let permissions = perms(&user).user(&target).calc_user(db).await;
     if permissions.get_access() {
         Ok(Json(target.with_perspective(&user, &permissions)))

src/routes/users/find_mutual.rs

@@ -2,16 +2,21 @@
 //! authenticated user and the target user
 
 use revolt_quark::models::User;
-use revolt_quark::{Error, Result, perms, Database, Ref};
+use revolt_quark::{perms, Database, Error, Ref, Result};
 
-use rocket::State;
 use rocket::serde::json::Value;
+use rocket::State;
 
 #[get("/<target>/mutual")]
 pub async fn req(db: &State<Database>, user: User, target: Ref) -> Result<Value> {
     let target = target.as_user(db).await?;
 
-    if perms(&user).user(&target).calc_user(db).await.get_view_profile() {
+    if perms(&user)
+        .user(&target)
+        .calc_user(db)
+        .await
+        .get_view_profile()
+    {
         Ok(json!({
             "users": db.fetch_mutual_user_ids(&user.id, &target.id).await?,
             "servers": db.fetch_mutual_server_ids(&user.id, &target.id).await?

src/routes/users/get_default_avatar.rs

@@ -1,6 +1,6 @@
-use rocket::{Request, Response};
-use rocket::response::{self, Responder};
 use rocket::fs::NamedFile;
+use rocket::response::{self, Responder};
+use rocket::{Request, Response};
 use std::path::Path;
 
 pub struct CachedFile(NamedFile);
@@ -19,22 +19,28 @@ impl<'r> Responder<'r, 'static> for CachedFile {
 pub async fn req(target: String) -> Option<CachedFile> {
     match target.chars().nth(25).unwrap() {
         '0' | '1' | '2' | '3' | '4' | '5' | '6' | '7' => {
-            NamedFile::open(Path::new("assets/user_red.png")).await.ok().map(CachedFile)
+            NamedFile::open(Path::new("assets/user_red.png"))
+                .await
+                .ok()
+                .map(CachedFile)
         }
         '8' | '9' | 'A' | 'C' | 'B' | 'D' | 'E' | 'F' => {
             NamedFile::open(Path::new("assets/user_green.png"))
                 .await
-                .ok().map(CachedFile)
+                .ok()
+                .map(CachedFile)
         }
         'G' | 'H' | 'J' | 'K' | 'M' | 'N' | 'P' | 'Q' => {
             NamedFile::open(Path::new("assets/user_blue.png"))
                 .await
-                .ok().map(CachedFile)
+                .ok()
+                .map(CachedFile)
         }
         'R' | 'S' | 'T' | 'V' | 'W' | 'X' | 'Y' | 'Z' => {
             NamedFile::open(Path::new("assets/user_yellow.png"))
                 .await
-                .ok().map(CachedFile)
+                .ok()
+                .map(CachedFile)
         }
         _ => unreachable!(),
     }

src/routes/users/mod.rs

@@ -6,13 +6,13 @@ mod change_username;
 mod edit_user;
 mod fetch_dms;
 mod fetch_profile;
+mod fetch_self;
 mod fetch_user;
 mod find_mutual;
 mod get_default_avatar;
 mod open_dm;
 mod remove_friend;
 mod unblock_user;
-mod fetch_self;
 
 pub fn routes() -> Vec<Route> {
     routes![

src/routes/users/open_dm.rs

@@ -1,9 +1,12 @@
 //! Open a direct message with another user
 
-use revolt_quark::{Error, Result, Ref, models::{User, Channel}, Database, perms, UserPermission};
+use revolt_quark::{
+    models::{Channel, User},
+    perms, Database, Error, Ref, Result, UserPermission,
+};
 
 use mongodb::bson::doc;
-use rocket::{State, serde::json::Json};
+use rocket::{serde::json::Json, State};
 use ulid::Ulid;
 
 #[get("/<target>/dm")]
@@ -12,14 +15,16 @@ pub async fn req(db: &State<Database>, user: User, target: Ref) -> Result<Json<C
 
     if let Ok(channel) = db.find_direct_message_channel(&user.id, &target.id).await {
         Ok(Json(channel))
-    } else if perms(&user).user(&target).calc_user(db).await.get_send_message() {
+    } else if perms(&user)
+        .user(&target)
+        .calc_user(db)
+        .await
+        .get_send_message()
+    {
         let new_channel = Channel::DirectMessage {
             id: Ulid::new().to_string(),
             active: false,
-            recipients: vec! [
-                user.id.clone(),
-                target.id.clone()
-            ],
+            recipients: vec![user.id.clone(), target.id.clone()],
             last_message_id: None,
         };
 

src/routes/users/remove_friend.rs

@@ -1,9 +1,9 @@
 use revolt_quark::models::User;
-use revolt_quark::{Result, Database};
+use revolt_quark::{Database, Result};
 
 use mongodb::bson::doc;
-use rocket::State;
 use rocket::serde::json::Json;
+use rocket::State;
 
 #[delete("/<username>/friend")]
 pub async fn req(db: &State<Database>, user: User, username: String) -> Result<Json<User>> {

src/routes/users/unblock_user.rs

@@ -1,9 +1,9 @@
 use revolt_quark::models::User;
-use revolt_quark::{Result, Database};
+use revolt_quark::{Database, Result};
 
 use mongodb::bson::doc;
-use rocket::State;
 use rocket::serde::json::Json;
+use rocket::State;
 
 #[delete("/<username>/block")]
 pub async fn req(db: &State<Database>, user: User, username: String) -> Result<Json<User>> {