Merge develop -> asyncio

delivrance · delivrance · commit a46ace4e5c15 · 2019-08-12T13:02:32.000+02:00
diff --git a/compiler/error/source/400_BAD_REQUEST.tsv b/compiler/error/source/400_BAD_REQUEST.tsv
@@ -123,4 +123,5 @@ WEBDOCUMENT_INVALID	The web document is invalid
 WEBDOCUMENT_URL_EMPTY	The web document URL is empty
 WEBDOCUMENT_URL_INVALID	The web document URL is invalid
 WEBDOCUMENT_MIME_INVALID	The web document mime type is invalid
-BUTTON_URL_INVALID	The button url is invalid
+BUTTON_URL_INVALID	The button url is invalid
+AUTH_BYTES_INVALID	The authorization bytes are invalid
diff --git a/pyrogram/client/client.py b/pyrogram/client/client.py
@@ -44,7 +44,7 @@
     PhoneCodeExpired, PhoneCodeEmpty, SessionPasswordNeeded,
     PasswordHashInvalid, FloodWait, PeerIdInvalid, FirstnameInvalid, PhoneNumberBanned,
     VolumeLocNotFound, UserMigrate, ChannelPrivate, PhoneNumberOccupied,
-    PasswordRecoveryNa, PasswordEmpty
+    PasswordRecoveryNa, PasswordEmpty, AuthBytesInvalid
 )
 from pyrogram.session import Auth, Session
 from .ext import utils, Syncer, BaseClient, Dispatcher
@@ -1238,7 +1238,7 @@ async def send(self,
     def load_config(self):
         parser = ConfigParser()
         parser.read(str(self.config_file))
-        
+
         if self.bot_token:
             pass
         else:
@@ -1322,7 +1322,7 @@ async def load_session(self):
         ])
 
         if session_empty:
-            self.storage.dc_id = 4
+            self.storage.dc_id = 2
             self.storage.date = 0
 
             self.storage.test_mode = self.test_mode
@@ -1745,33 +1745,35 @@ async def get_file(self, media_type: int,
 
             if session is None:
                 if dc_id != self.storage.dc_id:
-                    exported_auth = await self.send(
-                        functions.auth.ExportAuthorization(
-                            dc_id=dc_id
-                        )
-                    )
-
-                    session = Session(
-                        self,
-                        dc_id,
-                        await Auth(self, dc_id).create(), is_media=True)
-
+                    session = Session(self, dc_id, await Auth(self, dc_id).create(), is_media=True)
                     await session.start()
 
-                    self.media_sessions[dc_id] = session
-
-                    await session.send(
-                        functions.auth.ImportAuthorization(
-                            id=exported_auth.id,
-                            bytes=exported_auth.bytes
+                    for _ in range(3):
+                        exported_auth = await self.send(
+                            functions.auth.ExportAuthorization(
+                                dc_id=dc_id
+                            )
                         )
-                    )
+
+                        try:
+                            await session.send(
+                                functions.auth.ImportAuthorization(
+                                    id=exported_auth.id,
+                                    bytes=exported_auth.bytes
+                                )
+                            )
+                        except AuthBytesInvalid:
+                            continue
+                        else:
+                            break
+                    else:
+                        await session.stop()
+                        raise AuthBytesInvalid
                 else:
                     session = Session(self, dc_id, self.storage.auth_key, is_media=True)
-
                     await session.start()
 
-                    self.media_sessions[dc_id] = session
+                self.media_sessions[dc_id] = session
 
         if media_type == 1:
             location = types.InputPeerPhotoFileLocation(
