mir/pyrogram
2
0
Fork 0
mirror of https://github.com/pyrogram/pyrogram synced 2025-09-01 14:55:12 +00:00
Code Issues Releases Wiki Activity

Merge branch 'develop' into new-parsers

Browse Source
This commit is contained in:
Dan
2018-12-18 11:22:47 +01:00
parent e203a5500f bc824f738c
commit 8f6f38e0b0
1 changed files with 19 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
pyrogram/client/client.py
View File

@@ -45,7 +45,7 @@ from pyrogram.api.errors import (
PhoneNumberUnoccupied, PhoneCodeInvalid, PhoneCodeHashEmpty, PhoneNumberUnoccupied, PhoneCodeInvalid, PhoneCodeHashEmpty,
PhoneCodeExpired, PhoneCodeEmpty, SessionPasswordNeeded, PhoneCodeExpired, PhoneCodeEmpty, SessionPasswordNeeded,
PasswordHashInvalid, FloodWait, PeerIdInvalid, FirstnameInvalid, PhoneNumberBanned, PasswordHashInvalid, FloodWait, PeerIdInvalid, FirstnameInvalid, PhoneNumberBanned,
VolumeLocNotFound, UserMigrate, FileIdInvalid, ChannelPrivate) VolumeLocNotFound, UserMigrate, FileIdInvalid, ChannelPrivate, PhoneNumberOccupied)
from pyrogram.client.handlers import DisconnectHandler from pyrogram.client.handlers import DisconnectHandler
from pyrogram.client.handlers.handler import Handler from pyrogram.client.handlers.handler import Handler
from pyrogram.crypto import AES from pyrogram.crypto import AES
@@ -529,16 +529,8 @@ class Client(Methods, BaseClient):
try: try:
if phone_registered: if phone_registered:
r = self.send(
functions.auth.SignIn(
self.phone_number,
phone_code_hash,
self.phone_code
)
)
else:
try: try:
self.send( r = self.send(
functions.auth.SignIn( functions.auth.SignIn(
self.phone_number, self.phone_number,
phone_code_hash, phone_code_hash,
@@ -546,20 +538,27 @@ class Client(Methods, BaseClient):
) )
) )
except PhoneNumberUnoccupied: except PhoneNumberUnoccupied:
pass log.warning("Phone number unregistered")
phone_registered = False
continue
else:
self.first_name = self.first_name if self.first_name is not None else input("First name: ") self.first_name = self.first_name if self.first_name is not None else input("First name: ")
self.last_name = self.last_name if self.last_name is not None else input("Last name: ") self.last_name = self.last_name if self.last_name is not None else input("Last name: ")
r = self.send( try:
functions.auth.SignUp( r = self.send(
self.phone_number, functions.auth.SignUp(
phone_code_hash, self.phone_number,
self.phone_code, phone_code_hash,
self.first_name, self.phone_code,
self.last_name self.first_name,
self.last_name
)
) )
) except PhoneNumberOccupied:
log.warning("Phone number already registered")
phone_registered = True
continue
except (PhoneCodeInvalid, PhoneCodeEmpty, PhoneCodeExpired, PhoneCodeHashEmpty) as e: except (PhoneCodeInvalid, PhoneCodeEmpty, PhoneCodeExpired, PhoneCodeHashEmpty) as e:
if phone_code_invalid_raises: if phone_code_invalid_raises:
raise raise