mirror of
https://github.com/kuhyx/signal-bot.git
synced 2026-11-10 20:47:17 +01:00
Krzysztof kuhy Rudnicki
dc1995b558
The tally was one integer per person, deleted after each post. Nothing dated survived it, so weeks, months, records, streaks and weekday averages were all unanswerable. This replaces it with an append-only per-message log holding metadata only -- never a message body -- and rebuilds the nightly report on top. What changes for the group: a photo posted without a caption now counts (it was worth zero), stickers count, the bot's own messages no longer do, people who said nothing appear with a 0, and the report covers the previous full calendar day in Europe/Warsaw instead of "since the last post" -- which used to merge two days whenever a group went quiet. Notable decisions, each with the trap it avoids: - Events and people are PERMANENT_TABLES: neither forget_group nor a future SCHEMA_VERSION bump may drop them. Both paths used to cost a day's counter and would now cost the entire history, and forget_group fires on a listing that merely omits members. - is_own comes from which envelope branch carried the payload, not from comparing identities. The account is spelled as a uuid on some frames and a +E.164 number on others, so any comparison misses one of them. - The roster is stashed in refresh(), not _adopt(), which returns early once the watched set stops changing -- i.e. always, in the steady state. - The roster matches on uuid OR number because /v1/groups spells kuhy as +48123456789 while his messages carry an ACI uuid. Joining on uuid alone would have listed him twice every night, once with 0. - Members whose display name we have never seen are counted, not named: their only spellings are a uuid or a phone number. - (group, uuid, sent_at_ms) is the primary key, so a websocket redelivery after a reconnect cannot inflate the counts. - Days come from a stored Warsaw date string, never a timestamp range: 2026-03-29 is 23 hours long and 2026-10-25 is 25. - Polish number agreement is a real rule with a 12-14 exception, so "44 znaki" and "45 znaków" are both spelled correctly. config.py and startup.py were two lines under the 250-line cap and both had to grow, so config_env and startup_retry come out of them first, as pure moves. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_015d48t4qsQLBJnDwDeo2Nom
88 lines
2.8 KiB
Python
88 lines
2.8 KiB
Python
# Copyright (c) 2026 Krzysztof Rudnicki. MIT licence.
|
|
"""Scoping and tally predicates."""
|
|
|
|
from __future__ import annotations
|
|
|
|
from typing import TYPE_CHECKING
|
|
|
|
import pytest
|
|
|
|
from signal_bot.counting import media_kind, should_count, watched_group
|
|
from signal_bot.models import parse_envelope
|
|
from tests.conftest import OTHER_GROUP, SECOND_GROUP, WATCHED_GROUP, envelope
|
|
|
|
if TYPE_CHECKING:
|
|
from signal_bot.discovery import GroupDirectory
|
|
|
|
|
|
def _message(**kwargs: object) -> object:
|
|
parsed = parse_envelope(envelope(**kwargs))
|
|
assert parsed is not None
|
|
return parsed
|
|
|
|
|
|
@pytest.mark.parametrize("group", [WATCHED_GROUP, SECOND_GROUP])
|
|
async def test_every_watched_group_is_accepted_as_itself(
|
|
directory: GroupDirectory, group: str
|
|
) -> None:
|
|
"""Each watched group resolves to itself, never to the first one listed."""
|
|
assert watched_group(_message(group_id=group), directory) == group
|
|
|
|
|
|
async def test_other_group_is_rejected(directory: GroupDirectory) -> None:
|
|
assert watched_group(_message(group_id=OTHER_GROUP), directory) is None
|
|
|
|
|
|
async def test_direct_message_is_rejected(directory: GroupDirectory) -> None:
|
|
"""The dangerous case: a DM must never reach a handler."""
|
|
assert watched_group(_message(group_id=None), directory) is None
|
|
|
|
|
|
def test_plain_text_counts() -> None:
|
|
assert should_count(_message(text="hello"))
|
|
|
|
|
|
def test_reactions_do_not_count() -> None:
|
|
"""A reaction annotates somebody else's message; it is not one."""
|
|
assert not should_count(_message(extra="reaction"))
|
|
|
|
|
|
def test_a_sticker_is_a_message() -> None:
|
|
assert should_count(_message(text=None, extra="sticker"))
|
|
|
|
|
|
@pytest.mark.parametrize("text", [None, ""])
|
|
def test_empty_text_with_no_media_does_not_count(text: str | None) -> None:
|
|
assert not should_count(_message(text=text))
|
|
|
|
|
|
@pytest.mark.parametrize("text", [None, ""])
|
|
def test_a_caption_less_photo_counts(text: str | None) -> None:
|
|
"""Until 0.1.0 this was worth zero, which is what the release fixes."""
|
|
assert should_count(_message(text=text, attachments=("image/jpeg",)))
|
|
|
|
|
|
def test_the_bots_own_messages_never_count() -> None:
|
|
"""Taken from the sync branch, so it holds however the account is spelled."""
|
|
assert not should_count(_message(text="hello", sync=True))
|
|
|
|
|
|
@pytest.mark.parametrize(
|
|
("attachments", "expected"),
|
|
[
|
|
((), ""),
|
|
(("image/jpeg",), "image"),
|
|
(("image/jpeg", "image/png"), "image"),
|
|
(("video/mp4",), "video"),
|
|
(("audio/aac",), "audio"),
|
|
(("application/pdf",), "file"),
|
|
(("image/jpeg", "video/mp4"), "mixed"),
|
|
],
|
|
)
|
|
def test_media_kind(attachments: tuple[str, ...], expected: str) -> None:
|
|
assert media_kind(_message(attachments=attachments)) == expected
|
|
|
|
|
|
def test_a_sticker_is_its_own_kind() -> None:
|
|
assert media_kind(_message(text=None, extra="sticker")) == "sticker"
|