Merge pull request #114 from InsanusMokrassar/2.0.0

2.0.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,

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()

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())
             }

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.0
-micro_utils_version=0.10.4
+micro_utils_version=0.10.5
 serialization_version=1.3.3
 ktor_version=2.0.1