Compatibility with OptionChoices in autocomplete

Author: Vioshim

discord/commands/commands.py

@@ -565,7 +565,8 @@ async def invoke_autocomplete_callback(self, ctx: AutocompleteContext):
                     result = await result
 
                 choices = [
-                    o if isinstance(o, OptionChoice) else OptionChoice(o)
+                    o if isinstance(o, OptionChoice) 
+                    else (OptionChoice(*o) if isinstance(o, tuple) else OptionChoice(o))
                     for o in result
                 ][:25]
                 return await ctx.interaction.response.send_autocomplete_result(choices=choices)

discord/utils.py

@@ -1111,7 +1111,26 @@ async def autocomplete_callback(ctx: AutocompleteContext) -> V:
         if asyncio.iscoroutine(_values):
             _values = await _values
 
-        gen = (val for val in _values if str(val).lower().startswith(str(ctx.value or "").lower()))
+        def check(item: Any) -> bool:
+            """Comparator method
+
+            Parameters
+            ----------
+            x : str
+                parameter
+
+            Returns
+            -------
+            bool
+                if valid
+            """
+            if isinstance(item, tuple):
+                item, _ = item
+            if hasattr(item, "to_dict"):
+                item = item.to_dict()["name"]
+            return str(item).lower().startswith(str(ctx.value or "").lower())
+        
+        gen = (val for val in _values if check(val))
         return iter(itertools.islice(gen, 25))
 
     return autocomplete_callback