mirrors/discord.py
1
0
Fork 0
mirror of https://github.com/Rapptz/discord.py.git synced 2025-07-24 20:04:55 +00:00
Code Issues Projects Releases Wiki Activity

Fix free functions being passed a binding in autocomplete callbacks

Browse Source 
Fix #7624
This commit is contained in:
Rapptz 2022-03-10 19:26:00 -05:00
parent ef92170a9d
commit f6453d9439
1 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
discord/app_commands/commands.py
View File

@ -136,6 +136,20 @@ def _to_kebab_case(text: str) -> str:
return CAMEL_CASE_REGEX.sub('-', text).lower() return CAMEL_CASE_REGEX.sub('-', text).lower()
def _validate_auto_complete_callback(
callback: AutocompleteCallback[GroupT, ChoiceT]
) -> AutocompleteCallback[GroupT, ChoiceT]:
requires_binding = is_inside_class(callback)
required_parameters = 3 + requires_binding
callback.requires_binding = requires_binding
params = inspect.signature(callback).parameters
if len(params) < required_parameters:
raise TypeError('autocomplete callback requires either 3 or 4 parameters to be passed')
return callback
def _context_menu_annotation(annotation: Any, *, _none=NoneType) -> AppCommandType: def _context_menu_annotation(annotation: Any, *, _none=NoneType) -> AppCommandType:
if annotation is Message: if annotation is Message:
return AppCommandType.message return AppCommandType.message
@ -215,7 +229,7 @@ def _populate_autocomplete(params: Dict[str, CommandParameter], autocomplete: Di
if param.type not in (AppCommandOptionType.string, AppCommandOptionType.number, AppCommandOptionType.integer): if param.type not in (AppCommandOptionType.string, AppCommandOptionType.number, AppCommandOptionType.integer):
raise TypeError('autocomplete is only supported for integer, string, or number option types') raise TypeError('autocomplete is only supported for integer, string, or number option types')
param.autocomplete = callback param.autocomplete = _validate_auto_complete_callback(callback)
if autocomplete: if autocomplete:
first = next(iter(autocomplete)) first = next(iter(autocomplete))
@ -434,8 +448,11 @@ class Command(Generic[GroupT, P, T]):
if param.autocomplete is None: if param.autocomplete is None:
raise CommandSignatureMismatch(self) raise CommandSignatureMismatch(self)
if self.binding is not None: if param.autocomplete.requires_binding:
choices = await param.autocomplete(self.binding, interaction, value, namespace) if self.binding is not None:
choices = await param.autocomplete(self.binding, interaction, value, namespace)
else:
raise TypeError('autocomplete parameter expected a bound self parameter but one was not provided')
else: else:
choices = await param.autocomplete(interaction, value, namespace) choices = await param.autocomplete(interaction, value, namespace)
@ -539,7 +556,7 @@ class Command(Generic[GroupT, P, T]):
if param.type not in (AppCommandOptionType.string, AppCommandOptionType.number, AppCommandOptionType.integer): if param.type not in (AppCommandOptionType.string, AppCommandOptionType.number, AppCommandOptionType.integer):
raise TypeError('autocomplete is only supported for integer, string, or number option types') raise TypeError('autocomplete is only supported for integer, string, or number option types')
param.autocomplete = coro param.autocomplete = _validate_auto_complete_callback(coro)
return coro return coro
return decorator return decorator