style: cargo clippy && format

src/api/v1/auth/login.rs

@@ -2,13 +2,17 @@ use std::time::{SystemTime, UNIX_EPOCH};
 
 use actix_web::{HttpResponse, post, web};
 use argon2::{PasswordHash, PasswordVerifier};
-use diesel::{dsl::insert_into, ExpressionMethods, QueryDsl};
+use diesel::{ExpressionMethods, QueryDsl, dsl::insert_into};
 use diesel_async::RunQueryDsl;
 use serde::Deserialize;
 use uuid::Uuid;
 
 use crate::{
-    error::Error, api::v1::auth::{EMAIL_REGEX, PASSWORD_REGEX, USERNAME_REGEX}, schema::*, utils::{generate_access_token, generate_refresh_token, refresh_token_cookie}, Data
+    Data,
+    api::v1::auth::{EMAIL_REGEX, PASSWORD_REGEX, USERNAME_REGEX},
+    error::Error,
+    schema::*,
+    utils::{generate_access_token, generate_refresh_token, refresh_token_cookie},
 };
 
 use super::Response;
@@ -79,34 +83,45 @@ async fn login(
 ) -> Result<HttpResponse, Error> {
     let mut conn = data.pool.get().await?;
 
-    let parsed_hash = PasswordHash::new(&database_password).map_err(|e| Error::PasswordHashError(e.to_string()))?;
+    let parsed_hash = PasswordHash::new(&database_password)
+        .map_err(|e| Error::PasswordHashError(e.to_string()))?;
 
     if data
         .argon2
         .verify_password(request_password.as_bytes(), &parsed_hash)
         .is_err()
     {
-        return Err(Error::Unauthorized("Wrong username or password".to_string()));
+        return Err(Error::Unauthorized(
+            "Wrong username or password".to_string(),
+        ));
     }
 
     let refresh_token = generate_refresh_token()?;
     let access_token = generate_access_token()?;
 
-    let current_time = SystemTime::now()
-        .duration_since(UNIX_EPOCH)?
-        .as_secs() as i64;
+    let current_time = SystemTime::now().duration_since(UNIX_EPOCH)?.as_secs() as i64;
 
     use refresh_tokens::dsl as rdsl;
 
     insert_into(refresh_tokens::table)
-        .values((rdsl::token.eq(&refresh_token), rdsl::uuid.eq(uuid), rdsl::created_at.eq(current_time), rdsl::device_name.eq(device_name)))
+        .values((
+            rdsl::token.eq(&refresh_token),
+            rdsl::uuid.eq(uuid),
+            rdsl::created_at.eq(current_time),
+            rdsl::device_name.eq(device_name),
+        ))
         .execute(&mut conn)
         .await?;
 
     use access_tokens::dsl as adsl;
 
     insert_into(access_tokens::table)
-        .values((adsl::token.eq(&access_token), adsl::refresh_token.eq(&refresh_token), adsl::uuid.eq(uuid), adsl::created_at.eq(current_time)))
+        .values((
+            adsl::token.eq(&access_token),
+            adsl::refresh_token.eq(&refresh_token),
+            adsl::uuid.eq(uuid),
+            adsl::created_at.eq(current_time),
+        ))
         .execute(&mut conn)
         .await?;
 

src/api/v1/auth/mod.rs

@@ -10,7 +10,7 @@ use regex::Regex;
 use serde::Serialize;
 use uuid::Uuid;
 
-use crate::{error::Error, Conn, schema::access_tokens::dsl};
+use crate::{Conn, error::Error, schema::access_tokens::dsl};
 
 mod login;
 mod refresh;
@@ -39,10 +39,7 @@ pub fn web() -> Scope {
         .service(revoke::res)
 }
 
-pub async fn check_access_token(
-    access_token: &str,
-    conn: &mut Conn,
-) -> Result<Uuid, Error> {
+pub async fn check_access_token(access_token: &str, conn: &mut Conn) -> Result<Uuid, Error> {
     let (uuid, created_at): (Uuid, i64) = dsl::access_tokens
         .filter(dsl::token.eq(access_token))
         .select((dsl::uuid, dsl::created_at))
@@ -56,9 +53,7 @@ pub async fn check_access_token(
             }
         })?;
 
-    let current_time = SystemTime::now()
-        .duration_since(UNIX_EPOCH)?
-        .as_secs() as i64;
+    let current_time = SystemTime::now().duration_since(UNIX_EPOCH)?.as_secs() as i64;
 
     let lifetime = current_time - created_at;
 

src/api/v1/auth/refresh.rs

@@ -1,11 +1,17 @@
 use actix_web::{HttpRequest, HttpResponse, post, web};
-use diesel::{delete, update, ExpressionMethods, QueryDsl};
+use diesel::{ExpressionMethods, QueryDsl, delete, update};
 use diesel_async::RunQueryDsl;
 use log::error;
 use std::time::{SystemTime, UNIX_EPOCH};
 
 use crate::{
-    error::Error, schema::{access_tokens::{self, dsl}, refresh_tokens::{self, dsl as rdsl}}, utils::{generate_access_token, generate_refresh_token, refresh_token_cookie}, Data
+    Data,
+    error::Error,
+    schema::{
+        access_tokens::{self, dsl},
+        refresh_tokens::{self, dsl as rdsl},
+    },
+    utils::{generate_access_token, generate_refresh_token, refresh_token_cookie},
 };
 
 use super::Response;
@@ -20,9 +26,7 @@ pub async fn res(req: HttpRequest, data: web::Data<Data>) -> Result<HttpResponse
 
     let mut refresh_token = String::from(recv_refresh_token_cookie.unwrap().value());
 
-    let current_time = SystemTime::now()
-        .duration_since(UNIX_EPOCH)?
-        .as_secs() as i64;
+    let current_time = SystemTime::now().duration_since(UNIX_EPOCH)?.as_secs() as i64;
 
     let mut conn = data.pool.get().await?;
 
@@ -52,9 +56,7 @@ pub async fn res(req: HttpRequest, data: web::Data<Data>) -> Result<HttpResponse
                 .finish());
         }
 
-        let current_time = SystemTime::now()
-            .duration_since(UNIX_EPOCH)?
-            .as_secs() as i64;
+        let current_time = SystemTime::now().duration_since(UNIX_EPOCH)?.as_secs() as i64;
 
         if lifetime > 1987200 {
             let new_refresh_token = generate_refresh_token();

src/api/v1/auth/register.rs

@@ -5,14 +5,22 @@ use argon2::{
     PasswordHasher,
     password_hash::{SaltString, rand_core::OsRng},
 };
-use diesel::{dsl::insert_into, ExpressionMethods};
+use diesel::{ExpressionMethods, dsl::insert_into};
 use diesel_async::RunQueryDsl;
 use serde::{Deserialize, Serialize};
 use uuid::Uuid;
 
 use super::Response;
 use crate::{
-    api::v1::auth::{EMAIL_REGEX, PASSWORD_REGEX, USERNAME_REGEX}, error::Error, schema::{access_tokens::{self, dsl as adsl}, refresh_tokens::{self, dsl as rdsl}, users::{self, dsl as udsl}}, utils::{generate_access_token, generate_refresh_token, refresh_token_cookie}, Data
+    Data,
+    api::v1::auth::{EMAIL_REGEX, PASSWORD_REGEX, USERNAME_REGEX},
+    error::Error,
+    schema::{
+        access_tokens::{self, dsl as adsl},
+        refresh_tokens::{self, dsl as rdsl},
+        users::{self, dsl as udsl},
+    },
+    utils::{generate_access_token, generate_refresh_token, refresh_token_cookie},
 };
 
 #[derive(Deserialize)]
@@ -107,9 +115,7 @@ pub async fn res(
         let refresh_token = generate_refresh_token()?;
         let access_token = generate_access_token()?;
 
-        let current_time = SystemTime::now()
-            .duration_since(UNIX_EPOCH)?
-            .as_secs() as i64;
+        let current_time = SystemTime::now().duration_since(UNIX_EPOCH)?.as_secs() as i64;
 
         insert_into(refresh_tokens::table)
             .values((
@@ -133,7 +139,7 @@ pub async fn res(
 
         return Ok(HttpResponse::Ok()
             .cookie(refresh_token_cookie(refresh_token))
-            .json(Response { access_token }))
+            .json(Response { access_token }));
     }
 
     Ok(HttpResponse::InternalServerError().finish())

src/api/v1/auth/revoke.rs

@@ -1,10 +1,17 @@
 use actix_web::{HttpRequest, HttpResponse, post, web};
 use argon2::{PasswordHash, PasswordVerifier};
-use diesel::{delete, ExpressionMethods, QueryDsl};
+use diesel::{ExpressionMethods, QueryDsl, delete};
 use diesel_async::RunQueryDsl;
 use serde::Deserialize;
 
-use crate::{api::v1::auth::check_access_token, error::Error, schema::users::dsl as udsl, schema::refresh_tokens::{self, dsl as rdsl}, utils::get_auth_header, Data};
+use crate::{
+    Data,
+    api::v1::auth::check_access_token,
+    error::Error,
+    schema::refresh_tokens::{self, dsl as rdsl},
+    schema::users::dsl as udsl,
+    utils::get_auth_header,
+};
 
 #[derive(Deserialize)]
 struct RevokeRequest {
@@ -33,14 +40,17 @@ pub async fn res(
         .get_result(&mut conn)
         .await?;
 
-    let hashed_password = PasswordHash::new(&database_password).map_err(|e| Error::PasswordHashError(e.to_string()))?;
+    let hashed_password = PasswordHash::new(&database_password)
+        .map_err(|e| Error::PasswordHashError(e.to_string()))?;
 
     if data
         .argon2
         .verify_password(revoke_request.password.as_bytes(), &hashed_password)
         .is_err()
     {
-        return Err(Error::Unauthorized("Wrong username or password".to_string()));
+        return Err(Error::Unauthorized(
+            "Wrong username or password".to_string(),
+        ));
     }
 
     delete(refresh_tokens::table)

src/api/v1/invites/id.rs

@@ -1,9 +1,9 @@
 use actix_web::{HttpRequest, HttpResponse, get, post, web};
 
 use crate::{
-    error::Error,
     Data,
     api::v1::auth::check_access_token,
+    error::Error,
     structs::{Guild, Invite, Member},
     utils::get_auth_header,
 };

src/api/v1/servers/mod.rs

@@ -1,9 +1,15 @@
-use actix_web::{get, post, web, HttpRequest, HttpResponse, Scope};
+use actix_web::{HttpRequest, HttpResponse, Scope, get, post, web};
 use serde::Deserialize;
 
 mod uuid;
 
-use crate::{error::Error, api::v1::auth::check_access_token, structs::{Guild, StartAmountQuery}, utils::get_auth_header, Data};
+use crate::{
+    Data,
+    api::v1::auth::check_access_token,
+    error::Error,
+    structs::{Guild, StartAmountQuery},
+    utils::get_auth_header,
+};
 
 #[derive(Deserialize)]
 struct GuildInfo {
@@ -63,4 +69,3 @@ pub async fn get(
 
     Ok(HttpResponse::Ok().json(guilds))
 }
-

src/api/v1/servers/uuid/channels/mod.rs

@@ -1,7 +1,7 @@
 use crate::{
-    error::Error,
     Data,
     api::v1::auth::check_access_token,
+    error::Error,
     structs::{Channel, Member},
     utils::get_auth_header,
 };
@@ -43,8 +43,7 @@ pub async fn get(
 
     let channels = Channel::fetch_all(&data.pool, guild_uuid).await?;
 
-    data
-        .set_cache_key(format!("{}_channels", guild_uuid), channels.clone(), 1800)
+    data.set_cache_key(format!("{}_channels", guild_uuid), channels.clone(), 1800)
         .await?;
 
     Ok(HttpResponse::Ok().json(channels))

src/api/v1/servers/uuid/channels/uuid/messages.rs

@@ -1,7 +1,7 @@
 use crate::{
-    error::Error,
     Data,
     api::v1::auth::check_access_token,
+    error::Error,
     structs::{Channel, Member},
     utils::get_auth_header,
 };
@@ -41,8 +41,7 @@ pub async fn get(
     } else {
         channel = Channel::fetch_one(&mut conn, channel_uuid).await?;
 
-        data
-            .set_cache_key(format!("{}", channel_uuid), channel.clone(), 60)
+        data.set_cache_key(format!("{}", channel_uuid), channel.clone(), 60)
             .await?;
     }
 

src/api/v1/servers/uuid/channels/uuid/mod.rs

@@ -2,14 +2,14 @@ pub mod messages;
 pub mod socket;
 
 use crate::{
-    error::Error,
     Data,
     api::v1::auth::check_access_token,
+    error::Error,
     structs::{Channel, Member},
     utils::get_auth_header,
 };
-use uuid::Uuid;
 use actix_web::{HttpRequest, HttpResponse, delete, get, web};
+use uuid::Uuid;
 
 #[get("{uuid}/channels/{channel_uuid}")]
 pub async fn get(
@@ -37,8 +37,7 @@ pub async fn get(
 
     let channel = Channel::fetch_one(&mut conn, channel_uuid).await?;
 
-    data
-        .set_cache_key(format!("{}", channel_uuid), channel.clone(), 60)
+    data.set_cache_key(format!("{}", channel_uuid), channel.clone(), 60)
         .await?;
 
     Ok(HttpResponse::Ok().json(channel))

src/api/v1/servers/uuid/channels/uuid/socket.rs

@@ -26,7 +26,7 @@ pub async fn echo(
     // Get uuids from path
     let (guild_uuid, channel_uuid) = path.into_inner();
 
-    let mut conn = data.pool.get().await.map_err(|e| crate::error::Error::from(e))?;
+    let mut conn = data.pool.get().await.map_err(crate::error::Error::from)?;
 
     // Authorize client using auth header
     let uuid = check_access_token(auth_header, &mut conn).await?;
@@ -42,8 +42,7 @@ pub async fn echo(
     } else {
         channel = Channel::fetch_one(&mut conn, channel_uuid).await?;
 
-        data
-            .set_cache_key(format!("{}", channel_uuid), channel.clone(), 60)
+        data.set_cache_key(format!("{}", channel_uuid), channel.clone(), 60)
             .await?;
     }
 
@@ -54,7 +53,11 @@ pub async fn echo(
         // aggregate continuation frames up to 1MiB
         .max_continuation_size(2_usize.pow(20));
 
-    let mut pubsub = data.cache_pool.get_async_pubsub().await.map_err(|e| crate::error::Error::from(e))?;
+    let mut pubsub = data
+        .cache_pool
+        .get_async_pubsub()
+        .await
+        .map_err(crate::error::Error::from)?;
 
     let mut session_2 = session_1.clone();
 

src/api/v1/servers/uuid/icon.rs

@@ -1,8 +1,14 @@
-use actix_web::{put, web, HttpRequest, HttpResponse};
-use uuid::Uuid;
+use actix_web::{HttpRequest, HttpResponse, put, web};
 use futures_util::StreamExt as _;
+use uuid::Uuid;
 
-use crate::{error::Error, api::v1::auth::check_access_token, structs::{Guild, Member}, utils::get_auth_header, Data};
+use crate::{
+    Data,
+    api::v1::auth::check_access_token,
+    error::Error,
+    structs::{Guild, Member},
+    utils::get_auth_header,
+};
 
 #[put("{uuid}/icon")]
 pub async fn upload(
@@ -30,7 +36,14 @@ pub async fn upload(
         bytes.extend_from_slice(&item?);
     }
 
-    guild.set_icon(&data.bunny_cdn, &mut conn, data.config.bunny.cdn_url.clone(), bytes).await?;
+    guild
+        .set_icon(
+            &data.bunny_cdn,
+            &mut conn,
+            data.config.bunny.cdn_url.clone(),
+            bytes,
+        )
+        .await?;
 
     Ok(HttpResponse::Ok().finish())
 }

src/api/v1/servers/uuid/invites/mod.rs

@@ -3,9 +3,9 @@ use serde::Deserialize;
 use uuid::Uuid;
 
 use crate::{
-    error::Error,
     Data,
     api::v1::auth::check_access_token,
+    error::Error,
     structs::{Guild, Member},
     utils::get_auth_header,
 };

src/api/v1/servers/uuid/mod.rs

@@ -2,14 +2,14 @@ use actix_web::{HttpRequest, HttpResponse, Scope, get, web};
 use uuid::Uuid;
 
 mod channels;
+mod icon;
 mod invites;
 mod roles;
-mod icon;
 
 use crate::{
-    error::Error,
     Data,
     api::v1::auth::check_access_token,
+    error::Error,
     structs::{Guild, Member},
     utils::get_auth_header,
 };

src/api/v1/servers/uuid/roles/mod.rs

@@ -3,9 +3,9 @@ use actix_web::{HttpRequest, HttpResponse, get, post, web};
 use serde::Deserialize;
 
 use crate::{
-    error::Error,
     Data,
     api::v1::auth::check_access_token,
+    error::Error,
     structs::{Member, Role},
     utils::get_auth_header,
 };
@@ -43,8 +43,7 @@ pub async fn get(
 
     let roles = Role::fetch_all(&mut conn, guild_uuid).await?;
 
-    data
-        .set_cache_key(format!("{}_roles", guild_uuid), roles.clone(), 1800)
+    data.set_cache_key(format!("{}_roles", guild_uuid), roles.clone(), 1800)
         .await?;
 
     Ok(HttpResponse::Ok().json(roles))

src/api/v1/servers/uuid/roles/uuid.rs

@@ -1,7 +1,7 @@
 use crate::{
-    error::Error,
     Data,
     api::v1::auth::check_access_token,
+    error::Error,
     structs::{Member, Role},
     utils::get_auth_header,
 };
@@ -34,8 +34,7 @@ pub async fn get(
 
     let role = Role::fetch_one(&mut conn, role_uuid).await?;
 
-    data
-        .set_cache_key(format!("{}", role_uuid), role.clone(), 60)
+    data.set_cache_key(format!("{}", role_uuid), role.clone(), 60)
         .await?;
 
     Ok(HttpResponse::Ok().json(role))

src/api/v1/stats.rs

@@ -5,8 +5,8 @@ use diesel::QueryDsl;
 use diesel_async::RunQueryDsl;
 use serde::Serialize;
 
-use crate::error::Error;
 use crate::Data;
+use crate::error::Error;
 use crate::schema::users::dsl::{users, uuid};
 
 const VERSION: Option<&'static str> = option_env!("CARGO_PKG_VERSION");

src/api/v1/users/me.rs

@@ -1,8 +1,10 @@
-use actix_web::{get, patch, web, HttpRequest, HttpResponse};
-use actix_multipart::form::{json::Json as MpJson, tempfile::TempFile, MultipartForm};
+use actix_multipart::form::{MultipartForm, json::Json as MpJson, tempfile::TempFile};
+use actix_web::{HttpRequest, HttpResponse, get, patch, web};
 use serde::Deserialize;
 
-use crate::{error::Error, structs::Me, api::v1::auth::check_access_token, utils::get_auth_header, Data};
+use crate::{
+    Data, api::v1::auth::check_access_token, error::Error, structs::Me, utils::get_auth_header,
+};
 
 #[get("/me")]
 pub async fn res(req: HttpRequest, data: web::Data<Data>) -> Result<HttpResponse, Error> {
@@ -35,7 +37,11 @@ struct UploadForm {
 }
 
 #[patch("/me")]
-pub async fn update(req: HttpRequest, MultipartForm(form): MultipartForm<UploadForm>, data: web::Data<Data>) -> Result<HttpResponse, Error> {
+pub async fn update(
+    req: HttpRequest,
+    MultipartForm(form): MultipartForm<UploadForm>,
+    data: web::Data<Data>,
+) -> Result<HttpResponse, Error> {
     let headers = req.headers();
 
     let auth_header = get_auth_header(headers)?;
@@ -51,7 +57,13 @@ pub async fn update(req: HttpRequest, MultipartForm(form): MultipartForm<UploadF
 
         let byte_slice: &[u8] = &bytes;
 
-        me.set_avatar(&data.bunny_cdn, &mut conn, data.config.bunny.cdn_url.clone(), byte_slice.into()).await?;
+        me.set_avatar(
+            &data.bunny_cdn,
+            &mut conn,
+            data.config.bunny.cdn_url.clone(),
+            byte_slice.into(),
+        )
+        .await?;
     }
 
     if let Some(new_info) = form.json {

src/api/v1/users/mod.rs

@@ -1,6 +1,12 @@
 use actix_web::{HttpRequest, HttpResponse, Scope, get, web};
 
-use crate::{api::v1::auth::check_access_token, error::Error, structs::{StartAmountQuery, User}, utils::get_auth_header, Data};
+use crate::{
+    Data,
+    api::v1::auth::check_access_token,
+    error::Error,
+    structs::{StartAmountQuery, User},
+    utils::get_auth_header,
+};
 
 mod me;
 mod uuid;

src/api/v1/users/uuid.rs

@@ -1,8 +1,9 @@
 use actix_web::{HttpRequest, HttpResponse, get, web};
 use uuid::Uuid;
 
-use crate::{error::Error, api::v1::auth::check_access_token, structs::User, utils::get_auth_header, Data};
-
+use crate::{
+    Data, api::v1::auth::check_access_token, error::Error, structs::User, utils::get_auth_header,
+};
 
 #[get("/{uuid}")]
 pub async fn res(
@@ -28,8 +29,7 @@ pub async fn res(
 
     let user = User::fetch_one(&mut conn, uuid).await?;
 
-    data
-        .set_cache_key(uuid.to_string(), user.clone(), 1800)
+    data.set_cache_key(uuid.to_string(), user.clone(), 1800)
         .await?;
 
     Ok(HttpResponse::Ok().json(user))