From ba2442e7860bbd4993dbcb3069505b99f1410c60 Mon Sep 17 00:00:00 2001
From: BAaboe <baaboe@gorb.app>
Date: Thu, 24 Jul 2025 02:13:53 +0200
Subject: [PATCH 1/2] style: updated to use the new ban object

---
 src/objects/member.rs | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

diff --git a/src/objects/member.rs b/src/objects/member.rs
index fcd0b6b..ed6a77c 100644
--- a/src/objects/member.rs
+++ b/src/objects/member.rs
@@ -6,11 +6,7 @@ use serde::{Deserialize, Serialize};
 use uuid::Uuid;
 
 use crate::{
-    AppState, Conn,
-    error::Error,
-    objects::{Me, Permissions, Role},
-    schema::guild_bans,
-    schema::guild_members,
+    error::Error, objects::{GuildBan, Me, Permissions, Role}, schema::{guild_bans, guild_members}, AppState, Conn
 };
 
 use super::{User, load_or_empty};
@@ -169,15 +165,10 @@ impl Member {
     ) -> Result<Self, Error> {
         let mut conn = app_state.pool.get().await?;
 
-        use guild_bans::dsl;
-        let banned = dsl::guild_bans
-            .filter(guild_bans::guild_uuid.eq(guild_uuid))
-            .filter(guild_bans::user_uuid.eq(user_uuid))
-            .execute(&mut conn)
-            .await;
+        let banned = GuildBan::fetch_one(&mut conn, guild_uuid, user_uuid).await;
         match banned {
             Ok(_) => Err(Error::Forbidden("User banned".to_string())),
-            Err(diesel::result::Error::NotFound) => Ok(()),
+            Err(Error::SqlError(diesel::result::Error::NotFound)) => Ok(()),
             Err(e) => Err(e.into()),
         }?;
 

From 0e0c590e4dd0260382a6be381974e5b9244c668b Mon Sep 17 00:00:00 2001
From: BAaboe <baaboe@gorb.app>
Date: Thu, 24 Jul 2025 02:14:29 +0200
Subject: [PATCH 2/2] feat: added unband endpoint

---
 src/api/v1/guilds/uuid/bans.rs | 23 +++++++++++++++++++++--
 src/api/v1/guilds/uuid/mod.rs  |  3 ++-
 2 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/src/api/v1/guilds/uuid/bans.rs b/src/api/v1/guilds/uuid/bans.rs
index 44ed48d..52e0949 100644
--- a/src/api/v1/guilds/uuid/bans.rs
+++ b/src/api/v1/guilds/uuid/bans.rs
@@ -25,8 +25,8 @@ pub async fn get(
 
     let mut conn = app_state.pool.get().await?;
 
-    let member = Member::check_membership(&mut conn, uuid, guild_uuid).await?;
-    member
+    let caller = Member::check_membership(&mut conn, uuid, guild_uuid).await?;
+    caller
         .check_permission(&app_state, Permissions::BanMember)
         .await?;
 
@@ -34,3 +34,22 @@ pub async fn get(
 
     Ok((StatusCode::OK, Json(all_guild_bans)))
 }
+
+pub async fn unban(
+    State(app_state): State<Arc<AppState>>,
+    Path((guild_uuid, user_uuid)): Path<(Uuid, 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 caller = Member::check_membership(&mut conn, uuid, guild_uuid).await?;
+    caller.check_permission(&app_state, Permissions::BanMember).await?;
+
+    let ban = GuildBan::fetch_one(&mut conn, guild_uuid, user_uuid).await?;
+
+    ban.unban(&mut conn).await?;
+
+    Ok(StatusCode::OK)
+}
diff --git a/src/api/v1/guilds/uuid/mod.rs b/src/api/v1/guilds/uuid/mod.rs
index 2174932..b9d8abf 100644
--- a/src/api/v1/guilds/uuid/mod.rs
+++ b/src/api/v1/guilds/uuid/mod.rs
@@ -7,7 +7,7 @@ use axum::{
     extract::{Multipart, Path, State},
     http::StatusCode,
     response::IntoResponse,
-    routing::{get, patch, post},
+    routing::{get, patch, post, delete},
 };
 use bytes::Bytes;
 use uuid::Uuid;
@@ -45,6 +45,7 @@ pub fn router() -> Router<Arc<AppState>> {
         .route("/members", get(members::get))
         // Bans
         .route("/bans", get(bans::get))
+        .route("/bans/{uuid}", delete(bans::unban))
 }
 
 /// `GET /api/v1/guilds/{uuid}` DESCRIPTION