Remove self_destruct_type from QuickReplyMessage.

td/generate/scheme/td_api.tl

@@ -3727,11 +3727,10 @@ storyInteractions total_count:int32 total_forward_count:int32 total_reaction_cou
 //@sending_state The sending state of the message; may be null if the message isn't being sent and didn't fail to be sent
 //@forward_info Information about the initial message sender; may be null if none or unknown
 //@reply_to_message_id Information about the identifier of the quick reply message to which the message replies
-//@self_destruct_type The message's self-destruct type; may be null if none
 //@via_bot_user_id If non-zero, the user identifier of the bot through which this message was sent
 //@media_album_id Unique identifier of an album this message belongs to. Only audios, documents, photos and videos can be grouped together in albums
 //@content Content of the message
-quickReplyMessage id:int53 sending_state:MessageSendingState forward_info:messageForwardInfo reply_to_message_id:int53 self_destruct_type:MessageSelfDestructType via_bot_user_id:int53 media_album_id:int64 content:MessageContent = QuickReplyMessage;
+quickReplyMessage id:int53 sending_state:MessageSendingState forward_info:messageForwardInfo reply_to_message_id:int53 via_bot_user_id:int53 media_album_id:int64 content:MessageContent = QuickReplyMessage;
 
 
 //@class PublicForward @description Describes a public forward or repost of a story

td/telegram/QuickReplyManager.cpp

@@ -13,6 +13,7 @@
 #include "td/telegram/MessageContent.h"
 #include "td/telegram/MessageForwardInfo.h"
 #include "td/telegram/MessageReplyHeader.h"
+#include "td/telegram/MessageSelfDestructType.h"
 #include "td/telegram/RepliedMessageInfo.h"
 #include "td/telegram/Td.h"
 
@@ -49,7 +50,6 @@ unique_ptr<QuickReplyManager::QuickReplyMessage> QuickReplyManager::create_messa
           message->media_unread_ || message->reply_markup_ != nullptr || !message->restriction_reason_.empty() ||
           !message->post_author_.empty() || message->from_boosts_applied_ != 0 || message->saved_peer_id_ != nullptr) {
         LOG(ERROR) << "Receive an invalid quick reply from " << source << ": " << to_string(message);
-        break;
       }
 
       auto message_id = MessageId::get_message_id(message_ptr, false);
@@ -86,32 +86,22 @@ unique_ptr<QuickReplyManager::QuickReplyMessage> QuickReplyManager::create_messa
       }
       auto reply_to_message_id = reply_header.replied_message_info_.get_same_chat_reply_to_message_id(true);
 
-      auto content_type = content->get_type();
-      bool is_content_secret =
-          ttl.is_secret_message_content(content_type);  // must be calculated before TTL is adjusted
       if (!ttl.is_empty()) {
-        if (!ttl.is_valid()) {
         LOG(ERROR) << "Wrong " << ttl << " received in " << message_id << " from " << source;
-          ttl = {};
-        } else {
-          ttl.ensure_at_least(get_message_content_duration(content.get(), td_) + 1);
-        }
       }
 
+      auto content_type = content->get_type();
       if (is_expired_message_content(content_type)) {
         LOG(ERROR) << "Receive " << content_type << " from " << source;
-        break;
       }
 
       auto result = make_unique<QuickReplyMessage>();
       result->message_id = message_id;
-      result->ttl = ttl;
       result->disable_web_page_preview = disable_web_page_preview;
       result->forward_info = MessageForwardInfo::get_message_forward_info(td_, std::move(forward_header));
       result->reply_to_message_id = reply_to_message_id;
       result->via_bot_user_id = via_bot_user_id;
       result->disable_notification = message->silent_;
-      result->is_content_secret = is_content_secret;
       result->legacy_layer = (message->legacy_ ? MTPROTO_LAYER : 0);
       result->invert_media = message->invert_media_;
       result->content = std::move(content);
@@ -190,8 +180,8 @@ td_api::object_ptr<td_api::MessageSendingState> QuickReplyManager::get_message_s
 
 td_api::object_ptr<td_api::MessageContent> QuickReplyManager::get_quick_reply_message_message_content_object(
     const QuickReplyMessage *m) const {
-  return get_message_content_object(m->content.get(), td_, DialogId(), 0, m->is_content_secret, true, -1,
+  return get_message_content_object(m->content.get(), td_, DialogId(), 0, false, true, -1, m->invert_media,
-                                    m->invert_media, m->disable_web_page_preview);
+                                    m->disable_web_page_preview);
 }
 
 td_api::object_ptr<td_api::quickReplyMessage> QuickReplyManager::get_quick_reply_message_object(
@@ -201,7 +191,6 @@ td_api::object_ptr<td_api::quickReplyMessage> QuickReplyManager::get_quick_reply
       m->forward_info == nullptr ? nullptr : m->forward_info->get_message_forward_info_object(td_, false);
   return td_api::make_object<td_api::quickReplyMessage>(
       m->message_id.get(), get_message_sending_state_object(m), std::move(forward_info), m->reply_to_message_id.get(),
-      m->ttl.get_message_self_destruct_type_object(),
       td_->contacts_manager_->get_user_id_object(m->via_bot_user_id, "via_bot_user_id"), m->media_album_id,
       get_quick_reply_message_message_content_object(m));
 }

td/telegram/QuickReplyManager.h

@@ -8,7 +8,6 @@
 
 #include "td/telegram/DialogId.h"
 #include "td/telegram/MessageId.h"
-#include "td/telegram/MessageSelfDestructType.h"
 #include "td/telegram/td_api.h"
 #include "td/telegram/UserId.h"
 
@@ -44,7 +43,6 @@ class QuickReplyManager final : public Actor {
 
     bool is_failed_to_send = false;
     bool disable_notification = false;
-    bool is_content_secret = false;  // must be shown only while tapped
     bool noforwards = false;
     bool invert_media = false;
 
@@ -63,8 +61,6 @@ class QuickReplyManager final : public Actor {
     string send_error_message;
     double try_resend_at = 0;
 
-    MessageSelfDestructType ttl;
-
     int64 media_album_id = 0;
 
     unique_ptr<MessageContent> content;