Merge branch 'master' of https://github.com/python-discord/bot

1 files changed, 11 insertions, 1 deletions

diff --git a/bot/cogs/help.py b/bot/cogs/help.py
index d30ff0dfb..c82a25417 100644
--- a/bot/cogs/help.py
+++ b/bot/cogs/help.py
@@ -9,11 +9,13 @@ from discord.ext import commands
 from fuzzywuzzy import fuzz, process
 
 from bot import constants
+from bot.decorators import InChannelCheckFailure
 from bot.pagination import (
     DELETE_EMOJI, FIRST_EMOJI, LAST_EMOJI,
     LEFT_EMOJI, LinePaginator, RIGHT_EMOJI,
 )
 
+
 REACTIONS = {
     FIRST_EMOJI: 'first',
     LEFT_EMOJI: 'back',
@@ -427,7 +429,15 @@ class HelpSession:
 
                     # see if the user can run the command
                     strikeout = ''
-                    can_run = await command.can_run(self._ctx)
+
+                    # Patch to make the !help command work outside of #bot-commands again
+                    # This probably needs a proper rewrite, but this will make it work in
+                    # the mean time.
+                    try:
+                        can_run = await command.can_run(self._ctx)
+                    except InChannelCheckFailure:
+                        can_run = False
+
                     if not can_run:
                         # skip if we don't show commands they can't run
                         if self._only_can_run: