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

Ensure explicitly set parents on nested groups are respected

Browse Source 
This had a multiple layer bug that needed to be squashed. The first
issue was that setting `parent=...` inside a `Group` wouldn't actually
add the `Group` into the `parent` children mapping. This meant that
it didn't actually end up copying the children when it came time to
within e.g. a Cog.

The second issue was that even if it was added into the children
listing, it wouldn't properly set the attribute.

This commit fixes both of these issues.

Fix #7818
This commit is contained in:
Rapptz
2022-04-01 09:04:44 -04:00
parent c671308211
commit 25ad5b675c
2 changed files with 46 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
discord/app_commands/commands.py
View File

@ -971,6 +971,7 @@ class Group:
self.name: str = validate_name(name) if name is not MISSING else cls.__discord_app_commands_group_name__
self.description: str = description or cls.__discord_app_commands_group_description__
self._attr: Optional[str] = None
self._owner_cls: Optional[Type[Any]] = None
self._guild_ids: Optional[List[int]] = guild_ids
if not self.description:
@ -1004,12 +1005,15 @@ class Group:
if copy._attr and not cls.__discord_app_commands_skip_init_binding__:
setattr(self, copy._attr, copy)
if parent is not None and parent.parent is not None:
raise ValueError('groups can only be nested at most one level')
if parent is not None:
if parent.parent is not None:
raise ValueError('groups can only be nested at most one level')
parent.add_command(self)
def __set_name__(self, owner: Type[Any], name: str) -> None:
self._attr = name
self.module = owner.__module__
self._owner_cls = owner
def _copy_with(
self,
@ -1029,6 +1033,7 @@ class Group:
copy.parent = parent
copy.module = self.module
copy._attr = self._attr
copy._owner_cls = self._owner_cls
copy._children = {}
bindings[self] = copy
@ -1038,6 +1043,12 @@ class Group:
child_copy.parent = copy
copy._children[child_copy.name] = child_copy
if isinstance(child_copy, Group) and child_copy._attr and set_on_binding:
if binding.__class__ is child_copy._owner_cls:
setattr(binding, child_copy._attr, child_copy)
elif child_copy._owner_cls is copy.__class__:
setattr(copy, child_copy._attr, child_copy)
if copy._attr and set_on_binding:
setattr(parent or binding, copy._attr, copy)