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

conversation.cancel() now raises cancelled on future calls (#1183)

Browse Source
This commit is contained in:
Lonami Exo 2019-06-03 19:44:43 +02:00
parent 4c3e467d25
commit 065719c8d8
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -55,6 +55,7 @@ class Conversation(ChatGetter):
self._pending_reads = {} self._pending_reads = {}
self._exclusive = exclusive self._exclusive = exclusive
self._cancelled = False
# The user is able to expect two responses for the same message. # The user is able to expect two responses for the same message.
# {desired message ID: next incoming index} # {desired message ID: next incoming index}
@ -354,6 +355,9 @@ class Conversation(ChatGetter):
raise ValueError('No message was sent previously') raise ValueError('No message was sent previously')
async def _get_result(self, future, start_time, timeout, pending, target_id): async def _get_result(self, future, start_time, timeout, pending, target_id):
if self._cancelled:
raise asyncio.CancelledError('The conversation was cancelled before')
due = self._total_due due = self._total_due
if timeout is None: if timeout is None:
timeout = self._timeout timeout = self._timeout
@ -371,6 +375,7 @@ class Conversation(ChatGetter):
del pending[target_id] del pending[target_id]
def _cancel_all(self, exception=None): def _cancel_all(self, exception=None):
self._cancelled = True
for pending in itertools.chain( for pending in itertools.chain(
self._pending_responses.values(), self._pending_responses.values(),
self._pending_replies.values(), self._pending_replies.values(),
@ -399,6 +404,7 @@ class Conversation(ChatGetter):
raise errors.AlreadyInConversationError() raise errors.AlreadyInConversationError()
conv_set.add(self) conv_set.add(self)
self._cancelled = False
self._last_outgoing = 0 self._last_outgoing = 0
self._last_incoming = 0 self._last_incoming = 0