Skip to content

Commit

Permalink
Fix handling of deleted subscribed messages
Browse files Browse the repository at this point in the history
  • Loading branch information
raccube committed Sep 3, 2024
1 parent b12c959 commit dba5caa
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions src/sr/discord_bot/bot.py
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

0 comments on commit dba5caa

Please sign in to comment.