From 313fcb3325c385acb26f359509e4686a83ac61f8 Mon Sep 17 00:00:00 2001
From: InsanusMokrassar <ovsyannikov.alexey95@gmail.com>
Date: Mon, 29 Jun 2026 23:37:14 +0600
Subject: [PATCH] fix of sendrichmessagedraft

---
 .../inmo/tgbotapi/extensions/api/send/SendRichMessageDraft.kt   | 2 +-
 .../dev/inmo/tgbotapi/requests/send/SendRichMessageDraft.kt     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/SendRichMessageDraft.kt b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/SendRichMessageDraft.kt
index 5f3c7a0257..2002481c74 100644
--- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/SendRichMessageDraft.kt
+++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/SendRichMessageDraft.kt
@@ -10,7 +10,7 @@ public suspend fun TelegramBot.sendRichMessageDraft(
     chatId: ChatId,
     draftId: Long,
     richMessage: InputRichMessage,
-    threadId: MessageThreadId? = null
+    threadId: MessageThreadId? = chatId.threadId
 ): Unit = execute(
     SendRichMessageDraft(
         chatId = chatId,
diff --git a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/SendRichMessageDraft.kt b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/SendRichMessageDraft.kt
index 8d0e842d89..96f4457dd2 100644
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/SendRichMessageDraft.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/SendRichMessageDraft.kt
@@ -33,7 +33,7 @@ data class SendRichMessageDraft(
     @SerialName(richMessageField)
     val richMessage: InputRichMessage,
     @SerialName(messageThreadIdField)
-    val threadId: MessageThreadId? = null
+    val threadId: MessageThreadId? = chatId.threadId
 ) : SimpleRequest<Unit> {
     init {
         require(draftId != 0L) {