Support custom joys

chiya/cogs/listeners/joyboard.py

@@ -16,17 +16,17 @@
 
 class Joyboard(commands.Cog):
 
-    JOYS = ("😂", "😹", ":joy_pride:984917004928569355", ":joy_tone1:984912210172194906", ":joy_tone5:974633464655654922", ":joy_logga:1028828971384709171")
+    JOYS = ("😂", "😹", "joy_pride", "joy_tone1", "joy_tone5", "joy_logga")
 
     def __init__(self, bot: commands.Bot) -> None:
         self.bot = bot
         self.cache = {"add": set(), "remove": set()}
 
-
     def generate_color(self, joy_count: int) -> int:
         """
-        Hue, saturation, and value is divided by 360, 100, 100 respectively because it is using the fourth coordinate group
-        described in https://en.wikipedia.org/wiki/Wikipedia:WikiProject_Color/Normalized_Color_Coordinates#HSV_coordinates.
+        Hue, saturation, and value is divided by 360, 100, 100 respectively because it is using the
+        fourth coordinate group described in
+        https://en.wikipedia.org/wiki/Wikipedia:WikiProject_Color/Normalized_Color_Coordinates#HSV_coordinates.
         """
         if joy_count <= 5:
             saturation = 0.4
@@ -37,10 +37,10 @@ def generate_color(self, joy_count: int) -> int:
 
         return discord.Color.from_hsv(48 / 360, saturation, 1).value
 
-    async def get_joy_count(self, message: discord.Message, joys: tuple) -> int:
+    async def get_joy_count(self, message: discord.Message) -> int:
         unique_users = set()
         for reaction in message.reactions:
-            if reaction.emoji not in joys:
+            if not self.check_emoji(reaction.emoji, message.guild.id):
                 continue
 
             async for user in reaction.users():
@@ -49,6 +49,19 @@ async def get_joy_count(self, message: discord.Message, joys: tuple) -> int:
 
         return len(unique_users)
 
+    def check_emoji(self, emoji: discord.PartialEmoji, guild_id: int):
+
+        if emoji.is_custom_emoji():
+            guild = self.bot.get_guild(guild_id)
+            if not guild:
+                return False
+
+            global_emoji = discord.utils.get(guild.emojis, id=emoji.id)
+            if not global_emoji:
+                return False
+
+        return emoji.name in self.JOYS
+
     @commands.Cog.listener()
     async def on_raw_reaction_add(self, payload: discord.RawReactionActionEvent) -> None:
         """
@@ -58,12 +71,12 @@ async def on_raw_reaction_add(self, payload: discord.RawReactionActionEvent) ->
         Implements a cache to prevent race condition where if multiple joys were reacted on a message after it hits the
         joy threshold and the IDs were not written to the database quickly enough, a duplicated joy embed would be sent.
         """
-        if payload.emoji.name not in self.JOYS:
+        if not self.check_emoji(payload.emoji, payload.guild_id):
             return
 
         channel = self.bot.get_channel(payload.channel_id)
         message = await channel.fetch_message(payload.message_id)
-        joy_count = await self.get_joy_count(message, self.JOYS)
+        joy_count = await self.get_joy_count(message)
         cache_data = (payload.message_id, payload.channel_id)
 
         if (
@@ -158,12 +171,12 @@ async def on_raw_reaction_add(self, payload: discord.RawReactionActionEvent) ->
     @commands.Cog.listener()
     async def on_raw_reaction_remove(self, payload: discord.RawReactionActionEvent) -> None:
         """
-        Update the joy count in the embed if the joys were reacted. Delete joy embed if the joy count is below threshold.
+        Update the joy count in the embed if the joys were reacted. Delete joy embed if the joy count is below threshold
         """
         cache_data = (payload.message_id, payload.channel_id)
 
         if (
-            payload.emoji.name not in self.JOYS
+            not self.check_emoji(payload.emoji, payload.guild_id)
             or cache_data in self.cache["remove"]
         ):
             return
@@ -187,7 +200,7 @@ async def on_raw_reaction_remove(self, payload: discord.RawReactionActionEvent)
             self.cache["remove"].remove(cache_data)
             return db.close()
 
-        joy_count = await self.get_joy_count(message, self.JOYS)
+        joy_count = await self.get_joy_count(message)
 
         if joy_count < config["channels"]["joyboard"]["joy_limit"]:
             db["joyboard"].delete(channel_id=payload.channel_id, message_id=payload.message_id)