Merge pull request #249 from practical-python-org/fix-run-command-edits

fix: run command edits

Author: Xarlos89

src/zorak/cogs/logging/logging_message_edit.py

@@ -18,15 +18,11 @@ def __init__(self, bot):
 
     @commands.Cog.listener()
     async def on_message_edit(self, message_before, message_after):
-        """
-        Checking if there is a change to /run command to summon a new embed
-        Or if the content before is != to the content after then log the change.
-        """
-        if message_after.content.startswith('/'):
-            edited_command = message_after.content.split()[0]
-            if edited_command == '/run':
-                ctx = await self.bot.get_context(message_after)
-                await self.bot.invoke(ctx)
+
+        # IGNORE /run, since we will set up an on_message_edit handler there with opposite logic
+        if message_before.content.startswith('/run') or message_after.content.startswith('/run'):
+            return
+
         elif message_before.content != message_after.content:
             # This guy here makes sure we use the displayed name inside the guild.
             if message_before.author.nick is None:

src/zorak/cogs/utility/utility_run_code.py

@@ -16,8 +16,6 @@ class UtilityRunCode(commands.Cog):
 
     def __init__(self, bot):
         self.bot = bot
-        self.previous_message_id = None
-
 
     def get_embed(self, name, value, is_error=False):
         if is_error:
@@ -31,7 +29,6 @@ def get_embed(self, name, value, is_error=False):
         )
         return embed
 
-
     @commands.command()
     async def run(self, ctx, *, codeblock):
         """
@@ -41,20 +38,12 @@ async def run(self, ctx, *, codeblock):
                     , ctx.author.name
                     , ctx.command)
 
-        if self.previous_message_id:
-            try:
-                previous_message = await ctx.channel.fetch_message(self.previous_message_id)
-                if previous_message:
-                    await previous_message.delete()
-            except discord.NotFound:
-                pass
-
-        # Adjust iOS quotation marks “”‘’ to avoid SyntaxError: invalid character 
+        # Adjust iOS quotation marks “”‘’ to avoid SyntaxError: invalid character
         for i, c in enumerate("“‘”’"):
-            codeblock = codeblock.replace(c, "\"'"[i%2])
+            codeblock = codeblock.replace(c, "\"'"[i % 2])
 
         if codeblock.startswith("```py") and "```" in codeblock[3:]:
-            
+
             # Split input args from codeblock
             _, codeblock, args = codeblock.split("```")
             args = [arg for arg in args.split("\n") if arg]
@@ -67,14 +56,14 @@ async def run(self, ctx, *, codeblock):
             if args or input_count:
                 # Check if number of input() functions matches args from user.
                 if len(args) != input_count:
-                    value = 'I am happy to run your script but I do not want to interact with you. You can '\
-                            'remove your input() functions, however if you insist on keeping them, please '\
-                            'put your input values in order on separate lines after the codeblock:'\
-                            '\n\n\`\`\`py \nx = input("What is your first input: ")\ny = input("What is '\
+                    value = 'I am happy to run your script but I do not want to interact with you. You can ' \
+                            'remove your input() functions, however if you insist on keeping them, please ' \
+                            'put your input values in order on separate lines after the codeblock:' \
+                            '\n\n\`\`\`py \nx = input("What is your first input: ")\ny = input("What is ' \
                             'your second input: ")\nprint(x)\nprint(y)\n\`\`\`\nmy_first_input\nmy_second_input'
                     embed = self.get_embed("Formatting error", value, True)
                     message = await ctx.channel.send(embed=embed)
-                    self.previous_message_id = message.id
+                    # self.previous_message_id = message.id
                     return
                 # Else, replace all input()s with values
                 else:
@@ -84,21 +73,39 @@ async def run(self, ctx, *, codeblock):
             piston = PistonAPI()
             runcode = piston.execute(language="py", version="3.10.0", code=codeblock)
             embed = self.get_embed("Output:", runcode)
-            message = await ctx.channel.send(embed=embed)
-            self.previous_message_id = message.id
+            message = await ctx.reply(embed=embed)
 
         elif codeblock.startswith("'''") and codeblock.endswith("'''"):
             value = "Did you mean to use a \` instead of a ' ?\n\`\`\`py Your code here \`\`\`"
             embed = self.get_embed("Formatting error", value, True)
             message = await ctx.channel.send(embed=embed)
-            self.previous_message_id = message.id
 
         else:
-            value = 'Please place your code inside a code block. (between \`\`\`py '\
+            print(codeblock)
+            value = 'Please place your code inside a code block. (between \`\`\`py ' \
                     'and \`\`\`)\n\n\`\`\`py \nx = "like this"\nprint(x) \n\`\`\`'
             embed = self.get_embed("Formatting error", value, True)
             message = await ctx.channel.send(embed=embed)
-            self.previous_message_id = message.id
+
+    @commands.Cog.listener()
+    async def on_message_edit(self, before, after):
+        if before.author.bot:
+            # Ignore messages sent by bots
+            return
+        if before.content.startswith('/run') or after.content.startswith('/run'):
+            # Make sure we ONLY re-run messages that are /run commands
+            channel = after.channel  # The channel that the edited message is in
+            # Grab the last 10 (should be enough...) bot messages
+            all_replies = [message async for message in channel.history(limit=20) if message.author == self.bot.user]
+            for bot_reply in all_replies:
+                if bot_reply.reference.message_id == after.id:
+                    await bot_reply.delete()
+                    # If the reference message of the bot message is the edited message...
+                    # Re-run the /run command with the new content
+                    # however, we dont call the command with /run, so we need to remove the '/run' from the message
+                    code = after.content.replace("/run", "").strip()
+                    new_ctx = await self.bot.get_context(after)  # get a new message ctx
+                    return await new_ctx.command.callback(self, new_ctx, codeblock=code)
 
 
 def setup(bot):