Update kotlin_version to v1.7.0

FSMBot/src/main/kotlin/SimpleFSMBot.kt

@@ -1,6 +1,5 @@
 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.*
@@ -56,7 +55,7 @@ suspend fun main(args: Array<String>) {
             }
         }
         strictlyOn<StopState> {
-            send(it.context, "You have stopped sending of content")
+            sendMessage(it.context, "You have stopped sending of content")
 
             null
         }

FilesLoaderBot/src/main/kotlin/FilesLoaderBot.kt

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

ForwardInfoSenderBot/src/main/kotlin/ForwardInfoSenderBot.kt

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

HelloBot/src/main/kotlin/HelloBot.kt

@@ -1,6 +1,7 @@
 import dev.inmo.micro_utils.coroutines.subscribeSafelyWithoutExceptions
 import dev.inmo.tgbotapi.extensions.api.chat.get.getChat
-import dev.inmo.tgbotapi.extensions.api.send.*
+import dev.inmo.tgbotapi.extensions.api.send.reply
+import dev.inmo.tgbotapi.extensions.api.send.sendTextMessage
 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
@@ -26,7 +27,7 @@ suspend fun main(vararg args: String) {
             val chat = message.chat
             if (chat is ChannelChat) {
                 val answer = "Hi everybody in this channel \"${chat.title}\""
-                send(chat, answer, MarkdownV2)
+                sendTextMessage(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.edit
+import dev.inmo.tgbotapi.extensions.api.edit.text.editMessageText
 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"
 
-            edit(
+            editMessageText(
                 it.message.withContent<TextContent>() ?: it.let {
                     answer(it, "Unsupported message type :(")
                     return@onMessageDataCallbackQuery

RandomFileSenderBot/src/main/kotlin/RandomFileSenderBot.kt

@@ -3,15 +3,15 @@ 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
@@ -81,7 +81,7 @@ suspend fun main(args: Array<String>) {
                 }
 
                 if (!sent) {
-                    reply(message, "Nothing selected :(")
+                    bot.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) {
-                send(chat, it.map { it.content.toMediaGroupMemberTelegramMedia() })
+                sendVisualMediaGroup(chat, it.map { it.content.toMediaGroupMemberTelegramMedia() })
             }
         }
         onPlaylist {
             val chat = it.chat ?: return@onPlaylist
             withUploadDocumentAction(chat) {
-                send(chat, it.map { it.content.toMediaGroupMemberTelegramMedia() })
+                sendPlaylist(chat, it.map { it.content.toMediaGroupMemberTelegramMedia() })
             }
         }
         onDocumentsGroup {
             val chat = it.chat ?: return@onDocumentsGroup
             withUploadDocumentAction(chat) {
-                send(chat, it.map { it.content.toMediaGroupMemberTelegramMedia() })
+                sendDocumentsGroup(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
-                reply(it, "${result.leftReel}|${result.centerReel}|${result.rightReel}")
+                bot.reply(it, "${result.leftReel}|${result.centerReel}|${result.rightReel}")
             } else {
-                reply(it, "There is no slot machine dice in message")
+                bot.reply(it, "There is no slot machine dice in message")
             }
         }
     }.join()

WebApp/src/jsMain/kotlin/main.kt

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

gradle.properties

@@ -4,8 +4,8 @@ org.gradle.parallel=true
 org.gradle.jvmargs=-Xmx768m
 
 
-kotlin_version=1.6.21
+kotlin_version=1.7.0
-telegram_bot_api_version=2.1.1
+telegram_bot_api_version=2.0.3
-micro_utils_version=0.11.6
+micro_utils_version=0.11.0
 serialization_version=1.3.3
 ktor_version=2.0.2