From e198a0e7e6df58bdfcba1cdbf31345ed67c5f10e Mon Sep 17 00:00:00 2001 From: Rapptz Date: Wed, 27 Apr 2022 01:24:10 -0400 Subject: [PATCH] Avoid re-creating View children on edit The older code attempted to be clever and sync component additions and removals with what the message edit is doing. In some cases, this led to the re-creation of those components causing lost attributes to be dropped such as `_rendered_row` which would mess up handling of view weights. Instead of recreating the children list every time and keeping track of additions and removals, this change just updates the old state with the new state while ignoring any new or removed additions. This should work fine in theory due to additions or removals already being present before editing the View instance in the first place. Closes #7231 #7511 --- discord/ui/view.py | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/discord/ui/view.py b/discord/ui/view.py index 64b2823d5..0195b9277 100644 --- a/discord/ui/view.py +++ b/discord/ui/view.py @@ -441,25 +441,26 @@ class View: asyncio.create_task(self._scheduled_task(item, interaction), name=f'discord-ui-view-dispatch-{self.id}') def _refresh(self, components: List[Component]) -> None: - # This is pretty hacky at the moment # fmt: off - old_state: Dict[Tuple[int, str], Item[Any]] = { - (item.type.value, item.custom_id): item # type: ignore + old_state: Dict[str, Item[Any]] = { + item.custom_id: item # type: ignore for item in self._children if item.is_dispatchable() } # fmt: on - children: List[Item[Any]] = [] + for component in _walk_all_components(components): + custom_id = getattr(component, 'custom_id', None) + if custom_id is None: + continue + try: - older = old_state[(component.type.value, component.custom_id)] # type: ignore - except (KeyError, AttributeError): - children.append(_component_to_item(component)) + older = old_state[custom_id] + except KeyError: + _log.debug('View interaction referenced an unknown item custom_id %s. Discarding', custom_id) + continue else: older._refresh_component(component) - children.append(older) - - self._children = children def stop(self) -> None: """Stops listening to interaction events from this view.