Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions gateway/whatsapp_identity.py
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
# full-width digits / Unicode word chars can't sneak through.
_SAFE_IDENTIFIER_RE = re.compile(r"^[A-Za-z0-9@.+\-]+$")

from hermes_constants import get_hermes_home
from hermes_constants import get_hermes_dir


def normalize_whatsapp_identifier(value: str) -> str:
Expand Down Expand Up @@ -82,7 +82,7 @@ def expand_whatsapp_aliases(identifier: str) -> Set[str]:
if not normalized:
return set()

session_dir = get_hermes_home() / "whatsapp" / "session"
session_dir = get_hermes_dir("platforms/whatsapp/session", "whatsapp/session")
resolved: Set[str] = set()
queue = [normalized]

Expand Down
37 changes: 37 additions & 0 deletions tests/gateway/test_whatsapp_identity.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
"""Tests for gateway.whatsapp_identity alias resolution path."""

import json

from gateway.whatsapp_identity import expand_whatsapp_aliases


def test_aliases_resolve_on_modern_platforms_layout(tmp_path, monkeypatch):
tmp_home = tmp_path / "hermes-home"
mapping_dir = tmp_home / "platforms" / "whatsapp" / "session"
mapping_dir.mkdir(parents=True, exist_ok=True)
(mapping_dir / "lid-mapping-999999999999999.json").write_text(
json.dumps("15551234567@s.whatsapp.net"),
encoding="utf-8",
)
monkeypatch.setenv("HERMES_HOME", str(tmp_home))

assert expand_whatsapp_aliases("999999999999999@lid") == {
"999999999999999",
"15551234567",
}


def test_aliases_resolve_on_legacy_layout(tmp_path, monkeypatch):
tmp_home = tmp_path / "hermes-home"
mapping_dir = tmp_home / "whatsapp" / "session"
mapping_dir.mkdir(parents=True, exist_ok=True)
(mapping_dir / "lid-mapping-999999999999999.json").write_text(
json.dumps("15551234567@s.whatsapp.net"),
encoding="utf-8",
)
monkeypatch.setenv("HERMES_HOME", str(tmp_home))

assert expand_whatsapp_aliases("999999999999999@lid") == {
"999999999999999",
"15551234567",
}