Update plugin org.jetbrains.kotlin.multiplatform to v1.6.21

.github/workflows/build.yml

@@ -8,9 +8,9 @@ jobs:
 
     steps:
       - uses: actions/checkout@v2
-      - name: Set up JDK 11
+      - name: Set up JDK 1.8
         uses: actions/setup-java@v1
         with:
-          java-version: 11
+          java-version: 1.8
       - name: Build with Gradle
         run: ./gradlew build

DeepLinksBot/README.md

@@ -1,9 +0,0 @@
-# DeepLinksBot
-
-This bot will send you deeplink to this bot when you send some text message and react on the `start` button
-
-## Launch
-
-```bash
-../gradlew run --args="BOT_TOKEN"
-```

DeepLinksBot/build.gradle

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

DeepLinksBot/src/main/kotlin/DeepLinksBot.kt

@@ -1,39 +0,0 @@
-import dev.inmo.micro_utils.coroutines.subscribeSafelySkippingExceptions
-import dev.inmo.micro_utils.coroutines.subscribeSafelyWithoutExceptions
-import dev.inmo.tgbotapi.bot.ktor.telegramBot
-import dev.inmo.tgbotapi.extensions.api.bot.getMe
-import dev.inmo.tgbotapi.extensions.api.send.reply
-import dev.inmo.tgbotapi.extensions.behaviour_builder.expectations.waitDeepLinks
-import dev.inmo.tgbotapi.extensions.behaviour_builder.telegramBotWithBehaviourAndLongPolling
-import dev.inmo.tgbotapi.extensions.behaviour_builder.triggers_handling.*
-import dev.inmo.tgbotapi.extensions.utils.formatting.makeTelegramDeepLink
-import dev.inmo.tgbotapi.types.message.textsources.BotCommandTextSource
-
-/**
- * This bot will send you deeplink to this bot when you send some text message and react on the `start` button
- */
-suspend fun main(vararg args: String) {
-    val botToken = args.first()
-
-    telegramBotWithBehaviourAndLongPolling(botToken) {
-        val me = bot.getMe()
-        println(me)
-
-        onText(
-            initialFilter = { it.content.textSources.none { it is BotCommandTextSource } } // excluding messages with commands
-        ) {
-            reply(it, makeTelegramDeepLink(me.username, it.content.text))
-        }
-
-        onCommand("start", requireOnlyCommandInMessage = true) { // handling of `start` without args
-            reply(it, "Hi :) Send me any text and I will try hard to create deeplink for you")
-        }
-        onDeepLink { (it, deepLink) ->
-            reply(it, "Ok, I got deep link \"${deepLink}\" in trigger")
-        }
-        waitDeepLinks().subscribeSafelyWithoutExceptions(this) { (it, deepLink) ->
-            reply(it, "Ok, I got deep link \"${deepLink}\" in waiter")
-            println(triggersHolder.handleableCommandsHolder.handleable)
-        }
-    }.second.join()
-}

FSMBot/src/main/kotlin/SimpleFSMBot.kt

@@ -1,6 +1,4 @@
-import dev.inmo.micro_utils.coroutines.AccumulatorFlow
 import dev.inmo.micro_utils.fsm.common.State
-import dev.inmo.tgbotapi.extensions.api.send.send
 import dev.inmo.tgbotapi.extensions.api.send.sendMessage
 import dev.inmo.tgbotapi.extensions.behaviour_builder.*
 import dev.inmo.tgbotapi.extensions.behaviour_builder.expectations.*
@@ -11,7 +9,6 @@ import dev.inmo.tgbotapi.types.ChatId
 import dev.inmo.tgbotapi.types.message.abstracts.CommonMessage
 import dev.inmo.tgbotapi.types.message.content.TextContent
 import kotlinx.coroutines.*
-import kotlinx.coroutines.flow.first
 
 sealed interface BotState : State
 data class ExpectContentOrStopState(override val context: ChatId, val sourceMessage: CommonMessage<TextContent>) : BotState
