Skip to content
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

Fix handling of deleted subscribed messages #36

Merged
merged 1 commit into from
Sep 3, 2024
Merged

Fix handling of deleted subscribed messages #36

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 4 additions & 2 deletions src/sr/discord_bot/bot.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,12 +259,14 @@ async def remove_subscribed_message(self, msg: SubscribedMessage) -> None:
if not hasattr(msg_channel, 'fetch_message'):
# ignore for channels that don't support message editing
return
message = await msg_channel.fetch_message(msg.message_id)

if message: # message may have already been deleted manually
try:
message = await msg_channel.fetch_message(msg.message_id)
chan_name = message.channel.name if hasattr(message.channel, 'name') else 'unknown channel'
self.logger.info(f'Removing message in {chan_name} from {message.author.name}')
await message.delete() # remove message from discord
except discord.errors.NotFound:
self.logger.info(f"Message #{msg.message_id} doesn't exist, removing from subscribed messages")

# remove message from subscription list and save to file
self.subscribed_messages.remove(msg)
Expand Down
Loading