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

Fix viewMessages.force_read.

Browse Source
This commit is contained in:
levlam 2023-03-05 15:49:08 +03:00
parent c983eb6eab
commit 31be0a5be8
1 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
td/telegram/MessagesManager.cpp
View File

@ -21707,7 +21707,10 @@ Status MessagesManager::view_messages(DialogId dialog_id, vector<MessageId> mess
return Status::OK(); return Status::OK();
} }
if (source == MessageSource::MessageThreadHistory && top_thread_message_id.is_valid() && max_message_id.is_valid()) { if (source == MessageSource::MessageThreadHistory) {
if (!top_thread_message_id.is_valid() || !max_message_id.is_valid()) {
return Status::OK();
}
MessageId prev_last_read_inbox_message_id; MessageId prev_last_read_inbox_message_id;
max_thread_message_id = MessageId(); max_thread_message_id = MessageId();
Message *top_m = get_message_force(d, top_thread_message_id, "view_messages 9"); Message *top_m = get_message_force(d, top_thread_message_id, "view_messages 9");
@ -21753,39 +21756,36 @@ Status MessagesManager::view_messages(DialogId dialog_id, vector<MessageId> mess
return Status::OK(); return Status::OK();
} }
if (source == MessageSource::DialogHistory) { CHECK(source == MessageSource::DialogHistory || force_read);
if (max_message_id > d->last_read_inbox_message_id) { if (max_message_id > d->last_read_inbox_message_id) {
const MessageId last_read_message_id = max_message_id; const MessageId last_read_message_id = max_message_id;
const MessageId prev_last_read_inbox_message_id = d->last_read_inbox_message_id; const MessageId prev_last_read_inbox_message_id = d->last_read_inbox_message_id;
MessageId read_history_on_server_message_id; MessageId read_history_on_server_message_id;
if (dialog_id.get_type() != DialogType::SecretChat) { if (dialog_id.get_type() != DialogType::SecretChat) {
if (last_read_message_id.get_prev_server_message_id().get() > if (last_read_message_id.get_prev_server_message_id().get() >
prev_last_read_inbox_message_id.get_prev_server_message_id().get()) { prev_last_read_inbox_message_id.get_prev_server_message_id().get()) {
read_history_on_server_message_id = last_read_message_id.get_prev_server_message_id(); read_history_on_server_message_id = last_read_message_id.get_prev_server_message_id();
}
} else {
if (last_read_message_id > prev_last_read_inbox_message_id) {
read_history_on_server_message_id = last_read_message_id;
}
} }
} else {
if (last_read_message_id > prev_last_read_inbox_message_id) {
read_history_on_server_message_id = last_read_message_id;
}
}
if (read_history_on_server_message_id.is_valid()) { if (read_history_on_server_message_id.is_valid()) {
// add dummy timeout to not try to repair unread_count in read_history_inbox before server request succeeds // add dummy timeout to not try to repair unread_count in read_history_inbox before server request succeeds
// the timeout will be overwritten in the read_history_on_server call // the timeout will be overwritten in the read_history_on_server call
pending_read_history_timeout_.add_timeout_in(dialog_id.get(), 0); pending_read_history_timeout_.add_timeout_in(dialog_id.get(), 0);
}
read_history_inbox(d->dialog_id, last_read_message_id, -1, "view_messages 13");
if (read_history_on_server_message_id.is_valid()) {
// call read_history_on_server after read_history_inbox to not have delay before request if all messages are read
read_history_on_server(d, read_history_on_server_message_id);
}
} }
if (d->is_marked_as_unread) { read_history_inbox(d->dialog_id, last_read_message_id, -1, "view_messages 13");
set_dialog_is_marked_as_unread(d, false); if (read_history_on_server_message_id.is_valid()) {
// call read_history_on_server after read_history_inbox to not have delay before request if all messages are read
read_history_on_server(d, read_history_on_server_message_id);
} }
return Status::OK();
} }
if (d->is_marked_as_unread) {
set_dialog_is_marked_as_unread(d, false);
}
return Status::OK(); return Status::OK();
} }