From 4140098594b142370604034f7e445a83b8f3726d Mon Sep 17 00:00:00 2001 From: miloszowi Date: Thu, 10 Mar 2022 16:04:38 +0100 Subject: [PATCH] fixed default group mention if there was a @ sign in any command argument --- src/bot/message/inboundMessage.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/bot/message/inboundMessage.py b/src/bot/message/inboundMessage.py index d41a013..685dfe8 100644 --- a/src/bot/message/inboundMessage.py +++ b/src/bot/message/inboundMessage.py @@ -26,9 +26,8 @@ class InboundMessage: user_id = str(update.effective_user.id) AccessValidator.validate(user_id) - if update.edited_message: - raise InvalidActionException - + message_content = update.edited_message.text if update.edited_message else update.message.text + message_content = message_content.replace("\n", " ") chat_id = str(update.effective_chat.id) group_name = InboundMessage.default_group @@ -39,8 +38,8 @@ class InboundMessage: GroupNameValidator.validate(group_name) # done upon resolving a message handler action - if '@' in update.message.text and update.message.text[0] != '/': - searched_message_part = [part for part in update.message.text.split(' ') if '@' in part][0] + if '@' in message_content: + searched_message_part = [part for part in message_content.split(' ') if '@' in part][0] group_name = re.sub(r'\W+', '', searched_message_part).lower() if group_name in GroupNameValidator.FORBIDDEN_GROUP_NAMES: