aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar MarkKoz <[email protected]>2020-08-15 18:45:32 -0700
committerGravatar MarkKoz <[email protected]>2020-08-15 19:24:17 -0700
commit1ff8559dda1caa9c8479da5d371ff96aa4797e7c (patch)
tree57fc4aab9cf41ce94e7e50d04c0e813657ff5f98
parentSilence: revoke permissions to add reactions (diff)
Silence: abort silence if there's already a scheduled task
Overwrites can be edited during a silence, which can result in the overwrites check failing. Checking the scheduler too ensures that a duplicate silence won't be scheduled.
-rw-r--r--bot/cogs/moderation/silence.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/bot/cogs/moderation/silence.py b/bot/cogs/moderation/silence.py
index 0f3c98306..0f64301c4 100644
--- a/bot/cogs/moderation/silence.py
+++ b/bot/cogs/moderation/silence.py
@@ -126,7 +126,7 @@ class Silence(commands.Cog):
overwrite = channel.overwrites_for(self._verified_role)
prev_overwrites = dict(send_messages=overwrite.send_messages, add_reactions=overwrite.add_reactions)
- if all(val is False for val in prev_overwrites.values()):
+ if channel.id in self.scheduler or all(val is False for val in prev_overwrites.values()):
log.info(f"Tried to silence channel #{channel} ({channel.id}) but the channel was already silenced.")
return False