mirror of
https://github.com/kuhyx/signal-bot.git
synced 2026-11-10 20:27:17 +01:00
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
207 lines
7.0 KiB
Python
207 lines
7.0 KiB
Python
# Copyright (c) 2026 Krzysztof Rudnicki. MIT licence.
|
|
"""Routing: scoping, counting, dispatch and error containment."""
|
|
|
|
from __future__ import annotations
|
|
|
|
import datetime as dt
|
|
from typing import TYPE_CHECKING
|
|
|
|
import pytest
|
|
|
|
from signal_bot.dispatcher import Dispatcher
|
|
from signal_bot.registry import CommandRegistry
|
|
from tests.conftest import OTHER_GROUP, SECOND_GROUP, WATCHED_GROUP, envelope
|
|
|
|
if TYPE_CHECKING:
|
|
from signal_bot.config import Config
|
|
from signal_bot.context import CommandContext
|
|
from signal_bot.discovery import GroupDirectory
|
|
from signal_bot.store import Store
|
|
from signal_bot.transport_fake import FakeTransport
|
|
|
|
NOW = dt.datetime(2026, 8, 29, 12, 0, tzinfo=dt.UTC)
|
|
|
|
|
|
def counted(store: Store, group_id: str = WATCHED_GROUP) -> int:
|
|
"""How many events one group holds."""
|
|
row = store.events.connection.execute(
|
|
"SELECT COUNT(*) AS n FROM message_events WHERE group_id = ?", (group_id,)
|
|
).fetchone()
|
|
return int(row["n"])
|
|
|
|
|
|
@pytest.fixture
|
|
def runs() -> list[str]:
|
|
return []
|
|
|
|
|
|
@pytest.fixture
|
|
def registry(runs: list[str]) -> CommandRegistry:
|
|
async def handler(ctx: CommandContext) -> None:
|
|
runs.append(ctx.command_name)
|
|
|
|
reg = CommandRegistry()
|
|
reg.register("cat", ["!cat"], handler, "cat description")
|
|
return reg
|
|
|
|
|
|
@pytest.fixture
|
|
def dispatcher(
|
|
config: Config,
|
|
directory: GroupDirectory,
|
|
registry: CommandRegistry,
|
|
store: Store,
|
|
transport: FakeTransport,
|
|
) -> Dispatcher:
|
|
return Dispatcher(
|
|
config=config,
|
|
directory=directory,
|
|
registry=registry,
|
|
store=store,
|
|
transport=transport,
|
|
clock=lambda: NOW,
|
|
)
|
|
|
|
|
|
async def test_counts_a_plain_group_message(dispatcher: Dispatcher, store: Store) -> None:
|
|
await dispatcher.handle(envelope(text="hello"))
|
|
assert counted(store) == 1
|
|
|
|
|
|
async def test_runs_a_command_and_records_the_use(
|
|
dispatcher: Dispatcher, store: Store, runs: list[str]
|
|
) -> None:
|
|
await dispatcher.handle(envelope(text="!cat"))
|
|
assert runs == ["cat"]
|
|
assert store.last_used(WATCHED_GROUP, "uuid-alice", "cat") == NOW.timestamp()
|
|
assert store.uses_today(WATCHED_GROUP, "uuid-alice", "cat", "2026-08-29") == 1
|
|
|
|
|
|
async def test_direct_messages_are_never_handled(
|
|
dispatcher: Dispatcher, store: Store, runs: list[str], transport: FakeTransport
|
|
) -> None:
|
|
"""A linked device sees every DM on the account; none may reach a handler."""
|
|
await dispatcher.handle(envelope(text="!cat", group_id=None))
|
|
assert runs == []
|
|
assert counted(store) == 0
|
|
assert transport.sent == []
|
|
|
|
|
|
async def test_other_groups_are_never_handled(
|
|
dispatcher: Dispatcher, store: Store, runs: list[str]
|
|
) -> None:
|
|
await dispatcher.handle(envelope(text="!cat", group_id=OTHER_GROUP))
|
|
assert runs == []
|
|
assert counted(store) == 0
|
|
|
|
|
|
async def test_unparseable_frames_are_dropped(dispatcher: Dispatcher, store: Store) -> None:
|
|
await dispatcher.handle("not json")
|
|
assert counted(store) == 0
|
|
|
|
|
|
async def test_the_bots_own_messages_are_not_counted(dispatcher: Dispatcher, store: Store) -> None:
|
|
"""The sync branch is the account's own outgoing traffic."""
|
|
await dispatcher.handle(envelope(text="hi", sync=True))
|
|
assert counted(store) == 0
|
|
|
|
|
|
async def test_stickers_are_counted(dispatcher: Dispatcher, store: Store) -> None:
|
|
await dispatcher.handle(envelope(text=None, extra="sticker"))
|
|
assert counted(store) == 1
|
|
|
|
|
|
async def test_a_caption_less_photo_is_counted(dispatcher: Dispatcher, store: Store) -> None:
|
|
"""Worth zero before 0.1.0. The whole point of the media change."""
|
|
await dispatcher.handle(envelope(text=None, attachments=("image/jpeg",)))
|
|
assert counted(store) == 1
|
|
|
|
|
|
async def test_a_replayed_frame_is_counted_once(dispatcher: Dispatcher, store: Store) -> None:
|
|
"""A reconnect replays frames; the primary key is what absorbs them."""
|
|
frame = envelope(text="hello")
|
|
await dispatcher.handle(frame)
|
|
await dispatcher.handle(frame)
|
|
assert counted(store) == 1
|
|
|
|
|
|
async def test_a_command_is_recorded_as_one(dispatcher: Dispatcher, store: Store) -> None:
|
|
"""is_command is resolved before the write, so it lands on the row."""
|
|
await dispatcher.handle(envelope(text="!cat"))
|
|
row = store.events.connection.execute(
|
|
"SELECT is_command FROM message_events WHERE group_id = ?", (WATCHED_GROUP,)
|
|
).fetchone()
|
|
assert row["is_command"] == 1
|
|
|
|
|
|
async def test_reactions_are_not_counted(dispatcher: Dispatcher, store: Store) -> None:
|
|
await dispatcher.handle(envelope(text="hi", extra="reaction"))
|
|
assert counted(store) == 0
|
|
|
|
|
|
async def test_non_command_text_runs_nothing(dispatcher: Dispatcher, runs: list[str]) -> None:
|
|
await dispatcher.handle(envelope(text="just chatting"))
|
|
assert runs == []
|
|
|
|
|
|
async def test_a_failing_command_does_not_kill_the_loop(
|
|
config: Config, directory: GroupDirectory, store: Store, transport: FakeTransport
|
|
) -> None:
|
|
async def boom(ctx: CommandContext) -> None:
|
|
msg = "upstream is down"
|
|
raise RuntimeError(msg)
|
|
|
|
registry = CommandRegistry()
|
|
registry.register("cat", ["!cat"], boom, "cat description")
|
|
dispatcher = Dispatcher(
|
|
config=config,
|
|
directory=directory,
|
|
registry=registry,
|
|
store=store,
|
|
transport=transport,
|
|
clock=lambda: NOW,
|
|
)
|
|
await dispatcher.handle(envelope(text="!cat"))
|
|
# The use is not recorded, so the cooldown does not punish a failed run.
|
|
assert store.last_used(WATCHED_GROUP, "uuid-alice", "cat") is None
|
|
|
|
|
|
async def test_command_message_is_also_counted(dispatcher: Dispatcher, store: Store) -> None:
|
|
await dispatcher.handle(envelope(text="!cat"))
|
|
assert counted(store) == 1
|
|
|
|
|
|
async def test_a_reply_goes_back_to_the_group_that_asked(
|
|
config: Config, directory: GroupDirectory, store: Store, transport: FakeTransport
|
|
) -> None:
|
|
"""The multi-group invariant: never answer in the other watched group."""
|
|
|
|
async def answer(ctx: CommandContext) -> None:
|
|
await ctx.reply("pong")
|
|
|
|
registry = CommandRegistry()
|
|
registry.register("cat", ["!cat"], answer, "cat description")
|
|
dispatcher = Dispatcher(
|
|
config=config,
|
|
directory=directory,
|
|
registry=registry,
|
|
store=store,
|
|
transport=transport,
|
|
clock=lambda: NOW,
|
|
)
|
|
await dispatcher.handle(envelope(text="!cat", group_id=SECOND_GROUP))
|
|
assert [m.recipient for m in transport.sent] == [SECOND_GROUP]
|
|
|
|
|
|
async def test_counts_are_kept_per_group(dispatcher: Dispatcher, store: Store) -> None:
|
|
"""Distinct timestamps: two frames one millisecond apart are two messages.
|
|
|
|
Reusing one timestamp here would be absorbed by the dedupe key, which is
|
|
the behaviour test_a_replayed_frame_is_counted_once pins deliberately.
|
|
"""
|
|
await dispatcher.handle(envelope(text="hello", group_id=WATCHED_GROUP, timestamp=1))
|
|
await dispatcher.handle(envelope(text="hello", group_id=SECOND_GROUP, timestamp=1))
|
|
await dispatcher.handle(envelope(text="hello", group_id=SECOND_GROUP, timestamp=2))
|
|
assert counted(store) == 1
|
|
assert counted(store, SECOND_GROUP) == 2
|