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

Allow to read deleted thread messages.

Browse Source
This commit is contained in:
levlam 2022-11-28 17:54:32 +03:00
parent c8507ec16a
commit d581e0499a
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
td/telegram/MessagesManager.cpp
View File

@ -21309,6 +21309,7 @@ Status MessagesManager::view_messages(DialogId dialog_id, MessageId top_thread_m
return Status::Error(400, "Can't access the chat"); return Status::Error(400, "Can't access the chat");
} }
MessageId max_thread_message_id;
if (top_thread_message_id != MessageId()) { if (top_thread_message_id != MessageId()) {
if (!top_thread_message_id.is_valid() || !top_thread_message_id.is_server()) { if (!top_thread_message_id.is_valid() || !top_thread_message_id.is_server()) {
return Status::Error(400, "Invalid message thread ID specified"); return Status::Error(400, "Invalid message thread ID specified");
@ -21316,6 +21317,10 @@ Status MessagesManager::view_messages(DialogId dialog_id, MessageId top_thread_m
if (dialog_id.get_type() != DialogType::Channel || is_broadcast_channel(dialog_id)) { if (dialog_id.get_type() != DialogType::Channel || is_broadcast_channel(dialog_id)) {
return Status::Error(400, "There are no message threads in the chat"); return Status::Error(400, "There are no message threads in the chat");
} }
const auto *top_m = get_message_force(d, top_thread_message_id, "view_messages 6");
if (top_m != nullptr && !top_m->reply_info.is_comment_) {
max_thread_message_id = top_m->reply_info.max_message_id_;
}
} }
bool need_read = force_read || d->is_opened; bool need_read = force_read || d->is_opened;
@ -21328,7 +21333,7 @@ Status MessagesManager::view_messages(DialogId dialog_id, MessageId top_thread_m
continue; continue;
} }
auto *m = get_message_force(d, message_id, "view_messages"); auto *m = get_message_force(d, message_id, "view_messages 1");
if (m != nullptr) { if (m != nullptr) {
if (m->message_id.is_server() && m->view_count > 0) { if (m->message_id.is_server() && m->view_count > 0) {
d->pending_viewed_message_ids.insert(m->message_id); d->pending_viewed_message_ids.insert(m->message_id);
@ -21386,11 +21391,13 @@ Status MessagesManager::view_messages(DialogId dialog_id, MessageId top_thread_m
view_id = ++info->current_view_id; view_id = ++info->current_view_id;
info->recently_viewed_messages[view_id] = message_id; info->recently_viewed_messages[view_id] = message_id;
} }
} else if (!message_id.is_yet_unsent() && message_id > max_message_id && } else if (!message_id.is_yet_unsent() && message_id > max_message_id) {
message_id <= d->max_notification_message_id) { if (message_id <= d->max_notification_message_id || message_id <= d->last_new_message_id ||
message_id <= max_thread_message_id) {
max_message_id = message_id; max_message_id = message_id;
} }
} }
}
if (!d->pending_viewed_message_ids.empty()) { if (!d->pending_viewed_message_ids.empty()) {
pending_message_views_timeout_.add_timeout_in(dialog_id.get(), MAX_MESSAGE_VIEW_DELAY); pending_message_views_timeout_.add_timeout_in(dialog_id.get(), MAX_MESSAGE_VIEW_DELAY);
d->increment_view_counter |= d->is_opened; d->increment_view_counter |= d->is_opened;
@ -21423,7 +21430,7 @@ Status MessagesManager::view_messages(DialogId dialog_id, MessageId top_thread_m
if (top_thread_message_id.is_valid() && max_message_id.is_valid()) { if (top_thread_message_id.is_valid() && max_message_id.is_valid()) {
MessageId prev_last_read_inbox_message_id; MessageId prev_last_read_inbox_message_id;
MessageId max_thread_message_id; max_thread_message_id = MessageId();
Message *top_m = get_message_force(d, top_thread_message_id, "view_messages 2"); Message *top_m = get_message_force(d, top_thread_message_id, "view_messages 2");
if (top_m != nullptr && is_active_message_reply_info(dialog_id, top_m->reply_info)) { if (top_m != nullptr && is_active_message_reply_info(dialog_id, top_m->reply_info)) {
prev_last_read_inbox_message_id = top_m->reply_info.last_read_inbox_message_id_; prev_last_read_inbox_message_id = top_m->reply_info.last_read_inbox_message_id_;