mirrors/discord.py
1
0
Fork 0
mirror of https://github.com/Rapptz/discord.py.git synced 2025-07-11 12:28:03 +00:00
Code Issues Projects Releases Wiki Activity

Change CommandTree.on_error to only take two parameters

Browse Source 
The command that failed can be retrieved using Interaction.command
so having it as a parameter doesn't make much sense.
This commit is contained in:
Rapptz 2022-04-13 22:29:27 -04:00
parent 83fae4f0fa
commit 3f4fb91328
1 changed files with 9 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
discord/app_commands/tree.py
View File

@ -69,11 +69,7 @@ if TYPE_CHECKING:
from .commands import ContextMenuCallback, CommandCallback, P, T from .commands import ContextMenuCallback, CommandCallback, P, T
ErrorFunc = Callable[ ErrorFunc = Callable[
[ [Interaction, AppCommandError],
Interaction,
Optional[Union[ContextMenu, Command[Any, ..., Any]]],
AppCommandError,
],
Coroutine[Any, Any, Any], Coroutine[Any, Any, Any],
] ]
@ -724,12 +720,7 @@ class CommandTree(Generic[ClientT]):
for key in remove: for key in remove:
del mapping[key] del mapping[key]
async def on_error( async def on_error(self, interaction: Interaction, error: AppCommandError) -> None:
self,
interaction: Interaction,
command: Optional[Union[ContextMenu, Command[Any, ..., Any]]],
error: AppCommandError,
) -> None:
"""|coro| """|coro|
A callback that is called when any command raises an :exc:`AppCommandError`. A callback that is called when any command raises an :exc:`AppCommandError`.
@ -737,16 +728,18 @@ class CommandTree(Generic[ClientT]):
The default implementation prints the traceback to stderr if the command does The default implementation prints the traceback to stderr if the command does
not have any error handlers attached to it. not have any error handlers attached to it.
To get the command that failed, :attr:`discord.Interaction.command` should
be used.
Parameters Parameters
----------- -----------
interaction: :class:`~discord.Interaction` interaction: :class:`~discord.Interaction`
The interaction that is being handled. The interaction that is being handled.
command: Optional[Union[:class:`~discord.app_commands.Command`, :class:`~discord.app_commands.ContextMenu`]]
The command that failed, if any.
error: :exc:`AppCommandError` error: :exc:`AppCommandError`
The exception that was raised. The exception that was raised.
""" """
command = interaction.command
if command is not None: if command is not None:
if command._has_any_error_handlers(): if command._has_any_error_handlers():
return return
@ -938,7 +931,7 @@ class CommandTree(Generic[ClientT]):
try: try:
await self.call(interaction) await self.call(interaction)
except AppCommandError as e: except AppCommandError as e:
await self.on_error(interaction, None, e) await self.on_error(interaction, e)
self.client.loop.create_task(wrapper(), name='CommandTree-invoker') self.client.loop.create_task(wrapper(), name='CommandTree-invoker')
@ -1029,7 +1022,7 @@ class CommandTree(Generic[ClientT]):
except AppCommandError as e: except AppCommandError as e:
if ctx_menu.on_error is not None: if ctx_menu.on_error is not None:
await ctx_menu.on_error(interaction, e) await ctx_menu.on_error(interaction, e)
await self.on_error(interaction, ctx_menu, e) await self.on_error(interaction, e)
async def interaction_check(self, interaction: Interaction, /) -> bool: async def interaction_check(self, interaction: Interaction, /) -> bool:
"""|coro| """|coro|
@ -1099,4 +1092,4 @@ class CommandTree(Generic[ClientT]):
await command._invoke_with_namespace(interaction, namespace) await command._invoke_with_namespace(interaction, namespace)
except AppCommandError as e: except AppCommandError as e:
await command._invoke_error_handler(interaction, e) await command._invoke_error_handler(interaction, e)
await self.on_error(interaction, command, e) await self.on_error(interaction, e)