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

Send option "version" before all other updates. 

GitOrigin-RevId: 6f9e36dd474ce191ff53a91aafeb95c8792aa300
This commit is contained in:
levlam 2018-09-20 20:41:22 +03:00
parent db14b2da4e
commit b2f9a33832
3 changed files with 42 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
td/telegram/ConfigShared.cpp
View File

@ -98,8 +98,8 @@ string ConfigShared::get_option_string(Slice name, string default_value) const {
return str_value.substr(1);
}
tl_object_ptr<td_api::OptionValue> ConfigShared::get_option_value(Slice value) const {
return get_option_value_object(get_option(value));
tl_object_ptr<td_api::OptionValue> ConfigShared::get_option_value(Slice name) const {
return get_option_value_object(get_option(name));
}
bool ConfigShared::set_option(Slice name, Slice value) {

5
td/telegram/ConfigShared.h
View File

@ -44,14 +44,15 @@ class ConfigShared {
int32 get_option_integer(Slice name, int32 default_value = 0) const;
string get_option_string(Slice name, string default_value = "") const;
tl_object_ptr<td_api::OptionValue> get_option_value(Slice value) const;
tl_object_ptr<td_api::OptionValue> get_option_value(Slice name) const;
static tl_object_ptr<td_api::OptionValue> get_option_value_object(Slice value);
private:
BinlogPmcPtr config_pmc_;
unique_ptr<Callback> callback_;
bool set_option(Slice name, Slice value);
static tl_object_ptr<td_api::OptionValue> get_option_value_object(Slice value);
void on_option_updated(Slice name) const;
};

41
td/telegram/Td.cpp
View File

@ -3641,6 +3641,8 @@ void Td::start_up() {
alarm_timeout_.set_callback_data(static_cast<void *>(this));
CHECK(state_ == State::WaitParameters);
send_update(td_api::make_object<td_api::updateOption>("version",
td_api::make_object<td_api::optionValueString>(TDLIB_VERSION)));
send_update(td_api::make_object<td_api::updateAuthorizationState>(
td_api::make_object<td_api::authorizationStateWaitTdlibParameters>()));
}
@ -4036,9 +4038,6 @@ Status Td::init(DbKey key) {
send_closure(G()->td(), &Td::on_config_option_updated, name);
}
};
send_closure(
actor_id(this), &Td::send_update,
make_tl_object<td_api::updateOption>("version", make_tl_object<td_api::optionValueString>(TDLIB_VERSION)));
G()->set_shared_config(
std::make_unique<ConfigShared>(G()->td_db()->get_config_pmc(), std::make_unique<ConfigSharedCallback>()));
@ -4568,7 +4567,40 @@ void Td::on_request(uint64 id, td_api::checkAuthenticationBotToken &request) {
}
void Td::on_request(uint64 id, const td_api::getCurrentState &request) {
return send_error_raw(id, 500, "Unimplemented");
vector<td_api::object_ptr<td_api::Update>> updates;
updates.push_back(td_api::make_object<td_api::updateOption>(
"version", td_api::make_object<td_api::optionValueString>(TDLIB_VERSION)));
updates.push_back(
td_api::make_object<td_api::updateOption>("online", make_tl_object<td_api::optionValueBoolean>(is_online_)));
for (auto &option : G()->shared_config().get_options()) {
if (!is_internal_config_option(option.first)) {
updates.push_back(td_api::make_object<td_api::updateOption>(
option.first, ConfigShared::get_option_value_object(option.second)));
}
}
auto state = auth_manager_->get_current_authorization_state_object();
if (state != nullptr) {
updates.push_back(td_api::make_object<td_api::updateAuthorizationState>(std::move(state)));
}
updates.push_back(td_api::make_object<td_api::updateConnectionState>(get_connection_state_object(connection_state_)));
/*
// TODO
updateUnreadMessageCount {
updateUnreadChatCount {
updateScopeNotificationSettings {
updateScopeNotificationSettings {
updateUser {
updateSecretChat {
updateNewChat {
updateChatLastMessage {
*/
// send response synchronously to prevent "Request aborted"
send_result(id, td_api::make_object<td_api::updates>(std::move(updates)));
}
void Td::on_request(uint64 id, td_api::getPasswordState &request) {
@ -6140,6 +6172,7 @@ void Td::on_request(uint64 id, td_api::getOption &request) {
tl_object_ptr<td_api::OptionValue> option_value;
switch (request.name_[0]) {
// all these options should be added to getCurrentState
case 'o':
if (request.name_ == "online") {
option_value = make_tl_object<td_api::optionValueBoolean>(is_online_);