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

Update last pinned message ID after receiving pinned message search results.

Browse Source 
GitOrigin-RevId: 5847782e855561c3f17b8f2a3d3a3feb3fc096d9
This commit is contained in:
levlam 2020-10-30 18:50:45 +03:00
parent e97d547edf
commit ed24ba28df
1 changed files with 33 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
td/telegram/MessagesManager.cpp
View File

@ -9257,7 +9257,7 @@ void MessagesManager::on_get_dialog_messages_search_result(DialogId dialog_id, c
MessageId first_added_message_id;
if (messages.empty()) {
// messages may be empty because there are no more messages or they can't be found due to global limit
// anyway pretend that there is no more messages
// anyway pretend that there are no more messages
first_added_message_id = MessageId::min();
}
bool can_be_in_different_dialog = top_thread_message_id.is_valid() && is_broadcast_channel(dialog_id);
@ -9309,7 +9309,11 @@ void MessagesManager::on_get_dialog_messages_search_result(DialogId dialog_id, c
total_count = static_cast<int32>(result.size());
}
if (query.empty() && !sender_dialog_id.is_valid() && filter != MessageSearchFilter::Empty &&
!top_thread_message_id.is_valid() && G()->parameters().use_message_db) {
!top_thread_message_id.is_valid()) {
bool from_the_end = !from_message_id.is_valid() ||
(d->last_message_id != MessageId() && from_message_id > d->last_message_id) ||
from_message_id >= MessageId::max();
if (G()->parameters().use_message_db) {
bool update_dialog = false;
auto &old_message_count = d->message_count_by_index[message_search_filter_index(filter)];
@ -9324,9 +9328,6 @@ void MessagesManager::on_get_dialog_messages_search_result(DialogId dialog_id, c
}
auto &old_first_db_message_id = d->first_database_message_id_by_index[message_search_filter_index(filter)];
bool from_the_end = !from_message_id.is_valid() ||
(d->last_message_id != MessageId() && from_message_id > d->last_message_id) ||
from_message_id >= MessageId::max();
if ((from_the_end || (old_first_db_message_id.is_valid() && old_first_db_message_id <= from_message_id)) &&
(!old_first_db_message_id.is_valid() || first_added_message_id < old_first_db_message_id)) {
old_first_db_message_id = first_added_message_id;
@ -9336,6 +9337,12 @@ void MessagesManager::on_get_dialog_messages_search_result(DialogId dialog_id, c
on_dialog_updated(dialog_id, "search results");
}
}
if (from_the_end && filter == MessageSearchFilter::Pinned) {
set_dialog_last_pinned_message_id(d, result.empty() ? MessageId() : result[0]);
}
}
it->second.first = total_count;
}
@ -20261,8 +20268,7 @@ std::pair<int32, vector<MessageId>> MessagesManager::search_dialog_messages(
// Trying to use database
if (use_db && query.empty() && G()->parameters().use_message_db && filter != MessageSearchFilter::Empty &&
!sender_dialog_id.is_valid() &&
top_thread_message_id == MessageId()) { // TODO support filter by users in the database
!sender_dialog_id.is_valid() && top_thread_message_id == MessageId()) {
MessageId first_db_message_id = get_first_database_message_id_by_index(d, filter);
int32 message_count = d->message_count_by_index[message_search_filter_index(filter)];
auto fixed_from_message_id = from_message_id;
@ -20847,6 +20853,9 @@ void MessagesManager::on_search_dialog_messages_db_result(int64 random_id, Dialo
found_dialog_messages_.erase(it);
} else {
LOG(INFO) << "Found " << res.size() << " messages out of " << message_count << " in database";
if (from_the_end && filter == MessageSearchFilter::Pinned) {
set_dialog_last_pinned_message_id(d, res.empty() ? MessageId() : res[0]);
}
}
promise.set_value(Unit());
}