diff options
| author |  Chris Goes <[email protected]> | 2019-01-09 21:22:49 -0700 |
|---|---|---|
| committer |  GitHub <[email protected]> | 2019-01-09 21:22:49 -0700 |
| commit | 7d0e6450b03145d97f6b702861896395e939beef (patch) | |
| tree | fceaf287c1e6511fb951fb1a2135322075f9a7a0 | |
| parent | Deleting unnecessary additional line (diff) | |
| parent | Merge pull request #263 from python-discord/help-command-patch (diff) | |
Merge branch 'master' into SebastiaanZ/embed-detection-filter
| -rw-r--r-- | bot/cogs/help.py | 12 | ||||
| -rw-r--r-- | bot/cogs/reminders.py | 2 | ||||
| -rw-r--r-- | config-default.yml | 2 |
3 files changed, 14 insertions, 2 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: diff --git a/bot/cogs/reminders.py b/bot/cogs/reminders.py index f6ed111dc..ddf5cc1f3 100644 --- a/bot/cogs/reminders.py +++ b/bot/cogs/reminders.py @@ -398,7 +398,7 @@ class Reminders(Scheduler): ) if not failed: - self.cancel_reminder(response_data["reminder_id"]) + await self._delete_reminder(response_data["reminder_id"]) def setup(bot: Bot): diff --git a/config-default.yml b/config-default.yml index ad3487c78..21d7f20b9 100644 --- a/config-default.yml +++ b/config-default.yml @@ -156,6 +156,8 @@ filter: - 267624335836053506 # Python Discord - 440186186024222721 # Python Discord: ModLog Emojis - 273944235143593984 # STEM + - 348658686962696195 # RLBot + - 531221516914917387 # Pallets domain_blacklist: - pornhub.com |