From 26f528819e87afade0021748caa7d1a19d364072 Mon Sep 17 00:00:00 2001
From: BAaboe <baaboe@gorb.app>
Date: Wed, 23 Jul 2025 19:10:17 +0200
Subject: [PATCH] style: cargo clippy --fix && cargo fmt

---
 src/api/v1/guilds/uuid/bans.rs | 24 ++++++++++++++++++------
 src/api/v1/guilds/uuid/mod.rs  |  2 +-
 src/objects/bans.rs            | 25 +++++++++++++------------
 src/objects/member.rs          |  8 ++------
 src/objects/mod.rs             |  4 ++--
 5 files changed, 36 insertions(+), 27 deletions(-)

diff --git a/src/api/v1/guilds/uuid/bans.rs b/src/api/v1/guilds/uuid/bans.rs
index 5b29f1d..44ed48d 100644
--- a/src/api/v1/guilds/uuid/bans.rs
+++ b/src/api/v1/guilds/uuid/bans.rs
@@ -1,24 +1,36 @@
 use std::sync::Arc;
 
-use axum::{extract::{Path, State}, http::{Extensions, StatusCode}, response::IntoResponse, Extension, Json};
+use axum::{
+    Extension, Json,
+    extract::{Path, State},
+    http::StatusCode,
+    response::IntoResponse,
+};
 use uuid::Uuid;
 
-use crate::{api::v1::auth::CurrentUser, error::Error, objects::{self, GuildBan, Member, Permissions}, utils::global_checks, AppState};
-
+use crate::{
+    AppState,
+    api::v1::auth::CurrentUser,
+    error::Error,
+    objects::{GuildBan, Member, Permissions},
+    utils::global_checks,
+};
 
 pub async fn get(
     State(app_state): State<Arc<AppState>>,
     Path(guild_uuid): Path<Uuid>,
-    Extension(CurrentUser(uuid)): Extension<CurrentUser<Uuid>>
+    Extension(CurrentUser(uuid)): Extension<CurrentUser<Uuid>>,
 ) -> Result<impl IntoResponse, Error> {
     global_checks(&app_state, uuid).await?;
 
     let mut conn = app_state.pool.get().await?;
 
     let member = Member::check_membership(&mut conn, uuid, guild_uuid).await?;
-    member.check_permission(&app_state, Permissions::BanMember).await?;
+    member
+        .check_permission(&app_state, Permissions::BanMember)
+        .await?;
 
     let all_guild_bans = GuildBan::fetch_all(&mut conn, guild_uuid).await?;
-    
+
     Ok((StatusCode::OK, Json(all_guild_bans)))
 }
diff --git a/src/api/v1/guilds/uuid/mod.rs b/src/api/v1/guilds/uuid/mod.rs
index a886e3d..2174932 100644
--- a/src/api/v1/guilds/uuid/mod.rs
+++ b/src/api/v1/guilds/uuid/mod.rs
@@ -12,11 +12,11 @@ use axum::{
 use bytes::Bytes;
 use uuid::Uuid;
 
+mod bans;
 mod channels;
 mod invites;
 mod members;
 mod roles;
-mod bans;
 
 use crate::{
     AppState,
diff --git a/src/objects/bans.rs b/src/objects/bans.rs
index 3aaa1ee..9eb58f5 100644
--- a/src/objects/bans.rs
+++ b/src/objects/bans.rs
@@ -4,10 +4,7 @@ use uuid::Uuid;
 
 use diesel_async::RunQueryDsl;
 
-use crate::{
-    error::Error, objects::{load_or_empty, Guild}, schema::guild_bans, Conn
-};
-
+use crate::{Conn, error::Error, objects::load_or_empty, schema::guild_bans};
 
 #[derive(Selectable, Queryable, Serialize, Deserialize)]
 #[diesel(table_name = guild_bans)]
@@ -19,9 +16,12 @@ pub struct GuildBan {
     pub ban_time: chrono::DateTime<chrono::Utc>,
 }
 
-
 impl GuildBan {
-    pub async fn fetch_one(conn: &mut Conn, guild_uuid: Uuid, user_uuid: Uuid) -> Result<GuildBan, Error> {
+    pub async fn fetch_one(
+        conn: &mut Conn,
+        guild_uuid: Uuid,
+        user_uuid: Uuid,
+    ) -> Result<GuildBan, Error> {
         use guild_bans::dsl;
         let guild_ban = dsl::guild_bans
             .filter(dsl::guild_uuid.eq(guild_uuid))
@@ -35,12 +35,13 @@ impl GuildBan {
 
     pub async fn fetch_all(conn: &mut Conn, guild_uuid: Uuid) -> Result<Vec<Self>, Error> {
         use guild_bans::dsl;
-        let all_guild_bans = load_or_empty(dsl::guild_bans
-            .filter(dsl::guild_uuid.eq(guild_uuid))
-            .load(conn)
-            .await
-            )?;
-        
+        let all_guild_bans = load_or_empty(
+            dsl::guild_bans
+                .filter(dsl::guild_uuid.eq(guild_uuid))
+                .load(conn)
+                .await,
+        )?;
+
         Ok(all_guild_bans)
     }
 
diff --git a/src/objects/member.rs b/src/objects/member.rs
index 0a216ea..fcd0b6b 100644
--- a/src/objects/member.rs
+++ b/src/objects/member.rs
@@ -1,6 +1,5 @@
 use diesel::{
-    ExpressionMethods, Insertable, QueryDsl, Queryable, Selectable, SelectableHelper,
-    insert_into,
+    ExpressionMethods, Insertable, QueryDsl, Queryable, Selectable, SelectableHelper, insert_into,
 };
 use diesel_async::RunQueryDsl;
 use serde::{Deserialize, Serialize};
@@ -9,12 +8,11 @@ use uuid::Uuid;
 use crate::{
     AppState, Conn,
     error::Error,
-    objects::{Me, Permissions, Role, GuildBan},
+    objects::{Me, Permissions, Role},
     schema::guild_bans,
     schema::guild_members,
 };
 
-
 use super::{User, load_or_empty};
 
 #[derive(Serialize, Queryable, Selectable, Insertable)]
@@ -75,7 +73,6 @@ pub struct Member {
     user: User,
 }
 
-
 impl Member {
     pub async fn count(conn: &mut Conn, guild_uuid: Uuid) -> Result<i64, Error> {
         use guild_members::dsl;
@@ -230,5 +227,4 @@ impl Member {
 
         Ok(())
     }
-
 }
diff --git a/src/objects/mod.rs b/src/objects/mod.rs
index e53583e..3bcce9c 100644
--- a/src/objects/mod.rs
+++ b/src/objects/mod.rs
@@ -7,6 +7,7 @@ use log::debug;
 use serde::Deserialize;
 use uuid::Uuid;
 
+mod bans;
 mod channel;
 mod email_token;
 mod friends;
@@ -18,8 +19,8 @@ mod message;
 mod password_reset_token;
 mod role;
 mod user;
-mod bans;
 
+pub use bans::GuildBan;
 pub use channel::Channel;
 pub use email_token::EmailToken;
 pub use friends::Friend;
@@ -33,7 +34,6 @@ pub use password_reset_token::PasswordResetToken;
 pub use role::Permissions;
 pub use role::Role;
 pub use user::User;
-pub use bans::GuildBan;
 
 use crate::error::Error;