mirror of
https://github.com/kuhyx/signal-bot.git
synced 2026-11-10 21:37:03 +01:00
Krzysztof kuhy Rudnicki
48957a105d
Some checks are pending
CI / check (push) Waiting to run
You asked for !add_photo in testbot without the real album being reachable there. One album cannot do that: its people.json "groups" list *is* the privacy guarantee, so making the commands exist in a second group necessarily makes the real photos postable there. So the bot now loads several albums. PHOTO_PACK_DIR takes a comma-separated list, the spelling GROUP_IDS and TRUSTED_INVITERS already use. Each album carries its own group scope, its own people, its own tags and its own custom labels; they share nothing but the process they run in. That makes trigger collisions between albums legal for the first time, and the registry had to learn it. Two albums are two different sets of people and both may reasonably call somebody "!alfa" -- no message can ever mean both, because a command a group is not scoped to is not a command there at all. So a trigger may be claimed more than once, and DuplicateTriggerError now fires only where the group sets *overlap*. Overlapping albums are refused at startup rather than resolved by registration order: a coin toss about which private album receives a photo is the outcome this whole design exists to prevent. Two consequences worth naming: - registry.resolve() takes an optional group. Without one it still answers "does anything claim this word", which is what pack_add's mint check wants; with one it answers "what runs here", which is what the dispatcher wants. resolve_with_args no longer resolves-then-checks, because with two claimants the first one found may be the wrong group's. - CommandContext moved to signal_bot/context.py to keep registry.py under the 250-line cap. A filing change: that file is "which word runs what", this one is "what the thing that runs may do". DOCS-add-photo.md is likewise a split, not new prose -- DOCS-photo-pack.md had grown past the cap and the ingest path is its own subject now. Verified live: the unit serves both albums, the real group resolves its 13 album commands and testbot its 7, and !losowe / !alfa / !dodaj all fire in testbot through the live dispatcher. 997 tests, 100% branch coverage, 28 e2e scenarios. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01JqqE22jp94B1ypwxppdr1o
82 lines
3.0 KiB
Python
82 lines
3.0 KiB
Python
# Copyright (c) 2026 Krzysztof Rudnicki. MIT licence.
|
|
"""Finding the private album, and the two different ways it can be absent.
|
|
|
|
Split out of test_config.py, which reached the 250-line cap.
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
from typing import TYPE_CHECKING
|
|
|
|
import pytest
|
|
|
|
from signal_bot.config import ConfigError
|
|
from signal_bot.config_env import load_config
|
|
from tests import pack_fixture
|
|
from tests.test_config import BASE_ENV
|
|
|
|
if TYPE_CHECKING:
|
|
from pathlib import Path
|
|
|
|
|
|
def test_an_installation_with_no_album_has_no_pack(tmp_path: Path) -> None:
|
|
"""Which is every machine but one, and every test in this suite."""
|
|
assert load_config(dict(BASE_ENV)).photo_pack_dirs == ()
|
|
|
|
|
|
def test_a_named_album_is_loaded_and_kept(tmp_path: Path, monkeypatch: pytest.MonkeyPatch) -> None:
|
|
root = pack_fixture.build(tmp_path / "pack")
|
|
monkeypatch.setenv("PHOTO_PACK_DIR", str(root))
|
|
assert load_config(dict(BASE_ENV)).photo_pack_dirs == (root,)
|
|
|
|
|
|
def test_a_named_album_that_is_not_there_fails_startup(
|
|
tmp_path: Path, monkeypatch: pytest.MonkeyPatch
|
|
) -> None:
|
|
"""A typo in a path is an answer, not an outage worth retrying."""
|
|
monkeypatch.setenv("PHOTO_PACK_DIR", str(tmp_path / "nowhere"))
|
|
with pytest.raises(ConfigError, match="is not a directory"):
|
|
load_config(dict(BASE_ENV))
|
|
|
|
|
|
def test_a_broken_album_fails_startup_rather_than_every_command(
|
|
tmp_path: Path, monkeypatch: pytest.MonkeyPatch
|
|
) -> None:
|
|
"""Parsed here, where load_config raising exits, not inside a retry loop."""
|
|
root = pack_fixture.build(tmp_path / "pack")
|
|
(root / "people.json").write_text("{}", encoding="utf-8")
|
|
monkeypatch.setenv("PHOTO_PACK_DIR", str(root))
|
|
with pytest.raises(ConfigError, match="defines no commands"):
|
|
load_config(dict(BASE_ENV))
|
|
|
|
|
|
def test_the_album_may_also_be_found_where_systemd_puts_it(
|
|
tmp_path: Path, monkeypatch: pytest.MonkeyPatch
|
|
) -> None:
|
|
pack_fixture.build(tmp_path / "state" / "pack")
|
|
monkeypatch.setenv("STATE_DIRECTORY", str(tmp_path / "state"))
|
|
assert load_config(dict(BASE_ENV)).photo_pack_dirs == (tmp_path / "state" / "pack",)
|
|
|
|
|
|
def test_an_empty_album_directory_is_not_a_crash_loop(
|
|
tmp_path: Path, monkeypatch: pytest.MonkeyPatch
|
|
) -> None:
|
|
"""The tagger creates the directory before the manifest exists.
|
|
|
|
With Restart=always, failing on a directory somebody merely created would
|
|
put the unit into a restart loop -- so the implicit path is a hint, and
|
|
only a pack named outright is allowed to fail startup.
|
|
"""
|
|
(tmp_path / "share" / "signal-bot" / "pack" / "media").mkdir(parents=True)
|
|
monkeypatch.setenv("XDG_DATA_HOME", str(tmp_path / "share"))
|
|
assert load_config(dict(BASE_ENV)).photo_pack_dirs == ()
|
|
|
|
|
|
def test_a_named_album_with_no_manifest_fails_startup(
|
|
tmp_path: Path, monkeypatch: pytest.MonkeyPatch
|
|
) -> None:
|
|
(tmp_path / "pack").mkdir()
|
|
monkeypatch.setenv("PHOTO_PACK_DIR", str(tmp_path / "pack"))
|
|
with pytest.raises(ConfigError, match=r"has no people\.json"):
|
|
load_config(dict(BASE_ENV))
|