Elgato_dark/appwrite
1
0
Fork 0
mirror of https://github.com/appwrite/appwrite synced 2026-05-23 08:58:35 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fix country code extraction using locale config

Browse source 
Use the existing locale-phones config to accurately extract country
codes from phone numbers. Sorts codes by length descending to match
longer codes first (e.g., 1868 Trinidad before 1 USA).
This commit is contained in:
Chirag Aggarwal 2026-02-03 12:36:46 +05:30
parent e14a026415
commit ae720c3462
1 changed files with 36 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
src/Appwrite/Platform/Workers/Messaging.php
View file

@ -196,10 +196,9 @@ class Messaging extends Action
$countryCodes = [];
foreach ($allTargets as $target) {
$identifier = $target->getAttribute('identifier', '');
if (\str_starts_with($identifier, '+')) {
if (\preg_match('/^\+(\d{1,3})/', $identifier, $matches)) {
$countryCodes[$matches[1]] = ($countryCodes[$matches[1]] ?? 0) + 1;
}
$countryCode = $this->extractCountryCode($identifier);
if ($countryCode !== null) {
$countryCodes[$countryCode] = ($countryCodes[$countryCode] ?? 0) + 1;
}
}
if (!empty($countryCodes)) {
@ -437,11 +436,9 @@ class Messaging extends Action
// Extract country codes from phone numbers
$countryCodes = [];
foreach ($recipients as $recipient) {
if (\str_starts_with($recipient, '+')) {
// Extract country code (1-3 digits after +)
if (\preg_match('/^\+(\d{1,3})/', $recipient, $matches)) {
$countryCodes[$matches[1]] = ($countryCodes[$matches[1]] ?? 0) + 1;
}
$countryCode = $this->extractCountryCode($recipient);
if ($countryCode !== null) {
$countryCodes[$countryCode] = ($countryCodes[$countryCode] ?? 0) + 1;
}
}
if (!empty($countryCodes)) {
@ -881,4 +878,34 @@ class Messaging extends Action
return $provider;
}
/**
* Extract country calling code from a phone number using known country codes.
*/
private function extractCountryCode(string $phoneNumber): ?string
{
if (!\str_starts_with($phoneNumber, '+')) {
return null;
}
$number = \substr($phoneNumber, 1);
if (empty($number)) {
return null;
}
$phoneCodes = Config::getParam('locale-phones', []);
$codes = \array_unique(\array_values($phoneCodes));
// Sort by length descending to match longest codes first (e.g., 1868 before 1)
\usort($codes, fn ($a, $b) => \strlen($b) - \strlen($a));
foreach ($codes as $code) {
if (\str_starts_with($number, $code)) {
return $code;
}
}
return null;
}
}