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

Move logging to DialogFilter::merge_dialog_filter_changes.

Browse Source
This commit is contained in:
levlam 2023-03-27 21:40:07 +03:00
parent f844179528
commit a487c08eca
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
td/telegram/DialogFilter.cpp
View File

@ -625,6 +625,12 @@ unique_ptr<DialogFilter> DialogFilter::merge_dialog_filter_changes(const DialogF
update_value(new_filter->title_, old_server_filter->title_, new_server_filter->title_); update_value(new_filter->title_, old_server_filter->title_, new_server_filter->title_);
update_value(new_filter->emoji_, old_server_filter->emoji_, new_server_filter->emoji_); update_value(new_filter->emoji_, old_server_filter->emoji_, new_server_filter->emoji_);
LOG(INFO) << "Old local filter: " << *old_filter;
LOG(INFO) << "Old server filter: " << *old_server_filter;
LOG(INFO) << "New server filter: " << *new_server_filter;
LOG(INFO) << "New local filter: " << *new_filter;
return new_filter; return new_filter;
} }

8
td/telegram/DialogFilterManager.cpp
View File

@ -825,7 +825,7 @@ void DialogFilterManager::on_get_dialog_filter(telegram_api::object_ptr<telegram
if (!DialogFilter::are_equivalent(*old_filter, *new_server_filter)) { if (!DialogFilter::are_equivalent(*old_filter, *new_server_filter)) {
auto new_filter = auto new_filter =
DialogFilter::merge_dialog_filter_changes(old_filter, old_server_filter.get(), new_server_filter.get()); DialogFilter::merge_dialog_filter_changes(old_filter, old_server_filter.get(), new_server_filter.get());
new_filter->sort_input_dialog_ids(td_, "on_get_dialog_filter 2"); new_filter->sort_input_dialog_ids(td_, "on_get_dialog_filter");
if (*new_filter != *old_filter) { if (*new_filter != *old_filter) {
is_changed = true; is_changed = true;
edit_dialog_filter(std::move(new_filter), "on_get_dialog_filter"); edit_dialog_filter(std::move(new_filter), "on_get_dialog_filter");
@ -934,11 +934,7 @@ void DialogFilterManager::on_get_dialog_filters(
} else { } else {
auto new_filter = auto new_filter =
DialogFilter::merge_dialog_filter_changes(old_filter, old_server_filter, new_server_filter.get()); DialogFilter::merge_dialog_filter_changes(old_filter, old_server_filter, new_server_filter.get());
LOG(INFO) << "Old local filter: " << *old_filter; new_filter->sort_input_dialog_ids(td_, "on_get_dialog_filters");
LOG(INFO) << "Old server filter: " << *old_server_filter;
LOG(INFO) << "New server filter: " << *new_server_filter;
LOG(INFO) << "New local filter: " << *new_filter;
new_filter->sort_input_dialog_ids(td_, "on_get_dialog_filters 2");
if (*new_filter != *old_filter) { if (*new_filter != *old_filter) {
is_changed = true; is_changed = true;
edit_dialog_filter(std::move(new_filter), "on_get_dialog_filters"); edit_dialog_filter(std::move(new_filter), "on_get_dialog_filters");