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

Change View dispatch mechanism to be keyed by message_id as well

Browse Source 
If different persistent view instances are used within different
message_ids their callbacks will get called without differentiating
between them, leading to potential issues such as 404 errors. This
change makes it so N views with custom IDs bound to N message_ids
will no longer conflict with one another.
This commit is contained in:
Rapptz 2021-07-31 23:08:05 -04:00
parent f72350199d
commit e795d341e7
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
discord/ui/view.py
View File

@ -456,8 +456,8 @@ class View:
class ViewStore:
def __init__(self, state: ConnectionState):
# (component_type, custom_id): (View, Item)
self._views: Dict[Tuple[int, str], Tuple[View, Item]] = {}
# (component_type, message_id, custom_id): (View, Item)
self._views: Dict[Tuple[int, Optional[int], str], Tuple[View, Item]] = {}
# message_id: View
self._synced_message_views: Dict[int, View] = {}
self._state: ConnectionState = state
@ -474,7 +474,7 @@ class ViewStore:
return list(views.values())
def __verify_integrity(self):
to_remove: List[Tuple[int, str]] = []
to_remove: List[Tuple[int, Optional[int], str]] = []
now = time.monotonic()
for (k, (view, _)) in self._views.items():
if view.is_finished():
@ -489,7 +489,7 @@ class ViewStore:
view._start_listening_from_store(self)
for item in view.children:
if item.is_dispatchable():
self._views[(item.type.value, item.custom_id)] = (view, item) # type: ignore
self._views[(item.type.value, message_id, item.custom_id)] = (view, item) # type: ignore
if message_id is not None:
self._synced_message_views[message_id] = view
@ -506,7 +506,8 @@ class ViewStore:
def dispatch(self, component_type: int, custom_id: str, interaction: Interaction):
self.__verify_integrity()
key = (component_type, custom_id)
message_id: Optional[int] = interaction.message and interaction.message.id
key = (component_type, message_id, custom_id)
value = self._views.get(key)
if value is None:
return