Resolve feedback.

Author: lorenzo132

bot.py

@@ -393,7 +393,7 @@ async def wait_for_connected(self) -> None:
         await self.config.wait_until_ready()
 
     @property
-    def snippets(self) -> typing.Dict[str, str]:
+    def snippets(self) -> typing.Dict[str, typing.Union[str, typing.Dict[str, str]]]:
         return self.config["snippets"]
 
     @property
@@ -1382,7 +1382,7 @@ async def get_contexts(self, message, *, cls=commands.Context):
                         snippet_text = snippet_data.get("text", "")
                         attachment = await self._download_snippet_attachment(snippet_data)
                         if attachment is not None:
-                            context_message.attachments = [attachment]
+                            context_message.attachments = [*message.attachments, attachment]
                     else:
                         snippet_text = None
                 except KeyError:
@@ -1409,7 +1409,7 @@ async def get_contexts(self, message, *, cls=commands.Context):
             attachment = await self._download_snippet_attachment(snippet_data)
             if attachment is not None:
                 snippet_message = copy.copy(message)
-                snippet_message.attachments = [attachment]
+                snippet_message.attachments = [*message.attachments, attachment]
                 ctx.message = snippet_message
             ctx.command = self._get_snippet_command()
             reply_view = StringView(f"{invoked_prefix}{ctx.command} {snippet_text}")

cogs/modmail.py

@@ -109,7 +109,7 @@ async def format_cog_help(self, cog, *, no_cog=False):
         return embeds
 
     def process_help_msg(self, help_: str):
-        return help_.replace("{prefix}", self.context.clean_prefix) if help_ else "No help message."
+        return help_.format(prefix=self.context.clean_prefix) if help_ else "No help message."
 
     async def send_bot_help(self, mapping):
         embeds = []
@@ -195,6 +195,8 @@ async def send_error_message(self, error):
         command = self.context.kwargs.get("command")
         val = self.context.bot.snippets.get(command)
         if val is not None:
+            if isinstance(val, dict):
+                val = val.get("text") or "This is an attachment-only snippet."
             embed = discord.Embed(title=f"{command} is a snippet.", color=self.context.bot.main_color)
             embed.add_field(name=f"`{command}` will send:", value=val, inline=False)
 

cogs/utility.py

@@ -9,6 +9,8 @@
 
 from aiohttp import ClientResponseError, ClientResponse
 from bson import ObjectId
+from bson.errors import InvalidId
+from gridfs.errors import NoFile
 from motor.motor_asyncio import AsyncIOMotorClient, AsyncIOMotorGridFSBucket
 from pymongo.errors import ConfigurationError
 
@@ -887,6 +889,9 @@ async def delete_snippet_attachment(self, file_id: str) -> bool:
             await self.fs.delete(ObjectId(file_id))
             logger.debug("Deleted snippet attachment with file_id %s.", file_id)
             return True
+        except (InvalidId, NoFile):
+            logger.info("Snippet attachment %s was already absent.", file_id)
+            return True
         except Exception as e:
             logger.warning("Failed to delete snippet attachment %s: %s", file_id, e)
             return False

core/clients.py

@@ -165,7 +165,7 @@ class ConfigManager:
         "thread_creation_menu_embed_footer_icon_url": None,
         "thread_creation_menu_embed_color": str(discord.Color.green()),
         # snippet attachments
-        "snippet_attachment_max_size": 10,  # in MB
+        "snippet_attachment_max_size": 10,  # in MiB
     }
 
     private_keys = {
@@ -245,7 +245,7 @@ class ConfigManager:
 
     duration_seconds = {"snooze_default_duration", "thread_creation_menu_timeout"}
 
-    megabytes = {"snippet_attachment_max_size"}
+    mebibytes = {"snippet_attachment_max_size"}
 
     booleans = {
         "use_user_id_channel_name",
@@ -318,6 +318,23 @@ def __init__(self, bot):
     def __repr__(self):
         return repr(self._cache)
 
+    @staticmethod
+    def _convert_mebibytes(value: typing.Any) -> int:
+        """Convert a positive whole-number MiB value without rounding it."""
+        if isinstance(value, bool):
+            raise InvalidConfigError("Must be a positive whole number of MiB.")
+
+        if isinstance(value, int):
+            converted = value
+        elif isinstance(value, str) and re.fullmatch(r"[1-9]\d*", value.strip()):
+            converted = int(value)
+        else:
+            raise InvalidConfigError("Must be a positive whole number of MiB.")
+
+        if converted <= 0:
+            raise InvalidConfigError("Must be a positive whole number of MiB.")
+        return converted
+
     def populate_cache(self) -> dict:
         data = deepcopy(self.defaults)
 
@@ -426,13 +443,12 @@ def get(self, key: str, *, convert: bool = True) -> typing.Any:
                     logger.warning("Invalid %s %s.", key, value)
                     value = self.remove(key)
 
-        elif key in self.megabytes:
-            if not isinstance(value, int):
-                try:
-                    value = int(value)
-                except (ValueError, TypeError):
-                    logger.warning("Invalid %s %s.", key, value)
-                    value = self.remove(key)
+        elif key in self.mebibytes:
+            try:
+                value = self._convert_mebibytes(value)
+            except InvalidConfigError:
+                logger.warning("Invalid %s %s.", key, value)
+                value = self.remove(key)
 
         elif key in self.force_str:
             # Temporary: as we saved in int previously, leading to int32 overflow,
@@ -537,6 +553,9 @@ async def set(self, key: str, item: typing.Any, convert=True) -> None:
             duration_seconds = int((time.dt - now).total_seconds())
             return self.__setitem__(key, duration_seconds)
 
+        elif key in self.mebibytes:
+            return self.__setitem__(key, self._convert_mebibytes(item))
+
         elif key in self.enums:
             if isinstance(item, self.enums[key]):
                 # value is an enum type

core/config.py

@@ -857,15 +857,16 @@
     ]
   },
   "snippet_attachment_max_size": {
-    "default": "10 (MB)",
-    "description": "Maximum file size in megabytes (MB) for attachments when creating or editing snippets.",
+    "default": "10 MiB",
+    "description": "Maximum file size in mebibytes (MiB) for attachments when creating or editing snippets.",
     "examples": [
-      "`{prefix}config set snippet_attachment_max_size 5` (5 MB)",
-      "`{prefix}config set snippet_attachment_max_size 20` (20 MB)"
+      "`{prefix}config set snippet_attachment_max_size 5` (5 MiB)",
+      "`{prefix}config set snippet_attachment_max_size 20` (20 MiB)"
     ],
     "notes": [
       "Attachments larger than this size will be rejected when adding or editing snippets.",
-      "Value is specified in megabytes (MB)."
+      "The value must be a positive whole number of MiB; fractional and negative values are rejected.",
+      "Increasing this limit can substantially increase long-term database storage usage, especially when attachments are used frequently."
     ]
   },
   "require_close_reason": {
@@ -1606,4 +1607,4 @@
       "Color names map to the built-in palette (e.g., 'red', 'green', 'blurple')."
     ]
   }
-}
+}

core/config_help.json

@@ -1754,7 +1754,12 @@ async def reply(
                 if any(
                     getattr(attachment, "is_snippet_attachment", False) for attachment in message.attachments
                 ):
-                    log_attachments = msg.attachments
+                    original_attachments = [
+                        attachment
+                        for attachment in message.attachments
+                        if not getattr(attachment, "is_snippet_attachment", False)
+                    ]
+                    log_attachments = [*original_attachments, *msg.attachments]
                 tasks.append(
                     self.bot.api.append_log(
                         message,