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

Return void from RecentDialogList::load_dialogs.

Browse Source
This commit is contained in:
levlam 2021-09-14 10:16:20 +03:00
parent dc35dea8a3
commit fa65e429eb
2 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
td/telegram/RecentDialogList.cpp
View File

@ -21,6 +21,7 @@ namespace td {
RecentDialogList::RecentDialogList(Td *td, const char *name, size_t max_size) RecentDialogList::RecentDialogList(Td *td, const char *name, size_t max_size)
: td_(td), name_(name), max_size_(max_size) { : td_(td), name_(name), max_size_(max_size) {
register_actor(PSLICE() << name << "_chats", this).release();
} }
string RecentDialogList::get_binlog_key() const { string RecentDialogList::get_binlog_key() const {
@ -68,10 +69,9 @@ void RecentDialogList::save_dialogs() const {
G()->td_db()->get_binlog_pmc()->set(get_binlog_key(), result.str()); G()->td_db()->get_binlog_pmc()->set(get_binlog_key(), result.str());
} }
bool RecentDialogList::load_dialogs(Promise<Unit> &&promise) { void RecentDialogList::load_dialogs(Promise<Unit> &&promise) {
if (dialogs_loaded_ >= 2) { if (dialogs_loaded_ >= 2) {
promise.set_value(Unit()); return promise.set_value(Unit());
return true;
} }
string found_dialogs_str = G()->td_db()->get_binlog_pmc()->get(get_binlog_key()); string found_dialogs_str = G()->td_db()->get_binlog_pmc()->get(get_binlog_key());
@ -81,8 +81,7 @@ bool RecentDialogList::load_dialogs(Promise<Unit> &&promise) {
if (!dialog_ids_.empty()) { if (!dialog_ids_.empty()) {
save_dialogs(); save_dialogs();
} }
promise.set_value(Unit()); return promise.set_value(Unit());
return true;
} }
auto found_dialogs = full_split(found_dialogs_str, ','); auto found_dialogs = full_split(found_dialogs_str, ',');
@ -112,8 +111,7 @@ bool RecentDialogList::load_dialogs(Promise<Unit> &&promise) {
if (!newly_found_dialogs.empty()) { if (!newly_found_dialogs.empty()) {
save_dialogs(); save_dialogs();
} }
promise.set_value(Unit()); return promise.set_value(Unit());
return true;
} }
resolve_dialogs_multipromise_.add_promise(std::move(promise)); resolve_dialogs_multipromise_.add_promise(std::move(promise));
@ -146,7 +144,6 @@ bool RecentDialogList::load_dialogs(Promise<Unit> &&promise) {
lock.set_value(Unit()); lock.set_value(Unit());
} }
return false;
} }
void RecentDialogList::add_dialog(DialogId dialog_id) { void RecentDialogList::add_dialog(DialogId dialog_id) {
@ -233,7 +230,8 @@ void RecentDialogList::update_dialogs() {
} }
std::pair<int32, vector<DialogId>> RecentDialogList::get_dialogs(int32 limit, Promise<Unit> &&promise) { std::pair<int32, vector<DialogId>> RecentDialogList::get_dialogs(int32 limit, Promise<Unit> &&promise) {
if (!load_dialogs(std::move(promise))) { load_dialogs(std::move(promise));
if (dialogs_loaded_ != 2) {
return {}; return {};
} }

3
td/telegram/RecentDialogList.h
View File

@ -8,6 +8,7 @@
#include "td/telegram/DialogId.h" #include "td/telegram/DialogId.h"
#include "td/actor/actor.h"
#include "td/actor/MultiPromise.h" #include "td/actor/MultiPromise.h"
#include "td/utils/common.h" #include "td/utils/common.h"
@ -42,7 +43,7 @@ class RecentDialogList : public Actor {
int32 dialogs_loaded_ = 0; // 0 - not loaded, 1 - load request was sent, 2 - loaded int32 dialogs_loaded_ = 0; // 0 - not loaded, 1 - load request was sent, 2 - loaded
MultiPromiseActor resolve_dialogs_multipromise_{"ResolveDialogsMultiPromiseActor"}; MultiPromiseActor resolve_dialogs_multipromise_{"ResolveDialogsMultiPromiseActor"};
bool load_dialogs(Promise<Unit> &&promise); void load_dialogs(Promise<Unit> &&promise);
bool do_add_dialog(DialogId dialog_id); bool do_add_dialog(DialogId dialog_id);