matthew/enhanced-discord.py
1
0
Fork 0
Code Issues 4 Pull Requests 21 Projects Releases Wiki Activity

[commands] fully remove command when CommandRegistrationError is raised for alias

Browse Source
This commit is contained in:
Sebastian Law 2020-12-29 05:24:54 -08:00 committed by GitHub
parent faffc8eeb2
commit e9e81d1a55
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
discord/ext/commands/core.py
View File

@ -1145,6 +1145,7 @@ class GroupMixin:
self.all_commands[command.name] = command self.all_commands[command.name] = command
for alias in command.aliases: for alias in command.aliases:
if alias in self.all_commands: if alias in self.all_commands:
self.remove_command(command.name)
raise CommandRegistrationError(alias, alias_conflict=True) raise CommandRegistrationError(alias, alias_conflict=True)
self.all_commands[alias] = command self.all_commands[alias] = command
@ -1177,7 +1178,12 @@ class GroupMixin:
# we're not removing the alias so let's delete the rest of them. # we're not removing the alias so let's delete the rest of them.
for alias in command.aliases: for alias in command.aliases:
self.all_commands.pop(alias, None) cmd = self.all_commands.pop(alias, None)
# in the case of a CommandRegistrationError, an alias might conflict
# with an already existing command. If this is the case, we want to
# make sure the pre-existing command is not removed.
if cmd not in (None, command):
self.all_commands[alias] = cmd
return command return command
def walk_commands(self): def walk_commands(self):