Merge 984ffb8bae into 3609ae6bc2

UserChatShared/src/main/kotlin/UserChatShared.kt

@@ -7,11 +7,14 @@ import dev.inmo.tgbotapi.extensions.behaviour_builder.buildBehaviourWithLongPoll
 import dev.inmo.tgbotapi.extensions.behaviour_builder.triggers_handling.onChatShared
 import dev.inmo.tgbotapi.extensions.behaviour_builder.triggers_handling.onCommand
 import dev.inmo.tgbotapi.extensions.behaviour_builder.triggers_handling.onUserShared
-import dev.inmo.tgbotapi.extensions.behaviour_builder.triggers_handling.onUsersShared
-import dev.inmo.tgbotapi.extensions.utils.types.buttons.*
+import dev.inmo.tgbotapi.extensions.utils.types.buttons.replyKeyboard
+import dev.inmo.tgbotapi.extensions.utils.types.buttons.requestBotButton
+import dev.inmo.tgbotapi.extensions.utils.types.buttons.requestChatButton
+import dev.inmo.tgbotapi.extensions.utils.types.buttons.requestGroupButton
+import dev.inmo.tgbotapi.extensions.utils.types.buttons.requestUserButton
+import dev.inmo.tgbotapi.extensions.utils.types.buttons.requestUserOrBotButton
 import dev.inmo.tgbotapi.types.BotCommand
 import dev.inmo.tgbotapi.types.chat.PrivateChat
-import dev.inmo.tgbotapi.types.keyboardButtonRequestUserLimit
 import dev.inmo.tgbotapi.types.message.textsources.mention
 import dev.inmo.tgbotapi.types.request.RequestId
 import dev.inmo.tgbotapi.utils.row
@@ -47,35 +50,30 @@ suspend fun main(args: Array<String>) {
         resizeKeyboard = true,
     ) {
         row {
-            requestUsersOrBotsButton(
+            requestUserOrBotButton(
                 "\uD83D\uDC64/\uD83E\uDD16",
-                requestIdUserOrBot,
-                maxCount = keyboardButtonRequestUserLimit.last
+                requestIdUserOrBot
             )
         }
         row {
-            requestUsersButton(
+            requestUserButton(
                 "\uD83D\uDC64☆",
                 requestIdUserNonPremium,
-                premiumUser = false,
-                maxCount = keyboardButtonRequestUserLimit.last
+                premiumUser = false
             )
-            requestUsersButton(
+            requestUserButton(
                 "\uD83D\uDC64",
                 requestIdUserAny,
-                premiumUser = null,
-                maxCount = keyboardButtonRequestUserLimit.last
+                premiumUser = null
             )
-            requestUsersButton(
+            requestUserButton(
                 "\uD83D\uDC64★",
                 requestIdUserPremium,
-                premiumUser = true,
-                maxCount = keyboardButtonRequestUserLimit.last
+                premiumUser = true
             )
-            requestBotsButton(
+            requestBotButton(
                 "\uD83E\uDD16",
-                requestIdBot,
-                maxCount = keyboardButtonRequestUserLimit.last
+                requestIdBot
             )
         }
         row {
@@ -166,26 +164,25 @@ suspend fun main(args: Array<String>) {
             )
         }
 
-        onUsersShared {
-            it.chatEvent.userIds.forEach { userId ->
-                val userInfo = runCatchingSafely { getChat(userId) }.getOrNull()
-                reply(
-                    it,
-                ) {
-                    +"You have shared "
-                    +mention(
-                        when (it.chatEvent.requestId) {
-                            requestIdUserOrBot -> "user or bot"
-                            requestIdUserNonPremium -> "non premium user"
-                            requestIdUserAny -> "any user"
-                            requestIdUserPremium -> "premium user"
-                            requestIdBot -> "bot"
-                            else -> "somebody O.o"
-                        },
-                        userId
-                    )
-                    +" (user info: $userInfo; user id: $userId)"
-                }
+        onUserShared {
+            val userId = it.chatEvent.userId
+            val userInfo = runCatchingSafely { getChat(userId) }.getOrNull()
+            reply(
+                it,
+            ) {
+                +"You have shared "
+                +mention(
+                    when (it.chatEvent.requestId) {
+                        requestIdUserOrBot -> "user or bot"
+                        requestIdUserNonPremium -> "non premium user"
+                        requestIdUserAny -> "any user"
+                        requestIdUserPremium -> "premium user"
+                        requestIdBot -> "bot"
+                        else -> "somebody O.o"
+                    },
+                    userId
+                )
+                +" (user info: $userInfo; user id: $userId)"
             }
         }