hoelee/Telethon
1
0
Fork 0
mirror of https://github.com/LonamiWebs/Telethon.git synced 2025-11-15 21:30:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Don't make a request at all if it will trigger flood wait

Browse Source
This commit is contained in:
Lonami Exo
2018-07-21 12:25:20 +02:00
parent a9cc35e604
commit 24758b82ec
3 changed files with 27 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
telethon/client/users.py
View File

@@ -18,6 +18,20 @@ class UserMethods(TelegramBaseClient):
raise _NOT_A_REQUEST
await r.resolve(self, utils)
# Avoid making the request if it's already in a flood wait
if r.CONSTRUCTOR_ID in self._flood_waited_requests:
due = self._flood_waited_requests[r.CONSTRUCTOR_ID]
diff = round(due - time.time())
if diff <= 3: # Flood waits below 3 seconds are "ignored"
self._flood_waited_requests.pop(r.CONSTRUCTOR_ID, None)
elif diff <= self.flood_sleep_threshold:
__log__.info('Sleeping early for %ds on flood wait', diff)
await asyncio.sleep(diff, loop=self._loop)
self._flood_waited_requests.pop(r.CONSTRUCTOR_ID, None)
else:
raise errors.FloodWaitError(capture=diff)
request_index = 0
self._last_request = time.time()
for _ in range(self._request_retries):
try:
@@ -28,6 +42,7 @@ class UserMethods(TelegramBaseClient):
result = await f
self.session.process_entities(result)
results.append(result)
request_index += 1
return results
else:
result = await future
@@ -37,6 +52,12 @@ class UserMethods(TelegramBaseClient):
__log__.warning('Telegram is having internal issues %s: %s',
e.__class__.__name__, e)
except (errors.FloodWaitError, errors.FloodTestPhoneWaitError) as e:
if utils.is_list_like(request):
request = request[request_index]
self._flood_waited_requests\
[request.CONSTRUCTOR_ID] = time.time() + e.seconds
if e.seconds <= self.flood_sleep_threshold:
__log__.info('Sleeping for %ds on flood wait', e.seconds)
await asyncio.sleep(e.seconds, loop=self._loop)