From bcf65c901e085b5c048b4672f99f001ec023881b Mon Sep 17 00:00:00 2001 From: levlam Date: Thu, 4 Apr 2019 23:03:27 +0300 Subject: [PATCH] Add more being_added_message_id debug. GitOrigin-RevId: 3040c562be8a826ec5183ea569d7f69aaca6fd40 --- td/telegram/MessagesManager.cpp | 9 +++++++-- td/telegram/MessagesManager.h | 2 ++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/td/telegram/MessagesManager.cpp b/td/telegram/MessagesManager.cpp index f207bff7..13633865 100644 --- a/td/telegram/MessagesManager.cpp +++ b/td/telegram/MessagesManager.cpp @@ -19150,7 +19150,7 @@ bool MessagesManager::add_new_message_notification(Dialog *d, Message *m, bool f auto message_id = get_message_content_pinned_message_id(m->content.get()); if (message_id.is_valid() && !have_message({d->dialog_id, message_id}, - force ? "add_new_message_notification false" : "add_new_message_notification true")) { + force ? "add_new_message_notification force" : "add_new_message_notification not force")) { missing_pinned_message_id = message_id; } } @@ -22203,9 +22203,11 @@ 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; if (*need_update) { auto pinned_message_id = get_message_content_pinned_message_id(message->content.get()); 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"; } @@ -22218,8 +22220,11 @@ MessagesManager::Message *MessagesManager::add_message_to_dialog(Dialog *d, uniq // there must be no two recursive calls to add_message_to_dialog LOG_CHECK(!d->being_added_message_id.is_valid()) << d->dialog_id << " " << d->being_added_message_id << " " << message_id << " " << *need_update << " " - << d->pinned_message_notification_message_id << " " << source; + << d->debug_being_added_need_update << " " << d->pinned_message_notification_message_id << " " + << preloaded_pinned_message_id << " " << d->debug_preloaded_pinned_message_id << " " << 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; 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 f2056d8e..d21a9196 100644 --- a/td/telegram/MessagesManager.h +++ b/td/telegram/MessagesManager.h @@ -966,6 +966,8 @@ class MessagesManager : public Actor { MessageId max_added_message_id; MessageId being_added_message_id; + bool debug_being_added_need_update = false; // TODO remove + MessageId debug_preloaded_pinned_message_id; // TODO remove NotificationGroupInfo message_notification_group; NotificationGroupInfo mention_notification_group;