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

Add source to get_messages_from_server.

Browse Source
This commit is contained in:
levlam 2021-07-08 17:09:16 +03:00
parent e9e2428237
commit 0dc4b5a469
5 changed files with 25 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
td/telegram/CallbackQueriesManager.cpp
View File

@ -87,7 +87,7 @@ class GetBotCallbackAnswerQuery final : public Td::ResultHandler {
void on_error(uint64 id, Status status) final {
if (status.message() == "DATA_INVALID") {
td->messages_manager_->get_message_from_server({dialog_id_, message_id_}, Auto());
td->messages_manager_->get_message_from_server({dialog_id_, message_id_}, Auto(), "GetBotCallbackAnswerQuery");
} else if (status.message() == "BOT_RESPONSE_TIMEOUT") {
status = Status::Error(502, "The bot is not responding");
}

2
td/telegram/FileReferenceManager.cpp
View File

@ -255,7 +255,7 @@ void FileReferenceManager::send_query(Destination dest, FileSourceId file_source
file_sources_[index].visit(overloaded(
[&](const FileSourceMessage &source) {
send_closure_later(G()->messages_manager(), &MessagesManager::get_message_from_server, source.full_message_id,
std::move(promise), nullptr);
std::move(promise), "FileSourceMessage", nullptr);
},
[&](const FileSourceUserPhoto &source) {
send_closure_later(G()->contacts_manager(), &ContactsManager::reload_user_profile_photo, source.user_id,

35
td/telegram/MessagesManager.cpp
View File

@ -9085,7 +9085,8 @@ void MessagesManager::after_get_difference() {
LOG(WARNING) << "Successfully get missing " << full_message_id << ": "
<< to_string(get_message_object(full_message_id));
}
}));
}),
"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);
@ -16684,12 +16685,13 @@ void MessagesManager::get_message_force_from_server(Dialog *d, MessageId message
}
if (d->deleted_message_ids.count(message_id) == 0 && dialog_type != DialogType::SecretChat) {
return get_message_from_server({d->dialog_id, message_id}, std::move(promise), std::move(input_message));
return get_message_from_server({d->dialog_id, message_id}, std::move(promise), "get_message_force_from_server",
std::move(input_message));
}
} else if (message_id.is_valid_scheduled() && message_id.is_scheduled_server()) {
if (d->deleted_scheduled_server_message_ids.count(message_id.get_scheduled_server_message_id()) == 0 &&
dialog_type != DialogType::SecretChat && input_message == nullptr) {
return get_message_from_server({d->dialog_id, message_id}, std::move(promise));
return get_message_from_server({d->dialog_id, message_id}, std::move(promise), "get_message_force_from_server");
}
}
}
@ -17116,7 +17118,7 @@ bool MessagesManager::get_messages(DialogId dialog_id, const vector<MessageId> &
}
if (!missed_message_ids.empty()) {
get_messages_from_server(std::move(missed_message_ids), std::move(promise));
get_messages_from_server(std::move(missed_message_ids), std::move(promise), "get_messages");
return false;
}
@ -17125,17 +17127,19 @@ bool MessagesManager::get_messages(DialogId dialog_id, const vector<MessageId> &
}
void MessagesManager::get_message_from_server(FullMessageId full_message_id, Promise<Unit> &&promise,
const char *source,
tl_object_ptr<telegram_api::InputMessage> input_message) {
get_messages_from_server({full_message_id}, std::move(promise), std::move(input_message));
get_messages_from_server({full_message_id}, std::move(promise), source, std::move(input_message));
}
void MessagesManager::get_messages_from_server(vector<FullMessageId> &&message_ids, Promise<Unit> &&promise,
const char *source,
tl_object_ptr<telegram_api::InputMessage> input_message) {
if (G()->close_flag()) {
return promise.set_error(Status::Error(500, "Request aborted"));
}
if (message_ids.empty()) {
LOG(ERROR) << "Empty message_ids";
LOG(ERROR) << "Empty message_ids from " << source;
return promise.set_error(Status::Error(500, "There are no messages specified to fetch"));
}
@ -17169,7 +17173,7 @@ void MessagesManager::get_messages_from_server(vector<FullMessageId> &&message_i
channel_message_ids[dialog_id.get_channel_id()].push_back(std::move(input_message));
break;
case DialogType::SecretChat:
LOG(ERROR) << "Can't get secret chat message from server";
LOG(ERROR) << "Can't get " << full_message_id << " from server from " << source;
break;
case DialogType::None:
default:
@ -17191,7 +17195,7 @@ void MessagesManager::get_messages_from_server(vector<FullMessageId> &&message_i
have_dialog_force(dialog_id, "get_messages_from_server");
auto input_peer = get_input_peer(dialog_id, AccessRights::Read);
if (input_peer == nullptr) {
LOG(ERROR) << "Can't find info about " << dialog_id << " to get a message from it";
LOG(ERROR) << "Can't find info about " << dialog_id << " to get a message from it from " << source;
mpas.get_promise().set_error(Status::Error(6, "Can't access the chat"));
continue;
}
@ -17203,7 +17207,7 @@ void MessagesManager::get_messages_from_server(vector<FullMessageId> &&message_i
td_->contacts_manager_->have_channel_force(it.first);
auto input_channel = td_->contacts_manager_->get_input_channel(it.first);
if (input_channel == nullptr) {
LOG(ERROR) << "Can't find info about " << it.first << " to get a message from it";
LOG(ERROR) << "Can't find info about " << it.first << " to get a message from it from " << source;
mpas.get_promise().set_error(Status::Error(6, "Can't access the chat"));
continue;
}
@ -21922,7 +21926,7 @@ unique_ptr<MessagesManager::Message> MessagesManager::parse_message(DialogId dia
if (!is_scheduled && dialog_id.get_type() != DialogType::SecretChat && m->message_id.is_valid() &&
m->message_id.is_server()) {
// trying to repair the message
get_message_from_server({dialog_id, m->message_id}, Auto());
get_message_from_server({dialog_id, m->message_id}, Auto(), "parse_message");
}
return nullptr;
}
@ -24693,7 +24697,7 @@ void MessagesManager::on_message_media_edited(DialogId dialog_id, MessageId mess
cancel_upload_message_content_files(m->edited_content.get());
if (dialog_id.get_type() != DialogType::SecretChat) {
get_message_from_server({dialog_id, m->message_id}, Auto());
get_message_from_server({dialog_id, m->message_id}, Auto(), "on_message_media_edited");
}
}
@ -27705,7 +27709,8 @@ bool MessagesManager::add_new_message_notification(Dialog *d, Message *m, bool f
send_closure(actor_id, &MessagesManager::flush_pending_new_message_notifications, dialog_id, from_mentions,
dialog_id);
});
get_message_from_server({d->dialog_id, missing_pinned_message_id}, std::move(promise));
get_message_from_server({d->dialog_id, missing_pinned_message_id}, std::move(promise),
"add_new_message_notification");
}
return false;
}
@ -31436,7 +31441,7 @@ MessagesManager::Message *MessagesManager::on_get_message_from_database(DialogId
if (m->message_id.is_valid() && m->message_id.is_any_server() &&
(dialog_id.get_type() == DialogType::User || dialog_id.get_type() == DialogType::Chat)) {
get_message_from_server({dialog_id, m->message_id}, Auto());
get_message_from_server({dialog_id, m->message_id}, Auto(), "on_get_message_from_database 1");
}
force_create_dialog(dialog_id, source);
@ -31469,7 +31474,7 @@ MessagesManager::Message *MessagesManager::on_get_message_from_database(DialogId
add_message_dependencies(dependencies, m.get());
if (!resolve_dependencies_force(td_, dependencies, "on_get_message_from_database")) {
FullMessageId full_message_id{dialog_id, m->message_id};
get_message_from_server(full_message_id, Auto());
get_message_from_server(full_message_id, Auto(), "on_get_message_from_database 2");
}
m->have_previous = false;
@ -35613,7 +35618,7 @@ void MessagesManager::reget_message_from_server_if_needed(DialogId dialog_id, co
if (need_reget_message_content(m->content.get()) || (m->legacy_layer != 0 && m->legacy_layer < MTPROTO_LAYER)) {
FullMessageId full_message_id{dialog_id, m->message_id};
LOG(INFO) << "Reget from server " << full_message_id;
get_message_from_server(full_message_id, Auto());
get_message_from_server(full_message_id, Auto(), "reget_message_from_server_if_needed");
}
}

4
td/telegram/MessagesManager.h
View File

@ -556,10 +556,10 @@ class MessagesManager final : public Actor {
bool get_messages(DialogId dialog_id, const vector<MessageId> &message_ids, Promise<Unit> &&promise);
void get_message_from_server(FullMessageId full_message_id, Promise<Unit> &&promise,
void get_message_from_server(FullMessageId full_message_id, Promise<Unit> &&promise, const char *source,
tl_object_ptr<telegram_api::InputMessage> input_message = nullptr);
void get_messages_from_server(vector<FullMessageId> &&message_ids, Promise<Unit> &&promise,
void get_messages_from_server(vector<FullMessageId> &&message_ids, Promise<Unit> &&promise, const char *source,
tl_object_ptr<telegram_api::InputMessage> input_message = nullptr);
struct MessageThreadInfo {

2
td/telegram/WebPagesManager.cpp
View File

@ -1375,7 +1375,7 @@ void WebPagesManager::on_pending_web_page_timeout(WebPageId web_page_id) {
}
if (!full_message_ids.empty()) {
send_closure_later(G()->messages_manager(), &MessagesManager::get_messages_from_server,
std::move(full_message_ids), Promise<Unit>(), nullptr);
std::move(full_message_ids), Promise<Unit>(), "on_pending_web_page_timeout", nullptr);
}
}
auto get_it = pending_get_web_pages_.find(web_page_id);