hoelee/Telethon
1
0
Fork 0
mirror of https://github.com/LonamiWebs/Telethon.git synced 2025-06-20 20:16:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Clearer variable naming

Browse Source
This commit is contained in:
Lonami Exo 2018-08-06 16:31:15 +02:00
parent f39f9a94b5
commit f332e4c423
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
telethon/tl/custom/conversation.py
View File

@ -159,7 +159,7 @@ class Conversation(ChatGetter):
The condition callable that checks if an incoming The condition callable that checks if an incoming
message is a valid response. message is a valid response.
""" """
now = time.time() start_time = time.time()
target_id = self._get_message_id(target_message) target_id = self._get_message_id(target_message)
# If there is no last-chosen ID, make sure to pick one *after* # If there is no last-chosen ID, make sure to pick one *after*
@ -183,14 +183,14 @@ class Conversation(ChatGetter):
# Otherwise the next incoming response will be the one to use # Otherwise the next incoming response will be the one to use
future = asyncio.Future() future = asyncio.Future()
pending[target_id] = future pending[target_id] = future
return self._get_result(future, now, timeout) return self._get_result(future, start_time, timeout)
def get_edit(self, message=None, *, timeout=None): def get_edit(self, message=None, *, timeout=None):
""" """
Awaits for an edit after the last message to arrive. Awaits for an edit after the last message to arrive.
The arguments are the same as those for `get_response`. The arguments are the same as those for `get_response`.
""" """
now = time.time() start_time = time.time()
target_id = self._get_message_id(message) target_id = self._get_message_id(message)
target_date = self._edit_dates.get(target_id, 0) target_date = self._edit_dates.get(target_id, 0)
@ -208,7 +208,7 @@ class Conversation(ChatGetter):
# Otherwise the next incoming response will be the one to use # Otherwise the next incoming response will be the one to use
future = asyncio.Future() future = asyncio.Future()
self._pending_edits[target_id] = future self._pending_edits[target_id] = future
return self._get_result(future, now, timeout) return self._get_result(future, start_time, timeout)
def wait_read(self, message=None, *, timeout=None): def wait_read(self, message=None, *, timeout=None):
""" """
@ -216,7 +216,7 @@ class Conversation(ChatGetter):
a response doesn't imply the message was read, and this action a response doesn't imply the message was read, and this action
will also trigger even without a response. will also trigger even without a response.
""" """
now = time.time() start_time = time.time()
future = asyncio.Future() future = asyncio.Future()
target_id = self._get_message_id(message) target_id = self._get_message_id(message)
@ -227,7 +227,7 @@ class Conversation(ChatGetter):
return return
self._pending_reads[target_id] = future self._pending_reads[target_id] = future
return self._get_result(future, now, timeout) return self._get_result(future, start_time, timeout)
def wait_event(self, event, *, timeout=None): def wait_event(self, event, *, timeout=None):
""" """
@ -253,7 +253,7 @@ class Conversation(ChatGetter):
also means the event can arrive before you send also means the event can arrive before you send
a previous action. a previous action.
""" """
now = time.time() start_time = time.time()
if isinstance(event, type): if isinstance(event, type):
event = event() event = event()
@ -263,7 +263,7 @@ class Conversation(ChatGetter):
future = asyncio.Future() future = asyncio.Future()
async def result(): async def result():
try: try:
return await self._get_result(future, now, timeout) return await self._get_result(future, start_time, timeout)
finally: finally:
del self._custom[counter] del self._custom[counter]