some progress on support of directMessageThreadId

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/SendContact.kt

@@ -66,6 +66,7 @@ data class SendContact(
         contact.firstName,
         contact.lastName,
         threadId,
+        null, // directMessageThreadId
         businessConnectionId,
         disableNotification,
         protectContent,

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/SendLocation.kt

@@ -30,6 +30,7 @@ fun SendLocation(
     latitude: Double,
     longitude: Double,
     threadId: MessageThreadId? = chatId.threadId,
+    directMessageThreadId: DirectMessageThreadId? = chatId.directMessageThreadId,
     businessConnectionId: BusinessConnectionId? = chatId.businessConnectionId,
     disableNotification: Boolean = false,
     protectContent: Boolean = false,
@@ -57,6 +58,7 @@ fun SendStaticLocation(
     latitude: Double,
     longitude: Double,
     threadId: MessageThreadId? = chatId.threadId,
+    directMessageThreadId: DirectMessageThreadId? = chatId.directMessageThreadId,
     businessConnectionId: BusinessConnectionId? = chatId.businessConnectionId,
     disableNotification: Boolean = false,
     protectContent: Boolean = false,
@@ -105,6 +107,7 @@ fun SendLiveLocation(
     heading = heading,
     proximityAlertRadius = proximityAlertRadius,
     threadId = threadId,
+    directMessageThreadId = directMessageThreadId,
     businessConnectionId = businessConnectionId,
     disableNotification = disableNotification,
     protectContent = protectContent,
@@ -194,6 +197,10 @@ sealed interface SendLocation<T : LocationContent> : SendContentMessageRequest<C
         @OptIn(ExperimentalSerializationApi::class)
         @EncodeDefault
         override val threadId: MessageThreadId? = chatId.threadId,
+        @OptIn(ExperimentalSerializationApi::class)
+        @EncodeDefault
+        @SerialName(directMessagesTopicIdField)
+        override val directMessageThreadId: DirectMessageThreadId? = chatId.directMessageThreadId,
         @SerialName(businessConnectionIdField)
         @OptIn(ExperimentalSerializationApi::class)
         @EncodeDefault
@@ -244,6 +251,8 @@ sealed interface SendLocation<T : LocationContent> : SendContentMessageRequest<C
             val proximityAlertRadius: Meters? = null,
             @SerialName(messageThreadIdField)
             val threadId: MessageThreadId? = chatId.threadId,
+            @SerialName(directMessagesTopicIdField)
+            val directMessageThreadId: DirectMessageThreadId? = chatId.directMessageThreadId,
             @SerialName(businessConnectionIdField)
             val businessConnectionId: BusinessConnectionId? = chatId.businessConnectionId,
             @SerialName(disableNotificationField)
@@ -272,6 +281,7 @@ sealed interface SendLocation<T : LocationContent> : SendContentMessageRequest<C
                     latitude = surrogate.latitude,
                     longitude = surrogate.longitude,
                     threadId = surrogate.threadId,
+                    directMessageThreadId = surrogate.directMessageThreadId,
                     businessConnectionId = surrogate.businessConnectionId,
                     disableNotification = surrogate.disableNotification,
                     protectContent = surrogate.protectContent,
@@ -289,6 +299,7 @@ sealed interface SendLocation<T : LocationContent> : SendContentMessageRequest<C
                     heading = surrogate.heading,
                     proximityAlertRadius = surrogate.proximityAlertRadius,
                     threadId = surrogate.threadId,
+                    directMessageThreadId = surrogate.directMessageThreadId,
                     businessConnectionId = surrogate.businessConnectionId,
                     disableNotification = surrogate.disableNotification,
                     protectContent = surrogate.protectContent,
@@ -311,6 +322,7 @@ sealed interface SendLocation<T : LocationContent> : SendContentMessageRequest<C
                     heading = heading,
                     proximityAlertRadius = proximityAlertRadius,
                     threadId = threadId,
+                    directMessageThreadId = directMessageThreadId,
                     businessConnectionId = businessConnectionId,
                     disableNotification = disableNotification,
                     protectContent = protectContent,

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/SendVenue.kt

@@ -64,6 +64,7 @@ data class SendVenue(
         chatId: ChatIdentifier,
         venue: Venue,
         threadId: MessageThreadId? = chatId.threadId,
+        directMessageThreadId: DirectMessageThreadId? = chatId.directMessageThreadId,
         businessConnectionId: BusinessConnectionId? = chatId.businessConnectionId,
         disableNotification: Boolean = false,
         protectContent: Boolean = false,
@@ -82,6 +83,7 @@ data class SendVenue(
         googlePlaceId = venue.googlePlaceId,
         googlePlaceType = venue.googlePlaceType,
         threadId = threadId,
+        directMessageThreadId = directMessageThreadId,
         businessConnectionId = businessConnectionId,
         disableNotification = disableNotification,
         protectContent = protectContent,

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/media/SendAnimation.kt

@@ -91,6 +91,7 @@ fun SendAnimation(
     width: Int? = null,
     height: Int? = null,
     threadId: MessageThreadId? = chatId.threadId,
+    directMessageThreadId: DirectMessageThreadId? = chatId.directMessageThreadId,
     businessConnectionId: BusinessConnectionId? = chatId.businessConnectionId,
     disableNotification: Boolean = false,
     protectContent: Boolean = false,
@@ -115,6 +116,7 @@ fun SendAnimation(
         width = width,
         height = height,
         threadId = threadId,
+        directMessageThreadId = directMessageThreadId,
         businessConnectionId = businessConnectionId,
         disableNotification = disableNotification,
         protectContent = protectContent,

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/media/SendAudio.kt

@@ -86,6 +86,7 @@ fun SendAudio(
     performer: String? = null,
     title: String? = null,
     threadId: MessageThreadId? = chatId.threadId,
+    directMessageThreadId: DirectMessageThreadId? = chatId.directMessageThreadId,
     businessConnectionId: BusinessConnectionId? = chatId.businessConnectionId,
     disableNotification: Boolean = false,
     protectContent: Boolean = false,
@@ -108,6 +109,7 @@ fun SendAudio(
         performer = performer,
         title = title,
         threadId = threadId,
+        directMessageThreadId = directMessageThreadId,
         businessConnectionId = businessConnectionId,
         disableNotification = disableNotification,
         protectContent = protectContent,

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/media/SendDocument.kt

@@ -96,6 +96,7 @@ fun SendDocument(
     thumbnail: InputFile? = null,
     entities: TextSourcesList,
     threadId: MessageThreadId? = chatId.threadId,
+    directMessageThreadId: DirectMessageThreadId? = chatId.directMessageThreadId,
     businessConnectionId: BusinessConnectionId? = chatId.businessConnectionId,
     disableNotification: Boolean = false,
     protectContent: Boolean = false,
@@ -116,6 +117,7 @@ fun SendDocument(
         parseMode = null,
         rawEntities = entities.toRawMessageEntities(),
         threadId = threadId,
+        directMessageThreadId = directMessageThreadId,
         businessConnectionId = businessConnectionId,
         disableNotification = disableNotification,
         protectContent = protectContent,

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/media/SendPaidMedia.kt

@@ -95,6 +95,7 @@ fun SendPaidMedia(
     payload: PaidMediaPayload? = null,
     showCaptionAboveMedia: Boolean = false,
     threadId: MessageThreadId? = chatId.threadId,
+    directMessageThreadId: DirectMessageThreadId? = chatId.directMessageThreadId,
     businessConnectionId: BusinessConnectionId? = chatId.businessConnectionId,
     disableNotification: Boolean = false,
     protectContent: Boolean = false,
@@ -112,6 +113,7 @@ fun SendPaidMedia(
         rawEntities = entities.toRawMessageEntities(),
         showCaptionAboveMedia = showCaptionAboveMedia,
         threadId = threadId,
+        directMessageThreadId = directMessageThreadId,
         businessConnectionId = businessConnectionId,
         disableNotification = disableNotification,
         protectContent = protectContent,

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/media/SendVideo.kt

@@ -102,6 +102,7 @@ fun SendVideo(
     height: Int? = null,
     supportStreaming: Boolean? = null,
     threadId: MessageThreadId? = chatId.threadId,
+    directMessageThreadId: DirectMessageThreadId? = chatId.directMessageThreadId,
     businessConnectionId: BusinessConnectionId? = chatId.businessConnectionId,
     disableNotification: Boolean = false,
     protectContent: Boolean = false,
@@ -130,6 +131,7 @@ fun SendVideo(
         height = height,
         supportStreaming = supportStreaming,
         threadId = threadId,
+        directMessageThreadId = directMessageThreadId,
         businessConnectionId = businessConnectionId,
         disableNotification = disableNotification,
         protectContent = protectContent,

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/media/SendVoice.kt

@@ -72,6 +72,7 @@ fun SendVoice(
     voice: InputFile,
     entities: TextSourcesList,
     threadId: MessageThreadId? = chatId.threadId,
+    directMessageThreadId: DirectMessageThreadId? = chatId.directMessageThreadId,
     businessConnectionId: BusinessConnectionId? = chatId.businessConnectionId,
     duration: Long? = null,
     disableNotification: Boolean = false,
@@ -91,6 +92,7 @@ fun SendVoice(
         rawEntities = entities.toRawMessageEntities(),
         duration = duration,
         threadId = threadId,
+        directMessageThreadId = directMessageThreadId,
         businessConnectionId = businessConnectionId,
         disableNotification = disableNotification,
         protectContent = protectContent,

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/payments/SendInvoice.kt

@@ -118,6 +118,7 @@ data class SendInvoice(
         startParameter: StartParameter? = null,
         providerData: String? = null,
         threadId: MessageThreadId? = chatId.threadId,
+        directMessageThreadId: DirectMessageThreadId? = chatId.directMessageThreadId,
         disableNotification: Boolean = false,
         protectContent: Boolean = false,
         allowPaidBroadcast: Boolean = false,
@@ -135,6 +136,7 @@ data class SendInvoice(
         startParameter = startParameter,
         providerData = providerData,
         threadId = threadId,
+        directMessageThreadId = directMessageThreadId,
         disableNotification = disableNotification,
         protectContent = protectContent,
         allowPaidBroadcast = allowPaidBroadcast,

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/polls/SendQuizPoll.kt

@@ -93,6 +93,7 @@ class SendQuizPoll internal constructor(
         openPeriod: LongSeconds? = null,
         closeDate: LongSeconds? = null,
         threadId: MessageThreadId? = chatId.threadId,
+        directMessageThreadId: DirectMessageThreadId? = chatId.directMessageThreadId,
         businessConnectionId: BusinessConnectionId? = chatId.businessConnectionId,
         disableNotification: Boolean = false,
         protectContent: Boolean = false,
@@ -115,6 +116,7 @@ class SendQuizPoll internal constructor(
         openPeriod = openPeriod,
         closeDate = closeDate,
         threadId = threadId,
+        directMessageThreadId = directMessageThreadId,
         businessConnectionId = businessConnectionId,
         disableNotification = disableNotification,
         protectContent = protectContent,
@@ -136,6 +138,7 @@ class SendQuizPoll internal constructor(
         openPeriod: LongSeconds? = null,
         closeDate: LongSeconds? = null,
         threadId: MessageThreadId? = chatId.threadId,
+        directMessageThreadId: DirectMessageThreadId? = chatId.directMessageThreadId,
         businessConnectionId: BusinessConnectionId? = chatId.businessConnectionId,
         disableNotification: Boolean = false,
         protectContent: Boolean = false,
@@ -158,6 +161,7 @@ class SendQuizPoll internal constructor(
         openPeriod = openPeriod,
         closeDate = closeDate,
         threadId = threadId,
+        directMessageThreadId = directMessageThreadId,
         businessConnectionId = businessConnectionId,
         disableNotification = disableNotification,
         protectContent = protectContent,
@@ -179,6 +183,7 @@ class SendQuizPoll internal constructor(
         openPeriod: LongSeconds? = null,
         closeDate: LongSeconds? = null,
         threadId: MessageThreadId? = chatId.threadId,
+        directMessageThreadId: DirectMessageThreadId? = chatId.directMessageThreadId,
         businessConnectionId: BusinessConnectionId? = chatId.businessConnectionId,
         disableNotification: Boolean = false,
         protectContent: Boolean = false,
@@ -201,6 +206,7 @@ class SendQuizPoll internal constructor(
         openPeriod = openPeriod,
         closeDate = closeDate,
         threadId = threadId,
+        directMessageThreadId = directMessageThreadId,
         businessConnectionId = businessConnectionId,
         disableNotification = disableNotification,
         protectContent = protectContent,
@@ -221,6 +227,7 @@ class SendQuizPoll internal constructor(
         openPeriod: LongSeconds? = null,
         closeDate: LongSeconds? = null,
         threadId: MessageThreadId? = chatId.threadId,
+        directMessageThreadId: DirectMessageThreadId? = chatId.directMessageThreadId,
         businessConnectionId: BusinessConnectionId? = chatId.businessConnectionId,
         disableNotification: Boolean = false,
         protectContent: Boolean = false,
@@ -243,6 +250,7 @@ class SendQuizPoll internal constructor(
         openPeriod = openPeriod,
         closeDate = closeDate,
         threadId = threadId,
+        directMessageThreadId = directMessageThreadId,
         businessConnectionId = businessConnectionId,
         disableNotification = disableNotification,
         protectContent = protectContent,
@@ -279,6 +287,7 @@ fun SendQuizPoll(
     isAnonymous: Boolean = true,
     isClosed: Boolean = false,
     threadId: MessageThreadId? = chatId.threadId,
+    directMessageThreadId: DirectMessageThreadId? = chatId.directMessageThreadId,
     businessConnectionId: BusinessConnectionId? = chatId.businessConnectionId,
     disableNotification: Boolean = false,
     protectContent: Boolean = false,
@@ -299,6 +308,7 @@ fun SendQuizPoll(
     openPeriod = (closeInfo as? ApproximateScheduledCloseInfo)?.openPeriod,
     closeDate = (closeInfo as? ExactScheduledCloseInfo)?.closeDate,
     threadId = threadId,
+    directMessageThreadId = directMessageThreadId,
     businessConnectionId = businessConnectionId,
     disableNotification = disableNotification,
     protectContent = protectContent,
@@ -319,6 +329,7 @@ fun SendQuizPoll(
     isAnonymous: Boolean = true,
     isClosed: Boolean = false,
     threadId: MessageThreadId? = chatId.threadId,
+    directMessageThreadId: DirectMessageThreadId? = chatId.directMessageThreadId,
     businessConnectionId: BusinessConnectionId? = chatId.businessConnectionId,
     disableNotification: Boolean = false,
     protectContent: Boolean = false,
@@ -338,6 +349,7 @@ fun SendQuizPoll(
     openPeriod = (closeInfo as? ApproximateScheduledCloseInfo)?.openPeriod,
     closeDate = (closeInfo as? ExactScheduledCloseInfo)?.closeDate,
     threadId = threadId,
+    directMessageThreadId = directMessageThreadId,
     businessConnectionId = businessConnectionId,
     disableNotification = disableNotification,
     protectContent = protectContent,
@@ -358,6 +370,7 @@ fun SendQuizPoll(
     isAnonymous: Boolean = true,
     isClosed: Boolean = false,
     threadId: MessageThreadId? = chatId.threadId,
+    directMessageThreadId: DirectMessageThreadId? = chatId.directMessageThreadId,
     businessConnectionId: BusinessConnectionId? = chatId.businessConnectionId,
     disableNotification: Boolean = false,
     protectContent: Boolean = false,
@@ -377,6 +390,7 @@ fun SendQuizPoll(
     openPeriod = (closeInfo as? ApproximateScheduledCloseInfo)?.openPeriod,
     closeDate = (closeInfo as? ExactScheduledCloseInfo)?.closeDate,
     threadId = threadId,
+    directMessageThreadId = directMessageThreadId,
     businessConnectionId = businessConnectionId,
     disableNotification = disableNotification,
     protectContent = protectContent,
@@ -396,6 +410,7 @@ fun SendQuizPoll(
     isAnonymous: Boolean = true,
     isClosed: Boolean = false,
     threadId: MessageThreadId? = chatId.threadId,
+    directMessageThreadId: DirectMessageThreadId? = chatId.directMessageThreadId,
     businessConnectionId: BusinessConnectionId? = chatId.businessConnectionId,
     disableNotification: Boolean = false,
     protectContent: Boolean = false,
@@ -414,6 +429,7 @@ fun SendQuizPoll(
     openPeriod = (closeInfo as? ApproximateScheduledCloseInfo)?.openPeriod,
     closeDate = (closeInfo as? ExactScheduledCloseInfo)?.closeDate,
     threadId = threadId,
+    directMessageThreadId = directMessageThreadId,
     businessConnectionId = businessConnectionId,
     disableNotification = disableNotification,
     protectContent = protectContent,

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/polls/SendRegularPoll.kt

@@ -79,6 +79,7 @@ class SendRegularPoll private constructor(
         openPeriod: LongSeconds?= null,
         closeDate: LongSeconds? = null,
         threadId: MessageThreadId? = chatId.threadId,
+        directMessageThreadId: DirectMessageThreadId? = chatId.directMessageThreadId,
         businessConnectionId: BusinessConnectionId? = chatId.businessConnectionId,
         disableNotification: Boolean = false,
         protectContent: Boolean = false,
@@ -98,6 +99,7 @@ class SendRegularPoll private constructor(
         openPeriod = openPeriod,
         closeDate = closeDate,
         threadId = threadId,
+        directMessageThreadId = directMessageThreadId,
         businessConnectionId = businessConnectionId,
         disableNotification = disableNotification,
         protectContent = protectContent,
@@ -118,6 +120,7 @@ class SendRegularPoll private constructor(
         openPeriod: LongSeconds?= null,
         closeDate: LongSeconds? = null,
         threadId: MessageThreadId? = chatId.threadId,
+        directMessageThreadId: DirectMessageThreadId? = chatId.directMessageThreadId,
         businessConnectionId: BusinessConnectionId? = chatId.businessConnectionId,
         disableNotification: Boolean = false,
         protectContent: Boolean = false,
@@ -137,6 +140,7 @@ class SendRegularPoll private constructor(
         openPeriod = openPeriod,
         closeDate = closeDate,
         threadId = threadId,
+        directMessageThreadId = directMessageThreadId,
         businessConnectionId = businessConnectionId,
         disableNotification = disableNotification,
         protectContent = protectContent,
@@ -166,6 +170,7 @@ fun SendRegularPoll(
     isClosed: Boolean = false,
     allowMultipleAnswers: Boolean = false,
     threadId: MessageThreadId? = chatId.threadId,
+    directMessageThreadId: DirectMessageThreadId? = chatId.directMessageThreadId,
     businessConnectionId: BusinessConnectionId? = chatId.businessConnectionId,
     disableNotification: Boolean = false,
     protectContent: Boolean = false,
@@ -184,6 +189,7 @@ fun SendRegularPoll(
     openPeriod = (closeInfo as? ApproximateScheduledCloseInfo) ?.openPeriod,
     closeDate = (closeInfo as? ExactScheduledCloseInfo) ?.closeDate,
     threadId = threadId,
+    directMessageThreadId = directMessageThreadId,
     businessConnectionId = businessConnectionId,
     disableNotification = disableNotification,
     protectContent = protectContent,
@@ -202,6 +208,7 @@ fun SendRegularPoll(
     isClosed: Boolean = false,
     allowMultipleAnswers: Boolean = false,
     threadId: MessageThreadId? = chatId.threadId,
+    directMessageThreadId: DirectMessageThreadId? = chatId.directMessageThreadId,
     businessConnectionId: BusinessConnectionId? = chatId.businessConnectionId,
     disableNotification: Boolean = false,
     protectContent: Boolean = false,
@@ -219,6 +226,7 @@ fun SendRegularPoll(
     openPeriod = (closeInfo as? ApproximateScheduledCloseInfo) ?.openPeriod,
     closeDate = (closeInfo as? ExactScheduledCloseInfo) ?.closeDate,
     threadId = threadId,
+    directMessageThreadId = directMessageThreadId,
     businessConnectionId = businessConnectionId,
     disableNotification = disableNotification,
     protectContent = protectContent,
@@ -236,6 +244,7 @@ fun SendRegularPoll(
     isClosed: Boolean = false,
     allowMultipleAnswers: Boolean = false,
     threadId: MessageThreadId? = chatId.threadId,
+    directMessageThreadId: DirectMessageThreadId? = chatId.directMessageThreadId,
     businessConnectionId: BusinessConnectionId? = chatId.businessConnectionId,
     disableNotification: Boolean = false,
     protectContent: Boolean = false,
@@ -253,6 +262,7 @@ fun SendRegularPoll(
     isClosed = isClosed,
     allowMultipleAnswers = allowMultipleAnswers,
     threadId = threadId,
+    directMessageThreadId = directMessageThreadId,
     businessConnectionId = businessConnectionId,
     disableNotification = disableNotification,
     protectContent = protectContent,

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/content/DiceContent.kt

@@ -28,6 +28,7 @@ data class DiceContent(
         chatId = chatId,
         animationType = dice.animationType,
         threadId = messageThreadId,
+        directMessageThreadId = directMessageThreadId,
         businessConnectionId = businessConnectionId,
         disableNotification = disableNotification,
         protectContent = protectContent,

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/content/GameContent.kt

@@ -28,6 +28,7 @@ data class GameContent(
         chatId = chatId,
         gameShortName = game.title,
         threadId = messageThreadId,
+        directMessageThreadId = directMessageThreadId,
         businessConnectionId = businessConnectionId,
         disableNotification = disableNotification,
         protectContent = protectContent,

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/content/GiveawayContent.kt

@@ -33,6 +33,7 @@ data class GiveawayContent(
             toChatId = chatId,
             messageId = messageId,
             threadId = messageThreadId,
+            directMessageThreadId = directMessageThreadId,
             disableNotification = disableNotification,
             protectContent = protectContent
         )

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/content/GiveawayPublicResultsContent.kt

@@ -30,6 +30,7 @@ data class GiveawayPublicResultsContent(
             toChatId = chatId,
             messageId = giveaway.messageId,
             threadId = messageThreadId,
+            directMessageThreadId = directMessageThreadId,
             disableNotification = disableNotification,
             protectContent = protectContent
         )

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/content/StoryContent.kt

@@ -33,6 +33,7 @@ data class StoryContent(
             toChatId = chatId,
             messageId = messageId,
             threadId = messageThreadId,
+            directMessageThreadId = directMessageThreadId,
             disableNotification = disableNotification,
             protectContent = protectContent
         )