Update the regex matching

https://regex101.com/r/aX8vec/5
1Git2Clone · Dec 14, 2024 · c2b4db7 · c2b4db7
1 parent 45c6bc7
commit c2b4db7
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 11 deletions.
diff --git a/src/data/bot_data.rs b/src/data/bot_data.rs
@@ -38,6 +38,6 @@ lazy_static! {
             temp
     };
 
-    // https://regex101.com/r/aX8vec/3
-    pub(crate) static ref EMOJIS_AND_IMAGE_EMOJIS_REGEX: Regex = Regex::new(r"((:|\[)([a-zA-Z0-9_]+)(:|\]))|\([^()]*\)").unwrap();
+    // https://regex101.com/r/aX8vec/5
+    pub(crate) static ref EMOJIS_AND_EMBEDS_REGEX: Regex = Regex::new(r"(?<emoji>(:)([a-zA-Z0-9_]+)(:))|(?<embed>(\[)([a-zA-Z0-9_]+)(\])\([^()]*\))").unwrap();
 }
diff --git a/src/event_handler/handler.rs b/src/event_handler/handler.rs
@@ -11,7 +11,7 @@ use crate::{
         command_data::{Data, Error},
         database_interactions::*,
     },
-    utils::{replies::handle_replies, string_manipulation::remove_emojis_from_str},
+    utils::{replies::handle_replies, string_manipulation::remove_emojis_and_embeds_from_str},
 };
 use poise::serenity_prelude as serenity;
 use rand::Rng;
@@ -53,7 +53,7 @@ pub async fn event_handler(
                 );
                 let text_patterns = ["hutao", "hu tao"];
                 let lowercase_msg = msg.to_lowercase();
-                let trimmed_emojis = remove_emojis_from_str(&lowercase_msg);
+                let trimmed_emojis = remove_emojis_and_embeds_from_str(&lowercase_msg);
                 match text_patterns
                     .iter()
                     .any(|text| trimmed_emojis.contains(text))

diff --git a/src/utils/string_manipulation.rs b/src/utils/string_manipulation.rs
@@ -1,6 +1,6 @@
 use std::borrow::Cow;
 
-use crate::data::bot_data::EMOJIS_AND_IMAGE_EMOJIS_REGEX;
+use crate::data::bot_data::EMOJIS_AND_EMBEDS_REGEX;
 
 pub fn upper_lowercase_permutations(data: &str) -> Vec<String> {
     if data.is_empty() {
@@ -25,12 +25,12 @@ pub fn upper_lowercase_permutations(data: &str) -> Vec<String> {
 /// Removes the emojis from a string.
 ///
 /// ```rust
-/// use serenity_discord_bot::utils::string_manipulation::remove_emojis_from_str;
+/// use serenity_discord_bot::utils::string_manipulation::remove_emojis_and_embeds_from_str;
 ///
-/// assert_eq!(remove_emojis_from_str(":hutao:"), "");
-/// assert_eq!(remove_emojis_from_str(":hutao"), ":hutao");
-/// assert_eq!(remove_emojis_from_str("Some longer example : messsage hutao: :hutao:"), "Some longer example : messsage hutao: ");
+/// assert_eq!(remove_emojis_and_embeds_from_str(":hutao:"), "");
+/// assert_eq!(remove_emojis_and_embeds_from_str(":hutao"), ":hutao");
+/// assert_eq!(remove_emojis_and_embeds_from_str("Some longer example : messsage hutao: :hutao:"), "Some longer example : messsage hutao: ");
 /// ```
-pub fn remove_emojis_from_str(whole_str: &str) -> Cow<str> {
-    EMOJIS_AND_IMAGE_EMOJIS_REGEX.replace_all(whole_str, "")
+pub fn remove_emojis_and_embeds_from_str(whole_str: &str) -> Cow<str> {
+    EMOJIS_AND_EMBEDS_REGEX.replace_all(whole_str, "")
 }