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

Add ConfigManager::reget_app_config.

Browse Source
This commit is contained in:
levlam 2021-10-06 01:17:10 +03:00
parent 6ecba8cb5d
commit c3d898f1e6
4 changed files with 52 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
td/telegram/ConfigManager.cpp
View File

@ -960,6 +960,16 @@ void ConfigManager::lazy_request_config() {
set_timeout_at(expire_time_.at()); set_timeout_at(expire_time_.at());
} }
void ConfigManager::try_request_app_config() {
if (get_app_config_queries_.size() + reget_app_config_queries_.size() != 1) {
return;
}
auto query = G()->net_query_creator().create_unauth(telegram_api::help_getAppConfig());
query->total_timeout_limit_ = 60 * 60 * 24;
G()->net_query_dispatcher().dispatch_with_callback(std::move(query), actor_shared(this, 1));
}
void ConfigManager::get_app_config(Promise<td_api::object_ptr<td_api::JsonValue>> &&promise) { void ConfigManager::get_app_config(Promise<td_api::object_ptr<td_api::JsonValue>> &&promise) {
TRY_STATUS_PROMISE(promise, G()->close_status()); TRY_STATUS_PROMISE(promise, G()->close_status());
@ -969,11 +979,21 @@ void ConfigManager::get_app_config(Promise<td_api::object_ptr<td_api::JsonValue>
} }
get_app_config_queries_.push_back(std::move(promise)); get_app_config_queries_.push_back(std::move(promise));
if (get_app_config_queries_.size() == 1) { try_request_app_config();
auto query = G()->net_query_creator().create_unauth(telegram_api::help_getAppConfig()); }
query->total_timeout_limit_ = 60 * 60 * 24;
G()->net_query_dispatcher().dispatch_with_callback(std::move(query), actor_shared(this, 1)); void ConfigManager::reget_app_config(Promise<Unit> &&promise) {
if (G()->close_flag()) {
return promise.set_error(Status::Error(500, "Request aborted"));
} }
auto auth_manager = G()->td().get_actor_unsafe()->auth_manager_.get();
if (auth_manager != nullptr && auth_manager->is_bot()) {
return promise.set_value(Unit());
}
reget_app_config_queries_.push_back(std::move(promise));
try_request_app_config();
} }
void ConfigManager::get_content_settings(Promise<Unit> &&promise) { void ConfigManager::get_content_settings(Promise<Unit> &&promise) {
@ -1066,7 +1086,7 @@ void ConfigManager::do_set_ignore_sensitive_content_restrictions(bool ignore_sen
ignore_sensitive_content_restrictions); ignore_sensitive_content_restrictions);
bool have_ignored_restriction_reasons = G()->shared_config().have_option("ignored_restriction_reasons"); bool have_ignored_restriction_reasons = G()->shared_config().have_option("ignored_restriction_reasons");
if (have_ignored_restriction_reasons != ignore_sensitive_content_restrictions) { if (have_ignored_restriction_reasons != ignore_sensitive_content_restrictions) {
get_app_config(Auto()); reget_app_config(Auto());
} }
} }
@ -1122,7 +1142,7 @@ void ConfigManager::on_result(NetQueryPtr res) {
return; return;
} }
remove_suggested_action(suggested_actions_, suggested_action); remove_suggested_action(suggested_actions_, suggested_action);
get_app_config(Auto()); reget_app_config(Auto());
for (auto &promise : promises) { for (auto &promise : promises) {
promise.set_value(Unit()); promise.set_value(Unit());
@ -1246,15 +1266,16 @@ void ConfigManager::on_result(NetQueryPtr res) {
if (token == 1) { if (token == 1) {
auto promises = std::move(get_app_config_queries_); auto promises = std::move(get_app_config_queries_);
get_app_config_queries_.clear(); get_app_config_queries_.clear();
CHECK(!promises.empty()); auto unit_promises = std::move(reget_app_config_queries_);
reget_app_config_queries_.clear();
CHECK(!promises.empty() || !unit_promises.empty());
auto result_ptr = fetch_result<telegram_api::help_getAppConfig>(std::move(res)); auto result_ptr = fetch_result<telegram_api::help_getAppConfig>(std::move(res));
if (result_ptr.is_error()) { if (result_ptr.is_error()) {
for (auto &promise : promises) { for (auto &promise : promises) {
if (!promise) { promise.set_error(result_ptr.error().clone());
promise.set_value(nullptr); }
} else { for (auto &promise : unit_promises) {
promise.set_error(result_ptr.error().clone()); promise.set_error(result_ptr.error().clone());
}
} }
return; return;
} }
@ -1262,11 +1283,10 @@ void ConfigManager::on_result(NetQueryPtr res) {
auto result = result_ptr.move_as_ok(); auto result = result_ptr.move_as_ok();
process_app_config(result); process_app_config(result);
for (auto &promise : promises) { for (auto &promise : promises) {
if (!promise) { promise.set_value(convert_json_value_object(result));
promise.set_value(nullptr); }
} else { for (auto &promise : unit_promises) {
promise.set_value(convert_json_value_object(result)); promise.set_value(Unit());
}
} }
return; return;
} }
@ -1452,7 +1472,7 @@ void ConfigManager::process_config(tl_object_ptr<telegram_api::config> config) {
// shared_config.set_option_integer("push_chat_limit", config->push_chat_limit_); // shared_config.set_option_integer("push_chat_limit", config->push_chat_limit_);
if (is_from_main_dc) { if (is_from_main_dc) {
get_app_config(Auto()); reget_app_config(Auto());
if (!shared_config.have_option("can_ignore_sensitive_content_restrictions") || if (!shared_config.have_option("can_ignore_sensitive_content_restrictions") ||
!shared_config.have_option("ignore_sensitive_content_restrictions")) { !shared_config.have_option("ignore_sensitive_content_restrictions")) {
get_content_settings(Auto()); get_content_settings(Auto());

5
td/telegram/ConfigManager.h
View File

@ -88,6 +88,8 @@ class ConfigManager final : public NetQueryCallback {
void get_app_config(Promise<td_api::object_ptr<td_api::JsonValue>> &&promise); void get_app_config(Promise<td_api::object_ptr<td_api::JsonValue>> &&promise);
void reget_app_config(Promise<Unit> &&promise);
void get_content_settings(Promise<Unit> &&promise); void get_content_settings(Promise<Unit> &&promise);
void set_content_settings(bool ignore_sensitive_content_restrictions, Promise<Unit> &&promise); void set_content_settings(bool ignore_sensitive_content_restrictions, Promise<Unit> &&promise);
@ -114,6 +116,7 @@ class ConfigManager final : public NetQueryCallback {
FloodControlStrict lazy_request_flood_control_; FloodControlStrict lazy_request_flood_control_;
vector<Promise<td_api::object_ptr<td_api::JsonValue>>> get_app_config_queries_; vector<Promise<td_api::object_ptr<td_api::JsonValue>>> get_app_config_queries_;
vector<Promise<Unit>> reget_app_config_queries_;
vector<Promise<Unit>> get_content_settings_queries_; vector<Promise<Unit>> get_content_settings_queries_;
vector<Promise<Unit>> set_content_settings_queries_[2]; vector<Promise<Unit>> set_content_settings_queries_[2];
@ -142,6 +145,8 @@ class ConfigManager final : public NetQueryCallback {
void request_config_from_dc_impl(DcId dc_id); void request_config_from_dc_impl(DcId dc_id);
void process_config(tl_object_ptr<telegram_api::config> config); void process_config(tl_object_ptr<telegram_api::config> config);
void try_request_app_config();
void process_app_config(tl_object_ptr<telegram_api::JSONValue> &config); void process_app_config(tl_object_ptr<telegram_api::JSONValue> &config);
void do_set_ignore_sensitive_content_restrictions(bool ignore_sensitive_content_restrictions); void do_set_ignore_sensitive_content_restrictions(bool ignore_sensitive_content_restrictions);

16
td/telegram/LinkManager.cpp
View File

@ -1156,14 +1156,14 @@ void LinkManager::get_external_link_info(string &&link, Promise<td_api::object_p
} }
if (autologin_update_time_ < Time::now() - 10000) { if (autologin_update_time_ < Time::now() - 10000) {
auto query_promise = PromiseCreator::lambda([link = std::move(link), promise = std::move(promise)]( auto query_promise =
Result<td_api::object_ptr<td_api::JsonValue>> &&result) mutable { PromiseCreator::lambda([link = std::move(link), promise = std::move(promise)](Result<Unit> &&result) mutable {
if (result.is_error()) { if (result.is_error()) {
return promise.set_value(td_api::make_object<td_api::loginUrlInfoOpen>(link, false)); return promise.set_value(td_api::make_object<td_api::loginUrlInfoOpen>(link, false));
} }
send_closure(G()->link_manager(), &LinkManager::get_external_link_info, std::move(link), std::move(promise)); send_closure(G()->link_manager(), &LinkManager::get_external_link_info, std::move(link), std::move(promise));
}); });
return send_closure(G()->config_manager(), &ConfigManager::get_app_config, std::move(query_promise)); return send_closure(G()->config_manager(), &ConfigManager::reget_app_config, std::move(query_promise));
} }
if (autologin_token_.empty()) { if (autologin_token_.empty()) {

3
td/telegram/StickersManager.cpp
View File

@ -4180,8 +4180,7 @@ void StickersManager::register_dice(const string &emoji, int32 value, FullMessag
if (!td::contains(dice_emojis_, emoji)) { if (!td::contains(dice_emojis_, emoji)) {
if (full_message_id.get_message_id().is_any_server() && if (full_message_id.get_message_id().is_any_server() &&
full_message_id.get_dialog_id().get_type() != DialogType::SecretChat) { full_message_id.get_dialog_id().get_type() != DialogType::SecretChat) {
send_closure(G()->config_manager(), &ConfigManager::get_app_config, send_closure(G()->config_manager(), &ConfigManager::reget_app_config, Promise<Unit>());
Promise<td_api::object_ptr<td_api::JsonValue>>());
} }
return; return;
} }