Handle commands in replies without changing message.content (#308)

* Fix message content while handling reply messages

* Handle commands in replies without changing message.content

Co-authored-by: dnns01 <[email protected]>

Author: dnns01

docs/changelog.rst

@@ -5,12 +5,12 @@ Master
 - TwitchIO
     - Bug fixes
         - Added ``self.registered_callbacks = {}`` to Bot and :func:`Client.from_client_credentials`
-        - Fixed message content while handling commands in reply messages
         - Add duration attribute to :class:`twitchio.Clip`
 
 - ext.commands
     - Bug fixes
         - Add type conversion for variable positional arguments
+        - Fixed message content while handling commands in reply messages
 
 - ext.pubsub
     - Bug fixes

twitchio/ext/commands/bot.py

@@ -171,12 +171,14 @@ async def __get_prefixes__(self, message):
     async def get_prefix(self, message):
         # TODO Docs
         prefixes = await self.__get_prefixes__(message)
-
+        message_content = message.content
+        if "reply-parent-msg-id" in message.tags:
+            message_content = message_content.split(" ", 1)[1]
         if not isinstance(prefixes, str):
             for prefix in prefixes:
-                if message.content.startswith(prefix):
+                if message_content.startswith(prefix):
                     return prefix
-        elif message.content.startswith(prefixes):
+        elif message_content.startswith(prefixes):
             return prefixes
         else:
             return None
@@ -287,7 +289,10 @@ async def get_context(self, message, *, cls=None):
         prefix = await self.get_prefix(message)
         if not prefix:
             return cls(message=message, prefix=prefix, valid=False, bot=self)
-        content = message.content[len(prefix) : :].lstrip()  # Strip prefix and remainder whitespace
+        content = message.content
+        if "reply-parent-msg-id" in message.tags:  # Remove @username from reply message
+            content = content.split(" ", 1)[1]
+        content = content[len(prefix) : :].lstrip()  # Strip prefix and remainder whitespace
         view = StringParser()
         parsed = view.process_string(content)  # Return the string as a dict view
 
@@ -329,15 +334,9 @@ async def handle_commands(self, message):
             The message object to get content of and context for.
 
         """
-        original_content = message.content
-
-        if "reply-parent-msg-id" in message.tags:
-            message.content = message.content.split(" ", 1)[1]
         context = await self.get_context(message)
         await self.invoke(context)
 
-        message.content = original_content
-
     async def invoke(self, context):
         # TODO Docs
         if not context.prefix or not context.is_valid: