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

Use get_dialog_list_folder_ids.

Browse Source 
GitOrigin-RevId: c2685f208b329c1fadb4c4fc467b432edff95a86
This commit is contained in:
levlam 2020-05-21 20:07:37 +03:00
parent 090ef866bd
commit f96714b254
1 changed files with 46 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
td/telegram/MessagesManager.cpp
View File

@ -10212,13 +10212,13 @@ void MessagesManager::repair_secret_chat_total_count(DialogListId dialog_list_id
auto *list = get_dialog_list(dialog_list_id); auto *list = get_dialog_list(dialog_list_id);
CHECK(list != nullptr); CHECK(list != nullptr);
for (auto &folder_id : get_dialog_list_folder_ids(*list)) { for (auto &folder_id : get_dialog_list_folder_ids(*list)) {
auto *folder_list = get_dialog_list(DialogListId(folder_id)); const auto *folder_list = get_dialog_list(DialogListId(folder_id));
if (folder_list->need_unread_count_recalc_) { if (folder_list->need_unread_count_recalc_) {
// can't repair total secret chat count yet // can't repair total secret chat count yet
return; return;
} }
auto &folder = *get_dialog_folder(folder_id); const auto &folder = *get_dialog_folder(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) {
@ -10272,9 +10272,8 @@ void MessagesManager::recalc_unread_count(DialogListId dialog_list_id) {
int32 dialog_muted_marked_count = 0; int32 dialog_muted_marked_count = 0;
int32 server_dialog_total_count = 0; int32 server_dialog_total_count = 0;
int32 secret_chat_total_count = 0; int32 secret_chat_total_count = 0;
for (const auto &folder_it : dialog_folders_) { for (auto folder_id : get_dialog_list_folder_ids(list)) {
auto &folder = folder_it.second; const auto &folder = *get_dialog_folder(folder_id);
if (has_dialogs_from_folder(list, folder)) {
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();
Dialog *d = get_dialog(dialog_id); Dialog *d = get_dialog(dialog_id);
@ -10305,7 +10304,6 @@ void MessagesManager::recalc_unread_count(DialogListId dialog_list_id) {
} }
} }
} }
}
if (list.unread_message_total_count_ != message_total_count || if (list.unread_message_total_count_ != message_total_count ||
list.unread_message_muted_count_ != message_muted_count) { list.unread_message_muted_count_ != message_muted_count) {
@ -13941,7 +13939,7 @@ vector<DialogId> MessagesManager::get_dialogs(DialogListId dialog_list_id, Dialo
vector<const DialogFolder *> folders; vector<const DialogFolder *> folders;
vector<std::set<DialogDate>::const_iterator> folder_iterators; vector<std::set<DialogDate>::const_iterator> folder_iterators;
for (auto &folder_id : get_dialog_list_folder_ids(list)) { for (auto folder_id : get_dialog_list_folder_ids(list)) {
folders.push_back(get_dialog_folder(folder_id)); folders.push_back(get_dialog_folder(folder_id));
folder_iterators.push_back(folders.back()->ordered_dialogs_.upper_bound(offset)); folder_iterators.push_back(folders.back()->ordered_dialogs_.upper_bound(offset));
} }
@ -13984,10 +13982,10 @@ vector<DialogId> MessagesManager::get_dialogs(DialogListId dialog_list_id, Dialo
void MessagesManager::load_dialog_list(DialogList &list, int32 limit, Promise<Unit> &&promise) { void MessagesManager::load_dialog_list(DialogList &list, int32 limit, Promise<Unit> &&promise) {
bool is_request_sent = false; bool is_request_sent = false;
for (const auto &folder_it : dialog_folders_) { for (auto folder_id : get_dialog_list_folder_ids(list)) {
auto &folder = folder_it.second; const auto &folder = *get_dialog_folder(folder_id);
if (has_dialogs_from_folder(list, folder) && folder.folder_last_dialog_date_ != MAX_DIALOG_DATE) { if (folder.folder_last_dialog_date_ != MAX_DIALOG_DATE) {
load_folder_dialog_list(folder_it.first, limit, false, Auto()); load_folder_dialog_list(folder_id, limit, false, Auto());
is_request_sent = true; is_request_sent = true;
} }
} }
@ -29928,9 +29926,9 @@ void MessagesManager::update_last_dialog_date(FolderId folder_id) {
void MessagesManager::update_list_last_dialog_date(DialogList &list) { void MessagesManager::update_list_last_dialog_date(DialogList &list) {
auto new_last_dialog_date = list.last_pinned_dialog_date_; auto new_last_dialog_date = list.last_pinned_dialog_date_;
for (const auto &folder_it : dialog_folders_) { for (auto folder_id : get_dialog_list_folder_ids(list)) {
auto &folder = folder_it.second; const auto &folder = *get_dialog_folder(folder_id);
if (has_dialogs_from_folder(list, folder) && folder.folder_last_dialog_date_ < new_last_dialog_date) { if (folder.folder_last_dialog_date_ < new_last_dialog_date) {
new_last_dialog_date = folder.folder_last_dialog_date_; new_last_dialog_date = folder.folder_last_dialog_date_;
} }
} }
@ -29949,9 +29947,8 @@ void MessagesManager::update_list_last_dialog_date(DialogList &list) {
} }
bool is_list_further_loaded = new_last_dialog_date == MAX_DIALOG_DATE; bool is_list_further_loaded = new_last_dialog_date == MAX_DIALOG_DATE;
for (const auto &folder_it : dialog_folders_) { for (auto folder_id : get_dialog_list_folder_ids(list)) {
auto &folder = folder_it.second; const auto &folder = *get_dialog_folder(folder_id);
if (has_dialogs_from_folder(list, folder)) {
for (auto it = folder.ordered_dialogs_.upper_bound(old_last_dialog_date); for (auto it = folder.ordered_dialogs_.upper_bound(old_last_dialog_date);
it != folder.ordered_dialogs_.end() && *it <= folder.folder_last_dialog_date_; ++it) { it != folder.ordered_dialogs_.end() && *it <= folder.folder_last_dialog_date_; ++it) {
auto dialog_id = it->get_dialog_id(); auto dialog_id = it->get_dialog_id();
@ -29965,7 +29962,6 @@ void MessagesManager::update_list_last_dialog_date(DialogList &list) {
} }
} }
} }
}
if (list.list_last_dialog_date_ == MAX_DIALOG_DATE) { if (list.list_last_dialog_date_ == MAX_DIALOG_DATE) {
bool need_update_unread_chat_count = list.server_dialog_total_count_ == -1 || list.secret_chat_total_count_ == -1; bool need_update_unread_chat_count = list.server_dialog_total_count_ == -1 || list.secret_chat_total_count_ == -1;