LonamiWebs/Telethon
1
1
Fork 0
mirror of https://github.com/LonamiWebs/Telethon.git synced 2025-01-24 08:14:14 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix EntityDatabase.get_input_peer not actually working

Browse Source
This commit is contained in:
Lonami Exo 2017-10-06 21:42:04 +02:00
parent 804a29d0bc
commit 79e36c98bd
2 changed files with 35 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
telethon/tl/entity_database.py
View File

@ -4,7 +4,10 @@ import re
from .. import utils from .. import utils
from ..tl import TLObject from ..tl import TLObject
from ..tl.types import User, Chat, Channel from ..tl.types import (
User, Chat, Channel, PeerUser, PeerChat, PeerChannel,
InputPeerUser, InputPeerChat, InputPeerChannel
)
class EntityDatabase: class EntityDatabase:
@ -174,9 +177,18 @@ class EntityDatabase:
def get_input_entity(self, peer): def get_input_entity(self, peer):
try: try:
return self._input_entities[utils.get_peer_id(peer, add_mark=True)] i, k = utils.get_peer_id(peer, add_mark=True, get_kind=True)
h = self._input_entities[i]
if k == PeerUser:
return InputPeerUser(i, h)
elif k == PeerChat:
return InputPeerChat(i)
elif k == PeerChannel:
return InputPeerChannel(i, h)
except ValueError as e: except ValueError as e:
raise KeyError(peer) from e raise KeyError(peer) from e
raise KeyError(peer)
def get_input_list(self): def get_input_list(self):
return list(self._input_entities.items()) return list(self._input_entities.items())

35
telethon/utils.py
View File

@ -300,39 +300,42 @@ def get_input_media(media, user_caption=None, is_photo=False):
_raise_cast_fail(media, 'InputMedia') _raise_cast_fail(media, 'InputMedia')
def get_peer_id(peer, add_mark=False): def get_peer_id(peer, add_mark=False, get_kind=False):
"""Finds the ID of the given peer, and optionally converts it to """Finds the ID of the given peer, and optionally converts it to
the "bot api" format if 'add_mark' is set to True. the "bot api" format if 'add_mark' is set to True.
If 'get_kind', the kind will be returned as a second value.
""" """
i, k = None, None # determined ID and kind
if not isinstance(peer, TLObject): if not isinstance(peer, TLObject):
if isinstance(peer, int): if isinstance(peer, int):
return peer i, k = peer, PeerUser
else: else:
_raise_cast_fail(peer, 'int') _raise_cast_fail(peer, 'int')
if type(peer).SUBCLASS_OF_ID not in {0x2d45687, 0xc91c90b6}: elif type(peer).SUBCLASS_OF_ID not in {0x2d45687, 0xc91c90b6}:
# Not a Peer or an InputPeer, so first get its Input version # Not a Peer or an InputPeer, so first get its Input version
peer = get_input_peer(peer, allow_self=False) peer = get_input_peer(peer, allow_self=False)
if isinstance(peer, PeerUser) or isinstance(peer, InputPeerUser): if isinstance(peer, PeerUser) or isinstance(peer, InputPeerUser):
return peer.user_id i, k = peer.user_id, PeerUser
else: elif isinstance(peer, PeerChat) or isinstance(peer, InputPeerChat):
if isinstance(peer, PeerChat) or isinstance(peer, InputPeerChat): k = PeerChat
if not add_mark:
return peer.chat_id
# Chats are marked by turning them into negative numbers # Chats are marked by turning them into negative numbers
return -peer.chat_id i = -peer.chat_id if add_mark else peer.chat_id
elif isinstance(peer, PeerChannel) or isinstance(peer, InputPeerChannel): elif isinstance(peer, PeerChannel) or isinstance(peer, InputPeerChannel):
if not add_mark: k = PeerChannel
return peer.channel_id i = peer.channel_id
if add_mark:
# Prepend -100 through math tricks (.to_supergroup() on Madeline) # Concat -100 through math tricks, .to_supergroup() on Madeline
i = peer.channel_id # IDs will be strictly positive -> log works # IDs will be strictly positive -> log works
return -(i + pow(10, math.floor(math.log10(i) + 3))) i = -(i + pow(10, math.floor(math.log10(i) + 3)))
if i is None:
_raise_cast_fail(peer, 'int') _raise_cast_fail(peer, 'int')
return (i, k) if get_kind else i # return kind only if get_kind
def resolve_id(marked_id): def resolve_id(marked_id):
"""Given a marked ID, returns the original ID and its Peer type""" """Given a marked ID, returns the original ID and its Peer type"""