From 11af0a058ded9262714f703de25ee4d2b32a7af6 Mon Sep 17 00:00:00 2001 From: levlam Date: Sun, 3 Oct 2021 14:54:40 +0300 Subject: [PATCH] Add source to get_message_object. --- td/telegram/GameManager.cpp | 2 +- td/telegram/MessagesManager.cpp | 129 ++++++++++++++++--------------- td/telegram/MessagesManager.h | 12 +-- td/telegram/NotificationType.cpp | 3 +- td/telegram/Td.cpp | 60 ++++++++------ 5 files changed, 112 insertions(+), 94 deletions(-) diff --git a/td/telegram/GameManager.cpp b/td/telegram/GameManager.cpp index 224f12700..9c7782579 100644 --- a/td/telegram/GameManager.cpp +++ b/td/telegram/GameManager.cpp @@ -242,7 +242,7 @@ void GameManager::set_game_score(FullMessageId full_message_id, bool edit_messag void GameManager::on_set_game_score(FullMessageId full_message_id, Promise> &&promise) { - promise.set_value(td_->messages_manager_->get_message_object(full_message_id)); + promise.set_value(td_->messages_manager_->get_message_object(full_message_id, "on_set_game_score")); } void GameManager::set_inline_game_score(const string &inline_message_id, bool edit_message, UserId user_id, int32 score, diff --git a/td/telegram/MessagesManager.cpp b/td/telegram/MessagesManager.cpp index bcff70b69..f8616f7fa 100644 --- a/td/telegram/MessagesManager.cpp +++ b/td/telegram/MessagesManager.cpp @@ -8645,9 +8645,9 @@ void MessagesManager::do_send_media(DialogId dialog_id, Message *m, FileId file_ auto input_media = get_input_media(content, td_, std::move(input_file), std::move(input_thumbnail), file_id, thumbnail_file_id, m->ttl, true); - LOG_CHECK(input_media != nullptr) << to_string(get_message_object(dialog_id, m)) << ' ' << have_input_file << ' ' - << have_input_thumbnail << ' ' << file_id << ' ' << thumbnail_file_id << ' ' - << m->ttl; + LOG_CHECK(input_media != nullptr) << to_string(get_message_object(dialog_id, m, "do_send_media")) << ' ' + << have_input_file << ' ' << have_input_thumbnail << ' ' << file_id << ' ' + << thumbnail_file_id << ' ' << m->ttl; on_message_media_uploaded(dialog_id, m, std::move(input_media), file_id, thumbnail_file_id); } @@ -9093,16 +9093,16 @@ void MessagesManager::after_get_difference() { dump_debug_message_op(get_dialog(dialog_id)); } if (message_id <= d->last_new_message_id) { - get_message_from_server(it.first, PromiseCreator::lambda([this, full_message_id](Result result) { - if (result.is_error()) { - LOG(WARNING) - << "Failed to get missing " << full_message_id << ": " << result.error(); - } else { - LOG(WARNING) << "Successfully get missing " << full_message_id << ": " - << to_string(get_message_object(full_message_id)); - } - }), - "get missing"); + get_message_from_server( + it.first, PromiseCreator::lambda([this, full_message_id](Result result) { + if (result.is_error()) { + LOG(WARNING) << "Failed to get missing " << full_message_id << ": " << result.error(); + } else { + LOG(WARNING) << "Successfully get missing " << full_message_id << ": " + << to_string(get_message_object(full_message_id, "after_get_difference")); + } + }), + "get missing"); } else if (dialog_id.get_type() == DialogType::Channel) { LOG(INFO) << "Schedule getDifference in " << dialog_id.get_channel_id(); channel_get_difference_retry_timeout_.add_timeout_in(dialog_id.get(), 0.001); @@ -9967,7 +9967,7 @@ void MessagesManager::on_get_message_public_forwards(int32 total_count, false, false, false, "get message public forwards"); if (new_full_message_id != FullMessageId()) { CHECK(dialog_id == new_full_message_id.get_dialog_id()); - result.push_back(get_message_object(new_full_message_id)); + result.push_back(get_message_object(new_full_message_id, "on_get_message_public_forwards")); CHECK(result.back() != nullptr); last_full_message_id = new_full_message_id; } else { @@ -13630,10 +13630,9 @@ FullMessageId MessagesManager::on_get_message(MessageInfo &&message_info, bool f << " with identifier less than last_new_message_id = " << d->last_new_message_id << " and trying to add it anyway"; } else { + // TODO move to INFO LOG(ERROR) << "Ignore " << old_message_id << "/" << message_id << " received not through update from " << source - << ": " - << oneline(to_string(get_message_object(dialog_id, new_message.get()))); // TODO move to INFO - dump_debug_message_op(d, 3); // TODO remove + << ": " << oneline(to_string(get_message_object(dialog_id, new_message.get(), "on_get_message"))); if (dialog_id.get_type() == DialogType::Channel && have_input_peer(dialog_id, AccessRights::Read)) { channel_get_difference_retry_timeout_.add_timeout_in(dialog_id.get(), 0.001); } @@ -17160,7 +17159,7 @@ td_api::object_ptr MessagesManager::get_message_threa messages.reserve(info.message_ids.size()); for (auto message_id : info.message_ids) { const Message *m = get_message_force(d, message_id, "get_message_thread_info_object"); - auto message = get_message_object(d->dialog_id, m); + auto message = get_message_object(d->dialog_id, m, "get_message_thread_info_object"); if (message != nullptr) { if (message->interaction_info_ != nullptr && message->interaction_info_->reply_info_ != nullptr) { reply_info = m->reply_info.get_message_reply_info_object(td_->contacts_manager_.get(), this); @@ -17882,7 +17881,7 @@ td_api::object_ptr MessagesManager::get_message_link_in } else { const Message *m = get_message(d, message_id); if (m != nullptr) { - message = get_message_object(dialog_id, m); + message = get_message_object(dialog_id, m, "get_message_link_info_object"); for_album = !info.is_single && m->media_album_id != 0; for_comment = (info.comment_dialog_id.is_valid() || info.for_comment) && m->top_thread_message_id.is_valid(); if (can_message_content_have_media_timestamp(m->content.get())) { @@ -20162,11 +20161,11 @@ td_api::object_ptr MessagesManager::get_chat_object(const Dialog * d->dialog_id.get(), get_chat_type_object(d->dialog_id), get_dialog_title(d->dialog_id), get_chat_photo_info_object(td_->file_manager_.get(), get_dialog_photo(d->dialog_id)), get_dialog_permissions(d->dialog_id).get_chat_permissions_object(), - get_message_object(d->dialog_id, get_message(d, d->last_message_id)), get_chat_positions_object(d), - d->is_marked_as_unread, d->is_blocked, get_dialog_has_scheduled_messages(d), can_delete_for_self, - can_delete_for_all_users, can_report_dialog(d->dialog_id), d->notification_settings.silent_send_message, - d->server_unread_count + d->local_unread_count, d->last_read_inbox_message_id.get(), - d->last_read_outbox_message_id.get(), d->unread_mention_count, + get_message_object(d->dialog_id, get_message(d, d->last_message_id), "get_chat_object"), + get_chat_positions_object(d), d->is_marked_as_unread, d->is_blocked, get_dialog_has_scheduled_messages(d), + can_delete_for_self, can_delete_for_all_users, can_report_dialog(d->dialog_id), + d->notification_settings.silent_send_message, d->server_unread_count + d->local_unread_count, + d->last_read_inbox_message_id.get(), d->last_read_outbox_message_id.get(), d->unread_mention_count, get_chat_notification_settings_object(&d->notification_settings), d->message_ttl_setting.get_message_ttl_setting_object(), get_dialog_theme_name(d), get_chat_action_bar_object(d), get_voice_chat_object(d), d->reply_markup_message_id.get(), std::move(draft_message), d->client_data); @@ -20633,7 +20632,7 @@ tl_object_ptr MessagesManager::get_dialog_history(DialogId dia vector> messages; if (*p != nullptr && offset == 0) { while (*p != nullptr && messages.size() < static_cast(limit)) { - messages.push_back(get_message_object(dialog_id, *p)); + messages.push_back(get_message_object(dialog_id, *p, "get_dialog_history")); from_message_id = (*p)->message_id; from_the_end = false; --p; @@ -21876,11 +21875,11 @@ void MessagesManager::on_search_dialog_messages_db_result(int64 random_id, Dialo } td_api::object_ptr MessagesManager::get_found_messages_object( - const FoundMessages &found_messages) { + const FoundMessages &found_messages, const char *source) { vector> result; result.reserve(found_messages.full_message_ids.size()); for (auto full_message_id : found_messages.full_message_ids) { - auto message = get_message_object(full_message_id); + auto message = get_message_object(full_message_id, source); if (message != nullptr) { result.push_back(std::move(message)); } @@ -22239,7 +22238,7 @@ tl_object_ptr MessagesManager::get_dialog_message_by_date_objec CHECK(it != get_dialog_message_by_date_results_.end()); auto full_message_id = std::move(it->second); get_dialog_message_by_date_results_.erase(it); - return get_message_object(full_message_id); + return get_message_object(full_message_id, "get_dialog_message_by_date_object"); } void MessagesManager::get_dialog_message_count(DialogId dialog_id, MessageSearchFilter filter, bool return_local, @@ -22496,7 +22495,8 @@ void MessagesManager::on_get_history_from_database(DialogId dialog_id, MessageId << ' ' << from_message_id << ' ' << offset << ' ' << limit << ' ' << from_the_end << ' ' << only_local << ' ' << messages.size() << ' ' << debug_first_database_message_id << ' ' << last_added_message_id << ' ' << added_new_message << ' ' << pos << ' ' << m << ' ' << next_message << ' ' << old_message << ' ' - << to_string(get_message_object(dialog_id, m)) << to_string(get_message_object(dialog_id, next_message)); + << to_string(get_message_object(dialog_id, m, "on_get_history_from_database")) + << to_string(get_message_object(dialog_id, next_message, "on_get_history_from_database")); LOG(INFO) << "Fix have_previous for " << next_message->message_id; next_message->have_previous = true; attach_message_to_previous( @@ -23031,15 +23031,16 @@ tl_object_ptr MessagesManager::get_message_sched return td_api::make_object(send_date); } -tl_object_ptr MessagesManager::get_message_object(FullMessageId full_message_id) { - return get_message_object(full_message_id.get_dialog_id(), get_message_force(full_message_id, "get_message_object")); +tl_object_ptr MessagesManager::get_message_object(FullMessageId full_message_id, const char *source) { + return get_message_object(full_message_id.get_dialog_id(), get_message_force(full_message_id, source), source); } tl_object_ptr MessagesManager::get_message_object(DialogId dialog_id, const Message *m, - bool for_event_log) const { + const char *source, bool for_event_log) const { if (m == nullptr) { return nullptr; } + LOG_CHECK(have_dialog(dialog_id)) << source; m->is_update_sent = true; @@ -23126,9 +23127,8 @@ tl_object_ptr MessagesManager::get_message_object(DialogId dial int32 max_media_timestamp = for_event_log ? get_message_own_max_media_timestamp(m) : get_message_max_media_timestamp(m); bool has_timestamped_media = for_event_log || reply_to_message_id == 0 || m->max_own_media_timestamp >= 0; - string source = PSTRING() << dialog_id << ' ' << m->message_id; return make_tl_object( - m->message_id.get(), get_message_sender_object_const(m->sender_user_id, m->sender_dialog_id, source.c_str()), + m->message_id.get(), get_message_sender_object_const(m->sender_user_id, m->sender_dialog_id, source), dialog_id.get(), std::move(sending_state), std::move(scheduling_state), is_outgoing, is_pinned, can_be_edited, can_be_forwarded, can_delete_for_self, can_delete_for_all_users, can_get_statistics, can_get_message_thread, can_get_viewers, can_get_media_timestamp_links, has_timestamped_media, m->is_channel_post, @@ -23143,20 +23143,21 @@ tl_object_ptr MessagesManager::get_message_object(DialogId dial tl_object_ptr MessagesManager::get_messages_object(int32 total_count, DialogId dialog_id, const vector &message_ids, - bool skip_not_found) { + bool skip_not_found, const char *source) { Dialog *d = get_dialog(dialog_id); CHECK(d != nullptr); - auto message_objects = transform(message_ids, [this, dialog_id, d](MessageId message_id) { - return get_message_object(dialog_id, get_message_force(d, message_id, "get_messages_object")); + auto message_objects = transform(message_ids, [this, dialog_id, d, source](MessageId message_id) { + return get_message_object(dialog_id, get_message_force(d, message_id, source), source); }); return get_messages_object(total_count, std::move(message_objects), skip_not_found); } tl_object_ptr MessagesManager::get_messages_object(int32 total_count, const vector &full_message_ids, - bool skip_not_found) { - auto message_objects = transform( - full_message_ids, [this](FullMessageId full_message_id) { return get_message_object(full_message_id); }); + bool skip_not_found, const char *source) { + auto message_objects = transform(full_message_ids, [this, source](FullMessageId full_message_id) { + return get_message_object(full_message_id, source); + }); return get_messages_object(total_count, std::move(message_objects), skip_not_found); } @@ -23671,7 +23672,7 @@ Result> MessagesManager::send_message( send_update_chat_last_message(d, "send_message"); } - return get_message_object(dialog_id, m); + return get_message_object(dialog_id, m, "send_message"); } Result MessagesManager::process_input_message_content( @@ -26550,7 +26551,7 @@ Result> MessagesManager::forward_messages( forwarded_message_ids.push_back(message_id); } - result[forwarded_message_contents[j].index] = get_message_object(to_dialog_id, m, false); + result[forwarded_message_contents[j].index] = get_message_object(to_dialog_id, m, "forward_messages"); } if (!forwarded_messages.empty()) { @@ -26586,7 +26587,7 @@ Result> MessagesManager::forward_messages( send_update_new_message(to_dialog, m); } - result[copied_message.index] = get_message_object(to_dialog_id, m, false); + result[copied_message.index] = get_message_object(to_dialog_id, m, "forward_messages"); } if (need_update_dialog_pos) { @@ -27212,8 +27213,9 @@ void MessagesManager::send_update_new_message(const Dialog *d, const Message *m) CHECK(d != nullptr); CHECK(m != nullptr); CHECK(d->is_update_new_chat_sent); - send_closure(G()->td(), &Td::send_update, - make_tl_object(get_message_object(d->dialog_id, m))); + send_closure( + G()->td(), &Td::send_update, + make_tl_object(get_message_object(d->dialog_id, m, "send_update_new_message"))); } MessagesManager::NotificationGroupInfo &MessagesManager::get_notification_group_info(Dialog *d, const Message *m) { @@ -28463,9 +28465,9 @@ void MessagesManager::send_update_message_send_succeeded(Dialog *d, MessageId ol if (!td_->auth_manager_->is_bot()) { d->yet_unsent_message_id_to_persistent_message_id.emplace(old_message_id, m->message_id); } - send_closure( - G()->td(), &Td::send_update, - make_tl_object(get_message_object(d->dialog_id, m), old_message_id.get())); + send_closure(G()->td(), &Td::send_update, + make_tl_object( + get_message_object(d->dialog_id, m, "send_update_message_send_succeeded"), old_message_id.get())); } void MessagesManager::send_update_message_content(DialogId dialog_id, Message *m, bool is_message_in_dialog, @@ -28593,7 +28595,8 @@ void MessagesManager::send_update_chat_last_message_impl(const Dialog *d, const << source; LOG(INFO) << "Send updateChatLastMessage in " << d->dialog_id << " to " << d->last_message_id << " from " << source; auto update = make_tl_object( - d->dialog_id.get(), get_message_object(d->dialog_id, get_message(d, d->last_message_id)), + d->dialog_id.get(), + get_message_object(d->dialog_id, get_message(d, d->last_message_id), "send_update_chat_last_message_impl"), get_chat_positions_object(d)); send_closure(G()->td(), &Td::send_update, std::move(update)); } @@ -29398,7 +29401,8 @@ void MessagesManager::on_send_message_fail(int64 random_id, Status error) { } if (error.message() == "REPLY_MARKUP_INVALID") { if (m->reply_markup == nullptr) { - LOG(ERROR) << "Receive " << error.message() << " for " << oneline(to_string(get_message_object(dialog_id, m))); + LOG(ERROR) << "Receive " << error.message() << " for " + << oneline(to_string(get_message_object(dialog_id, m, "on_send_message_fail"))); } else { LOG(ERROR) << "Receive " << error.message() << " for " << full_message_id << " with keyboard " << *m->reply_markup; @@ -29545,8 +29549,8 @@ void MessagesManager::fail_send_message(FullMessageId full_message_id, int error d->yet_unsent_message_id_to_persistent_message_id.emplace(old_message_id, m->message_id); } send_closure(G()->td(), &Td::send_update, - make_tl_object(get_message_object(dialog_id, m), old_message_id.get(), - error_code, error_message)); + make_tl_object(get_message_object(dialog_id, m, "fail_send_message"), + old_message_id.get(), error_code, error_message)); if (need_update_dialog_pos) { send_update_chat_last_message(d, "fail_send_message"); } @@ -31823,7 +31827,7 @@ tl_object_ptr MessagesManager::get_chat_event_action_ob LOG(ERROR) << "Failed to get pinned message"; return nullptr; } - auto message_object = get_message_object(message.first, message.second.get(), true); + auto message_object = get_message_object(message.first, message.second.get(), "admin log", true); if (message.second->is_pinned) { return make_tl_object(std::move(message_object)); } else { @@ -31844,8 +31848,8 @@ tl_object_ptr MessagesManager::get_chat_event_action_ob return nullptr; } return make_tl_object( - get_message_object(old_message.first, old_message.second.get(), true), - get_message_object(new_message.first, new_message.second.get(), true)); + get_message_object(old_message.first, old_message.second.get(), "admin log", true), + get_message_object(new_message.first, new_message.second.get(), "admin log", true)); } case telegram_api::channelAdminLogEventActionStopPoll::ID: { auto action = move_tl_object_as(action_ptr); @@ -31860,7 +31864,7 @@ tl_object_ptr MessagesManager::get_chat_event_action_ob return nullptr; } return make_tl_object( - get_message_object(message.first, message.second.get(), true)); + get_message_object(message.first, message.second.get(), "admin log", true)); } case telegram_api::channelAdminLogEventActionDeleteMessage::ID: { auto action = move_tl_object_as(action_ptr); @@ -31872,7 +31876,7 @@ tl_object_ptr MessagesManager::get_chat_event_action_ob return nullptr; } return make_tl_object( - get_message_object(message.first, message.second.get(), true)); + get_message_object(message.first, message.second.get(), "admin log", true)); } case telegram_api::channelAdminLogEventActionChangeStickerSet::ID: { auto action = move_tl_object_as(action_ptr); @@ -32451,7 +32455,7 @@ MessagesManager::Message *MessagesManager::add_message_to_dialog(Dialog *d, uniq << ". The maximum allowed is " << max_message_id << ", last is " << d->last_message_id << ", being added message is " << d->being_added_message_id << ", channel difference " << debug_channel_difference_dialog_ << " " - << to_string(get_message_object(dialog_id, message.get())); + << to_string(get_message_object(dialog_id, message.get(), "add_message_to_dialog")); dump_debug_message_op(d, 3); if (need_channel_difference_to_add_message(dialog_id, nullptr)) { @@ -33881,8 +33885,8 @@ bool MessagesManager::update_message(Dialog *d, Message *old_message, unique_ptr LOG_IF(ERROR, old_message->edit_date == 0 && is_new_available && !replace_legacy) << "Disable_notification has changed from " << old_message->disable_notification << " to " << new_message->disable_notification - << ". Old message: " << to_string(get_message_object(dialog_id, old_message)) - << ". New message: " << to_string(get_message_object(dialog_id, new_message.get())); + << ". Old message: " << to_string(get_message_object(dialog_id, old_message, "update_message")) + << ". New message: " << to_string(get_message_object(dialog_id, new_message.get(), "update_message")); // disable_notification flag shouldn't be changed, because we are unable to show/hide message notification // old_message->disable_notification = new_message->disable_notification; // need_send_update = true; @@ -33980,8 +33984,9 @@ bool MessagesManager::update_message(Dialog *d, Message *old_message, unique_ptr if (need_message_changed_warning(old_message) && is_new_available) { LOG(ERROR) << message_id << " in " << dialog_id << " sent by " << old_message->sender_user_id << "/" << old_message->sender_dialog_id << " has lost reply markup " << *old_message->reply_markup - << ". Old message: " << to_string(get_message_object(dialog_id, old_message)) - << ". New message: " << to_string(get_message_object(dialog_id, new_message.get())); + << ". Old message: " << to_string(get_message_object(dialog_id, old_message, "update_message")) + << ". New message: " + << to_string(get_message_object(dialog_id, new_message.get(), "update_message")); } } } diff --git a/td/telegram/MessagesManager.h b/td/telegram/MessagesManager.h index 941c1ce67..ba400730f 100644 --- a/td/telegram/MessagesManager.h +++ b/td/telegram/MessagesManager.h @@ -703,7 +703,8 @@ class MessagesManager final : public Actor { int32 total_count = 0; }; - td_api::object_ptr get_found_messages_object(const FoundMessages &found_messages); + td_api::object_ptr get_found_messages_object(const FoundMessages &found_messages, + const char *source); FoundMessages offline_search_messages(DialogId dialog_id, const string &query, const string &offset, int32 limit, MessageSearchFilter filter, int64 &random_id, Promise<> &&promise); @@ -740,13 +741,14 @@ class MessagesManager final : public Actor { tl_object_ptr get_dialog_message_by_date_object(int64 random_id); - tl_object_ptr get_message_object(FullMessageId full_message_id); + tl_object_ptr get_message_object(FullMessageId full_message_id, const char *source); tl_object_ptr get_messages_object(int32 total_count, DialogId dialog_id, - const vector &message_ids, bool skip_not_found); + const vector &message_ids, bool skip_not_found, + const char *source); tl_object_ptr get_messages_object(int32 total_count, const vector &full_message_ids, - bool skip_not_found); + bool skip_not_found, const char *source); void process_pts_update(tl_object_ptr &&update); @@ -2351,7 +2353,7 @@ class MessagesManager final : public Actor { static tl_object_ptr get_message_scheduling_state_object(int32 send_date); - tl_object_ptr get_message_object(DialogId dialog_id, const Message *m, + tl_object_ptr get_message_object(DialogId dialog_id, const Message *m, const char *source, bool for_event_log = false) const; static tl_object_ptr get_messages_object(int32 total_count, diff --git a/td/telegram/NotificationType.cpp b/td/telegram/NotificationType.cpp index b735a709b..a50f11fdc 100644 --- a/td/telegram/NotificationType.cpp +++ b/td/telegram/NotificationType.cpp @@ -42,7 +42,8 @@ class NotificationTypeMessage final : public NotificationType { } td_api::object_ptr get_notification_type_object(DialogId dialog_id) const final { - auto message_object = G()->td().get_actor_unsafe()->messages_manager_->get_message_object({dialog_id, message_id_}); + auto message_object = G()->td().get_actor_unsafe()->messages_manager_->get_message_object( + {dialog_id, message_id_}, "get_notification_type_object"); if (message_object == nullptr) { return nullptr; } diff --git a/td/telegram/Td.cpp b/td/telegram/Td.cpp index 9f669ed05..9d340ccea 100644 --- a/td/telegram/Td.cpp +++ b/td/telegram/Td.cpp @@ -985,7 +985,7 @@ class GetMessageRequest final : public RequestOnceActor { } void do_send_result() final { - send_result(td->messages_manager_->get_message_object(full_message_id_)); + send_result(td->messages_manager_->get_message_object(full_message_id_, "GetMessageRequest")); } public: @@ -1006,7 +1006,7 @@ class GetRepliedMessageRequest final : public RequestOnceActor { } void do_send_result() final { - send_result(td->messages_manager_->get_message_object(replied_message_id_)); + send_result(td->messages_manager_->get_message_object(replied_message_id_, "GetRepliedMessageRequest")); } public: @@ -1054,7 +1054,8 @@ class GetChatPinnedMessageRequest final : public RequestOnceActor { } void do_send_result() final { - send_result(td->messages_manager_->get_message_object({dialog_id_, pinned_message_id_})); + send_result( + td->messages_manager_->get_message_object({dialog_id_, pinned_message_id_}, "GetChatPinnedMessageRequest")); } public: @@ -1074,7 +1075,7 @@ class GetCallbackQueryMessageRequest final : public RequestOnceActor { } void do_send_result() final { - send_result(td->messages_manager_->get_message_object({dialog_id_, message_id_})); + send_result(td->messages_manager_->get_message_object({dialog_id_, message_id_}, "GetCallbackQueryMessageRequest")); } public: @@ -1096,7 +1097,7 @@ class GetMessagesRequest final : public RequestOnceActor { } void do_send_result() final { - send_result(td->messages_manager_->get_messages_object(-1, dialog_id_, message_ids_, false)); + send_result(td->messages_manager_->get_messages_object(-1, dialog_id_, message_ids_, false, "GetMessagesRequest")); } public: @@ -1168,7 +1169,7 @@ class EditMessageTextRequest final : public RequestOnceActor { } void do_send_result() final { - send_result(td->messages_manager_->get_message_object(full_message_id_)); + send_result(td->messages_manager_->get_message_object(full_message_id_, "EditMessageTextRequest")); } public: @@ -1195,7 +1196,7 @@ class EditMessageLiveLocationRequest final : public RequestOnceActor { } void do_send_result() final { - send_result(td->messages_manager_->get_message_object(full_message_id_)); + send_result(td->messages_manager_->get_message_object(full_message_id_, "EditMessageLiveLocationRequest")); } public: @@ -1222,7 +1223,7 @@ class EditMessageMediaRequest final : public RequestOnceActor { } void do_send_result() final { - send_result(td->messages_manager_->get_message_object(full_message_id_)); + send_result(td->messages_manager_->get_message_object(full_message_id_, "EditMessageMediaRequest")); } public: @@ -1247,7 +1248,7 @@ class EditMessageCaptionRequest final : public RequestOnceActor { } void do_send_result() final { - send_result(td->messages_manager_->get_message_object(full_message_id_)); + send_result(td->messages_manager_->get_message_object(full_message_id_, "EditMessageCaptionRequest")); } public: @@ -1270,7 +1271,7 @@ class EditMessageReplyMarkupRequest final : public RequestOnceActor { } void do_send_result() final { - send_result(td->messages_manager_->get_message_object(full_message_id_)); + send_result(td->messages_manager_->get_message_object(full_message_id_, "EditMessageReplyMarkupRequest")); } public: @@ -1331,7 +1332,8 @@ class GetMessageThreadHistoryRequest final : public RequestActor<> { } void do_send_result() final { - send_result(td->messages_manager_->get_messages_object(-1, messages_.first, messages_.second, true)); + send_result(td->messages_manager_->get_messages_object(-1, messages_.first, messages_.second, true, + "GetMessageThreadHistoryRequest")); } public: @@ -1368,7 +1370,8 @@ class SearchChatMessagesRequest final : public RequestActor<> { } void do_send_result() final { - send_result(td->messages_manager_->get_messages_object(messages_.first, dialog_id_, messages_.second, true)); + send_result(td->messages_manager_->get_messages_object(messages_.first, dialog_id_, messages_.second, true, + "SearchChatMessagesRequest")); } void do_send_error(Status &&status) final { @@ -1414,7 +1417,7 @@ class SearchSecretMessagesRequest final : public RequestActor<> { } void do_send_result() final { - send_result(td->messages_manager_->get_found_messages_object(found_messages_)); + send_result(td->messages_manager_->get_found_messages_object(found_messages_, "SearchSecretMessagesRequest")); } public: @@ -1452,7 +1455,8 @@ class SearchMessagesRequest final : public RequestActor<> { } void do_send_result() final { - send_result(td->messages_manager_->get_messages_object(messages_.first, messages_.second, true)); + send_result( + td->messages_manager_->get_messages_object(messages_.first, messages_.second, true, "SearchMessagesRequest")); } void do_send_error(Status &&status) final { @@ -1497,7 +1501,8 @@ class SearchCallMessagesRequest final : public RequestActor<> { } void do_send_result() final { - send_result(td->messages_manager_->get_messages_object(messages_.first, messages_.second, true)); + send_result(td->messages_manager_->get_messages_object(messages_.first, messages_.second, true, + "SearchCallMessagesRequest")); } public: @@ -1524,7 +1529,8 @@ class SearchChatRecentLocationMessagesRequest final : public RequestActor<> { } void do_send_result() final { - send_result(td->messages_manager_->get_messages_object(messages_.first, dialog_id_, messages_.second, true)); + send_result(td->messages_manager_->get_messages_object(messages_.first, dialog_id_, messages_.second, true, + "SearchChatRecentLocationMessagesRequest")); } public: @@ -1541,7 +1547,8 @@ class GetActiveLiveLocationMessagesRequest final : public RequestActor<> { } void do_send_result() final { - send_result(td->messages_manager_->get_messages_object(-1, full_message_ids_, true)); + send_result(td->messages_manager_->get_messages_object(-1, full_message_ids_, true, + "GetActiveLiveLocationMessagesRequest")); } public: @@ -1581,7 +1588,8 @@ class GetChatScheduledMessagesRequest final : public RequestActor<> { } void do_send_result() final { - send_result(td->messages_manager_->get_messages_object(-1, dialog_id_, message_ids_, true)); + send_result(td->messages_manager_->get_messages_object(-1, dialog_id_, message_ids_, true, + "GetChatScheduledMessagesRequest")); } public: @@ -4873,7 +4881,8 @@ void Td::on_request(uint64 id, const td_api::getMessage &request) { void Td::on_request(uint64 id, const td_api::getMessageLocally &request) { FullMessageId full_message_id(DialogId(request.chat_id_), MessageId(request.message_id_)); - send_closure(actor_id(this), &Td::send_result, id, messages_manager_->get_message_object(full_message_id)); + send_closure(actor_id(this), &Td::send_result, id, + messages_manager_->get_message_object(full_message_id, "getMessageLocally")); } void Td::on_request(uint64 id, const td_api::getRepliedMessage &request) { @@ -5480,7 +5489,7 @@ void Td::on_request(uint64 id, td_api::sendMessageAlbum &request) { } send_closure(actor_id(this), &Td::send_result, id, - messages_manager_->get_messages_object(-1, dialog_id, r_message_ids.ok(), false)); + messages_manager_->get_messages_object(-1, dialog_id, r_message_ids.ok(), false, "sendMessageAlbum")); } void Td::on_request(uint64 id, td_api::sendBotStartMessage &request) { @@ -5496,7 +5505,7 @@ void Td::on_request(uint64 id, td_api::sendBotStartMessage &request) { CHECK(r_new_message_id.ok().is_valid() || r_new_message_id.ok().is_valid_scheduled()); send_closure(actor_id(this), &Td::send_result, id, - messages_manager_->get_message_object({dialog_id, r_new_message_id.ok()})); + messages_manager_->get_message_object({dialog_id, r_new_message_id.ok()}, "sendBotStartMessage")); } void Td::on_request(uint64 id, td_api::sendInlineQueryResultMessage &request) { @@ -5512,8 +5521,9 @@ void Td::on_request(uint64 id, td_api::sendInlineQueryResultMessage &request) { } CHECK(r_new_message_id.ok().is_valid() || r_new_message_id.ok().is_valid_scheduled()); - send_closure(actor_id(this), &Td::send_result, id, - messages_manager_->get_message_object({dialog_id, r_new_message_id.ok()})); + send_closure( + actor_id(this), &Td::send_result, id, + messages_manager_->get_message_object({dialog_id, r_new_message_id.ok()}, "sendInlineQueryResultMessage")); } void Td::on_request(uint64 id, td_api::addLocalMessage &request) { @@ -5529,7 +5539,7 @@ void Td::on_request(uint64 id, td_api::addLocalMessage &request) { CHECK(r_new_message_id.ok().is_valid()); send_closure(actor_id(this), &Td::send_result, id, - messages_manager_->get_message_object({dialog_id, r_new_message_id.ok()})); + messages_manager_->get_message_object({dialog_id, r_new_message_id.ok()}, "addLocalMessage")); } void Td::on_request(uint64 id, td_api::editMessageText &request) { @@ -5678,7 +5688,7 @@ void Td::on_request(uint64 id, const td_api::resendMessages &request) { } send_closure(actor_id(this), &Td::send_result, id, - messages_manager_->get_messages_object(-1, dialog_id, r_message_ids.ok(), false)); + messages_manager_->get_messages_object(-1, dialog_id, r_message_ids.ok(), false, "resendMessages")); } void Td::on_request(uint64 id, td_api::getWebPagePreview &request) {