Merge pull request #118 from Akkihi/master

fixing example webapp mobile view with html meta
2025-12-19 04:35:55 +00:00 · 2022-06-04 16:49:52 +06:00 · 2022-06-04 14:46:28 +04:00 · 2022-06-03 10:33:33 +06:00 · 2022-06-03 08:57:38 +06:00 · 2022-06-03 02:57:34 +00:00
5 changed files with 29 additions and 7 deletions
--- a/FSMBot/src/main/kotlin/SimpleFSMBot.kt
+++ b/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,
--- a/RandomFileSenderBot/src/main/kotlin/RandomFileSenderBot.kt
+++ b/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()
--- a/WebApp/src/jsMain/resources/index.html
+++ b/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>
--- a/WebApp/src/jvmMain/kotlin/WebAppServer.kt
+++ b/WebApp/src/jvmMain/kotlin/WebAppServer.kt
@@ -68,7 +68,7 @@ suspend fun main(vararg args: String) {
                val requestBody = call.receiveText()
                val webAppCheckData = Json {  }.decodeFromString(WebAppDataWrapper.serializer(), requestBody)
-                val isSafe = telegramBotAPIUrlsKeeper.checkWebAppLink(webAppCheckData.data, webAppCheckData.hash)
+                val isSafe = telegramBotAPIUrlsKeeper.checkWebAppData(webAppCheckData.data, webAppCheckData.hash)
                call.respond(HttpStatusCode.OK, isSafe.toString())
            }
--- a/gradle.properties
+++ b/gradle.properties
@@ -5,7 +5,7 @@ org.gradle.jvmargs=-Xmx768m
 kotlin_version=1.6.21
-telegram_bot_api_version=1.1.1
+telegram_bot_api_version=2.0.1
-micro_utils_version=0.10.4
+micro_utils_version=0.10.8
 serialization_version=1.3.3
-ktor_version=2.0.1
+ktor_version=2.0.2
Author	SHA1	Message	Date
InsanusMokrassar	2f8f6f3169	Merge pull request #118 from Akkihi/master fixing example webapp mobile view with html meta	2022-06-04 16:49:52 +06:00
Akkihi	f2b6a50cb5	fixing example webapp mobile view with html meta	2022-06-04 14:46:28 +04:00
InsanusMokrassar	acd602d6fa	Merge pull request #116 from InsanusMokrassar/renovate/micro_utils_version Update dependency dev.inmo:micro_utils.ktor.server to v0.10.8	2022-06-03 10:33:33 +06:00
InsanusMokrassar	fdb80bf471	Merge pull request #115 from InsanusMokrassar/renovate/ktor_version Update dependency io.ktor:ktor-server-cio to v2.0.2	2022-06-03 08:57:38 +06:00
Renovate Bot	78c58db4b7	Update dependency dev.inmo:micro_utils.ktor.server to v0.10.8	2022-06-03 02:57:34 +00:00
InsanusMokrassar	edd6399bcc	Merge pull request #117 from InsanusMokrassar/renovate/telegram_bot_api_version Update telegram_bot_api_version to v2.0.1	2022-06-03 08:56:53 +06:00
Renovate Bot	9513e77ba3	Update telegram_bot_api_version to v2.0.1	2022-05-29 20:26:33 +00:00
Renovate Bot	ac75f6487e	Update dependency io.ktor:ktor-server-cio to v2.0.2	2022-05-27 18:22:47 +00:00
InsanusMokrassar	07750a71c0	Merge pull request #114 from InsanusMokrassar/2.0.0 2.0.0	2022-05-22 14:55:10 +06:00
InsanusMokrassar	0bf7e33df3	migration onto 2.0.0 and several improvements	2022-05-22 12:57:53 +06:00
InsanusMokrassar	7fb308ea4b	Merge pull request #113 from InsanusMokrassar/renovate/telegram_bot_api_version Update telegram_bot_api_version to v1.1.3	2022-05-19 14:57:05 -04:00
Renovate Bot	75b403ac98	Update telegram_bot_api_version to v1.1.3	2022-05-19 18:56:32 +00:00
InsanusMokrassar	5976e37046	Merge pull request #112 from InsanusMokrassar/renovate/micro_utils_version Update dependency dev.inmo:micro_utils.ktor.server to v0.10.5	2022-05-19 14:56:10 -04:00
Renovate Bot	c8a94496c7	Update dependency dev.inmo:micro_utils.ktor.server to v0.10.5	2022-05-19 17:40:28 +00:00
InsanusMokrassar	f6550bd401	Merge pull request #110 from InsanusMokrassar/1.1.2 1.1.2	2022-05-18 10:24:09 -04:00
InsanusMokrassar	389d96f323	fix of checkWebAppData method call	2022-05-18 17:46:50 +06:00
InsanusMokrassar	803c5fd664	add handling of errors in FSMBot and update up to tgbotapi 1.1.2	2022-05-18 17:46:04 +06:00
InsanusMokrassar	b6eb4fe134	Merge pull request #108 from InsanusMokrassar/1.1.1 1.1.1	2022-05-17 16:05:35 -04:00