From 20de4b3135f2254df795e33f824f0819a033de1c Mon Sep 17 00:00:00 2001 From: levlam Date: Tue, 17 Oct 2023 16:20:45 +0300 Subject: [PATCH] Remove get_message_content_object parameter. --- td/telegram/MessageContent.cpp | 9 ++++----- td/telegram/MessageContent.h | 3 +-- td/telegram/MessagesManager.cpp | 15 +++++++-------- td/telegram/SponsoredMessageManager.cpp | 2 +- 4 files changed, 13 insertions(+), 16 deletions(-) diff --git a/td/telegram/MessageContent.cpp b/td/telegram/MessageContent.cpp index 5353b8d6c..dfee39fe4 100644 --- a/td/telegram/MessageContent.cpp +++ b/td/telegram/MessageContent.cpp @@ -3917,8 +3917,8 @@ void merge_message_contents(Td *td, const MessageContent *old_content, MessageCo const auto *old_ = static_cast(old_content); const auto *new_ = static_cast(new_content); auto get_content_object = [td, dialog_id](const MessageContent *content) { - return to_string(get_message_content_object(content, td, dialog_id, -1, false, false, - std::numeric_limits::max(), false)); + return to_string( + get_message_content_object(content, td, dialog_id, -1, false, false, std::numeric_limits::max())); }; if (old_->text.text != new_->text.text) { if (need_message_changed_warning && need_message_text_changed_warning(old_, new_)) { @@ -6086,8 +6086,7 @@ unique_ptr get_action_message_content(Td *td, tl_object_ptr get_message_content_object(const MessageContent *content, Td *td, DialogId dialog_id, int32 message_date, bool is_content_secret, bool skip_bot_commands, - int32 max_media_timestamp, - bool disable_web_page_preview) { + int32 max_media_timestamp) { CHECK(content != nullptr); switch (content->get_type()) { case MessageContentType::Animation: { @@ -6166,7 +6165,7 @@ tl_object_ptr get_message_content_object(const MessageCo return make_tl_object( get_formatted_text_object(m->text, skip_bot_commands, max_media_timestamp), td->web_pages_manager_->get_web_page_object(m->web_page_id, m->force_small_media, m->force_large_media), - disable_web_page_preview ? string() : m->web_page_url); + m->web_page_url); } case MessageContentType::Unsupported: return make_tl_object(); diff --git a/td/telegram/MessageContent.h b/td/telegram/MessageContent.h index 4c8eed7ee..5b1b6aa56 100644 --- a/td/telegram/MessageContent.h +++ b/td/telegram/MessageContent.h @@ -223,8 +223,7 @@ unique_ptr get_action_message_content(Td *td, tl_object_ptr get_message_content_object(const MessageContent *content, Td *td, DialogId dialog_id, int32 message_date, bool is_content_secret, bool skip_bot_commands, - int32 max_media_timestamp, - bool disable_web_page_preview); + int32 max_media_timestamp); FormattedText *get_message_content_text_mutable(MessageContent *content); diff --git a/td/telegram/MessagesManager.cpp b/td/telegram/MessagesManager.cpp index c1a782290..573eabfdd 100644 --- a/td/telegram/MessagesManager.cpp +++ b/td/telegram/MessagesManager.cpp @@ -6564,7 +6564,7 @@ void MessagesManager::on_update_service_notification(tl_object_ptrtd(), &Td::send_update, td_api::make_object( update->type_, get_message_content_object(content.get(), td_, owner_dialog_id, date, - is_content_secret, true, -1, disable_web_page_preview))); + is_content_secret, true, -1))); } if (has_date && is_user) { Dialog *d = get_service_notifications_dialog(); @@ -14609,8 +14609,7 @@ std::pair> MessagesManager::creat LOG(ERROR) << "Receive media group identifier " << message_info.media_album_id << " in " << message_id << " from " << dialog_id << " with content " << oneline(to_string(get_message_content_object(message->content.get(), td_, dialog_id, - message->date, is_content_secret, false, -1, - message->disable_web_page_preview))); + message->date, is_content_secret, false, -1))); } } else { message->media_album_id = message_info.media_album_id; @@ -23998,7 +23997,7 @@ td_api::object_ptr MessagesManager::get_dialog_event_log_messag auto edit_date = m->hide_edit_date ? 0 : m->edit_date; auto reply_markup = get_reply_markup_object(td_->contacts_manager_.get(), m->reply_markup); auto content = get_message_content_object(m->content.get(), td_, dialog_id, 0, false, true, - get_message_own_max_media_timestamp(m), m->disable_web_page_preview); + get_message_own_max_media_timestamp(m)); return td_api::make_object( m->message_id.get(), std::move(sender), get_chat_id_object(dialog_id, "get_dialog_event_log_message_object"), nullptr, nullptr, m->is_outgoing, false, false, false, can_be_saved, false, false, false, false, false, false, @@ -24105,7 +24104,7 @@ tl_object_ptr MessagesManager::get_message_object(DialogId dial auto skip_bot_commands = need_skip_bot_commands(dialog_id, m); auto max_media_timestamp = get_message_max_media_timestamp(m); auto content = get_message_content_object(m->content.get(), td_, dialog_id, live_location_date, m->is_content_secret, - skip_bot_commands, max_media_timestamp, m->disable_web_page_preview); + skip_bot_commands, max_media_timestamp); auto self_destruct_type = [&]() -> td_api::object_ptr { if (m->ttl == 0x7FFFFFFF) { return td_api::make_object(); @@ -25686,7 +25685,7 @@ void MessagesManager::do_send_message_group(int64 media_album_id) { << file_view.has_active_download_remote_location() << " " << file_view.is_encrypted() << " " << is_web << " " << file_view.has_url() << " " << to_string(get_message_content_object(m->content.get(), td_, dialog_id, m->date, - m->is_content_secret, false, -1, m->disable_web_page_preview)); + m->is_content_secret, false, -1)); } auto entities = get_input_message_entities(td_->contacts_manager_.get(), caption, "do_send_message_group"); int32 input_single_media_flags = 0; @@ -30049,7 +30048,7 @@ void MessagesManager::send_update_message_content_impl(DialogId dialog_id, const LOG(INFO) << "Send updateMessageContent for " << m->message_id << " in " << dialog_id << " from " << source; auto content_object = get_message_content_object(m->content.get(), td_, dialog_id, m->is_failed_to_send ? 0 : m->date, m->is_content_secret, need_skip_bot_commands(dialog_id, m), - get_message_max_media_timestamp(m), m->disable_web_page_preview); + get_message_max_media_timestamp(m)); send_closure(G()->td(), &Td::send_update, td_api::make_object(get_chat_id_object(dialog_id, "updateMessageContent"), m->message_id.get(), std::move(content_object))); @@ -32947,7 +32946,7 @@ void MessagesManager::on_send_dialog_action_timeout(DialogId dialog_id) { if (!file_id.is_valid()) { LOG(ERROR) << "Have no file in " << to_string(get_message_content_object(m->content.get(), td_, dialog_id, m->date, m->is_content_secret, - false, -1, m->disable_web_page_preview)); + false, -1)); return; } auto file_view = td_->file_manager_->get_file_view(file_id); diff --git a/td/telegram/SponsoredMessageManager.cpp b/td/telegram/SponsoredMessageManager.cpp index ea6f54e7a..ecbd7c37e 100644 --- a/td/telegram/SponsoredMessageManager.cpp +++ b/td/telegram/SponsoredMessageManager.cpp @@ -291,7 +291,7 @@ td_api::object_ptr SponsoredMessageManager::get_sponso } return td_api::make_object( sponsored_message.local_id, sponsored_message.is_recommended, - get_message_content_object(sponsored_message.content.get(), td_, dialog_id, 0, false, true, -1, false), + get_message_content_object(sponsored_message.content.get(), td_, dialog_id, 0, false, true, -1), std::move(sponsor), sponsored_message.additional_info); }