diff options
| author |  Xithrius <[email protected]> | 2021-02-01 11:35:34 -0800 |
|---|---|---|
| committer |  GitHub <[email protected]> | 2021-02-01 11:35:34 -0800 |
| commit | 90f4293f33a5037cff6c6bfe041fa3cb9015a6f0 (patch) | |
| tree | 05fbafed1e928005d2eab9cd78fb297f17b8e7fc | |
| parent | Protect against overflows caused by large expirations (diff) | |
| parent | Make sure that restrictions also applies to moderators (diff) | |
Merge branch 'master' into Handle-OverflowErrors
| -rw-r--r-- | bot/utils/messages.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/bot/utils/messages.py b/bot/utils/messages.py index 832ad4d55..077dd9569 100644 --- a/bot/utils/messages.py +++ b/bot/utils/messages.py @@ -48,8 +48,10 @@ async def wait_for_deletion( return ( reaction.message.id == message.id and str(reaction.emoji) in deletion_emojis - and user.id in user_ids - or allow_moderation_roles and any(role.id in MODERATION_ROLES for role in user.roles) + and ( + user.id in user_ids + or allow_moderation_roles and any(role.id in MODERATION_ROLES for role in user.roles) + ) ) with contextlib.suppress(asyncio.TimeoutError): |