From 89bf5a8b4f85583795b9211eaca485d6fc633389 Mon Sep 17 00:00:00 2001 From: Ashelyn Rose Date: Sat, 1 Mar 2025 14:03:56 -0700 Subject: Refactor logging --- src/system/plugin/prefixes.rs | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) (limited to 'src/system/plugin/prefixes.rs') diff --git a/src/system/plugin/prefixes.rs b/src/system/plugin/prefixes.rs index a513573..609dafd 100644 --- a/src/system/plugin/prefixes.rs +++ b/src/system/plugin/prefixes.rs @@ -1,6 +1,6 @@ use async_trait::async_trait; use twilight_model::id::{marker::ChannelMarker, Id}; -use crate::system::types::Response; +use crate::system::{log::Logger, types::Response}; use super::{CommandOutcome, SeancePlugin}; @@ -8,23 +8,19 @@ pub struct ProxyPrefixes; #[async_trait] impl SeancePlugin for ProxyPrefixes { - async fn handle_command(&self, _system: &crate::system::types::System, _message: &twilight_model::channel::Message) -> CommandOutcome { + async fn handle_command(&self, _logger: &Logger, _system: &crate::system::types::System, _message: &twilight_model::channel::Message) -> CommandOutcome { CommandOutcome::Skipped } - async fn handle_message(&self, system: &crate::system::types::System, message: &twilight_model::channel::Message, response: &mut crate::system::types::Response) { + async fn handle_message(&self, logger: &Logger, system: &crate::system::types::System, message: &twilight_model::channel::Message, response: &mut crate::system::types::Response) { if let Response::Noop { delete_source: _ } = response { for member in &system.members { - println!("Checking member prefix: {:?}", member.message_pattern); match member.message_pattern.captures(message.content.as_str()) { - None => { - println!("Nope"); - continue; - }, + None => continue, Some(captures) => match captures.name("content") { None => continue, Some(matched_content) => { - println!("Matched member prefix: {:?}", member.message_pattern); + logger.log_line(Some(member.discord_token.clone()), "Matched prefix".to_string()).await; *response = Response::Proxy { member: member.clone(), content: matched_content.as_str().to_string() }; return }, @@ -34,7 +30,7 @@ impl SeancePlugin for ProxyPrefixes { } } - async fn post_response(&self, _system: &crate::system::types::System, _message: &twilight_model::channel::Message, _channel: Id, _response: &crate::system::types::Response) { + async fn post_response(&self, _logger: &Logger, _system: &crate::system::types::System, _message: &twilight_model::channel::Message, _channel: Id, _response: &crate::system::types::Response) { return } } -- cgit 1.4.1