discord: Use on_raw_reaction_add to avoid missing events for messages that aren't cached

Author: OatmealDome

chat_bridge/discord.py

@@ -5,7 +5,7 @@
 
 from pypeul import Tags
 
-from discord import Client, Intents, TextChannel, MessageType
+from discord import Client, Intents, TextChannel, MessageType, NotFound
 
 import asyncio
 import logging
@@ -42,11 +42,36 @@ async def on_raw_message_edit(self, payload):
         evt = events.DiscordMessageEdit(payload.message, self.user)
         events.dispatcher.dispatch("discord", evt)
 
-    async def on_reaction_add(self, reaction, user):
-        if reaction.message.channel.id != self.cfg.channel:
+    async def on_raw_reaction_add(self, payload):
+        if payload.channel_id != self.cfg.channel:
             return
 
-        evt = events.DiscordReactionAdd(reaction, user, self.user)
+        channel = self.get_channel(payload.channel_id)
+        if not channel:
+            logging.error(
+                "Channel %s not found in on_raw_reaction_add", payload.channel_id
+            )
+            return
+
+        try:
+            message = await channel.fetch_message(payload.message_id)
+        except NotFound:
+            logging.error(
+                "Message %s not found in on_raw_reaction_add", payload.message_id
+            )
+            return
+
+        user = payload.member
+        if not user:
+            try:
+                user = await self.fetch_user(payload.user_id)
+            except NotFound:
+                logging.error(
+                    "User %s not found in on_raw_reaction_add", payload.user_id
+                )
+                return
+
+        evt = events.DiscordReactionAdd(message, payload.emoji, user, self.user)
         events.dispatcher.dispatch("discord", evt)
 
     def format_irc_message(self, msg):

chat_bridge/events.py

@@ -91,6 +91,9 @@ def DiscordMessageEdit(msg: discord.Message, bot_user: discord.User):
 
 @event("discord_reaction_add")
 def DiscordReactionAdd(
-    reaction: discord.Reaction, user: discord.User, bot_user: discord.User
+    message: discord.Message,
+    emoji: discord.PartialEmoji,
+    user: discord.User,
+    bot_user: discord.User,
 ):
-    return {"reaction": reaction, "user": user, "bot_user": bot_user}
+    return {"message": message, "emoji": emoji, "user": user, "bot_user": bot_user}

chat_bridge/ircclient.py

@@ -188,18 +188,16 @@ def emoji_replacement_callback(match):
         for sticker in msg.stickers:
             self.message(self.cfg.channel, 'Sticker - "%s"' % sticker.name)
 
-    def relay_discord_reaction_add(self, reaction, user, bot_user):
-        if isinstance(reaction.emoji, str):
-            emoji = reaction.emoji
+    def relay_discord_reaction_add(self, message, emoji, user, bot_user):
+        if emoji.is_custom_emoji():
+            emoji_text = "custom emoji %s" % emoji.name
         else:
-            emoji = "custom emoji %s" % reaction.emoji.name
+            emoji_text = emoji.name
 
         text = "%s reacted with %s to a message by %s" % (
             Tags.Bold(self.sanitize_name(user.name)),
-            emoji,
-            Tags.Bold(
-                self.extract_sender_from_discord_message(reaction.message, bot_user)
-            ),
+            emoji_text,
+            Tags.Bold(self.extract_sender_from_discord_message(message, bot_user)),
         )
         self.message(self.cfg.channel, text)
 
@@ -243,7 +241,7 @@ def run(self):
                 self.bot.relay_discord_message(evt.msg, evt.bot_user, edited=True)
             elif evt.type == events.DiscordReactionAdd.TYPE:
                 self.bot.relay_discord_reaction_add(
-                    evt.reaction, evt.user, evt.bot_user
+                    evt.message, evt.emoji, evt.user, evt.bot_user
                 )
             else:
                 logging.error("Got unknown event for irc: %r" % evt.type)