Merge pull request #1000 from InsanusMokrassar/28.0.1

28.0.1
2025-10-24 16:50:13 +00:00 · 2025-09-04 16:38:10 +06:00
parent 2bbd2e0679 514bc699dd
commit d469a88791
27 changed files with 67 additions and 7 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,14 @@
 # TelegramBotAPI changelog

+## 28.0.1
+
+* `Version`:
+    * `Kotlin`: `2.2.0` -> `2.2.10`
+    * `MicroUtils`: `0.26.2` -> `0.26.3`
+    * `Ktor`: `3.2.2` -> `3.2.3`
+* `Core`:
+  * Let all `OptionallyMessageThreadRequest` inheritors to use `@EncodeDefault` annotation to fix default value passing
+
 ## 28.0.0

 **THIS UPDATE CONTAINS BREAKING CHANGES**
--- a/gradle.properties
+++ b/gradle.properties
@@ -9,4 +9,4 @@ kotlin.incremental.js=true
 ksp.useKSP2=false

 library_group=dev.inmo
-library_version=28.0.0
+library_version=28.0.1
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,6 +1,6 @@
 [versions]

-kotlin = "2.2.0"
+kotlin = "2.2.10"
 kotlin-serialization = "1.9.0"
 kotlin-coroutines = "1.10.2"

@@ -8,12 +8,12 @@ javax-activation = "1.1.1"

 korlibs = "5.4.0"
 uuid = "0.8.4"
-ktor = "3.2.2"
+ktor = "3.2.3"

-ksp = "2.2.0-2.0.2"
+ksp = "2.2.10-2.0.2"
 kotlin-poet = "2.2.0"

-microutils = "0.26.2"
+microutils = "0.26.3"
 kslog = "1.5.0"

 versions = "0.52.0"
@@ -22,7 +22,7 @@ github-release-plugin = "2.5.2"
 dokka = "2.0.0"

 validator = "0.18.1"
-nmcp = "1.0.2"
+nmcp = "1.1.0"

 [libraries]

