Merge pull request #123 from InsanusMokrassar/2.1.0

2.1.0

FSMBot/src/main/kotlin/SimpleFSMBot.kt

@@ -10,6 +10,7 @@ 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
@@ -18,7 +19,22 @@ data class StopState(override val context: ChatId) : BotState
 suspend fun main(args: Array<String>) {
     val botToken = args.first()
 
-    telegramBotWithBehaviourAndFSMAndStartLongPolling<BotState>(botToken, CoroutineScope(Dispatchers.IO)) {
+    telegramBotWithBehaviourAndFSMAndStartLongPolling<BotState>(
+        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,

FilesLoaderBot/src/main/kotlin/FilesLoaderBot.kt

@@ -20,11 +20,9 @@ suspend fun main(args: Array<String>) {
     telegramBotWithBehaviourAndLongPolling(botToken, CoroutineScope(Dispatchers.IO)) {
         onMedia(initialFilter = null) {
             val pathedFile = bot.getFileAdditionalInfo(it.content.media)
-            val file = File(directoryOrFile, pathedFile.filePath.filenameFromUrl).apply {
+            val outFile = File(directoryOrFile, pathedFile.filePath.filenameFromUrl)
-                createNewFile()
+            bot.downloadFile(it.content.media, outFile)
-                writeBytes(bot.downloadFile(pathedFile))
+            reply(it, "Saved to ${outFile.absolutePath}")
-            }
-            reply(it, "Saved to ${file.absolutePath}")
         }
         onContentMessage { println(it) }
     }.second.join()

ForwardInfoSenderBot/src/main/kotlin/ForwardInfoSenderBot.kt

@@ -26,7 +26,13 @@ suspend fun main(vararg args: String) {
                     is UserForwardInfo -> {
                         val user = forwardInfo.from
                         when (user) {
-                            is CommonUser -> regular("User ")
+                            is CommonUser -> {
+                                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"})"

KeyboardsBot/KeyboardsBotLib/build.gradle

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

RandomFileSenderBot/src/main/kotlin/RandomFileSenderBot.kt

@@ -1,3 +1,4 @@
+import dev.inmo.micro_utils.common.filesize
 import dev.inmo.tgbotapi.bot.ktor.telegramBot
 import dev.inmo.tgbotapi.bot.TelegramBot
 import dev.inmo.tgbotapi.extensions.api.bot.getMe
@@ -64,9 +65,9 @@ suspend fun main(args: Array<String>) {
                 val chosen = mutableListOf<File>()
 
                 while (left > 0) {
-                    left--
+                    val picked = pickFile() ?.takeIf { it.filesize > 0 } ?: continue
-                    val picked = pickFile() ?: continue
                     chosen.add(picked)
+                    left--
                     if (chosen.size >= mediaCountInMediaGroup.last) {
                         sendFiles(message.chat, chosen)
                         chosen.clear()

ResenderBot/ResenderBotLib/build.gradle

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

WebApp/build.gradle

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

WebApp/src/commonMain/kotlin/WebAppDataWrapper.kt

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

WebApp/src/jsMain/kotlin/main.kt

@@ -1,11 +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 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.bodyAsText
-import io.ktor.client.statement.readText
 import io.ktor.http.*
 import io.ktor.http.content.TextContent
 import kotlinx.browser.document
@@ -13,23 +13,52 @@ 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) {
-    appendElement("p", {})
     appendText(text)
+    appendElement("p", {})
 }
 
 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" }) {
-                            HttpClient().post("${window.location.origin.removeSuffix("/")}/inline") {
+                            client.post("${window.location.origin.removeSuffix("/")}/inline") {
                                 parameter(webAppQueryIdField, it)
                                 setBody(TextContent("Clicked", ContentType.Text.Plain))
                                 document.body ?.log(url.build().toString())
@@ -46,6 +75,28 @@ 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,6 +2,11 @@
 <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

@@ -1,4 +1,5 @@
 import dev.inmo.micro_utils.coroutines.subscribeSafelyWithoutExceptions
+import dev.inmo.micro_utils.crypto.hmacSha256
 import dev.inmo.micro_utils.ktor.server.createKtorServer
 import dev.inmo.tgbotapi.extensions.api.answers.answer
 import dev.inmo.tgbotapi.extensions.api.bot.getMe
@@ -16,7 +17,8 @@ import dev.inmo.tgbotapi.types.InlineQueries.InputMessageContent.InputTextMessag
 import dev.inmo.tgbotapi.types.webAppQueryIdField
 import dev.inmo.tgbotapi.types.webapps.WebAppInfo
 import dev.inmo.tgbotapi.utils.PreviewFeature
-import io.ktor.http.HttpStatusCode
+import dev.inmo.tgbotapi.utils.TelegramAPIUrlsKeeper
+import io.ktor.http.*
 import io.ktor.server.application.call
 import io.ktor.server.http.content.*
 import io.ktor.server.request.receiveText
@@ -24,7 +26,9 @@ 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:
@@ -36,7 +40,11 @@ import java.io.File
  */
 @OptIn(PreviewFeature::class)
 suspend fun main(vararg args: String) {
-    val bot = telegramBot(args.first(), testServer = args.any { it == "testServer" })
+    val telegramBotAPIUrlsKeeper = TelegramAPIUrlsKeeper(
+        args.first(),
+        testServer = args.any { it == "testServer" }
+    )
+    val bot = telegramBot(telegramBotAPIUrlsKeeper)
     createKtorServer(
         "0.0.0.0",
         8080,
@@ -56,6 +64,14 @@ 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)
 

build.gradle

@@ -1,3 +1,14 @@
+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

@@ -5,6 +5,7 @@ org.gradle.jvmargs=-Xmx768m
 
 
 kotlin_version=1.6.21
-telegram_bot_api_version=1.0.0
+telegram_bot_api_version=2.1.0
-micro_utils_version=0.10.3
+micro_utils_version=0.11.3
-ktor_version=2.0.1
+serialization_version=1.3.3
+ktor_version=2.0.2