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

Propagate account being logged-out errors

Browse Source 
Should close #4016.
This commit is contained in:
Lonami Exo 2023-01-11 20:30:33 +01:00
parent c932d79ab3
commit fb97a8aa87
1 changed files with 25 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
telethon/client/updates.py
View File

@ -253,6 +253,11 @@ class UpdateMethods:
# region Private methods # region Private methods
async def _update_loop(self: 'TelegramClient'): async def _update_loop(self: 'TelegramClient'):
# If the MessageBox is not empty, the account had to be logged-in to fill in its state.
# This flag is used to propagate the "you got logged-out" error up (but getting logged-out
# can only happen if it was once logged-in).
was_once_logged_in = self._authorized is True or not self._message_box.is_empty()
self._updates_error = None self._updates_error = None
try: try:
if self._catch_up: if self._catch_up:
@ -289,6 +294,10 @@ class UpdateMethods:
# Not logged in or broken authorization key, can't get difference # Not logged in or broken authorization key, can't get difference
self._log[__name__].info('Cannot get difference since the account is not logged in: %s', type(e).__name__) self._log[__name__].info('Cannot get difference since the account is not logged in: %s', type(e).__name__)
self._message_box.end_difference() self._message_box.end_difference()
if was_once_logged_in:
self._updates_error = e
await self.disconnect()
break
continue continue
except OSError as e: except OSError as e:
# Network is likely down, but it's unclear for how long. # Network is likely down, but it's unclear for how long.
@ -309,12 +318,26 @@ class UpdateMethods:
self._log[__name__].debug('Getting difference for channel %s updates', get_diff.channel.channel_id) self._log[__name__].debug('Getting difference for channel %s updates', get_diff.channel.channel_id)
try: try:
diff = await self(get_diff) diff = await self(get_diff)
except (errors.UnauthorizedError, errors.AuthKeyError) as e:
# Not logged in or broken authorization key, can't get difference
self._log[__name__].warning(
'Cannot get difference for channel %s since the account is not logged in: %s',
get_diff.channel.channel_id, type(e).__name__
)
self._message_box.end_channel_difference(
get_diff,
PrematureEndReason.TEMPORARY_SERVER_ISSUES,
self._mb_entity_cache
)
if was_once_logged_in:
self._updates_error = e
await self.disconnect()
break
continue
except ( except (
errors.PersistentTimestampOutdatedError, errors.PersistentTimestampOutdatedError,
errors.PersistentTimestampInvalidError, errors.PersistentTimestampInvalidError,
errors.ServerError, errors.ServerError,
errors.UnauthorizedError,
errors.AuthKeyError,
ValueError ValueError
) as e: ) as e:
# According to Telegram's docs: # According to Telegram's docs: