Merge branch 'development' into users/lorenzo132/arged-responses

Author: lorenzo132

CHANGELOG.md

@@ -6,6 +6,11 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 This project mostly adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html);
 however, insignificant breaking changes do not guarantee a major version bump, see the reasoning [here](https://github.com/modmail-dev/modmail/issues/319). If you're a plugin developer, note the "BREAKING" section.
 
+# Unreleased
+
+### Fixed
+* Confirm thread creation (react to contact) no longer leaves a thread stuck in a "not ready" cache state when the recipient has DMs disabled. The bot now catches `discord.Forbidden` when sending the confirmation prompt, cancels the thread, and clears the cache entry immediately instead of requiring a bot restart. (#3442)
+
 # v4.2.1
 
 ### Added

cogs/plugins.py

@@ -153,6 +153,14 @@ async def initial_load_plugins(self):
                 logger.info("Migrated legacy plugin name: %s, now %s.", plugin_name, str(plugin))
                 self.bot.config["plugins"].append(str(plugin))
 
+            if self.bot.config.get("registry_plugins_only") and not plugin_name in self.registry:
+                self.bot.config["plugins"].remove(plugin_name)
+                logger.info(
+                    "Loading of plugin %s was skipped and the plugin was removed because it is not present in the registry.",
+                    plugin_name,
+                )
+                continue
+
             try:
                 await self.download_plugin(plugin)
                 await self.load_plugin(plugin)
@@ -281,7 +289,7 @@ async def unload_plugin(self, plugin: Plugin) -> None:
             if module == ext_parent or module.startswith(ext_parent + "."):
                 del sys.modules[module]
 
-    async def parse_user_input(self, ctx, plugin_name, check_version=False):
+    async def parse_user_input(self, ctx, plugin_name, check_version=False, check_registry=True):
         if not self.bot.config["enable_plugins"]:
             embed = discord.Embed(
                 description="Plugins are disabled, enable them by setting `ENABLE_PLUGINS=true`",
@@ -318,7 +326,7 @@ async def parse_user_input(self, ctx, plugin_name, check_version=False):
             plugin = Plugin(user, repo, plugin_name, branch)
 
         else:
-            if self.bot.config.get("registry_plugins_only"):
+            if check_registry and self.bot.config.get("registry_plugins_only"):
                 embed = discord.Embed(
                     description="This plugin is not in the registry. To install this plugin, "
                     "you must set `REGISTRY_PLUGINS_ONLY=no` or remove this key in your .env file.",
@@ -337,7 +345,7 @@ async def parse_user_input(self, ctx, plugin_name, check_version=False):
                 )
                 await ctx.send(embed=embed)
                 return
-        return plugin
+            return plugin
 
     @commands.group(aliases=["plugin"], invoke_without_command=True)
     @checks.has_permissions(PermissionLevel.OWNER)
@@ -446,7 +454,7 @@ async def plugins_remove(self, ctx, *, plugin_name: str):
         `plugin_name` can be the name of the plugin found in `{prefix}plugin registry`, or a direct reference
         to a GitHub hosted plugin (in the format `user/repo/name[@branch]`) or `@local/name` for local plugins.
         """
-        plugin = await self.parse_user_input(ctx, plugin_name)
+        plugin = await self.parse_user_input(ctx, plugin_name, check_registry=False)
         if plugin is None:
             return
 

core/clients.py

@@ -662,39 +662,59 @@ async def append_log(
         channel_id: str = "",
         type_: str = "thread_message",
     ) -> dict:
-        channel_id = str(channel_id) or str(message.channel.id)
-        message_id = str(message_id) or str(message.id)
-
-        content = message.content or ""
-        if forwarded := extract_forwarded_content(message):
-            if content:
-                content += "\n" + forwarded
-            else:
-                content = forwarded
-
-        data = {
-            "timestamp": str(message.created_at),
-            "message_id": message_id,
-            "author": {
-                "id": str(message.author.id),
-                "name": message.author.name,
-                "discriminator": message.author.discriminator,
-                "avatar_url": message.author.display_avatar.url if message.author.display_avatar else None,
-                "mod": not isinstance(message.channel, DMChannel),
-            },
-            "content": content,
-            "type": type_,
-            "attachments": [
-                {
-                    "id": a.id,
-                    "filename": a.filename,
-                    "is_image": a.width is not None,
-                    "size": a.size,
-                    "url": a.url,
-                }
-                for a in message.attachments
-            ],
-        }
+        channel_id = str(channel_id) or (str(message.channel.id) if message else "")
+        message_id = str(message_id) or (str(message.id) if message else "")
+
+        if message:
+            content = message.content or ""
+            if forwarded := extract_forwarded_content(message):
+                if content:
+                    content += "\n" + forwarded
+                else:
+                    content = forwarded
+
+            data = {
+                "timestamp": str(message.created_at),
+                "message_id": message_id,
+                "author": {
+                    "id": str(message.author.id),
+                    "name": message.author.name,
+                    "discriminator": message.author.discriminator,
+                    "avatar_url": (
+                        message.author.display_avatar.url if message.author.display_avatar else None
+                    ),
+                    "mod": not isinstance(message.channel, DMChannel),
+                },
+                "content": content,
+                "type": type_,
+                "attachments": [
+                    {
+                        "id": a.id,
+                        "filename": a.filename,
+                        "is_image": a.width is not None,
+                        "size": a.size,
+                        "url": a.url,
+                    }
+                    for a in message.attachments
+                ],
+            }
+        else:
+            # Fallback for when message is None but we still want to log something (e.g. system note)
+            # This requires at least some manual data to be useful.
+            data = {
+                "timestamp": str(discord.utils.utcnow()),
+                "message_id": message_id or "0",
+                "author": {
+                    "id": "0",
+                    "name": "System",
+                    "discriminator": "0000",
+                    "avatar_url": None,
+                    "mod": True,
+                },
+                "content": "System Message (No Content)",
+                "type": type_,
+                "attachments": [],
+            }
 
         return await self.logs.find_one_and_update(
             {"channel_id": channel_id},

core/models.py

@@ -438,6 +438,10 @@ def __init__(self, message):
         self._message = message
 
     def __getattr__(self, name: str):
+        if self._message is None:
+            # If we're wrapping None, we can't delegate attributes.
+            # This mimics behavior where the attribute doesn't exist.
+            raise AttributeError(f"'DummyMessage' object has no attribute '{name}' (wrapped message is None)")
         return getattr(self._message, name)
 
     def __bool__(self):