From aa7d8c06bce7fb1e8b01c0b52ead19d27863d8ed Mon Sep 17 00:00:00 2001 From: levlam Date: Fri, 20 Dec 2019 16:32:56 +0300 Subject: [PATCH] Add logging in repair_dialog_action_bar. GitOrigin-RevId: 3aaf69fc3b5f366b00617e52e917a36381b87c2f --- td/telegram/ContactsManager.cpp | 6 +++--- td/telegram/MessagesManager.cpp | 24 +++++++++++++----------- td/telegram/MessagesManager.h | 2 +- 3 files changed, 17 insertions(+), 15 deletions(-) diff --git a/td/telegram/ContactsManager.cpp b/td/telegram/ContactsManager.cpp index f53a353f5..c0b70c43e 100644 --- a/td/telegram/ContactsManager.cpp +++ b/td/telegram/ContactsManager.cpp @@ -543,7 +543,7 @@ class AddContactQuery : public Td::ResultHandler { void on_error(uint64 id, Status status) override { promise_.set_error(std::move(status)); td->contacts_manager_->reload_contacts(true); - td->messages_manager_->repair_dialog_action_bar(DialogId(user_id_)); + td->messages_manager_->repair_dialog_action_bar(DialogId(user_id_), "AddContactQuery"); } }; @@ -577,7 +577,7 @@ class AcceptContactQuery : public Td::ResultHandler { void on_error(uint64 id, Status status) override { promise_.set_error(std::move(status)); td->contacts_manager_->reload_contacts(true); - td->messages_manager_->repair_dialog_action_bar(DialogId(user_id_)); + td->messages_manager_->repair_dialog_action_bar(DialogId(user_id_), "AcceptContactQuery"); } }; @@ -4203,7 +4203,7 @@ void ContactsManager::on_set_user_is_blocked_failed(UserId user_id, bool is_bloc LOG(WARNING) << "Receive error for SetUserIsBlockedQuery: " << error; on_update_user_is_blocked(user_id, !is_blocked); reload_user_full(user_id); - td_->messages_manager_->repair_dialog_action_bar(DialogId(user_id)); + td_->messages_manager_->repair_dialog_action_bar(DialogId(user_id), "on_set_user_is_blocked_failed"); } bool ContactsManager::is_valid_username(const string &username) { diff --git a/td/telegram/MessagesManager.cpp b/td/telegram/MessagesManager.cpp index 1ea6cad7c..1e1c34843 100644 --- a/td/telegram/MessagesManager.cpp +++ b/td/telegram/MessagesManager.cpp @@ -3455,7 +3455,7 @@ class UpdatePeerSettingsQuery : public Td::ResultHandler { void on_error(uint64 id, Status status) override { LOG(INFO) << "Receive error for update peer settings: " << status; td->messages_manager_->on_get_dialog_error(dialog_id_, status, "UpdatePeerSettingsQuery"); - td->messages_manager_->repair_dialog_action_bar(dialog_id_); + td->messages_manager_->repair_dialog_action_bar(dialog_id_, "UpdatePeerSettingsQuery"); promise_.set_error(std::move(status)); } }; @@ -3498,7 +3498,8 @@ class ReportEncryptedSpamQuery : public Td::ResultHandler { LOG(INFO) << "Receive error for report encrypted spam: " << status; td->messages_manager_->on_get_dialog_error(dialog_id_, status, "ReportEncryptedSpamQuery"); td->messages_manager_->repair_dialog_action_bar( - DialogId(td->contacts_manager_->get_secret_chat_user_id(dialog_id_.get_secret_chat_id()))); + DialogId(td->contacts_manager_->get_secret_chat_user_id(dialog_id_.get_secret_chat_id())), + "ReportEncryptedSpamQuery"); promise_.set_error(std::move(status)); } }; @@ -3547,7 +3548,7 @@ class ReportPeerQuery : public Td::ResultHandler { void on_error(uint64 id, Status status) override { LOG(INFO) << "Receive error for report peer: " << status; td->messages_manager_->on_get_dialog_error(dialog_id_, status, "ReportPeerQuery"); - td->messages_manager_->repair_dialog_action_bar(dialog_id_); + td->messages_manager_->repair_dialog_action_bar(dialog_id_, "ReportPeerQuery"); promise_.set_error(std::move(status)); } }; @@ -6761,11 +6762,12 @@ bool MessagesManager::update_dialog_silent_send_message(Dialog *d, bool silent_s return true; } -void MessagesManager::repair_dialog_action_bar(DialogId dialog_id) { - if (G()->close_flag() || !dialog_id.is_valid()) { +void MessagesManager::repair_dialog_action_bar(DialogId dialog_id, const char *source) { + if (G()->close_flag() || !dialog_id.is_valid() || td_->auth_manager_->is_bot()) { return; } + LOG(INFO) << "Repair action bar in " << dialog_id << " from " << source; switch (dialog_id.get_type()) { case DialogType::User: td_->contacts_manager_->reload_user_full(dialog_id.get_user_id()); @@ -14899,7 +14901,7 @@ void MessagesManager::open_dialog(Dialog *d) { break; case DialogType::Chat: td_->contacts_manager_->repair_chat_participants(dialog_id.get_chat_id()); - repair_dialog_action_bar(dialog_id); + repair_dialog_action_bar(dialog_id, "open_dialog"); break; case DialogType::Channel: if (!is_broadcast_channel(dialog_id)) { @@ -14912,7 +14914,7 @@ void MessagesManager::open_dialog(Dialog *d) { } } get_channel_difference(dialog_id, d->pts, true, "open_dialog"); - repair_dialog_action_bar(dialog_id); + repair_dialog_action_bar(dialog_id, "open_dialog"); break; case DialogType::SecretChat: { // to repair dialog action bar @@ -23653,7 +23655,7 @@ void MessagesManager::on_dialog_user_is_contact_updated(DialogId dialog_id, bool } else { d->know_action_bar = false; if (have_input_peer(dialog_id, AccessRights::Read)) { - repair_dialog_action_bar(dialog_id); + repair_dialog_action_bar(dialog_id, "on_dialog_user_is_contact_updated"); } // there is no need to change action bar on_dialog_updated(dialog_id, "on_dialog_user_is_contact_updated"); @@ -23678,7 +23680,7 @@ void MessagesManager::on_dialog_user_is_blocked_updated(DialogId dialog_id, bool } else { d->know_action_bar = false; if (have_input_peer(dialog_id, AccessRights::Read)) { - repair_dialog_action_bar(dialog_id); + repair_dialog_action_bar(dialog_id, "on_dialog_user_is_blocked_updated"); } // there is no need to change action bar on_dialog_updated(dialog_id, "on_dialog_user_is_blocked_updated"); @@ -23702,7 +23704,7 @@ void MessagesManager::on_dialog_user_is_deleted_updated(DialogId dialog_id, bool } else { d->know_action_bar = false; if (have_input_peer(dialog_id, AccessRights::Read)) { - repair_dialog_action_bar(dialog_id); + repair_dialog_action_bar(dialog_id, "on_dialog_user_is_deleted_updated"); } // there is no need to change action bar on_dialog_updated(dialog_id, "on_dialog_user_is_deleted_updated"); @@ -27470,7 +27472,7 @@ void MessagesManager::fix_new_dialog(Dialog *d, unique_ptr &&last_datab force_create_dialog(DialogId(user_id), "add chat with user to load/store action_bar"); } } else { - repair_dialog_action_bar(dialog_id); + repair_dialog_action_bar(dialog_id, "fix_new_dialog"); } } diff --git a/td/telegram/MessagesManager.h b/td/telegram/MessagesManager.h index ff1849339..f8579f3a6 100644 --- a/td/telegram/MessagesManager.h +++ b/td/telegram/MessagesManager.h @@ -693,7 +693,7 @@ class MessagesManager : public Actor { void remove_dialog_action_bar(DialogId dialog_id, Promise &&promise); - void repair_dialog_action_bar(DialogId dialog_id); + void repair_dialog_action_bar(DialogId dialog_id, const char *source); void report_dialog(DialogId dialog_id, const tl_object_ptr &reason, const vector &message_ids, Promise &&promise);