@ -207,6 +207,24 @@ class _ViewWeights:
self . weights = [ 0 , 0 , 0 , 0 , 0 ] self . weights = [ 0 , 0 , 0 , 0 , 0 ]
class _ViewCacheSnapshot :
__slots__ = ( ' items ' , ' dynamic_items ' )
def __init__ ( self ) - > None :
self . items : Set [ Tuple [ int , str ] ] = set ( )
self . dynamic_items : Set [ re . Pattern [ str ] ] = set ( )
@classmethod
def diff ( cls , older : _ViewCacheSnapshot , newer : _ViewCacheSnapshot ) - > Self :
self = cls ( )
self . items = older . items - newer . items
self . dynamic_items = older . dynamic_items - newer . dynamic_items
return self
def __repr__ ( self ) - > str :
return f ' <_ViewCacheSnapshot items= { self . items !r} dynamic_items= { self . dynamic_items !r} > '
class BaseView : class BaseView :
__discord_ui_view__ : ClassVar [ bool ] = False __discord_ui_view__ : ClassVar [ bool ] = False
__discord_ui_modal__ : ClassVar [ bool ] = False __discord_ui_modal__ : ClassVar [ bool ] = False
@ -220,6 +238,7 @@ class BaseView:
self . __cancel_callback : Optional [ Callable [ [ BaseView ] , None ] ] = None self . __cancel_callback : Optional [ Callable [ [ BaseView ] , None ] ] = None
self . __timeout_expiry : Optional [ float ] = None self . __timeout_expiry : Optional [ float ] = None
self . __timeout_task : Optional [ asyncio . Task [ None ] ] = None self . __timeout_task : Optional [ asyncio . Task [ None ] ] = None
self . __snapshot : Optional [ _ViewCacheSnapshot ] = None
try : try :
loop = asyncio . get_running_loop ( ) loop = asyncio . get_running_loop ( )
@ -326,6 +345,31 @@ class BaseView:
def _add_count ( self , value : int ) - > None : def _add_count ( self , value : int ) - > None :
self . _total_children = max ( 0 , self . _total_children + value ) self . _total_children = max ( 0 , self . _total_children + value )
@property
def _snapshot ( self ) - > Optional [ _ViewCacheSnapshot ] :
return self . __snapshot
def _get_snapshot_diff ( self ) - > Optional [ _ViewCacheSnapshot ] :
if self . __snapshot is None :
self . __snapshot = self . _get_snapshot ( )
return None
newer = self . _get_snapshot ( )
diff = _ViewCacheSnapshot . diff ( older = self . __snapshot , newer = newer )
# Update our snapshot to the newer version after diffing it
self . __snapshot = newer
return diff
def _get_snapshot ( self ) - > _ViewCacheSnapshot :
snapshot = _ViewCacheSnapshot ( )
for item in self . walk_children ( ) :
if isinstance ( item , DynamicItem ) :
snapshot . dynamic_items . add ( item . __discord_ui_compiled_template__ )
elif item . is_dispatchable ( ) :
custom_id = item . custom_id # type: ignore
snapshot . items . add ( ( item . type . value , custom_id ) )
return snapshot
@property @property
def children ( self ) - > List [ Item [ Self ] ] : def children ( self ) - > List [ Item [ Self ] ] :
""" List[:class:`Item`]: The list of children attached to this view. """ """ List[:class:`Item`]: The list of children attached to this view. """
@ -901,6 +945,7 @@ class ViewStore:
dispatch_info = self . _views . get ( message_id , { } ) dispatch_info = self . _views . get ( message_id , { } )
is_fully_dynamic = True is_fully_dynamic = True
snapshot = view . _get_snapshot_diff ( )
for item in view . walk_children ( ) : for item in view . walk_children ( ) :
if isinstance ( item , DynamicItem ) : if isinstance ( item , DynamicItem ) :
pattern = item . __discord_ui_compiled_template__ pattern = item . __discord_ui_compiled_template__
@ -909,6 +954,12 @@ class ViewStore:
dispatch_info [ ( item . type . value , item . custom_id ) ] = item # type: ignore dispatch_info [ ( item . type . value , item . custom_id ) ] = item # type: ignore
is_fully_dynamic = False is_fully_dynamic = False
if snapshot is not None :
for key in snapshot . items :
dispatch_info . pop ( key , None )
for key in snapshot . dynamic_items :
self . _dynamic_items . pop ( key , None )
view . _cache_key = message_id view . _cache_key = message_id
if dispatch_info : if dispatch_info :
self . _views [ message_id ] = dispatch_info self . _views [ message_id ] = dispatch_info
@ -922,13 +973,12 @@ class ViewStore:
return return
dispatch_info = self . _views . get ( view . _cache_key ) dispatch_info = self . _views . get ( view . _cache_key )
if dispatch_info : snapshot = view . _snapshot
for item in view . walk_children ( ) : if dispatch_info and snapshot :
if isinstance ( item , DynamicItem ) : for key in snapshot . items :
pattern = item . __discord_ui_compiled_template__ dispatch_info . pop ( key , None )
self . _dynamic_items . pop ( pattern , None ) for key in snapshot . dynamic_items :
elif item . is_dispatchable ( ) : self . _dynamic_items . pop ( key , None )
dispatch_info . pop ( ( item . type . value , item . custom_id ) , None ) # type: ignore
if dispatch_info is not None and len ( dispatch_info ) == 0 : if dispatch_info is not None and len ( dispatch_info ) == 0 :
self . _views . pop ( view . _cache_key , None ) self . _views . pop ( view . _cache_key , None )
@ -1003,15 +1053,12 @@ class ViewStore:
def dispatch_view ( self , component_type : int , custom_id : str , interaction : Interaction [ ClientT ] ) - > None : def dispatch_view ( self , component_type : int , custom_id : str , interaction : Interaction [ ClientT ] ) - > None :
self . dispatch_dynamic_items ( component_type , custom_id , interaction ) self . dispatch_dynamic_items ( component_type , custom_id , interaction )
interaction_id : Optional [ int ] = None
message_id : Optional [ int ] = None message_id : Optional [ int ] = None
# Realistically, in a component based interaction the Interaction.message will never be None # Realistically, in a component based interaction the Interaction.message will never be None
# However, this guard is just in case Discord screws up somehow # However, this guard is just in case Discord screws up somehow
msg = interaction . message msg = interaction . message
if msg is not None : if msg is not None :
message_id = msg . id message_id = msg . id
if msg . interaction_metadata :
interaction_id = msg . interaction_metadata . id
key = ( component_type , custom_id ) key = ( component_type , custom_id )
@ -1020,21 +1067,6 @@ class ViewStore:
if message_id is not None : if message_id is not None :
item = self . _views . get ( message_id , { } ) . get ( key ) item = self . _views . get ( message_id , { } ) . get ( key )
if item is None and interaction_id is not None :
try :
items = self . _views . pop ( interaction_id )
except KeyError :
item = None
else :
item = items . get ( key )
# If we actually got the items, then these keys should probably be moved
# to the proper message_id instead of the interaction_id as they are now.
# An interaction_id is only used as a temporary stop gap for
# InteractionResponse.send_message so multiple view instances do not
# override each other.
# NOTE: Fix this mess if /callback endpoint ever gets proper return types
self . _views . setdefault ( message_id , { } ) . update ( items )
if item is None : if item is None :
# Fallback to None message_id searches in case a persistent view # Fallback to None message_id searches in case a persistent view
# was added without an associated message_id # was added without an associated message_id
@ -1066,11 +1098,6 @@ class ViewStore:
self . add_task ( modal . _dispatch_submit ( interaction , components , resolved ) ) self . add_task ( modal . _dispatch_submit ( interaction , components , resolved ) )
def remove_interaction_mapping ( self , interaction_id : int ) - > None :
# This is called before re-adding the view
self . _views . pop ( interaction_id , None )
self . _synced_message_views . pop ( interaction_id , None )
def is_message_tracked ( self , message_id : int ) - > bool : def is_message_tracked ( self , message_id : int ) - > bool :
return message_id in self . _synced_message_views return message_id in self . _synced_message_views
Soheab
4 months ago