mirror of
https://github.com/kuhyx/signal-bot.git
synced 2026-11-10 20:17:02 +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
123 lines
4.2 KiB
Python
123 lines
4.2 KiB
Python
# Copyright (c) 2026 Krzysztof Rudnicki. MIT licence.
|
|
"""The cooldown gate: when it refuses, and what it says when it does."""
|
|
|
|
from __future__ import annotations
|
|
|
|
from typing import TYPE_CHECKING
|
|
|
|
import pytest
|
|
|
|
from signal_bot.decorators import DISPLAY_MARGIN_SECONDS, cooldown, wait_display
|
|
from tests.conftest import SECOND_GROUP, WATCHED_GROUP
|
|
from tests.gate_helpers import DAY, gate_context, refused
|
|
|
|
if TYPE_CHECKING:
|
|
from signal_bot.config import Config
|
|
from signal_bot.context import CommandContext
|
|
from signal_bot.registry import Handler
|
|
from signal_bot.store import Store
|
|
from signal_bot.transport_fake import FakeTransport
|
|
|
|
|
|
@pytest.fixture
|
|
def runs() -> list[str]:
|
|
return []
|
|
|
|
|
|
@pytest.fixture
|
|
def handler(runs: list[str]) -> Handler:
|
|
async def _handler(ctx: CommandContext) -> None:
|
|
runs.append(ctx.message.source_uuid)
|
|
|
|
return _handler
|
|
|
|
|
|
async def test_cooldown_allows_first_use(
|
|
store: Store, transport: FakeTransport, config: Config, handler: Handler, runs: list[str]
|
|
) -> None:
|
|
await cooldown(10, "wait {seconds}")(handler)(gate_context(store, transport, config))
|
|
assert runs == ["u1"]
|
|
|
|
|
|
async def test_cooldown_blocks_and_reports_remaining(
|
|
store: Store, transport: FakeTransport, config: Config, handler: Handler, runs: list[str]
|
|
) -> None:
|
|
store.record_use(WATCHED_GROUP, "u1", "ping", 100.0, DAY)
|
|
ctx = gate_context(store, transport, config, now=104.0)
|
|
await refused(cooldown(10, "wait {seconds}")(handler), ctx)
|
|
assert runs == []
|
|
# 6s left, rounded up, plus the deliberate margin.
|
|
assert transport.texts == [f"wait {6 + DISPLAY_MARGIN_SECONDS}"]
|
|
|
|
|
|
async def test_cooldown_expires(
|
|
store: Store, transport: FakeTransport, config: Config, handler: Handler, runs: list[str]
|
|
) -> None:
|
|
store.record_use(WATCHED_GROUP, "u1", "ping", 100.0, DAY)
|
|
await cooldown(10, "wait {seconds}")(handler)(gate_context(store, transport, config, now=111.0))
|
|
assert runs == ["u1"]
|
|
|
|
|
|
async def test_cooldown_is_per_user(
|
|
store: Store, transport: FakeTransport, config: Config, handler: Handler, runs: list[str]
|
|
) -> None:
|
|
"""One person's cat picture used to silence everybody."""
|
|
store.record_use(WATCHED_GROUP, "u1", "ping", 100.0, DAY)
|
|
await cooldown(10, "wait {seconds}")(handler)(
|
|
gate_context(store, transport, config, uuid="u2", now=101.0)
|
|
)
|
|
assert runs == ["u2"]
|
|
|
|
|
|
async def test_cooldown_is_per_group(
|
|
store: Store, transport: FakeTransport, config: Config, handler: Handler, runs: list[str]
|
|
) -> None:
|
|
"""A test-group command must not throttle the production group."""
|
|
store.record_use(WATCHED_GROUP, "u1", "ping", 100.0, DAY)
|
|
await cooldown(10, "wait {seconds}")(handler)(
|
|
gate_context(store, transport, config, now=101.0, group=SECOND_GROUP)
|
|
)
|
|
assert runs == ["u1"]
|
|
assert transport.texts == []
|
|
|
|
|
|
@pytest.mark.parametrize(
|
|
("shown", "unit"),
|
|
[
|
|
(1, "SEKUNDĘ"),
|
|
(2, "SEKUNDY"),
|
|
(3, "SEKUNDY"),
|
|
(4, "SEKUNDY"),
|
|
(5, "SEKUND"),
|
|
(11, "SEKUND"),
|
|
(12, "SEKUND"),
|
|
(13, "SEKUND"),
|
|
(14, "SEKUND"),
|
|
(21, "SEKUND"),
|
|
(22, "SEKUNDY"),
|
|
(25, "SEKUND"),
|
|
(112, "SEKUND"),
|
|
],
|
|
)
|
|
def test_the_wait_agrees_in_polish(shown: int, unit: str) -> None:
|
|
"""One SEKUND for every number is what the group noticed first.
|
|
|
|
Driven through the display helper rather than the gate: the gate can only
|
|
ever show 3 or more, because a live refusal always has some fraction of a
|
|
second left and the margin sits on top of that.
|
|
"""
|
|
assert wait_display(shown - DISPLAY_MARGIN_SECONDS) == (shown, unit)
|
|
|
|
|
|
async def test_the_shown_wait_rounds_up_and_carries_the_margin(
|
|
store: Store, transport: FakeTransport, config: Config, handler: Handler
|
|
) -> None:
|
|
"""Never below the real wait: a short number sends somebody back refused."""
|
|
store.record_use(WATCHED_GROUP, "u1", "ping", 100.0, DAY)
|
|
await refused(
|
|
cooldown(10, "POCZEKAJ {seconds} {unit}")(handler),
|
|
gate_context(store, transport, config, now=103.5),
|
|
)
|
|
# 6.5s really left -> 7 rounded up, plus the margin.
|
|
assert transport.texts == [f"POCZEKAJ {7 + DISPLAY_MARGIN_SECONDS} SEKUND"]
|