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

Fix .get_dialogs to never return more than limit

Browse Source
This commit is contained in:
Lonami Exo 2017-10-05 13:55:58 +02:00
parent 427a6aabaa
commit 7aa21dbd07
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
telethon/telegram_client.py
View File

@ -256,11 +256,12 @@ class TelegramClient(TelegramBareClient):
messages = {} # Used later for sorting TODO also return these? messages = {} # Used later for sorting TODO also return these?
entities = {} entities = {}
while len(dialogs) < limit: while len(dialogs) < limit:
need = limit - len(dialogs)
r = self(GetDialogsRequest( r = self(GetDialogsRequest(
offset_date=offset_date, offset_date=offset_date,
offset_id=offset_id, offset_id=offset_id,
offset_peer=offset_peer, offset_peer=offset_peer,
limit=0 # limit 0 often means "as much as possible" limit=need if need < float('inf') else 0
)) ))
if not r.dialogs: if not r.dialogs:
break break
@ -290,10 +291,12 @@ class TelegramClient(TelegramBareClient):
# so we need to set at least one day ahead while still being # so we need to set at least one day ahead while still being
# the smallest date possible. # the smallest date possible.
no_date = datetime.fromtimestamp(86400) no_date = datetime.fromtimestamp(86400)
ds = sorted( ds = list(sorted(
list(dialogs.values()), dialogs.values(),
key=lambda d: getattr(messages[d.top_message], 'date', no_date) key=lambda d: getattr(messages[d.top_message], 'date', no_date)
) ))
if limit < float('inf'):
ds = ds[:limit]
return ( return (
ds, ds,
[utils.find_user_or_chat(d.peer, entities, entities) for d in ds] [utils.find_user_or_chat(d.peer, entities, entities) for d in ds]