mirror of
https://github.com/kuhyx/signal-bot.git
synced 2026-11-13 07:51:00 +01:00
Some checks are pending
CI / check (push) Waiting to run
Send a photo captioned "!add_photo alfa wakacje" in one of the album's own groups and it lands in the pack tagged with both, retrievable through !alfa and the new !losowe immediately -- no restart, and no tagger session on the PC. A label matching nobody becomes a custom tag, and !losowe is the only door to one, which is what keeps a live swap a *data* swap: it can never register a trigger or widen a command's groups. No typed label travels. Labels become pseudonym keys in a new registry arg_resolver, at the dispatcher, before the line that logs the command name -- so no handler, journal entry, command_uses row or reply body ever holds a word somebody typed. The reply is counts and pseudonyms: "dodano · p1: 4 · t1: 1". Stripping is exiftool with a *positive* check on the output, never an exit code. ffmpeg was tried first and fails silently on photos: given a JPEG with a real APP1 Exif segment it returned a byte-identical file, GPS intact, exit 0. The surviving-tag allowlist is per tag *name* rather than per group, because measurement showed a group-level "must be empty" rule rejects every format except JPEG -- a valid PNG always reports its IHDR, an MP4 some fifty QuickTime tags that are the container itself. Codec configuration (CompressorName, VendorID, the HEVC parameter set) is on the list by decision: CompressorName lives in the avc1 sample description and exiftool cannot write it at all, so the alternative was refusing every video and every iPhone HEIC. Location and identity tags are still refused, and the e2e run re-reads the stored files to prove a QuickTime geotag did not survive. .webm and .svg stay on the format allowlist and are stored *unstripped*: exiftool 13.55 can write neither, and its SVG reader does not even surface <metadata>. That is a deliberate, documented hole, not an oversight. Two things this had to defuse along the way: - personal_data_sources now reads custom.json, so "!add_photo kot <photo>" would have outlawed the word "kot" and refused every future commit, fixable only by hand-editing an album the committer cannot see. Minting now refuses a word that is already a command, and the gate subtracts the repo's own alias vocabulary from custom labels only -- curated people.json names are never excused. - signal_bot/external.py is now the single subprocess site in the repository, so ruff's S603 needs exactly one scoped per-file-ignore instead of one per module that shells out. A test asserts nothing else imports subprocess. A failed add changes nothing: media and the three manifests are written, the album is reloaded, and only a load that succeeds is published; a load that fails rolls all four back and keeps serving the pack that was already working, without raising -- Restart=always would turn a ConfigError into a loop. 977 tests, 100% branch coverage, no omits and no suppressions. scripts/e2e.sh gains 8 scenarios driven against the real exiftool on media generated at run time, and asserts the invariants a reply cannot: that a refused upload is not stored, that a message with no attachment leaves custom.json byte-identical, and that signal-cli's own copy of every ingested attachment is gone. Closes TODO-add-photo.md. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01JqqE22jp94B1ypwxppdr1o
240 lines
8.6 KiB
Python
240 lines
8.6 KiB
Python
# Copyright (c) 2026 Krzysztof Rudnicki. MIT licence.
|
|
"""!pomoc, and the two gates that keep it from going stale."""
|
|
|
|
from __future__ import annotations
|
|
|
|
from typing import TYPE_CHECKING
|
|
|
|
import httpx
|
|
import pytest
|
|
|
|
from signal_bot.animals import register_animal_commands
|
|
from signal_bot.config import DEFAULT_COMMONS_API_URL
|
|
from signal_bot.help_command import (
|
|
ALBUM_HEADING,
|
|
COMMAND_NAME,
|
|
GROUPS,
|
|
HEADING,
|
|
PACK_HEADING,
|
|
SPELLINGS,
|
|
register_help_command,
|
|
render_help,
|
|
)
|
|
from signal_bot.http_client import ImageFetcher
|
|
from signal_bot.models import parse_envelope
|
|
from signal_bot.pack_add import register_add_command
|
|
from signal_bot.pack_command import register_pack_commands
|
|
from signal_bot.pack_holder import PackHolder
|
|
from signal_bot.pack_load import load as load_pack
|
|
from signal_bot.pack_random import register_random_command
|
|
from signal_bot.popes_command import register_pope_command
|
|
from signal_bot.portraits import PortraitCache
|
|
from signal_bot.registry import CommandContext, CommandRegistry
|
|
from signal_bot.stats.commands import register_stats_commands
|
|
from tests import pack_fixture
|
|
from tests.conftest import SECOND_GROUP, WATCHED_GROUP, envelope
|
|
|
|
if TYPE_CHECKING:
|
|
from pathlib import Path
|
|
|
|
from signal_bot.config import Config
|
|
from signal_bot.media_sniff import MediaKind
|
|
from signal_bot.store import Store
|
|
from signal_bot.transport_fake import FakeTransport
|
|
|
|
|
|
def _offline_fetcher() -> ImageFetcher:
|
|
"""A fetcher wired to a transport that refuses to be called.
|
|
|
|
!pomoc never fetches anything, and the other commands are registered here
|
|
only so that the help text has something to list.
|
|
"""
|
|
|
|
def handler(request: httpx.Request) -> httpx.Response:
|
|
raise AssertionError(request.url)
|
|
|
|
return ImageFetcher(httpx.AsyncClient(transport=httpx.MockTransport(handler)))
|
|
|
|
|
|
def full_registry() -> CommandRegistry:
|
|
"""Every command the live bot registers, wired the way build_bot wires it."""
|
|
registry = CommandRegistry()
|
|
fetcher = _offline_fetcher()
|
|
register_animal_commands(registry, fetcher)
|
|
register_pope_command(registry, PortraitCache(fetcher, DEFAULT_COMMONS_API_URL))
|
|
register_stats_commands(registry)
|
|
register_help_command(registry)
|
|
return registry
|
|
|
|
|
|
async def _noop(ctx: CommandContext) -> None:
|
|
"""A handler that does nothing."""
|
|
|
|
|
|
def test_every_registered_command_carries_a_description() -> None:
|
|
"""The whole point of making description a required argument."""
|
|
for command in full_registry().commands:
|
|
assert command.description.strip(), command.name
|
|
|
|
|
|
def test_help_lists_every_command_exactly_once() -> None:
|
|
"""A command missing from !pomoc, or listed twice, fails here.
|
|
|
|
Asserted on the whole line rather than the bare trigger, so prose that
|
|
happens to mention "!stats" can neither satisfy nor break it.
|
|
"""
|
|
registry = full_registry()
|
|
text = render_help(registry.commands, WATCHED_GROUP)
|
|
for command in registry.commands:
|
|
assert text.count(f"\n{command.primary} — {command.description}") == 1, command.name
|
|
|
|
|
|
def test_help_prints_the_polish_spelling_not_the_folded_one() -> None:
|
|
"""`triggers` holds skeletons; only `primary` still carries the diacritics."""
|
|
text = render_help(full_registry().commands, WATCHED_GROUP)
|
|
assert "!papież" in text
|
|
assert "!papiez" not in text
|
|
assert "!tydzień" in text
|
|
|
|
|
|
def test_headings_appear_in_order() -> None:
|
|
"""Obrazki, Papież, Statystyki, then the ungrouped block, then the note."""
|
|
text = render_help(full_registry().commands, WATCHED_GROUP)
|
|
positions = [text.index(f"\n{title}\n") for title, _ in GROUPS]
|
|
assert positions == sorted(positions)
|
|
assert text.startswith(HEADING)
|
|
assert text.endswith(SPELLINGS)
|
|
|
|
|
|
def test_a_command_outside_the_groups_is_still_listed() -> None:
|
|
"""The safety net: forgetting to add a command to GROUPS cannot hide it."""
|
|
registry = full_registry()
|
|
registry.register("ping", ["!ping"], _noop, "odpowiada pong")
|
|
assert "\n!ping — odpowiada pong" in render_help(registry.commands, WATCHED_GROUP)
|
|
|
|
|
|
def test_a_group_naming_an_unknown_command_fails_loudly() -> None:
|
|
"""A typo in GROUPS raises rather than silently dropping a line."""
|
|
registry = CommandRegistry()
|
|
register_help_command(registry)
|
|
with pytest.raises(KeyError):
|
|
render_help(registry.commands, WATCHED_GROUP)
|
|
|
|
|
|
async def test_the_handler_replies_with_the_rendered_list(
|
|
transport: FakeTransport, store: Store, config: Config
|
|
) -> None:
|
|
"""!pomoc answers in the group that asked, quoting the asker."""
|
|
registry = full_registry()
|
|
command = registry.resolve("!pomoc")
|
|
assert command is not None
|
|
assert command.name == COMMAND_NAME
|
|
message = parse_envelope(envelope(text="!pomoc"))
|
|
assert message is not None
|
|
await command.handler(
|
|
CommandContext(
|
|
message=message,
|
|
group_id=WATCHED_GROUP,
|
|
transport=transport,
|
|
store=store,
|
|
config=config,
|
|
command_name=COMMAND_NAME,
|
|
now=100.0,
|
|
day="2026-08-30",
|
|
)
|
|
)
|
|
assert transport.sent[0].recipient == WATCHED_GROUP
|
|
assert transport.sent[0].text == render_help(registry.commands, WATCHED_GROUP)
|
|
|
|
|
|
@pytest.mark.parametrize("trigger", ["!pomoc", "!pomocy", "!help", "!komendy", "!commands"])
|
|
def test_every_alias_resolves(trigger: str) -> None:
|
|
"""All five spellings reach the same command."""
|
|
command = full_registry().resolve(trigger)
|
|
assert command is not None
|
|
assert command.name == COMMAND_NAME
|
|
|
|
|
|
def test_an_album_gets_its_own_heading_and_a_hint(tmp_path: Path) -> None:
|
|
"""And the hint is built from real triggers, because they are the example."""
|
|
registry = full_registry()
|
|
register_pack_commands(registry, PackHolder(load_pack(pack_fixture.build(tmp_path / "pack"))))
|
|
|
|
text = render_help(registry.commands, WATCHED_GROUP)
|
|
|
|
assert f"\n{PACK_HEADING}\n" in text
|
|
assert "!alfa — losowe zdjęcie tej osoby" in text
|
|
assert "Kilka naraz (!alfa !beta)" in text
|
|
|
|
|
|
def test_the_album_is_invisible_in_every_other_group(tmp_path: Path) -> None:
|
|
"""The list is what would announce a private command family to strangers."""
|
|
registry = full_registry()
|
|
register_pack_commands(registry, PackHolder(load_pack(pack_fixture.build(tmp_path / "pack"))))
|
|
|
|
text = render_help(registry.commands, SECOND_GROUP)
|
|
|
|
assert PACK_HEADING not in text
|
|
assert "alfa" not in text
|
|
assert "!kot" in text
|
|
|
|
|
|
def test_a_pack_of_one_prints_no_hint(tmp_path: Path) -> None:
|
|
""" "Combine them" needs two things to combine."""
|
|
root = pack_fixture.build(
|
|
tmp_path / "pack",
|
|
people=[{"key": "p1", "triggers": ["!alfa"]}],
|
|
combos=[],
|
|
tags={},
|
|
)
|
|
registry = full_registry()
|
|
register_pack_commands(registry, PackHolder(load_pack(root)))
|
|
|
|
text = render_help(registry.commands, WATCHED_GROUP)
|
|
|
|
assert PACK_HEADING in text
|
|
assert "Kilka naraz" not in text
|
|
|
|
|
|
class _NoStripper:
|
|
"""Registration needs a stripper; rendering help never calls one."""
|
|
|
|
def strip(self, payload: bytes, kind: MediaKind) -> bytes | None:
|
|
return payload
|
|
|
|
|
|
def test_the_album_commands_get_their_own_block(tmp_path: Path) -> None:
|
|
"""Their own heading, so the "kilka naraz" hint keeps describing people.
|
|
|
|
And neither description may name anybody: !pomoc prints them, and the
|
|
trigger is the only place a name is allowed to appear.
|
|
"""
|
|
holder = PackHolder(load_pack(pack_fixture.build(tmp_path / "pack")))
|
|
registry = full_registry()
|
|
register_pack_commands(registry, holder)
|
|
register_random_command(registry, holder, ("!losowe",))
|
|
register_add_command(registry, holder, _NoStripper(), ("!dodaj",))
|
|
|
|
text = render_help(registry.commands, WATCHED_GROUP)
|
|
|
|
assert f"\n{ALBUM_HEADING}\n" in text
|
|
assert "!dodaj — dodaje załączone zdjęcie do albumu z podanymi etykietami" in text
|
|
assert "!losowe — losowe zdjęcie z albumu, opcjonalnie po etykiecie" in text
|
|
# The people's block is still its own, with its own hint.
|
|
assert f"\n{PACK_HEADING}\n" in text
|
|
assert "Kilka naraz (!alfa !beta)" in text
|
|
|
|
|
|
def test_the_album_commands_are_invisible_in_every_other_group(tmp_path: Path) -> None:
|
|
holder = PackHolder(load_pack(pack_fixture.build(tmp_path / "pack")))
|
|
registry = full_registry()
|
|
register_pack_commands(registry, holder)
|
|
register_random_command(registry, holder, ("!losowe",))
|
|
register_add_command(registry, holder, _NoStripper(), ("!dodaj",))
|
|
|
|
text = render_help(registry.commands, SECOND_GROUP)
|
|
|
|
assert ALBUM_HEADING not in text
|
|
assert "!dodaj" not in text
|
|
assert "!losowe" not in text
|