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

Don't init last_new_message_id with max_unavailable_message_id.

Browse Source 
The message with last_new_message_id must be the latest existing server message,
after which all messages will be received through updates.
This commit is contained in:
levlam 2021-06-25 03:26:59 +03:00
parent 4c49acc440
commit 50d2d0ff00
1 changed files with 9 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
td/telegram/MessagesManager.cpp
View File

@ -11728,16 +11728,12 @@ void MessagesManager::set_dialog_max_unavailable_message_id(DialogId dialog_id,
Dialog *d = get_dialog_force(dialog_id, source); Dialog *d = get_dialog_force(dialog_id, source);
if (d != nullptr) { if (d != nullptr) {
if (max_unavailable_message_id > d->last_new_message_id && from_update) { if (d->last_new_message_id.is_valid() && max_unavailable_message_id > d->last_new_message_id && from_update) {
if (d->last_new_message_id.is_valid()) {
if (!td_->auth_manager_->is_bot()) { if (!td_->auth_manager_->is_bot()) {
LOG(ERROR) << "Tried to set " << dialog_id << " max unavailable message to " << max_unavailable_message_id LOG(ERROR) << "Tried to set " << dialog_id << " max unavailable message to " << max_unavailable_message_id
<< " from " << source << ", but last new message is " << d->last_new_message_id; << " from " << source << ", but last new message is " << d->last_new_message_id;
} }
max_unavailable_message_id = d->last_new_message_id; max_unavailable_message_id = d->last_new_message_id;
} else if (max_unavailable_message_id.is_valid() && max_unavailable_message_id.is_server()) {
set_dialog_last_new_message_id(d, max_unavailable_message_id, source);
}
} }
if (d->max_unavailable_message_id == max_unavailable_message_id) { if (d->max_unavailable_message_id == max_unavailable_message_id) {
@ -31650,8 +31646,10 @@ MessagesManager::Message *MessagesManager::add_message_to_dialog(Dialog *d, uniq
if (max_message_id != MessageId() && message_id > max_message_id) { if (max_message_id != MessageId() && message_id > max_message_id) {
if (!message->from_database) { if (!message->from_database) {
LOG(ERROR) << "Ignore " << message_id << " in " << dialog_id << " received not through update from " << source LOG(ERROR) << "Ignore " << message_id << " in " << dialog_id << " received not through update from " << source
<< ". Last is " << max_message_id << ", channel difference " << debug_channel_difference_dialog_ << ". Maximum allowed is " << max_message_id << ", last is " << d->last_message_id
<< " " << to_string(get_message_object(dialog_id, message.get())); << ", being added message is " << d->being_added_message_id << ", channel difference "
<< debug_channel_difference_dialog_ << " "
<< to_string(get_message_object(dialog_id, message.get()));
dump_debug_message_op(d, 3); dump_debug_message_op(d, 3);
if (need_channel_difference_to_add_message(dialog_id, nullptr)) { if (need_channel_difference_to_add_message(dialog_id, nullptr)) {
@ -33759,12 +33757,6 @@ void MessagesManager::fix_new_dialog(Dialog *d, unique_ptr<Message> &&last_datab
LOG(ERROR) << "Drop invalid last_new_message_id " << d->last_new_message_id << " in " << dialog_id; LOG(ERROR) << "Drop invalid last_new_message_id " << d->last_new_message_id << " in " << dialog_id;
d->last_new_message_id = MessageId(); d->last_new_message_id = MessageId();
} }
if (!d->last_new_message_id.is_valid() && d->max_unavailable_message_id.is_valid() &&
d->max_unavailable_message_id.is_server()) {
LOG(ERROR) << "Bugfixing wrong last_new_message_id with max_unavailable_message_id to "
<< d->max_unavailable_message_id << " in " << dialog_id;
set_dialog_last_new_message_id(d, d->max_unavailable_message_id, "fix_new_dialog 11");
}
if (last_message_id.is_valid()) { if (last_message_id.is_valid()) {
if ((last_message_id.is_server() || dialog_type == DialogType::SecretChat) && !d->last_new_message_id.is_valid()) { if ((last_message_id.is_server() || dialog_type == DialogType::SecretChat) && !d->last_new_message_id.is_valid()) {
LOG(ERROR) << "Bugfixing wrong last_new_message_id to " << last_message_id << " in " << dialog_id; LOG(ERROR) << "Bugfixing wrong last_new_message_id to " << last_message_id << " in " << dialog_id;