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

Fix moving dialog between folders.

Browse Source 
GitOrigin-RevId: 427e3cd0738420ce68f1ed30b54693bced5b9877
This commit is contained in:
levlam 2020-05-22 19:11:03 +03:00
parent 400959989b
commit 17c68176c5
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
td/telegram/MessagesManager.cpp
View File

@ -25259,6 +25259,10 @@ void MessagesManager::on_update_dialog_folder_id(DialogId dialog_id, FolderId fo
} }
void MessagesManager::set_dialog_folder_id(Dialog *d, FolderId folder_id) { void MessagesManager::set_dialog_folder_id(Dialog *d, FolderId folder_id) {
if (td_->auth_manager_->is_bot()) {
return;
}
CHECK(d != nullptr); CHECK(d != nullptr);
if (d->folder_id == folder_id) { if (d->folder_id == folder_id) {
@ -25278,9 +25282,17 @@ void MessagesManager::set_dialog_folder_id(Dialog *d, FolderId folder_id) {
set_dialog_is_pinned(DialogListId(d->folder_id), d, false, false); set_dialog_is_pinned(DialogListId(d->folder_id), d, false, false);
} }
DialogDate dialog_date(d->order, d->dialog_id);
auto *folder = get_dialog_folder(d->folder_id);
if (folder->ordered_dialogs_.erase(dialog_date) == 0) {
LOG_IF(ERROR, d->order != DEFAULT_ORDER) << d->dialog_id << " not found in the chat list";
}
d->folder_id = folder_id; d->folder_id = folder_id;
d->is_folder_id_inited = true; d->is_folder_id_inited = true;
get_dialog_folder(d->folder_id)->ordered_dialogs_.insert(dialog_date);
update_dialog_lists(d, std::move(dialog_orders), true, false, "set_dialog_folder_id"); update_dialog_lists(d, std::move(dialog_orders), true, false, "set_dialog_folder_id");
on_dialog_updated(d->dialog_id, "set_dialog_folder_id"); on_dialog_updated(d->dialog_id, "set_dialog_folder_id");