From 2bcf7c8d42413b000f858756f8271abbdb01b3e7 Mon Sep 17 00:00:00 2001
From: Xyon <xyon@orbiter-radio.uk>
Date: Sun, 13 Oct 2024 14:58:53 +0100
Subject: [PATCH] Clean up merge, finish delete, clean up warnings

---
 src/badgey/commands/moderation.rs       | 10 +++++++---
 src/badgey/events.rs                    |  4 +---
 src/badgey/handlers/airlock.rs          |  3 +--
 src/badgey/models/quarantine_channel.rs |  5 ++---
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/badgey/commands/moderation.rs b/src/badgey/commands/moderation.rs
index f0e28c5..7550d5c 100644
--- a/src/badgey/commands/moderation.rs
+++ b/src/badgey/commands/moderation.rs
@@ -1,6 +1,8 @@
+use built::chrono;
 use manifold::error::{ManifoldError, ManifoldResult};
 use manifold::{ManifoldContext, ManifoldData};
 use poise::serenity_prelude as serenity;
+use crate::badgey::models::quarantine_channel::QuarantineChannel;
 
 #[poise::command(slash_command, prefix_command, required_permissions = "MODERATE_MEMBERS")]
 async fn void_user(_ctx: ManifoldContext<'_>, _target: serenity::User) -> ManifoldResult<()> {
@@ -39,16 +41,18 @@ async fn add_quarantine_channel(ctx: ManifoldContext<'_>, channel: serenity::Cha
     let qc = QuarantineChannel::new(role.as_u64().clone() as i64, channel.as_u64().clone() as i64);
     qc.insert(&ctx.data().database)?;
 
-    ctx.reply(format!("Quarantine channel {channel} defined with quarantine role {role}", channel = channel, role = role)).await?;
+    ctx.reply(format!("OK: Quarantine channel {channel} defined with quarantine role {role}", channel = channel, role = role)).await?;
 
     Ok(())
 }
 
 #[poise::command(slash_command, prefix_command, required_permissions = "MANAGE_GUILD")]
 async fn remove_quarantine_channel(ctx: ManifoldContext<'_>, channel: serenity::ChannelId) -> ManifoldResult<()> {
-    let qc = QuarantineChannel::get(&ctx.data().database, channel.as_u64().clone() as i64)?;
 
-    ctx.reply(format!("Quarantine channel {channel} is no longer defined.", channel = channel)).await?;
+    let db = &ctx.data().database;
+    QuarantineChannel::get(db, channel.as_u64().clone() as i64)?.remove(db)?;
+
+    ctx.reply(format!("OK: Quarantine channel {channel} is no longer defined.", channel = channel)).await?;
 
     Ok(())
 }
diff --git a/src/badgey/events.rs b/src/badgey/events.rs
index 2214713..4bebe34 100644
--- a/src/badgey/events.rs
+++ b/src/badgey/events.rs
@@ -1,4 +1,3 @@
-use built::chrono;
 use manifold::error::{ManifoldError, ManifoldResult};
 use manifold::events::EventHandler;
 use manifold::ManifoldData;
@@ -7,8 +6,7 @@ use poise::serenity_prelude::{Context, Member, Message};
 use crate::badgey::handlers;
 use crate::badgey::models::custom_response::CustomResponse;
 
-use crate::badgey::models::xp::{Rank, Xp};
-
+use crate::badgey::models::xp::Xp;
 
 pub struct BadgeyHandler {
 
diff --git a/src/badgey/handlers/airlock.rs b/src/badgey/handlers/airlock.rs
index ca4141f..6a15c06 100644
--- a/src/badgey/handlers/airlock.rs
+++ b/src/badgey/handlers/airlock.rs
@@ -1,8 +1,7 @@
-use std::collections::HashMap;
 use manifold::error::{ManifoldError, ManifoldResult};
 use manifold::ManifoldData;
 use poise::FrameworkContext;
-use poise::serenity_prelude::{ChannelId, Context, Member, Mentionable, RoleId};
+use poise::serenity_prelude::{ChannelId, Context, Member, Mentionable};
 
 use crate::badgey::models::quarantine_channel::QuarantineChannel;
 
diff --git a/src/badgey/models/quarantine_channel.rs b/src/badgey/models/quarantine_channel.rs
index 9a040e9..7664ecd 100644
--- a/src/badgey/models/quarantine_channel.rs
+++ b/src/badgey/models/quarantine_channel.rs
@@ -1,5 +1,4 @@
 use diesel::{insert_into, Identifiable, Insertable, QueryDsl, Queryable, RunQueryDsl, Selectable};
-use diesel::associations::HasTable;
 use diesel::dsl::delete;
 use diesel::prelude::*;
 use manifold::Db;
@@ -32,9 +31,9 @@ impl QuarantineChannel {
             .map_err(|e| ManifoldError::from(e))
     }
 
-    pub fn remove(&self, conn: &Db, needle: i64) -> ManifoldResult<usize> {
+    pub fn remove(&self, conn: &Db) -> ManifoldResult<usize> {
         Ok(delete(quarantine_table::dsl::quarantine_channels)
-            .filter(quarantine_table::qc_role_id.eq(needle))
+            .filter(quarantine_table::qc_role_id.eq(self.qc_role_id))
             .execute(&mut conn.get()?)?)
     }
 
-- 
2.30.2