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

Call get_message_id once in on_get_history.

Browse Source
This commit is contained in:
levlam 2022-05-31 15:56:38 +03:00
parent bcea804864
commit dc8d94383a
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
td/telegram/MessagesManager.cpp
View File

@ -9705,14 +9705,15 @@ void MessagesManager::on_get_history(DialogId dialog_id, MessageId from_message_
} }
for (auto &message : messages) { for (auto &message : messages) {
if (!have_next && from_the_end && get_message_id(message, false) < d->last_message_id) { auto expected_message_id = get_message_id(message, false);
if (!have_next && from_the_end && expected_message_id < d->last_message_id) {
// last message in the dialog should be attached to the next message if there is some // last message in the dialog should be attached to the next message if there is some
have_next = true; have_next = true;
} }
auto message_dialog_id = get_message_dialog_id(message); auto message_dialog_id = get_message_dialog_id(message);
if (message_dialog_id != dialog_id) { if (message_dialog_id != dialog_id) {
LOG(ERROR) << "Receive " << get_message_id(message, false) << " in wrong " << message_dialog_id << " instead of " LOG(ERROR) << "Receive " << expected_message_id << " in wrong " << message_dialog_id << " instead of "
<< dialog_id << ": " << oneline(to_string(message)); << dialog_id << ": " << oneline(to_string(message));
continue; continue;
} }
@ -9721,6 +9722,7 @@ void MessagesManager::on_get_history(DialogId dialog_id, MessageId from_message_
on_get_message(std::move(message), false, is_channel_message, false, false, have_next, "get history"); on_get_message(std::move(message), false, is_channel_message, false, false, have_next, "get history");
auto message_id = full_message_id.get_message_id(); auto message_id = full_message_id.get_message_id();
if (message_id.is_valid()) { if (message_id.is_valid()) {
CHECK(message_id == expected_message_id);
if (!last_added_message_id.is_valid()) { if (!last_added_message_id.is_valid()) {
last_added_message_id = message_id; last_added_message_id = message_id;
} }