mirror/nanobot
1
0
Fork 0
mirror of https://github.com/HKUDS/nanobot.git synced 2026-04-19 01:20:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(whatsapp): detect phone vs LID by JID suffix, not field name

Browse Source 
The bridge's pn/sender fields don't consistently map to phone/LID
across different versions. Classify by JID suffix instead:
  @s.whatsapp.net  → phone number
  @lid.whatsapp.net → LID (internal WhatsApp identifier)

This ensures allowFrom works reliably with phone numbers regardless
of which field the bridge populates.
This commit is contained in:
comadreja 2026-03-26 21:48:30 -05:00
parent e7d371ec1e
commit 59396bdbef
1 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
nanobot/channels/whatsapp.py
View File

@ -51,6 +51,7 @@ class WhatsAppChannel(BaseChannel):
self._ws = None self._ws = None
self._connected = False self._connected = False
self._processed_message_ids: OrderedDict[str, None] = OrderedDict() self._processed_message_ids: OrderedDict[str, None] = OrderedDict()
self._lid_to_phone: dict[str, str] = {}
async def login(self, force: bool = False) -> bool: async def login(self, force: bool = False) -> bool:
""" """
@ -197,9 +198,28 @@ class WhatsAppChannel(BaseChannel):
if not was_mentioned: if not was_mentioned:
return return
user_id = pn if pn else sender # Classify by JID suffix: @s.whatsapp.net = phone, @lid.whatsapp.net = LID
sender_id = user_id.split("@")[0] if "@" in user_id else user_id # The bridge's pn/sender fields don't consistently map to phone/LID across versions.
logger.info("Sender {}", sender) raw_a = pn or ""
raw_b = sender or ""
id_a = raw_a.split("@")[0] if "@" in raw_a else raw_a
id_b = raw_b.split("@")[0] if "@" in raw_b else raw_b
phone_id = ""
lid_id = ""
for raw, extracted in [(raw_a, id_a), (raw_b, id_b)]:
if "@s.whatsapp.net" in raw:
phone_id = extracted
elif "@lid.whatsapp.net" in raw:
lid_id = extracted
elif extracted and not phone_id:
phone_id = extracted # best guess for bare values
if phone_id and lid_id:
self._lid_to_phone[lid_id] = phone_id
sender_id = phone_id or self._lid_to_phone.get(lid_id, "") or lid_id or id_a or id_b
logger.info("Sender phone={} lid={} → sender_id={}", phone_id or "(empty)", lid_id or "(empty)", sender_id)
# Handle voice transcription if it's a voice message # Handle voice transcription if it's a voice message
if content == "[Voice Message]": if content == "[Voice Message]":