fix: use phonenumbers library to check if a recipient id is a phone n…

…umber (#95) Closes #29 --------- Co-authored-by: Kariton <[email protected]>
filipre · Feb 8, 2025 · 98a7811 · 98a7811
1 parent 28538a7
commit 98a7811
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 8 deletions.
diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -26,6 +26,7 @@ aiohttp = ">=3.11.9"
 python = ">=3.9"
 redis = ">=5.2.0"
 websockets = ">=14.1"
+phonenumbers = ">=8.13.54"
 
 [tool.poetry.dev-dependencies]
 black = ">=24.10.0"

diff --git a/signalbot/bot.py b/signalbot/bot.py
@@ -7,6 +7,7 @@
 from typing import Optional, Union, List, Callable, Any
 import re
 import uuid
+import phonenumbers
 
 from .api import SignalAPI, ReceiveMessagesError
 from .command import Command
@@ -285,13 +286,11 @@ def _resolve_receiver(self, receiver: str) -> str:
             raise SignalBotError(f"Cannot resolve receiver.")
 
     def _is_phone_number(self, phone_number: str) -> bool:
-        if phone_number is None:
-            return False
-        if phone_number[0] != "+":
-            return False
-        if len(phone_number[1:]) > 15:
+        try:
+            parsed_number = phonenumbers.parse(phone_number, region=None)
+            return phonenumbers.is_valid_number(parsed_number)
+        except phonenumbers.phonenumberutil.NumberParseException:
             return False
-        return True
 
     def _is_valid_uuid(self, receiver_uuid: str):
         try:

diff --git a/tests/test_bot.py b/tests/test_bot.py
@@ -106,7 +106,7 @@ def test_listenUser_invalid_phone_number(self):
 
     def test_listen_valid_invalid_phone_number(self):
         invalid_number = "49987654321"
-        valid_number = "+49123454321"
+        valid_number = "+49303454321"
         self.signal_bot.listen(invalid_number)
         self.signal_bot.listen(valid_number)
         expected_user_chats = {valid_number}