update dependendencies

FSMBot/src/main/kotlin/SimpleFSMBot.kt

@@ -8,7 +8,7 @@ import dev.inmo.tgbotapi.extensions.behaviour_builder.triggers_handling.*
 import dev.inmo.tgbotapi.extensions.utils.extensions.parseCommandsWithParams
 import dev.inmo.tgbotapi.extensions.utils.extensions.sameThread
 import dev.inmo.tgbotapi.extensions.utils.formatting.*
-import dev.inmo.tgbotapi.types.IdChatIdentifier
+import dev.inmo.tgbotapi.types.ChatId
 import dev.inmo.tgbotapi.types.MessageThreadId
 import dev.inmo.tgbotapi.types.message.abstracts.CommonMessage
 import dev.inmo.tgbotapi.types.message.content.TextContent
@@ -19,8 +19,8 @@ import kotlinx.coroutines.flow.filter
 import kotlinx.coroutines.flow.first
 
 sealed interface BotState : State
-data class ExpectContentOrStopState(override val context: IdChatIdentifier, val sourceMessage: CommonMessage<TextContent>) : BotState
-data class StopState(override val context: IdChatIdentifier) : BotState
+data class ExpectContentOrStopState(override val context: Pair<ChatId, MessageThreadId?>, val sourceMessage: CommonMessage<TextContent>) : BotState
+data class StopState(override val context: Pair<ChatId, MessageThreadId?>) : BotState
 
 suspend fun main(args: Array<String>) {
     val botToken = args.first()
@@ -43,7 +43,8 @@ suspend fun main(args: Array<String>) {
     ) {
         strictlyOn<ExpectContentOrStopState> {
             send(
-                it.context,
+                it.context.first,
+                threadId = it.context.second
             ) {
                 +"Send me some content or " + botCommand("stop") + " if you want to stop sending"
             }
@@ -56,13 +57,13 @@ suspend fun main(args: Array<String>) {
             when {
                 content is TextContent && content.parseCommandsWithParams().keys.contains("stop") -> StopState(it.context)
                 else -> {
-                    execute(content.createResend(it.context))
+                    execute(content.createResend(it.context.first, messageThreadId = it.context.second))
                     it
                 }
             }
         }
         strictlyOn<StopState> {
-            send(it.context) { +"You have stopped sending of content" }
+            send(it.context.first, threadId = it.context.second) { +"You have stopped sending of content" }
 
             null
         }
@@ -70,7 +71,7 @@ suspend fun main(args: Array<String>) {
         command(
             "start"
         ) {
-            startChain(ExpectContentOrStopState(it.chat.id, it))
+            startChain(ExpectContentOrStopState(it.chat.id to it.threadIdOrNull, it))
         }
     }.second.join()
 }

TopicsHandling/README.md

@@ -1,9 +0,0 @@
-# HelloBot
-
-The main purpose of this bot is just to answer "Oh, hi, " and add user mention here
-
-## Launch
-
-```bash
-../gradlew run --args="BOT_TOKEN"
-```

TopicsHandling/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="TopicsHandlingKt"
-
-
-dependencies {
-    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-
-    implementation "dev.inmo:tgbotapi:$telegram_bot_api_version"
-}

TopicsHandling/src/main/kotlin/TopicsHandling.kt

@@ -1,145 +0,0 @@
-import com.benasher44.uuid.uuid4
-import dev.inmo.micro_utils.common.repeatOnFailure
-import dev.inmo.micro_utils.coroutines.runCatchingSafely
-import dev.inmo.micro_utils.coroutines.subscribeSafelyWithoutExceptions
-import dev.inmo.tgbotapi.extensions.api.bot.setMyCommands
-import dev.inmo.tgbotapi.extensions.api.chat.forum.closeForumTopic
-import dev.inmo.tgbotapi.extensions.api.chat.forum.closeGeneralForumTopic
-import dev.inmo.tgbotapi.extensions.api.chat.forum.createForumTopic
-import dev.inmo.tgbotapi.extensions.api.chat.forum.deleteForumTopic
-import dev.inmo.tgbotapi.extensions.api.chat.forum.editForumTopic
-import dev.inmo.tgbotapi.extensions.api.chat.forum.editGeneralForumTopic
-import dev.inmo.tgbotapi.extensions.api.chat.forum.hideGeneralForumTopic
-import dev.inmo.tgbotapi.extensions.api.chat.forum.reopenForumTopic
-import dev.inmo.tgbotapi.extensions.api.chat.forum.reopenGeneralForumTopic
-import dev.inmo.tgbotapi.extensions.api.chat.forum.unhideGeneralForumTopic
-import dev.inmo.tgbotapi.extensions.api.send.reply
-import dev.inmo.tgbotapi.extensions.behaviour_builder.telegramBotWithBehaviourAndLongPolling
-import dev.inmo.tgbotapi.extensions.behaviour_builder.triggers_handling.onCommand
-import dev.inmo.tgbotapi.extensions.utils.updates.retrieving.flushAccumulatedUpdates
-import dev.inmo.tgbotapi.types.BotCommand
-import dev.inmo.tgbotapi.types.ForumTopic
-import dev.inmo.tgbotapi.types.commands.BotCommandScope
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.delay
-
-suspend fun main(vararg args: String) {
-    telegramBotWithBehaviourAndLongPolling(
-        args.first(),
-        CoroutineScope(Dispatchers.Default),
-        defaultExceptionsHandler = {
-            it.printStackTrace()
-        }
-    ) {
-        flushAccumulatedUpdates()
-        allUpdatesFlow.subscribeSafelyWithoutExceptions(this) {
-            println(it)
-        }
-        onCommand("start_test_topics") {
-            val forumTopic = createForumTopic(
-                it.chat,
-                "Test",
-                ForumTopic.GREEN
-            )
-
-            reply(it, "Test topic has been created")
-
-            delay(1000L)
-            editForumTopic(
-                it.chat.id,
-                forumTopic.messageThreadId,
-                "Test 01"
-            )
-
-            reply(it, "Test topic has changed its name to Test 01")
-
-            delay(1000L)
-            closeForumTopic(
-                it.chat.id,
-                forumTopic.messageThreadId,
-            )
-
-            reply(it, "Test topic has been closed")
-
-            delay(1000L)
-            reopenForumTopic(
-                it.chat.id,
-                forumTopic.messageThreadId,
-            )
-
-            reply(it, "Test topic has been reopened")
-
-            delay(1000L)
-            deleteForumTopic(
-                it.chat.id,
-                forumTopic.messageThreadId,
-            )
-
-            reply(it, "Test topic has been deleted")
-
-            delay(1000L)
-            hideGeneralForumTopic(
-                it.chat.id,
-            )
-
-            reply(it, "General topic has been hidden")
-
-            delay(1000L)
-            unhideGeneralForumTopic(
-                it.chat.id
-            )
-
-            reply(it, "General topic has been shown")
-
-            delay(1000L)
-            runCatchingSafely(
-                { _ ->
-                    reopenGeneralForumTopic(
-                        it.chat.id
-                    )
-
-                    closeGeneralForumTopic(
-                        it.chat.id
-                    )
-                }
-            ) {
-                closeGeneralForumTopic(
-                    it.chat.id
-                )
-            }
-
-            reply(it, "General topic has been closed")
-
-            delay(1000L)
-            reopenGeneralForumTopic(
-                it.chat.id
-            )
-
-            reply(it, "General topic has been opened")
-
-            delay(1000L)
-            editGeneralForumTopic(
-                it.chat.id,
-                uuid4().toString().take(10)
-            )
-
-            reply(it, "General topic has been renamed")
-
-            delay(1000L)
-            editGeneralForumTopic(
-                it.chat.id,
-                "Main topic"
-            )
-
-            reply(it, "General topic has been renamed")
-
-            delay(1000L)
-        }
-
-        setMyCommands(
-            BotCommand("start_test_topics", "start test topics"),
-            scope = BotCommandScope.AllGroupChats
-        )
-    }.second.join()
-}

build.gradle

@@ -22,7 +22,5 @@ allprojects {
                 }
             }
         }
-
-        maven { url "https://git.inmo.dev/api/packages/InsanusMokrassar/maven" }
     }
 }

gradle.properties

@@ -4,8 +4,8 @@ org.gradle.parallel=true
 org.gradle.jvmargs=-Xmx768m
 
 
-kotlin_version=1.7.22
-telegram_bot_api_version=5.0.0
-micro_utils_version=0.16.4
+kotlin_version=1.7.21
+telegram_bot_api_version=4.1.0
+micro_utils_version=0.14.1
 serialization_version=1.4.1
-ktor_version=2.2.1
+ktor_version=2.1.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.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip

settings.gradle

@@ -26,5 +26,3 @@ include ":ChatAvatarSetter"
 include ":WebApp"
 
 include ":FSMBot"
-
-include ":TopicsHandling"