hoelee/Telethon
1
0
Fork 0
mirror of https://github.com/LonamiWebs/Telethon.git synced 2025-06-18 19:16:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Support signing up through .start()

Browse Source
This commit is contained in:
Lonami Exo 2018-02-01 10:12:46 +01:00
parent d5a91c7273
commit add122bfe7
1 changed files with 24 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
telethon/telegram_client.py
View File

@ -27,7 +27,8 @@ from . import helpers, utils
from .errors import ( from .errors import (
RPCError, UnauthorizedError, PhoneCodeEmptyError, PhoneCodeExpiredError, RPCError, UnauthorizedError, PhoneCodeEmptyError, PhoneCodeExpiredError,
PhoneCodeHashEmptyError, PhoneCodeInvalidError, LocationInvalidError, PhoneCodeHashEmptyError, PhoneCodeInvalidError, LocationInvalidError,
SessionPasswordNeededError, FileMigrateError SessionPasswordNeededError, FileMigrateError, PhoneNumberUnoccupiedError,
PhoneNumberOccupiedError
) )
from .network import ConnectionMode from .network import ConnectionMode
from .tl.custom import Draft, Dialog from .tl.custom import Draft, Dialog
@ -204,7 +205,8 @@ class TelegramClient(TelegramBareClient):
def start(self, def start(self,
phone=lambda: input('Please enter your phone: '), phone=lambda: input('Please enter your phone: '),
password=None, bot_token=None, password=None, bot_token=None,
force_sms=False, code_callback=None): force_sms=False, code_callback=None,
first_name='New User', last_name=''):
""" """
Convenience method to interactively connect and sign in if required, Convenience method to interactively connect and sign in if required,
also taking into consideration that 2FA may be enabled in the account. also taking into consideration that 2FA may be enabled in the account.
@ -236,6 +238,13 @@ class TelegramClient(TelegramBareClient):
A callable that will be used to retrieve the Telegram A callable that will be used to retrieve the Telegram
login code. Defaults to `input()`. login code. Defaults to `input()`.
first_name (:obj:`str`, optional):
The first name to be used if signing up. This has no
effect if the account already exists and you sign in.
last_name (:obj:`str`, optional):
Similar to the first name, but for the last. Optional.
Returns: Returns:
:obj:`TelegramClient`: :obj:`TelegramClient`:
This client, so initialization can be chained with `.start()`. This client, so initialization can be chained with `.start()`.
@ -276,18 +285,27 @@ class TelegramClient(TelegramBareClient):
max_attempts = 3 max_attempts = 3
two_step_detected = False two_step_detected = False
self.send_code_request(phone, force_sms=force_sms) sent_code = self.send_code_request(phone, force_sms=force_sms)
sign_up = not sent_code.phone_registered
while attempts < max_attempts: while attempts < max_attempts:
try: try:
if sign_up:
me = self.sign_up(code_callback(), first_name, last_name)
else:
# Raises SessionPasswordNeededError if 2FA enabled # Raises SessionPasswordNeededError if 2FA enabled
me = self.sign_in(phone, code_callback()) me = self.sign_in(phone, code_callback())
break break
except SessionPasswordNeededError: except SessionPasswordNeededError:
two_step_detected = True two_step_detected = True
break break
except PhoneNumberOccupiedError:
sign_up = False
except PhoneNumberUnoccupiedError:
sign_up = True
except (PhoneCodeEmptyError, PhoneCodeExpiredError, except (PhoneCodeEmptyError, PhoneCodeExpiredError,
PhoneCodeHashEmptyError, PhoneCodeInvalidError): PhoneCodeHashEmptyError, PhoneCodeInvalidError):
print('Invalid code. Please try again.', file=sys.stderr) print('Invalid code. Please try again.', file=sys.stderr)
attempts += 1 attempts += 1
else: else:
raise RuntimeError( raise RuntimeError(