Session 2: Matrix client with E2EE and room-scoped handler

Adapted from Pete: password login + device persistence, cryptohelper
with cross-signing bootstrap, sync loop with auto-join on invite, and
PostThreadedReply for command responses. Messages outside allowed_rooms
are dropped.

.dockerignore

@@ -1,5 +1,4 @@
 .git
-__pycache__
+data/
-*.pyc
+config.yaml
-.env
+bellhop
-bellhop.db

.env.example

@@ -1,30 +0,0 @@
-# Matrix homeserver
-MATRIX_HOMESERVER_URL=https://matrix.example.com
-
-# Matrix audit bot (pre-authenticated)
-MATRIX_AUDIT_ROOM_ID=!roomid:example.com
-MATRIX_BOT_USER_ID=@bot:example.com
-MATRIX_BOT_ACCESS_TOKEN=syt_bot_token_here
-
-# Radarr
-RADARR_URL=https://radarr.example.com
-RADARR_API_KEY=your_radarr_api_key
-RADARR_QUALITY_PROFILE_ID=1
-RADARR_ROOT_FOLDER=/movies
-
-# Sonarr
-SONARR_URL=https://sonarr.example.com
-SONARR_API_KEY=your_sonarr_api_key
-SONARR_QUALITY_PROFILE_ID=1
-SONARR_ROOT_FOLDER=/tv
-
-# Lidarr
-LIDARR_URL=https://lidarr.example.com
-LIDARR_API_KEY=your_lidarr_api_key
-LIDARR_QUALITY_PROFILE_ID=1
-LIDARR_ROOT_FOLDER=/music
-
-# App
-# SESSION_SECRET_KEY is auto-generated if omitted. A new key on every restart invalidates all sessions.
-# SESSION_SECRET_KEY=
-DATABASE_PATH=bellhop.db

.gitignore

@@ -1,6 +1,3 @@
-__pycache__/
+/bellhop
-*.pyc
+/data/
-.env
+config.yaml
-bellhop.db
-*.sqlite
-*.sqlite3

Dockerfile

@@ -1,12 +0,0 @@
-FROM python:3.12-slim
-
-WORKDIR /app
-
-COPY requirements.txt .
-RUN pip install --no-cache-dir -r requirements.txt
-
-COPY . .
-
-EXPOSE 8000
-
-CMD ["uvicorn", "app.main:app", "--host", "0.0.0.0", "--port", "8000"]

SESSION_PLAN.md

@@ -0,0 +1,57 @@
+# Bellhop Go Rewrite — Session Plan
+
+Rewriting Bellhop from a Python FastAPI web portal into a Go-based Matrix command bot, modeled after [Pete](../pete). Users issue commands like `!movie dune` in allowlisted Matrix rooms; the bot performs the top-hit search against Radarr/Sonarr/Lidarr and adds the result.
+
+## Design decisions (locked in)
+
+- **Command UX:** top-hit auto-add (no numbered picker, no reaction selector).
+- **Authz:** any member of an allowlisted room ID can issue commands. No per-user list.
+- **Old Python code:** deleted, clean-slate Go rewrite.
+- **Module layout:** mirrors Pete (`main.go` + `internal/<pkg>/`).
+- **Config:** YAML with `${ENV_VAR}` expansion (Pete-style).
+- **Matrix client:** mautrix-go with cryptohelper for E2EE support.
+
+## Session breakdown
+
+- [x] **Session 1 — Foundation**
+  - Delete Python (`app/`, `requirements.txt`, `Dockerfile`, `.env.example`)
+  - Reset `.gitignore` / `.dockerignore` for Go
+  - `go.mod` (mautrix + yaml)
+  - `internal/config/config.go` — YAML loader: matrix creds, `allowed_rooms`, `services.{radarr,sonarr,lidarr}`
+
+- [x] **Session 2 — Matrix client** (`internal/matrix/`)
+  - Adapt Pete's `client.go`: login + device persistence + cryptohelper
+  - Sync loop, auto-join on invite
+  - Message handler scoped to `allowed_rooms` (not channel-name map like Pete)
+  - Threaded reply helper for command responses
+  - Drop Pete-specific bits: image upload, reaction handler, story formatting
+
+- [ ] **Session 3 — *arr clients** (`internal/arr/`)
+  - One file per service or a single generic client (TBD in session)
+  - `Search(term) → []Result` and `Add(result) → error`
+  - Radarr: `/api/v3/movie/lookup` + POST `/api/v3/movie`
+  - Sonarr: `/api/v3/series/lookup` + POST `/api/v3/series`
+  - Lidarr: `/api/v1/artist/lookup` + POST `/api/v1/artist`
+  - All adds: monitored=true, search-on-add=true, quality profile + root folder from config
+  - Unit tests with httptest
+
+- [ ] **Session 4 — Command dispatch + main** (`internal/bot/`, `main.go`)
+  - Parse `<prefix><cmd> <query>` (default prefix `!`)
+  - Commands: `movie`, `tv`, `music`, `help`
+  - On match: search → take `[0]` → add → reply with title/year (or error)
+  - "Service not configured" reply if the corresponding *arr block is absent
+  - `main.go`: load config, init matrix, wire handler, SIGINT/SIGTERM shutdown
+
+- [ ] **Session 5 — Ship polish**
+  - Multi-stage Dockerfile (`golang:1.25-alpine` → `alpine:3.21`, build with `-tags goolm`)
+  - `config.example.yaml`
+  - Rewrite `README.md`: command UX, install, config reference, Docker
+  - `go build ./...` + `go vet ./...` clean
+
+## Out of scope (for now)
+
+- Reaction-based result picker
+- Per-user allowlist or power-level gating
+- Persistent request audit log (the Matrix room itself is the audit trail since requests are in-channel)
+- Removal/cancellation commands
+- Search-only mode (browse without adding)

app/arr.py

