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

Init unknown last_new_message_id to max_unavailable_message_id.

Browse Source 
GitOrigin-RevId: cd70cf1e8fb571c69f8cbef5442881567a87b134
This commit is contained in:
levlam 2019-06-20 18:39:12 +03:00
parent a19fa6b724
commit b498688054
1 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
td/telegram/MessagesManager.cpp
View File

@ -8676,10 +8676,16 @@ void MessagesManager::set_dialog_max_unavailable_message_id(DialogId dialog_id,
bool from_update, const char *source) { bool from_update, const char *source) {
Dialog *d = get_dialog_force(dialog_id); Dialog *d = get_dialog_force(dialog_id);
if (d != nullptr) { if (d != nullptr) {
if (d->last_new_message_id.is_valid() && max_unavailable_message_id.get() > d->last_new_message_id.get()) { if (max_unavailable_message_id.get() > d->last_new_message_id.get() && from_update) {
LOG(ERROR) << "Tried to set " << dialog_id << " max unavailable message id to " << max_unavailable_message_id if (d->last_new_message_id.is_valid()) {
<< " from " << source << ", but last new message id is " << d->last_new_message_id; if (!td_->auth_manager_->is_bot()) {
max_unavailable_message_id = d->last_new_message_id; LOG(ERROR) << "Tried to set " << dialog_id << " max unavailable message id to " << max_unavailable_message_id
<< " from " << source << ", but last new message id is " << d->last_new_message_id;
}
max_unavailable_message_id = d->last_new_message_id;
} else if (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) {
@ -20488,11 +20494,11 @@ MessageId MessagesManager::get_next_message_id(Dialog *d, int32 type) {
d->last_assigned_message_id.get(), d->last_clear_history_message_id.get(), d->last_assigned_message_id.get(), d->last_clear_history_message_id.get(),
d->deleted_last_message_id.get(), d->max_unavailable_message_id.get(), d->max_added_message_id.get()}); d->deleted_last_message_id.get(), d->max_unavailable_message_id.get(), d->max_added_message_id.get()});
if (last < d->last_read_inbox_message_id.get() && if (last < d->last_read_inbox_message_id.get() &&
d->last_read_inbox_message_id.get() < d->last_new_message_id.get() + MessageId::FULL_TYPE_MASK) { d->last_read_inbox_message_id.get() <= (d->last_new_message_id.get() | MessageId::FULL_TYPE_MASK)) {
last = d->last_read_inbox_message_id.get(); last = d->last_read_inbox_message_id.get();
} }
if (last < d->last_read_outbox_message_id.get() && if (last < d->last_read_outbox_message_id.get() &&
d->last_read_outbox_message_id.get() < d->last_new_message_id.get() + MessageId::FULL_TYPE_MASK) { d->last_read_outbox_message_id.get() <= (d->last_new_message_id.get() | MessageId::FULL_TYPE_MASK)) {
last = d->last_read_outbox_message_id.get(); last = d->last_read_outbox_message_id.get();
} }
@ -24395,6 +24401,12 @@ void MessagesManager::fix_new_dialog(Dialog *d, unique_ptr<Message> &&last_datab
last_message_id = last_database_message_id; last_message_id = last_database_message_id;
} }
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_id.get_type() == DialogType::SecretChat) && if ((last_message_id.is_server() || dialog_id.get_type() == DialogType::SecretChat) &&
!d->last_new_message_id.is_valid()) { !d->last_new_message_id.is_valid()) {