Merge 91837c0ea2 into 9170d30b2f

10.1.0

InlineQueriesBot/build.gradle

@@ -33,6 +33,6 @@ kotlin {
 }
 
 dependencies {
-    implementation 'io.ktor:ktor-client-logging-jvm:2.3.7'
+    implementation 'io.ktor:ktor-client-logging-jvm:2.3.8'
 }
 

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:2.3.7'
+    implementation 'io.ktor:ktor-client-logging-jvm:2.3.8'
 }

RightsChangerBot/src/main/kotlin/RightsChanger.kt

@@ -1,4 +1,9 @@
+import dev.inmo.kslog.common.KSLog
+import dev.inmo.kslog.common.LogLevel
+import dev.inmo.kslog.common.defaultMessageFormatter
+import dev.inmo.kslog.common.setDefaultKSLog
 import dev.inmo.micro_utils.coroutines.firstOf
+import dev.inmo.micro_utils.coroutines.subscribeSafelyWithoutExceptions
 import dev.inmo.micro_utils.fsm.common.State
 import dev.inmo.tgbotapi.bot.ktor.telegramBot
 import dev.inmo.tgbotapi.extensions.api.bot.setMyCommands
@@ -50,6 +55,16 @@ sealed interface UserRetrievingStep : State {
 suspend fun main(args: Array<String>) {
     val botToken = args.first()
 
+    val isDebug = args.getOrNull(2) == "debug"
+
+    if (isDebug) {
+        setDefaultKSLog(
+            KSLog { level: LogLevel, tag: String?, message: Any, throwable: Throwable? ->
+                println(defaultMessageFormatter(level, tag, message, throwable))
+            }
+        )
+    }
+
     val bot = telegramBot(botToken)
 
     val allowedAdmin = ChatId(args[1].toLong())
@@ -517,5 +532,9 @@ suspend fun main(args: Array<String>) {
             BotCommand("rights_in_channel", "Trigger granular keyboard. Use with reply to user"),
             scope = BotCommandScope.AllGroupChats
         )
+
+        allUpdatesFlow.subscribeSafelyWithoutExceptions(this) {
+            println(it)
+        }
     }.join()
 }

gradle.properties

@@ -5,7 +5,7 @@ org.gradle.jvmargs=-Xmx2344m
 
 
 kotlin_version=1.9.22
-telegram_bot_api_version=10.0.0
-micro_utils_version=0.20.26
-serialization_version=1.6.2
-ktor_version=2.3.7
+telegram_bot_api_version=10.1.1
+micro_utils_version=0.20.37
+serialization_version=1.6.3
+ktor_version=2.3.8

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