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

Merge remote-tracking branch 'td/master'

Browse Source
This commit is contained in:
Andrea Cavalli 2021-10-05 12:29:46 +02:00
commit e5a7f26b7b
2 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
td/telegram/RecentDialogList.cpp
View File

@ -106,13 +106,20 @@ void RecentDialogList::load_dialogs(Promise<Unit> &&promise) {
dialog_ids.push_back(DialogId(to_integer<int64>(found_dialog))); dialog_ids.push_back(DialogId(to_integer<int64>(found_dialog)));
} }
} }
if (!dialog_ids.empty() && !G()->parameters().use_chat_info_db) { if (!dialog_ids.empty()) {
td_->messages_manager_->get_dialogs_from_list( if (G()->parameters().use_chat_info_db) {
DialogListId(FolderId::main()), 102, td_->messages_manager_->load_dialogs(
PromiseCreator::lambda([promise = mpas.get_promise()](td_api::object_ptr<td_api::chats> &&chats) mutable { std::move(dialog_ids),
promise.set_value(Unit()); PromiseCreator::lambda(
})); [promise = mpas.get_promise()](vector<DialogId> dialog_ids) mutable { promise.set_value(Unit()); }));
td_->contacts_manager_->search_contacts("", 1, mpas.get_promise()); } else {
td_->messages_manager_->get_dialogs_from_list(
DialogListId(FolderId::main()), 102,
PromiseCreator::lambda([promise = mpas.get_promise()](td_api::object_ptr<td_api::chats> &&chats) mutable {
promise.set_value(Unit());
}));
td_->contacts_manager_->search_contacts("", 1, mpas.get_promise());
}
} }
lock.set_value(Unit()); lock.set_value(Unit());

1
td/telegram/td_json_client.h
View File

@ -112,6 +112,7 @@ TDJSON_EXPORT void td_json_client_destroy(void *client);
* Also note that all updates and responses to requests must be applied in the order they were received for consistency. * Also note that all updates and responses to requests must be applied in the order they were received for consistency.
* Some TDLib requests can be executed synchronously from any thread using td_execute. * Some TDLib requests can be executed synchronously from any thread using td_execute.
* TDLib client instances are destroyed automatically after they are closed. * TDLib client instances are destroyed automatically after they are closed.
* All TDLib client instances must be closed before application termination to ensure data consistency.
* *
* General pattern of usage: * General pattern of usage:
* \code * \code