fix of directMessageThreadId passes

2025-12-11 16:55:40 +00:00 · 2025-09-15 11:55:25 +06:00
parent 152bf2af02
commit 79a0e202d8
74 changed files with 1824 additions and 1164 deletions
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/ForwardMessages.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/ForwardMessages.kt
@@ -15,7 +15,7 @@ fun ForwardMessages(
    fromChatId: ChatIdentifier,
    messageIds: Array<MessageId>,
    threadId: MessageThreadId? = toChatId.threadId,
-    directMessageThreadId: DirectMessageThreadId? = toChatId.directMessageThreadId,
+    directMessageThreadId: DirectMessageThreadId?,// = toChatId.directMessageThreadId,
    disableNotification: Boolean = false,
    protectContent: Boolean = false,
    removeCaption: 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
@@ -90,7 +90,7 @@ fun CopyMessage(
    parseMode: ParseMode? = null,
    showCaptionAboveMedia: Boolean = false,
    threadId: MessageThreadId? = toChatId.threadId,
-    directMessageThreadId: DirectMessageThreadId? = toChatId.directMessageThreadId,
+    directMessageThreadId: DirectMessageThreadId?,// = toChatId.directMessageThreadId,
    startTimestamp: Seconds? = null,
    disableNotification: Boolean = false,
    protectContent: Boolean = false,
@@ -122,7 +122,7 @@ fun CopyMessage(
    entities: List<TextSource>,
    showCaptionAboveMedia: Boolean = false,
    threadId: MessageThreadId? = toChatId.threadId,
-    directMessageThreadId: DirectMessageThreadId? = toChatId.directMessageThreadId,
+    directMessageThreadId: DirectMessageThreadId?,// = toChatId.directMessageThreadId,
    startTimestamp: Seconds? = null,
    disableNotification: Boolean = false,
    protectContent: Boolean = false,
--- 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
@@ -20,7 +20,7 @@ fun CopyMessages(
    fromChatId: ChatIdentifier,
    messageIds: Array<MessageId>,
    threadId: MessageThreadId? = toChatId.threadId,
-    directMessageThreadId: DirectMessageThreadId? = toChatId.directMessageThreadId,
+    directMessageThreadId: DirectMessageThreadId?,// = toChatId.directMessageThreadId,
    disableNotification: Boolean = false,
    protectContent: Boolean = false,
    removeCaption: Boolean = false
--- 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
@@ -53,7 +53,7 @@ data class SendContact(
        chatId: ChatIdentifier,
        contact: Contact,
        threadId: MessageThreadId? = chatId.threadId,
-        directMessageThreadId: DirectMessageThreadId? = chatId.directMessageThreadId,
+        directMessageThreadId: DirectMessageThreadId?,// = chatId.directMessageThreadId,
        businessConnectionId: BusinessConnectionId? = chatId.businessConnectionId,
        disableNotification: Boolean = false,
        protectContent: Boolean = false,
@@ -87,6 +87,7 @@ data class SendContact(
 fun Contact.toRequest(
    chatId: ChatIdentifier,
    threadId: MessageThreadId? = chatId.threadId,
+    directMessageThreadId: DirectMessageThreadId?/* = chatId.directMessageThreadId*/,
    businessConnectionId: BusinessConnectionId? = chatId.businessConnectionId,
    disableNotification: Boolean = false,
    protectContent: Boolean = false,
@@ -98,6 +99,7 @@ fun Contact.toRequest(
    chatId = chatId,
    contact = this,
    threadId = threadId,
+    directMessageThreadId = directMessageThreadId,
    businessConnectionId = businessConnectionId,
    disableNotification = disableNotification,
    protectContent = protectContent,
--- 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
@@ -30,7 +30,7 @@ fun SendLocation(
    latitude: Double,
    longitude: Double,
    threadId: MessageThreadId? = chatId.threadId,
-    directMessageThreadId: DirectMessageThreadId? = chatId.directMessageThreadId,
+    directMessageThreadId: DirectMessageThreadId?,// = chatId.directMessageThreadId,
    businessConnectionId: BusinessConnectionId? = chatId.businessConnectionId,
    disableNotification: Boolean = false,
    protectContent: Boolean = false,
@@ -58,7 +58,7 @@ fun SendStaticLocation(
    latitude: Double,
    longitude: Double,
    threadId: MessageThreadId? = chatId.threadId,
-    directMessageThreadId: DirectMessageThreadId? = chatId.directMessageThreadId,
+    directMessageThreadId: DirectMessageThreadId?,// = chatId.directMessageThreadId,
    businessConnectionId: BusinessConnectionId? = chatId.businessConnectionId,
    disableNotification: Boolean = false,
    protectContent: Boolean = false,
@@ -90,7 +90,7 @@ fun SendLiveLocation(
    heading: Degrees? = null,
    proximityAlertRadius: Meters? = null,
    threadId: MessageThreadId? = chatId.threadId,
-    directMessageThreadId: DirectMessageThreadId? = chatId.directMessageThreadId,
+    directMessageThreadId: DirectMessageThreadId?,// = chatId.directMessageThreadId,
    businessConnectionId: BusinessConnectionId? = chatId.businessConnectionId,
    disableNotification: Boolean = false,
    protectContent: Boolean = false,
@@ -200,7 +200,7 @@ sealed interface SendLocation<T : LocationContent> : SendContentMessageRequest<C
        @OptIn(ExperimentalSerializationApi::class)
        @EncodeDefault
        @SerialName(directMessagesTopicIdField)
-        override val directMessageThreadId: DirectMessageThreadId? = chatId.directMessageThreadId,
+        override val directMessageThreadId: DirectMessageThreadId?,// = chatId.directMessageThreadId,
        @SerialName(businessConnectionIdField)
        @OptIn(ExperimentalSerializationApi::class)
        @EncodeDefault
@@ -252,7 +252,7 @@ sealed interface SendLocation<T : LocationContent> : SendContentMessageRequest<C
            @SerialName(messageThreadIdField)
            val threadId: MessageThreadId? = chatId.threadId,
            @SerialName(directMessagesTopicIdField)
-            val directMessageThreadId: DirectMessageThreadId? = chatId.directMessageThreadId,
+            val directMessageThreadId: DirectMessageThreadId?,// = chatId.directMessageThreadId,
            @SerialName(businessConnectionIdField)
            val businessConnectionId: BusinessConnectionId? = chatId.businessConnectionId,
            @SerialName(disableNotificationField)
--- 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
@@ -27,7 +27,7 @@ fun SendTextMessage(
    parseMode: ParseMode? = null,
    linkPreviewOptions: LinkPreviewOptions? = null,
    threadId: MessageThreadId? = chatId.threadId,
-    directMessageThreadId: DirectMessageThreadId? = chatId.directMessageThreadId,
+    directMessageThreadId: DirectMessageThreadId?,// = chatId.directMessageThreadId,
    businessConnectionId: BusinessConnectionId? = chatId.businessConnectionId,
    disableNotification: Boolean = false,
    protectContent: Boolean = false,
@@ -57,7 +57,7 @@ fun SendTextMessage(
    entities: TextSourcesList,
    linkPreviewOptions: LinkPreviewOptions? = null,
    threadId: MessageThreadId? = chatId.threadId,
-    directMessageThreadId: DirectMessageThreadId? = chatId.directMessageThreadId,
+    directMessageThreadId: DirectMessageThreadId?,// = chatId.directMessageThreadId,
    businessConnectionId: BusinessConnectionId? = chatId.businessConnectionId,
    disableNotification: Boolean = false,
    protectContent: Boolean = false,
@@ -100,7 +100,7 @@ data class SendTextMessage internal constructor(
    @OptIn(ExperimentalSerializationApi::class)
    @EncodeDefault
    @SerialName(directMessagesTopicIdField)
-    override val directMessageThreadId: DirectMessageThreadId?,// = chatId.directMessageThreadId
+    override val directMessageThreadId: DirectMessageThreadId? = chatId.directMessageThreadId,
    @SerialName(businessConnectionIdField)
    override val businessConnectionId: BusinessConnectionId? = chatId.businessConnectionId,
    @SerialName(linkPreviewOptionsField)
--- 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
@@ -64,7 +64,7 @@ data class SendVenue(
        chatId: ChatIdentifier,
        venue: Venue,
        threadId: MessageThreadId? = chatId.threadId,
-        directMessageThreadId: DirectMessageThreadId? = chatId.directMessageThreadId,
+        directMessageThreadId: DirectMessageThreadId?,// = chatId.directMessageThreadId,
        businessConnectionId: BusinessConnectionId? = chatId.businessConnectionId,
        disableNotification: Boolean = false,
        protectContent: Boolean = false,
@@ -103,6 +103,7 @@ data class SendVenue(
 fun Venue.toRequest(
    chatId: ChatIdentifier,
    threadId: MessageThreadId? = chatId.threadId,
+    directMessageThreadId: DirectMessageThreadId?/* = chatId.directMessageThreadId*/,
    businessConnectionId: BusinessConnectionId? = chatId.businessConnectionId,
    disableNotification: Boolean = false,
    protectContent: Boolean = false,
@@ -114,6 +115,7 @@ fun Venue.toRequest(
    chatId = chatId,
    venue = this,
    threadId = threadId,
+    directMessageThreadId = directMessageThreadId,
    businessConnectionId = businessConnectionId,
    disableNotification = disableNotification,
    protectContent = protectContent,
--- 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
@@ -35,7 +35,7 @@ fun SendAnimation(
    width: Int? = null,
    height: Int? = null,
    threadId: MessageThreadId? = chatId.threadId,
-    directMessageThreadId: DirectMessageThreadId? = chatId.directMessageThreadId,
+    directMessageThreadId: DirectMessageThreadId?,// = chatId.directMessageThreadId,
    businessConnectionId: BusinessConnectionId? = chatId.businessConnectionId,
    disableNotification: Boolean = false,
    protectContent: Boolean = false,
@@ -91,7 +91,7 @@ fun SendAnimation(
    width: Int? = null,
    height: Int? = null,
    threadId: MessageThreadId? = chatId.threadId,
-    directMessageThreadId: DirectMessageThreadId? = chatId.directMessageThreadId,
+    directMessageThreadId: DirectMessageThreadId?,// = chatId.directMessageThreadId,
    businessConnectionId: BusinessConnectionId? = chatId.businessConnectionId,
    disableNotification: Boolean = false,
    protectContent: Boolean = false,
--- 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
@@ -34,7 +34,7 @@ fun SendAudio(
    performer: String? = null,
    title: String? = null,
    threadId: MessageThreadId? = chatId.threadId,
-    directMessageThreadId: DirectMessageThreadId? = chatId.directMessageThreadId,
+    directMessageThreadId: DirectMessageThreadId?,// = chatId.directMessageThreadId,
    businessConnectionId: BusinessConnectionId? = chatId.businessConnectionId,
    disableNotification: Boolean = false,
    protectContent: Boolean = false,
@@ -86,7 +86,7 @@ fun SendAudio(
    performer: String? = null,
    title: String? = null,
    threadId: MessageThreadId? = chatId.threadId,
-    directMessageThreadId: DirectMessageThreadId? = chatId.directMessageThreadId,
+    directMessageThreadId: DirectMessageThreadId?,// = chatId.directMessageThreadId,
    businessConnectionId: BusinessConnectionId? = chatId.businessConnectionId,
    disableNotification: Boolean = false,
    protectContent: Boolean = false,
--- 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
@@ -39,7 +39,7 @@ fun SendDocument(
    text: String? = null,
    parseMode: ParseMode? = null,
    threadId: MessageThreadId? = chatId.threadId,
-    directMessageThreadId: DirectMessageThreadId? = chatId.directMessageThreadId,
+    directMessageThreadId: DirectMessageThreadId?,// = chatId.directMessageThreadId,
    businessConnectionId: BusinessConnectionId? = chatId.businessConnectionId,
    disableNotification: Boolean = false,
    protectContent: Boolean = false,
@@ -96,7 +96,7 @@ fun SendDocument(
    thumbnail: InputFile? = null,
    entities: TextSourcesList,
    threadId: MessageThreadId? = chatId.threadId,
-    directMessageThreadId: DirectMessageThreadId? = chatId.directMessageThreadId,
+    directMessageThreadId: DirectMessageThreadId?,// = chatId.directMessageThreadId,
    businessConnectionId: BusinessConnectionId? = chatId.businessConnectionId,
    disableNotification: Boolean = false,
    protectContent: Boolean = false,
--- 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
@@ -35,7 +35,7 @@ fun <T : MediaGroupPartContent> SendMediaGroup(
    chatId: ChatIdentifier,
    media: List<MediaGroupMemberTelegramMedia>,
    threadId: MessageThreadId? = chatId.threadId,
-    directMessageThreadId: DirectMessageThreadId? = chatId.directMessageThreadId,
+    directMessageThreadId: DirectMessageThreadId?,// = chatId.directMessageThreadId,
    businessConnectionId: BusinessConnectionId? = chatId.businessConnectionId,
    disableNotification: Boolean = false,
    protectContent: Boolean = false,
@@ -97,6 +97,7 @@ inline fun SendPlaylist(
    chatId: ChatIdentifier,
    media: List<AudioMediaGroupMemberTelegramMedia>,
    threadId: MessageThreadId? = chatId.threadId,
+    directMessageThreadId: DirectMessageThreadId?/* = chatId.directMessageThreadId*/,
    businessConnectionId: BusinessConnectionId? = chatId.businessConnectionId,
    disableNotification: Boolean = false,
    protectContent: Boolean = false,
@@ -107,6 +108,7 @@ inline fun SendPlaylist(
    chatId = chatId,
    media = media,
    threadId = threadId,
+    directMessageThreadId = directMessageThreadId,
    businessConnectionId = businessConnectionId,
    disableNotification = disableNotification,
    protectContent = protectContent,
@@ -125,6 +127,7 @@ inline fun SendDocumentsGroup(
    chatId: ChatIdentifier,
    media: List<DocumentMediaGroupMemberTelegramMedia>,
    threadId: MessageThreadId? = chatId.threadId,
+    directMessageThreadId: DirectMessageThreadId?/* = chatId.directMessageThreadId*/,
    businessConnectionId: BusinessConnectionId? = chatId.businessConnectionId,
    disableNotification: Boolean = false,
    protectContent: Boolean = false,
@@ -135,6 +138,7 @@ inline fun SendDocumentsGroup(
    chatId = chatId,
    media = media,
    threadId = threadId,
+    directMessageThreadId = directMessageThreadId,
    businessConnectionId = businessConnectionId,
    disableNotification = disableNotification,
    protectContent = protectContent,
@@ -154,6 +158,7 @@ inline fun SendVisualMediaGroup(
    chatId: ChatIdentifier,
    media: List<VisualMediaGroupMemberTelegramMedia>,
    threadId: MessageThreadId? = chatId.threadId,
+    directMessageThreadId: DirectMessageThreadId?/* = chatId.directMessageThreadId*/,
    businessConnectionId: BusinessConnectionId? = chatId.businessConnectionId,
    disableNotification: Boolean = false,
    protectContent: Boolean = false,
@@ -164,6 +169,7 @@ inline fun SendVisualMediaGroup(
    chatId = chatId,
    media = media,
    threadId = threadId,
+    directMessageThreadId = directMessageThreadId,
    businessConnectionId = businessConnectionId,
    disableNotification = disableNotification,
    protectContent = protectContent,
--- 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
@@ -34,7 +34,7 @@ fun SendPaidMedia(
    payload: PaidMediaPayload? = null,
    showCaptionAboveMedia: Boolean = false,
    threadId: MessageThreadId? = chatId.threadId,
-    directMessageThreadId: DirectMessageThreadId? = chatId.directMessageThreadId,
+    directMessageThreadId: DirectMessageThreadId?,// = chatId.directMessageThreadId,
    businessConnectionId: BusinessConnectionId? = chatId.businessConnectionId,
    disableNotification: Boolean = false,
    protectContent: Boolean = false,
@@ -95,7 +95,7 @@ fun SendPaidMedia(
    payload: PaidMediaPayload? = null,
    showCaptionAboveMedia: Boolean = false,
    threadId: MessageThreadId? = chatId.threadId,
-    directMessageThreadId: DirectMessageThreadId? = chatId.directMessageThreadId,
+    directMessageThreadId: DirectMessageThreadId?,// = chatId.directMessageThreadId,
    businessConnectionId: BusinessConnectionId? = chatId.businessConnectionId,
    disableNotification: Boolean = false,
    protectContent: Boolean = false,
--- 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
@@ -30,7 +30,7 @@ fun SendPhoto(
    showCaptionAboveMedia: Boolean = false,
    spoilered: Boolean = false,
    threadId: MessageThreadId? = chatId.threadId,
-    directMessageThreadId: DirectMessageThreadId? = chatId.directMessageThreadId,
+    directMessageThreadId: DirectMessageThreadId?,// = chatId.directMessageThreadId,
    businessConnectionId: BusinessConnectionId? = chatId.businessConnectionId,
    disableNotification: Boolean = false,
    protectContent: Boolean = false,
@@ -74,7 +74,7 @@ fun SendPhoto(
    showCaptionAboveMedia: Boolean = false,
    spoilered: Boolean = false,
    threadId: MessageThreadId? = chatId.threadId,
-    directMessageThreadId: DirectMessageThreadId? = chatId.directMessageThreadId,
+    directMessageThreadId: DirectMessageThreadId?,// = chatId.directMessageThreadId,
    businessConnectionId: BusinessConnectionId? = chatId.businessConnectionId,
    disableNotification: Boolean = false,
    protectContent: Boolean = false,
--- 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
@@ -18,7 +18,7 @@ fun SendSticker(
    chatId: ChatIdentifier,
    sticker: InputFile,
    threadId: MessageThreadId? = chatId.threadId,
-    directMessageThreadId: DirectMessageThreadId? = chatId.directMessageThreadId,
+    directMessageThreadId: DirectMessageThreadId?,// = chatId.directMessageThreadId,
    businessConnectionId: BusinessConnectionId? = chatId.businessConnectionId,
    emoji: String? = null,
    disableNotification: Boolean = false,
--- 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
@@ -39,7 +39,7 @@ fun SendVideo(
    height: Int? = null,
    supportStreaming: Boolean? = null,
    threadId: MessageThreadId? = chatId.threadId,
-    directMessageThreadId: DirectMessageThreadId? = chatId.directMessageThreadId,
+    directMessageThreadId: DirectMessageThreadId?,// = chatId.directMessageThreadId,
    businessConnectionId: BusinessConnectionId? = chatId.businessConnectionId,
    disableNotification: Boolean = false,
    protectContent: Boolean = false,
@@ -102,7 +102,7 @@ fun SendVideo(
    height: Int? = null,
    supportStreaming: Boolean? = null,
    threadId: MessageThreadId? = chatId.threadId,
-    directMessageThreadId: DirectMessageThreadId? = chatId.directMessageThreadId,
+    directMessageThreadId: DirectMessageThreadId?,// = chatId.directMessageThreadId,
    businessConnectionId: BusinessConnectionId? = chatId.businessConnectionId,
    disableNotification: Boolean = false,
    protectContent: Boolean = false,
--- 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
@@ -21,7 +21,7 @@ fun SendVideoNote(
    duration: Long? = null,
    size: Int? = null, // in documentation - length (size of video side)
    threadId: MessageThreadId? = chatId.threadId,
-    directMessageThreadId: DirectMessageThreadId? = chatId.directMessageThreadId,
+    directMessageThreadId: DirectMessageThreadId?,// = chatId.directMessageThreadId,
    businessConnectionId: BusinessConnectionId? = chatId.businessConnectionId,
    disableNotification: Boolean = false,
    protectContent: Boolean = false,
--- 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
@@ -28,7 +28,7 @@ fun SendVoice(
    parseMode: ParseMode? = null,
    duration: Long? = null,
    threadId: MessageThreadId? = chatId.threadId,
-    directMessageThreadId: DirectMessageThreadId? = chatId.directMessageThreadId,
+    directMessageThreadId: DirectMessageThreadId?,// = chatId.directMessageThreadId,
    businessConnectionId: BusinessConnectionId? = chatId.businessConnectionId,
    disableNotification: Boolean = false,
    protectContent: Boolean = false,
@@ -72,7 +72,7 @@ fun SendVoice(
    voice: InputFile,
    entities: TextSourcesList,
    threadId: MessageThreadId? = chatId.threadId,
-    directMessageThreadId: DirectMessageThreadId? = chatId.directMessageThreadId,
+    directMessageThreadId: DirectMessageThreadId?,// = chatId.directMessageThreadId,
    businessConnectionId: BusinessConnectionId? = chatId.businessConnectionId,
    duration: Long? = null,
    disableNotification: Boolean = false,
--- 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
@@ -118,7 +118,7 @@ data class SendInvoice(
        startParameter: StartParameter? = null,
        providerData: String? = null,
        threadId: MessageThreadId? = chatId.threadId,
-        directMessageThreadId: DirectMessageThreadId? = chatId.directMessageThreadId,
+        directMessageThreadId: DirectMessageThreadId?,// = chatId.directMessageThreadId,
        disableNotification: Boolean = false,
        protectContent: Boolean = false,
        allowPaidBroadcast: Boolean = false,
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/polls/SendPoll.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/polls/SendPoll.kt
@@ -49,6 +49,7 @@ fun SendPoll(
    isAnonymous: Boolean = true,
    isClosed: Boolean = false,
    threadId: MessageThreadId? = chatId.threadId,
+    directMessageThreadId: DirectMessageThreadId?/* = chatId.directMessageThreadId*/,
    businessConnectionId: BusinessConnectionId? = chatId.businessConnectionId,
    disableNotification: Boolean = false,
    protectContent: Boolean = false,
@@ -63,6 +64,7 @@ fun SendPoll(
    isAnonymous,
    isClosed,
    threadId = threadId,
+    directMessageThreadId = directMessageThreadId,
    businessConnectionId = businessConnectionId,
    protectContent = protectContent,
    allowPaidBroadcast = allowPaidBroadcast,
@@ -78,6 +80,7 @@ fun SendPoll(
    isAnonymous: Boolean = true,
    isClosed: Boolean = false,
    threadId: MessageThreadId? = chatId.threadId,
+    directMessageThreadId: DirectMessageThreadId?/* = chatId.directMessageThreadId*/,
    businessConnectionId: BusinessConnectionId? = chatId.businessConnectionId,
    disableNotification: Boolean = false,
    protectContent: Boolean = false,
@@ -91,6 +94,7 @@ fun SendPoll(
    isAnonymous = isAnonymous,
    isClosed = isClosed,
    threadId = threadId,
+    directMessageThreadId = directMessageThreadId,
    businessConnectionId = businessConnectionId,
    protectContent = protectContent,
    allowPaidBroadcast = allowPaidBroadcast,
@@ -106,6 +110,7 @@ fun SendPoll(
 fun Poll.createRequest(
    chatId: ChatIdentifier,
    threadId: MessageThreadId? = chatId.threadId,
+    directMessageThreadId: DirectMessageThreadId?/* = chatId.directMessageThreadId*/,
    businessConnectionId: BusinessConnectionId? = chatId.businessConnectionId,
    disableNotification: Boolean = false,
    protectContent: Boolean = false,
@@ -123,6 +128,7 @@ fun Poll.createRequest(
        isClosed = isClosed,
        allowMultipleAnswers = allowMultipleAnswers,
        threadId = threadId,
+        directMessageThreadId = directMessageThreadId,
        businessConnectionId = businessConnectionId,
        disableNotification = disableNotification,
        protectContent = protectContent,
@@ -142,6 +148,7 @@ fun Poll.createRequest(
            isAnonymous = isAnonymous,
            isClosed = isClosed,
            threadId = threadId,
+            directMessageThreadId = directMessageThreadId,
            businessConnectionId = businessConnectionId,
            disableNotification = disableNotification,
            protectContent = protectContent,
@@ -159,6 +166,7 @@ fun Poll.createRequest(
        isClosed = isClosed,
        allowMultipleAnswers = false,
        threadId = threadId,
+        directMessageThreadId = directMessageThreadId,
        businessConnectionId = businessConnectionId,
        disableNotification = disableNotification,
        protectContent = protectContent,
@@ -176,6 +184,7 @@ fun Poll.createRequest(
        isClosed = isClosed,
        allowMultipleAnswers = false,
        threadId = threadId,
+        directMessageThreadId = directMessageThreadId,
        businessConnectionId = businessConnectionId,
        disableNotification = disableNotification,
        protectContent = protectContent,
--- 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
@@ -93,7 +93,7 @@ class SendQuizPoll internal constructor(
        openPeriod: LongSeconds? = null,
        closeDate: LongSeconds? = null,
        threadId: MessageThreadId? = chatId.threadId,
-        directMessageThreadId: DirectMessageThreadId? = chatId.directMessageThreadId,
+        directMessageThreadId: DirectMessageThreadId?,// = chatId.directMessageThreadId,
        businessConnectionId: BusinessConnectionId? = chatId.businessConnectionId,
        disableNotification: Boolean = false,
        protectContent: Boolean = false,
@@ -138,7 +138,7 @@ class SendQuizPoll internal constructor(
        openPeriod: LongSeconds? = null,
        closeDate: LongSeconds? = null,
        threadId: MessageThreadId? = chatId.threadId,
-        directMessageThreadId: DirectMessageThreadId? = chatId.directMessageThreadId,
+        directMessageThreadId: DirectMessageThreadId?,// = chatId.directMessageThreadId,
        businessConnectionId: BusinessConnectionId? = chatId.businessConnectionId,
        disableNotification: Boolean = false,
        protectContent: Boolean = false,
@@ -183,7 +183,7 @@ class SendQuizPoll internal constructor(
        openPeriod: LongSeconds? = null,
        closeDate: LongSeconds? = null,
        threadId: MessageThreadId? = chatId.threadId,
-        directMessageThreadId: DirectMessageThreadId? = chatId.directMessageThreadId,
+        directMessageThreadId: DirectMessageThreadId?,// = chatId.directMessageThreadId,
        businessConnectionId: BusinessConnectionId? = chatId.businessConnectionId,
        disableNotification: Boolean = false,
        protectContent: Boolean = false,
@@ -227,7 +227,7 @@ class SendQuizPoll internal constructor(
        openPeriod: LongSeconds? = null,
        closeDate: LongSeconds? = null,
        threadId: MessageThreadId? = chatId.threadId,
-        directMessageThreadId: DirectMessageThreadId? = chatId.directMessageThreadId,
+        directMessageThreadId: DirectMessageThreadId?,// = chatId.directMessageThreadId,
        businessConnectionId: BusinessConnectionId? = chatId.businessConnectionId,
        disableNotification: Boolean = false,
        protectContent: Boolean = false,
@@ -287,7 +287,7 @@ fun SendQuizPoll(
    isAnonymous: Boolean = true,
    isClosed: Boolean = false,
    threadId: MessageThreadId? = chatId.threadId,
-    directMessageThreadId: DirectMessageThreadId? = chatId.directMessageThreadId,
+    directMessageThreadId: DirectMessageThreadId?,// = chatId.directMessageThreadId,
    businessConnectionId: BusinessConnectionId? = chatId.businessConnectionId,
    disableNotification: Boolean = false,
    protectContent: Boolean = false,
@@ -329,7 +329,7 @@ fun SendQuizPoll(
    isAnonymous: Boolean = true,
    isClosed: Boolean = false,
    threadId: MessageThreadId? = chatId.threadId,
-    directMessageThreadId: DirectMessageThreadId? = chatId.directMessageThreadId,
+    directMessageThreadId: DirectMessageThreadId?,// = chatId.directMessageThreadId,
    businessConnectionId: BusinessConnectionId? = chatId.businessConnectionId,
    disableNotification: Boolean = false,
    protectContent: Boolean = false,
@@ -370,7 +370,7 @@ fun SendQuizPoll(
    isAnonymous: Boolean = true,
    isClosed: Boolean = false,
    threadId: MessageThreadId? = chatId.threadId,
-    directMessageThreadId: DirectMessageThreadId? = chatId.directMessageThreadId,
+    directMessageThreadId: DirectMessageThreadId?,// = chatId.directMessageThreadId,
    businessConnectionId: BusinessConnectionId? = chatId.businessConnectionId,
    disableNotification: Boolean = false,
    protectContent: Boolean = false,
@@ -410,7 +410,7 @@ fun SendQuizPoll(
    isAnonymous: Boolean = true,
    isClosed: Boolean = false,
    threadId: MessageThreadId? = chatId.threadId,
-    directMessageThreadId: DirectMessageThreadId? = chatId.directMessageThreadId,
+    directMessageThreadId: DirectMessageThreadId?,// = chatId.directMessageThreadId,
    businessConnectionId: BusinessConnectionId? = chatId.businessConnectionId,
    disableNotification: Boolean = false,
    protectContent: Boolean = false,
--- 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
@@ -79,7 +79,7 @@ class SendRegularPoll private constructor(
        openPeriod: LongSeconds?= null,
        closeDate: LongSeconds? = null,
        threadId: MessageThreadId? = chatId.threadId,
-        directMessageThreadId: DirectMessageThreadId? = chatId.directMessageThreadId,
+        directMessageThreadId: DirectMessageThreadId?,// = chatId.directMessageThreadId,
        businessConnectionId: BusinessConnectionId? = chatId.businessConnectionId,
        disableNotification: Boolean = false,
        protectContent: Boolean = false,
@@ -120,7 +120,7 @@ class SendRegularPoll private constructor(
        openPeriod: LongSeconds?= null,
        closeDate: LongSeconds? = null,
        threadId: MessageThreadId? = chatId.threadId,
-        directMessageThreadId: DirectMessageThreadId? = chatId.directMessageThreadId,
+        directMessageThreadId: DirectMessageThreadId?,// = chatId.directMessageThreadId,
        businessConnectionId: BusinessConnectionId? = chatId.businessConnectionId,
        disableNotification: Boolean = false,
        protectContent: Boolean = false,
@@ -170,7 +170,7 @@ fun SendRegularPoll(
    isClosed: Boolean = false,
    allowMultipleAnswers: Boolean = false,
    threadId: MessageThreadId? = chatId.threadId,
-    directMessageThreadId: DirectMessageThreadId? = chatId.directMessageThreadId,
+    directMessageThreadId: DirectMessageThreadId?,// = chatId.directMessageThreadId,
    businessConnectionId: BusinessConnectionId? = chatId.businessConnectionId,
    disableNotification: Boolean = false,
    protectContent: Boolean = false,
@@ -208,7 +208,7 @@ fun SendRegularPoll(
    isClosed: Boolean = false,
    allowMultipleAnswers: Boolean = false,
    threadId: MessageThreadId? = chatId.threadId,
-    directMessageThreadId: DirectMessageThreadId? = chatId.directMessageThreadId,
+    directMessageThreadId: DirectMessageThreadId?,// = chatId.directMessageThreadId,
    businessConnectionId: BusinessConnectionId? = chatId.businessConnectionId,
    disableNotification: Boolean = false,
    protectContent: Boolean = false,
@@ -244,7 +244,7 @@ fun SendRegularPoll(
    isClosed: Boolean = false,
    allowMultipleAnswers: Boolean = false,
    threadId: MessageThreadId? = chatId.threadId,
-    directMessageThreadId: DirectMessageThreadId? = chatId.directMessageThreadId,
+    directMessageThreadId: DirectMessageThreadId?,// = chatId.directMessageThreadId,
    businessConnectionId: BusinessConnectionId? = chatId.businessConnectionId,
    disableNotification: Boolean = false,
    protectContent: Boolean = false,
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/suggested/ApproveSuggestedPost.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/suggested/ApproveSuggestedPost.kt
@@ -17,6 +17,7 @@ import kotlinx.serialization.builtins.serializer

@Serializable
 data class ApproveSuggestedPost(
+    @Suppress("SERIALIZER_TYPE_INCOMPATIBLE")
    @SerialName(chatIdField)
    @Serializable(ChatIdentifierSerializer::class)
    override val chatId: IdChatIdentifier,
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/suggested/DeclineSuggestedPost.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/suggested/DeclineSuggestedPost.kt
@@ -2,16 +2,12 @@ package dev.inmo.tgbotapi.requests.suggested

 import dev.inmo.tgbotapi.abstracts.types.ChatRequest
 import dev.inmo.tgbotapi.requests.abstracts.SimpleRequest
-import dev.inmo.tgbotapi.types.ChatIdentifier
 import dev.inmo.tgbotapi.types.ChatIdentifierSerializer
 import dev.inmo.tgbotapi.types.IdChatIdentifier
 import dev.inmo.tgbotapi.types.MessageId
-import dev.inmo.tgbotapi.types.MessageIdentifier
-import dev.inmo.tgbotapi.types.TelegramDate
 import dev.inmo.tgbotapi.types.chatIdField
 import dev.inmo.tgbotapi.types.commentField
 import dev.inmo.tgbotapi.types.messageIdField
-import dev.inmo.tgbotapi.types.sendDateField
 import kotlinx.serialization.DeserializationStrategy
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
@@ -20,6 +16,7 @@ import kotlinx.serialization.builtins.serializer

@Serializable
 data class DeclineSuggestedPost(
+    @Suppress("SERIALIZER_TYPE_INCOMPATIBLE")
    @SerialName(chatIdField)
    @Serializable(ChatIdentifierSerializer::class)
    override val chatId: IdChatIdentifier,
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/chat/Extended.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/chat/Extended.kt
@@ -11,6 +11,7 @@ import dev.inmo.tgbotapi.types.message.abstracts.TelegramBotAPIMessageDeserializ
 import dev.inmo.tgbotapi.types.reactions.Reaction
 import dev.inmo.tgbotapi.utils.RiskFeature
 import kotlinx.serialization.EncodeDefault
+import kotlinx.serialization.ExperimentalSerializationApi
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.json.JsonObject
@@ -378,6 +379,7 @@ data class ExtendedChannelDirectMessagesChatImpl(
    @SerialName(acceptedGiftTypesField)
    override val acceptedGiftTypes: AcceptedGiftTypes = AcceptedGiftTypes(),
 ) : ExtendedChannelDirectMessagesChat {
+    @OptIn(ExperimentalSerializationApi::class)
    @SerialName(isDirectMessagesField)
    @EncodeDefault
    override val isDirectMessages: Boolean = true
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/chat/Impls.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/chat/Impls.kt
@@ -83,6 +83,7 @@ data class ChannelDirectMessagesChatImpl(
    @SerialName(usernameField)
    override val username: Username? = null
 ) : PreviewChannelDirectMessagesChat {
+    @Suppress("OPT_IN_USAGE")
    @SerialName(isDirectMessagesField)
    @EncodeDefault
    override val isDirectMessages: Boolean = true
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/ChannelPaidPostImpl.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/ChannelPaidPostImpl.kt
@@ -10,6 +10,7 @@ import dev.inmo.tgbotapi.types.chat.User
 import dev.inmo.tgbotapi.types.message.abstracts.*
 import dev.inmo.tgbotapi.types.message.content.MessageContent
 import kotlinx.serialization.EncodeDefault
+import kotlinx.serialization.ExperimentalSerializationApi
 import kotlinx.serialization.SerialName

 data class ChannelPaidPostImpl<T: MessageContent>(
@@ -30,6 +31,7 @@ data class ChannelPaidPostImpl<T: MessageContent>(
    @SerialName(paidMessageStarCountField)
    override val cost: Int? = null,
 ) : ChannelPaidPost<T> {
+    @OptIn(ExperimentalSerializationApi::class)
    @SerialName(isPaidPostField)
    @EncodeDefault
    override val isPaidPost: Boolean = true
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/content/Abstracts.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/content/Abstracts.kt
@@ -150,7 +150,7 @@ sealed interface ResendableContent {
    fun createResend(
        chatId: ChatIdentifier,
        messageThreadId: MessageThreadId? = chatId.threadId,
-        directMessageThreadId: DirectMessageThreadId? = chatId.directMessageThreadId,
+        directMessageThreadId: DirectMessageThreadId?,// = chatId.directMessageThreadId,
        businessConnectionId: BusinessConnectionId? = chatId.businessConnectionId,
        disableNotification: Boolean = false,
        protectContent: Boolean = false,
@@ -163,7 +163,7 @@ sealed interface ResendableContent {
    fun createResend(
        chatId: ChatIdentifier,
        messageThreadId: MessageThreadId? = chatId.threadId,
-        directMessageThreadId: DirectMessageThreadId? = chatId.directMessageThreadId,
+        directMessageThreadId: DirectMessageThreadId?,// = chatId.directMessageThreadId,
        businessConnectionId: BusinessConnectionId? = chatId.businessConnectionId,
        disableNotification: Boolean = false,
        protectContent: Boolean = false,
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/content/AnimationContent.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/content/AnimationContent.kt
@@ -44,6 +44,7 @@ data class AnimationContent(
        width = media.width,
        height = media.height,
        threadId = messageThreadId,
+        directMessageThreadId = directMessageThreadId,
        businessConnectionId = businessConnectionId,
        disableNotification = disableNotification,
        protectContent = protectContent,
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/content/AudioContent.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/content/AudioContent.kt
@@ -39,6 +39,7 @@ data class AudioContent(
        performer = media.performer,
        title = media.title,
        threadId = messageThreadId,
+        directMessageThreadId = directMessageThreadId,
        businessConnectionId = businessConnectionId,
        disableNotification = disableNotification,
        protectContent = protectContent,
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/content/ContactContent.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/content/ContactContent.kt
@@ -27,6 +27,7 @@ data class ContactContent(
        chatId = chatId,
        contact = contact,
        threadId = messageThreadId,
+        directMessageThreadId = directMessageThreadId,
        businessConnectionId = businessConnectionId,
        disableNotification = disableNotification,
        protectContent = protectContent,
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/content/DocumentContent.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/content/DocumentContent.kt
@@ -39,6 +39,7 @@ data class DocumentContent(
        thumbnail = media.thumbnail ?.fileId,
        entities = textSources,
        threadId = messageThreadId,
+        directMessageThreadId = directMessageThreadId,
        businessConnectionId = businessConnectionId,
        disableNotification = disableNotification,
        protectContent = protectContent,
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/content/LocationContent.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/content/LocationContent.kt
@@ -114,6 +114,7 @@ data class LiveLocationContent(
        heading = location.heading,
        proximityAlertRadius = location.proximityAlertRadius,
        threadId = messageThreadId,
+        directMessageThreadId = directMessageThreadId,
        businessConnectionId = businessConnectionId,
        disableNotification = disableNotification,
        protectContent = protectContent,
@@ -148,6 +149,7 @@ data class StaticLocationContent(
        latitude = location.latitude,
        longitude = location.longitude,
        threadId = messageThreadId,
+        directMessageThreadId = directMessageThreadId,
        businessConnectionId = businessConnectionId,
        disableNotification = disableNotification,
        protectContent = protectContent,
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/content/MediaGroupContent.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/content/MediaGroupContent.kt
@@ -46,6 +46,7 @@ data class MediaGroupContent<T : MediaGroupPartContent>(
        chatId = chatId,
        media = group.map { it.content.toMediaGroupMemberTelegramMedia() },
        threadId = messageThreadId,
+        directMessageThreadId = directMessageThreadId,
        businessConnectionId = businessConnectionId,
        disableNotification = disableNotification,
        protectContent = protectContent,
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/content/PaidMediaInfoContent.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/content/PaidMediaInfoContent.kt
@@ -50,6 +50,7 @@ data class PaidMediaInfoContent(
        entities = textSources,
        showCaptionAboveMedia = showCaptionAboveMedia,
        threadId = messageThreadId,
+        directMessageThreadId = directMessageThreadId,
        businessConnectionId = businessConnectionId,
        disableNotification = disableNotification,
        protectContent = protectContent,
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/content/PhotoContent.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/content/PhotoContent.kt
@@ -42,6 +42,7 @@ data class PhotoContent(
        showCaptionAboveMedia = showCaptionAboveMedia,
        spoilered = spoilered,
        threadId = messageThreadId,
+        directMessageThreadId = directMessageThreadId,
        businessConnectionId = businessConnectionId,
        disableNotification = disableNotification,
        protectContent = protectContent,
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/content/PollContent.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/content/PollContent.kt
@@ -27,6 +27,7 @@ data class PollContent(
    ): Request<ContentMessage<PollContent>> = poll.createRequest(
        chatId = chatId,
        threadId = messageThreadId,
+        directMessageThreadId = directMessageThreadId,
        businessConnectionId = businessConnectionId,
        disableNotification = disableNotification,
        protectContent = protectContent,
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/content/StickerContent.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/content/StickerContent.kt
@@ -29,6 +29,7 @@ data class StickerContent(
        chatId = chatId,
        sticker = media.fileId,
        threadId = messageThreadId,
+        directMessageThreadId = directMessageThreadId,
        businessConnectionId = businessConnectionId,
        disableNotification = disableNotification,
        protectContent = protectContent,
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/content/VenueContent.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/content/VenueContent.kt
@@ -28,6 +28,7 @@ data class VenueContent(
        chatId = chatId,
        venue = venue,
        threadId = messageThreadId,
+        directMessageThreadId = directMessageThreadId,
        businessConnectionId = businessConnectionId,
        disableNotification = disableNotification,
        protectContent = protectContent,
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/content/VideoContent.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/content/VideoContent.kt
@@ -46,6 +46,7 @@ data class VideoContent(
        height = media.height,
        supportStreaming = null,
        threadId = messageThreadId,
+        directMessageThreadId = directMessageThreadId,
        businessConnectionId = businessConnectionId,
        disableNotification = disableNotification,
        protectContent = protectContent,
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/content/VideoNoteContent.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/content/VideoNoteContent.kt
@@ -32,6 +32,7 @@ data class VideoNoteContent(
        duration = media.duration,
        size = media.width,
        threadId = messageThreadId,
+        directMessageThreadId = directMessageThreadId,
        businessConnectionId = businessConnectionId,
        disableNotification = disableNotification,
        protectContent = protectContent,
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/content/VoiceContent.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/content/VoiceContent.kt
@@ -34,6 +34,7 @@ data class VoiceContent(
        voice = media.fileId,
        entities = textSources,
        threadId = messageThreadId,
+        directMessageThreadId = directMessageThreadId,
        businessConnectionId = businessConnectionId,
        duration = media.duration,
        disableNotification = disableNotification,
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/utils/extensions/OptionalDirectMessageThreadId.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/utils/extensions/OptionalDirectMessageThreadId.kt
@@ -0,0 +1,8 @@
+package dev.inmo.tgbotapi.utils.extensions
+
+import dev.inmo.tgbotapi.types.message.abstracts.ChannelDirectMessagesContentMessage
+import dev.inmo.tgbotapi.types.message.abstracts.Message
+import dev.inmo.tgbotapi.types.message.abstracts.PossiblyTopicMessage
+
+val Message.directMessageThreadIdOrNull
+    get() = (this as? ChannelDirectMessagesContentMessage<*>) ?.directMessageTopic ?.threadId