refactor app command sync and other fixes

disnake/app_commands.py

@@ -468,12 +468,14 @@ def __init__(
         name: LocalizedRequired,
         dm_permission: Optional[bool] = None,
         default_member_permissions: Optional[Union[Permissions, int]] = None,
+        id: Optional[int] = None,
     ):
         self.type: ApplicationCommandType = enum_if_int(ApplicationCommandType, type)
 
         name_loc = Localized._cast(name, True)
         self.name: str = name_loc.string
         self.name_localizations: LocalizationValue = name_loc.localizations
+        self.id: Optional[int] = id
 
         self.dm_permission: bool = True if dm_permission is None else dm_permission
 
@@ -535,6 +537,11 @@ def __eq__(self, other) -> bool:
             and self._default_permission == other._default_permission
         )
 
+    def need_sync(self, other: ApplicationCommand) -> bool:
+        if self != other:
+            return True
+        return self.id is not None and self.id != other.id
+
     def to_dict(self) -> EditApplicationCommandPayload:
         data: EditApplicationCommandPayload = {
             "type": try_enum_to_int(self.type),
@@ -550,6 +557,9 @@ def to_dict(self) -> EditApplicationCommandPayload:
         if (loc := self.name_localizations.data) is not None:
             data["name_localizations"] = loc
 
+        if self.id is not None:
+            data["id"] = self.id
+
         return data
 
     def localize(self, store: LocalizationProtocol) -> None:
@@ -595,12 +605,14 @@ def __init__(
         name: LocalizedRequired,
         dm_permission: Optional[bool] = None,
         default_member_permissions: Optional[Union[Permissions, int]] = None,
+        id: Optional[int] = None,
     ):
         super().__init__(
             type=ApplicationCommandType.user,
             name=name,
             dm_permission=dm_permission,
             default_member_permissions=default_member_permissions,
+            id=id,
         )
 
 
@@ -636,6 +648,9 @@ class APIUserCommand(UserCommand, _APIApplicationCommandMixin):
 
     __repr_info__ = UserCommand.__repr_info__ + _APIApplicationCommandMixin.__repr_info__
 
+    if TYPE_CHECKING:
+        id: int
+
     @classmethod
     def from_dict(cls, data: ApplicationCommandPayload) -> Self:
         cmd_type = data.get("type", 0)
@@ -678,12 +693,14 @@ def __init__(
         name: LocalizedRequired,
         dm_permission: Optional[bool] = None,
         default_member_permissions: Optional[Union[Permissions, int]] = None,
+        id: Optional[int] = None,
     ):
         super().__init__(
             type=ApplicationCommandType.message,
             name=name,
             dm_permission=dm_permission,
             default_member_permissions=default_member_permissions,
+            id=id,
         )
 
 
@@ -719,6 +736,9 @@ class APIMessageCommand(MessageCommand, _APIApplicationCommandMixin):
 
     __repr_info__ = MessageCommand.__repr_info__ + _APIApplicationCommandMixin.__repr_info__
 
+    if TYPE_CHECKING:
+        id: int
+
     @classmethod
     def from_dict(cls, data: ApplicationCommandPayload) -> Self:
         cmd_type = data.get("type", 0)
@@ -779,12 +799,14 @@ def __init__(
         options: Optional[List[Option]] = None,
         dm_permission: Optional[bool] = None,
         default_member_permissions: Optional[Union[Permissions, int]] = None,
+        id: Optional[int] = None,
     ):
         super().__init__(
             type=ApplicationCommandType.chat_input,
             name=name,
             dm_permission=dm_permission,
             default_member_permissions=default_member_permissions,
+            id=id,
         )
         _validate_name(self.name)
 
@@ -898,6 +920,9 @@ class APISlashCommand(SlashCommand, _APIApplicationCommandMixin):
 
     __repr_info__ = SlashCommand.__repr_info__ + _APIApplicationCommandMixin.__repr_info__
 
+    if TYPE_CHECKING:
+        id: int
+
     @classmethod
     def from_dict(cls, data: ApplicationCommandPayload) -> Self:
         cmd_type = data.get("type", 0)

disnake/client.py

@@ -2478,6 +2478,10 @@ async def bulk_overwrite_global_commands(
 
         .. versionadded:: 2.1
 
+        .. versionchanged:: 2.6
+
+            Modifies the commands' ``id`` attribute to correspond to the version on the API.
+
         Parameters
         ----------
         application_commands: List[:class:`.ApplicationCommand`]
@@ -2490,7 +2494,16 @@ async def bulk_overwrite_global_commands(
         """
         for cmd in application_commands:
             cmd.localize(self.i18n)
-        return await self._connection.bulk_overwrite_global_commands(application_commands)
+        res = await self._connection.bulk_overwrite_global_commands(application_commands)
+
+        for api_command in res:
+            cmd = utils.get(application_commands, name=api_command.name)
+            if not cmd:
+                # consider a warning
+                continue
+            cmd.id = api_command.id
+
+        return res
 
     # Application commands (guild)
 
@@ -2634,7 +2647,16 @@ async def bulk_overwrite_guild_commands(
         """
         for cmd in application_commands:
             cmd.localize(self.i18n)
-        return await self._connection.bulk_overwrite_guild_commands(guild_id, application_commands)
+        res = await self._connection.bulk_overwrite_guild_commands(guild_id, application_commands)
+
+        for api_command in res:
+            cmd = utils.get(application_commands, name=api_command.name)
+            if not cmd:
+                # consider a warning
+                continue
+            cmd.id = api_command.id
+
+        return res
 
     # Application command permissions
 
@@ -2647,6 +2669,10 @@ async def bulk_fetch_command_permissions(
 
         .. versionadded:: 2.1
 
+        .. versionchanged:: 2.6
+
+            Modifies the commands' ``id`` attribute to correspond to the version on the API.
+
         Parameters
         ----------
         guild_id: :class:`int`

disnake/ext/commands/base_core.py

@@ -134,7 +134,6 @@ def __init__(self, func: CommandCallback, *, name: Optional[str] = None, **kwarg
         self.__command_flag__ = None
         self._callback: CommandCallback = func
         self.name: str = name or func.__name__
-        self.qualified_name: str = self.name
         # Annotation parser needs this attribute because body doesn't exist at this moment.
         # We will use this attribute later in order to set the dm_permission.
         self._guild_only: bool = kwargs.get("guild_only", False)
@@ -236,11 +235,28 @@ def _update_copy(self: AppCommandT, kwargs: Dict[str, Any]) -> AppCommandT:
         else:
             return self.copy()
 
+    @property
+    def id(self) -> Optional[int]:
+        return self.body.id
+
+    @id.setter
+    def id(self, id: int):
+        self.body.id = id
+
     @property
     def dm_permission(self) -> bool:
         """:class:`bool`: Whether this command can be used in DMs."""
         return self.body.dm_permission
 
+    @property
+    def qualified_name(self) -> str:
+        return self.name
+
+    @property
+    def mention(self) -> str:
+        # todo: add docs and make ID non-nullable
+        return f"</{self.qualified_name}:{self.id}>"
+
     @property
     def default_member_permissions(self) -> Optional[Permissions]:
         """Optional[:class:`.Permissions`]: The default required member permissions for this command.

disnake/ext/commands/ctx_menus_core.py

@@ -3,9 +3,10 @@
 from __future__ import annotations
 
 import asyncio
-from typing import TYPE_CHECKING, Any, Callable, Dict, Optional, Sequence, Tuple, Union
+from typing import TYPE_CHECKING, Any, Callable, Dict, Literal, Optional, Sequence, Tuple, Union
 
 from disnake.app_commands import MessageCommand, UserCommand
+from disnake.enums import ApplicationCommandType
 from disnake.i18n import Localized
 from disnake.permissions import Permissions
 
@@ -16,7 +17,7 @@
 if TYPE_CHECKING:
     from typing_extensions import ParamSpec
 
-    from disnake.i18n import LocalizedOptional
+    from disnake.i18n import LocalizationValue, LocalizedOptional
     from disnake.interactions import (
         ApplicationCommandInteraction,
         MessageCommandInteraction,
@@ -30,7 +31,7 @@
 __all__ = ("InvokableUserCommand", "InvokableMessageCommand", "user_command", "message_command")
 
 
-class InvokableUserCommand(InvokableApplicationCommand):
+class InvokableUserCommand(InvokableApplicationCommand, UserCommand):
     """A class that implements the protocol for a bot user command (context menu).
 
     These are not created manually, instead they are created via the
@@ -77,6 +78,7 @@ def __init__(
         default_member_permissions: Optional[Union[Permissions, int]] = None,
         guild_ids: Optional[Sequence[int]] = None,
         auto_sync: Optional[bool] = None,
+        id: Optional[int] = None,
         **kwargs,
     ):
         name_loc = Localized._cast(name, False)
@@ -101,8 +103,23 @@ def __init__(
             name=name_loc._upgrade(self.name),
             dm_permission=dm_permission and not self._guild_only,
             default_member_permissions=default_member_permissions,
+            id=id,
         )
 
+        self._name_localised = name_loc
+
+    @property
+    def type(self) -> Literal[ApplicationCommandType.user]:
+        return ApplicationCommandType.user
+
+    @property
+    def qualified_name(self) -> str:
+        return self.name
+
+    @property
+    def name_localizations(self) -> LocalizationValue:
+        return self._name_localised.localizations
+
     async def _call_external_error_handlers(
         self, inter: ApplicationCommandInteraction, error: CommandError
     ) -> None:
@@ -130,7 +147,7 @@ async def __call__(
             await safe_call(self.callback, interaction, *args, **kwargs)
 
 
-class InvokableMessageCommand(InvokableApplicationCommand):
+class InvokableMessageCommand(InvokableApplicationCommand, MessageCommand):
     """A class that implements the protocol for a bot message command (context menu).
 
     These are not created manually, instead they are created via the
@@ -177,6 +194,7 @@ def __init__(
         default_member_permissions: Optional[Union[Permissions, int]] = None,
         guild_ids: Optional[Sequence[int]] = None,
         auto_sync: Optional[bool] = None,
+        id: Optional[int] = None,
         **kwargs,
     ):
         name_loc = Localized._cast(name, False)
@@ -195,7 +213,21 @@ def __init__(
             name=name_loc._upgrade(self.name),
             dm_permission=dm_permission and not self._guild_only,
             default_member_permissions=default_member_permissions,
+            id=id,
         )
+        self._name_localised = name_loc
+
+    @property
+    def type(self) -> Literal[ApplicationCommandType.message]:
+        return ApplicationCommandType.message
+
+    @property
+    def qualified_name(self) -> str:
+        return self.name
+
+    @property
+    def name_localizations(self) -> LocalizationValue:
+        return self._name_localised.localizations
 
     async def _call_external_error_handlers(
         self, inter: ApplicationCommandInteraction, error: CommandError

disnake/ext/commands/errors.py

@@ -1016,11 +1016,16 @@ class CommandRegistrationError(ClientException):
         Whether the name that conflicts is an alias of the command we try to add.
     """
 
-    def __init__(self, name: str, *, alias_conflict: bool = False) -> None:
+    def __init__(
+        self, name: str, *, alias_conflict: bool = False, guild_id: Optional[int] = None
+    ) -> None:
         self.name: str = name
         self.alias_conflict: bool = alias_conflict
+        self.guild_id: Optional[int] = guild_id
         type_ = "alias" if alias_conflict else "command"
-        super().__init__(f"The {type_} {name} is already an existing command or alias.")
+        msg = f"The {type_} {name} is already an existing command or alias"
+        msg += "." if not guild_id else f" in guild ID {guild_id}."
+        super().__init__(msg)
 
 
 class FlagError(BadArgument):