@@ -20,22 +17,7 @@ data class StopState(override val context: ChatId) : BotState
 suspend fun main(args: Array<String>) {
     val botToken = args.first()
 
-    telegramBotWithBehaviourAndFSMAndStartLongPolling<BotState>(
+    telegramBotWithBehaviourAndFSMAndStartLongPolling<BotState>(botToken, CoroutineScope(Dispatchers.IO)) {
-        botToken,
-        CoroutineScope(Dispatchers.IO),
-        onStateHandlingErrorHandler = { state, e ->
-            when (state) {
-                is ExpectContentOrStopState -> {
-                    println("Thrown error on ExpectContentOrStopState")
-                }
-                is StopState -> {
-                    println("Thrown error on StopState")
-                }
-            }
-            e.printStackTrace()
-            state
-        }
-    ) {
         strictlyOn<ExpectContentOrStopState> {
             sendMessage(
                 it.context,
@@ -56,7 +38,7 @@ suspend fun main(args: Array<String>) {
             }
         }
         strictlyOn<StopState> {
-            send(it.context, "You have stopped sending of content")
+            sendMessage(it.context, "You have stopped sending of content")
 
             null
         }

FilesLoaderBot/src/main/kotlin/FilesLoaderBot.kt

@@ -1,6 +1,7 @@
 import dev.inmo.tgbotapi.extensions.api.files.downloadFile
 import dev.inmo.tgbotapi.extensions.api.get.getFileAdditionalInfo
 import dev.inmo.tgbotapi.extensions.api.send.reply
+import dev.inmo.tgbotapi.extensions.behaviour_builder.telegramBotWithBehaviour
 import dev.inmo.tgbotapi.extensions.behaviour_builder.telegramBotWithBehaviourAndLongPolling
 import dev.inmo.tgbotapi.extensions.behaviour_builder.triggers_handling.onContentMessage
 import dev.inmo.tgbotapi.extensions.behaviour_builder.triggers_handling.onMedia
@@ -14,19 +15,17 @@ import java.io.File
  */
 suspend fun main(args: Array<String>) {
     val botToken = args.first()
-    val directoryOrFile = args.getOrNull(1) ?.let { File(it) } ?: File("/tmp/")
+    val directoryOrFile = args.getOrNull(1) ?.let { File(it) } ?: File("")
     directoryOrFile.mkdirs()
 
     telegramBotWithBehaviourAndLongPolling(botToken, CoroutineScope(Dispatchers.IO)) {
         onMedia(initialFilter = null) {
             val pathedFile = bot.getFileAdditionalInfo(it.content.media)
-            val outFile = File(directoryOrFile, pathedFile.filePath.filenameFromUrl)
+            val file = File(directoryOrFile, pathedFile.filePath.filenameFromUrl).apply {
-            runCatching {
+                createNewFile()
-                bot.downloadFile(it.content.media, outFile)
+                writeBytes(bot.downloadFile(pathedFile))
-            }.onFailure {
-                it.printStackTrace()
             }
-            reply(it, "Saved to ${outFile.absolutePath}")
+            reply(it, "Saved to ${file.absolutePath}")
         }
         onContentMessage { println(it) }
     }.second.join()

ForwardInfoSenderBot/src/main/kotlin/ForwardInfoSenderBot.kt

@@ -2,9 +2,7 @@ import dev.inmo.tgbotapi.extensions.api.send.reply
 import dev.inmo.tgbotapi.extensions.behaviour_builder.telegramBotWithBehaviourAndLongPolling
 import dev.inmo.tgbotapi.extensions.behaviour_builder.triggers_handling.onContentMessage
 import dev.inmo.tgbotapi.extensions.utils.formatting.*
-import dev.inmo.tgbotapi.types.chat.CommonBot
+import dev.inmo.tgbotapi.types.*
-import dev.inmo.tgbotapi.types.chat.CommonUser
-import dev.inmo.tgbotapi.types.chat.ExtendedBot
 import dev.inmo.tgbotapi.types.message.*
 import kotlinx.coroutines.*
 
@@ -16,33 +14,28 @@ suspend fun main(vararg args: String) {
     val botToken = args.first()
 
     telegramBotWithBehaviourAndLongPolling(botToken, CoroutineScope(Dispatchers.IO)) {
-        onContentMessage {
+        onContentMessage(subcontextUpdatesFilter = { _, _ -> true }) {
             val toAnswer = buildEntities {
                 when (val forwardInfo = it.forwardInfo) {
                     null -> +"There is no forward info"
-                    is ForwardInfo.ByAnonymous -> {
+                    is AnonymousForwardInfo -> {
                         regular("Anonymous user which signed as \"") + code(forwardInfo.senderName) + "\""
                     }
-                    is ForwardInfo.ByUser -> {
+                    is UserForwardInfo -> {
                         val user = forwardInfo.from
                         when (user) {
-                            is CommonUser -> {
+                            is CommonUser -> regular("User ")
-                                if (user.isPremium) {
-                                    regular("Premium user ")
-                                } else {
-                                    regular("User ")
-                                }
-                            }
                             is CommonBot,
                             is ExtendedBot -> regular("Bot ")
                         } + code(user.id.chatId.toString()) + " (${user.firstName} ${user.lastName}: ${user.username ?.username ?: "Without username"})"
                     }
-                    is ForwardInfo.PublicChat.FromChannel -> regular("Channel (") + code(forwardInfo.channelChat.title) + ")"
+                    is ForwardFromChannelInfo -> regular("Channel (") + code((forwardInfo.channelChat).title) + ")"
-                    is ForwardInfo.PublicChat.FromSupergroup -> regular("Supergroup (") + code(forwardInfo.group.title) + ")"
+                    is ForwardFromSupergroupInfo -> regular("Supergroup (") + code((forwardInfo.group).title) + ")"
-                    is ForwardInfo.PublicChat.SentByChannel -> regular("Sent by channel (") + code(forwardInfo.channelChat.title) + ")"
                 }
             }
             reply(it, toAnswer)
+            coroutineContext.job.invokeOnCompletion { println("completance of onContentMessage") }
         }
+        coroutineContext.job.invokeOnCompletion { println("Completed :)") }
     }.second.join()
 }

GetMeBot/build.gradle

@@ -11,7 +11,7 @@ buildscript {
 apply plugin: 'kotlin'
 apply plugin: 'application'
 
-mainClassName="GetMeBotKt"
+mainClassName="HelloBotKt"
 
 
 dependencies {

GetMeBot/src/main/kotlin/GetMeBot.kt

@@ -1,4 +1,4 @@
-import dev.inmo.tgbotapi.bot.ktor.telegramBot
+import dev.inmo.tgbotapi.bot.Ktor.telegramBot
 import dev.inmo.tgbotapi.extensions.api.bot.getMe
 
 /**

HelloBot/src/main/kotlin/HelloBot.kt

@@ -1,61 +1,41 @@
 import dev.inmo.micro_utils.coroutines.subscribeSafelyWithoutExceptions
 import dev.inmo.tgbotapi.extensions.api.chat.get.getChat
-import dev.inmo.tgbotapi.extensions.api.send.*
+import dev.inmo.tgbotapi.extensions.api.send.reply
+import dev.inmo.tgbotapi.extensions.api.send.sendTextMessage
 import dev.inmo.tgbotapi.extensions.behaviour_builder.telegramBotWithBehaviourAndLongPolling
 import dev.inmo.tgbotapi.extensions.behaviour_builder.triggers_handling.onContentMessage
-import dev.inmo.tgbotapi.extensions.utils.extensions.raw.sender_chat
 import dev.inmo.tgbotapi.extensions.utils.formatting.linkMarkdownV2
 import dev.inmo.tgbotapi.extensions.utils.formatting.textMentionMarkdownV2
-import dev.inmo.tgbotapi.extensions.utils.ifChannelChat
+import dev.inmo.tgbotapi.types.ParseMode.MarkdownV2
-import dev.inmo.tgbotapi.extensions.utils.ifFromChannelGroupContentMessage
+import dev.inmo.tgbotapi.types.User
-import dev.inmo.tgbotapi.types.chat.*
+import dev.inmo.tgbotapi.types.chat.abstracts.*
-import dev.inmo.tgbotapi.types.chat.GroupChat
-import dev.inmo.tgbotapi.types.chat.PrivateChat
-import dev.inmo.tgbotapi.types.chat.SupergroupChat
-import dev.inmo.tgbotapi.types.message.MarkdownV2
-import dev.inmo.tgbotapi.utils.PreviewFeature
 import dev.inmo.tgbotapi.utils.extensions.escapeMarkdownV2Common
 import kotlinx.coroutines.*
 
 /**
  * The main purpose of this bot is just to answer "Oh, hi, " and add user mention here
  */
-@OptIn(PreviewFeature::class)
 suspend fun main(vararg args: String) {
     val botToken = args.first()
 
     telegramBotWithBehaviourAndLongPolling(botToken, CoroutineScope(Dispatchers.IO)) {
         onContentMessage { message ->
             val chat = message.chat
-
+            if (chat is ChannelChat) {
-            val answerText = when (val chat = message.chat) {
+                val answer = "Hi everybody in this channel \"${chat.title}\""
-                is ChannelChat -> {
+                sendTextMessage(chat, answer, MarkdownV2)
-                    val answer = "Hi everybody in this channel \"${chat.title}\""
+                return@onContentMessage
-                    reply(message, answer, MarkdownV2)
+            }
-                    return@onContentMessage
+            val answerText = "Oh, hi, " + when (chat) {
-                }
+                is PrivateChat -> "${chat.firstName} ${chat.lastName}".textMentionMarkdownV2(chat.id)
-                is PrivateChat -> {
+                is User -> "${chat.firstName} ${chat.lastName}".textMentionMarkdownV2(chat.id)
-                    reply(message, "Hi, " + "${chat.firstName} ${chat.lastName}".textMentionMarkdownV2(chat.id), MarkdownV2)
+                is SupergroupChat -> (chat.username ?.username ?: getChat(chat).inviteLink) ?.let {
-                    return@onContentMessage
+                    chat.title.linkMarkdownV2(it)
-                }
+                } ?: chat.title
-                is GroupChat -> {
+                is GroupChat -> bot.getChat(chat).inviteLink ?.let {
-                    message.ifFromChannelGroupContentMessage {
+                    chat.title.linkMarkdownV2(it)
-                        val answer = "Hi, ${it.senderChat.title}"
+                } ?: chat.title
-                        reply(message, answer, MarkdownV2)
+                else -> "Unknown :(".escapeMarkdownV2Common()
-                        return@onContentMessage
-                    }
-                    "Oh, hi, " + when (chat) {
-                        is SupergroupChat -> (chat.username ?.username ?: getChat(chat).inviteLink) ?.let {
-                            chat.title.linkMarkdownV2(it)
-                        } ?: chat.title
-                        else -> bot.getChat(chat).inviteLink ?.let {
-                            chat.title.linkMarkdownV2(it)
-                        } ?: chat.title
-                    }
-                }
-                is UnknownExtendedChat,
-                is UnknownChatType -> "Unknown :(".escapeMarkdownV2Common()
-                else -> error("Something went wrong: unknown type of chat $chat")
             }
             reply(
                 message,

KeyboardsBot/KeyboardsBotLib/build.gradle

@@ -9,7 +9,7 @@ buildscript {
 }
 
 plugins {
-    id "org.jetbrains.kotlin.multiplatform"
+    id "org.jetbrains.kotlin.multiplatform" version "$kotlin_version"
 }
 
 

KeyboardsBot/KeyboardsBotLib/src/commonMain/kotlin/KeyboardsBot.kt

@@ -1,17 +1,17 @@
 import dev.inmo.micro_utils.coroutines.subscribeSafelyWithoutExceptions
 import dev.inmo.tgbotapi.extensions.api.bot.getMe
-import dev.inmo.tgbotapi.bot.ktor.telegramBot
+import dev.inmo.tgbotapi.bot.Ktor.telegramBot
 import dev.inmo.tgbotapi.extensions.api.answers.answer
-import dev.inmo.tgbotapi.extensions.api.bot.setMyCommands
+import dev.inmo.tgbotapi.extensions.api.edit.text.editMessageText
-import dev.inmo.tgbotapi.extensions.api.edit.edit
 import dev.inmo.tgbotapi.extensions.api.send.*
+import dev.inmo.tgbotapi.extensions.api.send.media.*
 import dev.inmo.tgbotapi.extensions.behaviour_builder.*
+import dev.inmo.tgbotapi.extensions.behaviour_builder.filters.CommonMessageFilterExcludeMediaGroups
+import dev.inmo.tgbotapi.extensions.behaviour_builder.filters.MessageFilterByChat
 import dev.inmo.tgbotapi.extensions.behaviour_builder.triggers_handling.*
-import dev.inmo.tgbotapi.extensions.utils.formatting.botCommand
+import dev.inmo.tgbotapi.extensions.utils.shortcuts.*
-import dev.inmo.tgbotapi.extensions.utils.formatting.buildEntities
 import dev.inmo.tgbotapi.extensions.utils.types.buttons.*
 import dev.inmo.tgbotapi.extensions.utils.withContent
-import dev.inmo.tgbotapi.types.BotCommand
 import dev.inmo.tgbotapi.types.message.content.TextContent
 import kotlinx.coroutines.*
 
@@ -86,39 +86,20 @@ suspend fun activateKeyboardsBot(
                 return@onMessageDataCallbackQuery
             }
 
-            val text = "This is $page of $count"
+            editMessageText(
-
-            edit(
                 it.message.withContent<TextContent>() ?: it.let {
                     answer(it, "Unsupported message type :(")
                     return@onMessageDataCallbackQuery
                 },
-                text,
+                "This is $page of $count",
                 replyMarkup = inlineKeyboard {
                     row {
                         includePageButtons(page, count)
                     }
                 }
             )
-            answer(it)
         }
 
-        onUnhandledCommand {
-            reply(
-                it,
-                buildEntities {
-                    +"Use " + botCommand("inline") + " to get pagination inline keyboard"
-                },
-                replyMarkup = replyKeyboard(resizeKeyboard = true, oneTimeKeyboard = true) {
-                    row {
-                        simpleButton("/inline")
-                    }
-                }
-            )
-        }
-
-        setMyCommands(BotCommand("inline", "Creates message with pagination inline keyboard"))
-
         allUpdatesFlow.subscribeSafelyWithoutExceptions(this) {
             println(it)
         }

RandomFileSenderBot/src/main/kotlin/RandomFileSenderBot.kt

@@ -1,19 +1,23 @@
-import dev.inmo.micro_utils.common.filesize
+import dev.inmo.tgbotapi.bot.Ktor.telegramBot
-import dev.inmo.tgbotapi.bot.ktor.telegramBot
 import dev.inmo.tgbotapi.bot.TelegramBot
 import dev.inmo.tgbotapi.extensions.api.bot.getMe
 import dev.inmo.tgbotapi.extensions.api.bot.setMyCommands
-import dev.inmo.tgbotapi.extensions.api.send.*
 import dev.inmo.tgbotapi.extensions.api.send.media.sendDocument
 import dev.inmo.tgbotapi.extensions.api.send.media.sendDocumentsGroup
+import dev.inmo.tgbotapi.extensions.api.send.reply
+import dev.inmo.tgbotapi.extensions.api.send.withUploadDocumentAction
+import dev.inmo.tgbotapi.extensions.behaviour_builder.buildBehaviour
 import dev.inmo.tgbotapi.extensions.behaviour_builder.buildBehaviourWithLongPolling
+import dev.inmo.tgbotapi.extensions.behaviour_builder.triggers_handling.onCommand
 import dev.inmo.tgbotapi.extensions.behaviour_builder.triggers_handling.onCommandWithArgs
 import dev.inmo.tgbotapi.requests.abstracts.asMultipartFile
+import dev.inmo.tgbotapi.requests.abstracts.toInputFile
 import dev.inmo.tgbotapi.types.BotCommand
-import dev.inmo.tgbotapi.types.chat.Chat
+import dev.inmo.tgbotapi.types.InputMedia.DocumentMediaGroupMemberInputMedia
-import dev.inmo.tgbotapi.types.files.DocumentFile
+import dev.inmo.tgbotapi.types.InputMedia.InputMediaDocument
-import dev.inmo.tgbotapi.types.media.TelegramMediaDocument
+import dev.inmo.tgbotapi.types.chat.abstracts.Chat
 import dev.inmo.tgbotapi.types.mediaCountInMediaGroup
+import kotlinx.coroutines.*
 import java.io.File
 
 private const val command = "send_file"
@@ -46,7 +50,7 @@ suspend fun main(args: Array<String>) {
             )
             else -> sendDocumentsGroup(
                 chat,
-                files.map { TelegramMediaDocument(it.asMultipartFile()) },
+                files.map { InputMediaDocument(it.asMultipartFile()) },
                 protectContent = true
             )
         }
@@ -65,9 +69,9 @@ suspend fun main(args: Array<String>) {
                 val chosen = mutableListOf<File>()
 
                 while (left > 0) {
-                    val picked = pickFile() ?.takeIf { it.filesize > 0 } ?: continue
-                    chosen.add(picked)
                     left--
+                    val picked = pickFile() ?: continue
+                    chosen.add(picked)
                     if (chosen.size >= mediaCountInMediaGroup.last) {
                         sendFiles(message.chat, chosen)
                         chosen.clear()
@@ -81,7 +85,7 @@ suspend fun main(args: Array<String>) {
                 }
 
                 if (!sent) {
-                    reply(message, "Nothing selected :(")
+                    bot.reply(message, "Nothing selected :(")
                 }
             }
         }

ResenderBot/ResenderBotLib/build.gradle

@@ -9,7 +9,7 @@ buildscript {
 }
 
 plugins {
-    id "org.jetbrains.kotlin.multiplatform"
+    id "org.jetbrains.kotlin.multiplatform" version "$kotlin_version"
 }
 
 

ResenderBot/ResenderBotLib/src/commonMain/kotlin/ResenderBot.kt

@@ -1,6 +1,6 @@
 import dev.inmo.micro_utils.coroutines.subscribeSafelyWithoutExceptions
 import dev.inmo.tgbotapi.extensions.api.bot.getMe
-import dev.inmo.tgbotapi.bot.ktor.telegramBot
+import dev.inmo.tgbotapi.bot.Ktor.telegramBot
 import dev.inmo.tgbotapi.extensions.api.send.*
 import dev.inmo.tgbotapi.extensions.api.send.media.*
 import dev.inmo.tgbotapi.extensions.behaviour_builder.*
@@ -8,6 +8,7 @@ import dev.inmo.tgbotapi.extensions.behaviour_builder.filters.CommonMessageFilte
 import dev.inmo.tgbotapi.extensions.behaviour_builder.filters.MessageFilterByChat
 import dev.inmo.tgbotapi.extensions.behaviour_builder.triggers_handling.*
 import dev.inmo.tgbotapi.extensions.utils.shortcuts.*
+import dev.inmo.tgbotapi.types.message.abstracts.Message
 import kotlinx.coroutines.*
 
 suspend fun activateResenderBot(
@@ -25,27 +26,25 @@ suspend fun activateResenderBot(
         ) {
             val chat = it.chat
             withTypingAction(chat) {
-                executeUnsafe(it.content.createResend(chat.id, replyToMessageId = it.messageId)) {
+                executeUnsafe(it.content.createResend(chat.id, replyToMessageId = it.messageId))
-                    it.forEach(print)
-                }
             }
         }
         onVisualGallery {
             val chat = it.chat ?: return@onVisualGallery
             withUploadPhotoAction(chat) {
-                send(chat, it.map { it.content.toMediaGroupMemberTelegramMedia() })
+                sendVisualMediaGroup(chat, it.map { it.content.toMediaGroupMemberInputMedia() })
             }
         }
         onPlaylist {
             val chat = it.chat ?: return@onPlaylist
             withUploadDocumentAction(chat) {
-                send(chat, it.map { it.content.toMediaGroupMemberTelegramMedia() })
+                sendPlaylist(chat, it.map { it.content.toMediaGroupMemberInputMedia() })
             }
         }
         onDocumentsGroup {
             val chat = it.chat ?: return@onDocumentsGroup
             withUploadDocumentAction(chat) {
-                send(chat, it.map { it.content.toMediaGroupMemberTelegramMedia() })
+                sendDocumentsGroup(chat, it.map { it.content.toMediaGroupMemberInputMedia() })
             }
         }
 

SlotMachineDetectorBot/src/main/kotlin/SlotMachineDetectorBot.kt

@@ -1,26 +1,35 @@
-import dev.inmo.tgbotapi.bot.ktor.telegramBot
+import dev.inmo.micro_utils.coroutines.safely
+import dev.inmo.tgbotapi.bot.Ktor.telegramBot
 import dev.inmo.tgbotapi.extensions.api.send.reply
-import dev.inmo.tgbotapi.extensions.behaviour_builder.buildBehaviourWithLongPolling
-import dev.inmo.tgbotapi.extensions.behaviour_builder.triggers_handling.onDice
 import dev.inmo.tgbotapi.extensions.utils.*
+import dev.inmo.tgbotapi.extensions.utils.shortcuts.filterContentMessages
+import dev.inmo.tgbotapi.extensions.utils.updates.retrieving.longPolling
 import dev.inmo.tgbotapi.types.dice.SlotMachineDiceAnimationType
+import dev.inmo.tgbotapi.types.message.content.DiceContent
 import kotlinx.coroutines.*
+import kotlinx.coroutines.flow.launchIn
+import kotlinx.coroutines.flow.onEach
 
 suspend fun main(args: Array<String>) {
     val bot = telegramBot(args.first())
 
-    bot.buildBehaviourWithLongPolling(scope = CoroutineScope(Dispatchers.IO)) {
+    val scope = CoroutineScope(Dispatchers.Default)
-        onDice {
+    bot.longPolling(scope = scope) {
+        filterContentMessages<DiceContent>(scope).onEach {
             val content = it.content
             val dice = content.dice
             val diceType = dice.animationType
 
-            if (diceType == SlotMachineDiceAnimationType) {
+            safely ({ it.printStackTrace() }) {
-                val result = dice.calculateSlotMachineResult() ?: return@onDice
+                if (diceType == SlotMachineDiceAnimationType) {
-                reply(it, "${result.leftReel}|${result.centerReel}|${result.rightReel}")
+                    val result = dice.calculateSlotMachineResult() ?: return@safely
-            } else {
+                    bot.reply(it, "${result.leftReel}|${result.centerReel}|${result.rightReel}")
-                reply(it, "There is no slot machine dice in message")
+                } else {
+                    bot.reply(it, "There is no slot machine dice in message")
+                }
             }
-        }
+        }.launchIn(scope)
-    }.join()
+    }
+
+    scope.coroutineContext[Job]!!.join()
 }

StickerInfoBot/StickerInfoBotLib/build.gradle

@@ -1,33 +0,0 @@
-buildscript {
-    repositories {
-        mavenCentral()
-    }
-
-    dependencies {
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-    }
-}
-
-plugins {
-    id "org.jetbrains.kotlin.multiplatform"
-}
-
-
-kotlin {
-    jvm()
-//    js(LEGACY) {
-    js(IR) {
-        browser()
-        binaries.executable()
-    }
-
-    sourceSets {
-        commonMain {
-            dependencies {
-                implementation kotlin('stdlib')
-
-                api "dev.inmo:tgbotapi:$telegram_bot_api_version"
-            }
-        }
-    }
-}

StickerInfoBot/StickerInfoBotLib/src/commonMain/kotlin/StickerInfoBot.kt

@@ -1,71 +0,0 @@
-import dev.inmo.micro_utils.coroutines.defaultSafelyWithoutExceptionHandler
-import dev.inmo.micro_utils.coroutines.subscribeSafelyWithoutExceptions
-import dev.inmo.tgbotapi.extensions.api.bot.getMe
-import dev.inmo.tgbotapi.bot.ktor.telegramBot
-import dev.inmo.tgbotapi.extensions.api.get.getCustomEmojiStickerOrNull
-import dev.inmo.tgbotapi.extensions.api.get.getStickerSet
-import dev.inmo.tgbotapi.extensions.api.send.*
-import dev.inmo.tgbotapi.extensions.behaviour_builder.*
-import dev.inmo.tgbotapi.extensions.behaviour_builder.triggers_handling.*
-import dev.inmo.tgbotapi.extensions.utils.formatting.*
-import dev.inmo.tgbotapi.types.StickerType
-import dev.inmo.tgbotapi.types.message.textsources.*
-import dev.inmo.tgbotapi.types.stickers.StickerSet
-import kotlinx.coroutines.*
-
-fun StickerSet.buildInfo() = buildEntities {
-    bold("StickerSet name: ") + "${name}\n"
-    bold("StickerSet title: ") + "${title}\n"
-    bold(
-        when (stickerType) {
-            StickerType.CustomEmoji -> "Custom emoji"
-            StickerType.Mask -> "Mask"
-            StickerType.Regular -> "Regular"
-            is StickerType.Unknown -> "Unknown type \"${stickerType.type}\""
-        }
-    ) + " sticker set with title " + bold(title) + " and name " + bold(name)
-}
-
-suspend fun activateStickerInfoBot(
-    token: String,
-    print: (Any) -> Unit
-) {
-    val bot = telegramBot(token)
-
-    print(bot.getMe())
-
-    defaultSafelyWithoutExceptionHandler = {
-        it.printStackTrace()
-    }
-
-    bot.buildBehaviourWithLongPolling(CoroutineScope(currentCoroutineContext() + SupervisorJob())) {
-        onText {
-            withTypingAction(it.chat) {
-                it.content.textSources.mapNotNull {
-                    if (it is CustomEmojiTextSource) {
-                        getCustomEmojiStickerOrNull(it.customEmojiId) ?.stickerSetName
-                    } else {
-                        null
-                    }
-                }.distinct().map {
-                    getStickerSet(it)
-                }.distinct().flatMap {
-                    it.buildInfo() + regular("\n")
-                }.separateForText().map { entities ->
-                    reply(it, entities)
-                }
-            }
-        }
-        onSticker {
-            val stickerSetInfo = getStickerSet(it.content.media)
-            reply(
-                it,
-                stickerSetInfo.buildInfo()
-            )
-        }
-
-        allUpdatesFlow.subscribeSafelyWithoutExceptions(this) {
-            println(it)
-        }
-    }.join()
-}

StickerInfoBot/StickerInfoBotLib/src/jsMain/kotlin/StickerInfoBot.kt

@@ -1,32 +0,0 @@
-import kotlinx.browser.document
-import kotlinx.coroutines.*
-import org.w3c.dom.*
-
-private val scope = CoroutineScope(Dispatchers.Default)
-
-fun main() {
-    document.addEventListener(
-        "DOMContentLoaded",
-        {
-            val botsContainer = document.getElementById("bots_container") ?: return@addEventListener
-
-            (document.getElementById("bot_token_form") as? HTMLFormElement) ?.onsubmit = {
-                (document.getElementById("bot_token") as? HTMLInputElement) ?.value ?.let { token ->
-                    val botContainer = document.createElement("div") as HTMLDivElement
-                    botsContainer.append(botContainer)
-
-                    val infoDiv = document.createElement("div") as HTMLDivElement
-                    botContainer.append(infoDiv)
-
-                    scope.launch {
-                        activateStickerInfoBot(token) {
-                            infoDiv.innerHTML = it.toString()
-                        }
-                    }
-                }
-
-                false
-            }
-        }
-    )
-}

StickerInfoBot/StickerInfoBotLib/src/jsMain/resources/index.html

@@ -1,16 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <title>Resender bot</title>
-</head>
-<body>
-    <form id="bot_token_form">
-        <input type="text" id="bot_token">
-        <input type="submit" value="Start bot">
-    </form>
-    <div id="start_offer">Type your bot token to the input above to start its work</div>
-    <script type="text/javascript" src="StickerInfoBotLib.js"></script>
-    <div id="bots_container"></div>
-</body>
-</html>

StickerInfoBot/jvm_launcher/build.gradle

@@ -1,21 +0,0 @@
-buildscript {
-    repositories {
-        mavenCentral()
-    }
-
-    dependencies {
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-    }
-}
-
-apply plugin: 'kotlin'
-apply plugin: 'application'
-
-mainClassName="StickerInfoBotJvmKt"
-
-
-dependencies {
-    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-
-    implementation project(":StickerInfoBot:StickerInfoBotLib")
-}

StickerInfoBot/jvm_launcher/src/main/kotlin/StickerInfoBotBotJvm.kt

@@ -1,5 +0,0 @@
-suspend fun main(args: Array<String>) {
-    activateStickerInfoBot(args.first()) {
-        println(it)
-    }
-}

WebApp/build.gradle

@@ -9,8 +9,7 @@ buildscript {
 }
 
 plugins {
-    id "org.jetbrains.kotlin.multiplatform"
+    id "org.jetbrains.kotlin.multiplatform" version "$kotlin_version"
-    id "org.jetbrains.kotlin.plugin.serialization"
 }
 
 apply plugin: 'application'
@@ -26,7 +25,6 @@ kotlin {
         commonMain {
             dependencies {
                 implementation kotlin('stdlib')
-                implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:$serialization_version"
             }
         }
 

WebApp/src/commonMain/kotlin/WebAppDataWrapper.kt

@@ -1,7 +0,0 @@
-import kotlinx.serialization.Serializable
-
-@Serializable
-data class WebAppDataWrapper(
-    val data: String,
-    val hash: String
-)

WebApp/src/jsMain/kotlin/main.kt

@@ -1,12 +1,11 @@
 import dev.inmo.micro_utils.coroutines.launchSafelyWithoutExceptions
 import dev.inmo.tgbotapi.types.webAppQueryIdField
 import dev.inmo.tgbotapi.webapps.*
-import dev.inmo.tgbotapi.webapps.haptic.HapticFeedbackStyle
-import dev.inmo.tgbotapi.webapps.haptic.HapticFeedbackType
-import dev.inmo.tgbotapi.webapps.popup.*
 import io.ktor.client.HttpClient
+import io.ktor.client.call.receive
 import io.ktor.client.request.*
-import io.ktor.client.statement.bodyAsText
+import io.ktor.client.statement.HttpResponse
+import io.ktor.client.statement.readText
 import io.ktor.http.*
 import io.ktor.http.content.TextContent
 import kotlinx.browser.document
@@ -14,54 +13,25 @@ import kotlinx.browser.window
 import kotlinx.coroutines.*
 import kotlinx.dom.appendElement
 import kotlinx.dom.appendText
-import kotlinx.serialization.json.Json
 import org.w3c.dom.HTMLElement
 
 fun HTMLElement.log(text: String) {
-    appendText(text)
     appendElement("p", {})
+    appendText(text)
 }
 
 fun main() {
     console.log("Web app started")
-    val client = HttpClient()
-    val baseUrl = window.location.origin.removeSuffix("/")
-
     window.onload = {
         val scope = CoroutineScope(Dispatchers.Default)
         runCatching {
-
-            scope.launchSafelyWithoutExceptions {
-                val response = client.post("$baseUrl/check") {
-                    setBody(
-                        Json { }.encodeToString(
-                            WebAppDataWrapper.serializer(),
-                            WebAppDataWrapper(webApp.initData, webApp.initDataUnsafe.hash)
-                        )
-                    )
-                }
-                val dataIsSafe = response.bodyAsText().toBoolean()
-
-                document.body ?.log(
-                    if (dataIsSafe) {
-                        "Data is safe"
-                    } else {
-                        "Data is unsafe"
-                    }
-                )
-
-                document.body ?.log(
-                    webApp.initDataUnsafe.chat.toString()
-                )
-            }
-
             document.body ?.appendElement("button") {
                 addEventListener("click", {
                     scope.launchSafelyWithoutExceptions {
                         handleResult({ "Clicked" }) {
-                            client.post("${window.location.origin.removeSuffix("/")}/inline") {
+                            HttpClient().post<HttpResponse>("${window.location.origin.removeSuffix("/")}/inline") {
                                 parameter(webAppQueryIdField, it)
-                                setBody(TextContent("Clicked", ContentType.Text.Plain))
+                                body = TextContent("Clicked", ContentType.Text.Plain)
                                 document.body ?.log(url.build().toString())
                             }.coroutineContext.job.join()
                         }
@@ -69,79 +39,6 @@ fun main() {
                 })
                 appendText("Example button")
             } ?: window.alert("Unable to load body")
-
-            document.body ?.appendElement("p", {})
-            document.body ?.appendText("Alerts:")
-
-            document.body ?.appendElement("button") {
-                addEventListener("click", {
-                    webApp.showPopup(
-                        PopupParams(
-                            "It is sample title of default button",
-                            "It is sample message of default button",
-                            DefaultPopupButton("default", "Default button"),
-                            OkPopupButton("ok"),
-                            DestructivePopupButton("destructive", "Destructive button")
-                        )
-                    ) {
-                        document.body ?.log(
-                            when (it) {
-                                "default" -> "You have clicked default button in popup"
-                                "ok" -> "You have clicked ok button in popup"
-                                "destructive" -> "You have clicked destructive button in popup"
-                                else -> "I can't imagine where you take button with id $it"
-                            }
-                        )
-                    }
-                })
-                appendText("Popup")
-            } ?: window.alert("Unable to load body")
-
-            document.body ?.appendElement("button") {
-                addEventListener("click", {
-                    webApp.showAlert(
-                        "This is alert message"
-                    ) {
-                        document.body ?.log(
-                            "You have closed alert"
-                        )
-                    }
-                })
-                appendText("Alert")
-            } ?: window.alert("Unable to load body")
-
-            document.body ?.appendElement("button") {
-                addEventListener("click", {
-                    webApp.showConfirm(
-                        "This is confirm message"
-                    ) {
-                        document.body ?.log(
-                            "You have pressed \"${if (it) "Ok" else "Cancel"}\" in confirm"
-                        )
-                    }
-                })
-                appendText("Confirm")
-            } ?: window.alert("Unable to load body")
-
-            document.body ?.appendElement("p", {})
-
-            document.body ?.appendElement("button") {
-                fun updateText() {
-                    textContent = if (webApp.isClosingConfirmationEnabled) {
-                        "Disable closing confirmation"
-                    } else {
-                        "Enable closing confirmation"
-                    }
-                }
-                addEventListener("click", {
-                    webApp.toggleClosingConfirmation()
-                    updateText()
-                })
-                updateText()
-            } ?: window.alert("Unable to load body")
-
-            document.body ?.appendElement("p", {})
-
             webApp.apply {
                 onThemeChanged {
                     document.body ?.log("Theme changed: ${webApp.themeParams}")
@@ -149,28 +46,6 @@ fun main() {
                 onViewportChanged {
                     document.body ?.log("Viewport changed: ${it.isStateStable}")
                 }
-                backButton.apply {
-                    onClick {
-                        document.body ?.log("Back button clicked")
-                        hapticFeedback.impactOccurred(
-                            HapticFeedbackStyle.Heavy
-                        )
-                    }
-                    show()
-                }
-                mainButton.apply {
-                    setText("Main button")
-                    onClick {
-                        document.body ?.log("Main button clicked")
-                        hapticFeedback.notificationOccurred(
-                            HapticFeedbackType.Success
-                        )
-                    }
-                    show()
-                }
-                onSettingsButtonClicked {
-                    document.body ?.log("Settings button clicked")
-                }
             }
             webApp.ready()
         }.onFailure {

WebApp/src/jsMain/resources/index.html

@@ -2,11 +2,6 @@
 <html lang="en">
     <head>
         <meta charset="UTF-8">
-        <meta name="format-detection" content="telephone=no"/>
-        <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
-        <meta name="HandheldFriendly" content="True"/>
-        <meta name="robots" content="noindex,nofollow"/>
-        <meta name="viewport" content="width=device-width, height=device-height, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=no"/>
         <title>Web App Example</title>
     </head>
     <body>

WebApp/src/jvmMain/kotlin/WebAppServer.kt

@@ -7,27 +7,20 @@ import dev.inmo.tgbotapi.extensions.api.send.*
 import dev.inmo.tgbotapi.extensions.api.telegramBot
 import dev.inmo.tgbotapi.extensions.behaviour_builder.*
 import dev.inmo.tgbotapi.extensions.behaviour_builder.triggers_handling.*
-import dev.inmo.tgbotapi.extensions.utils.formatting.botCommand
-import dev.inmo.tgbotapi.extensions.utils.formatting.buildEntities
 import dev.inmo.tgbotapi.extensions.utils.types.buttons.*
 import dev.inmo.tgbotapi.types.BotCommand
 import dev.inmo.tgbotapi.types.InlineQueries.InlineQueryResult.InlineQueryResultArticle
 import dev.inmo.tgbotapi.types.InlineQueries.InputMessageContent.InputTextMessageContent
 import dev.inmo.tgbotapi.types.webAppQueryIdField
 import dev.inmo.tgbotapi.types.webapps.WebAppInfo
-import dev.inmo.tgbotapi.utils.PreviewFeature
+import io.ktor.application.call
-import dev.inmo.tgbotapi.utils.TelegramAPIUrlsKeeper
+import io.ktor.http.HttpStatusCode
-import io.ktor.http.*
+import io.ktor.http.content.*
-import io.ktor.server.application.call
+import io.ktor.request.receiveText
-import io.ktor.server.http.content.*
+import io.ktor.response.respond
-import io.ktor.server.request.receiveText
+import io.ktor.routing.*
-import io.ktor.server.response.respond
-import io.ktor.server.routing.post
-import io.ktor.server.routing.routing
 import kotlinx.coroutines.Dispatchers
-import kotlinx.serialization.json.Json
 import java.io.File
-import java.nio.charset.Charset
 
 /**
  * Accepts two parameters:
@@ -37,13 +30,8 @@ import java.nio.charset.Charset
  *
  * Will start the server to share the static (index.html and WebApp.js) on 0.0.0.0:8080
  */
-@OptIn(PreviewFeature::class)
 suspend fun main(vararg args: String) {
-    val telegramBotAPIUrlsKeeper = TelegramAPIUrlsKeeper(
+    val bot = telegramBot(args.first(), testServer = args.any { it == "testServer" })
-        args.first(),
-        testServer = args.any { it == "testServer" }
-    )
-    val bot = telegramBot(telegramBotAPIUrlsKeeper)
     createKtorServer(
         "0.0.0.0",
         8080,
@@ -63,14 +51,6 @@ suspend fun main(vararg args: String) {
                 bot.answer(queryId, InlineQueryResultArticle(queryId, "Result", InputTextMessageContent(requestBody)))
                 call.respond(HttpStatusCode.OK)
             }
-            post("check") {
-                val requestBody = call.receiveText()
-                val webAppCheckData = Json {  }.decodeFromString(WebAppDataWrapper.serializer(), requestBody)
-
-                val isSafe = telegramBotAPIUrlsKeeper.checkWebAppData(webAppCheckData.data, webAppCheckData.hash)
-
-                call.respond(HttpStatusCode.OK, isSafe.toString())
-            }
         }
     }.start(false)
 
@@ -101,15 +81,6 @@ suspend fun main(vararg args: String) {
 
             )
         }
-        onUnhandledCommand {
-            reply(
-                it,
-                buildEntities {
-                    +"Use " + botCommand("inline") + " to get inline web app button\n"
-                    +"Use " + botCommand("reply_markup") + " to get reply markup web app button\n"
-                }
-            )
-        }
         setMyCommands(
             BotCommand("reply_markup", "Use to get reply markup keyboard with web app trigger"),
             BotCommand("inline", "Use to get inline keyboard with web app trigger"),

build.gradle

@@ -1,14 +1,3 @@
-buildscript {
-    repositories {
-        mavenCentral()
-    }
-
-    dependencies {
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-        classpath "org.jetbrains.kotlin:kotlin-serialization:$kotlin_version"
-    }
-}
-
 allprojects {
     repositories {
         mavenLocal()

gradle.properties

@@ -1,11 +1,8 @@
 kotlin.code.style=official
 org.gradle.parallel=true
-# Due to parallel compilation project require next amount of memory on full build
-org.gradle.jvmargs=-Xmx768m
 
 
-kotlin_version=1.7.10
+kotlin_version=1.6.21
-telegram_bot_api_version=3.2.0
+telegram_bot_api_version=0.38.22
-micro_utils_version=0.12.4
+micro_utils_version=0.9.24
-serialization_version=1.4.0
+ktor_version=1.6.8
-ktor_version=2.1.0

gradle/wrapper/gradle-wrapper.properties

@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip

settings.gradle

@@ -6,8 +6,6 @@ include ":HelloBot"
 
 include ":GetMeBot"
 
-include ":DeepLinksBot"
-
 include ":FilesLoaderBot"
 
 include ":ResenderBot:ResenderBotLib"
@@ -16,9 +14,6 @@ include ":ResenderBot:jvm_launcher"
 include ":KeyboardsBot:KeyboardsBotLib"
 include ":KeyboardsBot:jvm_launcher"
 
-include ":StickerInfoBot:StickerInfoBotLib"
-include ":StickerInfoBot:jvm_launcher"
-
 include ":SlotMachineDetectorBot"
 
 include ":WebApp"