mir/pyrogram
2
0
Fork 0
mirror of https://github.com/pyrogram/pyrogram synced 2025-08-25 19:38:31 +00:00
Code Issues Releases Wiki Activity

Merge branch 'master' into new-api

Browse Source
This commit is contained in:
Dan 2018-04-13 18:55:20 +02:00
commit e3c70c84ba
2 changed files with 18 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
pyrogram/client/client.py
View File

@ -892,15 +892,20 @@ class Client:
) )
def get_dialogs_chunk(self, offset_date): def get_dialogs_chunk(self, offset_date):
r = self.send( while True:
functions.messages.GetDialogs( try:
offset_date, 0, types.InputPeerEmpty(), r = self.send(
self.DIALOGS_AT_ONCE, True functions.messages.GetDialogs(
) offset_date, 0, types.InputPeerEmpty(),
) self.DIALOGS_AT_ONCE, True
log.info("Total peers: {}".format(len(self.peers_by_id))) )
)
return r except FloodWait as e:
log.warning("get_dialogs flood: waiting {} seconds".format(e.x))
time.sleep(e.x)
else:
log.info("Total peers: {}".format(len(self.peers_by_id)))
return r
def get_dialogs(self): def get_dialogs(self):
self.send(functions.messages.GetPinnedDialogs()) self.send(functions.messages.GetPinnedDialogs())
@ -909,13 +914,7 @@ class Client:
offset_date = utils.get_offset_date(dialogs) offset_date = utils.get_offset_date(dialogs)
while len(dialogs.dialogs) == self.DIALOGS_AT_ONCE: while len(dialogs.dialogs) == self.DIALOGS_AT_ONCE:
try: dialogs = self.get_dialogs_chunk(offset_date)
dialogs = self.get_dialogs_chunk(offset_date)
except FloodWait as e:
log.warning("get_dialogs flood: waiting {} seconds".format(e.x))
time.sleep(e.x)
continue
offset_date = utils.get_offset_date(dialogs) offset_date = utils.get_offset_date(dialogs)
self.get_dialogs_chunk(0) self.get_dialogs_chunk(0)

6
pyrogram/client/syncer.py
View File

@ -74,15 +74,15 @@ class Syncer:
date=int(time.time()), date=int(time.time()),
peers_by_id={ peers_by_id={
k: getattr(v, "access_hash", None) k: getattr(v, "access_hash", None)
for k, v in client.peers_by_id.items() for k, v in client.peers_by_id.copy().items()
}, },
peers_by_username={ peers_by_username={
k: utils.get_peer_id(v) k: utils.get_peer_id(v)
for k, v in client.peers_by_username.items() for k, v in client.peers_by_username.copy().items()
}, },
peers_by_phone={ peers_by_phone={
k: utils.get_peer_id(v) k: utils.get_peer_id(v)
for k, v in client.peers_by_phone.items() for k, v in client.peers_by_phone.copy().items()
} }
) )