bstein/atlasbot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: handle matrix alias encoding

Browse Source
This commit is contained in:
Brad Stein 2026-01-28 12:27:59 -03:00
parent 1dbc2de39d
commit 9fb614772f
1 changed files with 25 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
atlasbot/matrix/bot.py
View File

@ -2,6 +2,7 @@ import asyncio
import logging import logging
import time import time
from typing import Any from typing import Any
from urllib.parse import quote
import httpx import httpx
@ -31,12 +32,20 @@ class MatrixClient:
return data.get("access_token", "") return data.get("access_token", "")
async def resolve_room(self, token: str) -> str: async def resolve_room(self, token: str) -> str:
url = f"{self._settings.matrix_base}/_matrix/client/v3/directory/room/{self._settings.room_alias}" alias = quote(self._settings.room_alias, safe="")
url = f"{self._settings.matrix_base}/_matrix/client/v3/directory/room/{alias}"
headers = {"Authorization": f"Bearer {token}"} headers = {"Authorization": f"Bearer {token}"}
async with httpx.AsyncClient(timeout=15.0) as client: async with httpx.AsyncClient(timeout=15.0) as client:
try:
resp = await client.get(url, headers=headers) resp = await client.get(url, headers=headers)
resp.raise_for_status() resp.raise_for_status()
data = resp.json() data = resp.json()
except httpx.HTTPError as exc:
log.warning(
"matrix resolve_room failed",
extra={"extra": {"error": str(exc), "alias": self._settings.room_alias}},
)
return ""
return data.get("room_id", "") return data.get("room_id", "")
async def join_room(self, token: str, room_id: str) -> None: async def join_room(self, token: str, room_id: str) -> None:
@ -77,10 +86,18 @@ class MatrixBot:
self._answer_handler = answer_handler self._answer_handler = answer_handler
async def run(self) -> None: async def run(self) -> None:
while True:
try:
token = await self._client.login() token = await self._client.login()
room_id = await self._client.resolve_room(token) room_id = await self._client.resolve_room(token)
if room_id: if room_id:
await self._client.join_room(token, room_id) await self._client.join_room(token, room_id)
await self._sync_loop(token)
except Exception as exc:
log.warning("matrix bootstrap failed", extra={"extra": {"error": str(exc)}})
await asyncio.sleep(10)
async def _sync_loop(self, token: str) -> None:
since = None since = None
while True: while True:
try: try: