From 3afcaa67f887e762c24c8c67043a81e2eef95f77 Mon Sep 17 00:00:00 2001 From: levlam Date: Wed, 10 Apr 2019 15:22:34 +0300 Subject: [PATCH] Add more being_added_message_id debug. GitOrigin-RevId: 248551b7fb837863e363d548c450e547353facef --- td/telegram/MessagesManager.cpp | 12 ++++++++++-- td/telegram/MessagesManager.h | 2 ++ 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/td/telegram/MessagesManager.cpp b/td/telegram/MessagesManager.cpp index 4e5bfe26..5b5fb52a 100644 --- a/td/telegram/MessagesManager.cpp +++ b/td/telegram/MessagesManager.cpp @@ -22359,13 +22359,17 @@ MessagesManager::Message *MessagesManager::add_message_to_dialog(Dialog *d, uniq // in get_message_notification_group_force get_dialog_notification_group_id(d->dialog_id, get_notification_group_info(d, message.get())); } - MessageId preloaded_pinned_message_id; + MessageId added_pinned_message_id; // TODO remove + MessageId preloaded_pinned_message_id; // TODO remove + const char *add_error_reason = ""; if (*need_update) { auto pinned_message_id = get_message_content_pinned_message_id(message->content.get()); + added_pinned_message_id = pinned_message_id; if (pinned_message_id.is_valid() && have_message({dialog_id, pinned_message_id}, "preload pinned message")) { preloaded_pinned_message_id = pinned_message_id; LOG(INFO) << "Preloaded pinned " << pinned_message_id << " from database"; } + add_error_reason = debug_add_message_to_dialog_fail_reason_; if (d->pinned_message_notification_message_id.is_valid() && have_message({dialog_id, d->pinned_message_notification_message_id}, "preload previously pinned message")) { @@ -22377,10 +22381,14 @@ MessagesManager::Message *MessagesManager::add_message_to_dialog(Dialog *d, uniq LOG_CHECK(!d->being_added_message_id.is_valid()) << d->dialog_id << " " << d->being_added_message_id << " " << message_id << " " << *need_update << " " << d->debug_being_added_need_update << " " << d->pinned_message_notification_message_id << " " - << preloaded_pinned_message_id << " " << d->debug_preloaded_pinned_message_id << " " << source; + << preloaded_pinned_message_id << " " << d->debug_preloaded_pinned_message_id << " " + << d->debug_added_pinned_message_id << " " << d->debug_add_message_to_dialog_fail_reason_ << " " << source; + d->being_added_message_id = message_id; d->debug_being_added_need_update = *need_update; d->debug_preloaded_pinned_message_id = preloaded_pinned_message_id; + d->debug_added_pinned_message_id = added_pinned_message_id; + d->debug_add_message_to_dialog_fail_reason_ = add_error_reason; if (d->new_secret_chat_notification_id.is_valid()) { remove_new_secret_chat_notification(d, true); diff --git a/td/telegram/MessagesManager.h b/td/telegram/MessagesManager.h index 003fc63f..31b63169 100644 --- a/td/telegram/MessagesManager.h +++ b/td/telegram/MessagesManager.h @@ -973,6 +973,8 @@ class MessagesManager : public Actor { MessageId being_added_message_id; bool debug_being_added_need_update = false; // TODO remove MessageId debug_preloaded_pinned_message_id; // TODO remove + MessageId debug_added_pinned_message_id; // TODO remove + const char *debug_add_message_to_dialog_fail_reason_ = ""; NotificationGroupInfo message_notification_group; NotificationGroupInfo mention_notification_group;