andreacavalli/tdlib-fork
Archived
1
0
Fork 0
Code Pull Requests Releases Activity

Preload pinned_message_notification_message_id even it is newer than being added message, because it could be deleted in set_dialog_last_new_message_id->delete_all_dialog_messages_from_database->remove_dialog_pinned_message_notification.

Browse Source 
GitOrigin-RevId: 8c4b73436bc26870af4fa788dedd5035e17116b9
This commit is contained in:
levlam 2020-05-22 13:12:31 +03:00
parent 54909ad713
commit 34c9ee6e84
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
td/telegram/MessagesManager.cpp
View File

@ -26569,7 +26569,7 @@ MessagesManager::Message *MessagesManager::add_message_to_dialog(Dialog *d, uniq
// in get_message_notification_group_force // in get_message_notification_group_force
get_dialog_notification_group_id(d->dialog_id, get_notification_group_info(d, message.get())); get_dialog_notification_group_id(d->dialog_id, get_notification_group_info(d, message.get()));
} }
if (*need_update || (!d->last_new_message_id.is_valid() && !message_id.is_yet_unsent() && !message->from_database)) { if (*need_update || (!d->last_new_message_id.is_valid() && !message_id.is_yet_unsent())) {
auto pinned_message_id = get_message_content_pinned_message_id(message->content.get()); auto pinned_message_id = get_message_content_pinned_message_id(message->content.get());
if (pinned_message_id.is_valid() && pinned_message_id < message_id && if (pinned_message_id.is_valid() && pinned_message_id < message_id &&
have_message_force({dialog_id, pinned_message_id}, "preload pinned message")) { have_message_force({dialog_id, pinned_message_id}, "preload pinned message")) {
@ -26577,7 +26577,7 @@ MessagesManager::Message *MessagesManager::add_message_to_dialog(Dialog *d, uniq
} }
if (d->pinned_message_notification_message_id.is_valid() && if (d->pinned_message_notification_message_id.is_valid() &&
d->pinned_message_notification_message_id < message_id && d->pinned_message_notification_message_id != message_id &&
have_message_force({dialog_id, d->pinned_message_notification_message_id}, have_message_force({dialog_id, d->pinned_message_notification_message_id},
"preload previously pinned message")) { "preload previously pinned message")) {
LOG(INFO) << "Preloaded previously pinned " << d->pinned_message_notification_message_id << " from database"; LOG(INFO) << "Preloaded previously pinned " << d->pinned_message_notification_message_id << " from database";
@ -27166,7 +27166,7 @@ void MessagesManager::delete_all_dialog_messages_from_database(Dialog *d, Messag
} }
if (d->pinned_message_notification_message_id.is_valid() && if (d->pinned_message_notification_message_id.is_valid() &&
d->pinned_message_notification_message_id <= max_message_id) { d->pinned_message_notification_message_id <= max_message_id) {
remove_dialog_pinned_message_notification(d, "delete_all_dialog_messages_from_database"); remove_dialog_pinned_message_notification(d, source);
} }
remove_message_dialog_notifications(d, max_message_id, false, source); remove_message_dialog_notifications(d, max_message_id, false, source);
remove_message_dialog_notifications(d, max_message_id, true, source); remove_message_dialog_notifications(d, max_message_id, true, source);