@@ -1,234 +0,0 @@
-"""Proxy layer for Radarr, Sonarr, and Lidarr APIs."""
-
-import httpx
-from fastapi import APIRouter, Request
-from fastapi.responses import JSONResponse
-
-from app.auth import require_session
-from app.audit import send_audit_message
-from app.config import (
-    LIDARR_API_KEY,
-    LIDARR_QUALITY_PROFILE_ID,
-    LIDARR_ROOT_FOLDER,
-    LIDARR_URL,
-    RADARR_API_KEY,
-    RADARR_QUALITY_PROFILE_ID,
-    RADARR_ROOT_FOLDER,
-    RADARR_URL,
-    SONARR_API_KEY,
-    SONARR_QUALITY_PROFILE_ID,
-    SONARR_ROOT_FOLDER,
-    SONARR_URL,
-)
-
-router = APIRouter(tags=["arr"])
-
-SERVICE_CONFIG = {
-    "movie": {
-        "url": RADARR_URL,
-        "api_key": RADARR_API_KEY,
-        "quality_profile_id": RADARR_QUALITY_PROFILE_ID,
-        "root_folder": RADARR_ROOT_FOLDER,
-        "lookup_path": "/api/v3/movie/lookup",
-        "add_path": "/api/v3/movie",
-        "label": "Movie",
-    },
-    "tv": {
-        "url": SONARR_URL,
-        "api_key": SONARR_API_KEY,
-        "quality_profile_id": SONARR_QUALITY_PROFILE_ID,
-        "root_folder": SONARR_ROOT_FOLDER,
-        "lookup_path": "/api/v3/series/lookup",
-        "add_path": "/api/v3/series",
-        "label": "Show",
-    },
-    "music": {
-        "url": LIDARR_URL,
-        "api_key": LIDARR_API_KEY,
-        "quality_profile_id": LIDARR_QUALITY_PROFILE_ID,
-        "root_folder": LIDARR_ROOT_FOLDER,
-        "lookup_path": "/api/v1/artist/lookup",
-        "add_path": "/api/v1/artist",
-        "label": "Artist",
-    },
-}
-
-VALID_TYPES = set(SERVICE_CONFIG.keys())
-
-
-def _headers(api_key: str) -> dict[str, str]:
-    return {"X-Api-Key": api_key}
-
-
-def _safe_result_movie(item: dict) -> dict:
-    return {
-        "title": item.get("title", ""),
-        "year": item.get("year"),
-        "tmdbId": item.get("tmdbId"),
-        "overview": item.get("overview", ""),
-        "remotePoster": item.get("remotePoster", ""),
-        "hasFile": item.get("hasFile", False),
-    }
-
-
-def _safe_result_tv(item: dict) -> dict:
-    return {
-        "title": item.get("title", ""),
-        "year": item.get("year"),
-        "tvdbId": item.get("tvdbId"),
-        "overview": item.get("overview", ""),
-        "remotePoster": item.get("remotePoster", ""),
-        "statistics": item.get("statistics", {}),
-    }
-
-
-def _safe_result_music(item: dict) -> dict:
-    return {
-        "artistName": item.get("artistName", ""),
-        "foreignArtistId": item.get("foreignArtistId", ""),
-        "overview": item.get("overview", ""),
-        "remotePoster": (item.get("images") or [{}])[0].get("remoteUrl", "") if item.get("images") else "",
-    }
-
-
-SAFE_MAPPERS = {
-    "movie": _safe_result_movie,
-    "tv": _safe_result_tv,
-    "music": _safe_result_music,
-}
-
-
-@router.get("/search/{media_type}")
-async def search(media_type: str, term: str, request: Request) -> JSONResponse:
-    session = await require_session(request)
-    if not session:
-        return JSONResponse({"error": "Not authenticated"}, status_code=401)
-
-    if media_type not in VALID_TYPES:
-        return JSONResponse({"error": f"Invalid type. Must be one of: {', '.join(VALID_TYPES)}"}, status_code=400)
-
-    if not term or not term.strip():
-        return JSONResponse({"error": "Search term is required"}, status_code=400)
-
-    cfg = SERVICE_CONFIG[media_type]
-    if not cfg["url"] or not cfg["api_key"]:
-        return JSONResponse({"error": f"{cfg['label']} service is not configured"}, status_code=503)
-
-    lookup_url = f"{cfg['url'].rstrip('/')}{cfg['lookup_path']}"
-    params = {"term": term.strip()}
-
-    async with httpx.AsyncClient() as client:
-        try:
-            resp = await client.get(
-                lookup_url,
-                params=params,
-                headers=_headers(cfg["api_key"]),
-                timeout=15.0,
-            )
-        except httpx.RequestError:
-            return JSONResponse({"error": f"Could not reach {cfg['label']} service"}, status_code=502)
-
-    if resp.status_code != 200:
-        return JSONResponse({"error": f"{cfg['label']} lookup failed"}, status_code=resp.status_code)
-
-    results = resp.json()
-    mapper = SAFE_MAPPERS[media_type]
-    safe_results = [mapper(item) for item in results[:25]]
-
-    return JSONResponse(safe_results)
-
-
-@router.post("/request/{media_type}")
-async def add_request(media_type: str, request: Request) -> JSONResponse:
-    session = await require_session(request)
-    if not session:
-        return JSONResponse({"error": "Not authenticated"}, status_code=401)
-
-    if media_type not in VALID_TYPES:
-        return JSONResponse({"error": f"Invalid type. Must be one of: {', '.join(VALID_TYPES)}"}, status_code=400)
-
-    body = await request.json()
-    cfg = SERVICE_CONFIG[media_type]
-
-    if not cfg["url"] or not cfg["api_key"]:
-        return JSONResponse({"error": f"{cfg['label']} service is not configured"}, status_code=503)
-
-    add_url = f"{cfg['url'].rstrip('/')}{cfg['add_path']}"
-
-    if media_type == "movie":
-        payload = _build_movie_payload(body, cfg)
-        title_display = f"\"{body.get('title', 'Unknown')}\" ({body.get('year', '?')})"
-    elif media_type == "tv":
-        payload = _build_tv_payload(body, cfg)
-        title_display = f"\"{body.get('title', 'Unknown')}\" ({body.get('year', '?')})"
-    else:
-        payload = _build_music_payload(body, cfg)
-        title_display = f"\"{body.get('artistName', 'Unknown')}\" ({body.get('foreignArtistId', '?')})"
-
-    async with httpx.AsyncClient() as client:
-        try:
-            resp = await client.post(
-                add_url,
-                json=payload,
-                headers=_headers(cfg["api_key"]),
-                timeout=15.0,
-            )
-        except httpx.RequestError:
-            return JSONResponse({"error": f"Could not reach {cfg['label']} service"}, status_code=502)
-
-    if resp.status_code not in (200, 201):
-        error_detail = ""
-        try:
-            error_body = resp.json()
-            if isinstance(error_body, list):
-                error_detail = "; ".join(e.get("errorMessage", "") for e in error_body if e.get("errorMessage"))
-            elif isinstance(error_body, dict):
-                error_detail = error_body.get("message", "") or error_body.get("errorMessage", "")
-        except Exception:
-            pass
-        msg = f"Failed to add to {cfg['label']}"
-        if error_detail:
-            msg += f": {error_detail}"
-        return JSONResponse({"error": msg}, status_code=resp.status_code)
-
-    # Fire-and-forget audit message
-    user_id = session["matrix_user_id"]
-    audit_msg = f"[REQUEST] {user_id} → [{cfg['label']}] {title_display}"
-    send_audit_message(audit_msg)
-
-    return JSONResponse({"ok": True, "message": f"{cfg['label']} added successfully"})
-
-
-def _build_movie_payload(body: dict, cfg: dict) -> dict:
-    return {
-        "title": body.get("title", ""),
-        "tmdbId": body.get("tmdbId"),
-        "year": body.get("year"),
-        "qualityProfileId": cfg["quality_profile_id"],
-        "rootFolderPath": cfg["root_folder"],
-        "monitored": True,
-        "addOptions": {"searchForMovie": True},
-    }
-
-
-def _build_tv_payload(body: dict, cfg: dict) -> dict:
-    return {
-        "title": body.get("title", ""),
-        "tvdbId": body.get("tvdbId"),
-        "year": body.get("year"),
-        "qualityProfileId": cfg["quality_profile_id"],
-        "rootFolderPath": cfg["root_folder"],
-        "monitored": True,
-        "addOptions": {"searchForMissingEpisodes": True},
-    }
-
-
-def _build_music_payload(body: dict, cfg: dict) -> dict:
-    return {
-        "artistName": body.get("artistName", ""),
-        "foreignArtistId": body.get("foreignArtistId", ""),
-        "qualityProfileId": cfg["quality_profile_id"],
-        "rootFolderPath": cfg["root_folder"],
-        "monitored": True,
-        "addOptions": {"searchForMissingAlbums": True},
-    }

app/audit.py

@@ -1,51 +0,0 @@
-"""Matrix audit log — fire-and-forget messages to an unencrypted room."""
-
-import asyncio
-import logging
-
-import httpx
-
-from app.config import (
-    MATRIX_AUDIT_ROOM_ID,
-    MATRIX_BOT_ACCESS_TOKEN,
-    MATRIX_HOMESERVER_URL,
-)
-
-logger = logging.getLogger(__name__)
-
-
-def send_audit_message(message: str) -> None:
-    """Schedule an audit message to be sent without blocking the caller."""
-    if not MATRIX_AUDIT_ROOM_ID or not MATRIX_BOT_ACCESS_TOKEN:
-        logger.debug("Audit log not configured, skipping")
-        return
-
-    try:
-        loop = asyncio.get_running_loop()
-    except RuntimeError:
-        return
-
-    loop.create_task(_send(message))
-
-
-async def _send(message: str) -> None:
-    import time
-
-    room_id = MATRIX_AUDIT_ROOM_ID
-    txn_id = str(int(time.time() * 1000))
-
-    url = (
-        f"{MATRIX_HOMESERVER_URL.rstrip('/')}/_matrix/client/v3/rooms/"
-        f"{room_id}/send/m.room.message/{txn_id}"
-    )
-    body = {
-        "msgtype": "m.text",
-        "body": message,
-    }
-    headers = {"Authorization": f"Bearer {MATRIX_BOT_ACCESS_TOKEN}"}
-
-    try:
-        async with httpx.AsyncClient() as client:
-            await client.put(url, json=body, headers=headers, timeout=10.0)
-    except Exception:
-        logger.warning("Failed to send audit message: %s", message, exc_info=True)

