mirror of
https://github.com/kuhyx/signal-bot.git
synced 2026-11-11 13:57:32 +01:00
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
170 lines
6.1 KiB
Python
170 lines
6.1 KiB
Python
# Copyright (c) 2026 Krzysztof Rudnicki. MIT licence.
|
|
"""Parsing of signal-cli-rest-api envelopes into a flat, typed message."""
|
|
|
|
from __future__ import annotations
|
|
|
|
import json
|
|
from dataclasses import dataclass
|
|
from typing import Any
|
|
|
|
|
|
@dataclass(frozen=True, slots=True)
|
|
class IncomingMessage:
|
|
"""One inbound Signal message, normalised across envelope shapes.
|
|
|
|
signal-cli reports messages from other people under ``dataMessage`` and
|
|
the account's own outgoing messages under ``syncMessage.sentMessage``.
|
|
The two carry the same fields at different depths; everything downstream
|
|
works on this flattened form instead of re-deriving the nesting.
|
|
"""
|
|
|
|
source_uuid: str
|
|
source_name: str
|
|
group_id: str | None
|
|
text: str | None
|
|
has_sticker: bool
|
|
is_reaction: bool
|
|
# The sender's +E.164 number. "source" carries it too, but only
|
|
# sometimes: live envelopes have shown a display name there and the
|
|
# number here, so this is the field a trust decision may rely on.
|
|
source_number: str = ""
|
|
# A group membership change rather than a message: this is the only
|
|
# frame that names who added the bot to a group.
|
|
is_group_update: bool = False
|
|
# The sent timestamp, which is the id Signal quotes a message by.
|
|
# Without it a reply can only be addressed to the room.
|
|
timestamp: int = 0
|
|
# contentType of each attachment, in the order Signal listed them.
|
|
# Empty for a text-only message.
|
|
attachment_types: tuple[str, ...] = ()
|
|
# True when this message quotes another one.
|
|
is_reply: bool = False
|
|
# True when the bot's own account sent this. Taken 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. syncMessage.sentMessage means "this
|
|
# account sent it", exactly, on every frame shape.
|
|
is_own: bool = False
|
|
|
|
@property
|
|
def is_direct_message(self) -> bool:
|
|
"""True when the message did not arrive via a group.
|
|
|
|
A linked device receives every direct conversation on the account, so
|
|
this is the discriminator that keeps the bot scoped to its group.
|
|
"""
|
|
return self.group_id is None
|
|
|
|
|
|
def _timestamp(payload: dict[str, Any], envelope: dict[str, Any]) -> int:
|
|
"""The sent timestamp, preferring the payload's own over the envelope's.
|
|
|
|
They agree on every frame seen so far, but a quote must point at the
|
|
message, so the message's own value wins where they ever differ.
|
|
"""
|
|
for source in (payload, envelope):
|
|
value = source.get("timestamp")
|
|
if isinstance(value, int):
|
|
return value
|
|
return 0
|
|
|
|
|
|
def _payload(envelope: dict[str, Any]) -> tuple[dict[str, Any], bool] | None:
|
|
"""Return the message body and whether the bot's own account sent it.
|
|
|
|
signal-cli reports other people under ``dataMessage`` and this account's
|
|
own outgoing messages under ``syncMessage.sentMessage``. Which branch
|
|
matched is the only reliable "did we send this" signal, so it is returned
|
|
rather than re-derived downstream.
|
|
"""
|
|
data = envelope.get("dataMessage")
|
|
if isinstance(data, dict):
|
|
return data, False
|
|
sync = envelope.get("syncMessage")
|
|
if isinstance(sync, dict):
|
|
sent = sync.get("sentMessage")
|
|
if isinstance(sent, dict):
|
|
return sent, True
|
|
return None
|
|
|
|
|
|
def _attachments(payload: dict[str, Any]) -> tuple[str, ...]:
|
|
"""Return each attachment's contentType, in the order Signal listed them."""
|
|
items = payload.get("attachments")
|
|
if not isinstance(items, list):
|
|
return ()
|
|
return tuple(str(item.get("contentType", "")) for item in items if isinstance(item, dict))
|
|
|
|
|
|
def _group_id(payload: dict[str, Any]) -> str | None:
|
|
"""Return the group id, or None for a direct message."""
|
|
info = payload.get("groupInfo")
|
|
if not isinstance(info, dict):
|
|
return None
|
|
group_id = info.get("groupId")
|
|
if not isinstance(group_id, str) or not group_id:
|
|
return None
|
|
return group_id
|
|
|
|
|
|
def _group_type(payload: dict[str, Any]) -> str:
|
|
"""Return the groupInfo type ("DELIVER", "UPDATE", ...), or ""."""
|
|
info = payload.get("groupInfo")
|
|
if not isinstance(info, dict):
|
|
return ""
|
|
group_type = info.get("type")
|
|
return group_type if isinstance(group_type, str) else ""
|
|
|
|
|
|
def _text(payload: dict[str, Any]) -> str | None:
|
|
"""Return the message body, or None when there is no text."""
|
|
message = payload.get("message")
|
|
if not isinstance(message, str):
|
|
return None
|
|
return message
|
|
|
|
|
|
def parse_envelope(raw: str | bytes) -> IncomingMessage | None:
|
|
"""Parse one raw websocket frame.
|
|
|
|
Args:
|
|
raw: The JSON frame exactly as received.
|
|
|
|
Returns:
|
|
The normalised message, or None when the frame carries no message
|
|
body at all (receipts, typing indicators, malformed JSON).
|
|
"""
|
|
try:
|
|
decoded = json.loads(raw)
|
|
except json.JSONDecodeError, UnicodeDecodeError:
|
|
return None
|
|
if not isinstance(decoded, dict):
|
|
return None
|
|
|
|
envelope = decoded.get("envelope")
|
|
if not isinstance(envelope, dict):
|
|
return None
|
|
|
|
resolved = _payload(envelope)
|
|
if resolved is None:
|
|
return None
|
|
payload, is_own = resolved
|
|
|
|
return IncomingMessage(
|
|
source_uuid=str(envelope.get("sourceUuid", "")),
|
|
source_name=str(envelope.get("sourceName", "")),
|
|
group_id=_group_id(payload),
|
|
text=_text(payload),
|
|
# The original bot looked for the sticker under dataMessage even when
|
|
# the envelope was a syncMessage, so its own stickers were never
|
|
# filtered. Reading it off the resolved payload fixes both shapes.
|
|
has_sticker=isinstance(payload.get("sticker"), dict),
|
|
is_reaction=isinstance(payload.get("reaction"), dict),
|
|
source_number=str(envelope.get("sourceNumber", "")),
|
|
is_group_update=_group_type(payload) == "UPDATE",
|
|
timestamp=_timestamp(payload, envelope),
|
|
attachment_types=_attachments(payload),
|
|
is_reply=isinstance(payload.get("quote"), dict),
|
|
is_own=is_own,
|
|
)
|