From 475e0081059bbbad48f87a6ad03f44e33080c4a8 Mon Sep 17 00:00:00 2001 From: Radical Date: Wed, 23 Jul 2025 15:03:56 +0200 Subject: [PATCH 1/2] fix: move owner check to correct function --- src/objects/member.rs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/objects/member.rs b/src/objects/member.rs index 05ef7bc..50a0a24 100644 --- a/src/objects/member.rs +++ b/src/objects/member.rs @@ -208,10 +208,6 @@ impl Member { } pub async fn delete(self, conn: &mut Conn) -> Result<(), Error> { - if self.is_owner { - return Err(Error::Forbidden("Can not ban owner".to_string())); - } - delete(guild_members::table) .filter(guild_members::uuid.eq(self.uuid)) .execute(conn) @@ -221,6 +217,10 @@ impl Member { } pub async fn ban(self, conn: &mut Conn, reason: &String) -> Result<(), Error> { + if self.is_owner { + return Err(Error::Forbidden("Can not ban owner".to_string())); + } + use guild_bans::dsl; insert_into(guild_bans::table) .values(( From bb8927840de568b76e3d3e3aa6de9c3011967f15 Mon Sep 17 00:00:00 2001 From: Radical Date: Wed, 23 Jul 2025 15:04:02 +0200 Subject: [PATCH 2/2] style: formatting --- src/api/v1/members/uuid/ban.rs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/api/v1/members/uuid/ban.rs b/src/api/v1/members/uuid/ban.rs index 5ba6702..dfe53f6 100644 --- a/src/api/v1/members/uuid/ban.rs +++ b/src/api/v1/members/uuid/ban.rs @@ -36,6 +36,7 @@ pub async fn post( let member = Member::fetch_one_with_member(&app_state, None, member_uuid).await?; let caller = Member::check_membership(&mut conn, uuid, member.guild_uuid).await?; + caller .check_permission(&app_state, Permissions::BanMember) .await?;