mirror of
https://github.com/prosolis/gogobee.git
synced 2026-07-16 00:52:40 +00:00
Adv 2.0 daily report: migrate to D&D-native render + unified activity source
Two longstanding warts surfaced when the user inspected today's TwinBee
daily report:
1. Active players were rendering "Acted today — no log recorded." The
adventure_activity_log path only captures !rest now; harvest/zone/
expedition action logging was lost during Phase R/L migration. The
stale HasActedToday() check fired on fossil harvest_actions_used
counters that nothing modern increments.
2. Per-player headline still rendered legacy four-skill line ("Combat
Lv.X | Mining Lv.Y | Forage Lv.Z | Fishing Lv.W"). No D&D level,
race, class, or HP — discoverability gap for the layer that's now
canonical.
Fix both:
- adventure_activity_unified.go: new loadAdvDailyActivity(date) unions
dnd_zone_run (zone runs touched today) + dnd_expedition_log
(expedition activity rolled up per expedition) + legacy
adventure_activity_log (mostly !rest). One source of truth.
- adventure_render.go: AdvPlayerDaySummary gains HasDnDChar/DnDLevel/
DnDRace/DnDClass/HPCurrent/HPMax. New advPlayerHeadline helper
renders "Lv.N Race Class — HP cur/max" when a dnd_character row
exists, falls back to the legacy four-skill line plus an inline
"(no D&D sheet — run !setup)" nudge for accounts that haven't
completed setup yet. titleizeDnDToken("half_elf") → "Half-Elf".
- adventure_scheduler.go: postDailySummary swaps loadAdvLogsForDate
for loadAdvDailyActivity. IsResting now derives from "len(acts)==0"
rather than the fossil HasActedToday() counter check, so dead
harvest_actions_used bytes can't trip the active-player branch.
- proddb_daily_report_test.go: renders the report against a copy of
data/gogobee.db and prints it for visual confirmation. Verified
output for 2026-05-09 shows real zone-run outcomes (Withdrew from
Sunken Temple at room 1/6, etc.) instead of the previous "no log
recorded" placeholder.
go vet + go test ./... clean.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
This commit is contained in:
prosolis
197
internal/plugin/adventure_activity_unified.go
Normal file
197
internal/plugin/adventure_activity_unified.go
Normal file
@@ -0,0 +1,197 @@
|
||||
package plugin
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"time"
|
||||
|
||||
"gogobee/internal/db"
|
||||
|
||||
"maunium.net/go/mautrix/id"
|
||||
)
|
||||
|
||||
// AdvDailyActivity is one row of "what a player did" on a given UTC date.
|
||||
// Unifies the legacy adventure_activity_log table with the D&D-layer zone
|
||||
// run / expedition log tables so the daily report can render a coherent
|
||||
// view regardless of which subsystem the action ran through.
|
||||
type AdvDailyActivity struct {
|
||||
UserID id.UserID
|
||||
Source string // "zone_run" | "expedition" | "rest_legacy" | "legacy"
|
||||
Activity string // "zone" | "expedition" | "rest" | legacy activity_type
|
||||
Location string // zone display name or legacy location
|
||||
Outcome string // "completed" | "abandoned" | "boss_defeated" | "in_progress" | "rest" | legacy outcome
|
||||
Summary string // one-line human description
|
||||
LootValue int64 // 0 for D&D-layer entries (loot stays in run/expedition state)
|
||||
Timestamp time.Time
|
||||
}
|
||||
|
||||
// loadAdvDailyActivity unions activity rows from every action surface for
|
||||
// the given UTC date (format "2006-01-02"). Returns map keyed by user_id.
|
||||
//
|
||||
// Sources (in chronological order on output):
|
||||
// - adventure_activity_log (legacy, mostly !rest post-Phase-R)
|
||||
// - dnd_zone_run (zone runs whose last_action_at falls on date)
|
||||
// - dnd_expedition_log (expedition log entries dated today, deduped per
|
||||
// expedition into one rollup line)
|
||||
//
|
||||
// Each user's slice is sorted oldest→newest. Empty slice when the player
|
||||
// had no activity on this date.
|
||||
func loadAdvDailyActivity(date string) (map[id.UserID][]AdvDailyActivity, error) {
|
||||
out := make(map[id.UserID][]AdvDailyActivity)
|
||||
d := db.Get()
|
||||
|
||||
// 1. Legacy adventure_activity_log
|
||||
rows, err := d.Query(`
|
||||
SELECT user_id, activity_type, COALESCE(location,''), outcome, loot_value, logged_at
|
||||
FROM adventure_activity_log
|
||||
WHERE logged_at >= ? AND logged_at < DATE(?, '+1 day')
|
||||
ORDER BY logged_at`, date, date)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("legacy log: %w", err)
|
||||
}
|
||||
for rows.Next() {
|
||||
var (
|
||||
uid, activity, location, outcome string
|
||||
loot int64
|
||||
ts time.Time
|
||||
)
|
||||
if err := rows.Scan(&uid, &activity, &location, &outcome, &loot, &ts); err != nil {
|
||||
rows.Close()
|
||||
return nil, fmt.Errorf("legacy log scan: %w", err)
|
||||
}
|
||||
userID := id.UserID(uid)
|
||||
entry := AdvDailyActivity{
|
||||
UserID: userID,
|
||||
Source: "legacy",
|
||||
Activity: activity,
|
||||
Location: location,
|
||||
Outcome: outcome,
|
||||
LootValue: loot,
|
||||
Timestamp: ts,
|
||||
}
|
||||
if activity == string(AdvActivityRest) {
|
||||
entry.Source = "rest_legacy"
|
||||
entry.Summary = "Rested. Streak preserved."
|
||||
} else {
|
||||
entry.Summary = fmt.Sprintf("%s in %s (%s)", activity, location, outcome)
|
||||
}
|
||||
out[userID] = append(out[userID], entry)
|
||||
}
|
||||
rows.Close()
|
||||
|
||||
// 2. dnd_zone_run — rows touched today.
|
||||
rows, err = d.Query(`
|
||||
SELECT user_id, zone_id, current_room, total_rooms, abandoned,
|
||||
boss_defeated, completed_at, last_action_at
|
||||
FROM dnd_zone_run
|
||||
WHERE last_action_at >= ? AND last_action_at < DATE(?, '+1 day')
|
||||
ORDER BY last_action_at`, date, date)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("zone runs: %w", err)
|
||||
}
|
||||
for rows.Next() {
|
||||
var (
|
||||
uid, zoneID string
|
||||
currentRoom, totalRooms int
|
||||
abandoned, bossDefeated int
|
||||
completedAt *time.Time
|
||||
lastAction time.Time
|
||||
)
|
||||
if err := rows.Scan(&uid, &zoneID, ¤tRoom, &totalRooms,
|
||||
&abandoned, &bossDefeated, &completedAt, &lastAction); err != nil {
|
||||
rows.Close()
|
||||
return nil, fmt.Errorf("zone run scan: %w", err)
|
||||
}
|
||||
userID := id.UserID(uid)
|
||||
zoneDef := zoneOrFallback(ZoneID(zoneID))
|
||||
|
||||
var outcome, summary string
|
||||
switch {
|
||||
case bossDefeated == 1:
|
||||
outcome = "boss_defeated"
|
||||
summary = fmt.Sprintf("Cleared %s — boss down (%d/%d rooms).", zoneDef.Display, currentRoom, totalRooms)
|
||||
case completedAt != nil && abandoned == 0:
|
||||
outcome = "completed"
|
||||
summary = fmt.Sprintf("Cleared %s (%d/%d rooms).", zoneDef.Display, currentRoom, totalRooms)
|
||||
case abandoned == 1:
|
||||
outcome = "abandoned"
|
||||
summary = fmt.Sprintf("Withdrew from %s at room %d/%d.", zoneDef.Display, currentRoom, totalRooms)
|
||||
default:
|
||||
outcome = "in_progress"
|
||||
summary = fmt.Sprintf("Mid-run in %s (%d/%d rooms).", zoneDef.Display, currentRoom, totalRooms)
|
||||
}
|
||||
out[userID] = append(out[userID], AdvDailyActivity{
|
||||
UserID: userID,
|
||||
Source: "zone_run",
|
||||
Activity: "zone",
|
||||
Location: zoneDef.Display,
|
||||
Outcome: outcome,
|
||||
Summary: summary,
|
||||
Timestamp: lastAction,
|
||||
})
|
||||
}
|
||||
rows.Close()
|
||||
|
||||
// 3. dnd_expedition_log — pick the most-recent player-visible entry
|
||||
// per expedition for users active today. We rollup per expedition
|
||||
// rather than per row so the report doesn't list every camp/combat
|
||||
// beat separately.
|
||||
rows, err = d.Query(`
|
||||
SELECT e.user_id, e.zone_id, e.current_day, e.status,
|
||||
l.entry_type, l.summary, l.timestamp
|
||||
FROM dnd_expedition_log l
|
||||
JOIN dnd_expedition e ON e.expedition_id = l.expedition_id
|
||||
WHERE l.timestamp >= ? AND l.timestamp < DATE(?, '+1 day')
|
||||
AND l.entry_type IN ('action','combat','event','recap')
|
||||
ORDER BY l.timestamp`, date, date)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("expedition log: %w", err)
|
||||
}
|
||||
type expKey struct {
|
||||
uid, zoneID string
|
||||
}
|
||||
mostRecentExp := make(map[expKey]AdvDailyActivity)
|
||||
for rows.Next() {
|
||||
var (
|
||||
uid, zoneID, status, entryType, summary string
|
||||
currentDay int
|
||||
ts time.Time
|
||||
)
|
||||
if err := rows.Scan(&uid, &zoneID, ¤tDay, &status,
|
||||
&entryType, &summary, &ts); err != nil {
|
||||
rows.Close()
|
||||
return nil, fmt.Errorf("expedition log scan: %w", err)
|
||||
}
|
||||
userID := id.UserID(uid)
|
||||
zoneDef := zoneOrFallback(ZoneID(zoneID))
|
||||
k := expKey{string(userID), zoneID}
|
||||
mostRecentExp[k] = AdvDailyActivity{
|
||||
UserID: userID,
|
||||
Source: "expedition",
|
||||
Activity: "expedition",
|
||||
Location: zoneDef.Display,
|
||||
Outcome: status,
|
||||
Summary: fmt.Sprintf("Expedition in %s, day %d — %s",
|
||||
zoneDef.Display, currentDay, summary),
|
||||
Timestamp: ts,
|
||||
}
|
||||
}
|
||||
rows.Close()
|
||||
for _, entry := range mostRecentExp {
|
||||
out[entry.UserID] = append(out[entry.UserID], entry)
|
||||
}
|
||||
|
||||
// Sort each user's slice oldest→newest so callers can pick the
|
||||
// representative entry deterministically (typically the latest).
|
||||
for uid := range out {
|
||||
entries := out[uid]
|
||||
// Insertion-sort is fine here — slices are tiny.
|
||||
for i := 1; i < len(entries); i++ {
|
||||
for j := i; j > 0 && entries[j-1].Timestamp.After(entries[j].Timestamp); j-- {
|
||||
entries[j-1], entries[j] = entries[j], entries[j-1]
|
||||
}
|
||||
}
|
||||
out[uid] = entries
|
||||
}
|
||||
|
||||
return out, nil
|
||||
}
|
||||
Reference in New Issue
Block a user