LonamiWebs/Telethon
1
1
Fork 0
mirror of https://github.com/LonamiWebs/Telethon.git synced 2025-11-04 09:57:29 +03:00
Code Issues Packages Projects Releases Wiki Activity

Raise TypeError in get_input_peer if access_hash is None

Browse Source 
When auto-casting to input peers if the access hash is now None,
the ID will be used to look-up a cached access hash which will
solve some common pitfalls (using full entities when only the
input variant should and could be used).
This commit is contained in:
Lonami Exo 2018-12-15 12:23:14 +01:00
parent 7ee7b43547
commit 5018879f84
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
telethon/utils.py
View File

@ -108,10 +108,12 @@ def _raise_cast_fail(entity, target):
type(entity).__name__, target)) type(entity).__name__, target))
def get_input_peer(entity, allow_self=True): def get_input_peer(entity, allow_self=True, check_hash=True):
""" """
Gets the input peer for the given "entity" (user, chat or channel). Gets the input peer for the given "entity" (user, chat or channel).
A ``TypeError`` is raised if the given entity isn't a supported type.
A ``TypeError`` is raised if the given entity isn't a supported type
or if ``check_hash is True`` but the entity's ``access_hash is None``.
""" """
try: try:
if entity.SUBCLASS_OF_ID == 0xc91c90b6: # crc32(b'InputPeer') if entity.SUBCLASS_OF_ID == 0xc91c90b6: # crc32(b'InputPeer')
@ -128,14 +130,19 @@ def get_input_peer(entity, allow_self=True):
if isinstance(entity, types.User): if isinstance(entity, types.User):
if entity.is_self and allow_self: if entity.is_self and allow_self:
return types.InputPeerSelf() return types.InputPeerSelf()
elif entity.access_hash is not None or not check_hash:
return types.InputPeerUser(entity.id, entity.access_hash)
else: else:
return types.InputPeerUser(entity.id, entity.access_hash or 0) raise TypeError('User without access_hash cannot be input')
if isinstance(entity, (types.Chat, types.ChatEmpty, types.ChatForbidden)): if isinstance(entity, (types.Chat, types.ChatEmpty, types.ChatForbidden)):
return types.InputPeerChat(entity.id) return types.InputPeerChat(entity.id)
if isinstance(entity, (types.Channel, types.ChannelForbidden)): if isinstance(entity, (types.Channel, types.ChannelForbidden)):
return types.InputPeerChannel(entity.id, entity.access_hash or 0) if entity.access_hash is not None or not check_hash:
return types.InputPeerChannel(entity.id, entity.access_hash)
else:
raise TypeError('Channel without access_hash cannot be input')
if isinstance(entity, types.InputUser): if isinstance(entity, types.InputUser):
return types.InputPeerUser(entity.user_id, entity.access_hash) return types.InputPeerUser(entity.user_id, entity.access_hash)
@ -703,7 +710,7 @@ def get_peer(peer):
elif isinstance(peer, types.ChannelFull): elif isinstance(peer, types.ChannelFull):
return types.PeerChannel(peer.id) return types.PeerChannel(peer.id)
peer = get_input_peer(peer, allow_self=False) peer = get_input_peer(peer, allow_self=False, check_hash=False)
if isinstance(peer, types.InputPeerUser): if isinstance(peer, types.InputPeerUser):
return types.PeerUser(peer.user_id) return types.PeerUser(peer.user_id)
elif isinstance(peer, types.InputPeerChat): elif isinstance(peer, types.InputPeerChat):