Auto close limbo open threads

Author: Taaku18

CHANGELOG.md

@@ -21,6 +21,7 @@ however, insignificant breaking changes does not guarantee a major version bump,
     - This config takes precedence over `reply_without_command`.
 - `?logs responded [user]` command, it will show all logs that the user has sent an reply. (Thanks to papiersnipper PR#288)
   - `user` when not provided, defaults to the user who ran the command.
+- Open threads in limbo now auto closes if the channel cannot be found. This check is done every time the bot restarts.
 
 ### Changed
 

bot.py

@@ -502,6 +502,29 @@ async def on_ready(self):
                 auto_close=items.get("auto_close", False),
             )
 
+        for log in await self.api.get_open_logs():
+            if self.get_channel(int(log['channel_id'])) is None:
+                logger.debug("Unable to resolve thread with channel %s.", log['channel_id'])
+                log_data = await self.api.post_log(
+                    log['channel_id'],
+                    {
+                        "open": False,
+                        "closed_at": str(datetime.utcnow()),
+                        "close_message": "Channel has been deleted, no closer found.",
+                        "closer": {
+                            "id": str(self.user.id),
+                            "name": self.user.name,
+                            "discriminator": self.user.discriminator,
+                            "avatar_url": str(self.user.avatar_url),
+                            "mod": True,
+                        },
+                    },
+                )
+                if log_data:
+                    logger.debug("Successfully closed thread with channel %s.", log['channel_id'])
+                else:
+                    logger.debug("Failed to close thread with channel %s, skipping.", log['channel_id'])
+
         self.metadata_loop = tasks.Loop(
             self.post_metadata,
             seconds=0,

core/clients.py

@@ -93,21 +93,23 @@ async def get_user_logs(self, user_id: Union[str, int]) -> list:
         return await self.logs.find(query, projection).to_list(None)
 
     async def get_responded_logs(self, user_id: Union[str, int]) -> list:
-        entries = []
-        async for l in self.bot.db.logs.find(
-            {
-                "open": False,
-                "messages": {
-                    "$elemMatch": {
-                        "author.id": str(user_id),
-                        "author.mod": True,
-                        "type": {"$in": ["anonymous", "thread_message"]},
-                    }
-                },
-            }
-        ):
-            entries.append(l)
-        return entries
+        query = {
+            "open": False,
+            "messages": {
+                "$elemMatch": {
+                    "author.id": str(user_id),
+                    "author.mod": True,
+                    "type": {"$in": ["anonymous", "thread_message"]},
+                }
+            },
+        }
+        return await self.logs.find(query).to_list(None)
+
+    async def get_open_logs(self) -> list:
+        query = {
+            "open": True
+        }
+        return await self.logs.find(query).to_list(None)
 
     async def get_log(self, channel_id: Union[str, int]) -> dict:
         logger.debug("Retrieving channel %s logs.", channel_id)

core/thread.py

@@ -762,8 +762,9 @@ async def send(
 
         if delete_message:
             try:
-                await message.delete()
-            except discord.HTTPException:
+                if isinstance(message.channel, discord.TextChannel):
+                    await message.delete()
+            except Exception:
                 logger.warning('Cannot delete message.', exc_info=True)
         return msg