mirror of
https://github.com/kuhyx/signal-bot.git
synced 2026-11-10 20: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
114 lines
3.5 KiB
Python
114 lines
3.5 KiB
Python
# Copyright (c) 2026 Krzysztof Rudnicki. MIT licence.
|
|
"""Command wiring, the daily report, and the listen loop."""
|
|
|
|
from __future__ import annotations
|
|
|
|
import datetime as dt
|
|
from dataclasses import replace
|
|
from typing import TYPE_CHECKING
|
|
|
|
import httpx
|
|
|
|
from signal_bot.bot import Bot, build_bot, now_local
|
|
from signal_bot.liveness import Liveness
|
|
from signal_bot.stats.events import MessageEvent
|
|
from signal_bot.stats.periods import WARSAW
|
|
from tests import pack_fixture
|
|
from tests.conftest import (
|
|
WATCHED_GROUP,
|
|
envelope,
|
|
mock_client,
|
|
)
|
|
|
|
if TYPE_CHECKING:
|
|
from pathlib import Path
|
|
|
|
from signal_bot.config import Config
|
|
from signal_bot.discovery import GroupDirectory
|
|
from signal_bot.store import Store
|
|
from signal_bot.transport_fake import FakeTransport
|
|
|
|
|
|
# The report covers the day it runs on, so the tests freeze "now" and write
|
|
# their events into it.
|
|
NOW = dt.datetime(2026, 9, 2, 21, 37, tzinfo=WARSAW)
|
|
YESTERDAY = "2026-09-01"
|
|
|
|
|
|
def _bot(config: Config, store: Store, transport: FakeTransport, directory: GroupDirectory) -> Bot:
|
|
client = mock_client(lambda r: httpx.Response(200))
|
|
return build_bot(
|
|
config, client, store, transport, directory, Liveness(config, client), clock=lambda: NOW
|
|
)
|
|
|
|
|
|
def wrote(
|
|
store: Store, group_id: str, uuid: str, name: str, times: int, *, day: str = YESTERDAY
|
|
) -> None:
|
|
"""Put ``times`` messages from one person into one group on one day."""
|
|
for i in range(times):
|
|
store.events.record(
|
|
MessageEvent(
|
|
group_id=group_id,
|
|
uuid=uuid,
|
|
display_name=name,
|
|
sent_at_ms=i + 1,
|
|
day=day,
|
|
local_hour=12,
|
|
char_len=5,
|
|
)
|
|
)
|
|
store.events.note_person(group_id, uuid, name, "", day)
|
|
|
|
|
|
def test_now_local_is_timezone_aware() -> None:
|
|
assert now_local().tzinfo is not None
|
|
|
|
|
|
def test_build_bot_registers_the_animal_commands(
|
|
config: Config, store: Store, transport: FakeTransport, directory: GroupDirectory
|
|
) -> None:
|
|
bot = _bot(config, store, transport, directory)
|
|
assert bot.dispatcher.registry.resolve("!cat") is not None
|
|
assert bot.dispatcher.registry.resolve("!pies") is not None
|
|
|
|
|
|
async def test_listen_dispatches_every_frame(
|
|
config: Config, store: Store, transport: FakeTransport, directory: GroupDirectory
|
|
) -> None:
|
|
transport.queue([envelope(text="hello", group_id=WATCHED_GROUP)])
|
|
await _bot(config, store, transport, directory).listen()
|
|
row = store.events.connection.execute(
|
|
"SELECT COUNT(*) AS n FROM message_events WHERE group_id = ?", (WATCHED_GROUP,)
|
|
).fetchone()
|
|
assert row["n"] == 1
|
|
|
|
|
|
def test_an_album_is_wired_up_only_where_there_is_one(
|
|
tmp_path: Path,
|
|
config: Config,
|
|
store: Store,
|
|
transport: FakeTransport,
|
|
directory: GroupDirectory,
|
|
) -> None:
|
|
"""Absent by default; present, and scoped, when the config names a pack."""
|
|
client = mock_client(lambda r: httpx.Response(200))
|
|
liveness = Liveness(config, client)
|
|
|
|
plain = build_bot(config, client, store, transport, directory, liveness)
|
|
assert plain.dispatcher.registry.resolve("!alfa") is None
|
|
|
|
root = pack_fixture.build(tmp_path / "pack")
|
|
with_album = build_bot(
|
|
replace(config, photo_pack_dirs=(root,)),
|
|
client,
|
|
store,
|
|
transport,
|
|
directory,
|
|
liveness,
|
|
)
|
|
command = with_album.dispatcher.registry.resolve("!alfa")
|
|
assert command is not None
|
|
assert command.name == "pack:p1"
|
|
assert command.groups == frozenset({WATCHED_GROUP})
|