From 543b2ae88c82fd5558785cee224680ff0285c7ad Mon Sep 17 00:00:00 2001 From: Daniel Brown Date: Mon, 7 Jan 2019 13:04:09 -0600 Subject: Corrected the delete_reminder() method to use the correct _delete_reminder method(). Signed-off-by: Daniel Brown --- bot/cogs/reminders.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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): -- cgit v1.2.3 From 623923780bd5bb2aa1c9624e27faa20229c150a7 Mon Sep 17 00:00:00 2001 From: sco1 Date: Tue, 8 Jan 2019 13:40:04 -0500 Subject: Add RLBot to server whitelist Yay partners! --- config-default.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/config-default.yml b/config-default.yml index ad87e44ac..4f4c79fa1 100644 --- a/config-default.yml +++ b/config-default.yml @@ -154,6 +154,7 @@ filter: - 267624335836053506 # Python Discord - 440186186024222721 # Python Discord: ModLog Emojis - 273944235143593984 # STEM + - 348658686962696195 # RLBot domain_blacklist: - pornhub.com -- cgit v1.2.3 From e9134a769b39e2cad58d03193d139760d3840bd7 Mon Sep 17 00:00:00 2001 From: sco1 Date: Tue, 8 Jan 2019 13:59:41 -0500 Subject: Add Pallets to server whitelist Yay partners! --- config-default.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/config-default.yml b/config-default.yml index 4f4c79fa1..a51d00778 100644 --- a/config-default.yml +++ b/config-default.yml @@ -155,6 +155,7 @@ filter: - 440186186024222721 # Python Discord: ModLog Emojis - 273944235143593984 # STEM - 348658686962696195 # RLBot + - 531221516914917387 # Pallets domain_blacklist: - pornhub.com -- cgit v1.2.3 From e61a818b394a40185b934d67fe7a2a943edf81fc Mon Sep 17 00:00:00 2001 From: SebastiaanZ <33516116+SebastiaanZ@users.noreply.github.com> Date: Wed, 9 Jan 2019 19:05:06 +0100 Subject: Patch to make \!help work outside of #bot-commands again. We should look into a proper rewrite later. --- bot/cogs/help.py | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) 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: -- cgit v1.2.3