Apply global allowed_mentions setting (#76)

README.md

@@ -126,8 +126,8 @@ client = disagreement.Client(
 )
 ```
 
-This dictionary is used whenever ``send_message`` is called without an explicit
+This dictionary is used whenever ``send_message`` or helpers like ``Message.reply``
-``allowed_mentions`` argument.
+are called without an explicit ``allowed_mentions`` argument.
 
 ### Defining Subcommands with `AppCommandGroup`
 

disagreement/ext/app_commands/context.py

@@ -253,6 +253,8 @@ class AppCommandContext:
             Optional[Message]: The sent message object if a new message was created and not ephemeral.
                                None if the response was ephemeral or an edit to a deferred message.
         """
+        if allowed_mentions is None:
+            allowed_mentions = getattr(self.bot, "allowed_mentions", None)
         if not self._responded and self._deferred:  # Editing a deferred response
             # Use edit_original_interaction_response
             payload: Dict[str, Any] = {}
@@ -393,6 +395,9 @@ class AppCommandContext:
                 "Must acknowledge or defer the interaction before sending a followup."
             )
 
+        if allowed_mentions is None:
+            allowed_mentions = getattr(self.bot, "allowed_mentions", None)
+
         payload: Dict[str, Any] = {}
         if content is not None:
             payload["content"] = content
@@ -473,6 +478,9 @@ class AppCommandContext:
                 "Cannot edit response if interaction hasn't been responded to or deferred."
             )
 
+        if allowed_mentions is None:
+            allowed_mentions = getattr(self.bot, "allowed_mentions", None)
+
         payload: Dict[str, Any] = {}
         if content is not None:
             payload["content"] = content  # Use None to clear

disagreement/ext/commands/core.py

@@ -250,15 +250,15 @@ class CommandContext:
             client's :attr:`mention_replies` value is used.
         """
 
-        allowed_mentions = kwargs.pop("allowed_mentions", None)
+        allowed_mentions = kwargs.pop("allowed_mentions", None)
-        if mention_author is None:
+        if mention_author is None:
-            mention_author = getattr(self.bot, "mention_replies", False)
+            mention_author = getattr(self.bot, "mention_replies", False)
-
+
-        if allowed_mentions is None:
+        if allowed_mentions is None:
-            allowed_mentions = {"replied_user": mention_author}
+            allowed_mentions = dict(getattr(self.bot, "allowed_mentions", {}) or {})
-        else:
+        else:
-            allowed_mentions = dict(allowed_mentions)
+            allowed_mentions = dict(allowed_mentions)
-            allowed_mentions.setdefault("replied_user", mention_author)
+        allowed_mentions.setdefault("replied_user", mention_author)
 
         return await self.bot.send_message(
             channel_id=self.message.channel_id,

disagreement/models.py

@@ -194,14 +194,14 @@ class Message:
             ValueError: If both `embed` and `embeds` are provided.
         """
         # Determine allowed mentions for the reply
-        if mention_author is None:
+        if mention_author is None:
-            mention_author = getattr(self._client, "mention_replies", False)
+            mention_author = getattr(self._client, "mention_replies", False)
-
+
-        if allowed_mentions is None:
+        if allowed_mentions is None:
-            allowed_mentions = {"replied_user": mention_author}
+            allowed_mentions = dict(getattr(self._client, "allowed_mentions", {}) or {})
-        else:
+        else:
-            allowed_mentions = dict(allowed_mentions)
+            allowed_mentions = dict(allowed_mentions)
-            allowed_mentions.setdefault("replied_user", mention_author)
+        allowed_mentions.setdefault("replied_user", mention_author)
 
         # Client.send_message is already updated to handle these parameters
         return await self._client.send_message(

docs/introduction.md

@@ -125,8 +125,8 @@ client = disagreement.Client(
 )
 ```
 
-This dictionary is used whenever ``send_message`` is called without an explicit
+This dictionary is used whenever ``send_message`` or helpers like ``Message.reply``
-``allowed_mentions`` argument.
+are called without an explicit ``allowed_mentions`` argument.
 
 The :class:`AllowedMentions` class offers ``none()`` and ``all()`` helpers for
 quickly generating these configurations.

docs/mentions.md

@@ -15,7 +15,8 @@ client = disagreement.Client(
 )
 ```
 
-When ``Client.send_message`` is called without an explicit ``allowed_mentions``
+When ``Client.send_message`` or convenience methods like ``Message.reply`` and
+``CommandContext.reply`` are called without an explicit ``allowed_mentions``
 argument this value will be used.
 
 ``AllowedMentions`` also provides the convenience methods