aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Rohan <[email protected]>2020-12-07 01:16:29 +0530
committerGravatar Rohan <[email protected]>2020-12-07 01:16:29 +0530
commitcd20acfee1e36351e561ba7c410dc8fac7725572 (patch)
treeb9ffe9b3afbff3bc6ab52c4ae16920b0fc4d60bb
parentCheck value of handled attribute on error in global error handler. (diff)
Modify snakes_cog error handler.
local error handler no longer checks for BadArgument error and the attribute handled will be set to True on the error if an OSError occurs.
-rw-r--r--bot/exts/evergreen/snakes/_snakes_cog.py22
1 files changed, 6 insertions, 16 deletions
diff --git a/bot/exts/evergreen/snakes/_snakes_cog.py b/bot/exts/evergreen/snakes/_snakes_cog.py
index 70bb0e73..2e88c146 100644
--- a/bot/exts/evergreen/snakes/_snakes_cog.py
+++ b/bot/exts/evergreen/snakes/_snakes_cog.py
@@ -15,7 +15,7 @@ import aiohttp
import async_timeout
from PIL import Image, ImageDraw, ImageFont
from discord import Colour, Embed, File, Member, Message, Reaction
-from discord.ext.commands import BadArgument, Bot, Cog, CommandError, Context, bot_has_permissions, group
+from discord.ext.commands import Bot, Cog, CommandError, Context, bot_has_permissions, group
from bot.constants import ERROR_REPLIES, Tokens
from bot.exts.evergreen.snakes import _utils as utils
@@ -1131,21 +1131,11 @@ class Snakes(Cog):
@video_command.error
async def command_error(self, ctx: Context, error: CommandError) -> None:
"""Local error handler for the Snake Cog."""
- embed = Embed()
- embed.colour = Colour.red()
-
- if isinstance(error, BadArgument):
- embed.description = str(error)
- embed.title = random.choice(ERROR_REPLIES)
-
- elif isinstance(error, OSError):
+ if isinstance(error, OSError):
+ error.handled = True
+ embed = Embed()
+ embed.colour = Colour.red()
log.error(f"snake_card encountered an OSError: {error} ({error.original})")
embed.description = "Could not generate the snake card! Please try again."
embed.title = random.choice(ERROR_REPLIES)
-
- else:
- log.error(f"Unhandled tag command error: {error} ({error.original})")
- return
-
- await ctx.send(embed=embed)
- # endregion
+ await ctx.send(embed=embed)