Read the recorded snooze outcomes back out of the nudges table (#364)
The gate honours State.SnoozeUntil but nothing ever filled it. New store.SnoozedUntil returns, per rule, when the newest snooze runs out. Reviewer: the fixed 2h SnoozeDuration and its reasoning in nudges.go — nothing upstream can supply a per-nudge length, so no new column. Expired snoozes are dropped in SQL, so silence can never be permanent. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01CGeSZxh1DCtRxmFVSYVGvJ
This commit is contained in:
@@ -28,6 +28,20 @@ const (
|
||||
NudgeIgnored = "ignored"
|
||||
)
|
||||
|
||||
// SnoozeDuration — how long one `snoozed` outcome keeps its rule quiet.
|
||||
//
|
||||
// The nudges table records THAT a snooze happened and when, never for how
|
||||
// long: nothing upstream can supply a length. ResolveNudge takes only
|
||||
// (id, outcome, ts), and so do the IPC method and the web/telegram callers
|
||||
// behind it. So a fixed default it is, rather than a new column no writer
|
||||
// could fill.
|
||||
//
|
||||
// Two hours: longer than every rule's base cooldown (15–60m) so a snooze
|
||||
// actually buys quiet instead of being swallowed by the cooldown, and short
|
||||
// enough that a snooze the operator forgets about clears the same day. A
|
||||
// snooze can never outlive this window, so Maven cannot go quiet forever.
|
||||
const SnoozeDuration = 2 * time.Hour
|
||||
|
||||
var (
|
||||
ErrNudgeNotFound = errors.New("store: nudge not found")
|
||||
ErrNudgeOutcome = errors.New("store: nudge already resolved")
|
||||
@@ -138,6 +152,37 @@ func (s *Store) UnackedTelegramRules(ctx context.Context) ([]string, error) {
|
||||
return out, rows.Err()
|
||||
}
|
||||
|
||||
// SnoozedUntil — per rule, when its most recent snooze runs out. This is the
|
||||
// read behind the gate's snooze check: the `snoozed` outcome already in the
|
||||
// nudges table IS the restraint memory, so there is no snooze table.
|
||||
//
|
||||
// Rules with no live snooze are absent from the map, which is what the gate
|
||||
// wants (a missing key means "not snoozed"). Expired snoozes are filtered out
|
||||
// in SQL, so an old snooze can never come back as a silent forever-mute.
|
||||
//
|
||||
// Called every tick (~60s). One indexed lookup over the snoozed rows only.
|
||||
func (s *Store) SnoozedUntil(ctx context.Context, now time.Time) (map[string]time.Time, error) {
|
||||
cutoff := now.Add(-SnoozeDuration).UnixMilli()
|
||||
rows, err := s.db.QueryContext(ctx,
|
||||
`SELECT rule, MAX(outcome_ts) FROM nudges
|
||||
WHERE outcome = 'snoozed' AND outcome_ts > ?
|
||||
GROUP BY rule`, cutoff)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("snoozed until: %w", err)
|
||||
}
|
||||
defer rows.Close()
|
||||
out := make(map[string]time.Time)
|
||||
for rows.Next() {
|
||||
var rule string
|
||||
var tsMilli int64
|
||||
if err := rows.Scan(&rule, &tsMilli); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
out[rule] = time.UnixMilli(tsMilli).UTC().Add(SnoozeDuration)
|
||||
}
|
||||
return out, rows.Err()
|
||||
}
|
||||
|
||||
// RecentNudges — the newest n nudges across all rules, with outcomes, for the
|
||||
// monitoring dash. Newest first.
|
||||
func (s *Store) RecentNudges(ctx context.Context, n int) ([]Nudge, error) {
|
||||
|
||||
Reference in New Issue
Block a user