From b55440ab86464f6c4d45bffdc53343ec3434025d Mon Sep 17 00:00:00 2001
From: Dan <14043624+delivrance@users.noreply.github.com>
Date: Thu, 8 Aug 2019 16:04:10 +0200
Subject: [PATCH] Update Filters.command

- Remove negative lookahead to fix "\"" reporting commas
- Escape cmd when interpolating the pattern
- Remove the escape character from the arguments
- Return True when a valid command is found, return False at the end
---
 pyrogram/client/filters/filters.py | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/pyrogram/client/filters/filters.py b/pyrogram/client/filters/filters.py
index a095ed89..5d892bbe 100644
--- a/pyrogram/client/filters/filters.py
+++ b/pyrogram/client/filters/filters.py
@@ -232,7 +232,7 @@ class Filters:
                 Pass True if you want your command(s) to be case sensitive. Defaults to False.
                 Examples: when True, command="Start" would trigger /Start but not /start.
         """
-        command_re = re.compile(r"([\"'])(?!\\)(.*?)(?<!\\)\1|(\S+)")
+        command_re = re.compile(r"([\"'])(.*?)(?<!\\)\1|(\S+)")
 
         def func(flt, message):
             text = message.text or message.caption
@@ -250,21 +250,21 @@ class Filters:
                 without_prefix = text[len(prefix):]
 
                 for cmd in flt.commands:
-
-                    if not re.match(pattern.format(cmd), without_prefix):
+                    if not re.match(pattern.format(re.escape(cmd)), without_prefix):
                         continue
 
                     # match.groups are 1-indexed, group(1) is the quote, group(2) is the text
                     # between the quotes, group(3) is unquoted, whitespace-split text
-                    without_command = without_prefix[len(cmd):]
+
+                    # Remove the escape character from the arguments
                     message.command = [cmd] + [
-                        m.group(2) or m.group(3) or ''
-                        for m in command_re.finditer(without_command)
+                        re.sub(r"\\([\"'])", r"\1", m.group(2) or m.group(3) or "")
+                        for m in command_re.finditer(without_prefix[len(cmd):])
                     ]
 
-                    break
+                    return True
 
-            return bool(message.command)
+            return False
 
         commands = commands if type(commands) is list else [commands]
         commands = {c if case_sensitive else c.lower() for c in commands}