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

Better handling of empty dialogs and last pending message.

Browse Source 
GitOrigin-RevId: cb9905ab05a7f60c2430d64b6f6a17ddbd54beb3
This commit is contained in:
levlam 2019-01-14 01:22:06 +03:00
parent ee2d557531
commit 90cde3dea0
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
td/telegram/MessagesManager.cpp
View File

@ -6529,7 +6529,7 @@ void MessagesManager::on_get_history(DialogId dialog_id, MessageId from_message_
on_dialog_updated(dialog_id, "set have_full_history"); on_dialog_updated(dialog_id, "set have_full_history");
} }
if (from_the_end && d->have_full_history) { if (from_the_end && d->have_full_history && d->messages == nullptr && !d->last_database_message_id.is_valid()) {
set_dialog_is_empty(d, "on_get_history empty"); set_dialog_is_empty(d, "on_get_history empty");
} }
} }
@ -9802,6 +9802,10 @@ void MessagesManager::set_dialog_is_empty(Dialog *d, const char *source) {
d->pending_last_message_date = 0; d->pending_last_message_date = 0;
d->pending_last_message_id = MessageId(); d->pending_last_message_id = MessageId();
} }
if (d->last_database_message_id.is_valid()) {
set_dialog_first_database_message_id(d, MessageId(), "set_dialog_is_empty");
set_dialog_last_database_message_id(d, MessageId(), "set_dialog_is_empty");
}
update_dialog_pos(d, false, source); update_dialog_pos(d, false, source);
} }
@ -22382,9 +22386,12 @@ void MessagesManager::fix_new_dialog(Dialog *d, unique_ptr<Message> &&last_datab
pending_add_dialog_last_database_message_[dialog_id] = {dependent_dialog_count, std::move(last_database_message)}; pending_add_dialog_last_database_message_[dialog_id] = {dependent_dialog_count, std::move(last_database_message)};
} }
} else if (last_database_message_id.is_valid()) { } else if (last_database_message_id.is_valid()) {
d->pending_last_message_date = DialogDate(order, dialog_id).get_date(); auto date = DialogDate(order, dialog_id).get_date();
if (date < MIN_PINNED_DIALOG_DATE) {
d->pending_last_message_date = date;
d->pending_last_message_id = last_database_message_id; d->pending_last_message_id = last_database_message_id;
} }
}
switch (dialog_id.get_type()) { switch (dialog_id.get_type()) {
case DialogType::User: case DialogType::User: