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

Move updated_read_history_message_ids out of Dialog.

Browse Source
This commit is contained in:
levlam 2023-03-16 18:05:36 +03:00
parent 3a1aaa1148
commit a9e70dcafc
2 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
td/telegram/MessagesManager.cpp
View File

@ -22572,7 +22572,7 @@ void MessagesManager::read_history_on_server(Dialog *d, MessageId max_message_id
LogEvent::HandlerType::ReadHistoryOnServer, "read history");
}
d->updated_read_history_message_ids.insert(MessageId());
updated_read_history_message_ids_[dialog_id].insert(MessageId());
pending_read_history_timeout_.set_timeout_in(dialog_id.get(), need_delay ? MIN_READ_HISTORY_DELAY : 0);
}
@ -22601,7 +22601,7 @@ void MessagesManager::read_message_thread_history_on_server(Dialog *d, MessageId
LogEvent::HandlerType::ReadMessageThreadHistoryOnServer, "read history");
}
d->updated_read_history_message_ids.insert(top_thread_message_id);
updated_read_history_message_ids_[dialog_id].insert(top_thread_message_id);
bool need_delay = d->open_count > 0 && last_message_id.is_valid() && max_message_id < last_message_id;
pending_read_history_timeout_.set_timeout_in(dialog_id.get(), need_delay ? MIN_READ_HISTORY_DELAY : 0);
@ -22615,14 +22615,17 @@ void MessagesManager::do_read_history_on_server(DialogId dialog_id) {
Dialog *d = get_dialog(dialog_id);
CHECK(d != nullptr);
for (auto top_thread_message_id : d->updated_read_history_message_ids) {
if (!top_thread_message_id.is_valid()) {
read_history_on_server_impl(d, MessageId());
} else {
read_message_thread_history_on_server_impl(d, top_thread_message_id, MessageId());
auto it = updated_read_history_message_ids_.find(dialog_id);
if (it != updated_read_history_message_ids_.end()) {
for (auto top_thread_message_id : it->second) {
if (!top_thread_message_id.is_valid()) {
read_history_on_server_impl(d, MessageId());
} else {
read_message_thread_history_on_server_impl(d, top_thread_message_id, MessageId());
}
}
updated_read_history_message_ids_.erase(it);
}
reset_to_empty(d->updated_read_history_message_ids);
}
void MessagesManager::read_history_on_server_impl(Dialog *d, MessageId max_message_id) {

3
td/telegram/MessagesManager.h
View File

@ -1307,7 +1307,6 @@ class MessagesManager final : public Actor {
LogEventIdWithGeneration save_draft_message_log_event_id;
LogEventIdWithGeneration save_notification_settings_log_event_id;
std::unordered_map<int64, LogEventIdWithGeneration, Hash<int64>> read_history_log_event_ids;
std::unordered_set<MessageId, MessageIdHash> updated_read_history_message_ids;
LogEventIdWithGeneration set_folder_id_log_event_id;
InputGroupCallId active_group_call_id;
InputGroupCallId expected_active_group_call_id;
@ -3761,6 +3760,8 @@ class MessagesManager final : public Actor {
};
FlatHashMap<DialogId, PendingMessageView, DialogIdHash> pending_message_views_;
FlatHashMap<DialogId, std::unordered_set<MessageId, MessageIdHash>, DialogIdHash> updated_read_history_message_ids_;
struct PendingReaction {
int32 query_count = 0;
bool was_updated = false;