Initial commit

Author: popeeyy

bot.py

@@ -1010,6 +1010,7 @@ async def trigger_auto_triggers(self, message, channel, *, cls=commands.Context)
             if trigger:
                 invoker = trigger.lower()
 
+        print("looking for auto trigger", trigger, self.auto_triggers[trigger])
         alias = self.auto_triggers[trigger]
 
         ctxs = []
@@ -1019,24 +1020,45 @@ async def trigger_auto_triggers(self, message, channel, *, cls=commands.Context)
             if not aliases:
                 logger.warning("Alias %s is invalid as called in autotrigger.", invoker)
 
+            print("Aliases", aliases)
+
             for alias in aliases:
                 view = StringView(invoked_prefix + alias)
+                invoked_with = view.get_word().lower()
+                invoked_with = invoked_with[1:]
+                print("Looking for", invoked_with)
+                found_command = self.all_commands.get(invoked_with)
+
+                # Check for alias
+                if not found_command:
+                    print("INVOKED WITH", invoked_with)
+                    command_alias = self.aliases.get(invoked_with)[1:-1]
+                    view = StringView(invoked_prefix + command_alias)
+                    split_cmd = command_alias.split(" ")
+                    found_command = self.all_commands.get(split_cmd[0])
+
                 ctx_ = cls(prefix=self.prefix, view=view, bot=self, message=message)
+                ctx_.command = found_command
+                ctx_.invoked_with = invoked_with
                 ctx_.thread = thread
                 discord.utils.find(view.skip_string, await self.get_prefix())
-                ctx_.invoked_with = view.get_word().lower()
-                ctx_.command = self.all_commands.get(ctx_.invoked_with)
+
+                print("Command info:", view, ctx_, ctx_.thread, ctx_.invoked_with, ctx_.command)
                 ctxs += [ctx_]
 
         for ctx in ctxs:
             if ctx.command:
+                print("Found command")
                 old_checks = copy.copy(ctx.command.checks)
+                print("Old checks set")
                 ctx.command.checks = [checks.has_permissions(PermissionLevel.INVALID)]
-
+                print("Command checks added, invoking...", ctx)
                 await self.invoke(ctx)
 
                 ctx.command.checks = old_checks
                 continue
+            else:
+                print("unable to find command")
 
     async def get_context(self, message, *, cls=commands.Context):
         """

cogs/modmail.py

@@ -818,7 +818,10 @@ async def reply(self, ctx, *, msg: str = ""):
         Supports attachments and images as well as
         automatically embedding image URLs.
         """
+
         ctx.message.content = msg
+        print("MSG IS", msg)
+        print("Sending", ctx.message, msg)
         async with ctx.typing():
             await ctx.thread.reply(ctx.message)
 

cogs/utility.py

@@ -1750,6 +1750,16 @@ async def autotrigger_add(self, ctx, keyword, *, command):
                     print(self.bot.get_command(" ".join(split_cmd[0:n])))
                     valid = True
                     break
+            
+            print("Split command", split_cmd, "Range", range(1, len(split_cmd) + 1), self.bot.aliases)
+
+            if not valid and self.bot.aliases:
+                for n in range(1, len(split_cmd) + 1):
+                    print(" ".join(split_cmd[0:n]), self.bot.aliases.get(" ".join(split_cmd[0:n])))
+                    if self.bot.aliases.get(" ".join(split_cmd[0:n])):
+                        print(self.bot.aliases.get(" ".join(split_cmd[0:n])))
+                        valid = True
+                        break
 
             if valid:
                 self.bot.auto_triggers[keyword] = command
@@ -1784,6 +1794,14 @@ async def autotrigger_edit(self, ctx, keyword, *, command):
                     valid = True
                     break
 
+            if not valid and self.bot.aliases:
+                for n in range(1, len(split_cmd) + 1):
+                    print(" ".join(split_cmd[0:n]), self.bot.aliases.get(" ".join(split_cmd[0:n])))
+                    if self.bot.aliases.get(" ".join(split_cmd[0:n])):
+                        print(self.bot.aliases.get(" ".join(split_cmd[0:n])))
+                        valid = True
+                        break
+
             if valid:
                 self.bot.auto_triggers[keyword] = command
                 await self.bot.config.update()

core/thread.py

@@ -241,6 +241,7 @@ class Author:
         async def activate_auto_triggers():
             if initial_message:
                 message = DummyMessage(copy.copy(initial_message))
+
                 try:
                     return await self.bot.trigger_auto_triggers(message, channel)
                 except RuntimeError: