Update dependency dev.inmo:micro_utils.ktor.server to v0.18.0-branch_0.18.0-build449

.gitignore

@@ -10,6 +10,3 @@ build/
 out/
 
 kotlin-js-store/
-
-local.*
-local.*/

DeepLinksBot/src/main/kotlin/DeepLinksBot.kt

@@ -17,17 +17,12 @@ suspend fun main(vararg args: String) {
 
     telegramBotWithBehaviourAndLongPolling(botToken) {
         val me = bot.getMe()
-        val username = me.username
         println(me)
 
-        if (username == null) {
-            error("Unable to start bot work: it have no username")
-        }
-
         onText(
             initialFilter = { it.content.textSources.none { it is BotCommandTextSource } } // excluding messages with commands
         ) {
-            reply(it, makeTelegramDeepLink(username, it.content.text))
+            reply(it, makeTelegramDeepLink(me.username, it.content.text))
         }
 
         onCommand("start", requireOnlyCommandInMessage = true) { // handling of `start` without args

HelloBot/src/main/kotlin/HelloBot.kt

@@ -1,10 +1,8 @@
 import dev.inmo.micro_utils.coroutines.subscribeSafelyWithoutExceptions
-import dev.inmo.tgbotapi.extensions.api.bot.getMe
 import dev.inmo.tgbotapi.extensions.api.chat.get.getChat
 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.behaviour_builder.triggers_handling.onMentionWithAnyContent
 import dev.inmo.tgbotapi.extensions.utils.extensions.raw.sender_chat
 import dev.inmo.tgbotapi.extensions.utils.formatting.linkMarkdownV2
 import dev.inmo.tgbotapi.extensions.utils.formatting.textMentionMarkdownV2
@@ -27,25 +25,24 @@ suspend fun main(vararg args: String) {
     val botToken = args.first()
 
     telegramBotWithBehaviourAndLongPolling(botToken, CoroutineScope(Dispatchers.IO)) {
-        val me = getMe()
+        onContentMessage { message ->
-        onMentionWithAnyContent(me) { message ->
             val chat = message.chat
 
             val answerText = when (val chat = message.chat) {
                 is ChannelChat -> {
                     val answer = "Hi everybody in this channel \"${chat.title}\""
                     reply(message, answer, MarkdownV2)
-                    return@onMentionWithAnyContent
+                    return@onContentMessage
                 }
                 is PrivateChat -> {
                     reply(message, "Hi, " + "${chat.firstName} ${chat.lastName}".textMentionMarkdownV2(chat.id), MarkdownV2)
-                    return@onMentionWithAnyContent
+                    return@onContentMessage
                 }
                 is GroupChat -> {
                     message.ifFromChannelGroupContentMessage {
                         val answer = "Hi, ${it.senderChat.title}"
                         reply(message, answer, MarkdownV2)
-                        return@onMentionWithAnyContent
+                        return@onContentMessage
                     }
                     "Oh, hi, " + when (chat) {
                         is SupergroupChat -> (chat.username ?.username ?: getChat(chat).inviteLink) ?.let {

PollsBot/README.md

@@ -1,11 +0,0 @@
-# PollsBot
-
-This bot will send test poll in the chat where commands will be received. Commands:
-
-
-
-## Launch
-
-```bash
-../gradlew run --args="BOT_TOKEN"
-```

PollsBot/build.gradle

@@ -1,21 +0,0 @@
-buildscript {
-    repositories {
-        mavenCentral()
-    }
-
-    dependencies {
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-    }
-}
-
-apply plugin: 'kotlin'
-apply plugin: 'application'
-
-mainClassName="HelloBotKt"
-
-
-dependencies {
-    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-
-    implementation "dev.inmo:tgbotapi:$telegram_bot_api_version"
-}

PollsBot/src/main/kotlin/PollsBot.kt

@@ -1,99 +0,0 @@
-import com.benasher44.uuid.uuid4
-import dev.inmo.micro_utils.coroutines.subscribeSafelyWithoutExceptions
-import dev.inmo.tgbotapi.extensions.api.bot.getMe
-import dev.inmo.tgbotapi.extensions.api.chat.get.getChat
-import dev.inmo.tgbotapi.extensions.api.send.*
-import dev.inmo.tgbotapi.extensions.api.send.polls.sendRegularPoll
-import dev.inmo.tgbotapi.extensions.behaviour_builder.telegramBotWithBehaviourAndLongPolling
-import dev.inmo.tgbotapi.extensions.behaviour_builder.triggers_handling.*
-import dev.inmo.tgbotapi.extensions.utils.extensions.raw.sender_chat
-import dev.inmo.tgbotapi.extensions.utils.formatting.linkMarkdownV2
-import dev.inmo.tgbotapi.extensions.utils.formatting.textMentionMarkdownV2
-import dev.inmo.tgbotapi.extensions.utils.ifChannelChat
-import dev.inmo.tgbotapi.extensions.utils.ifFromChannelGroupContentMessage
-import dev.inmo.tgbotapi.types.ChatId
-import dev.inmo.tgbotapi.types.IdChatIdentifier
-import dev.inmo.tgbotapi.types.PollIdentifier
-import dev.inmo.tgbotapi.types.chat.*
-import dev.inmo.tgbotapi.types.chat.GroupChat
-import dev.inmo.tgbotapi.types.chat.PrivateChat
-import dev.inmo.tgbotapi.types.chat.SupergroupChat
-import dev.inmo.tgbotapi.types.message.MarkdownV2
-import dev.inmo.tgbotapi.types.polls.Poll
-import dev.inmo.tgbotapi.types.polls.PollAnswer
-import dev.inmo.tgbotapi.types.polls.PollOption
-import dev.inmo.tgbotapi.types.polls.RegularPoll
-import dev.inmo.tgbotapi.utils.PreviewFeature
-import dev.inmo.tgbotapi.utils.extensions.escapeMarkdownV2Common
-import kotlinx.coroutines.*
-import kotlinx.coroutines.sync.Mutex
-import kotlinx.coroutines.sync.withLock
-
-/**
- * This bot will answer with anonymous or public poll and send message on
- * updates of any of it.
- * 
- * * Use `/anonymous` to take anonymous regular poll
- * * Use `/public` to take public regular poll
- */
-@OptIn(PreviewFeature::class)
-suspend fun main(vararg args: String) {
-    val botToken = args.first()
-
-    telegramBotWithBehaviourAndLongPolling(botToken, CoroutineScope(Dispatchers.IO)) {
-        val me = getMe()
-
-        val pollToChat = mutableMapOf<PollIdentifier, IdChatIdentifier>()
-        val pollToChatMutex = Mutex()
-
-        onCommand("anonymous") {
-            val sentPoll = sendRegularPoll(
-                it.chat,
-                "Test regular anonymous poll",
-                (1 .. 10).map {
-                    it.toString()
-                },
-                isAnonymous = true,
-                replyToMessageId = it.messageId
-            )
-            pollToChatMutex.withLock {
-                pollToChat[sentPoll.content.poll.id] = sentPoll.chat.id
-            }
-        }
-
-        onCommand("public") {
-            val sentPoll = sendRegularPoll(
-                it.chat,
-                "Test regular anonymous poll",
-                (1 .. 10).map {
-                    it.toString()
-                },
-                isAnonymous = false,
-                replyToMessageId = it.messageId
-            )
-            pollToChatMutex.withLock {
-                pollToChat[sentPoll.content.poll.id] = sentPoll.chat.id
-            }
-        }
-
-        onPollAnswer {
-            val chatId = pollToChat[it.pollId] ?: return@onPollAnswer
-
-            when(it) {
-                is PollAnswer.Public -> send(chatId, "[onPollAnswer] User ${it.user} have answered")
-                is PollAnswer.Anonymous -> send(chatId, "[onPollAnswer] Chat ${it.voterChat} have answered")
-            }
-        }
-
-        onPollUpdates {
-            val chatId = pollToChat[it.id] ?: return@onPollUpdates
-
-            when(it.isAnonymous) {
-                false -> send(chatId, "[onPollUpdates] Public poll updated: ${it.options.joinToString()}")
-                true -> send(chatId, "[onPollUpdates] Anonymous poll updated: ${it.options.joinToString()}")
-            }
-        }
-
-        allUpdatesFlow.subscribeSafelyWithoutExceptions(this) { println(it) }
-    }.second.join()
-}

RightsChangerBot/src/main/kotlin/RightsChanger.kt

@@ -1,4 +1,3 @@
-import dev.inmo.micro_utils.coroutines.runCatchingSafely
 import dev.inmo.tgbotapi.bot.ktor.telegramBot
 import dev.inmo.tgbotapi.extensions.api.bot.setMyCommands
 import dev.inmo.tgbotapi.extensions.api.chat.get.getChat
@@ -112,7 +111,7 @@ suspend fun main(args: Array<String>) {
 
     bot.buildBehaviourWithLongPolling(
         defaultExceptionsHandler = {
-            it.printStackTrace()
+            println(it)
         }
     ) {
         onCommand("simple", initialFilter = { it.chat is PublicChat && it.fromUserMessageOrNull() ?.user ?.id == allowedAdmin }) {

StickerSetHandler/src/main/kotlin/StickerSetHandlerBot.kt

@@ -32,7 +32,7 @@ suspend fun main(args: Array<String>) {
         }
     ) {
         val me = getMe()
-        fun Chat.stickerSetName() = "s${id.chatId}_by_${me.username ?.usernameWithoutAt}"
+        fun Chat.stickerSetName() = "s${id.chatId}_by_${me.username.usernameWithoutAt}"
         onCommand("start") {
             reply(it) {
                 botCommand("delete") + " - to clear stickers"

WebApp/src/jsMain/kotlin/main.kt

@@ -67,7 +67,7 @@ fun main() {
                         }
                     }
                 })
-                appendText("Exit button")
+                appendText("Example button")
             } ?: window.alert("Unable to load body")
 
             document.body ?.appendElement("p", {})

gradle.properties

@@ -4,8 +4,8 @@ org.gradle.parallel=true
 org.gradle.jvmargs=-Xmx2g
 
 
-kotlin_version=1.8.22
+kotlin_version=1.8.20
-telegram_bot_api_version=9.1.0
+telegram_bot_api_version=7.1.0
-micro_utils_version=0.19.9
+micro_utils_version=0.18.0-branch_0.18.0-build449
-serialization_version=1.5.1
+serialization_version=1.5.0
-ktor_version=2.3.3
+ktor_version=2.3.0

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

settings.gradle

@@ -4,8 +4,6 @@ include ":RandomFileSenderBot"
 
 include ":HelloBot"
 
-include ":PollsBot"
-
 include ":GetMeBot"
 
 include ":DeepLinksBot"