Support alias arguments

Author: kyb3r

README.md

@@ -29,9 +29,7 @@
 
 <img src='https://i.imgur.com/aHtn4C5.png' align='right' height=140>
 
-Assuming you got the bot setup (Read below on how to set it up), the first thing that you would do is type the command ```<prefix>setup [modrole]``` where `[modrole]` is an optional role you can specify which determines who can see the relayed messages. If a role is not specified, the bot will choose the first role that has `manage guild` permissions as the modrole. The bot will then set up a channel category named `Mod Mail`.
-
-When a user sends a direct message to the bot, a channel is created within this new category. This channel is where messages will be relayed. To reply to a message, simply type the command `<prefix>reply <message>` in the channel.
+When a user sends a direct message to the bot, a channel is created within an isolated category. This channel is where messages will be relayed. To reply to a message, simply use the command `reply` in the channel. See a full list of commands [below](#commands).
 
 ## What it looks like
 

bot.py

@@ -46,6 +46,7 @@
 init()
 
 from discord.ext import commands
+from discord.ext.commands.view import StringView
 import discord
 import aiohttp
 
@@ -186,6 +187,44 @@ async def process_modmail(self, message):
             thread = await self.threads.find_or_create(message.author)
             await thread.send(message)
 
+    async def get_context(self, message, *, cls=commands.Context):
+        """
+        Returns the invocation context from the message.
+        Supports getting the prefix from database as well as command aliases.
+        """
+
+        view = StringView(message.content)
+        ctx = cls(prefix=None, view=view, bot=self, message=message)
+
+        if self._skip_check(message.author.id, self.user.id):
+            return ctx
+        
+
+        prefixes = [self.prefix, f'<@{bot.user.id}> ', f'<@!{bot.user.id}>']
+
+        invoked_prefix = discord.utils.find(view.skip_string, prefixes)
+        if invoked_prefix is None:
+            return ctx
+
+        invoker = view.get_word().lower()
+
+        # Check if there is any aliases being called.
+        alias = self.config.get('aliases', {}).get(invoker)
+        if alias is not None:
+            ctx._alias_invoked = True
+            _len = len(f'{invoked_prefix}{invoker}')
+            ctx.view = view = StringView(f'{alias}{ctx.message.content[_len:]}')
+            invoker = view.get_word()
+
+        ctx.invoked_with = invoker
+        ctx.prefix = self.prefix # Sane prefix (No mentions)
+        ctx.command = self.all_commands.get(invoker)
+
+        # if hasattr(ctx, '_alias_invoked'):
+        #     ctx.command.checks = None # Let anyone use the command.
+
+        return ctx
+
     async def on_message(self, message):
         if message.author.bot:
             return
@@ -198,8 +237,6 @@ async def on_message(self, message):
             cmd = message.content[len(prefix):].strip()
             if cmd in self.snippets:
                 message.content = f'{prefix}reply {self.snippets[cmd]}'
-            if cmd in self.aliases:
-                message.content = f'{prefix}{self.aliases[cmd]}'
 
         await self.process_commands(message)
 

cogs/utility.py

@@ -440,16 +440,17 @@ async def aliases(self, ctx):
         embeds.append(em)
 
         em.description = 'Here is a list of aliases that are currently configured.'
+        em.set_footer(text=f'Do {self.bot.prefix}help aliases for more commands.')
 
         if not self.bot.aliases:
             em.color = discord.Color.red()
             em.description = f'You dont have any aliases at the moment.'
-            em.set_footer(text=f'Do {self.bot.prefix}help aliases for more commands.')
 
         for name, value in self.bot.aliases.items():
             if len(em.fields) == 5:
                 em = discord.Embed(color=discord.Color.green(), description=em.description)
                 em.set_author(name='Command aliases', icon_url=ctx.guild.icon_url)
+                em.set_footer(text=f'Do {self.bot.prefix}help aliases for more commands.')
                 embeds.append(em)
             em.add_field(name=name, value=value, inline=False)