Update gradle-wrapper.properties

Update telegram_bot_api_version to v2.2.2

FSMBot/src/main/kotlin/SimpleFSMBot.kt

@@ -1,5 +1,6 @@
 import dev.inmo.micro_utils.coroutines.AccumulatorFlow
 import dev.inmo.micro_utils.fsm.common.State
+import dev.inmo.tgbotapi.extensions.api.send.send
 import dev.inmo.tgbotapi.extensions.api.send.sendMessage
 import dev.inmo.tgbotapi.extensions.behaviour_builder.*
 import dev.inmo.tgbotapi.extensions.behaviour_builder.expectations.*
@@ -10,6 +11,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
@@ -54,7 +56,7 @@ suspend fun main(args: Array<String>) {
             }
         }
         strictlyOn<StopState> {
-            sendMessage(it.context, "You have stopped sending of content")
+            send(it.context, "You have stopped sending of content")
 
             null
         }

FilesLoaderBot/src/main/kotlin/FilesLoaderBot.kt

@@ -14,17 +14,19 @@ import java.io.File
  */
 suspend fun main(args: Array<String>) {
     val botToken = args.first()
-    val directoryOrFile = args.getOrNull(1) ?.let { File(it) } ?: File("")
+    val directoryOrFile = args.getOrNull(1) ?.let { File(it) } ?: File("/tmp/")
     directoryOrFile.mkdirs()
 
     telegramBotWithBehaviourAndLongPolling(botToken, CoroutineScope(Dispatchers.IO)) {
         onMedia(initialFilter = null) {
             val pathedFile = bot.getFileAdditionalInfo(it.content.media)
-            val file = File(directoryOrFile, pathedFile.filePath.filenameFromUrl).apply {
-                createNewFile()
-                writeBytes(bot.downloadFile(pathedFile))
+            val outFile = File(directoryOrFile, pathedFile.filePath.filenameFromUrl)
+            runCatching {
+                bot.downloadFile(it.content.media, outFile)
+            }.onFailure {
+                it.printStackTrace()
             }
-            reply(it, "Saved to ${file.absolutePath}")
+            reply(it, "Saved to ${outFile.absolutePath}")
         }
         onContentMessage { println(it) }
     }.second.join()

ForwardInfoSenderBot/src/main/kotlin/ForwardInfoSenderBot.kt

@@ -16,23 +16,30 @@ suspend fun main(vararg args: String) {
     val botToken = args.first()
 
     telegramBotWithBehaviourAndLongPolling(botToken, CoroutineScope(Dispatchers.IO)) {
-        onContentMessage(subcontextUpdatesFilter = { _, _ -> true }) {
+        onContentMessage {
             val toAnswer = buildEntities {
                 when (val forwardInfo = it.forwardInfo) {
                     null -> +"There is no forward info"
-                    is AnonymousForwardInfo -> {
+                    is ForwardInfo.ByAnonymous -> {
                         regular("Anonymous user which signed as \"") + code(forwardInfo.senderName) + "\""
                     }
-                    is UserForwardInfo -> {
+                    is ForwardInfo.ByUser -> {
                         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"})"
                     }
-                    is ForwardFromChannelInfo -> regular("Channel (") + code((forwardInfo.channelChat).title) + ")"
-                    is ForwardFromSupergroupInfo -> regular("Supergroup (") + code((forwardInfo.group).title) + ")"
+                    is ForwardInfo.PublicChat.FromChannel -> regular("Channel (") + code(forwardInfo.channelChat.title) + ")"
+                    is ForwardInfo.PublicChat.FromSupergroup -> regular("Supergroup (") + code(forwardInfo.group.title) + ")"
+                    is ForwardInfo.PublicChat.SentByChannel -> regular("Sent by channel (") + code(forwardInfo.channelChat.title) + ")"
                 }
             }
             reply(it, toAnswer)

HelloBot/src/main/kotlin/HelloBot.kt

@@ -1,7 +1,6 @@
 import dev.inmo.micro_utils.coroutines.subscribeSafelyWithoutExceptions
 import dev.inmo.tgbotapi.extensions.api.chat.get.getChat
-import dev.inmo.tgbotapi.extensions.api.send.reply
-import dev.inmo.tgbotapi.extensions.api.send.sendTextMessage
+import dev.inmo.tgbotapi.extensions.api.send.*
 import dev.inmo.tgbotapi.extensions.behaviour_builder.telegramBotWithBehaviourAndLongPolling
 import dev.inmo.tgbotapi.extensions.behaviour_builder.triggers_handling.onContentMessage
 import dev.inmo.tgbotapi.extensions.utils.formatting.linkMarkdownV2
@@ -27,7 +26,7 @@ suspend fun main(vararg args: String) {
             val chat = message.chat
             if (chat is ChannelChat) {
                 val answer = "Hi everybody in this channel \"${chat.title}\""
-                sendTextMessage(chat, answer, MarkdownV2)
+                send(chat, answer, MarkdownV2)
                 return@onContentMessage
             }
             val answerText = "Oh, hi, " + when (chat) {

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

@@ -3,7 +3,7 @@ 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.bot.setMyCommands
-import dev.inmo.tgbotapi.extensions.api.edit.text.editMessageText
+import dev.inmo.tgbotapi.extensions.api.edit.edit
 import dev.inmo.tgbotapi.extensions.api.send.*
 import dev.inmo.tgbotapi.extensions.behaviour_builder.*
 import dev.inmo.tgbotapi.extensions.behaviour_builder.triggers_handling.*
@@ -88,7 +88,7 @@ suspend fun activateKeyboardsBot(
 
             val text = "This is $page of $count"
 
-            editMessageText(
+            edit(
                 it.message.withContent<TextContent>() ?: it.let {
                     answer(it, "Unsupported message type :(")
                     return@onMessageDataCallbackQuery
@@ -100,6 +100,7 @@ suspend fun activateKeyboardsBot(
                     }
                 }
             )
+            answer(it)
         }
 
         onUnhandledCommand {

RandomFileSenderBot/src/main/kotlin/RandomFileSenderBot.kt

@@ -1,16 +1,17 @@
+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
 import dev.inmo.tgbotapi.extensions.api.bot.setMyCommands
+import dev.inmo.tgbotapi.extensions.api.send.*
 import dev.inmo.tgbotapi.extensions.api.send.media.sendDocument
 import dev.inmo.tgbotapi.extensions.api.send.media.sendDocumentsGroup
-import dev.inmo.tgbotapi.extensions.api.send.reply
-import dev.inmo.tgbotapi.extensions.api.send.withUploadDocumentAction
 import dev.inmo.tgbotapi.extensions.behaviour_builder.buildBehaviourWithLongPolling
 import dev.inmo.tgbotapi.extensions.behaviour_builder.triggers_handling.onCommandWithArgs
 import dev.inmo.tgbotapi.requests.abstracts.asMultipartFile
 import dev.inmo.tgbotapi.types.BotCommand
 import dev.inmo.tgbotapi.types.chat.Chat
+import dev.inmo.tgbotapi.types.files.DocumentFile
 import dev.inmo.tgbotapi.types.media.TelegramMediaDocument
 import dev.inmo.tgbotapi.types.mediaCountInMediaGroup
 import java.io.File
@@ -64,9 +65,9 @@ suspend fun main(args: Array<String>) {
                 val chosen = mutableListOf<File>()
 
                 while (left > 0) {
-                    left--
-                    val picked = pickFile() ?: continue
+                    val picked = pickFile() ?.takeIf { it.filesize > 0 } ?: continue
                     chosen.add(picked)
+                    left--
                     if (chosen.size >= mediaCountInMediaGroup.last) {
                         sendFiles(message.chat, chosen)
                         chosen.clear()
@@ -80,7 +81,7 @@ suspend fun main(args: Array<String>) {
                 }
 
                 if (!sent) {
-                    bot.reply(message, "Nothing selected :(")
+                    reply(message, "Nothing selected :(")
                 }
             }
         }

ResenderBot/ResenderBotLib/src/commonMain/kotlin/ResenderBot.kt

@@ -31,19 +31,19 @@ suspend fun activateResenderBot(
         onVisualGallery {
             val chat = it.chat ?: return@onVisualGallery
             withUploadPhotoAction(chat) {
-                sendVisualMediaGroup(chat, it.map { it.content.toMediaGroupMemberTelegramMedia() })
+                send(chat, it.map { it.content.toMediaGroupMemberTelegramMedia() })
             }
         }
         onPlaylist {
             val chat = it.chat ?: return@onPlaylist
             withUploadDocumentAction(chat) {
-                sendPlaylist(chat, it.map { it.content.toMediaGroupMemberTelegramMedia() })
+                send(chat, it.map { it.content.toMediaGroupMemberTelegramMedia() })
             }
         }
         onDocumentsGroup {
             val chat = it.chat ?: return@onDocumentsGroup
             withUploadDocumentAction(chat) {
-                sendDocumentsGroup(chat, it.map { it.content.toMediaGroupMemberTelegramMedia() })
+                send(chat, it.map { it.content.toMediaGroupMemberTelegramMedia() })
             }
         }
 

SlotMachineDetectorBot/src/main/kotlin/SlotMachineDetectorBot.kt

@@ -17,9 +17,9 @@ suspend fun main(args: Array<String>) {
 
             if (diceType == SlotMachineDiceAnimationType) {
                 val result = dice.calculateSlotMachineResult() ?: return@onDice
-                bot.reply(it, "${result.leftReel}|${result.centerReel}|${result.rightReel}")
+                reply(it, "${result.leftReel}|${result.centerReel}|${result.rightReel}")
             } else {
-                bot.reply(it, "There is no slot machine dice in message")
+                reply(it, "There is no slot machine dice in message")
             }
         }
     }.join()

WebApp/src/jsMain/kotlin/main.kt

@@ -1,6 +1,8 @@
 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.request.*
 import io.ktor.client.statement.bodyAsText
@@ -15,8 +17,8 @@ import kotlinx.serialization.json.Json
 import org.w3c.dom.HTMLElement
 
 fun HTMLElement.log(text: String) {
-    appendElement("p", {})
     appendText(text)
+    appendElement("p", {})
 }
 
 fun main() {
@@ -39,13 +41,17 @@ fun main() {
                 }
                 val dataIsSafe = response.bodyAsText().toBoolean()
 
-                document.body ?.appendElement("div") {
-                    textContent = if (dataIsSafe) {
+                document.body ?.log(
+                    if (dataIsSafe) {
                         "Data is safe"
                     } else {
                         "Data is unsafe"
                     }
-                }
+                )
+
+                document.body ?.log(
+                    webApp.initDataUnsafe.chat.toString()
+                )
             }
 
             document.body ?.appendElement("button") {
@@ -69,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,5 +1,4 @@
 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

gradle.properties

@@ -4,8 +4,8 @@ org.gradle.parallel=true
 org.gradle.jvmargs=-Xmx768m
 
 
-kotlin_version=1.6.21
-telegram_bot_api_version=1.1.2
-micro_utils_version=0.10.4
-serialization_version=1.3.3
-ktor_version=2.0.1
+kotlin_version=1.7.10
+telegram_bot_api_version=3.0.2
+micro_utils_version=0.12.0
+serialization_version=1.4.0-RC
+ktor_version=2.0.3

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