From 31593febf02b67795f7e3ff565fed2370c66d4ca Mon Sep 17 00:00:00 2001 From: ajax146 <31014239+ajax146@users.noreply.github.com> Date: Sat, 6 Jan 2024 15:19:46 -0500 Subject: [PATCH 1/2] Fix extension load/unload --- techsupport_bot/commands/extension.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/techsupport_bot/commands/extension.py b/techsupport_bot/commands/extension.py index 9056524d3..30033202d 100644 --- a/techsupport_bot/commands/extension.py +++ b/techsupport_bot/commands/extension.py @@ -94,7 +94,10 @@ async def load_extension(self, ctx, *, extension_name: str): ctx (discord.ext.Context): the context object for the message extension_name (str): the name of the extension """ - await ctx.bot.load_extension(f"extensions.{extension_name}") + try: + await ctx.bot.load_extension(f"functions.{extension_name}") + except: + await ctx.bot.load_extension(f"commands.{extension_name}") await auxiliary.send_confirm_embed( message="I've loaded that extension", channel=ctx.channel ) @@ -114,7 +117,10 @@ async def unload_extension(self, ctx, *, extension_name: str): ctx (discord.ext.Context): the context object for the message extension_name (str): the name of the extension """ - await ctx.bot.unload_extension(f"extensions.{extension_name}") + try: + await ctx.bot.unload_extension(f"functions.{extension_name}") + except: + await ctx.bot.unload_extension(f"commands.{extension_name}") await auxiliary.send_confirm_embed( message="I've unloaded that extension", channel=ctx.channel ) From 8973ed158cedd91e344217c7da916c8b316f1411 Mon Sep 17 00:00:00 2001 From: ajax146 <31014239+ajax146@users.noreply.github.com> Date: Sun, 7 Jan 2024 10:12:11 -0500 Subject: [PATCH 2/2] Add errors to except --- techsupport_bot/commands/extension.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/techsupport_bot/commands/extension.py b/techsupport_bot/commands/extension.py index 30033202d..f47f127dd 100644 --- a/techsupport_bot/commands/extension.py +++ b/techsupport_bot/commands/extension.py @@ -96,7 +96,7 @@ async def load_extension(self, ctx, *, extension_name: str): """ try: await ctx.bot.load_extension(f"functions.{extension_name}") - except: + except (ModuleNotFoundError, commands.errors.ExtensionNotFound): await ctx.bot.load_extension(f"commands.{extension_name}") await auxiliary.send_confirm_embed( message="I've loaded that extension", channel=ctx.channel @@ -119,7 +119,7 @@ async def unload_extension(self, ctx, *, extension_name: str): """ try: await ctx.bot.unload_extension(f"functions.{extension_name}") - except: + except commands.errors.ExtensionNotLoaded: await ctx.bot.unload_extension(f"commands.{extension_name}") await auxiliary.send_confirm_embed( message="I've unloaded that extension", channel=ctx.channel