fix: command parsing process

Author: Liki4

.env.example

@@ -5,6 +5,8 @@ RUST_LOG=DEBUG
 MEDIA_GROUP_MAPPING_TIMEOUT=86400
 
 TELOXIDE_TOKEN=<BOT_TOKEN>
+# Without `@`, to precisely parse commands
+BOT_NAME=xxx_bot
 # Uncomment TELOXIDE_PROXY to use proxy
 # TELOXIDE_PROXY=http://127.0.0.1:7890/
 

README.md

@@ -83,6 +83,8 @@ random 和 generate 的入参逻辑都是一样的
 
 然后参数最后会根据 meme 对应的最大入参量截断，比如你给一个 2 个入参的 meme 发 3 个参数，最后生效的也只是前 2 个
 
+注意！如果要同时使用多张图片，无论是回复还是直接发，都要求把 [Privacy Mode](https://core.telegram.org/bots/features#privacy-mode) 关闭，否则只能取出来第一张图片
+
 ## Generator
 
 Rust 版在：https://github.com/MemeCrafters/meme-generator-rs

src/bot/handler/endpoint.rs

@@ -49,7 +49,7 @@ pub async fn media_group_with_command_handler(bot: Bot, msg: Message) -> Respons
         .await;
 
         if let Some(caption) = msg.caption() {
-            if let Some(cmd) = Command::parse(caption, "").ok() {
+            if let Some(cmd) = Command::parse(caption, &env::var("BOT_NAME").unwrap()).ok() {
                 command_handler(bot, msg, cmd).await.ok();
             }
         }
@@ -61,7 +61,7 @@ pub async fn media_group_with_command_handler(bot: Bot, msg: Message) -> Respons
 pub async fn single_photo_with_command_handler(bot: Bot, msg: Message) -> ResponseResult<()> {
     tokio::spawn(async move {
         if let Some(caption) = msg.caption() {
-            if let Some(cmd) = Command::parse(caption, "").ok() {
+            if let Some(cmd) = Command::parse(caption, &env::var("BOT_NAME").unwrap()).ok() {
                 command_handler(bot, msg, cmd).await.ok();
             }
         }

src/main.rs

@@ -1,6 +1,7 @@
 mod bot;
 mod meme;
 
+use std::env;
 use {
     crate::bot::{
         bot_init,
@@ -43,7 +44,7 @@ async fn main() {
                         .branch(
                             dptree::filter(|msg: Message| {
                                 msg.caption()
-                                    .map_or(false, |caption| Command::parse(caption, "").is_ok())
+                                    .map_or(false, |caption| Command::parse(caption, &env::var("BOT_NAME").unwrap()).is_ok())
                             })
                             .endpoint(media_group_with_command_handler),
                         )