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

Return void from load_*_full.

Browse Source
This commit is contained in:
levlam 2021-09-23 18:52:39 +03:00
parent d032ca2ab2
commit a3c8da47a0
2 changed files with 22 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
td/telegram/ContactsManager.cpp
View File

@ -7104,8 +7104,7 @@ void ContactsManager::change_chat_participant_status(ChatId chat_id, UserId user
std::move(promise));
}
});
load_chat_full(chat_id, false, std::move(load_chat_full_promise), "change_chat_participant_status");
return;
return load_chat_full(chat_id, false, std::move(load_chat_full_promise), "change_chat_participant_status");
}
auto participant = get_chat_full_participant(chat_full, DialogId(user_id));
@ -13797,37 +13796,32 @@ void ContactsManager::reload_user(UserId user_id, Promise<Unit> &&promise) {
td_->create_handler<GetUsersQuery>(std::move(promise))->send(std::move(users));
}
bool ContactsManager::load_user_full(UserId user_id, bool force, Promise<Unit> &&promise, const char *source) {
void ContactsManager::load_user_full(UserId user_id, bool force, Promise<Unit> &&promise, const char *source) {
auto u = get_user(user_id);
if (u == nullptr) {
promise.set_error(Status::Error(6, "User not found"));
return false;
return promise.set_error(Status::Error(6, "User not found"));
}
auto user_full = get_user_full_force(user_id);
if (user_full == nullptr) {
auto input_user = get_input_user(user_id);
if (input_user == nullptr) {
promise.set_error(Status::Error(6, "Can't get info about inaccessible user"));
return false;
return promise.set_error(Status::Error(6, "Can't get info about inaccessible user"));
}
send_get_user_full_query(user_id, std::move(input_user), std::move(promise), source);
return false;
return send_get_user_full_query(user_id, std::move(input_user), std::move(promise), source);
}
if (user_full->is_expired()) {
auto input_user = get_input_user(user_id);
CHECK(input_user != nullptr);
if (td_->auth_manager_->is_bot() && !force) {
send_get_user_full_query(user_id, std::move(input_user), std::move(promise), "load expired user_full");
return false;
} else {
send_get_user_full_query(user_id, std::move(input_user), Auto(), "load expired user_full");
return send_get_user_full_query(user_id, std::move(input_user), std::move(promise), "load expired user_full");
}
send_get_user_full_query(user_id, std::move(input_user), Auto(), "load expired user_full");
}
promise.set_value(Unit());
return true;
}
void ContactsManager::reload_user_full(UserId user_id) {
@ -14095,32 +14089,28 @@ bool ContactsManager::is_chat_full_outdated(const ChatFull *chat_full, const Cha
return false;
}
bool ContactsManager::load_chat_full(ChatId chat_id, bool force, Promise<Unit> &&promise, const char *source) {
void ContactsManager::load_chat_full(ChatId chat_id, bool force, Promise<Unit> &&promise, const char *source) {
auto c = get_chat(chat_id);
if (c == nullptr) {
promise.set_error(Status::Error(6, "Group not found"));
return false;
return promise.set_error(Status::Error(6, "Group not found"));
}
auto chat_full = get_chat_full_force(chat_id, source);
if (chat_full == nullptr) {
LOG(INFO) << "Full " << chat_id << " not found";
send_get_chat_full_query(chat_id, std::move(promise), source);
return false;
return send_get_chat_full_query(chat_id, std::move(promise), source);
}
if (is_chat_full_outdated(chat_full, c, chat_id)) {
LOG(INFO) << "Have outdated full " << chat_id;
if (td_->auth_manager_->is_bot() && !force) {
send_get_chat_full_query(chat_id, std::move(promise), source);
return false;
} else {
send_get_chat_full_query(chat_id, Auto(), source);
return send_get_chat_full_query(chat_id, std::move(promise), source);
}
send_get_chat_full_query(chat_id, Auto(), source);
}
promise.set_value(Unit());
return true;
}
void ContactsManager::reload_chat_full(ChatId chat_id, Promise<Unit> &&promise) {
@ -14429,23 +14419,20 @@ ContactsManager::ChannelFull *ContactsManager::add_channel_full(ChannelId channe
return channel_full_ptr.get();
}
bool ContactsManager::load_channel_full(ChannelId channel_id, bool force, Promise<Unit> &&promise, const char *source) {
void ContactsManager::load_channel_full(ChannelId channel_id, bool force, Promise<Unit> &&promise, const char *source) {
auto channel_full = get_channel_full_force(channel_id, true, source);
if (channel_full == nullptr) {
send_get_channel_full_query(channel_full, channel_id, std::move(promise), source);
return false;
return send_get_channel_full_query(channel_full, channel_id, std::move(promise), source);
}
if (channel_full->is_expired()) {
if (td_->auth_manager_->is_bot() && !force) {
send_get_channel_full_query(channel_full, channel_id, std::move(promise), "load expired channel_full");
return false;
} else {
send_get_channel_full_query(channel_full, channel_id, Auto(), "load expired channel_full");
return send_get_channel_full_query(channel_full, channel_id, std::move(promise), "load expired channel_full");
}
send_get_channel_full_query(channel_full, channel_id, Auto(), "load expired channel_full");
}
promise.set_value(Unit());
return true;
}
void ContactsManager::reload_channel_full(ChannelId channel_id, Promise<Unit> &&promise, const char *source) {

6
td/telegram/ContactsManager.h
View File

@ -458,7 +458,7 @@ class ContactsManager final : public Actor {
UserId get_me(Promise<Unit> &&promise);
bool get_user(UserId user_id, int left_tries, Promise<Unit> &&promise);
void reload_user(UserId user_id, Promise<Unit> &&promise);
bool load_user_full(UserId user_id, bool force, Promise<Unit> &&promise, const char *source);
void load_user_full(UserId user_id, bool force, Promise<Unit> &&promise, const char *source);
void reload_user_full(UserId user_id);
std::pair<int32, vector<const Photo *>> get_user_profile_photos(UserId user_id, int32 offset, int32 limit,
@ -470,7 +470,7 @@ class ContactsManager final : public Actor {
bool have_chat_force(ChatId chat_id);
bool get_chat(ChatId chat_id, int left_tries, Promise<Unit> &&promise);
void reload_chat(ChatId chat_id, Promise<Unit> &&promise);
bool load_chat_full(ChatId chat_id, bool force, Promise<Unit> &&promise, const char *source);
void load_chat_full(ChatId chat_id, bool force, Promise<Unit> &&promise, const char *source);
FileSourceId get_chat_full_file_source_id(ChatId chat_id);
void reload_chat_full(ChatId chat_id, Promise<Unit> &&promise);
@ -486,7 +486,7 @@ class ContactsManager final : public Actor {
bool have_channel_force(ChannelId channel_id);
bool get_channel(ChannelId channel_id, int left_tries, Promise<Unit> &&promise);
void reload_channel(ChannelId chnanel_id, Promise<Unit> &&promise);
bool load_channel_full(ChannelId channel_id, bool force, Promise<Unit> &&promise, const char *source);
void load_channel_full(ChannelId channel_id, bool force, Promise<Unit> &&promise, const char *source);
FileSourceId get_channel_full_file_source_id(ChannelId channel_id);
void reload_channel_full(ChannelId channel_id, Promise<Unit> &&promise, const char *source);