mirror of
https://github.com/kuhyx/signal-bot.git
synced 2026-11-11 12:57:32 +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
66 lines
2.1 KiB
Python
66 lines
2.1 KiB
Python
# Copyright (c) 2026 Krzysztof Rudnicki. MIT licence.
|
|
"""The !papież command: a random pope, his portrait, his Latin name, his article.
|
|
|
|
The list this draws from is the same signal_bot/popes.json the version ladder
|
|
is built on, so the bot posts the popes it is named after.
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
import secrets
|
|
from typing import TYPE_CHECKING, Final
|
|
|
|
from signal_bot.animals import load_aliases
|
|
from signal_bot.versioning import POPES, article_url, pope_line
|
|
|
|
if TYPE_CHECKING:
|
|
from signal_bot.context import CommandContext
|
|
from signal_bot.decorators import Decorator
|
|
from signal_bot.portraits import PortraitCache
|
|
from signal_bot.registry import CommandRegistry, Handler
|
|
from signal_bot.versioning import Pope
|
|
|
|
COMMAND_NAME: Final = "pope"
|
|
DESCRIPTION: Final = "losowy papież z portretem i imieniem po łacinie"
|
|
|
|
|
|
def random_pope() -> Pope:
|
|
"""Return one pope, uniformly at random.
|
|
|
|
secrets rather than random for the reason animals.paged_url gives: the
|
|
choice is not security-sensitive, but ruff's ALL rule set flags `random`
|
|
and this repo forbids the noqa that would silence it.
|
|
"""
|
|
return POPES[secrets.randbelow(len(POPES))]
|
|
|
|
|
|
def caption_for(pope: Pope) -> str:
|
|
"""Return the message that rides along with the portrait."""
|
|
return f"{pope.name} — {pope.latin}\n{pope_line(pope)}\n{article_url(pope)}"
|
|
|
|
|
|
def pope_handler(cache: PortraitCache) -> Handler:
|
|
"""Build the handler that posts a random pope."""
|
|
|
|
async def handler(ctx: CommandContext) -> None:
|
|
pope = random_pope()
|
|
image = await cache.get_base64(pope)
|
|
await ctx.reply_image(image, caption_for(pope))
|
|
|
|
return handler
|
|
|
|
|
|
def register_pope_command(
|
|
registry: CommandRegistry,
|
|
cache: PortraitCache,
|
|
*,
|
|
decorate: Decorator | None = None,
|
|
aliases: dict[str, list[str]] | None = None,
|
|
) -> None:
|
|
"""Register !papież under every trigger aliases.json gives it."""
|
|
table = load_aliases() if aliases is None else aliases
|
|
handler = pope_handler(cache)
|
|
if decorate is not None:
|
|
handler = decorate(handler)
|
|
registry.register(COMMAND_NAME, table[COMMAND_NAME], handler, DESCRIPTION)
|