mirror of
https://github.com/kuhyx/signal-bot.git
synced 2026-11-10 19:27:20 +01:00
The registry used to be built once, inline in build_bot, so every change to the data behind it -- a person tagged in the web UI, an alias, soon a command switched off from the management page -- meant restarting the unit. That is cheap and lossless, but it is a deploy step somebody has to remember, and a 21:37 report can land in the middle of it. Now the registration sequence lives in wiring.build_registry, and RegistryHolder runs it again on POST /_reload: the new table is built whole and swapped in with one assignment, never patched in place, so a duplicate trigger is found before anything the dispatcher reads has changed. Bad data (ConfigError, DuplicateTriggerError) keeps the previous table and answers 409 with the reason; a programming error still surfaces as a 500. scripts/reload.sh wraps it, with --code for the restart a Python change needs, and an optional command to type in testbot so "reloaded" means "answered". No Python hot-reload on purpose. The loader change is what makes deploying this safe: two rows in the live tags.json name files that are no longer in media/, and load_pack refused them, so the next restart would have looped on ConfigError. A stale tag is drift in a file a page edits mid-session, not a broken album -- it is now skipped with a warning naming it. A tag that reaches outside the album is still refused. pack_load.py split at the 250-line cap; pack_tags.py is the half whose checks are not all fatal. Proven offline in scripts/e2e.sh: !delta is unknown, a fifth person is tagged into the synthetic pack, scripts/reload.sh runs, and the same process posts delta's photo. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
154 lines
5.2 KiB
Python
154 lines
5.2 KiB
Python
# Copyright (c) 2026 Krzysztof Rudnicki. MIT licence.
|
|
"""What the dispatcher records when a gate refuses -- which is nothing."""
|
|
|
|
from __future__ import annotations
|
|
|
|
import datetime as dt
|
|
from typing import TYPE_CHECKING
|
|
|
|
from signal_bot.decorators import cooldown
|
|
from signal_bot.dispatcher import Dispatcher
|
|
from signal_bot.registry import CommandRegistry
|
|
from signal_bot.registry_holder import RegistryHolder
|
|
from signal_bot.stats.queries_day import day_rows
|
|
from tests.conftest import 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)
|
|
|
|
|
|
async def test_a_refused_command_records_nothing(
|
|
config: Config, directory: GroupDirectory, store: Store, transport: FakeTransport
|
|
) -> None:
|
|
"""A gate's refusal must not slide the cooldown window forward.
|
|
|
|
This is what made "BEEP BOOP POCZEKAJ n SEKUND" a lie: the refusal itself
|
|
was recorded as a use, so waiting the stated n only bought another refusal.
|
|
"""
|
|
runs: list[str] = []
|
|
|
|
async def handler(ctx: CommandContext) -> None:
|
|
runs.append(ctx.command_name)
|
|
|
|
registry = CommandRegistry()
|
|
registry.register("cat", ["!cat"], cooldown(10, "wait {seconds}")(handler), "kot")
|
|
dispatcher = Dispatcher(
|
|
config=config,
|
|
directory=directory,
|
|
holder=RegistryHolder(lambda: registry),
|
|
store=store,
|
|
transport=transport,
|
|
clock=lambda: NOW,
|
|
)
|
|
earlier = NOW.timestamp() - 4.0
|
|
store.record_use(WATCHED_GROUP, "uuid-alice", "cat", earlier, NOW.date().isoformat())
|
|
|
|
await dispatcher.handle(envelope(text="!cat"))
|
|
|
|
assert runs == []
|
|
assert store.last_used(WATCHED_GROUP, "uuid-alice", "cat") == earlier
|
|
# The seeded run is the only one counted; a refusal must not eat an
|
|
# allowance either, which is the same bug in daily_limit.
|
|
assert store.uses_today(WATCHED_GROUP, "uuid-alice", "cat", NOW.date().isoformat()) == 1
|
|
|
|
|
|
async def test_waiting_the_stated_time_lets_the_command_run(
|
|
config: Config, directory: GroupDirectory, store: Store, transport: FakeTransport
|
|
) -> None:
|
|
"""The user's own loop: obey the reply, retry, and it must work."""
|
|
runs: list[str] = []
|
|
clock = [NOW]
|
|
|
|
async def handler(ctx: CommandContext) -> None:
|
|
runs.append(ctx.command_name)
|
|
|
|
registry = CommandRegistry()
|
|
registry.register("cat", ["!cat"], cooldown(10, "{seconds}")(handler), "kot")
|
|
dispatcher = Dispatcher(
|
|
config=config,
|
|
directory=directory,
|
|
holder=RegistryHolder(lambda: registry),
|
|
store=store,
|
|
transport=transport,
|
|
clock=lambda: clock[0],
|
|
)
|
|
|
|
await dispatcher.handle(envelope(text="!cat"))
|
|
clock[0] = NOW + dt.timedelta(seconds=3)
|
|
await dispatcher.handle(envelope(text="!cat"))
|
|
assert runs == ["cat"]
|
|
|
|
waited = int(transport.texts[-1])
|
|
clock[0] += dt.timedelta(seconds=waited)
|
|
await dispatcher.handle(envelope(text="!cat"))
|
|
assert runs == ["cat", "cat"]
|
|
|
|
|
|
async def test_a_scoped_command_in_another_group_is_not_a_command_at_all(
|
|
config: Config, directory: GroupDirectory, store: Store, transport: FakeTransport
|
|
) -> None:
|
|
"""The whole privacy guarantee, at the only layer that can enforce it.
|
|
|
|
Not answered, not counted as a command, and -- because the dispatcher
|
|
never resolves it -- never named in a log line either. A handler that
|
|
simply returned would still leak all three.
|
|
"""
|
|
runs: list[str] = []
|
|
|
|
async def handler(ctx: CommandContext) -> None:
|
|
runs.append(ctx.command_name)
|
|
|
|
registry = CommandRegistry()
|
|
registry.register(
|
|
"pack:p1", ["!alfa"], handler, "album", groups=frozenset({SECOND_GROUP}), takes_args=True
|
|
)
|
|
dispatcher = Dispatcher(
|
|
config=config,
|
|
directory=directory,
|
|
holder=RegistryHolder(lambda: registry),
|
|
store=store,
|
|
transport=transport,
|
|
clock=lambda: NOW,
|
|
)
|
|
|
|
await dispatcher.handle(envelope(text="!alfa"))
|
|
|
|
assert runs == []
|
|
assert transport.sent == []
|
|
# Counted as an ordinary message, which is the other half of the claim:
|
|
# the text was seen, it simply was not a command here. The day comes from
|
|
# the message's own timestamp, never from the clock.
|
|
day = store.events.first_day(WATCHED_GROUP)
|
|
assert day is not None
|
|
assert [row.commands for row in day_rows(store.events, WATCHED_GROUP, day)] == [0]
|
|
|
|
|
|
async def test_the_words_after_a_trigger_reach_the_handler(
|
|
config: Config, directory: GroupDirectory, store: Store, transport: FakeTransport
|
|
) -> None:
|
|
seen: list[tuple[str, ...]] = []
|
|
|
|
async def handler(ctx: CommandContext) -> None:
|
|
seen.append(ctx.args)
|
|
|
|
registry = CommandRegistry()
|
|
registry.register("pack:p1", ["!alfa"], handler, "album", takes_args=True)
|
|
dispatcher = Dispatcher(
|
|
config=config,
|
|
directory=directory,
|
|
holder=RegistryHolder(lambda: registry),
|
|
store=store,
|
|
transport=transport,
|
|
clock=lambda: NOW,
|
|
)
|
|
|
|
await dispatcher.handle(envelope(text="!alfa beta gamma"))
|
|
|
|
assert seen == [("beta", "gamma")]
|