Update dependency dev.inmo:micro_utils.ktor.server to v0.26.1

FSMBot/src/main/kotlin/SimpleFSMBot.kt

@@ -1,13 +1,10 @@
-import dev.inmo.micro_utils.coroutines.awaitFirst
 import dev.inmo.micro_utils.coroutines.subscribeSafelyWithoutExceptions
 import dev.inmo.micro_utils.fsm.common.State
 import dev.inmo.tgbotapi.extensions.api.send.send
 import dev.inmo.tgbotapi.extensions.behaviour_builder.expectations.waitAnyContentMessage
-import dev.inmo.tgbotapi.extensions.behaviour_builder.expectations.waitCommandMessage
 import dev.inmo.tgbotapi.extensions.behaviour_builder.telegramBotWithBehaviourAndFSMAndStartLongPolling
 import dev.inmo.tgbotapi.extensions.behaviour_builder.triggers_handling.command
 import dev.inmo.tgbotapi.extensions.behaviour_builder.triggers_handling.onContentMessage
-import dev.inmo.tgbotapi.extensions.behaviour_builder.utils.containsCommand
 import dev.inmo.tgbotapi.extensions.utils.extensions.parseCommandsWithArgs
 import dev.inmo.tgbotapi.extensions.utils.extensions.sameThread
 import dev.inmo.tgbotapi.extensions.utils.textContentOrNull
@@ -16,12 +13,10 @@ import dev.inmo.tgbotapi.types.IdChatIdentifier
 import dev.inmo.tgbotapi.types.message.abstracts.CommonMessage
 import dev.inmo.tgbotapi.types.message.content.TextContent
 import dev.inmo.tgbotapi.utils.botCommand
-import dev.inmo.tgbotapi.utils.firstOf
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.filter
 import kotlinx.coroutines.flow.first
-import kotlinx.coroutines.flow.map
 
 sealed interface BotState : State
 data class ExpectContentOrStopState(override val context: IdChatIdentifier, val sourceMessage: CommonMessage<TextContent>) : BotState
@@ -53,29 +48,19 @@ suspend fun main(args: Array<String>) {
                 +"Send me some content or " + botCommand("stop") + " if you want to stop sending"
             }
 
-            val contentMessage = firstOf(
-                {
-                    waitCommandMessage("stop").filter { message ->
-                        message.sameThread(it.sourceMessage)
-                    }.first()
-                    null
-                },
-                {
-                    waitAnyContentMessage().filter { message ->
-                        message.sameThread(it.sourceMessage)
-                    }.filter {
-                        containsCommand(
-                            "stop",
-                            it.withContentOrNull<TextContent>() ?.content ?.textSources ?: return@filter false
-                        ) == false
-                    }.first()
-                }
-            ) ?: return@strictlyOn StopState(it.context)
-
+            val contentMessage = waitAnyContentMessage().filter { message ->
+                message.sameThread(it.sourceMessage)
+            }.first()
             val content = contentMessage.content
 
-            execute(content.createResend(it.context))
-            it
+            when {
+                content is TextContent && content.text == "/stop"
+                || content is TextContent && content.parseCommandsWithArgs().keys.contains("stop") -> StopState(it.context)
+                else -> {
+                    execute(content.createResend(it.context))
+                    it
+                }
+            }
         }
         strictlyOn<StopState> {
             send(it.context) { +"You have stopped sending of content" }

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

@@ -1,6 +1,3 @@
-import dev.inmo.kslog.common.KSLog
-import dev.inmo.kslog.common.defaultMessageFormatter
-import dev.inmo.kslog.common.filter.filtered
 import dev.inmo.micro_utils.coroutines.subscribeLoggingDropExceptions
 import dev.inmo.tgbotapi.extensions.api.bot.getMe
 import dev.inmo.tgbotapi.extensions.api.send.withTypingAction
@@ -13,9 +10,7 @@ import dev.inmo.tgbotapi.extensions.utils.withContentOrNull
 import dev.inmo.tgbotapi.types.ReplyParameters
 import dev.inmo.tgbotapi.types.message.abstracts.BusinessContentMessage
 import dev.inmo.tgbotapi.types.message.content.TextContent
-import dev.inmo.tgbotapi.utils.DefaultKTgBotAPIKSLog
 import dev.inmo.tgbotapi.utils.extensions.threadIdOrNull
-import kotlinx.coroutines.CancellationException
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.SupervisorJob
 import kotlinx.coroutines.currentCoroutineContext
@@ -24,10 +19,7 @@ suspend fun activateResenderBot(
     token: String,
     print: (Any) -> Unit
 ) {
-    telegramBotWithBehaviourAndLongPolling(
-        token,
-        scope = CoroutineScope(currentCoroutineContext() + SupervisorJob()),
-    ) {
+    telegramBotWithBehaviourAndLongPolling(token, scope = CoroutineScope(currentCoroutineContext() + SupervisorJob())) {
         onContentMessage(
             subcontextUpdatesFilter = MessageFilterByChat,
             initialFilter = { it !is BusinessContentMessage<*> || !it.sentByBusinessConnectionOwner }

RightsChangerBot/build.gradle

@@ -18,5 +18,5 @@ dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
 
     implementation "dev.inmo:tgbotapi:$telegram_bot_api_version"
-    implementation 'io.ktor:ktor-client-logging-jvm:3.2.3'
+    implementation 'io.ktor:ktor-client-logging-jvm:3.1.0'
 }

gradle.properties

@@ -5,9 +5,9 @@ org.gradle.jvmargs=-Xmx3148m
 kotlin.daemon.jvmargs=-Xmx3g -Xms500m
 
 
-kotlin_version=2.2.0
-telegram_bot_api_version=28.0.0
-micro_utils_version=0.26.2
-serialization_version=1.9.0
-ktor_version=3.2.3
-compose_version=1.8.2
+kotlin_version=2.1.20
+telegram_bot_api_version=26.1.0
+micro_utils_version=0.26.1
+serialization_version=1.8.1
+ktor_version=3.1.3
+compose_version=1.8.0