[keyboard button] added support for request_name, request_username and request_photo

Author: yehuda-lev

pyrogram/types/bots_and_keyboards/keyboard_button.py

@@ -118,7 +118,11 @@ def read(b):
                         chat_has_username=getattr(b.peer_type, "has_username", None),
                         chat_is_forum=getattr(b.peer_type, "forum", None),
                         user_administrator_rights=types.ChatAdministratorRights._parse(user_privileges),
-                        bot_administrator_rights=types.ChatAdministratorRights._parse(bot_privileges)
+                        bot_administrator_rights=types.ChatAdministratorRights._parse(bot_privileges),
+                        request_title = getattr(b, "name_requested", None),
+                        request_username = getattr(b, "username_requested", None),
+                        request_photo = getattr(b, "photo_requested", None),
+                        max_quantity = getattr(b, "max_quantity", None),
                     )
                 )
 
@@ -129,7 +133,10 @@ def read(b):
                         button_id=b.button_id,
                         user_is_bot=getattr(b.peer_type, "bot", None),
                         user_is_premium=getattr(b.peer_type, "premium", None),
-                        max_quantity=getattr(b, "max_quantity", None)
+                        request_name=getattr(b, "name_requested", None),
+                        request_username=getattr(b, "username_requested", None),
+                        request_photo=getattr(b, "photo_requested", None),
+                        max_quantity = getattr(b, "max_quantity", None),
                     )
                 )
 
@@ -206,21 +213,29 @@ def write(self):
                     bot_admin_rights=bot_admin_rights
                 )
 
-            return raw.types.KeyboardButtonRequestPeer(
+            return raw.types.InputKeyboardButtonRequestPeer(
                 text=self.text,
                 button_id=self.request_chat.button_id,
                 peer_type=peer_type,
-                max_quantity=1
+                max_quantity=self.request_chat.max_quantity,
+                name_requested=self.request_chat.request_title,
+                username_requested=self.request_chat.request_username,
+                photo_requested=self.request_chat.request_photo,
             )
         elif self.request_users:
-            return raw.types.KeyboardButtonRequestPeer(
+            peer_type = raw.types.RequestPeerTypeUser(
+                bot=self.request_users.user_is_bot,
+                premium=self.request_users.user_is_premium
+            )
+
+            return raw.types.InputKeyboardButtonRequestPeer(
                 text=self.text,
                 button_id=self.request_users.button_id,
-                peer_type=raw.types.RequestPeerTypeUser(
-                    bot=self.request_users.user_is_bot,
-                    premium=self.request_users.user_is_premium
-                ),
-                max_quantity=self.request_users.max_quantity
+                peer_type=peer_type,
+                max_quantity=self.request_users.max_quantity,
+                name_requested=self.request_users.request_name,
+                username_requested=self.request_users.request_username,
+                photo_requested=self.request_users.request_photo,
             )
         elif self.web_app:
             return raw.types.KeyboardButtonSimpleWebView(text=self.text, url=self.web_app.url)

pyrogram/types/bots_and_keyboards/keyboard_button_request_chat.py

@@ -52,6 +52,18 @@ class KeyboardButtonRequestChat(Object):
 
         bot_administrator_rights (:obj:`~pyrogram.types.ChatAdministratorRights`, *optional*):
             Privileged actions that an bot administrator is able to take.
+
+        request_title (``bool``, *optional*):
+            Pass True to request the chats' title
+            If not specified, the title won't be requested.
+
+        request_username (``bool``, *optional*):
+            Pass True to request the chats' username
+            If not specified, the username won't be requested.
+
+        request_photo (``bool``, *optional*):
+            Pass True to request the chats' photo
+            If not specified, the photo won't be requested.
     """
 
     def __init__(
@@ -63,7 +75,11 @@ def __init__(
         chat_is_created: bool = None,
         bot_is_member: bool = None,
         user_administrator_rights: "types.ChatAdministratorRights" = None,
-        bot_administrator_rights: "types.ChatAdministratorRights" = None
+        bot_administrator_rights: "types.ChatAdministratorRights" = None,
+        request_title: bool = None,
+        request_username: bool = None,
+        request_photo: bool = None,
+        max_quantity: int = 1,  # Telegram ignores this field for chats
     ):
         super().__init__()
 
@@ -75,3 +91,7 @@ def __init__(
         self.chat_is_forum = chat_is_forum
         self.user_administrator_rights = user_administrator_rights
         self.bot_administrator_rights = bot_administrator_rights
+        self.request_title = request_title
+        self.request_username = request_username
+        self.request_photo = request_photo
+        self.max_quantity = max_quantity

pyrogram/types/bots_and_keyboards/keyboard_button_request_users.py

@@ -37,6 +37,19 @@ class KeyboardButtonRequestUsers(Object):
         max_quantity(``int``, *optional*):
             The maximum number of users to be selected; 1-10.
             Defaults to 1.
+
+        request_name (``bool``, *optional*):
+            Pass True to request the users' first and last name
+            If not specified, the name won't be requested.
+
+        request_username (``bool``, *optional*):
+            Pass True to request the users' username
+            If not specified, the username won't be requested.
+
+        request_photo (``bool``, *optional*):
+            Pass True to request the users' photo
+            If not specified, the photo won't be requested.
+
     """
 
     def __init__(
@@ -45,10 +58,16 @@ def __init__(
         user_is_bot: bool = None,
         user_is_premium: bool = None,
         max_quantity: int = 1,
+        request_name: bool = None,
+        request_username: bool = None,
+        request_photo: bool = None,
     ):
         super().__init__()
 
         self.button_id = button_id
         self.user_is_bot = user_is_bot
         self.user_is_premium = user_is_premium
         self.max_quantity = max_quantity
+        self.request_name = request_name
+        self.request_username = request_username
+        self.request_photo = request_photo