Update CHANGELOG.md

24.0.1

CHANGELOG.md

@@ -1,5 +1,22 @@
 # TelegramBotAPI changelog
 
+## 24.0.2
+
+* `Version`:
+  * `Kotlin`: `2.1.10` -> `2.1.20`
+  * `Ktor`: `3.1.0` -> `3.1.1`
+  * `MicroUtils`: `0.24.7` -> `0.25.3`
+* `DefaultKTgBotAPIKSLog` will drop `CancellationException`s by default
+* You may configure `DefaultKTgBotAPIKSLog` in simple way with `SetDefaultKTgBotAPIKSLog`
+* `BehaviourBuilder`:
+  * `FSM`:
+    * Fix chains cancelling on their ends
+
+## 24.0.1
+
+* `Core`:
+  * Now you may upload photos with `EditChatMessageMedia`
+
 ## 24.0.0
 
 **THIS UPDATE CONTAINS BREAKING CHANGES IN `subcontextUpdatesFilter` WORK. TAKE CARE IN MIGRATION**

gradle.properties

@@ -6,4 +6,4 @@ kotlin.incremental=true
 kotlin.incremental.js=true
 
 library_group=dev.inmo
-library_version=24.0.0
+library_version=24.0.2

gradle/libs.versions.toml

@@ -1,6 +1,6 @@
 [versions]
 
-kotlin = "2.1.10"
+kotlin = "2.1.20"
 kotlin-serialization = "1.8.0"
 kotlin-coroutines = "1.10.1"
 
@@ -8,12 +8,12 @@ javax-activation = "1.1.1"
 
 korlibs = "5.4.0"
 uuid = "0.8.4"
-ktor = "3.1.0"
+ktor = "3.1.1"
 
-ksp = "2.1.10-1.0.30"
+ksp = "2.1.20-1.0.31"
 kotlin-poet = "1.18.1"
 
-microutils = "0.24.7"
+microutils = "0.25.3"
 kslog = "1.4.1"
 
 versions = "0.51.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-8.11.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip

tgbotapi.behaviour_builder.fsm/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/BehaviourContextWithFSM.kt

