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

0.38.21

FSMBot/src/main/kotlin/SimpleFSMBot.kt

@@ -26,7 +26,9 @@ suspend fun main(args: Array<String>) {
                 }
             )
 
-            val content = waitContentMessage().first()
+            val contentMessage = waitContentMessage().first()
+            val content = contentMessage.content
+
             when {
                 content is TextContent && content.parseCommandsWithParams().keys.contains("stop") -> StopState(it.context)
                 else -> {

FilesLoaderBot/build.gradle

@@ -1,6 +1,6 @@
 buildscript {
     repositories {
-        jcenter()
+        mavenCentral()
     }
 
     dependencies {

ForwardInfoSenderBot/build.gradle

@@ -1,6 +1,6 @@
 buildscript {
     repositories {
-        jcenter()
+        mavenCentral()
     }
 
     dependencies {

GetMeBot/build.gradle

@@ -1,6 +1,6 @@
 buildscript {
     repositories {
-        jcenter()
+        mavenCentral()
     }
 
     dependencies {

HelloBot/build.gradle

@@ -1,6 +1,6 @@
 buildscript {
     repositories {
-        jcenter()
+        mavenCentral()
     }
 
     dependencies {

KeyboardsBot/KeyboardsBotLib/build.gradle

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

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

@@ -0,0 +1,107 @@
+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.answers.answer
+import dev.inmo.tgbotapi.extensions.api.edit.text.editMessageText
+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.shortcuts.*
+import dev.inmo.tgbotapi.extensions.utils.types.buttons.*
+import dev.inmo.tgbotapi.extensions.utils.withContent
+import dev.inmo.tgbotapi.types.message.content.TextContent
+import kotlinx.coroutines.*
+
+private const val nextPageData = "next"
+private const val previousPageData = "previous"
+
+fun String.parsePageAndCount(): Pair<Int, Int>? {
+    val (pageString, countString) = split(" ").takeIf { it.count() > 1 } ?: return null
+    return Pair(
+        pageString.toIntOrNull() ?: return null,
+        countString.toIntOrNull() ?: return null
+    )
+}
+
+fun InlineKeyboardBuilder.includePageButtons(page: Int, count: Int) {
+    val numericButtons = listOfNotNull(
+        page - 1,
+        page,
+        page + 1,
+    )
+    row {
+        val numbersRange = 1 .. count
+        numericButtons.forEach {
+            if (it in numbersRange) {
+                dataButton(it.toString(), "$it $count")
+            }
+        }
+    }
+
+    row {
+        if (page - 1 > 2) {
+            dataButton("<<", "1 $count")
+        }
+        if (page - 1 > 1) {
+            dataButton("<", "${page - 2} $count")
+        }
+
+        if (page + 1 < count) {
+            dataButton(">", "${page + 2} $count")
+        }
+        if (page + 2 < count) {
+            dataButton(">>", "$count $count")
+        }
+    }
+}
+
+suspend fun activateKeyboardsBot(
+    token: String,
+    print: (Any) -> Unit
+) {
+    val bot = telegramBot(token)
+
+    print(bot.getMe())
+
+    bot.buildBehaviourWithLongPolling(CoroutineScope(currentCoroutineContext() + SupervisorJob())) {
+        onCommandWithArgs("inline") { message, args ->
+            val numberOfPages = args.firstOrNull() ?.toIntOrNull() ?: 10
+            reply(
+                message,
+                "Your inline keyboard with $numberOfPages pages",
+                replyMarkup = inlineKeyboard {
+                    row {
+                        includePageButtons(1, numberOfPages)
+                    }
+                }
+            )
+        }
+
+        onMessageDataCallbackQuery {
+            val (page, count) = it.data.parsePageAndCount() ?: it.let {
+                answer(it, "Unsupported data :(")
+                return@onMessageDataCallbackQuery
+            }
+
+            editMessageText(
+                it.message.withContent<TextContent>() ?: it.let {
+                    answer(it, "Unsupported message type :(")
+                    return@onMessageDataCallbackQuery
+                },
+                "This is $page of $count",
+                replyMarkup = inlineKeyboard {
+                    row {
+                        includePageButtons(page, count)
+                    }
+                }
+            )
+        }
+
+        allUpdatesFlow.subscribeSafelyWithoutExceptions(this) {
+            println(it)
+        }
+    }.join()
+}

KeyboardsBot/KeyboardsBotLib/src/jsMain/kotlin/KeyboardsBot.kt

@@ -0,0 +1,32 @@
+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 {
+                        activateKeyboardsBot(token) {
+                            infoDiv.innerHTML = it.toString()
+                        }
+                    }
+                }
+
+                false
+            }
+        }
+    )
+}

KeyboardsBot/KeyboardsBotLib/src/jsMain/resources/index.html

@@ -0,0 +1,16 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <title>Keyboards 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="KeyboardsBotLib.js"></script>
+    <div id="bots_container"></div>
+</body>
+</html>

KeyboardsBot/jvm_launcher/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="KeyboardsBotJvmKt"
+
+
+dependencies {
+    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
+
+    implementation project(":KeyboardsBot:KeyboardsBotLib")
+}

KeyboardsBot/jvm_launcher/src/main/kotlin/KeyboardsBotJvm.kt

@@ -0,0 +1,10 @@
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
+
+suspend fun main(args: Array<String>) {
+    withContext(Dispatchers.IO) { // IO for inheriting of it in side of activateKeyboardsBot
+        activateKeyboardsBot(args.first()) {
+            println(it)
+        }
+    }
+}

RandomFileSenderBot/build.gradle

@@ -1,6 +1,6 @@
 buildscript {
     repositories {
-        jcenter()
+        mavenCentral()
     }
 
     dependencies {

ResenderBot/ResenderBotLib/build.gradle

@@ -1,6 +1,6 @@
 buildscript {
     repositories {
-        jcenter()
+        mavenCentral()
     }
 
     dependencies {

ResenderBot/jvm_launcher/build.gradle

@@ -1,6 +1,6 @@
 buildscript {
     repositories {
-        jcenter()
+        mavenCentral()
     }
 
     dependencies {

SlotMachineDetectorBot/build.gradle

@@ -1,6 +1,6 @@
 buildscript {
     repositories {
-        jcenter()
+        mavenCentral()
     }
 
     dependencies {

WebApp/README.md

@@ -0,0 +1,17 @@
+# WebApp
+
+Here you may find simple example of `WebApp`. For work of this example you will need one of two things:
+
+* Your own domain with SSL (letsencrypt is okay)
+* Test account in telegram
+
+What is there in this module:
+
+* JVM part of this example is a server with simple static webapp sharing and bot which just gives the webapp button to open webapp
+* JS part is the WebApp with one button and reacting to chaged user theme and app viewport
+
+## How to run
+
+```kotlin
+./gradlew run --args="TOKEN WEB_APP_ADDRESS"
+```

WebApp/build.gradle

@@ -0,0 +1,55 @@
+buildscript {
+    repositories {
+        mavenCentral()
+    }
+
+    dependencies {
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+    }
+}
+
+plugins {
+    id "org.jetbrains.kotlin.multiplatform" version "$kotlin_version"
+}
+
+apply plugin: 'application'
+
+kotlin {
+    jvm()
+    js(IR) {
+        browser()
+        binaries.executable()
+    }
+
+    sourceSets {
+        commonMain {
+            dependencies {
+                implementation kotlin('stdlib')
+            }
+        }
+
+        jsMain {
+            dependencies {
+                implementation "dev.inmo:tgbotapi.webapps:$telegram_bot_api_version"
+            }
+        }
+
+        jvmMain {
+            dependencies {
+                implementation "dev.inmo:tgbotapi:$telegram_bot_api_version"
+                implementation "dev.inmo:micro_utils.ktor.server:$micro_utils_version"
+                implementation "io.ktor:ktor-server-cio:$ktor_version"
+            }
+        }
+    }
+}
+
+application {
+    mainClassName = "WebAppServerKt"
+}
+
+tasks.getByName("compileKotlinJvm")
+        .dependsOn(jsBrowserDistribution)
+tasks.getByName("compileKotlinJvm").configure {
+    mustRunAfter jsBrowserDistribution
+}

WebApp/src/jsMain/kotlin/main.kt

@@ -0,0 +1,55 @@
+import dev.inmo.micro_utils.coroutines.launchSafelyWithoutExceptions
+import dev.inmo.tgbotapi.types.webAppQueryIdField
+import dev.inmo.tgbotapi.webapps.*
+import io.ktor.client.HttpClient
+import io.ktor.client.call.receive
+import io.ktor.client.request.*
+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
+import kotlinx.browser.window
+import kotlinx.coroutines.*
+import kotlinx.dom.appendElement
+import kotlinx.dom.appendText
+import org.w3c.dom.HTMLElement
+
+fun HTMLElement.log(text: String) {
+    appendElement("p", {})
+    appendText(text)
+}
+
+fun main() {
+    console.log("Web app started")
+    window.onload = {
+        val scope = CoroutineScope(Dispatchers.Default)
+        runCatching {
+            document.body ?.appendElement("button") {
+                addEventListener("click", {
+                    scope.launchSafelyWithoutExceptions {
+                        handleResult({ "Clicked" }) {
+                            HttpClient().post<HttpResponse>("${window.location.origin.removeSuffix("/")}/inline") {
+                                parameter(webAppQueryIdField, it)
+                                body = TextContent("Clicked", ContentType.Text.Plain)
+                                document.body ?.log(url.build().toString())
+                            }.coroutineContext.job.join()
+                        }
+                    }
+                })
+                appendText("Example button")
+            } ?: window.alert("Unable to load body")
+            webApp.apply {
+                onThemeChanged {
+                    document.body ?.log("Theme changed: ${webApp.themeParams}")
+                }
+                onViewportChanged {
+                    document.body ?.log("Viewport changed: ${it.isStateStable}")
+                }
+            }
+            webApp.ready()
+        }.onFailure {
+            window.alert(it.stackTraceToString())
+        }
+    }
+}

WebApp/src/jsMain/resources/index.html

@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<html lang="en">
+    <head>
+        <meta charset="UTF-8">
+        <title>Web App Example</title>
+    </head>
+    <body>
+        <script type="application/javascript" src="https://telegram.org/js/telegram-web-app.js"></script>
+        <script type="application/javascript" src="WebApp.js"></script>
+    </body>
+</html>

WebApp/src/jvmMain/kotlin/WebAppServer.kt

@@ -0,0 +1,93 @@
+import dev.inmo.micro_utils.coroutines.subscribeSafelyWithoutExceptions
+import dev.inmo.micro_utils.ktor.server.createKtorServer
+import dev.inmo.tgbotapi.extensions.api.answers.answer
+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.telegramBot
+import dev.inmo.tgbotapi.extensions.behaviour_builder.*
+import dev.inmo.tgbotapi.extensions.behaviour_builder.triggers_handling.*
+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 io.ktor.application.call
+import io.ktor.http.HttpStatusCode
+import io.ktor.http.content.*
+import io.ktor.request.receiveText
+import io.ktor.response.respond
+import io.ktor.routing.*
+import kotlinx.coroutines.Dispatchers
+import java.io.File
+
+/**
+ * Accepts two parameters:
+ *
+ * * Telegram Token
+ * * URL where will be placed
+ *
+ * Will start the server to share the static (index.html and WebApp.js) on 0.0.0.0:8080
+ */
+suspend fun main(vararg args: String) {
+    val bot = telegramBot(args.first(), testServer = args.any { it == "testServer" })
+    createKtorServer(
+        "0.0.0.0",
+        8080,
+        additionalEngineEnvironmentConfigurator = {
+            parentCoroutineContext += Dispatchers.IO
+        }
+    ) {
+        routing {
+            static {
+                files(File("WebApp/build/distributions"))
+                default("WebApp/build/distributions/index.html")
+            }
+            post("inline") {
+                val requestBody = call.receiveText()
+                val queryId = call.parameters[webAppQueryIdField] ?: error("$webAppQueryIdField should be presented")
+
+                bot.answer(queryId, InlineQueryResultArticle(queryId, "Result", InputTextMessageContent(requestBody)))
+                call.respond(HttpStatusCode.OK)
+            }
+        }
+    }.start(false)
+
+    bot.buildBehaviourWithLongPolling(
+        defaultExceptionsHandler = { it.printStackTrace() }
+    ) {
+        onCommand("reply_markup") {
+            reply(
+                it,
+                "Button",
+                replyMarkup = replyKeyboard(resizeKeyboard = true, oneTimeKeyboard = true) {
+                    row {
+                        webAppButton("Open WebApp", WebAppInfo(args[1]))
+                    }
+                }
+
+            )
+        }
+        onCommand("inline") {
+            reply(
+                it,
+                "Button",
+                replyMarkup = inlineKeyboard {
+                    row {
+                        webAppButton("Open WebApp", WebAppInfo(args[1]))
+                    }
+                }
+
+            )
+        }
+        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"),
+        )
+        allUpdatesFlow.subscribeSafelyWithoutExceptions(this) {
+            println(it)
+        }
+        println(getMe())
+    }.join()
+}

build.gradle

@@ -1,7 +1,7 @@
 allprojects {
     repositories {
         mavenLocal()
-        jcenter()
+        mavenCentral()
         if (project.hasProperty("GITHUB_USER") && project.hasProperty("GITHUB_TOKEN")) {
             maven {
                 url "https://maven.pkg.github.com/InsanusMokrassar/TelegramBotAPI"
@@ -12,4 +12,4 @@ allprojects {
             }
         }
     }
-}
+}

gradle.properties

@@ -2,6 +2,7 @@ kotlin.code.style=official
 org.gradle.parallel=true
 
 
-kotlin_version=1.6.10
-telegram_bot_api_version=0.38.10
-micro_utils_version=0.9.16
+kotlin_version=1.6.21
+telegram_bot_api_version=0.38.22
+micro_utils_version=0.9.24
+ktor_version=1.6.8

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.4.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip

settings.gradle

@@ -1,9 +1,21 @@
 include ":ForwardInfoSenderBot"
+
 include ":RandomFileSenderBot"
+
 include ":HelloBot"
+
 include ":GetMeBot"
+
 include ":FilesLoaderBot"
+
 include ":ResenderBot:ResenderBotLib"
 include ":ResenderBot:jvm_launcher"
+
+include ":KeyboardsBot:KeyboardsBotLib"
+include ":KeyboardsBot:jvm_launcher"
+
 include ":SlotMachineDetectorBot"
+
+include ":WebApp"
+
 include ":FSMBot"