diff --git a/src/bots/approved_bot/modules/support.rs b/src/bots/approved_bot/modules/support.rs index f6faa13..94930c5 100644 --- a/src/bots/approved_bot/modules/support.rs +++ b/src/bots/approved_bot/modules/support.rs @@ -15,7 +15,14 @@ enum SupportCommand { pub async fn support_command_handler( message: Message, bot: CacheMe>) -> BotHandlerInternal { - let username = &message.from().unwrap().first_name; + + let is_bot = message.from().unwrap().is_bot; + + let username = if is_bot { + &message.reply_to_message().unwrap().from().unwrap().first_name + } else { + &message.from().unwrap().first_name + }; let message_text = format!(" Привет, {username}!