Added command validation to autotrigger

Author: fourjr

CHANGELOG.md

@@ -8,13 +8,17 @@ however, insignificant breaking changes do not guarantee a major version bump, s
 
 # v3.7.14-dev0
 
-### Fixed
+### Added
 
-- Mentioned `competing` as an activity type ([PR #2902](https://github.com/kyb3r/modmail/pull/2902))
+- `update_notifications` configuration option to toggle bot autoupdate notifications. ([GH #2896](https://github.com/kyb3r/modmail/issues/2896))
 
-### Added
+### Improved
+
+- Added command validation to `autotrigger add/edit`.
+
+### Fixed
 
-- `update_notifications` configuration option to toggle bot autoupdate notifications ([GH #2896](https://github.com/kyb3r/modmail/issues/2896))
+- Mentioned `competing` as an activity type. ([PR #2902](https://github.com/kyb3r/modmail/pull/2902))
 
 # v3.7.13
 

bot.py

@@ -937,7 +937,6 @@ async def trigger_auto_triggers(self, message, channel, *, cls=commands.Context)
         invoked_prefix = self.prefix
         invoker = None
 
-        # Check if there is any aliases being called.
         if self.config.get("use_regex_autotrigger"):
             trigger = next(
                 filter(lambda x: re.match(x, message.content), self.auto_triggers.keys())
@@ -1528,7 +1527,9 @@ async def autoupdate(self):
                     channel = self.update_channel
                     if self.hosting_method == HostingMethod.PM2:
                         embed = discord.Embed(title="Bot has been updated", color=self.main_color)
-                        embed.set_footer(text=f"Updating Modmail v{self.version} " f"-> v{latest.version}")
+                        embed.set_footer(
+                            text=f"Updating Modmail v{self.version} " f"-> v{latest.version}"
+                        )
                         if self.bot.config["update_notifications"]:
                             await channel.send(embed=embed)
                     else:
@@ -1537,7 +1538,9 @@ async def autoupdate(self):
                             description="If you do not have an auto-restart setup, please manually start the bot.",
                             color=self.main_color,
                         )
-                        embed.set_footer(text=f"Updating Modmail v{self.version} " f"-> v{latest.version}")
+                        embed.set_footer(
+                            text=f"Updating Modmail v{self.version} " f"-> v{latest.version}"
+                        )
                         if self.bot.config["update_notifications"]:
                             await channel.send(embed=embed)
                     await self.logout()

cogs/utility.py

@@ -1727,14 +1727,30 @@ async def autotrigger_add(self, ctx, keyword, *, command):
                 description=f"Another autotrigger with the same name already exists: `{keyword}`.",
             )
         else:
-            self.bot.auto_triggers[keyword] = command
-            await self.bot.config.update()
+            # command validation
+            valid = False
+            split_cmd = command.split(" ")
+            for n in range(1, len(split_cmd) + 1):
+                if self.bot.get_command(" ".join(split_cmd[0:n])):
+                    print(self.bot.get_command(" ".join(split_cmd[0:n])))
+                    valid = True
+                    break
+
+            if valid:
+                self.bot.auto_triggers[keyword] = command
+                await self.bot.config.update()
 
-            embed = discord.Embed(
-                title="Success",
-                color=self.bot.main_color,
-                description=f"Keyword `{keyword}` has been linked to `{command}`.",
-            )
+                embed = discord.Embed(
+                    title="Success",
+                    color=self.bot.main_color,
+                    description=f"Keyword `{keyword}` has been linked to `{command}`.",
+                )
+            else:
+                embed = discord.Embed(
+                    title="Error",
+                    color=self.bot.error_color,
+                    description="Invalid command. Note that autotriggers do not work with aliases.",
+                )
 
         await ctx.send(embed=embed)
 
@@ -1747,14 +1763,30 @@ async def autotrigger_edit(self, ctx, keyword, *, command):
                 keyword, self.bot.auto_triggers.keys(), "Autotrigger"
             )
         else:
-            self.bot.auto_triggers[keyword] = command
-            await self.bot.config.update()
+            # command validation
+            valid = False
+            split_cmd = command.split(" ")
+            for n in range(1, len(split_cmd) + 1):
+                if self.bot.get_command(" ".join(split_cmd[0:n])):
+                    print(self.bot.get_command(" ".join(split_cmd[0:n])))
+                    valid = True
+                    break
+
+            if valid:
+                self.bot.auto_triggers[keyword] = command
+                await self.bot.config.update()
 
-            embed = discord.Embed(
-                title="Success",
-                color=self.bot.main_color,
-                description=f"Keyword `{keyword}` has been linked to `{command}`.",
-            )
+                embed = discord.Embed(
+                    title="Success",
+                    color=self.bot.main_color,
+                    description=f"Keyword `{keyword}` has been linked to `{command}`.",
+                )
+            else:
+                embed = discord.Embed(
+                    title="Error",
+                    color=self.bot.error_color,
+                    description="Invalid command. Note that autotriggers do not work with aliases.",
+                )
 
         await ctx.send(embed=embed)