boba/discord-bot-kernel
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

refactor(ticket): extract orphan reconcile to service/count, fix presence watching, handler ≤200

Browse source
This commit is contained in:
loki5512344 2026-09-21 21:48:58 +02:00
parent bd54f9be86
commit b4a19e01e4
Signed by: boba
GPG key ID: 253067914055423B
2 changed files with 34 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

37
src/core/bot.rs
View file

@ -51,45 +51,12 @@ impl EventHandler for Handler {
warn!(error=%e, "ensure_forum_channel failed"); warn!(error=%e, "ensure_forum_channel failed");
} }
} }
// Orphan reconciliation: purge DB rows whose channel/thread no longer exists crate::feature::ticket::service::count::reconcile_orphans(&http2, &pool_clone, gid)
let tickets =
crate::feature::ticket::service::count::list_tickets(&pool_clone).await;
let mut purged = 0;
for (cid_str, gid_str, opener) in tickets {
if gid_str != gid.to_string() {
continue;
}
if let Ok(cid) = cid_str.parse::<u64>() {
let cid = serenity::all::ChannelId::new(cid);
if http2.get_channel(cid).await.is_err() {
let _ = sqlx::query("DELETE FROM tickets WHERE channel_id=?")
.bind(&cid_str)
.execute(&pool_clone)
.await; .await;
let _ = sqlx::query("DELETE FROM ticket_claims WHERE channel_id=?")
.bind(&cid_str)
.execute(&pool_clone)
.await;
purged += 1;
warn!(channel=%cid_str, opener=%opener, "orphan ticket purged");
// Log to ticket-logs without transcript (manually deleted)
let _ = serenity::all::ChannelId::new(1509503717127356446)
.send_message(&http2, serenity::all::CreateMessage::new().embed(serenity::all::CreateEmbed::new().title("⚠️ Ticket Manually Deleted").description(format!("Ticket <#{cid_str}> (opener <@{opener}>) manually deleted — transcript unavailable.")).color(0x00ED_4245)))
.await;
}
}
}
if purged > 0 {
info!(purged, "orphan tickets reconciled");
}
// Presence: watching N tickets
let count = let count =
crate::feature::ticket::service::count::count_tickets(&pool_clone, gid).await; crate::feature::ticket::service::count::count_tickets(&pool_clone, gid).await;
ctx_clone.set_presence( ctx_clone.set_presence(
Some(serenity::all::ActivityData::custom(format!( Some(serenity::all::ActivityData::watching(format!("{} tickets", count))),
"watching {} tickets",
count
))),
serenity::all::OnlineStatus::Online, serenity::all::OnlineStatus::Online,
); );
} }

31
src/feature/ticket/service/count.rs
View file

@ -1,4 +1,6 @@
use serenity::http::Http;
use sqlx::SqlitePool; use sqlx::SqlitePool;
use tracing::{info, warn};
#[rustfmt::skip] #[rustfmt::skip]
pub async fn list_tickets(p: &SqlitePool) -> Vec<(String, String, String)> { pub async fn list_tickets(p: &SqlitePool) -> Vec<(String, String, String)> {
let _ = sqlx::query("CREATE TABLE IF NOT EXISTS tickets (channel_id TEXT PRIMARY KEY, guild_id TEXT NOT NULL, opener_id TEXT NOT NULL)").execute(p).await; let _ = sqlx::query("CREATE TABLE IF NOT EXISTS tickets (channel_id TEXT PRIMARY KEY, guild_id TEXT NOT NULL, opener_id TEXT NOT NULL)").execute(p).await;
@ -9,3 +11,32 @@ pub async fn count_tickets(p: &SqlitePool, g: u64) -> i64 {
let _ = sqlx::query("CREATE TABLE IF NOT EXISTS tickets (channel_id TEXT PRIMARY KEY, guild_id TEXT NOT NULL, opener_id TEXT NOT NULL)").execute(p).await; let _ = sqlx::query("CREATE TABLE IF NOT EXISTS tickets (channel_id TEXT PRIMARY KEY, guild_id TEXT NOT NULL, opener_id TEXT NOT NULL)").execute(p).await;
sqlx::query_scalar::<_, i64>("SELECT COUNT(*) FROM tickets WHERE guild_id=?").bind(g.to_string()).fetch_one(p).await.unwrap_or(0) sqlx::query_scalar::<_, i64>("SELECT COUNT(*) FROM tickets WHERE guild_id=?").bind(g.to_string()).fetch_one(p).await.unwrap_or(0)
} }
pub async fn reconcile_orphans(http: &Http, pool: &SqlitePool, guild_id: u64) -> usize {
let tickets = list_tickets(pool).await;
let mut purged = 0;
for (cid_str, gid_str, opener) in tickets {
if gid_str != guild_id.to_string() {
continue;
}
if let Ok(cid) = cid_str.parse::<u64>() {
let cid = serenity::all::ChannelId::new(cid);
if http.get_channel(cid).await.is_err() {
let _ = sqlx::query("DELETE FROM tickets WHERE channel_id=?")
.bind(&cid_str)
.execute(pool)
.await;
let _ = sqlx::query("DELETE FROM ticket_claims WHERE channel_id=?")
.bind(&cid_str)
.execute(pool)
.await;
purged += 1;
warn!(channel=%cid_str, opener=%opener, "orphan ticket purged");
let _ = serenity::all::ChannelId::new(1509503717127356446).send_message(http, serenity::all::CreateMessage::new().embed(serenity::all::CreateEmbed::new().title("⚠️ Ticket Manually Deleted").description(format!("Ticket <#{cid_str}> (opener <@{opener}>) manually deleted — transcript unavailable.")).color(0x00ED_4245))).await;
}
}
}
if purged > 0 {
info!(purged, "orphan tickets reconciled");
}
purged
}