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

Improve getPhoneNumberInfo.

Browse Source
This commit is contained in:
levlam 2021-08-30 17:11:45 +03:00
parent 788c13f834
commit c5a2105b61
2 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
td/generate/scheme/td_api.tl
View File

@ -1302,7 +1302,7 @@ countries countries:vector<countryInfo> = Countries;
//@description Contains information about a phone number
//@country Information about the country to which the phone number belongs; may be null
//@country_calling_code The part of the phone number denoting country calling code or its part
//@formatted_phone_number The phone number without country calling code formatted accordingly to local rules
//@formatted_phone_number The phone number without country calling code formatted accordingly to local rules. Expected digits are returned as '-', but even more digits might be entered by the user
phoneNumberInfo country:countryInfo country_calling_code:string formatted_phone_number:string = PhoneNumberInfo;

18
td/telegram/CountryInfoManager.cpp
View File

@ -199,7 +199,7 @@ void CountryInfoManager::do_get_phone_number_info(string phone_number_prefix, st
const CountryInfo *best_country = nullptr;
const CallingCodeInfo *best_calling_code = nullptr;
size_t best_length = 0;
bool is_prefix = false;
bool is_prefix = false; // is phone number a prefix of a valid country_code + prefix
for (auto &country : list->countries_) {
for (auto &calling_code : country.calling_codes) {
if (begins_with(phone_number, calling_code.calling_code)) {
@ -240,7 +240,7 @@ void CountryInfoManager::do_get_phone_number_info(string phone_number_prefix, st
result += pattern[current_pattern_pos++];
}
if (current_pattern_pos == pattern.size()) {
result += ' ';
// result += ' ';
}
if (current_pattern_pos >= pattern.size() || pattern[current_pattern_pos] == 'X') {
result += c;
@ -257,8 +257,22 @@ void CountryInfoManager::do_get_phone_number_info(string phone_number_prefix, st
}
}
}
for (size_t i = current_pattern_pos; i < pattern.size(); i++) {
if (is_digit(pattern[i])) {
is_failed_match = true;
}
}
if (!is_failed_match && matched_digits >= max_matched_digits) {
max_matched_digits = matched_digits;
while (current_pattern_pos < pattern.size()) {
if (pattern[current_pattern_pos] == 'X') {
result.push_back('-');
} else {
CHECK(!is_digit(pattern[current_pattern_pos]));
result.push_back(' ');
}
current_pattern_pos++;
}
formatted_phone_number = std::move(result);
}
}