feat: negative lookaround to avoid parsing links on page shares from …

…tachiyomi

Cargo.toml

@@ -8,13 +8,13 @@ build = "build.rs"
 anyhow = "1.0.86"
 chrono = "0.4.38"
 dotenvy = "0.15.7"
+fancy-regex = "0.14.0"
 futures = "0.3.31"
 mangadex-api = { version = "3.4.1", features = ["multi-thread", "tokio-multi-thread"] }
 mangadex-api-schema-rust = "0.10.0"
 mangadex-api-types-rust = "0.10.0"
 poise = { version = "0.6.1", features = ["cache"] }
 rand = "0.8.5"
-regex = "1.11.0"
 rustc_version_runtime = "0.3.0"
 sea-orm = { version = "1.0.1", features = [
     "macros",

src/commands/manga.rs

@@ -82,7 +82,7 @@ pub async fn add(
         .inspect_err(|e| tracing::error!(err = ?e, "an error occurred when refreshing token"))?;
 
     let uuid = match MD_URL_REGEX.captures(&input) {
-        Some(captures) => match uuid::Uuid::try_parse(&captures[1]) {
+        Ok(Some(captures)) => match uuid::Uuid::try_parse(&captures[1]) {
             Ok(u) => {
                 tracing::info!(uuid = %u, "got uuid from link");
                 u
@@ -102,7 +102,7 @@ pub async fn add(
                 return Ok(());
             }
         },
-        None => match uuid::Uuid::try_parse(&input) {
+        Ok(None) => match uuid::Uuid::try_parse(&input) {
             Ok(u) => {
                 tracing::info!(uuid = %u, "got uuid from input string");
                 u
@@ -122,6 +122,19 @@ pub async fn add(
                 return Ok(());
             }
         },
+        Err(e) => {
+            tracing::error!(err = ?e, "an error occurred when parsing input");
+            ctx.send(
+                poise::CreateReply::default()
+                    .reply(true)
+                    .allowed_mentions(CreateAllowedMentions::new().replied_user(false))
+                    .content("an error occurred when parsing input."),
+            )
+            .await
+            .inspect_err(|e| tracing::error!(err = ?e, "an error occurred when sending reply"))?;
+
+            return Ok(());
+        }
     };
 
     let manga_list = manga::Entity::find()

src/constants.rs

@@ -5,8 +5,8 @@ pub mod version;
 pub static POISE_VERSION: &str = "0.6.1";
 pub static STARTUP_TIME: LazyLock<std::time::SystemTime> =
     LazyLock::new(std::time::SystemTime::now);
-pub static MD_URL_REGEX: LazyLock<regex::Regex> = LazyLock::new(|| {
-    regex::Regex::new(r"https://mangadex\.org/title/([a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12})").unwrap()
+pub static MD_URL_REGEX: LazyLock<fancy_regex::Regex> = LazyLock::new(|| {
+    fancy_regex::Regex::new(r"(?<!<)https://mangadex\.org/title/([a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12})(?!>)").unwrap()
 });
 pub static AZUKI_MANGA: LazyLock<uuid::Uuid> =
     LazyLock::new(|| uuid::Uuid::try_parse("5fed0576-8b94-4f9a-b6a7-08eecd69800d").unwrap());

src/main.rs

@@ -46,7 +46,7 @@ async fn event_handler(
             return Ok(());
         }
 
-        if let Some(captures) = MD_URL_REGEX.captures(&new_message.content) {
+        if let Ok(Some(captures)) = MD_URL_REGEX.captures(&new_message.content) {
             let uuid = uuid::Uuid::try_parse(&captures[1]);
 
             match uuid {