Merge branch 'master' into docs

pyrogram/client/client.py

@@ -706,7 +706,7 @@ class Client:
     def resolve_peer(self, peer_id: int or str):
         """Use this method to get the *InputPeer* of a known *peer_id*.
 
-        It is intended to be used when working with Raw Functions (i.e: a Telegram API method you wish to  use which is
+        It is intended to be used when working with Raw Functions (i.e: a Telegram API method you wish to use which is
         not available yet in the Client class as an easy-to-use method).
 
         Args:

pyrogram/client/input_media.py

@@ -20,10 +20,11 @@
 class InputMedia:
     class Photo:
         """This object represents a photo to be sent inside an album.
+        It is intended to be used with :obj:`pyrogram.Client.send_media_group`.
 
         Args:
             media (:obj:`str`):
-                File to send.
+                Photo file to send.
                 Pass a file path as string to send a photo that exists on your local machine.
 
             caption (:obj:`str`):
@@ -45,10 +46,11 @@ class InputMedia:
 
     class Video:
         """This object represents a video to be sent inside an album.
+        It is intended to be used with :obj:`pyrogram.Client.send_media_group`.
 
         Args:
             media (:obj:`str`):
-                File to send.
+                Video file to send.
                 Pass a file path as string to send a video that exists on your local machine.
 
             caption (:obj:`str`):

pyrogram/connection/transport/tcp/tcp.py

@@ -30,6 +30,7 @@ Proxy = namedtuple("Proxy", ["enabled", "hostname", "port", "username", "passwor
 class TCP(socks.socksocket):
     def __init__(self, proxy: Proxy):
         super().__init__()
+        self.settimeout(10)
         self.proxy_enabled = False
 
         if proxy and proxy.enabled:

pyrogram/session/session.py

@@ -296,7 +296,7 @@ class Session:
                 break
 
             try:
-                self._send(functions.Ping(0), False)
+                self._send(functions.PingDelayDisconnect(0, self.PING_INTERVAL + 15), False)
             except (OSError, TimeoutError):
                 pass