LonamiWebs/Telethon
1
1
Fork 0
mirror of https://github.com/LonamiWebs/Telethon.git synced 2024-11-25 19:03:46 +03:00
Code Issues Packages Projects Releases Wiki Activity

Use builtin base64.urlsafe_b64decode and fix docstring

Browse Source
This commit is contained in:
Lonami Exo 2018-08-02 13:59:27 +02:00
parent 2ca8ddbfb4
commit 3612652f39
1 changed files with 13 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
telethon/utils.py
View File

@ -761,23 +761,18 @@ def _rle_decode(data):
def _decode_telegram_base64(string):
"""
Decodes an url-safe base64-encoded string into its bytes.
Decodes an url-safe base64-encoded string into its bytes
by first adding the stripped necessary padding characters.
This is the way Telegram shares binary data as strings,
such as Bot API-style file IDs or invite links.
Returns ``None`` if the input string was not valid.
"""
try:
data = string.encode('ascii')
except (UnicodeEncodeError, AttributeError):
return None
data = data.replace(b'-', b'+').replace(
b'_', b'/') + b'=' * (len(data) % 4)
try:
return base64.b64decode(data)
except binascii.Error:
return None
return base64.urlsafe_b64decode(string + '=' * (len(string) % 4))
except (binascii.Error, ValueError, TypeError):
return None # not valid base64, not valid ascii, not a string
def resolve_bot_file_id(file_id):
@ -850,16 +845,16 @@ def resolve_bot_file_id(file_id):
def resolve_invite_link(link):
"""
Resolves the given invite link. Returns a tuple of
``(creator user id, global chat id, random int)``.
``(link creator user id, global chat id, random int)``.
Note that for broadcast channels, the creator user
ID will be zero to protect their identity. Normal
chats and megagroup channels will have creator ID.
Note that for broadcast channels, the link creator
user ID will be zero to protect their identity.
Normal chats and megagroup channels will have such ID.
Note that the chat ID may not be accurate for chats
with a link that were upgraded to megagroup, since
the link can remain the same, but the ID will be
correct once a new link is generated.
the link can remain the same, but the chat ID will
be correct once a new link is generated.
"""
link_hash, is_link = parse_username(link)
if not is_link: