Merge pull request #97 from InsanusMokrassar/0.38.16

0.38.16

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

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

KeyboardsBot/jvm_launcher/build.gradle

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

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/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-tomcat:$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,42 @@
+import dev.inmo.tgbotapi.webapps.*
+import io.ktor.client.HttpClient
+import io.ktor.client.request.get
+import io.ktor.client.statement.HttpResponse
+import io.ktor.client.statement.readText
+import io.ktor.http.encodeURLPath
+import kotlinx.browser.document
+import kotlinx.browser.window
+import kotlinx.coroutines.*
+import kotlinx.dom.appendElement
+import kotlinx.dom.appendText
+
+fun main() {
+    console.log("Web app started")
+    window.onload = {
+        val scope = CoroutineScope(Dispatchers.Default)
+        runCatching {
+            document.body ?.appendElement("button") {
+                addEventListener(
+                    "click",
+                    {
+                        webApp.sendData("Clicked")
+                    }
+                )
+                appendText("Example button")
+            } ?: window.alert("Unable to load body")
+            webApp.apply {
+                onThemeChanged {
+                    document.body ?.appendText("Theme changed: ${webApp.themeParams}")
+                    document.body ?.appendElement("p", {})
+                }
+                onViewportChanged {
+                    document.body ?.appendText("Viewport changed: ${it.isStateStable}")
+                    document.body ?.appendElement("p", {})
+                }
+            }
+            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,61 @@
+import dev.inmo.micro_utils.coroutines.subscribeSafelyWithoutExceptions
+import dev.inmo.micro_utils.ktor.server.createKtorServer
+import dev.inmo.tgbotapi.extensions.api.bot.getMe
+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.types.buttons.*
+import io.ktor.application.call
+import io.ktor.http.content.files
+import io.ktor.http.content.static
+import io.ktor.routing.get
+import io.ktor.routing.routing
+import io.ktor.server.tomcat.Tomcat
+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) {
+    createKtorServer(
+        Tomcat,
+        "0.0.0.0",
+        8080,
+        additionalEngineEnvironmentConfigurator = {
+            parentCoroutineContext += Dispatchers.IO
+        }
+    ) {
+        routing {
+            static {
+                files(File("WebApp/build/distributions"))
+            }
+        }
+    }.start(false)
+
+    telegramBotWithBehaviourAndLongPolling(
+        args.first(),
+        defaultExceptionsHandler = { it.printStackTrace() }
+    ) {
+        onCommand("start") {
+            reply(
+                it,
+                "Button:",
+                replyMarkup = inlineKeyboard {
+                    row {
+                        webAppButton("Open", args[1])
+                    }
+                }
+            )
+        }
+        allUpdatesFlow.subscribeSafelyWithoutExceptions(this) {
+            println(it)
+        }
+        println(getMe())
+    }.second.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

@@ -3,5 +3,6 @@ org.gradle.parallel=true
 
 
 kotlin_version=1.6.10
-telegram_bot_api_version=0.38.15
-micro_utils_version=0.9.20
+telegram_bot_api_version=0.38.16
+micro_utils_version=0.9.24
+ktor_version=1.6.8

settings.gradle

@@ -16,4 +16,6 @@ include ":KeyboardsBot:jvm_launcher"
 
 include ":SlotMachineDetectorBot"
 
+include ":WebApp"
+
 include ":FSMBot"