LonamiWebs/Telethon
1
1
Fork 0
mirror of https://github.com/LonamiWebs/Telethon.git synced 2024-09-21 03:08:49 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix logical bugs when getting input peers in custom.Message

Browse Source 
Such as incorrectly handling InputPeerSelf/InputPeerChat and
using self._input_sender when self._input_chat was expected.
This commit is contained in:
Lonami Exo 2018-07-22 11:33:29 +02:00
parent e4963237dc
commit bc03c29216
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
telethon/tl/custom/message.py
View File

@ -46,7 +46,7 @@ class Message(ChatGetter, SenderGetter):
self._sender = entities.get(self._sender_id) self._sender = entities.get(self._sender_id)
if self._sender: if self._sender:
self._input_sender = get_input_peer(self._sender) self._input_sender = get_input_peer(self._sender)
if not getattr(self._input_sender, 'access_hash', None): if not getattr(self._input_sender, 'access_hash', True):
self._input_sender = None self._input_sender = None
else: else:
self._input_sender = None self._input_sender = None
@ -64,8 +64,10 @@ class Message(ChatGetter, SenderGetter):
self._input_chat = input_chat self._input_chat = input_chat
if not self._input_chat and self._chat: if not self._input_chat and self._chat:
self._input_chat = get_input_peer(self._chat) self._input_chat = get_input_peer(self._chat)
if not getattr(self._input_sender, 'access_hash', None): if not getattr(self._input_chat, 'access_hash', True):
# Telegram may omit the hash in updates -> invalid peer # Telegram may omit the hash in updates -> invalid peer
# However things like InputPeerSelf() or InputPeerChat(id)
# are still valid so default to getting "True" on not found
self._input_chat = None self._input_chat = None
if getattr(self.original_message, 'fwd_from', None): if getattr(self.original_message, 'fwd_from', None):