From dba5caa5e25a53fe49d931a542cbb11857bbc495 Mon Sep 17 00:00:00 2001 From: "Karina J. Kwiatek" Date: Tue, 3 Sep 2024 22:37:25 +0200 Subject: [PATCH] Fix handling of deleted subscribed messages --- src/sr/discord_bot/bot.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/sr/discord_bot/bot.py b/src/sr/discord_bot/bot.py index 69adfe4..9d2c3c5 100644 --- a/src/sr/discord_bot/bot.py +++ b/src/sr/discord_bot/bot.py @@ -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)