Merge pull request #336 from Aras14HD/allow-escaped-underscore-commands

Allow escaped underscore in commands

Author: tolik518

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "factorion-bot-discord"
-version = "3.0.0"
+version = "3.0.1"
 edition = "2024"
 description = "factorion-bot (for factorials and related) on Discord"
 license = "MIT"
@@ -10,7 +10,7 @@ keywords = ["factorial", "termial", "bot", "math", "discord"]
 categories = ["mathematics", "web-programming", "parser-implementations"]
 
 [dependencies]
-factorion-lib = { path = "../factorion-lib", version = "6.0.0", features = ["serde", "influxdb"] }
+factorion-lib = { path = "../factorion-lib", version = "6.0.1", features = ["serde", "influxdb"] }
 serenity = { version = "0.12", default-features = false, features = ["client", "gateway", "rustls_backend", "model", "cache"] }
 tokio = { version = "1.48.0", features = ["macros", "rt-multi-thread", "time"] }
 dotenvy = "^0.15.7"

factorion-bot-discord/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "factorion-bot-reddit"
-version = "6.0.0"
+version = "6.0.1"
 edition = "2024"
 description = "factorion-bot (for factorials and related) on Reddit"
 license = "MIT"
@@ -10,7 +10,7 @@ keywords = ["factorial", "termial", "bot", "math"]
 categories = ["mathematics", "web-programming", "parser-implementations"]
 
 [dependencies]
-factorion-lib = {path = "../factorion-lib", version = "6.0.0", features = ["serde", "influxdb"]}
+factorion-lib = {path = "../factorion-lib", version = "6.0.1", features = ["serde", "influxdb"]}
 reqwest = { version = "0.12.28", features = ["json", "native-tls"], default-features = false }
 serde = { version = "1.0.219", default-features = false, features = ["derive"] }
 serde_json = "1.0.140"

factorion-bot-reddit/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "factorion-lib"
-version = "6.0.0"
+version = "6.0.1"
 edition = "2024"
 description = "A library used to create bots to recognize and calculate factorials and related concepts"
 license = "MIT"

factorion-lib/Cargo.toml

@@ -221,23 +221,31 @@ impl Commands {
             termial: Self::contains_command_format(text, "termial")
                 || Self::contains_command_format(text, "triangle"),
             no_note: Self::contains_command_format(text, "no note")
+                || Self::contains_command_format(text, "no\\_note")
                 || Self::contains_command_format(text, "no_note"),
             write_out: Self::contains_command_format(text, "write_out")
-                || Self::contains_command_format(text, "write_num"),
+                || Self::contains_command_format(text, "write\\_out")
+                || Self::contains_command_format(text, "write_num")
+                || Self::contains_command_format(text, "write\\_num"),
         }
     }
     pub fn overrides_from_comment_text(text: &str) -> Self {
         Self {
             shorten: !Self::contains_command_format(text, "long"),
             steps: !(Self::contains_command_format(text, "no steps")
-                || Self::contains_command_format(text, "no_steps")),
+                || Self::contains_command_format(text, "no_steps")
+                || Self::contains_command_format(text, "no\\_steps")),
             nested: !(Self::contains_command_format(text, "no_nest")
+                || Self::contains_command_format(text, "no\\_nest")
                 || Self::contains_command_format(text, "multi")),
             termial: !(Self::contains_command_format(text, "no termial")
-                || Self::contains_command_format(text, "no_termial")),
+                || Self::contains_command_format(text, "no_termial")
+                || Self::contains_command_format(text, "no\\_termial")),
             no_note: !Self::contains_command_format(text, "note"),
             write_out: !(Self::contains_command_format(text, "dont_write_out")
-                || Self::contains_command_format(text, "normal_num")),
+                || Self::contains_command_format(text, "dont\\_write\\_out")
+                || Self::contains_command_format(text, "normal\\_num")
+                || Self::contains_command_format(text, "normal\\_num")),
         }
     }
 }