hoelee/Telethon
1
0
Fork 0
mirror of https://github.com/LonamiWebs/Telethon.git synced 2025-11-15 05:20:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove redundant entity cache

Browse Source 
Progress towards #3989.
May also help with #3235.
This commit is contained in:
Lonami Exo
2023-04-06 13:09:07 +02:00
parent 3e64ea35ff
commit f7e38ee6f0
14 changed files with 35 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
telethon/events/album.py
View File

@@ -160,7 +160,7 @@ class Album(EventBuilder):
def _set_client(self, client):
super()._set_client(client)
self._sender, self._input_sender = utils._get_entity_pair(
self.sender_id, self._entities, client._entity_cache)
self.sender_id, self._entities, client._mb_entity_cache)
for msg in self.messages:
msg._finish_init(client, self._entities, None)

7
telethon/events/callbackquery.py
View File

@@ -151,7 +151,7 @@ class CallbackQuery(EventBuilder):
def _set_client(self, client):
super()._set_client(client)
self._sender, self._input_sender = utils._get_entity_pair(
self.sender_id, self._entities, client._entity_cache)
self.sender_id, self._entities, client._mb_entity_cache)
@property
def id(self):
@@ -208,8 +208,9 @@ class CallbackQuery(EventBuilder):
if not getattr(self._input_sender, 'access_hash', True):
# getattr with True to handle the InputPeerSelf() case
try:
self._input_sender = self._client._entity_cache[self._sender_id]
except KeyError:
self._input_sender = self._client._mb_entity_cache.get(
utils.resolve_id(self._sender_id)[0])._as_input_peer()
except AttributeError:
m = await self.get_message()
if m:
self._sender = m._sender

5
telethon/events/chataction.py
View File

@@ -425,9 +425,10 @@ class ChatAction(EventBuilder):
# If missing, try from the entity cache
try:
self._input_users.append(self._client._entity_cache[user_id])
self._input_users.append(self._client._mb_entity_cache.get(
utils.resolve_id(user_id)[0])._as_input_peer())
continue
except KeyError:
except AttributeError:
pass
return self._input_users or []

2
telethon/events/common.py
View File

@@ -154,7 +154,7 @@ class EventCommon(ChatGetter, abc.ABC):
self._client = client
if self._chat_peer:
self._chat, self._input_chat = utils._get_entity_pair(
self.chat_id, self._entities, client._entity_cache)
self.chat_id, self._entities, client._mb_entity_cache)
else:
self._chat = self._input_chat = None

2
telethon/events/inlinequery.py
View File

@@ -99,7 +99,7 @@ class InlineQuery(EventBuilder):
def _set_client(self, client):
super()._set_client(client)
self._sender, self._input_sender = utils._get_entity_pair(
self.sender_id, self._entities, client._entity_cache)
self.sender_id, self._entities, client._mb_entity_cache)
@property
def id(self):

2
telethon/events/userupdate.py
View File

@@ -95,7 +95,7 @@ class UserUpdate(EventBuilder):
def _set_client(self, client):
super()._set_client(client)
self._sender, self._input_sender = utils._get_entity_pair(
self.sender_id, self._entities, client._entity_cache)
self.sender_id, self._entities, client._mb_entity_cache)
@property
def user(self):