Xtao-Labs/MTPyroger
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove token parameter

Browse Source
This commit is contained in:
Dan 2018-03-24 15:02:03 +01:00
parent ef71dcf56a
commit 813b7958e3
1 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
pyrogram/client/client.py
View File

@ -81,10 +81,10 @@ class Client:
Args:
session_name (:obj:`str`):
Name to uniquely identify an authorized session. It will be used
to save the session to a file named *<session_name>.session* and to load
it when you restart your script. As long as a valid session file exists,
Pyrogram won't ask you again to input your phone number.
Name to uniquely identify a session of either a User or a Bot.
For Users: pass a string of your choice, e.g.: "my_main_account".
For Bots: pass your Bot API token, e.g.: "123456:ABC-DEF1234ghIkl-zyx57W2v1u123ew11"
Note: as long as a valid User session file exists, Pyrogram won't ask you again to input your phone number.
api_key (:obj:`tuple`, optional):
Your Telegram API Key as tuple: *(api_id, api_hash)*.
@ -92,8 +92,8 @@ class Client:
don't want to use the *config.ini* file.
proxy (:obj:`dict`, optional):
Your SOCKS5 Proxy settings as dict: *{hostname: str, port: int, username: str, password: str}*.
E.g.: *dict(hostname="11.22.33.44", port=1080, username="user", password="pass")*.
Your SOCKS5 Proxy settings as dict,
e.g.: *dict(hostname="11.22.33.44", port=1080, username="user", password="pass")*.
*username* and *password* can be omitted if your proxy doesn't require authorization.
This is an alternative way to setup a proxy if you don't want to use the *config.ini* file.
@ -102,10 +102,6 @@ class Client:
Only applicable for new sessions and will be ignored in case previously
created sessions are loaded.
token (:obj:`str`, optional):
Pass your Bot API token to log-in as Bot.
E.g.: 123456:ABC-DEF1234ghIkl-zyx57W2v1u123ew11
phone_number (:obj:`str`, optional):
Pass your phone number (with your Country Code prefix included) to avoid
entering it manually. Only applicable for new sessions.
@ -132,6 +128,7 @@ class Client:
"""
INVITE_LINK_RE = re.compile(r"^(?:https?://)?(?:t\.me/joinchat/)([\w-]+)$")
BOT_TOKEN_RE = re.compile(r"^\d+:[\w-]+$")
DIALOGS_AT_ONCE = 100
UPDATES_WORKERS = 1
DOWNLOAD_WORKERS = 1
@ -141,7 +138,6 @@ class Client:
api_key: tuple or APIKey = None,
proxy: dict or Proxy = None,
test_mode: bool = False,
token: str = None,
phone_number: str = None,
phone_code: str or callable = None,
password: str = None,
@ -153,7 +149,6 @@ class Client:
self.proxy = proxy
self.test_mode = test_mode
self.token = token
self.phone_number = phone_number
self.password = password
self.phone_code = phone_code
@ -162,6 +157,8 @@ class Client:
self.workers = workers
self.token = None
self.dc_id = None
self.auth_key = None
self.user_id = None
@ -195,6 +192,10 @@ class Client:
Raises:
:class:`pyrogram.Error`
"""
if self.BOT_TOKEN_RE.match(self.session_name):
self.token = self.session_name
self.session_name = self.session_name.split(":")[0]
self.load_config()
self.load_session(self.session_name)