From 15982188f5900098f5056a0610b139ce0be4c691 Mon Sep 17 00:00:00 2001 From: Colin McKechney Date: Tue, 26 Mar 2024 18:00:32 -0700 Subject: [PATCH] renamed module dir to modules --- src/module/config.toml | 6 ----- src/module/lenny.rs | 38 ---------------------------- src/{module => modules}/bully.rs | 34 ++++++++++--------------- src/{module => modules}/join_rude.rs | 0 src/modules/lenny.rs | 34 +++++++++++++++++++++++++ src/modules/mod.rs | 4 +++ 6 files changed, 52 insertions(+), 64 deletions(-) delete mode 100644 src/module/config.toml delete mode 100644 src/module/lenny.rs rename src/{module => modules}/bully.rs (61%) rename src/{module => modules}/join_rude.rs (100%) create mode 100644 src/modules/lenny.rs create mode 100644 src/modules/mod.rs diff --git a/src/module/config.toml b/src/module/config.toml deleted file mode 100644 index 581713a..0000000 --- a/src/module/config.toml +++ /dev/null @@ -1,6 +0,0 @@ -nickname = "robbit" -username = "robbit" -realname = "robbit" -server = "chat.ndlug.org" -port = 6697 -channels = ["#bots"] \ No newline at end of file diff --git a/src/module/lenny.rs b/src/module/lenny.rs deleted file mode 100644 index 84e8361..0000000 --- a/src/module/lenny.rs +++ /dev/null @@ -1,38 +0,0 @@ -use std::collections::VecDeque; -use irc::proto::{Message, Command::*}; -use regex::Regex; -use rand::prelude::Rng; - -const LENNYS:[&str;12] = ["( ͡° ͜ʖ ͡°)","( ͠° ͟ʖ ͡°)","ᕦ( ͡° ͜ʖ ͡°)ᕤ","( ͡° ͜ʖ ͡°)","( ͡~ ͜ʖ ͡°)","( ͡o ͜ʖ ͡o)","͡° ͜ʖ ͡ -","( ͡͡ ° ͜ ʖ ͡ °)","( ͡ ͡° ͡° ʖ ͡° ͡°)","(ง ͠° ͟ل͜ ͡°)ง","( ͡° ͜ʖ ͡ °)","( ͡°╭͜ʖ╮͡° )"]; -const PATTERN: &str = "^![Ll]enny\\s*(?P.*)$"; -const USAGE: &str = "Usage: ![Ll]enny -Displays a Lenny face ( ͡° ͜ʖ ͡°)"; - -pub struct Lenny {} -#[allow(unused_variables)] -impl Lenny { - pub fn mod_message(message: &Message, message_buf: &VecDeque) -> Option<(String,String)> { - let regex: Regex = Regex::new(PATTERN).expect("Error creating regex"); - - //checks if it was a PRIVMSG - if let PRIVMSG(_,msg) = message.command.clone() { - //checks if it was lenny - if let Some(captures) = regex.captures(msg.as_str()) { - - let lenny = LENNYS[rand::thread_rng().gen_range(0..12)].to_string(); - let text = captures.get(1).unwrap().as_str(); - - return Some((message.response_target().unwrap_or("#lug").to_string(),format!("{} {}", lenny, text))); - } - } - - None - } - - pub fn usage(message: &Message) -> (String,String) { - //prints a usage, not sure when I'm gonna use this but let's see - (message.response_target().unwrap_or("#lug").to_string(),USAGE.to_string()) - } -} - - diff --git a/src/module/bully.rs b/src/modules/bully.rs similarity index 61% rename from src/module/bully.rs rename to src/modules/bully.rs index 6916e65..13ccd44 100644 --- a/src/module/bully.rs +++ b/src/modules/bully.rs @@ -23,30 +23,24 @@ const BULLY_PHRASES:[&str;12] = [ " thinks you were probably the pilot of Ever Given when it clogged the Suez Canal, " ]; -const PATTERN: &str = "^!bully (?P[^\\s]+)"; +const PATTERN: &str = "^\\$bully (?P[^\\s]+)"; +pub fn mod_message(message: &Message, message_buf: &VecDeque) -> Option<(String,String)> { + let regex: Regex = Regex::new(PATTERN).expect("Error creating regex"); + if let PRIVMSG(_,msg) = message.command.clone() { + if let Some(capture) = regex.captures(msg.as_str()) { + let bully_message: String = BULLY_PHRASES[rand::thread_rng().gen_range(0..BULLY_PHRASES.len())].to_string(); + let to_be_bullied = capture.get(1).unwrap().as_str(); -pub struct Bully{} + let complete_message = message.source_nickname().unwrap_or("unknown_nick").to_string() + bully_message.as_str() + to_be_bullied; -impl Bully { - pub fn mod_message(message: &Message, message_buf: &VecDeque) -> Option<(String,String)> { - let regex: Regex = Regex::new(PATTERN).expect("Error creating regex"); - - if let PRIVMSG(_,msg) = message.command.clone() { - if let Some(capture) = regex.captures(msg.as_str()) { - let bully_message: String = BULLY_PHRASES[rand::thread_rng().gen_range(0..BULLY_PHRASES.len())].to_string(); - let to_be_bullied = capture.get(1).unwrap().as_str(); - - let complete_message = message.source_nickname().unwrap_or("unknown_nick").to_string() + bully_message.as_str() + to_be_bullied; - - return Some((message.response_target().unwrap_or("#lug").to_string(), complete_message)); - } + return Some((message.response_target().unwrap_or("#lug").to_string(), complete_message)); } - None - } - - pub fn usage(message: &Message) -> (String, String) { - (message.response_target().unwrap_or("#lug").to_string(), USAGE.to_string()) } + None +} + +pub fn usage(message: &Message) -> (String, String) { + (message.response_target().unwrap_or("#lug").to_string(), USAGE.to_string()) } diff --git a/src/module/join_rude.rs b/src/modules/join_rude.rs similarity index 100% rename from src/module/join_rude.rs rename to src/modules/join_rude.rs diff --git a/src/modules/lenny.rs b/src/modules/lenny.rs new file mode 100644 index 0000000..7b97c56 --- /dev/null +++ b/src/modules/lenny.rs @@ -0,0 +1,34 @@ +use std::collections::VecDeque; +use irc::proto::{Message, Command::*}; +use regex::Regex; +use rand::prelude::Rng; + +const LENNYS:[&str;12] = ["( ͡° ͜ʖ ͡°)","( ͠° ͟ʖ ͡°)","ᕦ( ͡° ͜ʖ ͡°)ᕤ","( ͡° ͜ʖ ͡°)","( ͡~ ͜ʖ ͡°)","( ͡o ͜ʖ ͡o)","͡° ͜ʖ ͡ -","( ͡͡ ° ͜ ʖ ͡ °)","( ͡ ͡° ͡° ʖ ͡° ͡°)","(ง ͠° ͟ل͜ ͡°)ง","( ͡° ͜ʖ ͡ °)","( ͡°╭͜ʖ╮͡° )"]; +const PATTERN: &str = "^\\$[Ll]enny\\s*(?P.*)$"; +const USAGE: &str = "Usage: ![Ll]enny +Displays a Lenny face ( ͡° ͜ʖ ͡°)"; + +pub fn mod_message(message: &Message, message_buf: &VecDeque) -> Option<(String,String)> { + let regex: Regex = Regex::new(PATTERN).expect("Error creating regex"); + + //checks if it was a PRIVMSG + if let PRIVMSG(_,msg) = message.command.clone() { + //checks if it was lenny + if let Some(captures) = regex.captures(msg.as_str()) { + + let lenny = LENNYS[rand::thread_rng().gen_range(0..12)].to_string(); + let text = captures.get(1).unwrap().as_str(); + + return Some((message.response_target().unwrap_or("#lug").to_string(),format!("{} {}", lenny, text))); + } + } + + None +} + +pub fn usage(message: &Message) -> (String,String) { + //prints a usage, not sure when I'm gonna use this but let's see + (message.response_target().unwrap_or("#lug").to_string(),USAGE.to_string()) +} + + diff --git a/src/modules/mod.rs b/src/modules/mod.rs new file mode 100644 index 0000000..8316154 --- /dev/null +++ b/src/modules/mod.rs @@ -0,0 +1,4 @@ +pub mod bully; +pub mod lenny; +pub mod join_rude; +