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

Unpin dialog before changing folder_id.

Browse Source 
GitOrigin-RevId: eae801a366f777db3872bc1e0ed4258e9d159e07
This commit is contained in:
levlam 2020-05-10 01:28:17 +03:00
parent 3a577baf9b
commit 2a700693ce
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
td/telegram/MessagesManager.cpp
View File

@ -23158,9 +23158,11 @@ void MessagesManager::send_update_unread_message_count(FolderId folder_id, Dialo
list.unread_message_total_count_ = list.unread_message_muted_count_;
}
}
G()->td_db()->get_binlog_pmc()->set(
PSTRING() << "unread_message_count" << folder_id.get(),
PSTRING() << list.unread_message_total_count_ << ' ' << list.unread_message_muted_count_);
int32 unread_unmuted_count = list.unread_message_total_count_ - list.unread_message_muted_count_;
if (!force && running_get_difference_) {
LOG(INFO) << "Postpone updateUnreadMessageCount in " << folder_id << " to " << list.unread_message_total_count_
@ -23207,11 +23209,13 @@ void MessagesManager::send_update_unread_chat_count(FolderId folder_id, DialogId
list.unread_dialog_muted_count_ + list.unread_dialog_marked_count_ - list.unread_dialog_muted_marked_count_;
}
}
G()->td_db()->get_binlog_pmc()->set(
PSTRING() << "unread_dialog_count" << folder_id.get(),
PSTRING() << list.unread_dialog_total_count_ << ' ' << list.unread_dialog_muted_count_ << ' '
<< list.unread_dialog_marked_count_ << ' ' << list.unread_dialog_muted_marked_count_ << ' '
<< list.server_dialog_total_count_ << ' ' << list.secret_chat_total_count_);
bool need_postpone = !force && running_get_difference_;
int32 unread_unmuted_count = list.unread_dialog_total_count_ - list.unread_dialog_muted_count_;
int32 unread_unmuted_marked_count = list.unread_dialog_marked_count_ - list.unread_dialog_muted_marked_count_;
@ -24296,6 +24300,10 @@ void MessagesManager::set_dialog_folder_id(Dialog *d, FolderId folder_id) {
auto dialog_orders = get_dialog_orders(d);
if (get_dialog_pinned_order(d->folder_id, d->dialog_id) != DEFAULT_ORDER) {
set_dialog_is_pinned(d->folder_id, d, false, false);
}
d->folder_id = folder_id;
d->is_folder_id_inited = true;
@ -28827,17 +28835,17 @@ void MessagesManager::update_dialog_lists(Dialog *d,
LOG(INFO) << "Update lists of " << dialog_id << " from " << source;
if (d->order == DEFAULT_ORDER) {
if (d->folder_id != FolderId::main()) {
d->folder_id = FolderId::main();
d->is_folder_id_inited = true;
on_dialog_updated(dialog_id, "update_dialog_lists");
}
for (auto &old_order : old_orders) {
if (old_order.second.is_pinned) {
set_dialog_is_pinned(old_order.first, d, false, false);
}
}
if (d->folder_id != FolderId::main()) {
d->folder_id = FolderId::main();
d->is_folder_id_inited = true;
on_dialog_updated(dialog_id, "update_dialog_lists");
}
}
for (auto &dialog_list : dialog_lists_) {