From a346dfca7edcfd0108be356076c28f7c86278ba2 Mon Sep 17 00:00:00 2001 From: Myned Date: Sat, 14 Oct 2017 23:41:42 -0400 Subject: [PATCH] Formatting changes, changed to errext, caught CheckFailure --- src/main/cogs/booru.py | 2 +- src/main/cogs/owner.py | 8 ++++---- src/main/run.py | 9 +++++++-- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/src/main/cogs/booru.py b/src/main/cogs/booru.py index c84b27e..3094b45 100644 --- a/src/main/cogs/booru.py +++ b/src/main/cogs/booru.py @@ -37,7 +37,7 @@ class MsG: for tag in tag_request.get('wolf', []): tags.append(tag[0]) - await ctx.send('✅ ``{}` **tags:**\n```\n{}```'.format(tag, formatter.tostring(tags))) + await ctx.send('✅ `{}` **related tags:**\n```\n{}```'.format(tag, formatter.tostring(tags))) @tags.error async def tags_error(self, ctx, error): diff --git a/src/main/cogs/owner.py b/src/main/cogs/owner.py index 3a65307..19a9916 100644 --- a/src/main/cogs/owner.py +++ b/src/main/cogs/owner.py @@ -27,8 +27,8 @@ class Bot: @commands.is_owner() @checks.del_ctx() async def die(self, ctx): - if isinstance(self.bot.get_channel(u.config['startup_channel']), d.TextChannel): - await self.bot.get_channel(u.config['shutdown_channel']).send('**Shutting down...** 🌙') + if isinstance(self.bot.get_channel(u.config['shutdown_channel']), d.TextChannel): + await self.bot.get_channel(u.config['shutdown_channel']).send('**Shutting down. . .** 🌙') # loop = self.bot.loop.all_tasks() # for task in loop: # task.cancel() @@ -43,8 +43,8 @@ class Bot: @checks.del_ctx() async def restart(self, ctx): print('\n| | | | | | | | | |\nR E S T A R T I N G\n| | | | | | | | | |\n') - if isinstance(self.bot.get_channel(u.config['startup_channel']), d.TextChannel): - await self.bot.get_channel(u.config['shutdown_channel']).send('**Restarting...** 💤') + if isinstance(self.bot.get_channel(u.config['shutdown_channel']), d.TextChannel): + await self.bot.get_channel(u.config['shutdown_channel']).send('**Restarting. . .** 💤') # u.notify('R E S T A R T I N G') # loop = self.bot.loop.all_tasks() # for task in loop: diff --git a/src/main/run.py b/src/main/run.py index 0d9feb7..2b51ca9 100644 --- a/src/main/run.py +++ b/src/main/run.py @@ -9,6 +9,7 @@ import traceback as tb import discord as d from discord import utils from discord.ext import commands +from discord.ext.commands import errors as errext from misc import exceptions as exc from misc import checks @@ -40,7 +41,9 @@ async def on_ready(): @bot.event -async def on_error(error): +async def on_error(error, *args, **kwargs): + if isinstance(bot.get_channel(u.config['shutdown_channel']), d.TextChannel): + await bot.get_channel(u.config['shutdown_channel']).send('**__ERROR__** ⚠️ {}\n**Exiting. . .**'.format(error)) u.close() await bot.logout() await bot.close() @@ -51,7 +54,9 @@ async def on_error(error): @bot.event async def on_command_error(ctx, error): - if not isinstance(error, commands.errors.CommandNotFound): + if isinstance(error, errext.CheckFailure): + await ctx.send('❌ **Insufficient permissions.**', delete_after=10) + elif not isinstance(error, errext.CommandNotFound): print('\n! ! ! ! ! ! ! ! ! ! ! !\nC O M M A N D E R R O R : {}\n! ! ! ! ! ! ! ! ! ! ! !\n'.format( error), file=sys.stderr) tb.print_exception(type(error), error, error.__traceback__, file=sys.stderr)