--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/ForwardMessage.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/ForwardMessage.kt
@@ -20,7 +20,9 @@ data class ForwardMessage(
    val toChatId: ChatIdentifier,
    @SerialName(messageIdField)
    override val messageId: MessageId,
+    @OptIn(ExperimentalSerializationApi::class)
    @SerialName(messageThreadIdField)
+    @EncodeDefault
    override val threadId: MessageThreadId? = toChatId.threadId,
    @SerialName(videoStartTimestampField)
    override val startTimestamp: Seconds? = null,
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/ForwardMessages.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/ForwardMessages.kt
@@ -35,7 +35,9 @@ data class ForwardMessages (
    val fromChatId: ChatIdentifier,
    @SerialName(messageIdsField)
    override val messageIds: List<MessageId>,
+    @OptIn(ExperimentalSerializationApi::class)
    @SerialName(messageThreadIdField)
+    @EncodeDefault
    override val threadId: MessageThreadId? = toChatId.threadId,
    @SerialName(disableNotificationField)
    override val disableNotification: Boolean = false,
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/CopyMessage.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/CopyMessage.kt
@@ -160,7 +160,9 @@ data class CopyMessage internal constructor(
    private val rawEntities: List<RawMessageEntity>? = null,
    @SerialName(showCaptionAboveMediaField)
    override val showCaptionAboveMedia: Boolean = false,
+    @OptIn(ExperimentalSerializationApi::class)
    @SerialName(messageThreadIdField)
+    @EncodeDefault
    override val threadId: MessageThreadId? = toChatId.threadId,
    @SerialName(videoStartTimestampField)
    override val startTimestamp: Seconds? = null,
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/CopyMessages.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/CopyMessages.kt
@@ -40,7 +40,9 @@ data class CopyMessages (
    val fromChatId: ChatIdentifier,
    @SerialName(messageIdsField)
    override val messageIds: List<MessageId>,
+    @OptIn(ExperimentalSerializationApi::class)
    @SerialName(messageThreadIdField)
+    @EncodeDefault
    override val threadId: MessageThreadId? = toChatId.threadId,
    @SerialName(disableNotificationField)
    override val disableNotification: Boolean = false,
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/SendAction.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/SendAction.kt
@@ -18,7 +18,9 @@ data class SendAction(
    override val chatId: ChatIdentifier,
    @SerialName(actionField)
    val action: BotAction,
+    @OptIn(ExperimentalSerializationApi::class)
    @SerialName(messageThreadIdField)
+    @EncodeDefault
    override val threadId: MessageThreadId? = chatId.threadId,
    @SerialName(businessConnectionIdField)
    override val businessConnectionId: BusinessConnectionId? = chatId.businessConnectionId
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/SendContact.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/SendContact.kt
@@ -24,7 +24,9 @@ data class SendContact(
    val firstName: String,
    @SerialName(lastNameField)
    val lastName: String? = null,
+    @OptIn(ExperimentalSerializationApi::class)
    @SerialName(messageThreadIdField)
+    @EncodeDefault
    override val threadId: MessageThreadId? = chatId.threadId,
    @SerialName(businessConnectionIdField)
    override val businessConnectionId: BusinessConnectionId? = chatId.businessConnectionId,
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/SendDice.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/SendDice.kt
@@ -23,7 +23,9 @@ data class SendDice(
    override val chatId: ChatIdentifier,
    @SerialName(emojiField)
    val animationType: DiceAnimationType? = null,
+    @OptIn(ExperimentalSerializationApi::class)
    @SerialName(messageThreadIdField)
+    @EncodeDefault
    override val threadId: MessageThreadId? = chatId.threadId,
    @SerialName(businessConnectionIdField)
    override val businessConnectionId: BusinessConnectionId? = chatId.businessConnectionId,
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/SendLocation.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/SendLocation.kt
@@ -139,8 +139,8 @@ sealed interface SendLocation<T : LocationContent> : SendContentMessageRequest<C
        override val heading: Degrees? = null,
        @SerialName(proximityAlertRadiusField)
        override val proximityAlertRadius: Meters? = null,
-        @SerialName(messageThreadIdField)
        @OptIn(ExperimentalSerializationApi::class)
+        @SerialName(messageThreadIdField)
        @EncodeDefault
        override val threadId: MessageThreadId? = chatId.threadId,
        @SerialName(businessConnectionIdField)
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/SendMessage.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/SendMessage.kt
@@ -89,7 +89,9 @@ data class SendTextMessage internal constructor(
    override val parseMode: ParseMode? = null,
    @SerialName(entitiesField)
    private val rawEntities: List<RawMessageEntity>? = null,
+    @OptIn(ExperimentalSerializationApi::class)
    @SerialName(messageThreadIdField)
+    @EncodeDefault
    override val threadId: MessageThreadId? = chatId.threadId,
    @SerialName(businessConnectionIdField)
    override val businessConnectionId: BusinessConnectionId? = chatId.businessConnectionId,
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/SendVenue.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/SendVenue.kt
@@ -33,7 +33,9 @@ data class SendVenue(
    val googlePlaceId: GooglePlaceId? = null,
    @SerialName(googlePlaceTypeField)
    val googlePlaceType: GooglePlaceType? = null,
+    @OptIn(ExperimentalSerializationApi::class)
    @SerialName(messageThreadIdField)
+    @EncodeDefault
    override val threadId: MessageThreadId? = chatId.threadId,
    @SerialName(businessConnectionIdField)
    override val businessConnectionId: BusinessConnectionId? = chatId.businessConnectionId,
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/games/SendGame.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/games/SendGame.kt
@@ -20,7 +20,9 @@ data class SendGame (
    override val chatId: ChatIdentifier,
    @SerialName(gameShortNameField)
    val gameShortName: String,
+    @OptIn(ExperimentalSerializationApi::class)
    @SerialName(messageThreadIdField)
+    @EncodeDefault
    override val threadId: MessageThreadId? = chatId.threadId,
    @SerialName(businessConnectionIdField)
    override val businessConnectionId: BusinessConnectionId? = chatId.businessConnectionId,
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/media/SendAnimation.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/media/SendAnimation.kt
@@ -160,7 +160,9 @@ data class SendAnimationData internal constructor(
    override val width: Int? = null,
    @SerialName(heightField)
    override val height: Int? = null,
+    @OptIn(ExperimentalSerializationApi::class)
    @SerialName(messageThreadIdField)
+    @EncodeDefault
    override val threadId: MessageThreadId? = chatId.threadId,
    @SerialName(businessConnectionIdField)
    override val businessConnectionId: BusinessConnectionId? = chatId.businessConnectionId,
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/media/SendAudio.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/media/SendAudio.kt
@@ -149,7 +149,9 @@ data class SendAudioData internal constructor(
    override val performer: String? = null,
    @SerialName(titleField)
    override val title: String? = null,
+    @OptIn(ExperimentalSerializationApi::class)
    @SerialName(messageThreadIdField)
+    @EncodeDefault
    override val threadId: MessageThreadId? = chatId.threadId,
    @SerialName(businessConnectionIdField)
    override val businessConnectionId: BusinessConnectionId? = chatId.businessConnectionId,
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/media/SendDocument.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/media/SendDocument.kt
@@ -161,7 +161,9 @@ data class SendDocumentData internal constructor(
    override val parseMode: ParseMode? = null,
    @SerialName(captionEntitiesField)
    private val rawEntities: List<RawMessageEntity>? = null,
+    @OptIn(ExperimentalSerializationApi::class)
    @SerialName(messageThreadIdField)
+    @EncodeDefault
    override val threadId: MessageThreadId? = chatId.threadId,
    @SerialName(businessConnectionIdField)
    override val businessConnectionId: BusinessConnectionId? = chatId.businessConnectionId,
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/media/SendMediaGroup.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/media/SendMediaGroup.kt
@@ -191,7 +191,9 @@ data class SendMediaGroupData internal constructor(
    @SerialName(chatIdField)
    override val chatId: ChatIdentifier,
    val media: List<MediaGroupMemberTelegramMedia> = emptyList(),
+    @OptIn(ExperimentalSerializationApi::class)
    @SerialName(messageThreadIdField)
+    @EncodeDefault
    override val threadId: MessageThreadId? = chatId.threadId,
    @SerialName(businessConnectionIdField)
    override val businessConnectionId: BusinessConnectionId? = chatId.businessConnectionId,
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/media/SendPaidMedia.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/media/SendPaidMedia.kt
@@ -167,7 +167,9 @@ data class SendPaidMediaData internal constructor(
    val payload: PaidMediaPayload? = null,
    @SerialName(showCaptionAboveMediaField)
    override val showCaptionAboveMedia: Boolean = false,
+    @OptIn(ExperimentalSerializationApi::class)
    @SerialName(messageThreadIdField)
+    @EncodeDefault
    override val threadId: MessageThreadId? = chatId.threadId,
    @SerialName(businessConnectionIdField)
    override val businessConnectionId: BusinessConnectionId? = chatId.businessConnectionId,
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/media/SendPhoto.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/media/SendPhoto.kt
@@ -128,7 +128,9 @@ data class SendPhotoData internal constructor(
    override val showCaptionAboveMedia: Boolean = false,
    @SerialName(hasSpoilerField)
    override val spoilered: Boolean = false,
+    @OptIn(ExperimentalSerializationApi::class)
    @SerialName(messageThreadIdField)
+    @EncodeDefault
    override val threadId: MessageThreadId? = chatId.threadId,
    @SerialName(businessConnectionIdField)
    override val businessConnectionId: BusinessConnectionId? = chatId.businessConnectionId,
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/media/SendSticker.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/media/SendSticker.kt
@@ -58,7 +58,9 @@ data class SendStickerByFileId internal constructor(
    override val chatId: ChatIdentifier,
    @SerialName(stickerField)
    val sticker: InputFile,
+    @OptIn(ExperimentalSerializationApi::class)
    @SerialName(messageThreadIdField)
+    @EncodeDefault
    override val threadId: MessageThreadId? = chatId.threadId,
    @SerialName(businessConnectionIdField)
    override val businessConnectionId: BusinessConnectionId? = chatId.businessConnectionId,
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/media/SendVideo.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/media/SendVideo.kt
@@ -181,7 +181,9 @@ data class SendVideoData internal constructor(
    override val height: Int? = null,
    @SerialName(supportStreamingField)
    val supportStreaming: Boolean? = null,
+    @OptIn(ExperimentalSerializationApi::class)
    @SerialName(messageThreadIdField)
+    @EncodeDefault
    override val threadId: MessageThreadId? = chatId.threadId,
    @SerialName(businessConnectionIdField)
    override val businessConnectionId: BusinessConnectionId? = chatId.businessConnectionId,
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/media/SendVideoNote.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/media/SendVideoNote.kt
@@ -74,7 +74,9 @@ data class SendVideoNoteData internal constructor(
    override val duration: Long? = null,
    @SerialName(lengthField)
    override val width: Int? = null,
+    @OptIn(ExperimentalSerializationApi::class)
    @SerialName(messageThreadIdField)
+    @EncodeDefault
    override val threadId: MessageThreadId? = chatId.threadId,
    @SerialName(businessConnectionIdField)
    override val businessConnectionId: BusinessConnectionId? = chatId.businessConnectionId,
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/media/SendVoice.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/media/SendVoice.kt
@@ -126,7 +126,9 @@ data class SendVoiceData internal constructor(
    private val rawEntities: List<RawMessageEntity>? = null,
    @SerialName(durationField)
    override val duration: Long? = null,
+    @OptIn(ExperimentalSerializationApi::class)
    @SerialName(messageThreadIdField)
+    @EncodeDefault
    override val threadId: MessageThreadId? = chatId.threadId,
    @SerialName(businessConnectionIdField)
    override val businessConnectionId: BusinessConnectionId? = chatId.businessConnectionId,
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/payments/SendInvoice.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/payments/SendInvoice.kt
@@ -13,6 +13,7 @@ import dev.inmo.tgbotapi.types.payments.LabeledPrice
 import dev.inmo.tgbotapi.types.payments.LabeledPricesSerializer
 import dev.inmo.tgbotapi.types.payments.abstracts.Currency
 import dev.inmo.tgbotapi.types.payments.abstracts.XTR
+import dev.inmo.tgbotapi.types.threadId
 import kotlinx.serialization.*

 private val invoiceMessageSerializer: DeserializationStrategy<ContentMessage<InvoiceContent>>
@@ -61,7 +62,9 @@ data class SendInvoice(
    override val shouldSendEmailToProvider: Boolean = false,
    @SerialName(priceDependOnShipAddressField)
    override val priceDependOnShipAddress: Boolean = false,
+    @OptIn(ExperimentalSerializationApi::class)
    @SerialName(messageThreadIdField)
+    @EncodeDefault
    override val threadId: MessageThreadId? = chatId.threadId,
    @SerialName(disableNotificationField)
    override val disableNotification: Boolean = false,
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/polls/SendQuizPoll.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/polls/SendQuizPoll.kt
@@ -13,6 +13,8 @@ import dev.inmo.tgbotapi.types.polls.ExactScheduledCloseInfo
 import dev.inmo.tgbotapi.types.polls.InputPollOption
 import dev.inmo.tgbotapi.types.polls.ScheduledCloseInfo
 import dev.inmo.tgbotapi.utils.extensions.makeSourceString
+import kotlinx.serialization.EncodeDefault
+import kotlinx.serialization.ExperimentalSerializationApi
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.SerializationStrategy
@@ -46,7 +48,9 @@ class SendQuizPoll internal constructor(
    override val openPeriod: LongSeconds? = null,
    @SerialName(closeDateField)
    override val closeDate: LongSeconds? = null,
+    @OptIn(ExperimentalSerializationApi::class)
    @SerialName(messageThreadIdField)
+    @EncodeDefault
    override val threadId: MessageThreadId? = chatId.threadId,
    @SerialName(businessConnectionIdField)
    override val businessConnectionId: BusinessConnectionId? = chatId.businessConnectionId,
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/polls/SendRegularPoll.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/polls/SendRegularPoll.kt
@@ -15,6 +15,8 @@ import dev.inmo.tgbotapi.types.polls.ScheduledCloseInfo
 import dev.inmo.tgbotapi.utils.EntitiesBuilder
 import dev.inmo.tgbotapi.utils.EntitiesBuilderBody
 import dev.inmo.tgbotapi.utils.extensions.makeSourceString
+import kotlinx.serialization.EncodeDefault
+import kotlinx.serialization.ExperimentalSerializationApi
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.SerializationStrategy
@@ -41,7 +43,9 @@ class SendRegularPoll private constructor(
    override val openPeriod: LongSeconds?= null,
    @SerialName(closeDateField)
    override val closeDate: LongSeconds? = null,
+    @OptIn(ExperimentalSerializationApi::class)
    @SerialName(messageThreadIdField)
+    @EncodeDefault
    override val threadId: MessageThreadId? = chatId.threadId,
    @SerialName(businessConnectionIdField)
    override val businessConnectionId: BusinessConnectionId? = chatId.businessConnectionId,