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

Use new differentiator for guild and global commands

Browse Source 
Fixes #7602
This commit is contained in:
Rapptz 2022-03-10 20:08:29 -05:00
parent 02fcc814e1
commit 26c6b4d449
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
discord/app_commands/tree.py
View File

@ -40,7 +40,7 @@ from .errors import (
) )
from ..errors import ClientException from ..errors import ClientException
from ..enums import AppCommandType, InteractionType from ..enums import AppCommandType, InteractionType
from ..utils import MISSING from ..utils import MISSING, _get_as_snowflake
if TYPE_CHECKING: if TYPE_CHECKING:
from ..types.interactions import ApplicationCommandInteractionData, ApplicationCommandInteractionDataOption from ..types.interactions import ApplicationCommandInteractionData, ApplicationCommandInteractionDataOption
@ -671,8 +671,8 @@ class CommandTree(Generic[ClientT]):
async def _call_context_menu(self, interaction: Interaction, data: ApplicationCommandInteractionData, type: int): async def _call_context_menu(self, interaction: Interaction, data: ApplicationCommandInteractionData, type: int):
name = data['name'] name = data['name']
guild_id = interaction.guild_id guild_id = _get_as_snowflake(data, 'guild_id')
ctx_menu = self._context_menus.get((name, guild_id, type)) or self._context_menus.get((name, None, type)) ctx_menu = self._context_menus.get((name, guild_id, type))
if ctx_menu is None: if ctx_menu is None:
raise CommandNotFound(name, [], AppCommandType(type)) raise CommandNotFound(name, [], AppCommandType(type))
@ -729,14 +729,17 @@ class CommandTree(Generic[ClientT]):
parents: List[str] = [] parents: List[str] = []
name = data['name'] name = data['name']
command = self._global_commands.get(name)
if interaction.guild_id: command_guild_id = _get_as_snowflake(data, 'guild_id')
if command_guild_id:
try: try:
guild_commands = self._guild_commands[interaction.guild_id] guild_commands = self._guild_commands[command_guild_id]
except KeyError: except KeyError:
pass command = None
else: else:
command = guild_commands.get(name) or command command = guild_commands.get(name)
else:
command = self._global_commands.get(name)
# If it's not found at this point then it's not gonna be found at any point # If it's not found at this point then it's not gonna be found at any point
if command is None: if command is None:

1
discord/types/interactions.py
View File

@ -122,6 +122,7 @@ ApplicationCommandInteractionDataOption = Union[
class _BaseApplicationCommandInteractionDataOptional(TypedDict, total=False): class _BaseApplicationCommandInteractionDataOptional(TypedDict, total=False):
resolved: ResolvedData resolved: ResolvedData
guild_id: Snowflake
class _BaseApplicationCommandInteractionData(_BaseApplicationCommandInteractionDataOptional): class _BaseApplicationCommandInteractionData(_BaseApplicationCommandInteractionDataOptional):