mirror
/
meshtastic-matrix-relay
kopia lustrzana https://github.com/mate-dev/meshtastic-matrix-relay
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

Merge pull request #23 from jeremiah-k/main 

Revert alias changes for now
feature/plugins-parameters
Jeremiah K 2023-04-28 15:10:18 -05:00 zatwierdzone przez GitHub
rodzic a32b9bcb52 a5c3d8489d
commit a7d21767b7
1 zmienionych plików z 2 dodań i 2 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

4
matrix_utils.py
Wyświetl plik

@ -52,7 +52,7 @@ async def join_matrix_room(matrix_client, room_id_or_alias: str) -> None:
"""Join a Matrix room by its ID or alias.""" """Join a Matrix room by its ID or alias."""
try: try:
if room_id_or_alias.startswith("#"): if room_id_or_alias.startswith("#"):
response = await matrix_client.room_resolve_alias(room_id_or_alias) response = await matrix_client.resolve_room_alias(room_id_or_alias)
if not response.room_id: if not response.room_id:
logger.error( logger.error(
f"Failed to resolve room alias '{room_id_or_alias}': {response.message}" f"Failed to resolve room alias '{room_id_or_alias}': {response.message}"
@ -63,7 +63,7 @@ async def join_matrix_room(matrix_client, room_id_or_alias: str) -> None:
room_id = room_id_or_alias room_id = room_id_or_alias
if room_id not in matrix_client.rooms: if room_id not in matrix_client.rooms:
response = await matrix_client.join(room_id_or_alias) response = await matrix_client.join(room_id)
if response and hasattr(response, "room_id"): if response and hasattr(response, "room_id"):
logger.info(f"Joined room '{room_id_or_alias}' successfully") logger.info(f"Joined room '{room_id_or_alias}' successfully")
else: else: