diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 9f6d625ffe..ad3af12e33 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -13,7 +13,7 @@ ktor = "3.2.1" ksp = "2.2.0-2.0.2" kotlin-poet = "2.0.0" -microutils = "0.26.0" +microutils = "0.26.1" kslog = "1.5.0" versions = "0.52.0" diff --git a/tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/triggers_handling/MainTrigger.kt b/tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/triggers_handling/MainTrigger.kt index 091fc209c9..4eed163996 100644 --- a/tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/triggers_handling/MainTrigger.kt +++ b/tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/triggers_handling/MainTrigger.kt @@ -3,6 +3,8 @@ package dev.inmo.tgbotapi.extensions.behaviour_builder.triggers_handling import dev.inmo.micro_utils.coroutines.SpecialMutableStateFlow +import dev.inmo.micro_utils.coroutines.runCatchingLogging +import dev.inmo.micro_utils.coroutines.subscribeAsync import dev.inmo.micro_utils.coroutines.subscribeLoggingDropExceptions import dev.inmo.micro_utils.coroutines.subscribeSafelyWithoutExceptionsAsync import dev.inmo.tgbotapi.extensions.behaviour_builder.* @@ -69,12 +71,16 @@ internal fun BC.on( createSubContextAndDoSynchronouslyWithUpdatesFilter(behaviourContextReceiver = { scenarioReceiver(triggerData) }) } markerFactory ?.let { - subscribeSafelyWithoutExceptionsAsync( + subscribeAsync( scope, { markerFactory(it.second) }, - block = handler - ) - } ?: subscribeLoggingDropExceptions(scope) { + logger = Log + ) { + runCatchingLogging(logger = Log) { + handler(it) + } + } + } ?: subscribeLoggingDropExceptions(scope, logger = Log) { scope.launchWithBotLogger { handler(it) } diff --git a/tgbotapi.ksp/src/main/kotlin/ClassCastsFiller.kt b/tgbotapi.ksp/src/main/kotlin/ClassCastsFiller.kt index ddceb473df..63a9976d5c 100644 --- a/tgbotapi.ksp/src/main/kotlin/ClassCastsFiller.kt +++ b/tgbotapi.ksp/src/main/kotlin/ClassCastsFiller.kt @@ -1,7 +1,8 @@ +@file:Suppress("OPT_IN_USAGE") + package dev.inmo.tgbotapi.ksp.processor import com.google.devtools.ksp.KspExperimental -import com.google.devtools.ksp.getAnnotationsByType import com.google.devtools.ksp.isAnnotationPresent import com.google.devtools.ksp.symbol.* import com.squareup.kotlinpoet.* diff --git a/tgbotapi.webapps/src/jsMain/kotlin/dev/inmo/tgbotapi/webapps/WebAppInitData.kt b/tgbotapi.webapps/src/jsMain/kotlin/dev/inmo/tgbotapi/webapps/WebAppInitData.kt index 1fe1f572a4..3b60a9bf15 100644 --- a/tgbotapi.webapps/src/jsMain/kotlin/dev/inmo/tgbotapi/webapps/WebAppInitData.kt +++ b/tgbotapi.webapps/src/jsMain/kotlin/dev/inmo/tgbotapi/webapps/WebAppInitData.kt @@ -1,3 +1,5 @@ +@file:Suppress("INLINE_CLASS_IN_EXTERNAL_DECLARATION_WARNING") + package dev.inmo.tgbotapi.webapps import dev.inmo.tgbotapi.types.* diff --git a/tgbotapi.webapps/src/jsMain/kotlin/dev/inmo/tgbotapi/webapps/WebAppUser.kt b/tgbotapi.webapps/src/jsMain/kotlin/dev/inmo/tgbotapi/webapps/WebAppUser.kt index cc7bc6985e..f70b521906 100644 --- a/tgbotapi.webapps/src/jsMain/kotlin/dev/inmo/tgbotapi/webapps/WebAppUser.kt +++ b/tgbotapi.webapps/src/jsMain/kotlin/dev/inmo/tgbotapi/webapps/WebAppUser.kt @@ -1,3 +1,5 @@ +@file:Suppress("INLINE_CLASS_IN_EXTERNAL_DECLARATION_WARNING") + package dev.inmo.tgbotapi.webapps import dev.inmo.micro_utils.language_codes.IetfLang