From e9e6c30d05f5ebe84d6dbe8cbc0623afb97026d8 Mon Sep 17 00:00:00 2001
From: Dan <14043624+delivrance@users.noreply.github.com>
Date: Wed, 5 May 2021 13:58:03 +0200
Subject: [PATCH] Handle bot commands with trailing usernames Closes #139, #615

---
 pyrogram/filters.py | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/pyrogram/filters.py b/pyrogram/filters.py
index db08f672..aaff1aa1 100644
--- a/pyrogram/filters.py
+++ b/pyrogram/filters.py
@@ -764,15 +764,21 @@ def command(commands: Union[str, List[str]], prefixes: Union[str, List[str]] = "
             Examples: when True, command="Start" would trigger /Start but not /start.
     """
     command_re = re.compile(r"([\"'])(.*?)(?<!\\)\1|(\S+)")
+    username = None
+
+    async def func(flt, client: pyrogram.Client, message: Message):
+        nonlocal username
+
+        if username is None:
+            username = (await client.get_me()).username
 
-    async def func(flt, _, message: Message):
         text = message.text or message.caption
         message.command = None
 
         if not text:
             return False
 
-        pattern = r"^{}(?:\s|$)" if flt.case_sensitive else r"(?i)^{}(?:\s|$)"
+        pattern = rf"^(?:{{cmd}}|{{cmd}}@{username})(?:\s|$)" if username else r"^{cmd}(?:\s|$)"
 
         for prefix in flt.prefixes:
             if not text.startswith(prefix):
@@ -781,7 +787,8 @@ def command(commands: Union[str, List[str]], prefixes: Union[str, List[str]] = "
             without_prefix = text[len(prefix):]
 
             for cmd in flt.commands:
-                if not re.match(pattern.format(re.escape(cmd)), without_prefix):
+                if not re.match(pattern.format(cmd=re.escape(cmd)), without_prefix,
+                                flags=re.IGNORECASE if not flt.case_sensitive else 0):
                     continue
 
                 # match.groups are 1-indexed, group(1) is the quote, group(2) is the text