fix: escape mentions on unsnooze

Author: lorenzo132

core/config.py

@@ -143,6 +143,9 @@ class ConfigManager:
         # snooze behavior
         "snooze_behavior": "delete",  # 'delete' to delete channel, 'move' to move channel to snoozed_category_id
         "snoozed_category_id": None,  # Category ID to move snoozed channels into when snooze_behavior == 'move'
+        # attachments persistence for delete-behavior snooze
+        "snooze_store_attachments": False,  # when True, store image attachments as base64 in snooze_data
+        "snooze_attachment_max_bytes": 4_194_304,  # 4 MiB per attachment cap to avoid Mongo 16MB limit
     }
 
     private_keys = {
@@ -242,6 +245,8 @@ class ConfigManager:
         "use_hoisted_top_role",
         "enable_presence_intent",
         "registry_plugins_only",
+        # snooze
+        "snooze_store_attachments",
     }
 
     enums = {

core/config_help.json

@@ -1345,5 +1345,29 @@
       "Only used when `snooze_behavior` is 'move'.",
       "If not set or invalid, the channel will remain in its current category or the bot will fall back to deleting on failure."
     ]
+  },
+  "snooze_store_attachments": {
+    "default": "No",
+    "description": "When enabled and `snooze_behavior` is 'delete', image attachments are stored as base64 within the snooze data so they can be re-uploaded on unsnooze, preserving media even if the original channel was deleted.",
+    "examples": [
+      "`{prefix}config set snooze_store_attachments yes`",
+      "`{prefix}config set snooze_store_attachments no`"
+    ],
+    "notes": [
+      "Only applies to delete-behavior snoozes. In move-behavior, attachments remain in the channel history.",
+      "To avoid exceeding Mongo's 16MB document size, consider also adjusting `snooze_attachment_max_bytes`."
+    ]
+  },
+  "snooze_attachment_max_bytes": {
+    "default": "4194304 (4 MiB)",
+    "description": "Maximum size per attachment to store as base64 when `snooze_store_attachments` is enabled.",
+    "examples": [
+      "`{prefix}config set snooze_attachment_max_bytes 2097152` (2 MiB)",
+      "`{prefix}config set snooze_attachment_max_bytes 0` (disable size check; not recommended)"
+    ],
+    "notes": [
+      "This cap helps prevent hitting MongoDB's 16MB per-document limit when storing large attachments.",
+      "Non-image files are not stored as base64 and will be preserved as their original URLs if available."
+    ]
   }
 }

core/thread.py

@@ -1,6 +1,6 @@
 import asyncio
-import base64
 import copy
+import base64
 import functools
 import io
 import re
@@ -431,6 +431,14 @@ async def restore_from_snooze(self):
                                 else None
                             ),
                         )
+                        # If there were attachment URLs, include them as a field so mods can access them
+                        if attachments:
+                            try:
+                                embeds[0].add_field(
+                                    name="Attachments", value="\n".join(attachments), inline=False
+                                )
+                            except Exception:
+                                pass
                         await channel.send(embeds=embeds, allowed_mentions=discord.AllowedMentions.none())
                     else:
                         # Build a non-empty message; include attachment URLs if no content
@@ -444,7 +452,9 @@ async def restore_from_snooze(self):
                         await channel.send(formatted, allowed_mentions=discord.AllowedMentions.none())
                 else:
                     # Recipient message: include attachment URLs if content is empty
-                    content_to_send = content if content else ("\n".join(attachments) if attachments else None)
+                    content_to_send = (
+                        content if content else ("\n".join(attachments) if attachments else None)
+                    )
                     await channel.send(
                         content=content_to_send,
                         embeds=embeds or None,
@@ -480,9 +490,7 @@ async def restore_from_snooze(self):
         notify_channel = self.bot.config.get("unsnooze_notify_channel") or "thread"
         notify_text = self.bot.config.get("unsnooze_text") or "This thread has been unsnoozed and restored."
         if notify_channel == "thread":
-            await channel.send(
-                notify_text, allowed_mentions=discord.AllowedMentions.none()
-            )
+            await channel.send(notify_text, allowed_mentions=discord.AllowedMentions.none())
         else:
             ch = self.bot.get_channel(int(notify_channel))
             if ch:
@@ -1720,32 +1728,33 @@ def lottie_to_png(data):
 
         if plain:
             if from_mod and not isinstance(destination, discord.TextChannel):
-                # Plain to user
+                # Plain to user (DM)
                 with warnings.catch_warnings():
-                    # Catch coroutines not awaited warning
                     warnings.simplefilter("ignore")
                     additional_images = []
 
-                if embed.footer.text:
-                    plain_message = f"**{embed.footer.text} "
-                else:
-                    plain_message = "**"
-                plain_message += f"{embed.author.name}:** {embed.description}"
+                prefix = f"**{embed.footer.text} " if embed.footer and embed.footer.text else "**"
+                body = embed.description or ""
+                plain_message = f"{prefix}{embed.author.name}:** {body}"
+
                 files = []
-                for i in message.attachments:
-                    files.append(await i.to_file())
+                for att in message.attachments:
+                    try:
+                        files.append(await att.to_file())
+                    except Exception:
+                        logger.warning("Failed to attach file in plain DM.", exc_info=True)
 
-                msg = await destination.send(plain_message, files=files)
+                msg = await destination.send(plain_message, files=files or None)
             else:
                 # Plain to mods
-                embed.set_footer(text="[PLAIN] " + embed.footer.text)
+                footer_text = embed.footer.text if embed.footer else ""
+                embed.set_footer(text=f"[PLAIN] {footer_text}".strip())
                 msg = await destination.send(mentions, embed=embed)
 
         else:
             try:
                 msg = await destination.send(mentions, embed=embed)
             except discord.NotFound:
-                # If channel vanished right before send, try to restore and resend once
                 if (
                     isinstance(destination, discord.TextChannel)
                     and (self.snoozed or self.snooze_data)
@@ -1768,16 +1777,19 @@ def lottie_to_png(data):
 
     async def get_notifications(self) -> str:
         key = str(self.id)
-
-        mentions = []
-        mentions.extend(self.bot.config["subscriptions"].get(key, []))
-
-        if key in self.bot.config["notification_squad"]:
-            mentions.extend(self.bot.config["notification_squad"][key])
-            self.bot.config["notification_squad"].pop(key)
+        mentions: typing.List[str] = []
+        subs = self.bot.config["subscriptions"].get(key, [])
+        mentions.extend(subs)
+        one_time = self.bot.config["notification_squad"].get(key, [])
+        mentions.extend(one_time)
+
+        if one_time:
+            self.bot.config["notification_squad"].pop(key, None)
             self.bot.loop.create_task(self.bot.config.update())
 
-        return " ".join(set(mentions))
+        if not mentions:
+            return ""
+        return " ".join(list(dict.fromkeys(mentions)))
 
     async def set_title(self, title: str) -> None:
         topic = f"Title: {title}\n"