app/auth.py

@@ -1,131 +0,0 @@
-import httpx
-from fastapi import APIRouter, Request, Response
-from fastapi.responses import JSONResponse
-
-from app.config import MATRIX_HOMESERVER_URL
-from app.database import create_session, delete_session, get_session
-
-router = APIRouter(prefix="/auth", tags=["auth"])
-
-SESSION_COOKIE = "bellhop_session"
-MAX_SESSION_AGE = 60 * 60 * 24 * 7  # 7 days
-
-
-@router.post("/login")
-async def login(request: Request) -> Response:
-    body = await request.json()
-    username: str = body.get("username", "").strip()
-    password: str = body.get("password", "")
-
-    if not username or not password:
-        return JSONResponse({"error": "Username and password are required"}, status_code=400)
-
-    # Build the Matrix user identifier
-    if username.startswith("@"):
-        user_identifier = username
-    else:
-        user_identifier = username  # let the homeserver resolve it
-
-    login_url = f"{MATRIX_HOMESERVER_URL.rstrip('/')}/_matrix/client/v3/login"
-    payload = {
-        "type": "m.login.password",
-        "identifier": {"type": "m.id.user", "user": user_identifier},
-        "password": password,
-    }
-
-    async with httpx.AsyncClient() as client:
-        try:
-            resp = await client.post(login_url, json=payload, timeout=15.0)
-        except httpx.RequestError:
-            return JSONResponse({"error": "Could not reach Matrix homeserver"}, status_code=502)
-
-    if resp.status_code != 200:
-        error_msg = resp.json().get("error", "Authentication failed")
-        return JSONResponse({"error": error_msg}, status_code=401)
-
-    data = resp.json()
-    matrix_user_id: str = data["user_id"]
-    matrix_access_token: str = data["access_token"]
-
-    session_id = await create_session(matrix_user_id, matrix_access_token)
-
-    response = JSONResponse({"user_id": matrix_user_id})
-    response.set_cookie(
-        key=SESSION_COOKIE,
-        value=session_id,
-        httponly=True,
-        samesite="strict",
-        secure=True,
-        max_age=MAX_SESSION_AGE,
-    )
-    return response
-
-
-@router.post("/logout")
-async def logout(request: Request) -> Response:
-    session_id = request.cookies.get(SESSION_COOKIE)
-    if session_id:
-        await delete_session(session_id)
-    response = JSONResponse({"ok": True})
-    response.delete_cookie(key=SESSION_COOKIE)
-    return response
-
-
-@router.get("/me")
-async def me(request: Request) -> Response:
-    session_id = request.cookies.get(SESSION_COOKIE)
-    if not session_id:
-        return JSONResponse({"error": "Not authenticated"}, status_code=401)
-
-    session = await get_session(session_id)
-    if not session:
-        return JSONResponse({"error": "Not authenticated"}, status_code=401)
-
-    # Verify token is still valid with the homeserver
-    whoami_url = f"{MATRIX_HOMESERVER_URL.rstrip('/')}/_matrix/client/v3/account/whoami"
-    async with httpx.AsyncClient() as client:
-        try:
-            resp = await client.get(
-                whoami_url,
-                headers={"Authorization": f"Bearer {session['matrix_access_token']}"},
-                timeout=10.0,
-            )
-        except httpx.RequestError:
-            # If homeserver is unreachable, trust the local session
-            return JSONResponse({"user_id": session["matrix_user_id"]})
-
-    if resp.status_code != 200:
-        await delete_session(session_id)
-        response = JSONResponse({"error": "Session expired"}, status_code=401)
-        response.delete_cookie(key=SESSION_COOKIE)
-        return response
-
-    return JSONResponse({"user_id": session["matrix_user_id"]})
-
-
-async def require_session(request: Request) -> dict | None:
-    """Utility: extract and validate session from a request. Returns session dict or None."""
-    session_id = request.cookies.get(SESSION_COOKIE)
-    if not session_id:
-        return None
-    session = await get_session(session_id)
-    if not session:
-        return None
-
-    # Verify token is still valid
-    whoami_url = f"{MATRIX_HOMESERVER_URL.rstrip('/')}/_matrix/client/v3/account/whoami"
-    async with httpx.AsyncClient() as client:
-        try:
-            resp = await client.get(
-                whoami_url,
-                headers={"Authorization": f"Bearer {session['matrix_access_token']}"},
-                timeout=10.0,
-            )
-        except httpx.RequestError:
-            return session  # trust local session if homeserver unreachable
-
-    if resp.status_code != 200:
-        await delete_session(session_id)
-        return None
-
-    return session

app/config.py

@@ -1,43 +0,0 @@
-import os
-import secrets
-from pathlib import Path
-
-from dotenv import load_dotenv
-
-load_dotenv()
-
-
-def _require(name: str) -> str:
-    val = os.getenv(name)
-    if not val:
-        raise RuntimeError(f"Missing required environment variable: {name}")
-    return val
-
-
-# Matrix
-MATRIX_HOMESERVER_URL: str = _require("MATRIX_HOMESERVER_URL")
-MATRIX_AUDIT_ROOM_ID: str = os.getenv("MATRIX_AUDIT_ROOM_ID", "")
-MATRIX_BOT_USER_ID: str = os.getenv("MATRIX_BOT_USER_ID", "")
-MATRIX_BOT_ACCESS_TOKEN: str = os.getenv("MATRIX_BOT_ACCESS_TOKEN", "")
-
-# Radarr
-RADARR_URL: str = os.getenv("RADARR_URL", "")
-RADARR_API_KEY: str = os.getenv("RADARR_API_KEY", "")
-RADARR_QUALITY_PROFILE_ID: int = int(os.getenv("RADARR_QUALITY_PROFILE_ID", "1"))
-RADARR_ROOT_FOLDER: str = os.getenv("RADARR_ROOT_FOLDER", "/movies")
-
-# Sonarr
-SONARR_URL: str = os.getenv("SONARR_URL", "")
-SONARR_API_KEY: str = os.getenv("SONARR_API_KEY", "")
-SONARR_QUALITY_PROFILE_ID: int = int(os.getenv("SONARR_QUALITY_PROFILE_ID", "1"))
-SONARR_ROOT_FOLDER: str = os.getenv("SONARR_ROOT_FOLDER", "/tv")
-
-# Lidarr
-LIDARR_URL: str = os.getenv("LIDARR_URL", "")
-LIDARR_API_KEY: str = os.getenv("LIDARR_API_KEY", "")
-LIDARR_QUALITY_PROFILE_ID: int = int(os.getenv("LIDARR_QUALITY_PROFILE_ID", "1"))
-LIDARR_ROOT_FOLDER: str = os.getenv("LIDARR_ROOT_FOLDER", "/music")
-
-# App
-SESSION_SECRET_KEY: str = os.getenv("SESSION_SECRET_KEY") or secrets.token_urlsafe(32)
-DATABASE_PATH: str = os.getenv("DATABASE_PATH", "bellhop.db")

app/database.py

