Skip to content

fix: Ensure the bookmarks service will only delete messages in DMs #979

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 26, 2025
Merged

fix: Ensure the bookmarks service will only delete messages in DMs #979

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0a4afc9
fix: Prevents tux from deleting messages outside of DMs
meatharvester Jul 26, 2025
79f4e47
fix: added a additional check for saftey
meatharvester Jul 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions tux/cogs/services/bookmarks.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,8 +73,12 @@ async def on_raw_reaction_add(self, payload: discord.RawReactionActionEvent) ->
if payload.emoji.name in self.add_bookmark_emojis:
await self.add_bookmark(user, message)

# If the emoji is the remove bookmark emoji, remove the bookmark
elif payload.emoji.name in self.remove_bookmark_emojis:
# Ensures were in a users DMs before removing (to fix an issue with being able to remove messages anywhere)
if not isinstance(channel, discord.DMChannel):
return

# If the emoji is the remove bookmark emoji and reaction is on the bot, remove the bookmark
if payload.emoji.name in self.remove_bookmark_emojis and message.author is self.bot.user:
await self.remove_bookmark(message)

async def add_bookmark(self, user: discord.User, message: discord.Message) -> None:
Expand Down