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

Postpone events resolution

Browse Source
This commit is contained in:
Lonami Exo 2018-02-28 21:09:05 +01:00
parent 3afd7dca84
commit 3655df50dc
1 changed files with 26 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
telethon/telegram_client.py
View File

@ -174,6 +174,7 @@ class TelegramClient(TelegramBareClient):
) )
self._event_builders = [] self._event_builders = []
self._events_pending_resolve = []
# Some fields to easy signing in. Let {phone: hash} be # Some fields to easy signing in. Let {phone: hash} be
# a dictionary because the user may change their mind. # a dictionary because the user may change their mind.
@ -288,6 +289,7 @@ class TelegramClient(TelegramBareClient):
self.connect() self.connect()
if self.is_user_authorized(): if self.is_user_authorized():
self._check_events_pending_resolve()
return self return self
if bot_token: if bot_token:
@ -344,6 +346,7 @@ class TelegramClient(TelegramBareClient):
# We won't reach here if any step failed (exit by exception) # We won't reach here if any step failed (exit by exception)
print('Signed in successfully as', utils.get_display_name(me)) print('Signed in successfully as', utils.get_display_name(me))
self._check_events_pending_resolve()
return self return self
def sign_in(self, phone=None, code=None, def sign_in(self, phone=None, code=None,
@ -377,6 +380,9 @@ class TelegramClient(TelegramBareClient):
The signed in user, or the information about The signed in user, or the information about
:meth:`.send_code_request()`. :meth:`.send_code_request()`.
""" """
if self.is_user_authorized():
self._check_events_pending_resolve()
return self.get_me()
if phone and not code and not password: if phone and not code and not password:
return self.send_code_request(phone) return self.send_code_request(phone)
@ -435,6 +441,10 @@ class TelegramClient(TelegramBareClient):
Returns: Returns:
The new created user. The new created user.
""" """
if self.is_user_authorized():
self._check_events_pending_resolve()
return self.get_me()
result = self(SignUpRequest( result = self(SignUpRequest(
phone_number=self._phone, phone_number=self._phone,
phone_code_hash=self._phone_code_hash.get(self._phone, ''), phone_code_hash=self._phone_code_hash.get(self._phone, ''),
@ -1920,6 +1930,12 @@ class TelegramClient(TelegramBareClient):
return decorator return decorator
def _check_events_pending_resolve(self):
if self._events_pending_resolve:
for event in self._events_pending_resolve:
event.resolve(self)
self._events_pending_resolve.clear()
def _on_handler(self, update): def _on_handler(self, update):
for builder, callback in self._event_builders: for builder, callback in self._event_builders:
event = builder.build(update) event = builder.build(update)
@ -1963,7 +1979,12 @@ class TelegramClient(TelegramBareClient):
elif not event: elif not event:
event = events.Raw() event = events.Raw()
event.resolve(self) if self.is_user_authorized():
event.resolve(self)
self._check_events_pending_resolve()
else:
self._events_pending_resolve.append(event)
self._event_builders.append((event, callback)) self._event_builders.append((event, callback))
def add_update_handler(self, handler): def add_update_handler(self, handler):
@ -1987,6 +2008,10 @@ class TelegramClient(TelegramBareClient):
# region Small utilities to make users' life easier # region Small utilities to make users' life easier
def _set_connected_and_authorized(self):
super()._set_connected_and_authorized()
self._check_events_pending_resolve()
def get_entity(self, entity): def get_entity(self, entity):
""" """
Turns the given entity into a valid Telegram user or chat. Turns the given entity into a valid Telegram user or chat.