From 4bff860c015b6d918cd88d24000cdd08b2aac739 Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Fri, 19 Apr 2024 19:34:27 +0600 Subject: [PATCH] fixes --- tgbotapi.core/api/tgbotapi.core.api | 40 +++---- .../buttons/KeyboardButtonRequestChat.kt | 20 +++- .../reply/ReplyKeyboardButtonsShortcuts.kt | 97 ++++++++++++--- tgbotapi.utils/api/tgbotapi.utils.api | 34 +++--- .../types/buttons/ReplyKeyboardBuilder.kt | 110 ++++++++++++++---- 5 files changed, 225 insertions(+), 76 deletions(-) diff --git a/tgbotapi.core/api/tgbotapi.core.api b/tgbotapi.core/api/tgbotapi.core.api index 997841651f..58ec01e855 100644 --- a/tgbotapi.core/api/tgbotapi.core.api +++ b/tgbotapi.core/api/tgbotapi.core.api @@ -11920,7 +11920,6 @@ public final class dev/inmo/tgbotapi/types/business_connection/BusinessOpeningHo public fun equals (Ljava/lang/Object;)Z public final fun getOpeningHours ()Ljava/util/List; public final fun getTimeZoneName ()Ljava/lang/String; - public final fun getTimezone ()Lkorlibs/time/Timezone; public fun hashCode ()I public fun toString ()Ljava/lang/String; } @@ -12440,10 +12439,10 @@ public final class dev/inmo/tgbotapi/types/buttons/KeyboardButtonRequestChat$$se } public final class dev/inmo/tgbotapi/types/buttons/KeyboardButtonRequestChat$Companion { - public final fun Channel-tzG5d64 (SLjava/lang/Boolean;Ljava/lang/Boolean;Ldev/inmo/tgbotapi/types/chat/member/ChatCommonAdministratorRights;Ldev/inmo/tgbotapi/types/chat/member/ChatCommonAdministratorRights;Ljava/lang/Boolean;)Ldev/inmo/tgbotapi/types/buttons/KeyboardButtonRequestChat; - public static synthetic fun Channel-tzG5d64$default (Ldev/inmo/tgbotapi/types/buttons/KeyboardButtonRequestChat$Companion;SLjava/lang/Boolean;Ljava/lang/Boolean;Ldev/inmo/tgbotapi/types/chat/member/ChatCommonAdministratorRights;Ldev/inmo/tgbotapi/types/chat/member/ChatCommonAdministratorRights;Ljava/lang/Boolean;ILjava/lang/Object;)Ldev/inmo/tgbotapi/types/buttons/KeyboardButtonRequestChat; - public final fun Group-pV1CTLE (SLjava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;Ldev/inmo/tgbotapi/types/chat/member/ChatCommonAdministratorRights;Ldev/inmo/tgbotapi/types/chat/member/ChatCommonAdministratorRights;Ljava/lang/Boolean;)Ldev/inmo/tgbotapi/types/buttons/KeyboardButtonRequestChat; - public static synthetic fun Group-pV1CTLE$default (Ldev/inmo/tgbotapi/types/buttons/KeyboardButtonRequestChat$Companion;SLjava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;Ldev/inmo/tgbotapi/types/chat/member/ChatCommonAdministratorRights;Ldev/inmo/tgbotapi/types/chat/member/ChatCommonAdministratorRights;Ljava/lang/Boolean;ILjava/lang/Object;)Ldev/inmo/tgbotapi/types/buttons/KeyboardButtonRequestChat; + public final fun Channel-jf4QQwM (SLjava/lang/Boolean;Ljava/lang/Boolean;Ldev/inmo/tgbotapi/types/chat/member/ChatCommonAdministratorRights;Ldev/inmo/tgbotapi/types/chat/member/ChatCommonAdministratorRights;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;)Ldev/inmo/tgbotapi/types/buttons/KeyboardButtonRequestChat; + public static synthetic fun Channel-jf4QQwM$default (Ldev/inmo/tgbotapi/types/buttons/KeyboardButtonRequestChat$Companion;SLjava/lang/Boolean;Ljava/lang/Boolean;Ldev/inmo/tgbotapi/types/chat/member/ChatCommonAdministratorRights;Ldev/inmo/tgbotapi/types/chat/member/ChatCommonAdministratorRights;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;ILjava/lang/Object;)Ldev/inmo/tgbotapi/types/buttons/KeyboardButtonRequestChat; + public final fun Group-79T4ZTI (SLjava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;Ldev/inmo/tgbotapi/types/chat/member/ChatCommonAdministratorRights;Ldev/inmo/tgbotapi/types/chat/member/ChatCommonAdministratorRights;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;)Ldev/inmo/tgbotapi/types/buttons/KeyboardButtonRequestChat; + public static synthetic fun Group-79T4ZTI$default (Ldev/inmo/tgbotapi/types/buttons/KeyboardButtonRequestChat$Companion;SLjava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;Ldev/inmo/tgbotapi/types/chat/member/ChatCommonAdministratorRights;Ldev/inmo/tgbotapi/types/chat/member/ChatCommonAdministratorRights;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;ILjava/lang/Object;)Ldev/inmo/tgbotapi/types/buttons/KeyboardButtonRequestChat; public final fun serializer ()Lkotlinx/serialization/KSerializer; } @@ -12993,26 +12992,27 @@ public final class dev/inmo/tgbotapi/types/buttons/inline/InlineKeyboardButtonsS } public final class dev/inmo/tgbotapi/types/buttons/reply/ReplyKeyboardButtonsShortcutsKt { - public static final fun requestBotsReplyButton-TwpgBjg (Ljava/lang/String;SI)Ldev/inmo/tgbotapi/types/buttons/RequestUserKeyboardButton; - public static synthetic fun requestBotsReplyButton-TwpgBjg$default (Ljava/lang/String;SIILjava/lang/Object;)Ldev/inmo/tgbotapi/types/buttons/RequestUserKeyboardButton; - public static final fun requestChannelReplyButton--ZHpl2Q (Ljava/lang/String;SLjava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;Ldev/inmo/tgbotapi/types/chat/member/ChatCommonAdministratorRights;Ldev/inmo/tgbotapi/types/chat/member/ChatCommonAdministratorRights;Ljava/lang/Boolean;)Ldev/inmo/tgbotapi/types/buttons/RequestChatKeyboardButton; - public static synthetic fun requestChannelReplyButton--ZHpl2Q$default (Ljava/lang/String;SLjava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;Ldev/inmo/tgbotapi/types/chat/member/ChatCommonAdministratorRights;Ldev/inmo/tgbotapi/types/chat/member/ChatCommonAdministratorRights;Ljava/lang/Boolean;ILjava/lang/Object;)Ldev/inmo/tgbotapi/types/buttons/RequestChatKeyboardButton; - public static final fun requestChannelReplyButton-DwHZ6rQ (Ljava/lang/String;SLjava/lang/Boolean;Ljava/lang/Boolean;Ldev/inmo/tgbotapi/types/chat/member/ChatCommonAdministratorRights;Ldev/inmo/tgbotapi/types/chat/member/ChatCommonAdministratorRights;Z)Ldev/inmo/tgbotapi/types/buttons/RequestChatKeyboardButton; - public static synthetic fun requestChannelReplyButton-DwHZ6rQ$default (Ljava/lang/String;SLjava/lang/Boolean;Ljava/lang/Boolean;Ldev/inmo/tgbotapi/types/chat/member/ChatCommonAdministratorRights;Ldev/inmo/tgbotapi/types/chat/member/ChatCommonAdministratorRights;ZILjava/lang/Object;)Ldev/inmo/tgbotapi/types/buttons/RequestChatKeyboardButton; + public static final fun requestBotsReplyButton-DMiTggw (Ljava/lang/String;SILjava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;)Ldev/inmo/tgbotapi/types/buttons/RequestUserKeyboardButton; + public static synthetic fun requestBotsReplyButton-DMiTggw$default (Ljava/lang/String;SILjava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;ILjava/lang/Object;)Ldev/inmo/tgbotapi/types/buttons/RequestUserKeyboardButton; + public static final fun requestChannelReplyButton-48zEUc8 (Ljava/lang/String;SLjava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;Ldev/inmo/tgbotapi/types/chat/member/ChatCommonAdministratorRights;Ldev/inmo/tgbotapi/types/chat/member/ChatCommonAdministratorRights;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;)Ldev/inmo/tgbotapi/types/buttons/RequestChatKeyboardButton; + public static synthetic fun requestChannelReplyButton-48zEUc8$default (Ljava/lang/String;SLjava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;Ldev/inmo/tgbotapi/types/chat/member/ChatCommonAdministratorRights;Ldev/inmo/tgbotapi/types/chat/member/ChatCommonAdministratorRights;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;ILjava/lang/Object;)Ldev/inmo/tgbotapi/types/buttons/RequestChatKeyboardButton; + public static final fun requestChannelReplyButton-x7olw_Q (Ljava/lang/String;SLjava/lang/Boolean;Ljava/lang/Boolean;Ldev/inmo/tgbotapi/types/chat/member/ChatCommonAdministratorRights;Ldev/inmo/tgbotapi/types/chat/member/ChatCommonAdministratorRights;ZLjava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;)Ldev/inmo/tgbotapi/types/buttons/RequestChatKeyboardButton; + public static synthetic fun requestChannelReplyButton-x7olw_Q$default (Ljava/lang/String;SLjava/lang/Boolean;Ljava/lang/Boolean;Ldev/inmo/tgbotapi/types/chat/member/ChatCommonAdministratorRights;Ldev/inmo/tgbotapi/types/chat/member/ChatCommonAdministratorRights;ZLjava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;ILjava/lang/Object;)Ldev/inmo/tgbotapi/types/buttons/RequestChatKeyboardButton; public static final fun requestChatReplyButton (Ljava/lang/String;Ldev/inmo/tgbotapi/types/buttons/KeyboardButtonRequestChat;)Ldev/inmo/tgbotapi/types/buttons/RequestChatKeyboardButton; - public static final fun requestChatReplyButton-Rgd8aa8 (Ljava/lang/String;SLjava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;Ldev/inmo/tgbotapi/types/chat/member/ChatCommonAdministratorRights;Ldev/inmo/tgbotapi/types/chat/member/ChatCommonAdministratorRights;Z)Ldev/inmo/tgbotapi/types/buttons/RequestChatKeyboardButton; - public static synthetic fun requestChatReplyButton-Rgd8aa8$default (Ljava/lang/String;SLjava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;Ldev/inmo/tgbotapi/types/chat/member/ChatCommonAdministratorRights;Ldev/inmo/tgbotapi/types/chat/member/ChatCommonAdministratorRights;ZILjava/lang/Object;)Ldev/inmo/tgbotapi/types/buttons/RequestChatKeyboardButton; + public static final fun requestChatReplyButton-Q8_HZNU (Ljava/lang/String;SLjava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;Ldev/inmo/tgbotapi/types/chat/member/ChatCommonAdministratorRights;Ldev/inmo/tgbotapi/types/chat/member/ChatCommonAdministratorRights;ZLjava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;)Ldev/inmo/tgbotapi/types/buttons/RequestChatKeyboardButton; + public static synthetic fun requestChatReplyButton-Q8_HZNU$default (Ljava/lang/String;SLjava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;Ldev/inmo/tgbotapi/types/chat/member/ChatCommonAdministratorRights;Ldev/inmo/tgbotapi/types/chat/member/ChatCommonAdministratorRights;ZLjava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;ILjava/lang/Object;)Ldev/inmo/tgbotapi/types/buttons/RequestChatKeyboardButton; public static final fun requestContactReplyButton (Ljava/lang/String;)Ldev/inmo/tgbotapi/types/buttons/RequestContactKeyboardButton; public static final fun requestLocationReplyButton (Ljava/lang/String;)Ldev/inmo/tgbotapi/types/buttons/RequestLocationKeyboardButton; public static final fun requestPollReplyButton (Ljava/lang/String;Ldev/inmo/tgbotapi/types/buttons/KeyboardButtonPollType;)Ldev/inmo/tgbotapi/types/buttons/RequestPollKeyboardButton; - public static final fun requestUserOrBotReplyButton-LWJCOyk (Ljava/lang/String;S)Ldev/inmo/tgbotapi/types/buttons/RequestUserKeyboardButton; - public static final fun requestUserReplyButton-AjjO_Wo (Ljava/lang/String;SLjava/lang/Boolean;I)Ldev/inmo/tgbotapi/types/buttons/RequestUserKeyboardButton; - public static synthetic fun requestUserReplyButton-AjjO_Wo$default (Ljava/lang/String;SLjava/lang/Boolean;IILjava/lang/Object;)Ldev/inmo/tgbotapi/types/buttons/RequestUserKeyboardButton; - public static final fun requestUsersOrBotsReplyButton-AjjO_Wo (Ljava/lang/String;SLjava/lang/Boolean;I)Ldev/inmo/tgbotapi/types/buttons/RequestUserKeyboardButton; - public static synthetic fun requestUsersOrBotsReplyButton-AjjO_Wo$default (Ljava/lang/String;SLjava/lang/Boolean;IILjava/lang/Object;)Ldev/inmo/tgbotapi/types/buttons/RequestUserKeyboardButton; + public static final fun requestUserOrBotReplyButton-L4bH-_U (Ljava/lang/String;SLjava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;)Ldev/inmo/tgbotapi/types/buttons/RequestUserKeyboardButton; + public static synthetic fun requestUserOrBotReplyButton-L4bH-_U$default (Ljava/lang/String;SLjava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;ILjava/lang/Object;)Ldev/inmo/tgbotapi/types/buttons/RequestUserKeyboardButton; + public static final fun requestUserReplyButton-DwHZ6rQ (Ljava/lang/String;SLjava/lang/Boolean;ILjava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;)Ldev/inmo/tgbotapi/types/buttons/RequestUserKeyboardButton; + public static synthetic fun requestUserReplyButton-DwHZ6rQ$default (Ljava/lang/String;SLjava/lang/Boolean;ILjava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;ILjava/lang/Object;)Ldev/inmo/tgbotapi/types/buttons/RequestUserKeyboardButton; + public static final fun requestUsersOrBotsReplyButton-DwHZ6rQ (Ljava/lang/String;SLjava/lang/Boolean;ILjava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;)Ldev/inmo/tgbotapi/types/buttons/RequestUserKeyboardButton; + public static synthetic fun requestUsersOrBotsReplyButton-DwHZ6rQ$default (Ljava/lang/String;SLjava/lang/Boolean;ILjava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;ILjava/lang/Object;)Ldev/inmo/tgbotapi/types/buttons/RequestUserKeyboardButton; public static final fun requestUsersReplyButton (Ljava/lang/String;Ldev/inmo/tgbotapi/types/buttons/KeyboardButtonRequestUsers;)Ldev/inmo/tgbotapi/types/buttons/RequestUserKeyboardButton; - public static final fun requestUsersReplyButton-AjjO_Wo (Ljava/lang/String;SLjava/lang/Boolean;I)Ldev/inmo/tgbotapi/types/buttons/RequestUserKeyboardButton; - public static synthetic fun requestUsersReplyButton-AjjO_Wo$default (Ljava/lang/String;SLjava/lang/Boolean;IILjava/lang/Object;)Ldev/inmo/tgbotapi/types/buttons/RequestUserKeyboardButton; + public static final fun requestUsersReplyButton-DwHZ6rQ (Ljava/lang/String;SLjava/lang/Boolean;ILjava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;)Ldev/inmo/tgbotapi/types/buttons/RequestUserKeyboardButton; + public static synthetic fun requestUsersReplyButton-DwHZ6rQ$default (Ljava/lang/String;SLjava/lang/Boolean;ILjava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;ILjava/lang/Object;)Ldev/inmo/tgbotapi/types/buttons/RequestUserKeyboardButton; public static final fun simpleReplyButton (Ljava/lang/String;)Ldev/inmo/tgbotapi/types/buttons/SimpleKeyboardButton; public static final fun webAppReplyButton (Ljava/lang/String;Ldev/inmo/tgbotapi/types/webapps/WebAppInfo;)Ldev/inmo/tgbotapi/types/buttons/WebAppKeyboardButton; public static final fun webAppReplyButton (Ljava/lang/String;Ljava/lang/String;)Ldev/inmo/tgbotapi/types/buttons/WebAppKeyboardButton; diff --git a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/buttons/KeyboardButtonRequestChat.kt b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/buttons/KeyboardButtonRequestChat.kt index 146db3af7d..ca55189e32 100644 --- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/buttons/KeyboardButtonRequestChat.kt +++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/buttons/KeyboardButtonRequestChat.kt @@ -42,7 +42,10 @@ data class KeyboardButtonRequestChat( isOwnedBy: Boolean? = null, userRightsInChat: ChatCommonAdministratorRights? = null, botRightsInChat: ChatCommonAdministratorRights? = null, - botIsMember: Boolean? = null + botIsMember: Boolean? = null, + requestTitle: Boolean? = null, + requestUsername: Boolean? = null, + requestPhoto: Boolean? = null, ) = KeyboardButtonRequestChat( requestId = requestId, isChannel = true, @@ -51,7 +54,10 @@ data class KeyboardButtonRequestChat( isOwnedBy = isOwnedBy, userRightsInChat = userRightsInChat, botRightsInChat = botRightsInChat, - botIsMember = botIsMember + botIsMember = botIsMember, + requestTitle = requestTitle, + requestUsername = requestUsername, + requestPhoto = requestPhoto, ) fun Group( @@ -61,7 +67,10 @@ data class KeyboardButtonRequestChat( isOwnedBy: Boolean? = null, userRightsInChat: ChatCommonAdministratorRights? = null, botRightsInChat: ChatCommonAdministratorRights? = null, - botIsMember: Boolean? = null + botIsMember: Boolean? = null, + requestTitle: Boolean? = null, + requestUsername: Boolean? = null, + requestPhoto: Boolean? = null, ) = KeyboardButtonRequestChat( requestId = requestId, isChannel = false, @@ -70,7 +79,10 @@ data class KeyboardButtonRequestChat( isOwnedBy = isOwnedBy, userRightsInChat = userRightsInChat, botRightsInChat = botRightsInChat, - botIsMember = botIsMember + botIsMember = botIsMember, + requestTitle = requestTitle, + requestUsername = requestUsername, + requestPhoto = requestPhoto, ) } } diff --git a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/buttons/reply/ReplyKeyboardButtonsShortcuts.kt b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/buttons/reply/ReplyKeyboardButtonsShortcuts.kt index eb44cea784..e09e4ac6a7 100644 --- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/buttons/reply/ReplyKeyboardButtonsShortcuts.kt +++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/buttons/reply/ReplyKeyboardButtonsShortcuts.kt @@ -4,7 +4,11 @@ import dev.inmo.tgbotapi.types.buttons.* import dev.inmo.tgbotapi.types.chat.member.ChatCommonAdministratorRights import dev.inmo.tgbotapi.types.keyboardButtonRequestUserLimit import dev.inmo.tgbotapi.types.request.RequestId +import dev.inmo.tgbotapi.types.requestNameField +import dev.inmo.tgbotapi.types.requestPhotoField +import dev.inmo.tgbotapi.types.requestUsernameField import dev.inmo.tgbotapi.types.webapps.WebAppInfo +import kotlinx.serialization.SerialName import kotlin.math.max @@ -71,10 +75,19 @@ inline fun requestUsersReplyButton( inline fun requestBotsReplyButton( text: String, requestId: RequestId, - maxCount: Int = keyboardButtonRequestUserLimit.first + maxCount: Int = keyboardButtonRequestUserLimit.first, + requestName: Boolean? = null, + requestUsername: Boolean? = null, + requestPhoto: Boolean? = null, ) = requestUsersReplyButton( text, - KeyboardButtonRequestUsers.Bot(requestId, maxCount) + KeyboardButtonRequestUsers.Bot( + requestId = requestId, + maxCount = maxCount, + requestName = requestName, + requestUsername = requestUsername, + requestPhoto = requestPhoto + ) ) /** @@ -84,10 +97,20 @@ inline fun requestUsersReplyButton( text: String, requestId: RequestId, premiumUser: Boolean? = null, - maxCount: Int = keyboardButtonRequestUserLimit.first + maxCount: Int = keyboardButtonRequestUserLimit.first, + requestName: Boolean? = null, + requestUsername: Boolean? = null, + requestPhoto: Boolean? = null, ) = requestUsersReplyButton( text, - KeyboardButtonRequestUsers.Common(requestId, premiumUser, maxCount) + KeyboardButtonRequestUsers.Common( + requestId = requestId, + isPremium = premiumUser, + maxCount = maxCount, + requestName = requestName, + requestUsername = requestUsername, + requestPhoto = requestPhoto + ) ) /** @@ -97,12 +120,18 @@ inline fun requestUserReplyButton( text: String, requestId: RequestId, premiumUser: Boolean? = null, - maxCount: Int = keyboardButtonRequestUserLimit.first + maxCount: Int = keyboardButtonRequestUserLimit.first, + requestName: Boolean? = null, + requestUsername: Boolean? = null, + requestPhoto: Boolean? = null, ) = requestUsersReplyButton( text, requestId, premiumUser, - maxCount + maxCount, + requestName = requestName, + requestUsername = requestUsername, + requestPhoto = requestPhoto ) /** @@ -112,10 +141,20 @@ inline fun requestUsersOrBotsReplyButton( text: String, requestId: RequestId, premiumUser: Boolean? = null, - maxCount: Int = keyboardButtonRequestUserLimit.first + maxCount: Int = keyboardButtonRequestUserLimit.first, + requestName: Boolean? = null, + requestUsername: Boolean? = null, + requestPhoto: Boolean? = null, ) = requestUsersReplyButton( text, - KeyboardButtonRequestUsers.Any(requestId, premiumUser, maxCount) + KeyboardButtonRequestUsers.Any( + requestId = requestId, + isPremium = premiumUser, + maxCount = maxCount, + requestName = requestName, + requestUsername = requestUsername, + requestPhoto = requestPhoto + ) ) /** @@ -123,10 +162,18 @@ inline fun requestUsersOrBotsReplyButton( */ inline fun requestUserOrBotReplyButton( text: String, - requestId: RequestId + requestId: RequestId, + requestName: Boolean? = null, + requestUsername: Boolean? = null, + requestPhoto: Boolean? = null, ) = requestUsersReplyButton( text, - KeyboardButtonRequestUsers.Any(requestId) + KeyboardButtonRequestUsers.Any( + requestId = requestId, + requestName = requestName, + requestUsername = requestUsername, + requestPhoto = requestPhoto + ) ) @@ -153,7 +200,10 @@ inline fun requestChatReplyButton( isOwnedBy: Boolean? = null, userRightsInChat: ChatCommonAdministratorRights? = null, botRightsInChat: ChatCommonAdministratorRights? = null, - botIsMember: Boolean = false + botIsMember: Boolean = false, + requestTitle: Boolean? = null, + requestUsername: Boolean? = null, + requestPhoto: Boolean? = null, ) = requestChatReplyButton( text, KeyboardButtonRequestChat( @@ -164,7 +214,10 @@ inline fun requestChatReplyButton( isOwnedBy = isOwnedBy, userRightsInChat = userRightsInChat, botRightsInChat = botRightsInChat, - botIsMember = botIsMember + botIsMember = botIsMember, + requestTitle = requestTitle, + requestUsername = requestUsername, + requestPhoto = requestPhoto, ) ) @@ -178,7 +231,10 @@ inline fun requestChannelReplyButton( isOwnedBy: Boolean? = null, userRightsInChat: ChatCommonAdministratorRights? = null, botRightsInChat: ChatCommonAdministratorRights? = null, - botIsMember: Boolean = false + botIsMember: Boolean = false, + requestTitle: Boolean? = null, + requestUsername: Boolean? = null, + requestPhoto: Boolean? = null, ) = requestChatReplyButton( text, KeyboardButtonRequestChat.Channel( @@ -187,7 +243,10 @@ inline fun requestChannelReplyButton( isOwnedBy = isOwnedBy, userRightsInChat = userRightsInChat, botRightsInChat = botRightsInChat, - botIsMember = botIsMember + botIsMember = botIsMember, + requestTitle = requestTitle, + requestUsername = requestUsername, + requestPhoto = requestPhoto, ) ) @@ -203,7 +262,10 @@ inline fun requestChannelReplyButton( isOwnedBy: Boolean? = null, userRightsInChat: ChatCommonAdministratorRights? = null, botRightsInChat: ChatCommonAdministratorRights? = null, - botIsMember: Boolean? = null + botIsMember: Boolean? = null, + requestTitle: Boolean? = null, + requestUsername: Boolean? = null, + requestPhoto: Boolean? = null, ) = requestChatReplyButton( text, KeyboardButtonRequestChat.Group( @@ -213,6 +275,9 @@ inline fun requestChannelReplyButton( isOwnedBy = isOwnedBy, userRightsInChat = userRightsInChat, botRightsInChat = botRightsInChat, - botIsMember = botIsMember + botIsMember = botIsMember, + requestTitle = requestTitle, + requestUsername = requestUsername, + requestPhoto = requestPhoto, ) ) diff --git a/tgbotapi.utils/api/tgbotapi.utils.api b/tgbotapi.utils/api/tgbotapi.utils.api index b533c2e8e6..db3969d7cd 100644 --- a/tgbotapi.utils/api/tgbotapi.utils.api +++ b/tgbotapi.utils/api/tgbotapi.utils.api @@ -3196,27 +3196,29 @@ public final class dev/inmo/tgbotapi/extensions/utils/types/buttons/ReplyKeyboar public static synthetic fun flatReplyKeyboard$default (Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/String;Ljava/lang/Boolean;Ljava/lang/Boolean;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Ldev/inmo/tgbotapi/types/buttons/ReplyKeyboardMarkup; public static final fun replyKeyboard (Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/String;Ljava/lang/Boolean;Ljava/lang/Boolean;Lkotlin/jvm/functions/Function1;)Ldev/inmo/tgbotapi/types/buttons/ReplyKeyboardMarkup; public static synthetic fun replyKeyboard$default (Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/String;Ljava/lang/Boolean;Ljava/lang/Boolean;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Ldev/inmo/tgbotapi/types/buttons/ReplyKeyboardMarkup; - public static final fun requestBotButton-k9yqfdo (Ldev/inmo/tgbotapi/utils/RowBuilder;Ljava/lang/String;S)Z - public static final fun requestBotsButton-t22p7TQ (Ldev/inmo/tgbotapi/utils/RowBuilder;Ljava/lang/String;SI)Z - public static synthetic fun requestBotsButton-t22p7TQ$default (Ldev/inmo/tgbotapi/utils/RowBuilder;Ljava/lang/String;SIILjava/lang/Object;)Z - public static final fun requestChannelButton-XjXd-ic (Ldev/inmo/tgbotapi/utils/RowBuilder;Ljava/lang/String;SLjava/lang/Boolean;Ljava/lang/Boolean;Ldev/inmo/tgbotapi/types/chat/member/ChatCommonAdministratorRights;Ldev/inmo/tgbotapi/types/chat/member/ChatCommonAdministratorRights;Ljava/lang/Boolean;)Z - public static synthetic fun requestChannelButton-XjXd-ic$default (Ldev/inmo/tgbotapi/utils/RowBuilder;Ljava/lang/String;SLjava/lang/Boolean;Ljava/lang/Boolean;Ldev/inmo/tgbotapi/types/chat/member/ChatCommonAdministratorRights;Ldev/inmo/tgbotapi/types/chat/member/ChatCommonAdministratorRights;Ljava/lang/Boolean;ILjava/lang/Object;)Z + public static final fun requestBotButton-6J3sOes (Ldev/inmo/tgbotapi/utils/RowBuilder;Ljava/lang/String;SLjava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;)Z + public static synthetic fun requestBotButton-6J3sOes$default (Ldev/inmo/tgbotapi/utils/RowBuilder;Ljava/lang/String;SLjava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;ILjava/lang/Object;)Z + public static final fun requestBotsButton-6xNxnbw (Ldev/inmo/tgbotapi/utils/RowBuilder;Ljava/lang/String;SILjava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;)Z + public static synthetic fun requestBotsButton-6xNxnbw$default (Ldev/inmo/tgbotapi/utils/RowBuilder;Ljava/lang/String;SILjava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;ILjava/lang/Object;)Z + public static final fun requestChannelButton-cvDvKfo (Ldev/inmo/tgbotapi/utils/RowBuilder;Ljava/lang/String;SLjava/lang/Boolean;Ljava/lang/Boolean;Ldev/inmo/tgbotapi/types/chat/member/ChatCommonAdministratorRights;Ldev/inmo/tgbotapi/types/chat/member/ChatCommonAdministratorRights;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;)Z + public static synthetic fun requestChannelButton-cvDvKfo$default (Ldev/inmo/tgbotapi/utils/RowBuilder;Ljava/lang/String;SLjava/lang/Boolean;Ljava/lang/Boolean;Ldev/inmo/tgbotapi/types/chat/member/ChatCommonAdministratorRights;Ldev/inmo/tgbotapi/types/chat/member/ChatCommonAdministratorRights;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;ILjava/lang/Object;)Z public static final fun requestChatButton (Ldev/inmo/tgbotapi/utils/RowBuilder;Ljava/lang/String;Ldev/inmo/tgbotapi/types/buttons/KeyboardButtonRequestChat;)Z - public static final fun requestChatButton-Lj92p0I (Ldev/inmo/tgbotapi/utils/RowBuilder;Ljava/lang/String;SLjava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;Ldev/inmo/tgbotapi/types/chat/member/ChatCommonAdministratorRights;Ldev/inmo/tgbotapi/types/chat/member/ChatCommonAdministratorRights;Ljava/lang/Boolean;)Z - public static synthetic fun requestChatButton-Lj92p0I$default (Ldev/inmo/tgbotapi/utils/RowBuilder;Ljava/lang/String;SLjava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;Ldev/inmo/tgbotapi/types/chat/member/ChatCommonAdministratorRights;Ldev/inmo/tgbotapi/types/chat/member/ChatCommonAdministratorRights;Ljava/lang/Boolean;ILjava/lang/Object;)Z + public static final fun requestChatButton-n4yCVdQ (Ldev/inmo/tgbotapi/utils/RowBuilder;Ljava/lang/String;SLjava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;Ldev/inmo/tgbotapi/types/chat/member/ChatCommonAdministratorRights;Ldev/inmo/tgbotapi/types/chat/member/ChatCommonAdministratorRights;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;)Z + public static synthetic fun requestChatButton-n4yCVdQ$default (Ldev/inmo/tgbotapi/utils/RowBuilder;Ljava/lang/String;SLjava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;Ldev/inmo/tgbotapi/types/chat/member/ChatCommonAdministratorRights;Ldev/inmo/tgbotapi/types/chat/member/ChatCommonAdministratorRights;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;ILjava/lang/Object;)Z public static final fun requestContactButton (Ldev/inmo/tgbotapi/utils/RowBuilder;Ljava/lang/String;)Z - public static final fun requestGroupButton-GP8XSDU (Ldev/inmo/tgbotapi/utils/RowBuilder;Ljava/lang/String;SLjava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;Ldev/inmo/tgbotapi/types/chat/member/ChatCommonAdministratorRights;Ldev/inmo/tgbotapi/types/chat/member/ChatCommonAdministratorRights;Ljava/lang/Boolean;)Z - public static synthetic fun requestGroupButton-GP8XSDU$default (Ldev/inmo/tgbotapi/utils/RowBuilder;Ljava/lang/String;SLjava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;Ldev/inmo/tgbotapi/types/chat/member/ChatCommonAdministratorRights;Ldev/inmo/tgbotapi/types/chat/member/ChatCommonAdministratorRights;Ljava/lang/Boolean;ILjava/lang/Object;)Z + public static final fun requestGroupButton-dh25vGQ (Ldev/inmo/tgbotapi/utils/RowBuilder;Ljava/lang/String;SLjava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;Ldev/inmo/tgbotapi/types/chat/member/ChatCommonAdministratorRights;Ldev/inmo/tgbotapi/types/chat/member/ChatCommonAdministratorRights;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;)Z + public static synthetic fun requestGroupButton-dh25vGQ$default (Ldev/inmo/tgbotapi/utils/RowBuilder;Ljava/lang/String;SLjava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;Ldev/inmo/tgbotapi/types/chat/member/ChatCommonAdministratorRights;Ldev/inmo/tgbotapi/types/chat/member/ChatCommonAdministratorRights;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;ILjava/lang/Object;)Z public static final fun requestLocationButton (Ldev/inmo/tgbotapi/utils/RowBuilder;Ljava/lang/String;)Z public static final fun requestPollButton (Ldev/inmo/tgbotapi/utils/RowBuilder;Ljava/lang/String;Ldev/inmo/tgbotapi/types/buttons/KeyboardButtonPollType;)Z - public static final fun requestUserButton-t22p7TQ (Ldev/inmo/tgbotapi/utils/RowBuilder;Ljava/lang/String;SLjava/lang/Boolean;)Z - public static synthetic fun requestUserButton-t22p7TQ$default (Ldev/inmo/tgbotapi/utils/RowBuilder;Ljava/lang/String;SLjava/lang/Boolean;ILjava/lang/Object;)Z - public static final fun requestUserOrBotButton-k9yqfdo (Ldev/inmo/tgbotapi/utils/RowBuilder;Ljava/lang/String;S)Z + public static final fun requestUserButton-6xNxnbw (Ldev/inmo/tgbotapi/utils/RowBuilder;Ljava/lang/String;SLjava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;)Z + public static synthetic fun requestUserButton-6xNxnbw$default (Ldev/inmo/tgbotapi/utils/RowBuilder;Ljava/lang/String;SLjava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;ILjava/lang/Object;)Z + public static final fun requestUserOrBotButton-6J3sOes (Ldev/inmo/tgbotapi/utils/RowBuilder;Ljava/lang/String;SLjava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;)Z + public static synthetic fun requestUserOrBotButton-6J3sOes$default (Ldev/inmo/tgbotapi/utils/RowBuilder;Ljava/lang/String;SLjava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;ILjava/lang/Object;)Z public static final fun requestUsersButton (Ldev/inmo/tgbotapi/utils/RowBuilder;Ljava/lang/String;Ldev/inmo/tgbotapi/types/buttons/KeyboardButtonRequestUsers;)Z - public static final fun requestUsersButton-0GQog4c (Ldev/inmo/tgbotapi/utils/RowBuilder;Ljava/lang/String;SLjava/lang/Boolean;I)Z - public static synthetic fun requestUsersButton-0GQog4c$default (Ldev/inmo/tgbotapi/utils/RowBuilder;Ljava/lang/String;SLjava/lang/Boolean;IILjava/lang/Object;)Z - public static final fun requestUsersOrBotsButton-0GQog4c (Ldev/inmo/tgbotapi/utils/RowBuilder;Ljava/lang/String;SLjava/lang/Boolean;I)Z - public static synthetic fun requestUsersOrBotsButton-0GQog4c$default (Ldev/inmo/tgbotapi/utils/RowBuilder;Ljava/lang/String;SLjava/lang/Boolean;IILjava/lang/Object;)Z + public static final fun requestUsersButton-XjXd-ic (Ldev/inmo/tgbotapi/utils/RowBuilder;Ljava/lang/String;SLjava/lang/Boolean;ILjava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;)Z + public static synthetic fun requestUsersButton-XjXd-ic$default (Ldev/inmo/tgbotapi/utils/RowBuilder;Ljava/lang/String;SLjava/lang/Boolean;ILjava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;ILjava/lang/Object;)Z + public static final fun requestUsersOrBotsButton-XjXd-ic (Ldev/inmo/tgbotapi/utils/RowBuilder;Ljava/lang/String;SLjava/lang/Boolean;ILjava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;)Z + public static synthetic fun requestUsersOrBotsButton-XjXd-ic$default (Ldev/inmo/tgbotapi/utils/RowBuilder;Ljava/lang/String;SLjava/lang/Boolean;ILjava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;ILjava/lang/Object;)Z public static final fun simpleButton (Ldev/inmo/tgbotapi/utils/RowBuilder;Ljava/lang/String;)Z public static final fun webAppButton (Ldev/inmo/tgbotapi/utils/RowBuilder;Ljava/lang/String;Ldev/inmo/tgbotapi/types/webapps/WebAppInfo;)Z public static final fun webAppButton (Ldev/inmo/tgbotapi/utils/RowBuilder;Ljava/lang/String;Ljava/lang/String;)Z diff --git a/tgbotapi.utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/types/buttons/ReplyKeyboardBuilder.kt b/tgbotapi.utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/types/buttons/ReplyKeyboardBuilder.kt index bd17d904e5..24e9069363 100644 --- a/tgbotapi.utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/types/buttons/ReplyKeyboardBuilder.kt +++ b/tgbotapi.utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/types/buttons/ReplyKeyboardBuilder.kt @@ -158,10 +158,19 @@ inline fun ReplyKeyboardRowBuilder.requestUsersButton( inline fun ReplyKeyboardRowBuilder.requestBotsButton( text: String, requestId: RequestId, - maxCount: Int = keyboardButtonRequestUserLimit.first + maxCount: Int = keyboardButtonRequestUserLimit.first, + requestName: Boolean? = null, + requestUsername: Boolean? = null, + requestPhoto: Boolean? = null, ) = requestUsersButton( text, - KeyboardButtonRequestUsers.Bot(requestId, maxCount) + KeyboardButtonRequestUsers.Bot( + requestId = requestId, + maxCount = maxCount, + requestName = requestName, + requestUsername = requestUsername, + requestPhoto = requestPhoto + ) ) /** @@ -172,11 +181,17 @@ inline fun ReplyKeyboardRowBuilder.requestBotsButton( */ inline fun ReplyKeyboardRowBuilder.requestBotButton( text: String, - requestId: RequestId + requestId: RequestId, + requestName: Boolean? = null, + requestUsername: Boolean? = null, + requestPhoto: Boolean? = null, ) = requestBotsButton( text, requestId, - maxCount = keyboardButtonRequestUserLimit.first + maxCount = keyboardButtonRequestUserLimit.first, + requestName = requestName, + requestUsername = requestUsername, + requestPhoto = requestPhoto ) /** @@ -189,10 +204,20 @@ inline fun ReplyKeyboardRowBuilder.requestUsersButton( text: String, requestId: RequestId, premiumUser: Boolean? = null, - maxCount: Int = keyboardButtonRequestUserLimit.first + maxCount: Int = keyboardButtonRequestUserLimit.first, + requestName: Boolean? = null, + requestUsername: Boolean? = null, + requestPhoto: Boolean? = null, ) = requestUsersButton( text, - KeyboardButtonRequestUsers.Common(requestId, premiumUser, maxCount) + KeyboardButtonRequestUsers.Common( + requestId = requestId, + isPremium = premiumUser, + maxCount = maxCount, + requestName = requestName, + requestUsername = requestUsername, + requestPhoto = requestPhoto + ) ) /** @@ -204,8 +229,19 @@ inline fun ReplyKeyboardRowBuilder.requestUsersButton( inline fun ReplyKeyboardRowBuilder.requestUserButton( text: String, requestId: RequestId, - premiumUser: Boolean? = null -) = requestUsersButton(text, requestId, premiumUser, maxCount = keyboardButtonRequestUserLimit.first) + premiumUser: Boolean? = null, + requestName: Boolean? = null, + requestUsername: Boolean? = null, + requestPhoto: Boolean? = null, +) = requestUsersButton( + text = text, + requestId = requestId, + premiumUser = premiumUser, + maxCount = keyboardButtonRequestUserLimit.first, + requestName = requestName, + requestUsername = requestUsername, + requestPhoto = requestPhoto +) /** * Creates and put [RequestUserKeyboardButton] with [KeyboardButtonRequestUsers.Any] @@ -217,10 +253,20 @@ inline fun ReplyKeyboardRowBuilder.requestUsersOrBotsButton( text: String, requestId: RequestId, premiumUser: Boolean? = null, - maxCount: Int = keyboardButtonRequestUserLimit.first + maxCount: Int = keyboardButtonRequestUserLimit.first, + requestName: Boolean? = null, + requestUsername: Boolean? = null, + requestPhoto: Boolean? = null, ) = requestUsersButton( text, - KeyboardButtonRequestUsers.Any(requestId, premiumUser, maxCount) + KeyboardButtonRequestUsers.Any( + requestId = requestId, + isPremium = premiumUser, + maxCount = maxCount, + requestName = requestName, + requestUsername = requestUsername, + requestPhoto = requestPhoto + ) ) /** @@ -231,11 +277,17 @@ inline fun ReplyKeyboardRowBuilder.requestUsersOrBotsButton( */ inline fun ReplyKeyboardRowBuilder.requestUserOrBotButton( text: String, - requestId: RequestId + requestId: RequestId, + requestName: Boolean? = null, + requestUsername: Boolean? = null, + requestPhoto: Boolean? = null, ) = requestUsersOrBotsButton( - text, - requestId, - maxCount = keyboardButtonRequestUserLimit.first + text = text, + requestId = requestId, + maxCount = keyboardButtonRequestUserLimit.first, + requestName = requestName, + requestUsername = requestUsername, + requestPhoto = requestPhoto, ) @@ -270,7 +322,10 @@ inline fun ReplyKeyboardRowBuilder.requestChatButton( isOwnedBy: Boolean? = null, userRightsInChat: ChatCommonAdministratorRights? = null, botRightsInChat: ChatCommonAdministratorRights? = null, - botIsMember: Boolean? = null + botIsMember: Boolean? = null, + requestTitle: Boolean? = null, + requestUsername: Boolean? = null, + requestPhoto: Boolean? = null, ) = requestChatButton( text, KeyboardButtonRequestChat( @@ -281,7 +336,10 @@ inline fun ReplyKeyboardRowBuilder.requestChatButton( isOwnedBy = isOwnedBy, userRightsInChat = userRightsInChat, botRightsInChat = botRightsInChat, - botIsMember = botIsMember + botIsMember = botIsMember, + requestTitle = requestTitle, + requestUsername = requestUsername, + requestPhoto = requestPhoto, ) ) @@ -298,7 +356,10 @@ inline fun ReplyKeyboardRowBuilder.requestChannelButton( isOwnedBy: Boolean? = null, userRightsInChat: ChatCommonAdministratorRights? = null, botRightsInChat: ChatCommonAdministratorRights? = null, - botIsMember: Boolean? = null + botIsMember: Boolean? = null, + requestTitle: Boolean? = null, + requestUsername: Boolean? = null, + requestPhoto: Boolean? = null, ) = requestChatButton( text, KeyboardButtonRequestChat.Channel( @@ -307,7 +368,10 @@ inline fun ReplyKeyboardRowBuilder.requestChannelButton( isOwnedBy = isOwnedBy, userRightsInChat = userRightsInChat, botRightsInChat = botRightsInChat, - botIsMember = botIsMember + botIsMember = botIsMember, + requestTitle = requestTitle, + requestUsername = requestUsername, + requestPhoto = requestPhoto, ) ) @@ -325,7 +389,10 @@ inline fun ReplyKeyboardRowBuilder.requestGroupButton( isOwnedBy: Boolean? = null, userRightsInChat: ChatCommonAdministratorRights? = null, botRightsInChat: ChatCommonAdministratorRights? = null, - botIsMember: Boolean? = null + botIsMember: Boolean? = null, + requestTitle: Boolean? = null, + requestUsername: Boolean? = null, + requestPhoto: Boolean? = null, ) = requestChatButton( text, KeyboardButtonRequestChat.Group( @@ -335,6 +402,9 @@ inline fun ReplyKeyboardRowBuilder.requestGroupButton( isOwnedBy = isOwnedBy, userRightsInChat = userRightsInChat, botRightsInChat = botRightsInChat, - botIsMember = botIsMember + botIsMember = botIsMember, + requestTitle = requestTitle, + requestUsername = requestUsername, + requestPhoto = requestPhoto, ) )