LonamiWebs/Telethon
1
1
Fork 0
mirror of https://github.com/LonamiWebs/Telethon.git synced 2025-03-10 06:05:47 +03:00
Code Issues Packages Projects Releases Wiki Activity

Revert None result checks on the TelegramClient

Browse Source
This commit is contained in:
Lonami Exo 2017-10-22 20:30:55 +02:00
parent 48ec0319d2
commit 3a7fa249a4
1 changed files with 12 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
telethon/telegram_client.py
View File

@ -106,9 +106,8 @@ class TelegramClient(TelegramBareClient):
"""Sends a code request to the specified phone number""" """Sends a code request to the specified phone number"""
phone = EntityDatabase.parse_phone(phone) or self._phone phone = EntityDatabase.parse_phone(phone) or self._phone
result = await self(SendCodeRequest(phone, self.api_id, self.api_hash)) result = await self(SendCodeRequest(phone, self.api_id, self.api_hash))
if result: self._phone = phone
self._phone = phone self._phone_code_hash = result.phone_code_hash
self._phone_code_hash = result.phone_code_hash
return result return result
async def sign_in(self, phone=None, code=None, async def sign_in(self, phone=None, code=None,
@ -172,10 +171,8 @@ class TelegramClient(TelegramBareClient):
'and a password only if an RPCError was raised before.' 'and a password only if an RPCError was raised before.'
) )
if result: self._set_connected_and_authorized()
self._set_connected_and_authorized() return result.user
return result.user
return result
async def sign_up(self, code, first_name, last_name=''): async def sign_up(self, code, first_name, last_name=''):
"""Signs up to Telegram. Make sure you sent a code request first!""" """Signs up to Telegram. Make sure you sent a code request first!"""
@ -187,10 +184,8 @@ class TelegramClient(TelegramBareClient):
last_name=last_name last_name=last_name
)) ))
if result: self._set_connected_and_authorized()
self._set_connected_and_authorized() return result.user
return result.user
return result
async def log_out(self): async def log_out(self):
"""Logs out and deletes the current session. """Logs out and deletes the current session.
@ -209,7 +204,7 @@ class TelegramClient(TelegramBareClient):
"""Gets "me" (the self user) which is currently authenticated, """Gets "me" (the self user) which is currently authenticated,
or None if the request fails (hence, not authenticated).""" or None if the request fails (hence, not authenticated)."""
try: try:
return await self(GetUsersRequest([InputUserSelf()]))[0] return (await self(GetUsersRequest([InputUserSelf()])))[0]
except UnauthorizedError: except UnauthorizedError:
return None return None
@ -246,7 +241,7 @@ class TelegramClient(TelegramBareClient):
offset_peer=offset_peer, offset_peer=offset_peer,
limit=need if need < float('inf') else 0 limit=need if need < float('inf') else 0
)) ))
if not r or not r.dialogs: if not r.dialogs:
break break
for d in r.dialogs: for d in r.dialogs:
@ -295,12 +290,10 @@ class TelegramClient(TelegramBareClient):
:return List[telethon.tl.custom.Draft]: A list of open drafts :return List[telethon.tl.custom.Draft]: A list of open drafts
""" """
response = await self(GetAllDraftsRequest()) response = await self(GetAllDraftsRequest())
if response: self.session.process_entities(response)
self.session.process_entities(response) self.session.generate_sequence(response.seq)
self.session.generate_sequence(response.seq) drafts = [Draft._from_update(self, u) for u in response.updates]
drafts = [Draft._from_update(self, u) for u in response.updates] return drafts
return drafts
return response
async def send_message(self, async def send_message(self,
entity, entity,
@ -322,8 +315,6 @@ class TelegramClient(TelegramBareClient):
reply_to_msg_id=self._get_reply_to(reply_to) reply_to_msg_id=self._get_reply_to(reply_to)
) )
result = await self(request) result = await self(request)
if not result:
return result
if isinstance(result, UpdateShortSentMessage): if isinstance(result, UpdateShortSentMessage):
return Message( return Message(
@ -419,8 +410,6 @@ class TelegramClient(TelegramBareClient):
min_id=min_id, min_id=min_id,
add_offset=add_offset add_offset=add_offset
)) ))
if not result:
return result
# The result may be a messages slice (not all messages were retrieved) # The result may be a messages slice (not all messages were retrieved)
# or simply a messages TLObject. In the later case, no "count" # or simply a messages TLObject. In the later case, no "count"