Apply thread draft updates.

levlam · levlam · commit 22d9f4b3fb11 · 2025-10-20T18:08:26.000+03:00
diff --git a/td/telegram/ForumTopic.cpp b/td/telegram/ForumTopic.cpp
@@ -89,8 +89,7 @@ bool ForumTopic::update_unread_reaction_count(int32 count, bool is_relative) {
   return true;
 }
 
-bool ForumTopic::set_draft_message(unique_ptr<DraftMessage> &&draft_message) {
-  bool from_update = false;
+bool ForumTopic::set_draft_message(unique_ptr<DraftMessage> &&draft_message, bool from_update) {
   if (!need_update_draft_message(draft_message_, draft_message, from_update)) {
     return false;
   }
diff --git a/td/telegram/ForumTopic.h b/td/telegram/ForumTopic.h
@@ -61,7 +61,7 @@ class ForumTopic {
     return true;
   }
 
-  bool set_draft_message(unique_ptr<DraftMessage> &&draft_message);
+  bool set_draft_message(unique_ptr<DraftMessage> &&draft_message, bool from_update);
 
   DialogNotificationSettings *get_notification_settings() {
     return &notification_settings_;
diff --git a/td/telegram/ForumTopicManager.cpp b/td/telegram/ForumTopicManager.cpp
@@ -677,7 +677,7 @@ void ForumTopicManager::on_update_forum_topic_draft_message(DialogId dialog_id,
   if (topic == nullptr || topic->topic_ == nullptr) {
     return;
   }
-  if (topic->topic_->set_draft_message(std::move(draft_message))) {
+  if (topic->topic_->set_draft_message(std::move(draft_message), true)) {
     on_forum_topic_changed(dialog_id, topic);
   }
 }
@@ -780,7 +780,7 @@ Status ForumTopicManager::set_forum_topic_draft_message(DialogId dialog_id, Foru
   if (topic == nullptr || topic->topic_ == nullptr) {
     return Status::Error(400, "Topic not found");
   }
-  if (topic->topic_->set_draft_message(std::move(draft_message))) {
+  if (topic->topic_->set_draft_message(std::move(draft_message), false)) {
     save_draft_message(td_, dialog_id, MessageTopic::forum(dialog_id, forum_topic_id),
                        topic->topic_->get_draft_message(), Promise<Unit>());
     on_forum_topic_changed(dialog_id, topic);
diff --git a/td/telegram/MessagesManager.cpp b/td/telegram/MessagesManager.cpp
@@ -27687,7 +27687,17 @@ void MessagesManager::on_update_dialog_draft_message(
       return td_->forum_topic_manager_->on_update_forum_topic_draft_message(
           dialog_id, message_topic.get_forum_topic_id(), std::move(new_draft_message));
     }
-    // TODO update thread message draft
+    if (message_topic.is_thread()) {
+      auto m = get_message_force(d, top_thread_message_id, "on_update_dialog_draft_message");
+      if (m == nullptr || m->reply_info.is_comment_ || !is_active_message_reply_info(d->dialog_id, m->reply_info)) {
+        return;
+      }
+      if (need_update_draft_message(m->thread_draft_message, new_draft_message, true)) {
+        m->thread_draft_message = std::move(new_draft_message);
+        on_message_changed(d, m, false, "on_update_dialog_draft_message");
+      }
+      return;
+    }
     return;
   }
 

Original file line number	Diff line number	Diff line change
`@@ -89,8 +89,7 @@ bool ForumTopic::update_unread_reaction_count(int32 count, bool is_relative) {`
`89`	`89`	`return true;`
`90`	`90`	`}`
`91`	`91`
`92`		`-bool ForumTopic::set_draft_message(unique_ptr<DraftMessage> &&draft_message) {`
`93`		`- bool from_update = false;`
	`92`	`+bool ForumTopic::set_draft_message(unique_ptr<DraftMessage> &&draft_message, bool from_update) {`
`94`	`93`	`if (!need_update_draft_message(draft_message_, draft_message, from_update)) {`
`95`	`94`	`return false;`
`96`	`95`	`}`
Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ class ForumTopic {`
`61`	`61`	`return true;`
`62`	`62`	`}`
`63`	`63`
`64`		`- bool set_draft_message(unique_ptr<DraftMessage> &&draft_message);`
	`64`	`+ bool set_draft_message(unique_ptr<DraftMessage> &&draft_message, bool from_update);`
`65`	`65`
`66`	`66`	`DialogNotificationSettings *get_notification_settings() {`
`67`	`67`	`return &notification_settings_;`
Original file line number	Diff line number	Diff line change
`@@ -677,7 +677,7 @@ void ForumTopicManager::on_update_forum_topic_draft_message(DialogId dialog_id,`
`677`	`677`	`if (topic == nullptr \|\| topic->topic_ == nullptr) {`
`678`	`678`	`return;`
`679`	`679`	`}`
`680`		`- if (topic->topic_->set_draft_message(std::move(draft_message))) {`
	`680`	`+ if (topic->topic_->set_draft_message(std::move(draft_message), true)) {`
`681`	`681`	`on_forum_topic_changed(dialog_id, topic);`
`682`	`682`	`}`
`683`	`683`	`}`
`@@ -780,7 +780,7 @@ Status ForumTopicManager::set_forum_topic_draft_message(DialogId dialog_id, Foru`
`780`	`780`	`if (topic == nullptr \|\| topic->topic_ == nullptr) {`
`781`	`781`	`return Status::Error(400, "Topic not found");`
`782`	`782`	`}`
`783`		`- if (topic->topic_->set_draft_message(std::move(draft_message))) {`
	`783`	`+ if (topic->topic_->set_draft_message(std::move(draft_message), false)) {`
`784`	`784`	`save_draft_message(td_, dialog_id, MessageTopic::forum(dialog_id, forum_topic_id),`
`785`	`785`	`topic->topic_->get_draft_message(), Promise<Unit>());`
`786`	`786`	`on_forum_topic_changed(dialog_id, topic);`