From 234937fea6452a037d8cf2d2e20af5ff535ebe26 Mon Sep 17 00:00:00 2001 From: salmonik Date: Wed, 4 Nov 2026 01:12:42 +0100 Subject: cron/triggers: keep pre-scoping rows manageable --- src/events/mod.rs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/events') diff --git a/src/events/mod.rs b/src/events/mod.rs index 406490a..79ebb0f 100644 --- a/src/events/mod.rs +++ b/src/events/mod.rs @@ -393,8 +393,9 @@ pub async fn handle_message( let triggers = data.triggers.lock().await; let mut chosen = None; for (trigger, keywords, responses) in triggers.iter() { - // Triggers belong to one guild and never fire in DMs. - if message_guild_id != Some(trigger.guild_id) { + // Triggers belong to one guild and never fire in DMs. Rows with + // guild_id = 0 predate scoping and keep their old global behaviour. + if trigger.guild_id != 0 && message_guild_id != Some(trigger.guild_id) { continue; } if keywords.iter().any(|k| content_lower.contains(k)) { -- cgit v1.2.3