Merge pull request #256 from Dorukyum/restructure

Implement custom converter types

Author: Dorukyum

discord/commands/commands.py

@@ -392,7 +392,7 @@ def __eq__(self, other) -> bool:
         )
 
     async def _invoke(self, ctx: ApplicationContext) -> None:
-        # TODO: Parse the args better, apply custom converters etc.
+        # TODO: Parse the args better
         kwargs = {}
         for arg in ctx.interaction.data.get("options", []):
             op = find(lambda x: x.name == arg["name"], self.options)
@@ -413,6 +413,9 @@ async def _invoke(self, ctx: ApplicationContext) -> None:
                 if arg is None:
                     arg = ctx.guild.get_role(arg_id) or arg_id
 
+            elif op.input_type == SlashCommandOptionType.string and op._converter is not None:
+                arg = await op._converter.convert(ctx, arg)
+
             kwargs[op.name] = arg
 
         for o in self.options:
@@ -470,8 +473,13 @@ def __init__(
     ) -> None:
         self.name: Optional[str] = kwargs.pop("name", None)
         self.description = description or "No description provided"
+        self._converter = None
         if not isinstance(input_type, SlashCommandOptionType):
-            input_type = SlashCommandOptionType.from_datatype(input_type)
+            to_assign = input_type() if isinstance(input_type, type) else input_type
+            _type = SlashCommandOptionType.from_datatype(to_assign.__class__)
+            if _type == SlashCommandOptionType.custom:
+                self._converter = to_assign
+                input_type = SlashCommandOptionType.string
         self.input_type = input_type
         self.required: bool = kwargs.pop("required", True)
         self.choices: List[OptionChoice] = [

discord/enums.py

@@ -612,6 +612,9 @@ def from_datatype(cls, datatype):
         if issubclass(datatype, float):
             return cls.number
 
+        if hasattr(datatype, "convert"):
+            return cls.custom
+
         if datatype.__name__ == "Member":
             return cls.user
         if datatype.__name__ == "GuildChannel":