fixes in samples and update up to 10.0.0

BoostsInfoBot/README.md

@@ -0,0 +1,9 @@
+# UserChatShared
+
+Showing info about boosts
+
+## Launch
+
+```bash
+../gradlew run --args="BOT_TOKEN"
+```

BoostsInfoBot/build.gradle

@@ -0,0 +1,21 @@
+buildscript {
+    repositories {
+        mavenCentral()
+    }
+
+    dependencies {
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+    }
+}
+
+apply plugin: 'kotlin'
+apply plugin: 'application'
+
+mainClassName="BoostsInfoKt"
+
+
+dependencies {
+    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
+
+    implementation "dev.inmo:tgbotapi:$telegram_bot_api_version"
+}

BoostsInfoBot/src/main/kotlin/BoostsInfo.kt

@@ -0,0 +1,65 @@
+import dev.inmo.kslog.common.KSLog
+import dev.inmo.kslog.common.LogLevel
+import dev.inmo.kslog.common.defaultMessageFormatter
+import dev.inmo.kslog.common.setDefaultKSLog
+import dev.inmo.tgbotapi.bot.ktor.telegramBot
+import dev.inmo.tgbotapi.extensions.api.get.getUserChatBoosts
+import dev.inmo.tgbotapi.extensions.api.send.*
+import dev.inmo.tgbotapi.extensions.behaviour_builder.buildBehaviourWithLongPolling
+import dev.inmo.tgbotapi.extensions.behaviour_builder.triggers_handling.onChatBoostUpdated
+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.utils.types.buttons.*
+import dev.inmo.tgbotapi.types.chat.member.ChatCommonAdministratorRights
+import dev.inmo.tgbotapi.types.request.RequestId
+import dev.inmo.tgbotapi.utils.regular
+import korlibs.time.DateFormat
+import korlibs.time.format
+
+suspend fun main(args: Array<String>) {
+    val isDebug = args.getOrNull(1) == "debug"
+
+    if (isDebug) {
+        setDefaultKSLog(
+            KSLog { level: LogLevel, tag: String?, message: Any, throwable: Throwable? ->
+                println(defaultMessageFormatter(level, tag, message, throwable))
+            }
+        )
+    }
+
+    val requestChatId = RequestId(1)
+
+    val bot = telegramBot(args.first())
+
+    bot.buildBehaviourWithLongPolling (defaultExceptionsHandler = { it.printStackTrace() }) {
+        onChatBoostUpdated {
+            println(it)
+        }
+
+        onCommand("start") {
+            reply(
+                it,
+                replyMarkup = flatReplyKeyboard {
+                    requestChannelButton(
+                        "Click me :)",
+                        requestChatId,
+                        botIsMember = true
+                    )
+                }
+            ) {
+                regular("Select chat to get know about your boosts")
+            }
+        }
+
+        onChatShared(initialFilter = { it.chatEvent.requestId == requestChatId }) {
+            val boosts = getUserChatBoosts(it.chatEvent.chatId, it.chat.id)
+            reply(
+                it
+            ) {
+                boosts.boosts.forEach {
+                    regular("Boost added: ${DateFormat.FORMAT1.format(it.addDate.asDate)}; Boost expire: ${DateFormat.FORMAT1.format(it.expirationDate.asDate)}; Unformatted: $it") + "\n"
+                }
+            }
+        }
+    }.join()
+}

ReactionsInfoBot/src/main/kotlin/ReactionsInfoBot.kt

@@ -42,7 +42,7 @@ suspend fun main(vararg args: String) {
             val replyResult = reply(
                 it.chat.id,
                 it.messageId,
-                replyInChat = it.reactedUser.id
+                replyInChatId = it.reactedUser.id
             ) {
                 regular("Current reactions for message in reply:\n")
                 it.new.forEach {

RightsChangerBot/src/main/kotlin/RightsChanger.kt

@@ -24,6 +24,7 @@ import dev.inmo.tgbotapi.types.chat.ChatPermissions
 import dev.inmo.tgbotapi.types.chat.PublicChat
 import dev.inmo.tgbotapi.types.chat.member.*
 import dev.inmo.tgbotapi.types.commands.BotCommandScope
+import dev.inmo.tgbotapi.types.message.abstracts.AccessibleMessage
 import dev.inmo.tgbotapi.types.request.RequestId
 import dev.inmo.tgbotapi.utils.*
 import dev.inmo.tgbotapi.utils.mention
@@ -185,14 +186,21 @@ suspend fun main(args: Array<String>) {
     ) {
         onCommand(
             "simple",
-            initialFilter = { it.chat is PublicChat && it.fromUserMessageOrNull()?.user?.id == allowedAdmin }) {
+            initialFilter = { it.chat is PublicChat && it.fromUserMessageOrNull()?.user?.id == allowedAdmin }
+        ) {
             val replyMessage = it.replyTo
             val userInReply = replyMessage?.fromUserMessageOrNull()?.user?.id ?: return@onCommand
-            reply(
+            if (replyMessage is AccessibleMessage) {
-                replyMessage,
+                reply(
-                "Manage keyboard:",
+                    replyMessage,
-                replyMarkup = buildCommonKeyboard(it.chat.id.toChatId(), userInReply) ?: return@onCommand
+                    "Manage keyboard:",
-            )
+                    replyMarkup = buildCommonKeyboard(it.chat.id.toChatId(), userInReply) ?: return@onCommand
+                )
+            } else {
+                reply(it) {
+                    regular("Reply to somebody's message to get hist/her rights keyboard")
+                }
+            }
         }
         onCommand(
             "granular",
@@ -204,11 +212,17 @@ suspend fun main(args: Array<String>) {
             val usernameInText = it.content.textSources.firstNotNullOfOrNull { it.mentionTextSourceOrNull() } ?.username
             val userInReply = replyMessage?.fromUserMessageOrNull()?.user?.id ?: return@onCommand
 
-            reply(
+            if (replyMessage is AccessibleMessage) {
-                replyMessage,
+                reply(
-                "Manage keyboard:",
+                    replyMessage,
-                replyMarkup = buildGranularKeyboard(it.chat.id.toChatId(), userInReply) ?: return@onCommand
+                    "Manage keyboard:",
-            )
+                    replyMarkup = buildGranularKeyboard(it.chat.id.toChatId(), userInReply) ?: return@onCommand
+                )
+            } else {
+                reply(it) {
+                    regular("Reply to somebody's message to get hist/her rights keyboard")
+                }
+            }
         }
 
         onMessageDataCallbackQuery(

UserChatShared/src/main/kotlin/UserChatShared.kt

@@ -7,14 +7,11 @@ 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.utils.types.buttons.replyKeyboard
+import dev.inmo.tgbotapi.extensions.behaviour_builder.triggers_handling.onUsersShared
-import dev.inmo.tgbotapi.extensions.utils.types.buttons.requestBotButton
+import dev.inmo.tgbotapi.extensions.utils.types.buttons.*
-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
@@ -30,52 +27,90 @@ suspend fun main(args: Array<String>) {
     val requestIdUserPremium = RequestId(3)
     val requestIdBot = RequestId(4)
 
-    val requestIdAnyChat = RequestId(5)
+    val requestIdUsersOrBots = RequestId(5)
-    val requestIdChannel = RequestId(6)
+    val requestIdUsersNonPremium = RequestId(6)
-    val requestIdPublicChannel = RequestId(7)
+    val requestIdUsersAny = RequestId(7)
-    val requestIdPrivateChannel = RequestId(8)
+    val requestIdUsersPremium = RequestId(8)
-    val requestIdChannelUserOwner = RequestId(9)
+    val requestIdBots = RequestId(9)
 
-    val requestIdGroup = RequestId(10)
+    val requestIdAnyChat = RequestId(10)
-    val requestIdPublicGroup = RequestId(11)
+    val requestIdChannel = RequestId(11)
-    val requestIdPrivateGroup = RequestId(12)
+    val requestIdPublicChannel = RequestId(12)
-    val requestIdGroupUserOwner = RequestId(13)
+    val requestIdPrivateChannel = RequestId(13)
+    val requestIdChannelUserOwner = RequestId(14)
 
-    val requestIdForum = RequestId(14)
+    val requestIdGroup = RequestId(15)
-    val requestIdPublicForum = RequestId(15)
+    val requestIdPublicGroup = RequestId(16)
-    val requestIdPrivateForum = RequestId(16)
+    val requestIdPrivateGroup = RequestId(17)
-    val requestIdForumUserOwner = RequestId(17)
+    val requestIdGroupUserOwner = RequestId(18)
+
+    val requestIdForum = RequestId(19)
+    val requestIdPublicForum = RequestId(20)
+    val requestIdPrivateForum = RequestId(21)
+    val requestIdForumUserOwner = RequestId(22)
 
     val keyboard = replyKeyboard(
         resizeKeyboard = true,
     ) {
         row {
             requestUserOrBotButton(
-                "\uD83D\uDC64/\uD83E\uDD16",
+                "\uD83D\uDC64/\uD83E\uDD16 (1)",
                 requestIdUserOrBot
             )
         }
         row {
             requestUserButton(
-                "\uD83D\uDC64☆",
+                "\uD83D\uDC64☆ (1)",
                 requestIdUserNonPremium,
                 premiumUser = false
             )
             requestUserButton(
-                "\uD83D\uDC64",
+                "\uD83D\uDC64 (1)",
                 requestIdUserAny,
                 premiumUser = null
             )
             requestUserButton(
-                "\uD83D\uDC64★",
+                "\uD83D\uDC64★ (1)",
                 requestIdUserPremium,
                 premiumUser = true
             )
             requestBotButton(
-                "\uD83E\uDD16",
+                "\uD83E\uDD16 (1)",
                 requestIdBot
             )
         }
+        row {
+            requestUsersOrBotsButton(
+                "\uD83D\uDC64/\uD83E\uDD16",
+                requestIdUsersOrBots,
+                maxCount = keyboardButtonRequestUserLimit.last
+            )
+        }
+        row {
+            requestUsersButton(
+                "\uD83D\uDC64☆",
+                requestIdUsersNonPremium,
+                premiumUser = false,
+                maxCount = keyboardButtonRequestUserLimit.last
+            )
+            requestUsersButton(
+                "\uD83D\uDC64",
+                requestIdUsersAny,
+                premiumUser = null,
+                maxCount = keyboardButtonRequestUserLimit.last
+            )
+            requestUsersButton(
+                "\uD83D\uDC64★",
+                requestIdUsersPremium,
+                premiumUser = true,
+                maxCount = keyboardButtonRequestUserLimit.last
+            )
+            requestBotsButton(
+                "\uD83E\uDD16",
+                requestIdBots,
+                maxCount = keyboardButtonRequestUserLimit.last
+            )
+        }
         row {
             requestChatButton(
                 "\uD83D\uDDE3/\uD83D\uDC65",
@@ -164,25 +199,26 @@ suspend fun main(args: Array<String>) {
             )
         }
 
-        onUserShared {
+        onUsersShared {
-            val userId = it.chatEvent.userId
+            it.chatEvent.userIds.forEach { userId ->
-            val userInfo = runCatchingSafely { getChat(userId) }.getOrNull()
+                val userInfo = runCatchingSafely { getChat(userId) }.getOrNull()
-            reply(
+                reply(
-                it,
+                    it,
-            ) {
+                ) {
-                +"You have shared "
+                    +"You have shared "
-                +mention(
+                    +mention(
-                    when (it.chatEvent.requestId) {
+                        when (it.chatEvent.requestId) {
-                        requestIdUserOrBot -> "user or bot"
+                            requestIdUserOrBot -> "user or bot"
-                        requestIdUserNonPremium -> "non premium user"
+                            requestIdUserNonPremium -> "non premium user"
-                        requestIdUserAny -> "any user"
+                            requestIdUserAny -> "any user"
-                        requestIdUserPremium -> "premium user"
+                            requestIdUserPremium -> "premium user"
-                        requestIdBot -> "bot"
+                            requestIdBot -> "bot"
-                        else -> "somebody O.o"
+                            else -> "somebody O.o"
-                    },
+                        },
-                    userId
+                        userId
-                )
+                    )
-                +" (user info: $userInfo; user id: $userId)"
+                    +" (user info: $userInfo; user id: $userId)"
+                }
             }
         }
 

gradle.properties

@@ -5,7 +5,7 @@ org.gradle.jvmargs=-Xmx2344m
 
 
 kotlin_version=1.9.22
-telegram_bot_api_version=10.0.0-branch_10.0.0-build2050
+telegram_bot_api_version=10.0.0
-micro_utils_version=0.20.25
+micro_utils_version=0.20.26
 serialization_version=1.6.2
 ktor_version=2.3.7

settings.gradle

@@ -45,3 +45,5 @@ include ":InlineQueriesBot"
 include ":ReactionsInfoBot"
 
 include ":LinkPreviewsBot"
+
+include ":BoostsInfoBot"