Browse Source

Rename MaxCommandsReached to CommandLimitReached

pull/7821/head
Rapptz 3 years ago
parent
commit
24f8f8d4a7
  1. 4
      discord/app_commands/errors.py
  2. 16
      discord/app_commands/tree.py
  3. 4
      docs/interactions/api.rst

4
discord/app_commands/errors.py

@ -38,7 +38,7 @@ __all__ = (
'CommandAlreadyRegistered', 'CommandAlreadyRegistered',
'CommandSignatureMismatch', 'CommandSignatureMismatch',
'CommandNotFound', 'CommandNotFound',
'MaxCommandsReached', 'CommandLimitReached',
'NoPrivateMessage', 'NoPrivateMessage',
'MissingRole', 'MissingRole',
'MissingAnyRole', 'MissingAnyRole',
@ -333,7 +333,7 @@ class CommandNotFound(AppCommandError):
super().__init__(f'Application command {name!r} not found') super().__init__(f'Application command {name!r} not found')
class MaxCommandsReached(AppCommandError): class CommandLimitReached(AppCommandError):
"""An exception raised when the maximum number of application commands was reached """An exception raised when the maximum number of application commands was reached
either globally or in a guild. either globally or in a guild.

16
discord/app_commands/tree.py

@ -55,7 +55,7 @@ from .errors import (
CommandAlreadyRegistered, CommandAlreadyRegistered,
CommandNotFound, CommandNotFound,
CommandSignatureMismatch, CommandSignatureMismatch,
MaxCommandsReached, CommandLimitReached,
) )
from ..errors import ClientException from ..errors import ClientException
from ..enums import AppCommandType, InteractionType from ..enums import AppCommandType, InteractionType
@ -195,7 +195,7 @@ class CommandTree(Generic[ClientT]):
Raises Raises
-------- --------
MaxCommandsReached CommandLimitReached
The maximum number of commands was reached for that guild. The maximum number of commands was reached for that guild.
This is currently 100 for slash commands and 5 for context menu commands. This is currently 100 for slash commands and 5 for context menu commands.
""" """
@ -207,7 +207,7 @@ class CommandTree(Generic[ClientT]):
mapping.update(self._global_commands) mapping.update(self._global_commands)
if len(mapping) > 100: if len(mapping) > 100:
raise MaxCommandsReached(guild_id=guild.id, limit=100) raise CommandLimitReached(guild_id=guild.id, limit=100)
ctx_menu: Dict[Tuple[str, Optional[int], int], ContextMenu] = { ctx_menu: Dict[Tuple[str, Optional[int], int], ContextMenu] = {
(name, guild.id, cmd_type): cmd (name, guild.id, cmd_type): cmd
@ -219,7 +219,7 @@ class CommandTree(Generic[ClientT]):
for cmd_type, count in counter.items(): for cmd_type, count in counter.items():
if count > 5: if count > 5:
as_enum = AppCommandType(cmd_type) as_enum = AppCommandType(cmd_type)
raise MaxCommandsReached(guild_id=guild.id, limit=5, type=as_enum) raise CommandLimitReached(guild_id=guild.id, limit=5, type=as_enum)
self._context_menus.update(ctx_menu) self._context_menus.update(ctx_menu)
self._guild_commands[guild.id] = mapping self._guild_commands[guild.id] = mapping
@ -262,7 +262,7 @@ class CommandTree(Generic[ClientT]):
TypeError TypeError
The application command passed is not a valid application command. The application command passed is not a valid application command.
Or, ``guild`` and ``guilds`` were both given. Or, ``guild`` and ``guilds`` were both given.
MaxCommandsReached CommandLimitReached
The maximum number of commands was reached globally or for that guild. The maximum number of commands was reached globally or for that guild.
This is currently 100 for slash commands and 5 for context menu commands. This is currently 100 for slash commands and 5 for context menu commands.
""" """
@ -285,7 +285,7 @@ class CommandTree(Generic[ClientT]):
total = sum(1 for _, g, t in self._context_menus if g == guild_id and t == type) total = sum(1 for _, g, t in self._context_menus if g == guild_id and t == type)
if total + found > 5: if total + found > 5:
raise MaxCommandsReached(guild_id=guild_id, limit=5, type=AppCommandType(type)) raise CommandLimitReached(guild_id=guild_id, limit=5, type=AppCommandType(type))
data[key] = command data[key] = command
if guild_ids is None: if guild_ids is None:
@ -316,7 +316,7 @@ class CommandTree(Generic[ClientT]):
if found and not override: if found and not override:
raise CommandAlreadyRegistered(name, guild_id) raise CommandAlreadyRegistered(name, guild_id)
if len(commands) + found > 100: if len(commands) + found > 100:
raise MaxCommandsReached(guild_id=guild_id, limit=100) raise CommandLimitReached(guild_id=guild_id, limit=100)
# Actually add the command now that it has been verified to be okay. # Actually add the command now that it has been verified to be okay.
for guild_id in guild_ids: for guild_id in guild_ids:
@ -327,7 +327,7 @@ class CommandTree(Generic[ClientT]):
if found and not override: if found and not override:
raise CommandAlreadyRegistered(name, None) raise CommandAlreadyRegistered(name, None)
if len(self._global_commands) + found > 100: if len(self._global_commands) + found > 100:
raise MaxCommandsReached(guild_id=None, limit=100) raise CommandLimitReached(guild_id=None, limit=100)
self._global_commands[name] = root self._global_commands[name] = root
@overload @overload

4
docs/interactions/api.rst

@ -575,7 +575,7 @@ Exceptions
.. autoexception:: discord.app_commands.CommandOnCooldown .. autoexception:: discord.app_commands.CommandOnCooldown
:members: :members:
.. autoexception:: discord.app_commands.MaxCommandsReached .. autoexception:: discord.app_commands.CommandLimitReached
:members: :members:
.. autoexception:: discord.app_commands.CommandAlreadyRegistered .. autoexception:: discord.app_commands.CommandAlreadyRegistered
@ -603,7 +603,7 @@ Exception Hierarchy
- :exc:`~discord.app_commands.MissingPermissions` - :exc:`~discord.app_commands.MissingPermissions`
- :exc:`~discord.app_commands.BotMissingPermissions` - :exc:`~discord.app_commands.BotMissingPermissions`
- :exc:`~discord.app_commands.CommandOnCooldown` - :exc:`~discord.app_commands.CommandOnCooldown`
- :exc:`~discord.app_commands.MaxCommandsReached` - :exc:`~discord.app_commands.CommandLimitReached`
- :exc:`~discord.app_commands.CommandAlreadyRegistered` - :exc:`~discord.app_commands.CommandAlreadyRegistered`
- :exc:`~discord.app_commands.CommandSignatureMismatch` - :exc:`~discord.app_commands.CommandSignatureMismatch`
- :exc:`~discord.app_commands.CommandNotFound` - :exc:`~discord.app_commands.CommandNotFound`

Loading…
Cancel
Save