feat:(bookmarks) added removing bookmarks

tux/cogs/services/bookmarks.py

@@ -13,6 +13,16 @@ class Bookmarks(commands.Cog):
     def __init__(self, bot: Tux) -> None:
         self.bot = bot
 
+        self.valid_add_emojis = CONST.ADD_BOOKMARK
+        self.valid_remove_emojis = CONST.REMOVE_BOOKMARK
+        self.valid_emojis = CONST.ADD_BOOKMARK + CONST.REMOVE_BOOKMARK
+
+    # The linter wants to change this but it breaks when it does that
+    def _is_valid_emoji(self, emoji: discord.PartialEmoji, valid_list: str) -> bool:
+        if emoji.name in valid_list:  # noqa: SIM103
+            return True
+        return False
+
     @commands.Cog.listener()
     async def on_raw_reaction_add(self, payload: discord.RawReactionActionEvent) -> None:
         """
@@ -27,15 +37,30 @@ async def on_raw_reaction_add(self, payload: discord.RawReactionActionEvent) ->
         -------
         None
         """
-
-        if str(payload.emoji) != "🔖":
+        if not self._is_valid_emoji(payload.emoji, self.valid_emojis):
             return
 
+        # Get the user who reacted to the message
+        user = self.bot.get_user(payload.user_id)
+        if user is None:
+            try:
+                user = await self.bot.fetch_user(payload.user_id)
+            except discord.NotFound:
+                logger.error(f"User not found for ID: {payload.user_id}")
+            except (discord.Forbidden, discord.HTTPException) as fetch_error:
+                logger.error(f"Failed to fetch user: {fetch_error}")
+            return
         # Fetch the channel where the reaction was added
         channel = self.bot.get_channel(payload.channel_id)
         if channel is None:
-            logger.error(f"Channel not found for ID: {payload.channel_id}")
+            try:
+                channel = await self.bot.fetch_channel(payload.channel_id)
+            except discord.NotFound:
+                logger.error(f"Channel not found for ID: {payload.channel_id}")
+            except (discord.Forbidden, discord.HTTPException) as fetch_error:
+                logger.error(f"Failed to fetch channel: {fetch_error}")
             return
+
         channel = cast(discord.TextChannel | discord.Thread, channel)
 
         # Fetch the message that was reacted to
@@ -48,19 +73,20 @@ async def on_raw_reaction_add(self, payload: discord.RawReactionActionEvent) ->
             logger.error(f"Failed to fetch message: {fetch_error}")
             return
 
-        # Create an embed for the bookmarked message
-        embed = self._create_bookmark_embed(message)
+        # check for what to do
+        if self._is_valid_emoji(payload.emoji, self.valid_add_emojis):
+            # Create an embed for the bookmarked message
+            embed = await self._create_bookmark_embed(message)
 
-        # Get the user who reacted to the message
-        user = self.bot.get_user(payload.user_id)
-        if user is None:
-            logger.error(f"User not found for ID: {payload.user_id}")
-            return
+            # Send the bookmarked message to the user
+            await self._send_bookmark(user, message, embed, payload.emoji)
 
-        # Send the bookmarked message to the user
-        await self._send_bookmark(user, message, embed, payload.emoji)
+        elif self._is_valid_emoji(payload.emoji, self.valid_remove_emojis) and user is not self.bot.user:
+            await self._delete_bookmark(message, user)
+        else:
+            return
 
-    def _create_bookmark_embed(
+    async def _create_bookmark_embed(
         self,
         message: discord.Message,
     ) -> discord.Embed:
@@ -77,13 +103,16 @@ def _create_bookmark_embed(
         embed.add_field(name="Author", value=message.author.name, inline=False)
 
         embed.add_field(name="Jump to Message", value=f"[Click Here]({message.jump_url})", inline=False)
-
         if message.attachments:
             attachments_info = "\n".join([attachment.url for attachment in message.attachments])
             embed.add_field(name="Attachments", value=attachments_info, inline=False)
-
         return embed
 
+    async def _delete_bookmark(self, message: discord.Message, user: discord.User) -> None:
+        if message.author is not self.bot.user:
+            return
+        await message.delete()
+
     @staticmethod
     async def _send_bookmark(
         user: discord.User,
@@ -107,7 +136,8 @@ async def _send_bookmark(
         """
 
         try:
-            await user.send(embed=embed)
+            dm_message = await user.send(embed=embed)
+            await dm_message.add_reaction(CONST.REMOVE_BOOKMARK)
 
         except (discord.Forbidden, discord.HTTPException) as dm_error:
             logger.error(f"Cannot send a DM to {user.name}: {dm_error}")

tux/cogs/utility/poll.py

@@ -1,3 +1,5 @@
+from typing import cast
+
 import discord
 from discord import app_commands
 from discord.ext import commands
@@ -74,13 +76,15 @@ async def on_raw_reaction_add(self, payload: discord.RawReactionActionEvent) ->
         # get reaction from payload.message_id, payload.channel_id, payload.guild_id, payload.emoji
         channel = self.bot.get_channel(payload.channel_id)
         if channel is None:
-            logger.error(f"Channel with ID {payload.channel_id} not found.")
-            return
-        if isinstance(channel, discord.ForumChannel | discord.CategoryChannel | discord.abc.PrivateChannel):
-            logger.error(
-                f"Channel with ID {payload.channel_id} is not a compatible channel type. How the fuck did you get here?",
-            )
-            return
+            try:
+                channel = await self.bot.fetch_channel(payload.channel_id)
+            except discord.NotFound:
+                logger.error(f"Channel not found for ID: {payload.channel_id}")
+                return
+            except (discord.Forbidden, discord.HTTPException) as fetch_error:
+                logger.error(f"Failed to fetch channel: {fetch_error}")
+                return
+        channel = cast(discord.TextChannel | discord.Thread, channel)
 
         message = await channel.fetch_message(payload.message_id)
         # Lookup the reaction object for this event

tux/utils/constants.py

@@ -73,5 +73,9 @@ class Constants:
     EIGHT_BALL_QUESTION_LENGTH_LIMIT = 120
     EIGHT_BALL_RESPONSE_WRAP_WIDTH = 30
 
+    # Bookmark constants
+    ADD_BOOKMARK = "🔖"
+    REMOVE_BOOKMARK = "🗑️"
+
 
 CONST = Constants()