All checks were successful
Sync infra to hosts / sync-beta (push) Successful in 8s
Sync infra to hosts / sync-prod (push) Successful in 7s
secrets-guard / encrypted (push) Successful in 8s
shell-lint / shellcheck (push) Successful in 10s
Build + push backend image (Forgejo registry) / build-push (push) Successful in 1m14s
Deploy backend to beta VPS / deploy (push) Successful in 2m4s
The gateway bot and APScheduler were long-lived stateful I/O loops running inside the async web app under a leader election. They move into a single Go binary that owns ONLY that I/O -- websocket, RESUME, heartbeat, backoff, timers. It owns no grading logic. Anything needing data calls back over a new internal-only surface (/internal/discord/grade, /internal/jobs/*). Grading depends on polars and the parquet cache; reimplementing it in Go would let the bot's grades drift from the API's. The grade route returns gateway-ready JSON and Go relays the bytes verbatim. The binary ships in the backend image and runs as a second compose service off the same tag, so the two ends of the /internal/* contract can never skew. deploy.sh rolls daemon alongside backend -- without that the service would never be created, since a single-service deploy uses --no-deps. It also probes the image first and skips the daemon when rolling a tag that predates the binary: infra tracks main while image tags are env-staged, so a host can legitimately be asked to roll an older backend image, and creating the service anyway would leave a container crash-looping on a missing binary. replicas: 1 with order: stop-first replaces the leader election -- Discord permits one gateway connection per bot token. THERMOGRAPH_INTERNAL_TOKEN is optional: both ends derive it from THERMOGRAPH_AUTH_SECRET via HMAC under a domain-separation label, so this needs no new vault entry. The derivation is pinned to a shared cross-language test vector asserted on both sides, so drift fails CI instead of 401ing every call. Fail closed when neither secret is set. Improvements over the Python: a close intended for RESUME uses 4000 rather than 1000 (Discord invalidates a session closed 1000, so the old default defeated its own resume); MESSAGE_CREATE runs on a bounded worker pool; and a malformed HELLO returns an error rather than a clean reconnect, which would otherwise reset backoff and hot-loop against the gateway. 365 Python tests pass; Go build/vet/test -race clean; shellcheck 0 findings.
118 lines
3.5 KiB
Go
118 lines
3.5 KiB
Go
// Message triage: the pure decision of whether — and how — to answer one
|
|
// MESSAGE_CREATE. Ported from the Python bot's _response_for_message /
|
|
// _mentions_bot / _is_dm / _strip_mentions; it is plain string/JSON logic
|
|
// with no data dependency, so it lives in Go. Anything needing climate data
|
|
// (the actual grade) goes back to Python via Grader.
|
|
|
|
package gateway
|
|
|
|
import (
|
|
"encoding/json"
|
|
"fmt"
|
|
"strings"
|
|
)
|
|
|
|
// helpText answers an empty query. Go owns this constant because it needs no
|
|
// data; the wording matches the Python original exactly.
|
|
const helpText = "Mention me with a city name — e.g. `@Thermograph Phoenix` — and I'll grade " +
|
|
"today's weather against ~45 years of local history."
|
|
|
|
// snowflake decodes a Discord id that may arrive as a JSON string (what v10
|
|
// sends) or a bare number. The Python compared ids through str() coercion;
|
|
// this keeps that tolerance instead of betting the payload shape never
|
|
// wobbles.
|
|
type snowflake string
|
|
|
|
func (s *snowflake) UnmarshalJSON(b []byte) error {
|
|
if string(b) == "null" {
|
|
*s = ""
|
|
return nil
|
|
}
|
|
var str string
|
|
if err := json.Unmarshal(b, &str); err == nil {
|
|
*s = snowflake(str)
|
|
return nil
|
|
}
|
|
var n json.Number
|
|
if err := json.Unmarshal(b, &n); err == nil {
|
|
*s = snowflake(n.String())
|
|
return nil
|
|
}
|
|
return fmt.Errorf("snowflake: cannot decode %s", b)
|
|
}
|
|
|
|
// gwMessage is the slice of a MESSAGE_CREATE payload the triage needs.
|
|
type gwMessage struct {
|
|
ID snowflake `json:"id"`
|
|
ChannelID snowflake `json:"channel_id"`
|
|
GuildID snowflake `json:"guild_id"`
|
|
Content string `json:"content"`
|
|
Author gwAuthor `json:"author"`
|
|
Mentions []gwAuthor `json:"mentions"`
|
|
}
|
|
|
|
type gwAuthor struct {
|
|
ID snowflake `json:"id"`
|
|
Bot bool `json:"bot"`
|
|
}
|
|
|
|
// action is triage's verdict for one message.
|
|
type action int
|
|
|
|
const (
|
|
actSilent action = iota // no reply
|
|
actHelp // reply with helpText
|
|
actGrade // call back into Python with the query
|
|
)
|
|
|
|
// mentionsBot reports whether the message @mentions our own user id.
|
|
func mentionsBot(m *gwMessage, botID string) bool {
|
|
for _, u := range m.Mentions {
|
|
if string(u.ID) == botID {
|
|
return true
|
|
}
|
|
}
|
|
return false
|
|
}
|
|
|
|
// isDM: a DM has no guild_id; a guild message always carries one.
|
|
func isDM(m *gwMessage) bool {
|
|
return m.GuildID == ""
|
|
}
|
|
|
|
// stripMentions drops every form of the bot's own mention (<@id> and the
|
|
// legacy <@!id>) and collapses the surrounding whitespace, leaving just the
|
|
// user's query text.
|
|
func stripMentions(content, botID string) string {
|
|
out := strings.ReplaceAll(content, "<@"+botID+">", " ")
|
|
out = strings.ReplaceAll(out, "<@!"+botID+">", " ")
|
|
return strings.Join(strings.Fields(out), " ")
|
|
}
|
|
|
|
// triage decides the reply for one MESSAGE_CREATE: silence, the help line, or
|
|
// a grade lookup for the returned query.
|
|
//
|
|
// Silent unless the message DMs the bot or @mentions it, and never for a bot
|
|
// author — which includes ourselves, the guard against a mention-loop (our
|
|
// reply quoting the mention must not trigger another reply). The text after
|
|
// the mention is treated as a city query; DMs are the query as-is (trimmed
|
|
// but not collapsed, matching the Python's .strip()).
|
|
func triage(m *gwMessage, botID string) (action, string) {
|
|
if m.Author.Bot || string(m.Author.ID) == botID {
|
|
return actSilent, ""
|
|
}
|
|
dm := isDM(m)
|
|
if !dm && !mentionsBot(m, botID) {
|
|
return actSilent, ""
|
|
}
|
|
var query string
|
|
if dm {
|
|
query = strings.TrimSpace(m.Content)
|
|
} else {
|
|
query = stripMentions(m.Content, botID)
|
|
}
|
|
if query == "" {
|
|
return actHelp, ""
|
|
}
|
|
return actGrade, query
|
|
}
|