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

Update dialog filter order after receiving them from server.

Browse Source 
GitOrigin-RevId: 9ef943eb5faaf36cfe960e91a6daba6d5804a57d
This commit is contained in:
levlam 2020-05-28 03:08:00 +03:00
parent 09f8c68e04
commit 9a5f6c5dd5
1 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
td/telegram/MessagesManager.cpp
View File

@ -14311,6 +14311,12 @@ void MessagesManager::on_get_dialog_filters(Result<vector<tl_object_ptr<telegram
} }
} }
} }
vector<DialogFilterId> left_old_server_dialog_filter_ids;
for (auto &filter : server_dialog_filters_) {
if (old_server_dialog_filters.count(filter->dialog_filter_id) == 0) {
left_old_server_dialog_filter_ids.push_back(filter->dialog_filter_id);
}
}
for (auto &old_server_filter : old_server_dialog_filters) { for (auto &old_server_filter : old_server_dialog_filters) {
auto dialog_filter_id = old_server_filter.first; auto dialog_filter_id = old_server_filter.first;
// deleted filter // deleted filter
@ -14323,8 +14329,23 @@ void MessagesManager::on_get_dialog_filters(Result<vector<tl_object_ptr<telegram
delete_dialog_filter(dialog_filter_id, "on_get_dialog_filters"); delete_dialog_filter(dialog_filter_id, "on_get_dialog_filters");
} }
} }
bool is_order_changed = [&] {
// TODO update dialog filter order vector<DialogFilterId> new_server_dialog_filter_ids =
transform(new_server_dialog_filters, [](auto &filter) { return filter->dialog_filter_id; });
CHECK(new_server_dialog_filter_ids.size() >= left_old_server_dialog_filter_ids.size());
new_server_dialog_filter_ids.resize(left_old_server_dialog_filter_ids.size());
return new_server_dialog_filter_ids != left_old_server_dialog_filter_ids;
}();
if (is_order_changed) { // if order is changed from this and other clients, prefer order from another client
vector<DialogFilterId> new_dialog_filter_order;
for (auto &new_server_filter : new_server_dialog_filters) {
auto dialog_filter_id = new_server_filter->dialog_filter_id;
if (get_dialog_filter(dialog_filter_id) != nullptr) {
new_dialog_filter_order.push_back(dialog_filter_id);
}
}
set_dialog_filters_order(new_dialog_filter_order);
}
server_dialog_filters_ = std::move(new_server_dialog_filters); server_dialog_filters_ = std::move(new_server_dialog_filters);
send_update_chat_filters(); send_update_chat_filters();