tdlight-team/tdlight
tdlight-team/tdlight
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove get_message_content_object parameter.

Browse Source
This commit is contained in:
levlam 2023-10-17 16:20:45 +03:00
parent 1b49787c88
commit 20de4b3135
4 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
td/telegram/MessageContent.cpp
View File

@ -3917,8 +3917,8 @@ void merge_message_contents(Td *td, const MessageContent *old_content, MessageCo
const auto *old_ = static_cast<const MessageText *>(old_content); const auto *old_ = static_cast<const MessageText *>(old_content);
const auto *new_ = static_cast<const MessageText *>(new_content); const auto *new_ = static_cast<const MessageText *>(new_content);
auto get_content_object = [td, dialog_id](const MessageContent *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, return to_string(
std::numeric_limits<int32>::max(), false)); get_message_content_object(content, td, dialog_id, -1, false, false, std::numeric_limits<int32>::max()));
}; };
if (old_->text.text != new_->text.text) { if (old_->text.text != new_->text.text) {
if (need_message_changed_warning && need_message_text_changed_warning(old_, new_)) { if (need_message_changed_warning && need_message_text_changed_warning(old_, new_)) {
@ -6086,8 +6086,7 @@ unique_ptr<MessageContent> get_action_message_content(Td *td, tl_object_ptr<tele
tl_object_ptr<td_api::MessageContent> get_message_content_object(const MessageContent *content, Td *td, tl_object_ptr<td_api::MessageContent> get_message_content_object(const MessageContent *content, Td *td,
DialogId dialog_id, int32 message_date, DialogId dialog_id, int32 message_date,
bool is_content_secret, bool skip_bot_commands, bool is_content_secret, bool skip_bot_commands,
int32 max_media_timestamp, int32 max_media_timestamp) {
bool disable_web_page_preview) {
CHECK(content != nullptr); CHECK(content != nullptr);
switch (content->get_type()) { switch (content->get_type()) {
case MessageContentType::Animation: { case MessageContentType::Animation: {
@ -6166,7 +6165,7 @@ tl_object_ptr<td_api::MessageContent> get_message_content_object(const MessageCo
return make_tl_object<td_api::messageText>( return make_tl_object<td_api::messageText>(
get_formatted_text_object(m->text, skip_bot_commands, max_media_timestamp), 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), 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: case MessageContentType::Unsupported:
return make_tl_object<td_api::messageUnsupported>(); return make_tl_object<td_api::messageUnsupported>();

3
td/telegram/MessageContent.h
View File

@ -223,8 +223,7 @@ unique_ptr<MessageContent> get_action_message_content(Td *td, tl_object_ptr<tele
tl_object_ptr<td_api::MessageContent> get_message_content_object(const MessageContent *content, Td *td, tl_object_ptr<td_api::MessageContent> get_message_content_object(const MessageContent *content, Td *td,
DialogId dialog_id, int32 message_date, DialogId dialog_id, int32 message_date,
bool is_content_secret, bool skip_bot_commands, bool is_content_secret, bool skip_bot_commands,
int32 max_media_timestamp, int32 max_media_timestamp);
bool disable_web_page_preview);
FormattedText *get_message_content_text_mutable(MessageContent *content); FormattedText *get_message_content_text_mutable(MessageContent *content);

15
td/telegram/MessagesManager.cpp
View File

@ -6564,7 +6564,7 @@ void MessagesManager::on_update_service_notification(tl_object_ptr<telegram_api:
send_closure(G()->td(), &Td::send_update, send_closure(G()->td(), &Td::send_update,
td_api::make_object<td_api::updateServiceNotification>( td_api::make_object<td_api::updateServiceNotification>(
update->type_, get_message_content_object(content.get(), td_, owner_dialog_id, date, 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) { if (has_date && is_user) {
Dialog *d = get_service_notifications_dialog(); Dialog *d = get_service_notifications_dialog();
@ -14609,8 +14609,7 @@ std::pair<DialogId, unique_ptr<MessagesManager::Message>> MessagesManager::creat
LOG(ERROR) << "Receive media group identifier " << message_info.media_album_id << " in " << message_id LOG(ERROR) << "Receive media group identifier " << message_info.media_album_id << " in " << message_id
<< " from " << dialog_id << " with content " << " from " << dialog_id << " with content "
<< oneline(to_string(get_message_content_object(message->content.get(), td_, dialog_id, << oneline(to_string(get_message_content_object(message->content.get(), td_, dialog_id,
message->date, is_content_secret, false, -1, message->date, is_content_secret, false, -1)));
message->disable_web_page_preview)));
} }
} else { } else {
message->media_album_id = message_info.media_album_id; message->media_album_id = message_info.media_album_id;
@ -23998,7 +23997,7 @@ td_api::object_ptr<td_api::message> MessagesManager::get_dialog_event_log_messag
auto edit_date = m->hide_edit_date ? 0 : m->edit_date; 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 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, 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<td_api::message>( return td_api::make_object<td_api::message>(
m->message_id.get(), std::move(sender), get_chat_id_object(dialog_id, "get_dialog_event_log_message_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, nullptr, nullptr, m->is_outgoing, false, false, false, can_be_saved, false, false, false, false, false, false,
@ -24105,7 +24104,7 @@ tl_object_ptr<td_api::message> MessagesManager::get_message_object(DialogId dial
auto skip_bot_commands = need_skip_bot_commands(dialog_id, m); auto skip_bot_commands = need_skip_bot_commands(dialog_id, m);
auto max_media_timestamp = get_message_max_media_timestamp(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, 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<td_api::MessageSelfDestructType> { auto self_destruct_type = [&]() -> td_api::object_ptr<td_api::MessageSelfDestructType> {
if (m->ttl == 0x7FFFFFFF) { if (m->ttl == 0x7FFFFFFF) {
return td_api::make_object<td_api::messageSelfDestructTypeImmediately>(); return td_api::make_object<td_api::messageSelfDestructTypeImmediately>();
@ -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_active_download_remote_location() << " " << file_view.is_encrypted() << " " << is_web
<< " " << file_view.has_url() << " " << " " << file_view.has_url() << " "
<< to_string(get_message_content_object(m->content.get(), td_, dialog_id, m->date, << 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"); auto entities = get_input_message_entities(td_->contacts_manager_.get(), caption, "do_send_message_group");
int32 input_single_media_flags = 0; 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; 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, 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), 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, send_closure(G()->td(), &Td::send_update,
td_api::make_object<td_api::updateMessageContent>(get_chat_id_object(dialog_id, "updateMessageContent"), td_api::make_object<td_api::updateMessageContent>(get_chat_id_object(dialog_id, "updateMessageContent"),
m->message_id.get(), std::move(content_object))); 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()) { if (!file_id.is_valid()) {
LOG(ERROR) << "Have no file in " LOG(ERROR) << "Have no file in "
<< to_string(get_message_content_object(m->content.get(), td_, dialog_id, m->date, m->is_content_secret, << 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; return;
} }
auto file_view = td_->file_manager_->get_file_view(file_id); auto file_view = td_->file_manager_->get_file_view(file_id);

2
td/telegram/SponsoredMessageManager.cpp
View File

@ -291,7 +291,7 @@ td_api::object_ptr<td_api::sponsoredMessage> SponsoredMessageManager::get_sponso
} }
return td_api::make_object<td_api::sponsoredMessage>( return td_api::make_object<td_api::sponsoredMessage>(
sponsored_message.local_id, sponsored_message.is_recommended, 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); std::move(sponsor), sponsored_message.additional_info);
} }