Add basic checks for checklist_task_id.

levlam · levlam · commit 9768de921439 · 2025-08-10T16:27:52.000+03:00
diff --git a/td/telegram/BusinessConnectionManager.cpp b/td/telegram/BusinessConnectionManager.cpp
@@ -1167,7 +1167,7 @@ MessageInputReplyTo BusinessConnectionManager::create_business_message_input_rep
         return {};
       }
       return MessageInputReplyTo{message_id, DialogId(), MessageQuote(td_, std::move(reply_to_message->quote_)),
-                                 reply_to_message->checklist_task_id_};
+                                 max(0, reply_to_message->checklist_task_id_)};
     }
     case td_api::inputMessageReplyToExternalMessage::ID:
       return {};
diff --git a/td/telegram/MessagesManager.cpp b/td/telegram/MessagesManager.cpp
@@ -20384,6 +20384,7 @@ MessageInputReplyTo MessagesManager::create_message_input_reply_to(
       if (!can_reply_to_message(d->dialog_id, message_id)) {
         message_id = {};
       }
+      auto checklist_task_id = max(0, reply_to_message->checklist_task_id_);
       const Message *m = get_message_force(d, message_id, "create_message_input_reply_to 2");
       if (m == nullptr) {
         if (message_id.is_server() && d->dialog_id.get_type() != DialogType::SecretChat &&
@@ -20392,7 +20393,7 @@ MessageInputReplyTo MessagesManager::create_message_input_reply_to(
              message_id <= d->notification_info->max_push_notification_message_id_)) {
           // allow to reply to yet unreceived server message in the same chat
           return MessageInputReplyTo{message_id, DialogId(), MessageQuote{td_, std::move(reply_to_message->quote_)},
-                                     reply_to_message->checklist_task_id_};
+                                     checklist_task_id};
         }
         if (!for_draft && top_thread_message_id.is_valid()) {
           return MessageInputReplyTo{top_thread_message_id, DialogId(), MessageQuote(), 0};
@@ -20403,8 +20404,11 @@ MessageInputReplyTo MessagesManager::create_message_input_reply_to(
         // TODO replies to yet unsent messages can be allowed with special handling of them on application restart
         return {};
       }
+      if (checklist_task_id != 0 && m->content->get_type() != MessageContentType::ToDoList) {
+        checklist_task_id = 0;
+      }
       return MessageInputReplyTo{m->message_id, DialogId(), MessageQuote{td_, std::move(reply_to_message->quote_)},
-                                 reply_to_message->checklist_task_id_};
+                                 checklist_task_id};
     }
     case td_api::inputMessageReplyToExternalMessage::ID: {
       auto reply_to_message = td_api::move_object_as<td_api::inputMessageReplyToExternalMessage>(reply_to);
@@ -20426,8 +20430,12 @@ MessageInputReplyTo MessagesManager::create_message_input_reply_to(
         LOG(INFO) << "Can't reply in another chat " << message_id << " in " << reply_d->dialog_id;
         return {};
       }
+      auto checklist_task_id = max(0, reply_to_message->checklist_task_id_);
+      if (checklist_task_id != 0 && m != nullptr && m->content->get_type() != MessageContentType::ToDoList) {
+        checklist_task_id = 0;
+      }
       return MessageInputReplyTo{m->message_id, reply_dialog_id, MessageQuote{td_, std::move(reply_to_message->quote_)},
-                                 reply_to_message->checklist_task_id_};
+                                 checklist_task_id};
     }
     default:
       UNREACHABLE();

Original file line number	Diff line number	Diff line change
`@@ -1167,7 +1167,7 @@ MessageInputReplyTo BusinessConnectionManager::create_business_message_input_rep`
`1167`	`1167`	`return {};`
`1168`	`1168`	`}`
`1169`	`1169`	`return MessageInputReplyTo{message_id, DialogId(), MessageQuote(td_, std::move(reply_to_message->quote_)),`
`1170`		`- reply_to_message->checklist_task_id_};`
	`1170`	`+ max(0, reply_to_message->checklist_task_id_)};`
`1171`	`1171`	`}`
`1172`	`1172`	`case td_api::inputMessageReplyToExternalMessage::ID:`
`1173`	`1173`	`return {};`