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

Add CountryInfoManager::get_phone_number_info_object.

This commit is contained in:
levlam 2021-08-30 17:51:09 +03:00
parent c5a2105b61
commit 44556b3309
2 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
td/telegram/CountryInfoManager.cpp
View File

@ -195,7 +195,12 @@ void CountryInfoManager::do_get_phone_number_info(string phone_number_prefix, st
}));
}
Slice phone_number = phone_number_prefix;
promise.set_value(get_phone_number_info_object(list, phone_number_prefix));
}
td_api::object_ptr<td_api::phoneNumberInfo> CountryInfoManager::get_phone_number_info_object(const CountryList *list,
Slice phone_number) {
CHECK(list != nullptr);
const CountryInfo *best_country = nullptr;
const CallingCodeInfo *best_calling_code = nullptr;
size_t best_length = 0;
@ -222,12 +227,12 @@ void CountryInfoManager::do_get_phone_number_info(string phone_number_prefix, st
}
}
if (best_country == nullptr) {
return promise.set_value(td_api::make_object<td_api::phoneNumberInfo>(
nullptr, is_prefix ? phone_number_prefix : string(), is_prefix ? string() : phone_number_prefix));
return td_api::make_object<td_api::phoneNumberInfo>(nullptr, is_prefix ? phone_number.str() : string(),
is_prefix ? string() : phone_number.str());
}
string formatted_part = phone_number_prefix.substr(best_calling_code->calling_code.size());
string formatted_phone_number = formatted_part;
Slice formatted_part = phone_number.substr(best_calling_code->calling_code.size());
string formatted_phone_number;
size_t max_matched_digits = 0;
for (auto &pattern : best_calling_code->patterns) {
string result;
@ -277,9 +282,9 @@ void CountryInfoManager::do_get_phone_number_info(string phone_number_prefix, st
}
}
promise.set_value(td_api::make_object<td_api::phoneNumberInfo>(
return td_api::make_object<td_api::phoneNumberInfo>(
best_country->get_country_info_object(), best_calling_code->calling_code,
formatted_phone_number.empty() ? formatted_part : formatted_phone_number));
formatted_phone_number.empty() ? formatted_part.str() : formatted_phone_number);
}
void CountryInfoManager::get_current_country_code(Promise<string> &&promise) {

3
td/telegram/CountryInfoManager.h
View File

@ -63,6 +63,9 @@ class CountryInfoManager final : public Actor {
const CountryList *get_country_list(const string &language_code);
static td_api::object_ptr<td_api::phoneNumberInfo> get_phone_number_info_object(const CountryList *list,
Slice phone_number);
std::unordered_map<string, vector<Promise<Unit>>> pending_load_country_queries_;
std::unordered_map<string, unique_ptr<CountryList>> countries_;