From 55046e15b227bdf1e9e77ce781f6039f556b8e6b Mon Sep 17 00:00:00 2001 From: Tulir Asokan Date: Sat, 24 Feb 2018 12:57:18 +0200 Subject: [PATCH] Add support for /command@bot bot command syntax --- mautrix_telegram/bot.py | 4 ++-- mautrix_telegram/formatter/from_matrix.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/mautrix_telegram/bot.py b/mautrix_telegram/bot.py index ba43bffe..1ba9539f 100644 --- a/mautrix_telegram/bot.py +++ b/mautrix_telegram/bot.py @@ -127,9 +127,9 @@ class Bot(AbstractUser): text = message.message portal = po.Portal.get_by_entity(message.to_id) - if text == "/portal": + if text == "/portal" or text == f"/portal@{self.username}": await self.handle_command_portal(portal, reply) - elif text.startswith("/invite"): + elif text.startswith("/invite") or text.startswith(f"/invite@{self.username}"): await self.handle_command_invite(portal, reply, mxid=text[len("/invite "):]) async def update(self, update): diff --git a/mautrix_telegram/formatter/from_matrix.py b/mautrix_telegram/formatter/from_matrix.py index 5999a68b..f6a9a5e5 100644 --- a/mautrix_telegram/formatter/from_matrix.py +++ b/mautrix_telegram/formatter/from_matrix.py @@ -210,7 +210,7 @@ class MatrixParser(HTMLParser): self.entities.append(entity) -command_regex = re.compile("(\s|^)!([A-Za-z0-9]+)") +command_regex = re.compile("(\s|^)!([A-Za-z0-9@]+)") def matrix_text_to_telegram(text):