Merge pull request #358 from InsanusMokrassar/33.0.0

33.0.0

BusinessConnectionsBot/src/main/kotlin/BusinessConnectionsBot.kt

@@ -213,6 +213,8 @@ suspend fun main(args: Array<String>) {
                     firstName,
                     secondName
                 )
+            }.map {
+                true
             }.getOrElse { false }
             reply(it) {
                 if (set) {
@@ -230,6 +232,8 @@ suspend fun main(args: Array<String>) {
                     businessConnectionId,
                     username
                 )
+            }.map {
+                true
             }.getOrElse {
                 it.printStackTrace()
                 false
@@ -267,6 +271,8 @@ suspend fun main(args: Array<String>) {
             }
             val transferred = runCatching {
                 transferBusinessAccountStars(businessConnectionId, count)
+            }.map {
+                true
             }.getOrElse {
                 it.printStackTrace()
                 false
@@ -310,6 +316,8 @@ suspend fun main(args: Array<String>) {
                     businessConnectionId,
                     bio
                 )
+            }.map {
+                true
             }.getOrElse {
                 it.printStackTrace()
                 false
@@ -327,6 +335,8 @@ suspend fun main(args: Array<String>) {
                     businessConnectionId,
                     initialBio
                 )
+            }.map {
+                true
             }.getOrElse {
                 it.printStackTrace()
                 false
@@ -358,6 +368,8 @@ suspend fun main(args: Array<String>) {
                     ),
                     isPublic = isPublic
                 )
+            }.map {
+                true
             }.getOrElse {
                 it.printStackTrace()
                 false
@@ -376,6 +388,8 @@ suspend fun main(args: Array<String>) {
                     businessConnectionId,
                     isPublic = isPublic
                 )
+            }.map {
+                true
             }.getOrElse {
                 it.printStackTrace()
                 false
@@ -461,6 +475,8 @@ suspend fun main(args: Array<String>) {
 
             val deleted = runCatching {
                 deleteStory(businessConnectionId, replyTo.content.story.id)
+            }.map {
+                true
             }.getOrElse {
                 it.printStackTrace()
                 false

ChatAvatarSetter/src/main/kotlin/ChatAvatarSetter.kt

@@ -1,3 +1,4 @@
+import dev.inmo.micro_utils.coroutines.runCatchingLogging
 import dev.inmo.micro_utils.coroutines.runCatchingSafely
 import dev.inmo.tgbotapi.bot.ktor.telegramBot
 import dev.inmo.tgbotapi.extensions.api.chat.modify.setChatPhoto
@@ -15,17 +16,13 @@ suspend fun main(args: Array<String>) {
     bot.buildBehaviourWithLongPolling(scope = CoroutineScope(Dispatchers.IO)) {
         onPhoto {
             val bytes = downloadFile(it.content)
-            runCatchingSafely {
+            runCatchingLogging {
                 setChatPhoto(
                     it.chat.id,
                     bytes.asMultipartFile("sample.jpg")
                 )
-            }.onSuccess { b ->
+            }.onSuccess { _ ->
-                if (b) {
+                reply(it, "Done")
-                    reply(it, "Done")
-                } else {
-                    reply(it, "Something went wrong")
-                }
             }.onFailure { e ->
                 e.printStackTrace()
 

MyBot/src/main/kotlin/MyBot.kt

@@ -70,21 +70,18 @@ suspend fun main(vararg args: String) {
 
             draftMessagesChannel.send("Photo file have been downloaded. Start set my profile photo")
 
-            val setResult = setMyProfilePhoto(
+            setMyProfilePhoto(
                 InputProfilePhoto.Static(
                     photoFile.asMultipartFile()
                 )
             )
-            if (setResult) {
+            reply(commandMessage, "New photo have been set")
-                reply(commandMessage, "New photo have been set")
-            }
         }
 
         onCommand("removeMyProfilePhoto") {
             runCatchingLogging {
-                if (removeMyProfilePhoto()) {
+                removeMyProfilePhoto()
-                    reply(it, "Photo have been removed")
+                reply(it, "Photo have been removed")
-                }
             }.onFailure { e ->
                 e.printStackTrace()
                 reply(it, "Something web wrong. See logs for details.")

PollsBot/src/main/kotlin/PollsBot.kt

@@ -6,11 +6,16 @@ import dev.inmo.micro_utils.coroutines.subscribeSafelyWithoutExceptions
 import dev.inmo.tgbotapi.extensions.api.bot.setMyCommands
 import dev.inmo.tgbotapi.extensions.api.send.polls.sendQuizPoll
 import dev.inmo.tgbotapi.extensions.api.send.polls.sendRegularPoll
+import dev.inmo.tgbotapi.extensions.api.send.reply
 import dev.inmo.tgbotapi.extensions.api.send.send
 import dev.inmo.tgbotapi.extensions.behaviour_builder.telegramBotWithBehaviourAndLongPolling
 import dev.inmo.tgbotapi.extensions.behaviour_builder.triggers_handling.onCommand
+import dev.inmo.tgbotapi.extensions.behaviour_builder.triggers_handling.onContentMessage
 import dev.inmo.tgbotapi.extensions.behaviour_builder.triggers_handling.onPollAnswer
+import dev.inmo.tgbotapi.extensions.behaviour_builder.triggers_handling.onPollOptionAdded
+import dev.inmo.tgbotapi.extensions.behaviour_builder.triggers_handling.onPollOptionDeleted
 import dev.inmo.tgbotapi.extensions.behaviour_builder.triggers_handling.onPollUpdates
+import dev.inmo.tgbotapi.extensions.utils.accessibleMessageOrNull
 import dev.inmo.tgbotapi.extensions.utils.customEmojiTextSourceOrNull
 import dev.inmo.tgbotapi.extensions.utils.extensions.parseCommandsWithArgsSources
 import dev.inmo.tgbotapi.types.BotCommand
@@ -105,7 +110,9 @@ suspend fun main(vararg args: String) {
                     }
                 },
                 isAnonymous = false,
-                replyParameters = ReplyParameters(it)
+                replyParameters = ReplyParameters(it),
+                allowAddingOptions = true,
+                hideResultsUntilCloses = true,
             )
             pollToChatMutex.withLock {
                 pollToChat[sentPoll.content.poll.id] = sentPoll.chat.id
@@ -118,7 +125,12 @@ suspend fun main(vararg args: String) {
                 .firstOrNull { it.first.command == "quiz" }
                 ?.second
                 ?.firstNotNullOfOrNull { it.customEmojiTextSourceOrNull() }
-            val correctAnswer = Random.nextInt(10)
+            val correctAnswer = mutableListOf<Int>()
+            (1 until Random.nextInt(9)).forEach {
+                val option = Random.nextInt(10)
+                if (correctAnswer.contains(option)) return@forEach
+                correctAnswer.add(option)
+            }
             val sentPoll = sendQuizPoll(
                 it.chat.id,
                 questionEntities = buildEntities {
@@ -127,7 +139,13 @@ suspend fun main(vararg args: String) {
                         customEmoji(customEmoji.customEmojiId, customEmoji.subsources)
                     }
                 },
-                (1 .. 10).map {
+                descriptionTextSources = buildEntities {
+                    regular("Test quiz poll description:")
+                    if (customEmoji != null) {
+                        customEmoji(customEmoji.customEmojiId, customEmoji.subsources)
+                    }
+                },
+                options = (1 .. 10).map {
                     InputPollOption {
                         regular(it.toString()) + " "
                         if (customEmoji != null) {
@@ -137,7 +155,11 @@ suspend fun main(vararg args: String) {
                 },
                 isAnonymous = false,
                 replyParameters = ReplyParameters(it),
-                correctOptionId = correctAnswer,
+                correctOptionIds = correctAnswer.sorted(),
+                allowsMultipleAnswers = correctAnswer.size > 1,
+                allowsRevoting = true,
+                shuffleOptions = true,
+                hideResultsUntilCloses = true,
                 explanationTextSources = buildEntities {
                     regular("Random solved it to be ") + underline((correctAnswer + 1).toString()) + " "
                     if (customEmoji != null) {
@@ -145,6 +167,7 @@ suspend fun main(vararg args: String) {
                     }
                 }
             )
+            println("Sent poll data: $sentPoll")
             pollToChatMutex.withLock {
                 pollToChat[sentPoll.content.poll.id] = sentPoll.chat.id
             }
@@ -168,6 +191,32 @@ suspend fun main(vararg args: String) {
             }
         }
 
+        onPollOptionAdded {
+            it.chatEvent.pollMessage ?.accessibleMessageOrNull() ?.let { pollMessage ->
+                reply(pollMessage) {
+                    +"Poll option added: \n"
+                    +it.chatEvent.optionTextSources
+                }
+            }
+        }
+        onPollOptionDeleted {
+            it.chatEvent.pollMessage ?.accessibleMessageOrNull() ?.let { pollMessage ->
+                reply(pollMessage) {
+                    +"Poll option deleted: \n"
+                    +it.chatEvent.optionTextSources
+                }
+            }
+        }
+
+        onContentMessage {
+            val replyPollOptionId = it.replyInfo ?.pollOptionId ?: return@onContentMessage
+            it.replyTo ?.accessibleMessageOrNull() ?.let { replied ->
+                reply(replied, pollOptionId = replyPollOptionId) {
+                    +"Reply to poll option"
+                }
+            }
+        }
+
         setMyCommands(
             BotCommand("anonymous", "Create anonymous regular poll"),
             BotCommand("public", "Create non anonymous regular poll"),

StickerSetHandler/src/main/kotlin/StickerSetHandlerBot.kt

@@ -44,7 +44,11 @@ suspend fun main(args: Array<String>) {
         onCommand("delete") {
             val deleted = runCatchingSafely {
                 deleteStickerSet(it.chat.stickerSetName())
-            }.getOrElse { false }
+            }.map {
+                true
+            }.getOrElse {
+                false
+            }
 
             if (deleted) {
                 reply(it, "Deleted")

WebApp/src/commonMain/kotlin/PreparedSampleData.kt

@@ -0,0 +1,6 @@
+import dev.inmo.tgbotapi.types.buttons.PreparedKeyboardButtonId
+import dev.inmo.tgbotapi.types.request.RequestId
+import kotlin.random.Random
+import kotlin.random.nextUInt
+
+val preparedSampleKeyboardRequestId = RequestId(Random.nextUInt().toUShort())

WebApp/src/jsMain/kotlin/main.kt

@@ -1,6 +1,7 @@
 import androidx.compose.runtime.*
 import dev.inmo.micro_utils.coroutines.launchLoggingDropExceptions
 import dev.inmo.tgbotapi.types.CustomEmojiId
+import dev.inmo.tgbotapi.types.buttons.PreparedKeyboardButtonId
 import dev.inmo.tgbotapi.types.userIdField
 import dev.inmo.tgbotapi.types.webAppQueryIdField
 import dev.inmo.tgbotapi.webapps.*
@@ -17,6 +18,7 @@ import io.ktor.client.request.*
 import io.ktor.client.statement.bodyAsText
 import io.ktor.http.*
 import io.ktor.http.content.TextContent
+import kotlinx.browser.document
 import kotlinx.browser.window
 import kotlinx.coroutines.*
 import kotlinx.dom.appendElement
@@ -65,7 +67,12 @@ fun main() {
         }
         val scope = rememberCoroutineScope()
         val isSafeState = remember { mutableStateOf<Boolean?>(null) }
-        val logsState = remember { mutableStateListOf<Any?>() }
+        val logsState = remember {
+            mutableStateListOf<Any?>(
+                window.location.href,
+            )
+        }
+        val buttonIdState = remember { mutableStateOf<PreparedKeyboardButtonId?>(null) }
 
 //        Text(window.location.href)
 //        P()
@@ -94,6 +101,30 @@ fun main() {
             )
         }
 
+        LaunchedEffect(baseUrl) {
+            val response = client.post("$baseUrl/getPreparedKeyboardButtonId") {
+                setBody(
+                    Json.encodeToString(
+                        WebAppDataWrapper.serializer(),
+                        WebAppDataWrapper(webApp.initData, webApp.initDataUnsafe.hash)
+                    )
+                )
+                parameter(userIdField, webApp.initDataUnsafe.user ?.id ?.long ?: return@LaunchedEffect)
+            }
+            when (response.status) {
+                HttpStatusCode.OK -> {
+                    val buttonId = response.bodyAsText()
+                    buttonIdState.value = PreparedKeyboardButtonId(buttonId)
+                }
+                HttpStatusCode.NoContent -> {
+                    buttonIdState.value = null
+                }
+                else -> {
+                    logsState.add("Error while getting prepared keyboard button id: ${response.status}")
+                }
+            }
+        }
+
         Text(
             when (isSafeState.value) {
                 null -> "Checking safe state..."
@@ -249,6 +280,23 @@ fun main() {
             Text("Confirm")
         }
 
+        P()
+        H3 { Text("Prepared keyboard button") }
+        val buttonIdValue = buttonIdState.value
+        if (buttonIdValue == null) {
+            Text("Ensure that you have called /prepareKeyboard in bot. If you did it, check logs of server")
+        } else {
+            Button({
+                onClick {
+                    webApp.requestChat(buttonIdValue) {
+                        logsState.add("Chat have been received: $it")
+                    }
+                }
+            }) {
+                Text("Prepared keyboard button")
+            }
+        }
+
         P()
         H3 { Text("Write access callbacks") }
         Button({
@@ -396,11 +444,15 @@ fun main() {
                 }
                 mainButton.apply {
                     setText("Main button")
-                    setParams(
+                    runCatching {
-                        BottomButtonParams(
+                        setParams(
-                            iconCustomEmojiId = CustomEmojiId("5370976574969486150") // 😏
+                            BottomButtonParams(
+                                iconCustomEmojiId = CustomEmojiId("5370976574969486150") // 😏
+                            )
                         )
-                    )
+                    }.onFailure {
+                        logsState.add("Can't set params for main button: $it")
+                    }
                     onClick {
                         logsState.add("Main button clicked")
                         hapticFeedback.notificationOccurred(
@@ -411,11 +463,15 @@ fun main() {
                 }
                 secondaryButton.apply {
                     setText("Secondary button")
-                    setParams(
+                    runCatching {
-                        BottomButtonParams(
+                        setParams(
-                            iconCustomEmojiId = CustomEmojiId("5370763368497944736") // 😒
+                            BottomButtonParams(
+                                iconCustomEmojiId = CustomEmojiId("5370763368497944736") // 😒
+                            )
                         )
-                    )
+                    }.onFailure {
+                        logsState.add("Can't set params for secondary button: $it")
+                    }
                     onClick {
                         logsState.add("Secondary button clicked")
                         hapticFeedback.notificationOccurred(

WebApp/src/jvmMain/kotlin/WebAppServer.kt

@@ -5,6 +5,7 @@ import dev.inmo.micro_utils.ktor.server.createKtorServer
 import dev.inmo.tgbotapi.extensions.api.answers.answerInlineQuery
 import dev.inmo.tgbotapi.extensions.api.bot.getMe
 import dev.inmo.tgbotapi.extensions.api.bot.setMyCommands
+import dev.inmo.tgbotapi.extensions.api.savePreparedKeyboardButton
 import dev.inmo.tgbotapi.extensions.api.send.reply
 import dev.inmo.tgbotapi.extensions.api.send.send
 import dev.inmo.tgbotapi.extensions.api.set.setUserEmojiStatus
@@ -21,6 +22,10 @@ import dev.inmo.tgbotapi.requests.answers.InlineQueryResultsButton
 import dev.inmo.tgbotapi.types.*
 import dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult.InlineQueryResultArticle
 import dev.inmo.tgbotapi.types.InlineQueries.InputMessageContent.InputTextMessageContent
+import dev.inmo.tgbotapi.types.buttons.KeyboardButtonRequestManagedBot
+import dev.inmo.tgbotapi.types.buttons.PreparedKeyboardButton
+import dev.inmo.tgbotapi.types.buttons.PreparedKeyboardButtonId
+import dev.inmo.tgbotapi.types.buttons.reply.requestManagedBotReplyButton
 import dev.inmo.tgbotapi.types.webapps.WebAppInfo
 import dev.inmo.tgbotapi.utils.*
 import io.ktor.http.*
@@ -59,6 +64,7 @@ suspend fun main(vararg args: String) {
     val initiationLogger = KSLog("Initialization")
 
     val bot = telegramBot(telegramBotAPIUrlsKeeper)
+    val usersToButtonsMap = mutableMapOf<UserId, PreparedKeyboardButtonId>()
     createKtorServer(
         "0.0.0.0",
         args.getOrNull(2) ?.toIntOrNull() ?: 8080
@@ -123,6 +129,24 @@ suspend fun main(vararg args: String) {
 
                 call.respond(HttpStatusCode.OK, set.toString())
             }
+            post("getPreparedKeyboardButtonId") {
+                val requestBody = call.receiveText()
+                val webAppCheckData = Json.decodeFromString(WebAppDataWrapper.serializer(), requestBody)
+
+                val isSafe = telegramBotAPIUrlsKeeper.checkWebAppData(webAppCheckData.data, webAppCheckData.hash)
+                val rawUserId = call.parameters[userIdField] ?.toLongOrNull() ?.let(::RawChatId) ?: error("$userIdField should be presented as long value")
+
+                if (isSafe) {
+                    val buttonId = usersToButtonsMap[UserId(rawUserId)]
+                    if (buttonId == null) {
+                        call.respond(HttpStatusCode.NoContent)
+                    } else {
+                        call.respond(HttpStatusCode.OK, buttonId.string)
+                    }
+                } else {
+                    call.respond(HttpStatusCode.Forbidden)
+                }
+            }
         }
     }.start(false)
 
@@ -171,6 +195,20 @@ suspend fun main(vararg args: String) {
                 )
             )
         }
+        onCommand("prepareKeyboard") {
+            val preparedKeyboardButton = savePreparedKeyboardButton(
+                userId = it.chat.id.toChatId(),
+                button = requestManagedBotReplyButton(
+                    text = "Saved sample button",
+                    requestManagedBot = KeyboardButtonRequestManagedBot(
+                        requestId = preparedSampleKeyboardRequestId,
+                        suggestedName = "Saved sample button bot",
+                        suggestedUsername = Username.prepare("saved_sample_button_bot")
+                    )
+                )
+            )
+            usersToButtonsMap[it.chat.id.toChatId()] = preparedKeyboardButton.id
+        }
         onBaseInlineQuery {
             answerInlineQuery(
                 it,