LonamiWebs/Telethon
1
1
Fork 0
mirror of https://github.com/LonamiWebs/Telethon.git synced 2025-02-11 00:50:56 +03:00
Code Issues Packages Projects Releases Wiki Activity

Better handle pinned dialogs and limit on .get_dialogs()

Browse Source
This commit is contained in:
Lonami Exo 2018-03-11 09:55:31 +01:00
parent a596f88497
commit 8b1cc4c8cb
1 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
telethon/telegram_client.py
View File

@ -559,14 +559,15 @@ class TelegramClient(TelegramBareClient):
return return
seen = set() seen = set()
req = GetDialogsRequest(
offset_date=offset_date,
offset_id=offset_id,
offset_peer=offset_peer,
limit=0
)
while len(seen) < limit: while len(seen) < limit:
real_limit = min(limit - len(seen), 100) req.limit = min(limit - len(seen), 100)
r = self(GetDialogsRequest( r = self(req)
offset_date=offset_date,
offset_id=offset_id,
offset_peer=offset_peer,
limit=real_limit
))
if _total_box: if _total_box:
_total_box.x = getattr(r, 'count', len(r.dialogs)) _total_box.x = getattr(r, 'count', len(r.dialogs))
@ -574,20 +575,25 @@ class TelegramClient(TelegramBareClient):
entities = {utils.get_peer_id(x): x entities = {utils.get_peer_id(x): x
for x in itertools.chain(r.users, r.chats)} for x in itertools.chain(r.users, r.chats)}
# Happens when there are pinned dialogs
if len(r.dialogs) > limit:
r.dialogs = r.dialogs[:limit]
for d in r.dialogs: for d in r.dialogs:
peer_id = utils.get_peer_id(d.peer) peer_id = utils.get_peer_id(d.peer)
if peer_id not in seen: if peer_id not in seen:
seen.add(peer_id) seen.add(peer_id)
yield Dialog(self, d, entities, messages) yield Dialog(self, d, entities, messages)
if len(r.dialogs) < real_limit or not isinstance(r, DialogsSlice): if len(r.dialogs) < req.limit or not isinstance(r, DialogsSlice):
# Less than we requested means we reached the end, or # Less than we requested means we reached the end, or
# we didn't get a DialogsSlice which means we got all. # we didn't get a DialogsSlice which means we got all.
break break
offset_date = r.messages[-1].date req.offset_date = r.messages[-1].date
offset_peer = entities[utils.get_peer_id(r.dialogs[-1].peer)] req.offset_peer = entities[utils.get_peer_id(r.dialogs[-1].peer)]
offset_id = r.messages[-1].id req.offset_id = r.messages[-1].id
req.exclude_pinned = True
def get_dialogs(self, *args, **kwargs): def get_dialogs(self, *args, **kwargs):
""" """