diff options
| author | 2021-08-07 16:03:41 -0700 | |
|---|---|---|
| committer | 2021-08-07 16:10:01 -0700 | |
| commit | dde617e19e570df2a6a57b36679b307cda496217 (patch) | |
| tree | b08fa322b5434ae1d65655586d51ec174043a7db | |
| parent | Code block: catch 404s when editing or deleting the message (diff) | |
Duck pond: abort if reaction's message or author can't be found
Fixes BOT-1J7
| -rw-r--r-- | bot/exts/fun/duck_pond.py | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/bot/exts/fun/duck_pond.py b/bot/exts/fun/duck_pond.py index c78b9c141..d02912545 100644 --- a/bot/exts/fun/duck_pond.py +++ b/bot/exts/fun/duck_pond.py @@ -171,8 +171,14 @@ class DuckPond(Cog): if not self.is_helper_viewable(channel): return - message = await channel.fetch_message(payload.message_id) + try: + message = await channel.fetch_message(payload.message_id) + except discord.NotFound: + return # Message was deleted. + member = discord.utils.get(message.guild.members, id=payload.user_id) + if not member: + return # Member left or wasn't in the cache. # Was the message sent by a human staff member? if not self.is_staff(message.author) or message.author.bot: |