@@ -1,73 +0,0 @@
-import secrets
-import time
-
-import aiosqlite
-
-from app.config import DATABASE_PATH
-
-_db: aiosqlite.Connection | None = None
-
-
-async def get_db() -> aiosqlite.Connection:
-    global _db
-    if _db is None:
-        _db = await aiosqlite.connect(DATABASE_PATH)
-        _db.row_factory = aiosqlite.Row
-        await _db.execute("PRAGMA journal_mode=WAL")
-        await _db.execute(
-            """
-            CREATE TABLE IF NOT EXISTS sessions (
-                session_id TEXT PRIMARY KEY,
-                matrix_user_id TEXT NOT NULL,
-                matrix_access_token TEXT NOT NULL,
-                created_at REAL NOT NULL,
-                last_seen REAL NOT NULL
-            )
-            """
-        )
-        await _db.commit()
-    return _db
-
-
-async def close_db() -> None:
-    global _db
-    if _db is not None:
-        await _db.close()
-        _db = None
-
-
-async def create_session(matrix_user_id: str, matrix_access_token: str) -> str:
-    db = await get_db()
-    session_id = secrets.token_urlsafe(32)
-    now = time.time()
-    await db.execute(
-        "INSERT INTO sessions (session_id, matrix_user_id, matrix_access_token, created_at, last_seen) "
-        "VALUES (?, ?, ?, ?, ?)",
-        (session_id, matrix_user_id, matrix_access_token, now, now),
-    )
-    await db.commit()
-    return session_id
-
-
-async def get_session(session_id: str) -> dict | None:
-    db = await get_db()
-    cursor = await db.execute(
-        "SELECT session_id, matrix_user_id, matrix_access_token, created_at, last_seen "
-        "FROM sessions WHERE session_id = ?",
-        (session_id,),
-    )
-    row = await cursor.fetchone()
-    if row is None:
-        return None
-    await db.execute(
-        "UPDATE sessions SET last_seen = ? WHERE session_id = ?",
-        (time.time(), session_id),
-    )
-    await db.commit()
-    return dict(row)
-
-
-async def delete_session(session_id: str) -> None:
-    db = await get_db()
-    await db.execute("DELETE FROM sessions WHERE session_id = ?", (session_id,))
-    await db.commit()

app/main.py

@@ -1,48 +0,0 @@
-from contextlib import asynccontextmanager
-from pathlib import Path
-
-from fastapi import FastAPI, Request
-from fastapi.responses import HTMLResponse
-from fastapi.staticfiles import StaticFiles
-from slowapi import Limiter, _rate_limit_exceeded_handler
-from slowapi.errors import RateLimitExceeded
-from slowapi.util import get_remote_address
-
-from app.auth import router as auth_router
-from app.arr import router as arr_router
-from app.database import close_db, get_db
-
-BASE_DIR = Path(__file__).resolve().parent
-
-limiter = Limiter(key_func=get_remote_address)
-
-
-@asynccontextmanager
-async def lifespan(app: FastAPI):
-    await get_db()
-    yield
-    await close_db()
-
-
-app = FastAPI(title="Bellhop", lifespan=lifespan)
-app.state.limiter = limiter
-app.add_exception_handler(RateLimitExceeded, _rate_limit_exceeded_handler)
-
-# Mount static files
-app.mount("/static", StaticFiles(directory=str(BASE_DIR / "static")), name="static")
-
-# Apply rate limit to login specifically
-original_login = auth_router.routes
-for route in auth_router.routes:
-    if hasattr(route, "path") and route.path == "/login" and hasattr(route, "endpoint"):
-        route.endpoint = limiter.limit("5/minute")(route.endpoint)
-        break
-
-app.include_router(auth_router)
-app.include_router(arr_router)
-
-
-@app.get("/", response_class=HTMLResponse)
-async def index():
-    html_path = BASE_DIR / "templates" / "index.html"
-    return HTMLResponse(html_path.read_text())

app/templates/index.html

