Merge pull request #118 from python-discord/suppress-404-on-msg-delete

Suppress not found errors on reaction clear

bot/exts/games.py

@@ -1,4 +1,5 @@
 import asyncio
+import contextlib
 import enum
 import random
 import textwrap
@@ -8,6 +9,7 @@
 
 import arrow
 import discord
+import discord.errors
 from async_rediscache import RedisCache
 from discord.ext import commands, tasks
 from discord.ext.commands import BadArgument
@@ -150,7 +152,10 @@ async def on_message(self, msg: discord.Message) -> None:
 
         await asyncio.sleep(self.event_uptime)
 
-        await msg.clear_reaction(self.chosen_team.value.emoji)
+        # If the message was deleted in the meantime, the
+        # reaction is gone either way. Continue with cleanup.
+        with contextlib.suppress(discord.errors.NotFound):
+            await msg.clear_reaction(self.chosen_team.value.emoji)
         self.team_game_message_id = self.chosen_team = None
         self.team_game_users_already_reacted.clear()