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

Revert add_mark parameter on utils.get_peer_id

Browse Source 
And a fix for -1000 IDs that wasn't being accounted for.
This commit is contained in:
Lonami Exo 2018-07-07 12:44:05 +02:00
parent 5d4b8a283d
commit 3b3b148a43
1 changed files with 11 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
telethon/utils.py
View File

@ -575,17 +575,6 @@ def parse_username(username):
return None, False return None, False
def _fix_peer_id(peer_id):
"""
Fixes the peer ID for chats and channels, in case the users
mix marking the ID with the :tl:`Peer` constructors.
"""
peer_id = abs(peer_id)
if str(peer_id).startswith('100'):
peer_id = str(peer_id)[3:]
return int(peer_id)
def get_inner_text(text, entities): def get_inner_text(text, entities):
""" """
Gets the inner text that's surrounded by the given entities. Gets the inner text that's surrounded by the given entities.
@ -605,7 +594,7 @@ def get_inner_text(text, entities):
return result return result
def get_peer_id(peer): def get_peer_id(peer, add_mark=True):
""" """
Finds the ID of the given peer, and converts it to the "bot api" format Finds the ID of the given peer, and converts it to the "bot api" format
so it the peer can be identified back. User ID is left unmodified, so it the peer can be identified back. User ID is left unmodified,
@ -616,7 +605,7 @@ def get_peer_id(peer):
""" """
# First we assert it's a Peer TLObject, or early return for integers # First we assert it's a Peer TLObject, or early return for integers
if isinstance(peer, int): if isinstance(peer, int):
return peer return peer if add_mark else resolve_id(peer)[0]
try: try:
if peer.SUBCLASS_OF_ID not in (0x2d45687, 0xc91c90b6): if peer.SUBCLASS_OF_ID not in (0x2d45687, 0xc91c90b6):
@ -634,9 +623,9 @@ def get_peer_id(peer):
elif isinstance(peer, (PeerChat, InputPeerChat)): elif isinstance(peer, (PeerChat, InputPeerChat)):
# Check in case the user mixed things up to avoid blowing up # Check in case the user mixed things up to avoid blowing up
if not (0 < peer.chat_id <= 0x7fffffff): if not (0 < peer.chat_id <= 0x7fffffff):
peer.chat_id = _fix_peer_id(peer.chat_id) peer.chat_id = resolve_id(peer.chat_id)[0]
return -peer.chat_id return -peer.chat_id if add_mark else peer.chat_id
elif isinstance(peer, (PeerChannel, InputPeerChannel, ChannelFull)): elif isinstance(peer, (PeerChannel, InputPeerChannel, ChannelFull)):
if isinstance(peer, ChannelFull): if isinstance(peer, ChannelFull):
# Special case: .get_input_peer can't return InputChannel from # Special case: .get_input_peer can't return InputChannel from
@ -647,15 +636,18 @@ def get_peer_id(peer):
# Check in case the user mixed things up to avoid blowing up # Check in case the user mixed things up to avoid blowing up
if not (0 < i <= 0x7fffffff): if not (0 < i <= 0x7fffffff):
i = _fix_peer_id(i) i = resolve_id(i)[0]
if isinstance(peer, ChannelFull): if isinstance(peer, ChannelFull):
peer.id = i peer.id = i
else: else:
peer.channel_id = i peer.channel_id = i
# Concat -100 through math tricks, .to_supergroup() on Madeline if add_mark:
# IDs will be strictly positive -> log works # Concat -100 through math tricks, .to_supergroup() on
return -(i + pow(10, math.floor(math.log10(i) + 3))) # Madeline IDs will be strictly positive -> log works.
return -(i + pow(10, math.floor(math.log10(i) + 3)))
else:
return i
_raise_cast_fail(peer, 'int') _raise_cast_fail(peer, 'int')