Merge pull request #14 from wildjames/codex/troubleshoot-unprompted-bot-dms

Fix self-message check

Author: wildjames

signal_interface/signal_consumer.py

@@ -10,6 +10,7 @@
 
 import asyncio
 import json
+import re
 from logging import getLogger
 from typing import Any, Dict, List, Union
 
@@ -34,6 +35,11 @@
 logger = getLogger(__name__)
 
 
+def _normalize_number(number: str) -> str:
+    """Normalize a phone number by stripping all non-digit characters."""
+    return re.sub(r"\D", "", number)
+
+
 class SignalConsumer:
     """The consumer class handles checking for new messages, and placing them
     on the queue.
@@ -282,7 +288,10 @@ async def _process_incoming(self, message: Dict[str, Any]):
         # back messages that we've just sent (sync messages), which can cause
         # the Razzler to respond to its own messages. This manifests as the bot
         # sending apparently unprompted direct messages.
-        if msg.envelope.sourceNumber == self.signal_info.phone_number:
+        if (
+            _normalize_number(msg.envelope.sourceNumber)
+            == _normalize_number(self.signal_info.phone_number)
+        ):
             logger.debug("Ignoring message sent by ourselves")
             return