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

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

ForwardInfoSenderBot/src/main/kotlin/ForwardInfoSenderBot.kt

@@ -16,14 +16,14 @@ suspend fun main(vararg args: String) {
     val botToken = args.first()
 
     telegramBotWithBehaviourAndLongPolling(botToken, CoroutineScope(Dispatchers.IO)) {
-        onContentMessage {
+        onContentMessage(subcontextUpdatesFilter = { _, _ -> true }) {
             val toAnswer = buildEntities {
                 when (val forwardInfo = it.forwardInfo) {
                     null -> +"There is no forward info"
-                    is ForwardInfo.ByAnonymous -> {
+                    is AnonymousForwardInfo -> {
                         regular("Anonymous user which signed as \"") + code(forwardInfo.senderName) + "\""
                     }
-                    is ForwardInfo.ByUser -> {
+                    is UserForwardInfo -> {
                         val user = forwardInfo.from
                         when (user) {
                             is CommonUser -> {
@@ -37,9 +37,8 @@ suspend fun main(vararg args: String) {
                             is ExtendedBot -> regular("Bot ")
                         } + code(user.id.chatId.toString()) + " (${user.firstName} ${user.lastName}: ${user.username ?.username ?: "Without username"})"
                     }
-                    is ForwardInfo.PublicChat.FromChannel -> regular("Channel (") + code(forwardInfo.channelChat.title) + ")"
+                    is ForwardFromChannelInfo -> regular("Channel (") + code((forwardInfo.channelChat).title) + ")"
-                    is ForwardInfo.PublicChat.FromSupergroup -> regular("Supergroup (") + code(forwardInfo.group.title) + ")"
+                    is ForwardFromSupergroupInfo -> 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,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
@@ -100,7 +100,6 @@ suspend fun activateKeyboardsBot(
                     }
                 }
             )
-            answer(it)
         }
 
         onUnhandledCommand {

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/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

gradle.properties

@@ -4,8 +4,8 @@ org.gradle.parallel=true
 org.gradle.jvmargs=-Xmx768m
 
 
-kotlin_version=1.7.10
+kotlin_version=1.7.0
-telegram_bot_api_version=3.0.2
+telegram_bot_api_version=2.1.0
-micro_utils_version=0.12.0
+micro_utils_version=0.11.3
-serialization_version=1.4.0-RC
+serialization_version=1.3.3
-ktor_version=2.0.3
+ktor_version=2.0.2

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