v1.1.1 supported help command

Author: Taaku18

bot.py

@@ -48,7 +48,7 @@
 from core.changelog import Changelog
 from core.clients import DatabaseClient, PluginDatabaseClient
 from core.config import ConfigManager
-from core.utils import info, error
+from core.utils import info, error, human_join
 from core.models import Bot, PermissionLevel
 from core.thread import ThreadManager
 from core.time import human_timedelta
@@ -167,8 +167,6 @@ async def get_prefix(self, message=None):
 
     def _load_extensions(self):
         """Adds commands automatically"""
-        self.remove_command('help')
-
         logger.info(LINE)
         logger.info(info('┌┬┐┌─┐┌┬┐┌┬┐┌─┐┬┬'))
         logger.info(info('││││ │ │││││├─┤││'))
@@ -834,13 +832,6 @@ async def on_error(self, event_method, *args, **kwargs):
         logger.error(error('Unexpected exception:'), exc_info=sys.exc_info())
 
     async def on_command_error(self, ctx, exception):
-
-        def human_join(strings):
-            if len(strings) <= 2:
-                return ' or '.join(strings)
-            else:
-                return ', '.join(strings[:len(strings)-1]) + ' or ' + strings[-1]
-
         if isinstance(exception, commands.BadUnionArgument):
             msg = 'Could not find the specified ' + human_join([c.__name__ for c in exception.converters])
             await ctx.trigger_typing()
@@ -855,12 +846,17 @@ def human_join(strings):
                 color=discord.Color.red(), 
                 description=str(exception)
                 ))
-        elif isinstance(exception, commands.MissingRequiredArgument):
-            await ctx.invoke(self.get_command('help'),
-                                 command=str(ctx.command))
         elif isinstance(exception, commands.CommandNotFound):
             logger.warning(error('CommandNotFound: ' + str(exception)))
+        elif isinstance(exception, commands.MissingRequiredArgument):
+            await ctx.send_help(ctx.command)
         elif isinstance(exception, commands.CheckFailure):
+            for check in ctx.command.checks:
+                if not await check(ctx) and hasattr(check, 'fail_msg'):
+                    await ctx.send(embed=discord.Embed(
+                        color=discord.Color.red(),
+                        description=check.fail_msg
+                    ))
             logger.warning(error('CheckFailure: ' + str(exception)))
         else:
             logger.error(error('Unexpected exception:'), exc_info=exception)
@@ -975,9 +971,5 @@ async def metadata_loop(self):
 
 
 if __name__ == '__main__':
-    if os.name != 'nt':
-        import uvloop
-
-        uvloop.install()
     bot = ModmailBot()
     bot.run()

cogs/modmail.py

@@ -147,17 +147,10 @@ async def snippets_remove(self, ctx, *, name: str.lower):
 
     @commands.command()
     @checks.has_permissions(PermissionLevel.MODERATOR)
+    @checks.thread_only()
     async def move(self, ctx, *, category: discord.CategoryChannel):
         """Moves a thread to a specified category."""
         thread = ctx.thread
-        if not thread:
-            embed = discord.Embed(
-                title='Error',
-                description='This is not a Modmail thread.',
-                color=discord.Color.red()
-            )
-            return await ctx.send(embed=embed)
-
         await thread.channel.edit(category=category, sync_permissions=True)
         await ctx.message.add_reaction('✅')
 
@@ -820,10 +813,11 @@ async def delete(self, ctx, message_id: Optional[int] = None):
         if linked_message_id is None:
             return await ctx.send(
                 embed=discord.Embed(
-                title='Failed',
-                description='Cannot find a message to delete.',
-                color=discord.Color.red()
-            ))
+                    title='Failed',
+                    description='Cannot find a message to delete.',
+                    color=discord.Color.red()
+                )
+            )
 
         await thread.delete_message(linked_message_id)
         await ctx.message.add_reaction('✅')

cogs/plugins.py

@@ -121,8 +121,7 @@ async def load_plugin(self, username, repo, plugin_name):
     @checks.has_permissions(PermissionLevel.OWNER)
     async def plugin(self, ctx):
         """Plugin handler. Controls the plugins in the bot."""
-        cmd = self.bot.get_command('help')
-        await ctx.invoke(cmd, command='plugin')
+        await ctx.send_help(ctx.command)
 
     @plugin.command(name='add')
     @checks.has_permissions(PermissionLevel.OWNER)