fix: rewrite warning logic into cmd init

Author: BobDotCom

discord/ext/bridge/core.py

@@ -96,6 +96,28 @@ class BridgeExtCommand(Command):
     def __init__(self, func, **kwargs):
         super().__init__(func, **kwargs)
 
+        # TODO: v2.7: Remove backwards support for Option in bridge commands.
+        for name, option in self.params.items():
+            if isinstance(option.annotation, Option) and not isinstance(
+                option.annotation, BridgeOption
+            ):
+                # Warn not to do this
+                warn_deprecated(
+                    "Using Option for bridge commands",
+                    "BridgeOption",
+                    "2.5",
+                    "2.7",
+                    reference="https://github.com/Pycord-Development/pycord/pull/2417",
+                    stacklevel=6,
+                )
+                # Override the convert method of the parameter's annotated Option.
+                # We can use the convert method from BridgeOption, and bind "self"
+                # using a manual invocation of the descriptor protocol.
+                # Definitely not a good approach, but gets the job done until removal.
+                self.params[name].annotation.convert = BridgeOption.convert.__get__(
+                    self.params[name].annotation
+                )
+
     async def dispatch_error(self, ctx: BridgeExtContext, error: Exception) -> None:
         await super().dispatch_error(ctx, error)
         ctx.bot.dispatch("bridge_command_error", ctx, error)
@@ -653,27 +675,3 @@ def decorator(func):
         return func
 
     return decorator
-
-
-# TODO: Fix this, it doesn't work if discord.Option is imported before discord.ext.bridge
-
-
-# TODO: 2.7: Remove this
-class BridgeOptionDeprecated(BridgeOption):
-    @staticmethod
-    def _warn():
-        warn_deprecated(
-            "Option",
-            "BridgeOption",
-            "2.5",
-            "2.7",
-            reference="https://github.com/Pycord-Development/pycord/pull/2417",
-        )
-
-    def __init__(self, *args, **kwargs):
-        self._warn()
-        super().__init__(*args, **kwargs)
-
-
-discord.commands.options.Option = BridgeOptionDeprecated
-discord.Option = BridgeOptionDeprecated