Ensure that solved or locked help threads are never auto-deleted in 'helpforums_pre' extension

Author: Mega-JC

pcbot/exts/anti_crosspost.py

@@ -261,11 +261,14 @@ async def on_message(self, message: discord.Message):
                             f"Found crosspost for user {message.author.name}, message URL {message.jump_url}!!!!!!!!!!"
                         )
                         alert_channel = cast(MessageableGuildChannel, message.channel)
-                        if self.exclude_alert_channel_ids and not await self._check_channel(
-                            alert_channel, deny=self.exclude_alert_channel_ids
+                        if (
+                            self.exclude_alert_channel_ids
+                            and not await self._check_channel(
+                                alert_channel, deny=self.exclude_alert_channel_ids
+                            )
                         ):
                             # Attempt to find the next best channel to alert in
-                            print( [ msg.content for msg in messages[:-1] ])
+                            print([msg.content for msg in messages[:-1]])
                             for message in reversed(messages[:-1]):
                                 alert_channel = cast(
                                     MessageableGuildChannel, message.channel
@@ -279,7 +282,7 @@ async def on_message(self, message: discord.Message):
                                     f"No allowed alerting channel for user {message.author.name} found"
                                 )
                                 break  # Don't issue an alert if not possible
-                        
+
                         if message.id in user_cache["message_to_alert_map"]:
                             logger.debug(
                                 f"Message {message.id} is already being alerted for user {message.author.name}"

pcbot/exts/helpforums_pre/cogs.py

@@ -761,7 +761,16 @@ async def on_raw_member_remove(self, payload: discord.RawMemberRemoveEvent):
                 forum_channel.threads,
                 [thr async for thr in forum_channel.archived_threads(limit=20)],
             ):
-                if help_thread.owner_id == payload.user.id:
+                if (
+                    help_thread.owner_id == payload.user.id
+                    and not (
+                        help_thread.locked
+                        or any(
+                            tag.name.lower() in ("solved", "invalid")
+                            for tag in help_thread.applied_tags
+                        )
+                    )
+                ):
                     snakecore.utils.hold_task(
                         asyncio.create_task(
                             self.help_thread_deletion_below_size_threshold(
@@ -800,7 +809,12 @@ async def on_raw_message_delete(self, payload: discord.RawMessageDeleteEvent):
         ):
             return
 
-        if not thread.locked:
+        if not (
+            thread.locked
+            or any(
+                tag.name.lower() in ("solved", "invalid") for tag in thread.applied_tags
+            )
+        ):
             await self.help_thread_deletion_below_size_threshold(
                 thread,
                 300,