@@ -1,355 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-  <meta charset="UTF-8">
-  <meta name="viewport" content="width=device-width, initial-scale=1.0">
-  <title>Bellhop</title>
-  <script defer src="https://cdn.jsdelivr.net/npm/alpinejs@3.x.x/dist/cdn.min.js"></script>
-  <style>
-    :root {
-      --bg: #0f0f0f;
-      --surface: #1a1a2e;
-      --surface2: #16213e;
-      --primary: #e94560;
-      --primary-hover: #c73650;
-      --text: #eee;
-      --text-muted: #999;
-      --border: #333;
-      --success: #2ecc71;
-      --error: #e74c3c;
-    }
-    * { box-sizing: border-box; margin: 0; padding: 0; }
-    body {
-      font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, sans-serif;
-      background: var(--bg);
-      color: var(--text);
-      min-height: 100vh;
-    }
-    .container { max-width: 960px; margin: 0 auto; padding: 1.5rem; }
-    header {
-      display: flex; justify-content: space-between; align-items: center;
-      padding: 1rem 0; border-bottom: 1px solid var(--border); margin-bottom: 1.5rem;
-    }
-    header h1 { font-size: 1.5rem; letter-spacing: 0.05em; }
-    header h1 span { color: var(--primary); }
-    .btn {
-      padding: 0.5rem 1rem; border: none; border-radius: 6px;
-      cursor: pointer; font-size: 0.9rem; font-weight: 500;
-      transition: background 0.2s;
-    }
-    .btn-primary { background: var(--primary); color: #fff; }
-    .btn-primary:hover { background: var(--primary-hover); }
-    .btn-primary:disabled { opacity: 0.5; cursor: not-allowed; }
-    .btn-ghost {
-      background: transparent; color: var(--text-muted); border: 1px solid var(--border);
-    }
-    .btn-ghost:hover { color: var(--text); border-color: var(--text-muted); }
-    .btn-sm { padding: 0.35rem 0.75rem; font-size: 0.8rem; }
-
-    /* Login */
-    .login-card {
-      max-width: 380px; margin: 4rem auto; background: var(--surface);
-      border-radius: 12px; padding: 2rem;
-    }
-    .login-card h2 { margin-bottom: 0.25rem; }
-    .login-card p { color: var(--text-muted); font-size: 0.85rem; margin-bottom: 1.5rem; }
-    .form-group { margin-bottom: 1rem; }
-    .form-group label { display: block; font-size: 0.8rem; color: var(--text-muted); margin-bottom: 0.3rem; }
-    .form-group input {
-      width: 100%; padding: 0.6rem 0.75rem; background: var(--bg);
-      border: 1px solid var(--border); border-radius: 6px; color: var(--text);
-      font-size: 0.95rem;
-    }
-    .form-group input:focus { outline: none; border-color: var(--primary); }
-    .error-msg { color: var(--error); font-size: 0.85rem; margin-bottom: 0.75rem; }
-
-    /* Search bar */
-    .search-bar {
-      display: flex; gap: 0.5rem; margin-bottom: 1.5rem; flex-wrap: wrap;
-    }
-    .media-tabs { display: flex; gap: 0.25rem; margin-bottom: 1rem; }
-    .media-tab {
-      padding: 0.4rem 1rem; background: var(--surface); border: 1px solid var(--border);
-      border-radius: 6px; cursor: pointer; color: var(--text-muted); font-size: 0.85rem;
-      transition: all 0.2s;
-    }
-    .media-tab.active { background: var(--primary); color: #fff; border-color: var(--primary); }
-    .search-input {
-      flex: 1; min-width: 200px; padding: 0.6rem 0.75rem; background: var(--surface);
-      border: 1px solid var(--border); border-radius: 6px; color: var(--text); font-size: 0.95rem;
-    }
-    .search-input:focus { outline: none; border-color: var(--primary); }
-
-    /* Results grid */
-    .results-grid {
-      display: grid; grid-template-columns: repeat(auto-fill, minmax(180px, 1fr));
-      gap: 1rem;
-    }
-    .result-card {
-      background: var(--surface); border-radius: 10px; overflow: hidden;
-      transition: transform 0.15s;
-    }
-    .result-card:hover { transform: translateY(-2px); }
-    .result-card img {
-      width: 100%; aspect-ratio: 2/3; object-fit: cover; background: var(--surface2);
-    }
-    .result-card .info { padding: 0.75rem; }
-    .result-card .title { font-size: 0.9rem; font-weight: 600; margin-bottom: 0.15rem; }
-    .result-card .year { font-size: 0.8rem; color: var(--text-muted); margin-bottom: 0.5rem; }
-    .result-card .btn { width: 100%; }
-
-    /* Feedback */
-    .toast {
-      position: fixed; bottom: 1.5rem; right: 1.5rem;
-      padding: 0.75rem 1.25rem; border-radius: 8px;
-      font-size: 0.9rem; color: #fff; z-index: 100;
-      animation: slideIn 0.3s ease;
-    }
-    .toast.success { background: var(--success); }
-    .toast.error { background: var(--error); }
-    @keyframes slideIn {
-      from { transform: translateY(1rem); opacity: 0; }
-      to { transform: translateY(0); opacity: 1; }
-    }
-
-    .spinner { display: inline-block; width: 1em; height: 1em; border: 2px solid #fff3;
-      border-top-color: #fff; border-radius: 50%; animation: spin 0.6s linear infinite; }
-    @keyframes spin { to { transform: rotate(360deg); } }
-
-    .placeholder {
-      text-align: center; padding: 3rem 1rem; color: var(--text-muted);
-    }
-    .no-poster {
-      width: 100%; aspect-ratio: 2/3; background: var(--surface2);
-      display: flex; align-items: center; justify-content: center;
-      color: var(--text-muted); font-size: 0.8rem;
-    }
-  </style>
-</head>
-<body>
-  <div class="container" x-data="bellhop()">
-
-    <!-- Toast -->
-    <template x-if="toast.show">
-      <div class="toast" :class="toast.type" x-text="toast.message"
-           x-init="setTimeout(() => toast.show = false, 3000)"></div>
-    </template>
-
-    <!-- Logged-out view -->
-    <template x-if="!user">
-      <div class="login-card">
-        <h2>Bellhop</h2>
-        <p>Sign in with your Matrix account to request media.</p>
-        <div x-show="loginError" class="error-msg" x-text="loginError"></div>
-        <form @submit.prevent="login">
-          <div class="form-group">
-            <label for="username">Matrix username</label>
-            <input id="username" type="text" x-model="loginForm.username"
-                   placeholder="@user:example.com" required autocomplete="username">
-          </div>
-          <div class="form-group">
-            <label for="password">Password</label>
-            <input id="password" type="password" x-model="loginForm.password"
-                   required autocomplete="current-password">
-          </div>
-          <button type="submit" class="btn btn-primary" style="width:100%;margin-top:0.5rem"
-                  :disabled="loggingIn">
-            <span x-show="!loggingIn">Sign in</span>
-            <span x-show="loggingIn"><span class="spinner"></span></span>
-          </button>
-        </form>
-      </div>
-    </template>
-
-    <!-- Logged-in view -->
-    <template x-if="user">
-      <div>
-        <header>
-          <h1><span>Bellhop</span></h1>
-          <div style="display:flex;align-items:center;gap:0.75rem">
-            <span style="font-size:0.85rem;color:var(--text-muted)" x-text="user"></span>
-            <button class="btn btn-ghost btn-sm" @click="logout">Sign out</button>
-          </div>
-        </header>
-
-        <!-- Media type tabs -->
-        <div class="media-tabs">
-          <template x-for="t in mediaTypes" :key="t.value">
-            <button class="media-tab" :class="mediaType === t.value && 'active'"
-                    @click="mediaType = t.value" x-text="t.label"></button>
-          </template>
-        </div>
-
-        <!-- Search -->
-        <div class="search-bar">
-          <input class="search-input" type="text" x-model="searchTerm"
-                 @keydown.enter="search" placeholder="Search for a title...">
-          <button class="btn btn-primary" @click="search" :disabled="searching">
-            <span x-show="!searching">Search</span>
-            <span x-show="searching"><span class="spinner"></span></span>
-          </button>
-        </div>
-
-        <!-- Results -->
-        <div x-show="results.length > 0" class="results-grid">
-          <template x-for="(item, idx) in results" :key="idx">
-            <div class="result-card">
-              <template x-if="posterUrl(item)">
-                <img :src="posterUrl(item)" :alt="itemTitle(item)" loading="lazy">
-              </template>
-              <template x-if="!posterUrl(item)">
-                <div class="no-poster">No image</div>
-              </template>
-              <div class="info">
-                <div class="title" x-text="itemTitle(item)"></div>
-                <div class="year" x-text="itemSubtitle(item)"></div>
-                <button class="btn btn-primary btn-sm"
-                        @click="requestItem(item)" :disabled="item._requesting">
-                  <span x-show="!item._requesting">Request</span>
-                  <span x-show="item._requesting"><span class="spinner"></span></span>
-                </button>
-              </div>
-            </div>
-          </template>
-        </div>
-
-        <div x-show="searched && results.length === 0" class="placeholder">
-          No results found. Try a different search.
-        </div>
-        <div x-show="!searched && results.length === 0" class="placeholder">
-          Select a media type and search for something to request.
-        </div>
-      </div>
-    </template>
-  </div>
-
-  <script>
-    function bellhop() {
-      return {
-        user: null,
-        loginForm: { username: '', password: '' },
-        loginError: '',
-        loggingIn: false,
-        mediaType: 'movie',
-        mediaTypes: [
-          { value: 'movie', label: 'Movie' },
-          { value: 'tv', label: 'TV Show' },
-          { value: 'music', label: 'Music' },
-        ],
-        searchTerm: '',
-        results: [],
-        searched: false,
-        searching: false,
-        toast: { show: false, type: 'success', message: '' },
-
-        async init() {
-          try {
-            const res = await fetch('/auth/me');
-            if (res.ok) {
-              const data = await res.json();
-              this.user = data.user_id;
-            }
-          } catch {}
-        },
-
-        async login() {
-          this.loginError = '';
-          this.loggingIn = true;
-          try {
-            const res = await fetch('/auth/login', {
-              method: 'POST',
-              headers: { 'Content-Type': 'application/json' },
-              body: JSON.stringify({
-                username: this.loginForm.username,
-                password: this.loginForm.password,
-              }),
-            });
-            const data = await res.json();
-            if (res.ok) {
-              this.user = data.user_id;
-              this.loginForm = { username: '', password: '' };
-            } else {
-              this.loginError = data.error || 'Login failed';
-            }
-          } catch {
-            this.loginError = 'Network error';
-          } finally {
-            this.loggingIn = false;
-          }
-        },
-
-        async logout() {
-          try { await fetch('/auth/logout', { method: 'POST' }); } catch {}
-          this.user = null;
-          this.results = [];
-          this.searched = false;
-        },
-
-        async search() {
-          if (!this.searchTerm.trim()) return;
-          this.searching = true;
-          this.results = [];
-          this.searched = false;
-          try {
-            const res = await fetch(
-              `/search/${this.mediaType}?term=${encodeURIComponent(this.searchTerm)}`
-            );
-            if (res.ok) {
-              this.results = (await res.json()).map(r => ({ ...r, _requesting: false }));
-            } else {
-              const d = await res.json();
-              this.showToast('error', d.error || 'Search failed');
-            }
-          } catch {
-            this.showToast('error', 'Network error');
-          } finally {
-            this.searching = true; // keep spinner briefly
-            this.searched = true;
-            this.searching = false;
-          }
-        },
-
-        async requestItem(item) {
-          item._requesting = true;
-          try {
-            const res = await fetch(`/request/${this.mediaType}`, {
-              method: 'POST',
-              headers: { 'Content-Type': 'application/json' },
-              body: JSON.stringify(item),
-            });
-            const data = await res.json();
-            if (res.ok) {
-              this.showToast('success', data.message || 'Requested!');
-            } else {
-              this.showToast('error', data.error || 'Request failed');
-            }
-          } catch {
-            this.showToast('error', 'Network error');
-          } finally {
-            item._requesting = false;
-          }
-        },
-
-        posterUrl(item) {
-          return item.remotePoster || '';
-        },
-
-        itemTitle(item) {
-          return item.title || item.artistName || '—';
-        },
-
-        itemSubtitle(item) {
-          if (item.year) return String(item.year);
-          if (item.foreignArtistId) return item.foreignArtistId;
-          return '';
-        },
-
-        showToast(type, message) {
-          this.toast = { show: true, type, message };
-          setTimeout(() => { this.toast.show = false; }, 3000);
-        },
-      };
-    }
-  </script>
-</body>
-</html>

go.mod

@@ -0,0 +1,27 @@
+module bellhop
+
+go 1.25.0
+
+require (
+	gopkg.in/yaml.v3 v3.0.1
+	maunium.net/go/mautrix v0.28.0
+)
+
+require (
+	filippo.io/edwards25519 v1.2.0 // indirect
+	github.com/mattn/go-colorable v0.1.14 // indirect
+	github.com/mattn/go-isatty v0.0.20 // indirect
+	github.com/mattn/go-sqlite3 v1.14.44 // indirect
+	github.com/petermattis/goid v0.0.0-20260330135022-df67b199bc81 // indirect
+	github.com/rs/zerolog v1.35.1 // indirect
+	github.com/tidwall/gjson v1.19.0 // indirect
+	github.com/tidwall/match v1.1.1 // indirect
+	github.com/tidwall/pretty v1.2.1 // indirect
+	github.com/tidwall/sjson v1.2.5 // indirect
+	go.mau.fi/util v0.9.9 // indirect
+	golang.org/x/crypto v0.51.0 // indirect
+	golang.org/x/exp v0.0.0-20260508232706-74f9aab9d74a // indirect
+	golang.org/x/net v0.54.0 // indirect
+	golang.org/x/sys v0.44.0 // indirect
+	golang.org/x/text v0.37.0 // indirect
+)

go.sum

@@ -0,0 +1,49 @@
+filippo.io/edwards25519 v1.2.0 h1:crnVqOiS4jqYleHd9vaKZ+HKtHfllngJIiOpNpoJsjo=
+filippo.io/edwards25519 v1.2.0/go.mod h1:xzAOLCNug/yB62zG1bQ8uziwrIqIuxhctzJT18Q77mc=
+github.com/DATA-DOG/go-sqlmock v1.5.2 h1:OcvFkGmslmlZibjAjaHm3L//6LiuBgolP7OputlJIzU=
+github.com/DATA-DOG/go-sqlmock v1.5.2/go.mod h1:88MAG/4G7SMwSE3CeA0ZKzrT5CiOU3OJ+JlNzwDqpNU=
+github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
+github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/mattn/go-colorable v0.1.14 h1:9A9LHSqF/7dyVVX6g0U9cwm9pG3kP9gSzcuIPHPsaIE=
+github.com/mattn/go-colorable v0.1.14/go.mod h1:6LmQG8QLFO4G5z1gPvYEzlUgJ2wF+stgPZH1UqBm1s8=
+github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
+github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
+github.com/mattn/go-sqlite3 v1.14.44 h1:3VSe+xafpbzsLbdr2AWlAZk9yRHiBhTBakioXaCKTF8=
+github.com/mattn/go-sqlite3 v1.14.44/go.mod h1:pjEuOr8IwzLJP2MfGeTb0A35jauH+C2kbHKBr7yXKVQ=
+github.com/petermattis/goid v0.0.0-20260330135022-df67b199bc81 h1:WDsQxOJDy0N1VRAjXLpi8sCEZRSGarLWQevDxpTBRrM=
+github.com/petermattis/goid v0.0.0-20260330135022-df67b199bc81/go.mod h1:pxMtw7cyUw6B2bRH0ZBANSPg+AoSud1I1iyJHI69jH4=
+github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
+github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/rs/zerolog v1.35.1 h1:m7xQeoiLIiV0BCEY4Hs+j2NG4Gp2o2KPKmhnnLiazKI=
+github.com/rs/zerolog v1.35.1/go.mod h1:EjML9kdfa/RMA7h/6z6pYmq1ykOuA8/mjWaEvGI+jcw=
+github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U=
+github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
+github.com/tidwall/gjson v1.14.2/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=
+github.com/tidwall/gjson v1.19.0 h1:xwxm7n691Uf3u5OFjzngavjGTh55KX5q/9w9xHW88JU=
+github.com/tidwall/gjson v1.19.0/go.mod h1:V37/opeE/JbLUOfH0QTXiNez2l0RUjYUhpT4szFQAfc=
+github.com/tidwall/match v1.1.1 h1:+Ho715JplO36QYgwN9PGYNhgZvoUSc9X2c80KVTi+GA=
+github.com/tidwall/match v1.1.1/go.mod h1:eRSPERbgtNPcGhD8UCthc6PmLEQXEWd3PRB5JTxsfmM=
+github.com/tidwall/pretty v1.2.0/go.mod h1:ITEVvHYasfjBbM0u2Pg8T2nJnzm8xPwvNhhsoaGGjNU=
+github.com/tidwall/pretty v1.2.1 h1:qjsOFOWWQl+N3RsoF5/ssm1pHmJJwhjlSbZ51I6wMl4=
+github.com/tidwall/pretty v1.2.1/go.mod h1:ITEVvHYasfjBbM0u2Pg8T2nJnzm8xPwvNhhsoaGGjNU=
+github.com/tidwall/sjson v1.2.5 h1:kLy8mja+1c9jlljvWTlSazM7cKDRfJuR/bOJhcY5NcY=
+github.com/tidwall/sjson v1.2.5/go.mod h1:Fvgq9kS/6ociJEDnK0Fk1cpYF4FIW6ZF7LAe+6jwd28=
+go.mau.fi/util v0.9.9 h1:ujDeXCo07HBor5oQLyO1tHklupmqVmPgasc53d7q/NE=
+go.mau.fi/util v0.9.9/go.mod h1:pqt4Vcrt+5gcH/CgrHZg11qSx+b34o6mknGzOEA6waY=
+golang.org/x/crypto v0.51.0 h1:IBPXwPfKxY7cWQZ38ZCIRPI50YLeevDLlLnyC5wRGTI=
+golang.org/x/crypto v0.51.0/go.mod h1:8AdwkbraGNABw2kOX6YFPs3WM22XqI4EXEd8g+x7Oc8=
+golang.org/x/exp v0.0.0-20260508232706-74f9aab9d74a h1:+3jdDGGB8NGb1Zktc737jlt3/A5f6UlwSzmvqUuufxw=
+golang.org/x/exp v0.0.0-20260508232706-74f9aab9d74a/go.mod h1:d2fgXJLVs4dYDHUk5lwMIfzRzSrWCfGZb0ZqeLa/Vcw=
+golang.org/x/net v0.54.0 h1:2zJIZAxAHV/OHCDTCOHAYehQzLfSXuf/5SoL/Dv6w/w=
+golang.org/x/net v0.54.0/go.mod h1:Sj4oj8jK6XmHpBZU/zWHw3BV3abl4Kvi+Ut7cQcY+cQ=
+golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.44.0 h1:ildZl3J4uzeKP07r2F++Op7E9B29JRUy+a27EibtBTQ=
+golang.org/x/sys v0.44.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw=
+golang.org/x/text v0.37.0 h1:Cqjiwd9eSg8e0QAkyCaQTNHFIIzWtidPahFWR83rTrc=
+golang.org/x/text v0.37.0/go.mod h1:a5sjxXGs9hsn/AJVwuElvCAo9v8QYLzvavO5z2PiM38=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
+gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+maunium.net/go/mautrix v0.28.0 h1:vBakLzf8MAdfED3NzAKiMeKQbc3AQ4EAS03NC+TVMXQ=
+maunium.net/go/mautrix v0.28.0/go.mod h1:/a9A7LGaqb9B3nho4tLd28n0EPcCdwpm2dxkxkLLgh0=

internal/config/config.go

@@ -0,0 +1,127 @@
+package config
+
+import (
+	"fmt"
+	"log/slog"
+	"os"
+	"regexp"
+
+	"gopkg.in/yaml.v3"
+)
+
+var envBracketRe = regexp.MustCompile(`\$\{([^}]+)\}`)
+
+type Config struct {
+	Matrix   MatrixConfig   `yaml:"matrix"`
+	Services ServicesConfig `yaml:"services"`
+}
+
+type MatrixConfig struct {
+	Homeserver  string   `yaml:"homeserver"`
+	UserID      string   `yaml:"user_id"`
+	Password    string   `yaml:"password"`
+	PickleKey   string   `yaml:"pickle_key"`
+	DisplayName string   `yaml:"display_name"`
+	DataDir     string   `yaml:"data_dir"`
+	CommandPrefix string `yaml:"command_prefix"`
+	// AllowedRooms is the set of room IDs the bot listens for commands in.
+	// Messages in any other room are ignored.
+	AllowedRooms []string `yaml:"allowed_rooms"`
+}
+
+type ServicesConfig struct {
+	Radarr *ArrConfig `yaml:"radarr"`
+	Sonarr *ArrConfig `yaml:"sonarr"`
+	Lidarr *ArrConfig `yaml:"lidarr"`
+}
+
+type ArrConfig struct {
+	URL              string `yaml:"url"`
+	APIKey           string `yaml:"api_key"`
+	QualityProfileID int    `yaml:"quality_profile_id"`
+	RootFolder       string `yaml:"root_folder"`
+}
+
+func Load(path string) (*Config, error) {
+	data, err := os.ReadFile(path)
+	if err != nil {
+		return nil, fmt.Errorf("read config: %w", err)
+	}
+
+	expanded := envBracketRe.ReplaceAllStringFunc(string(data), func(match string) string {
+		varName := match[2 : len(match)-1]
+		val := os.Getenv(varName)
+		if val == "" {
+			slog.Warn("config: env var referenced but not set", "var", varName)
+		}
+		return val
+	})
+
+	var cfg Config
+	if err := yaml.Unmarshal([]byte(expanded), &cfg); err != nil {
+		return nil, fmt.Errorf("parse config: %w", err)
+	}
+
+	cfg.applyDefaults()
+
+	if err := cfg.validate(); err != nil {
+		return nil, fmt.Errorf("validate config: %w", err)
+	}
+
+	return &cfg, nil
+}
+
+func (c *Config) validate() error {
+	if c.Matrix.Homeserver == "" {
+		return fmt.Errorf("matrix.homeserver is required")
+	}
+	if c.Matrix.UserID == "" {
+		return fmt.Errorf("matrix.user_id is required")
+	}
+	if c.Matrix.Password == "" {
+		return fmt.Errorf("matrix.password is required")
+	}
+	if len(c.Matrix.AllowedRooms) == 0 {
+		return fmt.Errorf("matrix.allowed_rooms must have at least one entry")
+	}
+	if c.Services.Radarr == nil && c.Services.Sonarr == nil && c.Services.Lidarr == nil {
+		return fmt.Errorf("at least one of services.radarr/sonarr/lidarr must be configured")
+	}
+	for name, svc := range map[string]*ArrConfig{
+		"radarr": c.Services.Radarr,
+		"sonarr": c.Services.Sonarr,
+		"lidarr": c.Services.Lidarr,
+	} {
+		if svc == nil {
+			continue
+		}
+		if svc.URL == "" {
+			return fmt.Errorf("services.%s.url is required when service is set", name)
+		}
+		if svc.APIKey == "" {
+			return fmt.Errorf("services.%s.api_key is required when service is set", name)
+		}
+		if svc.RootFolder == "" {
+			return fmt.Errorf("services.%s.root_folder is required when service is set", name)
+		}
+		if svc.QualityProfileID == 0 {
+			return fmt.Errorf("services.%s.quality_profile_id is required when service is set", name)
+		}
+	}
+	return nil
+}
+
+func (c *Config) applyDefaults() {
+	if c.Matrix.DataDir == "" {
+		c.Matrix.DataDir = "./data"
+	}
+	if c.Matrix.DisplayName == "" {
+		c.Matrix.DisplayName = "Bellhop"
+	}
+	if c.Matrix.PickleKey == "" {
+		c.Matrix.PickleKey = "bellhop_pickle_key"
+	}
+	if c.Matrix.CommandPrefix == "" {
+		c.Matrix.CommandPrefix = "!"
+	}
+}

internal/matrix/client.go

@@ -0,0 +1,316 @@
+package matrix
+
+import (
+	"context"
+	"encoding/json"
+	"fmt"
+	"log/slog"
+	"net/http"
+	"os"
+	"path/filepath"
+	"sync"
+	"time"
+
+	"bellhop/internal/config"
+
+	"maunium.net/go/mautrix"
+	"maunium.net/go/mautrix/crypto/cryptohelper"
+	"maunium.net/go/mautrix/event"
+	"maunium.net/go/mautrix/id"
+)
+
+// MessageHandler is called when a text message is received in an allowlisted room.
+type MessageHandler func(roomID id.RoomID, eventID id.EventID, sender id.UserID, body string)
+
+type deviceInfo struct {
+	AccessToken string `json:"access_token"`
+	DeviceID    string `json:"device_id"`
+	UserID      string `json:"user_id"`
+}
+
+type Client struct {
+	mx           *mautrix.Client
+	allowedRooms map[id.RoomID]struct{}
+	userID       id.UserID
+	cfg          config.MatrixConfig
+	crypto       *cryptohelper.CryptoHelper
+
+	mu         sync.RWMutex
+	onMessage  MessageHandler
+	cancelSync context.CancelFunc
+}
+
+// New creates a Matrix client with password login, device persistence, and E2EE.
+func New(cfg config.MatrixConfig) (*Client, error) {
+	if err := os.MkdirAll(cfg.DataDir, 0o755); err != nil {
+		return nil, fmt.Errorf("create data dir: %w", err)
+	}
+
+	devicePath := filepath.Join(cfg.DataDir, "device.json")
+
+	device, err := loadDevice(devicePath)
+	if err != nil {
+		slog.Info("no existing device found, will login fresh")
+	}
+
+	var mx *mautrix.Client
+
+	if device != nil {
+		if isTokenValid(cfg.Homeserver, device.AccessToken) {
+			slog.Info("existing device credentials valid", "device_id", device.DeviceID)
+			mx, err = mautrix.NewClient(cfg.Homeserver, id.UserID(device.UserID), device.AccessToken)
+			if err != nil {
+				return nil, fmt.Errorf("create client with existing token: %w", err)
+			}
+			mx.DeviceID = id.DeviceID(device.DeviceID)
+		} else {
+			slog.Warn("existing device credentials invalid, logging in again")
+			device = nil
+		}
+	}
+
+	if device == nil {
+		mx, err = mautrix.NewClient(cfg.Homeserver, "", "")
+		if err != nil {
+			return nil, fmt.Errorf("create client: %w", err)
+		}
+
+		resp, err := mx.Login(context.Background(), &mautrix.ReqLogin{
+			Type: mautrix.AuthTypePassword,
+			Identifier: mautrix.UserIdentifier{
+				Type: mautrix.IdentifierTypeUser,
+				User: cfg.UserID,
+			},
+			Password:                 cfg.Password,
+			InitialDeviceDisplayName: cfg.DisplayName,
+		})
+		if err != nil {
+			return nil, fmt.Errorf("login: %w", err)
+		}
+
+		mx.AccessToken = resp.AccessToken
+		mx.UserID = resp.UserID
+		mx.DeviceID = resp.DeviceID
+
+		device = &deviceInfo{
+			AccessToken: resp.AccessToken,
+			DeviceID:    string(resp.DeviceID),
+			UserID:      string(resp.UserID),
+		}
+		if err := saveDevice(devicePath, device); err != nil {
+			slog.Warn("failed to save device info", "err", err)
+		}
+
+		slog.Info("logged in successfully", "user_id", resp.UserID, "device_id", resp.DeviceID)
+	}
+
+	cryptoDBPath := filepath.Join(cfg.DataDir, "crypto.db")
+	ch, err := cryptohelper.NewCryptoHelper(mx, []byte(cfg.PickleKey), cryptoDBPath)
+	if err != nil {
+		return nil, fmt.Errorf("init crypto helper: %w", err)
+	}
+
+	// Surface decrypt failures — the default silent no-op hides missing-megolm-session
+	// errors, which look like the bot ignoring commands.
+	ch.DecryptErrorCallback = func(evt *event.Event, err error) {
+		slog.Warn("matrix: failed to decrypt incoming event",
+			"room", evt.RoomID, "event_id", evt.ID, "sender", evt.Sender, "err", err)
+	}
+
+	ch.LoginAs = &mautrix.ReqLogin{
+		Type: mautrix.AuthTypePassword,
+		Identifier: mautrix.UserIdentifier{
+			Type: mautrix.IdentifierTypeUser,
+			User: cfg.UserID,
+		},
+		Password:                 cfg.Password,
+		InitialDeviceDisplayName: cfg.DisplayName,
+	}
+
+	if err := ch.Init(context.Background()); err != nil {
+		return nil, fmt.Errorf("crypto helper init: %w", err)
+	}
+
+	mx.Crypto = ch
+
+	mach := ch.Machine()
+	existingKeys, err := mach.GetOwnCrossSigningPublicKeys(context.Background())
+	if err != nil {
+		slog.Warn("cross-signing: failed to fetch existing keys", "err", err)
+	}
+	if existingKeys == nil || existingKeys.MasterKey == "" {
+		_, _, err = mach.GenerateAndUploadCrossSigningKeys(context.Background(), func(ui *mautrix.RespUserInteractive) interface{} {
+			return map[string]interface{}{
+				"type": mautrix.AuthTypePassword,
+				"identifier": map[string]interface{}{
+					"type": mautrix.IdentifierTypeUser,
+					"user": cfg.UserID,
+				},
+				"password": cfg.Password,
+				"session":  ui.Session,
+			}
+		}, "")
+		if err != nil {
+			slog.Warn("cross-signing: key upload failed", "err", err)
+		} else {
+			slog.Info("cross-signing: keys uploaded")
+		}
+		if err := mach.SignOwnDevice(context.Background(), mach.OwnIdentity()); err != nil {
+			slog.Warn("cross-signing: sign own device failed", "err", err)
+		}
+		if err := mach.SignOwnMasterKey(context.Background()); err != nil {
+			slog.Warn("cross-signing: sign master key failed", "err", err)
+		}
+	} else {
+		slog.Info("cross-signing: already configured, skipping bootstrap")
+	}
+
+	slog.Info("E2EE initialized", "device_id", mx.DeviceID)
+
+	allowed := make(map[id.RoomID]struct{}, len(cfg.AllowedRooms))
+	for _, r := range cfg.AllowedRooms {
+		allowed[id.RoomID(r)] = struct{}{}
+	}
+
+	return &Client{
+		mx:           mx,
+		allowedRooms: allowed,
+		userID:       mx.UserID,
+		cfg:          cfg,
+		crypto:       ch,
+	}, nil
+}
+
+// SetMessageHandler registers a callback for text messages in allowlisted rooms.
+func (c *Client) SetMessageHandler(fn MessageHandler) {
+	c.mu.Lock()
+	defer c.mu.Unlock()
+	c.onMessage = fn
+}
+
+// Start begins the Matrix sync loop in the background.
+func (c *Client) Start(ctx context.Context) {
+	syncer := c.mx.Syncer.(*mautrix.DefaultSyncer)
+
+	syncer.OnEventType(event.EventMessage, func(ctx context.Context, evt *event.Event) {
+		if evt.Sender == c.userID {
+			return
+		}
+		if _, ok := c.allowedRooms[evt.RoomID]; !ok {
+			return
+		}
+		msg := evt.Content.AsMessage()
+		if msg == nil || msg.MsgType != event.MsgText {
+			return
+		}
+		c.mu.RLock()
+		handler := c.onMessage
+		c.mu.RUnlock()
+		if handler != nil {
+			handler(evt.RoomID, evt.ID, evt.Sender, msg.Body)
+		}
+	})
+
+	// Auto-join on invite to any room — allowlist still gates message handling.
+	syncer.OnEventType(event.StateMember, func(ctx context.Context, evt *event.Event) {
+		if evt.GetStateKey() == string(c.userID) && evt.Content.AsMember().Membership == event.MembershipInvite {
+			if _, err := c.mx.JoinRoomByID(ctx, evt.RoomID); err != nil {
+				slog.Error("failed to auto-join room", "room", evt.RoomID, "err", err)
+			} else {
+				slog.Info("auto-joined room", "room", evt.RoomID)
+			}
+		}
+	})
+
+	syncCtx, cancel := context.WithCancel(ctx)
+	c.cancelSync = cancel
+
+	go func() {
+		for {
+			err := c.mx.SyncWithContext(syncCtx)
+			if syncCtx.Err() != nil {
+				return
+			}
+			if err != nil {
+				slog.Error("matrix sync stopped, restarting in 5s", "err", err)
+			} else {
+				slog.Warn("matrix sync returned without error, restarting in 5s")
+			}
+			select {
+			case <-time.After(5 * time.Second):
+			case <-syncCtx.Done():
+				return
+			}
+		}
+	}()
+}
+
+// Stop halts the sync loop and closes the crypto store.
+func (c *Client) Stop() {
+	if c.cancelSync != nil {
+		c.cancelSync()
+	}
+	if c.crypto != nil {
+		if err := c.crypto.Close(); err != nil {
+			slog.Error("failed to close crypto helper", "err", err)
+		}
+	}
+}
+
+// PostThreadedReply sends a plain/HTML message into the thread rooted at rootEventID.
+// IsFallingBack + m.in_reply_to gives non-thread-aware clients a sensible quoted reply.
+func (c *Client) PostThreadedReply(roomID id.RoomID, rootEventID id.EventID, plain, htmlBody string) error {
+	ctx, cancel := context.WithTimeout(context.Background(), 30*time.Second)
+	defer cancel()
+
+	content := &event.MessageEventContent{
+		MsgType:       event.MsgText,
+		Body:          plain,
+		Format:        event.FormatHTML,
+		FormattedBody: htmlBody,
+		RelatesTo: &event.RelatesTo{
+			Type:          event.RelThread,
+			EventID:       rootEventID,
+			InReplyTo:     &event.InReplyTo{EventID: rootEventID},
+			IsFallingBack: true,
+		},
+	}
+	_, err := c.mx.SendMessageEvent(ctx, roomID, event.EventMessage, content)
+	return err
+}
+
+func loadDevice(path string) (*deviceInfo, error) {
+	data, err := os.ReadFile(path)
+	if err != nil {
+		return nil, err
+	}
+	var info deviceInfo
+	if err := json.Unmarshal(data, &info); err != nil {
+		return nil, err
+	}
+	return &info, nil
+}
+
+func saveDevice(path string, info *deviceInfo) error {
+	data, err := json.MarshalIndent(info, "", "  ")
+	if err != nil {
+		return err
+	}
+	return os.WriteFile(path, data, 0o600)
+}
+
+func isTokenValid(homeserver, accessToken string) bool {
+	req, err := http.NewRequest("GET", homeserver+"/_matrix/client/v3/account/whoami", nil)
+	if err != nil {
+		return false
+	}
+	req.Header.Set("Authorization", "Bearer "+accessToken)
+
+	client := &http.Client{Timeout: 10 * time.Second}
+	resp, err := client.Do(req)
+	if err != nil {
+		return false
+	}
+	defer resp.Body.Close()
+	return resp.StatusCode == http.StatusOK
+}

requirements.txt

@@ -1,9 +0,0 @@
-fastapi==0.115.6
-uvicorn[standard]==0.34.0
-httpx==0.28.1
-aiosqlite==0.20.0
-python-dotenv==1.0.1
-matrix-nio==0.24.0
-slowapi==0.1.9
-jinja2==3.1.5
-itsdangerous==2.2.0