feat: allow conversion to Member in MentionableConverter (Pycord-Development#2775)

* Update CHANGELOG.md

Signed-off-by: Lumouille <[email protected]>

* fix member not being converted

Signed-off-by: Lumouille <[email protected]>

* fix member not being converted

Signed-off-by: Lumouille <[email protected]>

* style(pre-commit): auto fixes from pre-commit.com hooks

* Update CHANGELOG.md

Signed-off-by: Lumouille <[email protected]>

* Update CHANGELOG.md

Signed-off-by: Lumouille <[email protected]>

* Update CHANGELOG.md

Co-authored-by: plun1331 <[email protected]>
Signed-off-by: Lumouille <[email protected]>

* refactor(bridge): remove redundant constructor in BridgeOption

* feat(bridge): enhance BridgeOption initialization with converter support

* Update discord/ext/bridge/core.py

Co-authored-by: Dorukyum <[email protected]>
Signed-off-by: Lumouille <[email protected]>

* improved code quality

---------

Signed-off-by: Lumouille <[email protected]>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: plun1331 <[email protected]>
Co-authored-by: Dorukyum <[email protected]>
(cherry picked from commit a82f562)

Author: 4 people

CHANGELOG.md

@@ -55,6 +55,8 @@ These changes are available on the `master` branch, but have not yet been releas
   ([#2714](https://github.com/Pycord-Development/pycord/pull/2714))
 - Added the ability to pass a `datetime.time` object to `format_dt`.
   ([#2747](https://github.com/Pycord-Development/pycord/pull/2747))
+- Added conversion to `Member` in `MentionableConverter`.
+  ([#2775](https://github.com/Pycord-Development/pycord/pull/2775))
 - Added `discord.Interaction.created_at`.
   ([#2801](https://github.com/Pycord-Development/pycord/pull/2801))
 

discord/ext/bridge/core.py

@@ -51,6 +51,7 @@
     Converter,
     Group,
     GuildChannelConverter,
+    MemberConverter,
     RoleConverter,
     UserConverter,
 )
@@ -553,13 +554,21 @@ def predicate(func: Callable | ApplicationCommand):
 
 
 class MentionableConverter(Converter):
-    """A converter that can convert a mention to a user or a role."""
+    """A converter that can convert a mention to a member, a user or a role."""
 
     async def convert(self, ctx, argument):
         try:
             return await RoleConverter().convert(ctx, argument)
         except BadArgument:
-            return await UserConverter().convert(ctx, argument)
+            pass
+
+        if ctx.guild:
+            try:
+                return await MemberConverter().convert(ctx, argument)
+            except BadArgument:
+                pass
+
+        return await UserConverter().convert(ctx, argument)
 
 
 class AttachmentConverter(Converter):
@@ -587,6 +596,7 @@ async def convert(self, ctx, arg: bool):
     SlashCommandOptionType.mentionable: MentionableConverter,
     SlashCommandOptionType.number: float,
     SlashCommandOptionType.attachment: AttachmentConverter,
+    discord.Member: MemberConverter,
 }
 
 
@@ -595,16 +605,24 @@ class BridgeOption(Option, Converter):
     command option and a prefixed command argument for bridge commands.
     """
 
+    def __init__(self, input_type, *args, **kwargs):
+        self.converter = kwargs.pop("converter", None)
+        super().__init__(input_type, *args, **kwargs)
+
+        self.converter = self.converter or BRIDGE_CONVERTER_MAPPING.get(input_type)
+
     async def convert(self, ctx, argument: str) -> Any:
         try:
             if self.converter is not None:
-                converted = await self.converter.convert(ctx, argument)
+                converted = await self.converter().convert(ctx, argument)
             else:
-                converter = BRIDGE_CONVERTER_MAPPING[self.input_type]
-                if issubclass(converter, Converter):
+                converter = BRIDGE_CONVERTER_MAPPING.get(self.input_type)
+                if isinstance(converter, type) and issubclass(converter, Converter):
                     converted = await converter().convert(ctx, argument)  # type: ignore # protocol class
-                else:
+                elif callable(converter):
                     converted = converter(argument)
+                else:
+                    raise TypeError(f"Invalid converter: {converter}")
 
             if self.choices:
                 choices_names: list[str | int | float] = [choice.name for choice in self.choices]