diff options
| author |  Mark <[email protected]> | 2021-01-18 15:56:09 -0800 |
|---|---|---|
| committer |  GitHub <[email protected]> | 2021-01-18 15:56:09 -0800 |
| commit | b14933d88dbe7260145f77b04309eddcaa35257e (patch) | |
| tree | 59216997dbee60961cfc52534cd73029447f121f | |
| parent | Merge branch 'master' into branding-manager (diff) | |
| parent | Update config-default.yml (diff) | |
Merge branch 'master' into branding-manager
| -rw-r--r-- | bot/exts/backend/error_handler.py | 7 | ||||
| -rw-r--r-- | config-default.yml | 4 |
2 files changed, 5 insertions, 6 deletions
diff --git a/bot/exts/backend/error_handler.py b/bot/exts/backend/error_handler.py index 9398aa8ec..b8bb3757f 100644 --- a/bot/exts/backend/error_handler.py +++ b/bot/exts/backend/error_handler.py @@ -164,12 +164,7 @@ class ErrorHandler(Cog): return if not any(role.id in MODERATION_ROLES for role in ctx.author.roles): - tags_cog = self.bot.get_cog("Tags") - command_name = ctx.invoked_with - sent = await tags_cog.display_tag(ctx, command_name) - - if not sent: - await self.send_command_suggestion(ctx, command_name) + await self.send_command_suggestion(ctx, ctx.invoked_with) # Return to not raise the exception return diff --git a/config-default.yml b/config-default.yml index 1ff4b06f0..f8368c5d2 100644 --- a/config-default.yml +++ b/config-default.yml @@ -190,6 +190,8 @@ guild: mods: &MODS 305126844661760000 mod_alerts: 473092532147060736 mod_spam: &MOD_SPAM 620607373828030464 + mod_tools: &MOD_TOOLS 775413915391098921 + mod_meta: &MOD_META 775412552795947058 organisation: &ORGANISATION 551789653284356126 staff_lounge: &STAFF_LOUNGE 464905259261755392 duck_pond: &DUCK_POND 637820308341915648 @@ -223,6 +225,8 @@ guild: moderation_channels: - *ADMINS - *ADMIN_SPAM + - *MOD_META + - *MOD_TOOLS - *MODS - *MOD_SPAM |