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

Greatly improve the handling of working with different DC

Browse Source
This commit is contained in:
Lonami Exo 2017-03-20 12:23:53 +01:00
parent 6b1dc30045
commit 628b7391e3
2 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
telethon/network/mtproto_sender.py
View File

@ -328,7 +328,7 @@ class MtProtoSender:
error.additional_data)) error.additional_data))
sleep(error.additional_data) sleep(error.additional_data)
elif error.message.startswith('PHONE_MIGRATE_'): elif '_MIGRATE_' in error.message:
raise InvalidDCError(error.additional_data) raise InvalidDCError(error.additional_data)
else: else:

25
telethon/telegram_client.py
View File

@ -152,18 +152,29 @@ class TelegramClient:
# region Telegram requests functions # region Telegram requests functions
def invoke(self, request, timeout=timedelta(seconds=5)): def invoke(self, request, timeout=timedelta(seconds=5), throw_invalid_dc=False):
"""Invokes a MTProtoRequest (sends and receives it) and returns its result. """Invokes a MTProtoRequest (sends and receives it) and returns its result.
An optional timeout can be given to cancel the operation after the time delta. An optional timeout can be given to cancel the operation after the time delta.
Timeout can be set to None for no timeout""" Timeout can be set to None for no timeout.
If throw_invalid_dc is True, these errors won't be caught (useful to
avoid infinite recursion). This should not be set to True manually."""
if not issubclass(type(request), MTProtoRequest): if not issubclass(type(request), MTProtoRequest):
raise ValueError('You can only invoke MtProtoRequests') raise ValueError('You can only invoke MtProtoRequests')
try:
self.sender.send(request) self.sender.send(request)
self.sender.receive(request, timeout) self.sender.receive(request, timeout)
return request.result return request.result
except InvalidDCError as error:
if throw_invalid_dc:
raise error
self.reconnect_to_dc(error.new_dc)
return self.invoke(request, timeout=timeout, throw_invalid_dc=True)
# region Authorization requests # region Authorization requests
def is_user_authorized(self): def is_user_authorized(self):
@ -173,16 +184,8 @@ class TelegramClient:
def send_code_request(self, phone_number): def send_code_request(self, phone_number):
"""Sends a code request to the specified phone number""" """Sends a code request to the specified phone number"""
request = SendCodeRequest(phone_number, self.api_id, self.api_hash) result = self.invoke(SendCodeRequest(phone_number, self.api_id, self.api_hash))
completed = False
while not completed:
try:
result = self.invoke(request)
self.phone_code_hashes[phone_number] = result.phone_code_hash self.phone_code_hashes[phone_number] = result.phone_code_hash
completed = True
except InvalidDCError as error:
self.reconnect_to_dc(error.new_dc)
def sign_in(self, phone_number=None, code=None, password=None): def sign_in(self, phone_number=None, code=None, password=None):
"""Completes the authorization of a phone number by providing the received code. """Completes the authorization of a phone number by providing the received code.