@@ -144,10 +144,12 @@ class DefaultBehaviourContextWithFSM<T : State>(
             state.context
         ).apply {
             stateInitialAction(state)
-        }.launchStateHandling(
+        }.run {
-            state,
+            launchStateHandling(
-            actualHandlersList
+                state,
-        )
+                actualHandlersList
+            )
+        }
     }
 
     override fun <I : T> add(kClass: KClass<I>, strict: Boolean, handler: BehaviourWithFSMStateHandler<I, T>) {
@@ -188,7 +190,7 @@ class DefaultBehaviourContextWithFSM<T : State>(
             statesJobsMutex.withLock {
                 runCatchingSafely { statesJobs.remove(it) ?.cancel() }
             }
-            updatesFlows.remove(it.context)
+            updatesFlows.remove(it.context) ?.cancel()
         }
         statesManager.onChainStateUpdated.subscribeSafelyWithoutExceptions(this) { (old, new) ->
             statesJobsMutex.withLock {
@@ -197,7 +199,7 @@ class DefaultBehaviourContextWithFSM<T : State>(
                 statesJobs[new] = launch { statePerformer(new) }.apply { enableRemoveOnCompletion(new) }
             }
             if (old.context != new.context) {
-                updatesFlows.remove(old.context)
+                updatesFlows.remove(old.context) ?.cancel()
             }
         }
 

tgbotapi.core/api/tgbotapi.core.api

@@ -432,6 +432,7 @@ public final class dev/inmo/tgbotapi/bot/ktor/base/MultipartRequestCallFactory :
 	public fun <init> ()V
 	public fun <init> (Ldev/inmo/kslog/common/KSLog;)V
 	public synthetic fun <init> (Ldev/inmo/kslog/common/KSLog;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public fun makeCall (Lio/ktor/client/HttpClient;Ldev/inmo/tgbotapi/utils/TelegramAPIUrlsKeeper;Ldev/inmo/tgbotapi/requests/abstracts/Request;Lkotlinx/serialization/json/Json;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 }
 
 public final class dev/inmo/tgbotapi/bot/ktor/base/MultipleClientKtorRequestsExecutor : dev/inmo/tgbotapi/bot/BaseRequestsExecutor {
@@ -3895,7 +3896,7 @@ public final class dev/inmo/tgbotapi/requests/edit/location/live/StopInlineMessa
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
 }
 
-public final class dev/inmo/tgbotapi/requests/edit/media/EditChatMessageMedia : dev/inmo/tgbotapi/requests/edit/abstracts/EditChatMessage, dev/inmo/tgbotapi/requests/edit/abstracts/EditMediaMessage, dev/inmo/tgbotapi/requests/edit/abstracts/EditReplyMessage {
+public final class dev/inmo/tgbotapi/requests/edit/media/EditChatMessageMedia : dev/inmo/tgbotapi/requests/abstracts/MultipartRequest$Common, dev/inmo/tgbotapi/requests/edit/abstracts/EditChatMessage, dev/inmo/tgbotapi/requests/edit/abstracts/EditMediaMessage, dev/inmo/tgbotapi/requests/edit/abstracts/EditReplyMessage {
 	public static final field Companion Ldev/inmo/tgbotapi/requests/edit/media/EditChatMessageMedia$Companion;
 	public synthetic fun <init> (Ldev/inmo/tgbotapi/types/ChatIdentifier;JLdev/inmo/tgbotapi/types/media/TelegramFreeMedia;Ljava/lang/String;Ldev/inmo/tgbotapi/types/buttons/InlineKeyboardMarkup;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public synthetic fun <init> (Ldev/inmo/tgbotapi/types/ChatIdentifier;JLdev/inmo/tgbotapi/types/media/TelegramFreeMedia;Ljava/lang/String;Ldev/inmo/tgbotapi/types/buttons/InlineKeyboardMarkup;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
@@ -3909,8 +3910,11 @@ public final class dev/inmo/tgbotapi/requests/edit/media/EditChatMessageMedia :
 	public fun equals (Ljava/lang/Object;)Z
 	public fun getBusinessConnectionId-nXr5wdE ()Ljava/lang/String;
 	public fun getChatId ()Ldev/inmo/tgbotapi/types/ChatIdentifier;
+	public fun getData ()Ldev/inmo/tgbotapi/requests/abstracts/SimpleRequest;
 	public fun getMedia ()Ldev/inmo/tgbotapi/types/media/TelegramFreeMedia;
+	public fun getMediaMap ()Ljava/util/Map;
 	public fun getMessageId-APLFQys ()J
+	public fun getParamsJson ()Lkotlinx/serialization/json/JsonObject;
 	public fun getReplyMarkup ()Ldev/inmo/tgbotapi/types/buttons/InlineKeyboardMarkup;
 	public synthetic fun getReplyMarkup ()Ldev/inmo/tgbotapi/types/buttons/KeyboardMarkup;
 	public fun getRequestSerializer ()Lkotlinx/serialization/SerializationStrategy;
@@ -27143,6 +27147,8 @@ public final class dev/inmo/tgbotapi/utils/ByteReadChannelAllocatorDeserializati
 }
 
 public final class dev/inmo/tgbotapi/utils/DefaultKSLogKt {
+	public static final fun SetDefaultKTgBotAPIKSLog (ZLkotlin/jvm/functions/Function1;)V
+	public static synthetic fun SetDefaultKTgBotAPIKSLog$default (ZLkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
 	public static final fun getDefaultKTgBotAPIKSLog ()Ldev/inmo/kslog/common/KSLog;
 	public static final fun getDefaultKTgBotAPIKSLogSystemTag ()Ljava/lang/String;
 	public static final fun setDefaultKTgBotAPIKSLog (Ldev/inmo/kslog/common/KSLog;)V

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/bot/ktor/KtorRequestsExecutorFactories.kt

@@ -12,8 +12,8 @@ import kotlinx.serialization.json.Json
 
 @RiskFeature
 fun createTelegramBotDefaultKtorCallRequestsFactories(logger: KSLog? = null) = listOf(
-    SimpleRequestCallFactory(logger),
     MultipartRequestCallFactory(logger),
+    SimpleRequestCallFactory(logger),
     DownloadFileRequestCallFactory,
     DownloadFileChannelRequestCallFactory
 )

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/bot/ktor/base/MultipartRequestCallFactory.kt

@@ -9,8 +9,23 @@ import io.ktor.client.HttpClient
 import io.ktor.client.request.forms.*
 import io.ktor.http.Headers
 import io.ktor.http.HttpHeaders
+import kotlinx.serialization.json.Json
 
 class MultipartRequestCallFactory(logger: KSLog? = null) : AbstractRequestCallFactory(logger ?: DefaultKTgBotAPIKSLog) {
+    private val localSimpleRequestCallFactory = SimpleRequestCallFactory(logger)
+    override suspend fun <T : Any> makeCall(
+        client: HttpClient,
+        urlsKeeper: TelegramAPIUrlsKeeper,
+        request: Request<T>,
+        jsonFormatter: Json
+    ): T? {
+        return when (request) {
+            !is MultipartRequest -> null
+            is MultipartRequest.Common -> localSimpleRequestCallFactory.makeCall(client, urlsKeeper, request.data, jsonFormatter)
+            else -> super.makeCall(client, urlsKeeper, request, jsonFormatter)
+        }
+    }
+
     override fun <T : Any> prepareCallBody(
         client: HttpClient,
         urlsKeeper: TelegramAPIUrlsKeeper,

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/edit/media/EditChatMessageMedia.kt

@@ -1,6 +1,8 @@
 package dev.inmo.tgbotapi.requests.edit.media
 
 import dev.inmo.tgbotapi.requests.abstracts.MultipartFile
+import dev.inmo.tgbotapi.requests.abstracts.MultipartRequest
+import dev.inmo.tgbotapi.requests.abstracts.SimpleRequest
 import dev.inmo.tgbotapi.requests.edit.abstracts.*
 import dev.inmo.tgbotapi.types.*
 import dev.inmo.tgbotapi.types.business_connection.BusinessConnectionId
@@ -27,14 +29,21 @@ data class EditChatMessageMedia(
     override val businessConnectionId: BusinessConnectionId? = chatId.businessConnectionId,
     @SerialName(replyMarkupField)
     override val replyMarkup: InlineKeyboardMarkup? = null
-) : EditChatMessage<MediaContent>, EditReplyMessage, EditMediaMessage {
+) : EditChatMessage<MediaContent>, EditReplyMessage, EditMediaMessage, MultipartRequest.Common<ContentMessage<MediaContent>> {
-
+    override val data: SimpleRequest<ContentMessage<MediaContent>>
-    init {
+        get() = this
-        if (media.file is MultipartFile) {
+    override val mediaMap: Map<String, MultipartFile> by lazy {
-            throw IllegalArgumentException("For editing of media messages you MUST use file id (according to documentation)")
+        (media.file as? MultipartFile) ?.let {
-        }
+            mapOf(it.fileId to it)
+        } ?: emptyMap()
     }
 
+//    init {
+//        if (media.file is MultipartFile) {
+//            throw IllegalArgumentException("For editing of media messages you MUST use file id (according to documentation)")
+//        }
+//    }
+
     override fun method(): String = editMessageMediaMethod
     override val resultDeserializer: DeserializationStrategy<ContentMessage<MediaContent>>
         get() = MediaContentMessageResultDeserializer

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/utils/DefaultKSLog.kt

@@ -2,18 +2,59 @@ package dev.inmo.tgbotapi.utils
 
 import dev.inmo.kslog.common.KSLog
 import dev.inmo.kslog.common.LogLevel
+import dev.inmo.kslog.common.MessageFilter
 import dev.inmo.kslog.common.TagLogger
+import dev.inmo.kslog.common.filter.filtered
+import kotlinx.coroutines.CancellationException
 
 /**
  * Default tag for [DefaultKTgBotAPIKSLog]. You may change it and tag will be changed since the near logging
  */
 var DefaultKTgBotAPIKSLogSystemTag: String = "KTgBot"
+
+private inline fun CreateDefaultKSLogger(
+    crossinline loggerTagGetter: () -> String,
+    dropCancellationExceptions: Boolean = true,
+    noinline additionalLoggerMapper: (KSLog.() -> KSLog)? = null
+): KSLog {
+    val filter: MessageFilter? = if (dropCancellationExceptions) {
+        { ll, message, e ->
+            e !is CancellationException
+        }
+    } else {
+        null
+    }
+    return KSLog { level: LogLevel, tag: String?, message: Any, throwable: Throwable? ->
+        TagLogger(loggerTagGetter()).performLog(level, tag, message, throwable)
+    }.let {
+        if (filter == null) {
+            additionalLoggerMapper ?.invoke(it) ?: it
+        } else {
+            val base = it.filtered(filter)
+            additionalLoggerMapper ?.invoke(base) ?: base
+        }
+    }
+}
 /**
  * Default realization of [KSLog] which will be used everywhere where there is no some custom variant of [KSLog]
  *
  * By default, uses [KSLog] factory with lambda and tag [DefaultKTgBotAPIKSLogSystemTag] (which in fact falling back to
  * [KSLog.default] with `KTgBot` default tag)
+ *
+ * @see SetDefaultKTgBotAPIKSLog
  */
-var DefaultKTgBotAPIKSLog: KSLog = KSLog { level: LogLevel, tag: String?, message: Any, throwable: Throwable? ->
+var DefaultKTgBotAPIKSLog: KSLog = CreateDefaultKSLogger({ DefaultKTgBotAPIKSLogSystemTag } )
-    TagLogger(DefaultKTgBotAPIKSLogSystemTag).performLog(level, tag, message, throwable)
+
+/**
+ * Setting [DefaultKTgBotAPIKSLog] with applying of [dropCancellationExceptions] and [additionalFilter] to it
+ *
+ * @param dropCancellationExceptions Will drap coroutines job [CancellationException]s
+ * @param additionalLoggerMapper Receives [KSLog] to allow you to use extensions like [filtered]. Returned
+ * [KSLog] will be used as the result [KSLog] in [DefaultKTgBotAPIKSLog]
+ */
+fun SetDefaultKTgBotAPIKSLog(
+    dropCancellationExceptions: Boolean = true,
+    additionalLoggerMapper: (KSLog.() -> KSLog)? = null
+) {
+    DefaultKTgBotAPIKSLog = CreateDefaultKSLogger({ DefaultKTgBotAPIKSLogSystemTag }, dropCancellationExceptions, additionalLoggerMapper)
 }