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

Add MessagesManager::get_dialog_list_folder_ids.

Browse Source 
GitOrigin-RevId: 9f32a65eebec47964f9222a4bb5fd0e1221c492f
This commit is contained in:
levlam 2020-05-21 03:48:54 +03:00
parent b1a6bf42eb
commit 0ea6ebd1e4
2 changed files with 22 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
td/telegram/MessagesManager.cpp
View File

@ -10188,7 +10188,7 @@ void MessagesManager::repair_server_dialog_total_count(FolderId folder_id) {
get_sequence_dispatcher_id(DialogId(), MessageContentType::None)); get_sequence_dispatcher_id(DialogId(), MessageContentType::None));
} }
void MessagesManager::repair_secret_chat_total_count(FolderId folder_id) { void MessagesManager::repair_secret_chat_total_count(FolderId dialog_list_id) {
if (td_->auth_manager_->is_bot()) { if (td_->auth_manager_->is_bot()) {
return; return;
} }
@ -10196,23 +10196,23 @@ void MessagesManager::repair_secret_chat_total_count(FolderId folder_id) {
if (G()->parameters().use_message_db) { if (G()->parameters().use_message_db) {
// race-prone // race-prone
G()->td_db()->get_dialog_db_async()->get_secret_chat_count( G()->td_db()->get_dialog_db_async()->get_secret_chat_count(
folder_id, PromiseCreator::lambda([actor_id = actor_id(this), folder_id](Result<int32> result) { dialog_list_id, PromiseCreator::lambda([actor_id = actor_id(this), dialog_list_id](Result<int32> result) {
if (result.is_error()) { if (result.is_error()) {
return; return;
} }
send_closure(actor_id, &MessagesManager::on_get_secret_chat_total_count, folder_id, result.move_as_ok()); send_closure(actor_id, &MessagesManager::on_get_secret_chat_total_count, dialog_list_id, result.move_as_ok());
})); }));
} else { } else {
int32 total_count = 0; int32 total_count = 0;
auto *list = get_dialog_list(folder_id); auto *list = get_dialog_list(dialog_list_id);
CHECK(list != nullptr); CHECK(list != nullptr);
for (const auto &folder_it : dialog_lists_) { for (auto &folder_id : get_dialog_list_folder_ids(*list)) {
auto &folder = folder_it.second; auto *folder_list = get_dialog_list(folder_id);
if (has_dialogs_from_folder(*list, folder)) {
auto *folder_list = get_dialog_list(folder.folder_id);
if (folder_list->need_unread_count_recalc_) { if (folder_list->need_unread_count_recalc_) {
return; return;
} }
auto &folder = *get_dialog_list(folder_id);
for (const auto &dialog_date : folder.ordered_dialogs_) { for (const auto &dialog_date : folder.ordered_dialogs_) {
auto dialog_id = dialog_date.get_dialog_id(); auto dialog_id = dialog_date.get_dialog_id();
if (dialog_id.get_type() == DialogType::SecretChat && dialog_date.get_order() != DEFAULT_ORDER) { if (dialog_id.get_type() == DialogType::SecretChat && dialog_date.get_order() != DEFAULT_ORDER) {
@ -10220,8 +10220,7 @@ void MessagesManager::repair_secret_chat_total_count(FolderId folder_id) {
} }
} }
} }
} on_get_secret_chat_total_count(dialog_list_id, total_count);
on_get_secret_chat_total_count(folder_id, total_count);
} }
} }
@ -30108,6 +30107,10 @@ const MessagesManager::DialogFilter *MessagesManager::get_dialog_filter(DialogFi
return nullptr; return nullptr;
} }
vector<FolderId> MessagesManager::get_dialog_list_folder_ids(const DialogList &list) const {
return {list.folder_id};
}
bool MessagesManager::has_dialogs_from_folder(const DialogList &list, const DialogList &folder) const { bool MessagesManager::has_dialogs_from_folder(const DialogList &list, const DialogList &folder) const {
return list.folder_id == folder.folder_id; return list.folder_id == folder.folder_id;
} }

2
td/telegram/MessagesManager.h
View File

@ -2252,6 +2252,8 @@ class MessagesManager : public Actor {
DialogFilter *get_dialog_filter(DialogFilterId dialog_filter_id); DialogFilter *get_dialog_filter(DialogFilterId dialog_filter_id);
const DialogFilter *get_dialog_filter(DialogFilterId dialog_filter_id) const; const DialogFilter *get_dialog_filter(DialogFilterId dialog_filter_id) const;
vector<FolderId> get_dialog_list_folder_ids(const DialogList &list) const;
bool has_dialogs_from_folder(const DialogList &list, const DialogList &folder) const; bool has_dialogs_from_folder(const DialogList &list, const DialogList &folder) const;
bool is_dialog_in_list(const Dialog *d, const DialogList &list) const; bool is_dialog_in_list(const Dialog *d, const DialogList &list) const;