From ec33dc3f8ac574de6090d32483536fd56b23b520 Mon Sep 17 00:00:00 2001 From: Brittany Ellich Date: Mon, 18 May 2026 05:36:49 +0000 Subject: [PATCH] Add tests, badges, favicon, etc. --- features/about/pages/about.templ | 2 +- features/about/pages/about_templ.go | 2 +- features/admin/handlers.go | 419 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------- features/admin/pages/badges.templ | 138 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ features/admin/pages/badges_templ.go | 500 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ features/admin/pages/dashboard.templ | 3 ++- features/admin/pages/dashboard_templ.go | 14 +++++++++----- features/admin/pages/events.templ | 84 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------- features/admin/pages/events_templ.go | 546 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- features/admin/pages/users.templ | 2 +- features/admin/pages/users_templ.go | 2 +- features/admin/routes.go | 7 +++++++ features/auth/drain_middleware.go | 26 +++++++++++++++++++++++++- features/auth/handlers.go | 2 +- features/auth/pages/signin.templ | 2 +- features/auth/pages/signin_atproto.templ | 2 +- features/auth/pages/signin_atproto_templ.go | 2 +- features/auth/pages/signin_templ.go | 2 +- features/common/layouts/base.templ | 5 +++++ features/common/layouts/base_templ.go | 89 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------ features/connect/handlers.go | 27 +++++++++++++++++++++++++-- features/connect/pages/connect.templ | 2 +- features/connect/pages/connect_templ.go | 2 +- features/connections/pages/connections.templ | 2 +- features/connections/pages/connections_templ.go | 2 +- features/connections/pages/profile.templ | 4 ++-- features/connections/pages/profile_templ.go | 4 ++-- features/event/pages/event.templ | 2 +- features/event/pages/event_templ.go | 2 +- features/events/handlers.go | 118 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------- features/events/pages/detail.templ | 67 ++++++++++++++++++++++++++++++++++++++++++++++++++----------------- features/events/pages/detail_templ.go | 748 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- features/events/pages/events.templ | 2 +- features/events/pages/events_templ.go | 2 +- features/index/handlers.go | 6 +++++- features/index/pages/index.templ | 54 +++++++++++++++++++++++++++++++++++------------------- features/index/pages/index_templ.go | 271 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------------------------------------------------------------------------------------------------------------- features/profile/handlers.go | 9 +++++++++ features/profile/pages/profile.templ | 32 +++++++++++++++++++++++++++++--- features/profile/pages/profile_edit.templ | 2 +- features/profile/pages/profile_edit_templ.go | 2 +- features/profile/pages/profile_templ.go | 96 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------------------- features/settings/handlers.go | 263 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------------- features/settings/pages/notes_list.templ | 94 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ features/settings/pages/notes_list_templ.go | 217 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ features/settings/pages/pds_data.templ | 93 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ features/settings/pages/pds_data_templ.go | 216 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ features/settings/pages/settings.templ | 146 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------------------------------------- features/settings/pages/settings_templ.go | 264 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------------------------------------------------------------- features/settings/routes.go | 7 ++++++- internal/admincrypto/signer_test.go | 235 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ internal/badge/award.go | 138 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ internal/badge/badge.go | 98 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------------------- internal/badge/badge_test.go | 303 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ internal/badge/definitions.go | 19 ++++++++++++------- internal/badge/definitions_test.go | 291 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ internal/checkin/list_test.go | 216 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ internal/connection/drain.go | 23 ++++++++++++++++++++++- internal/db/migrations/009_privacy_toggles.sql | 6 ++++++ internal/db/migrations/010_new_badge_definitions.sql | 15 +++++++++++++++ internal/db/migrations/011_event_badges_per_type.sql | 31 +++++++++++++++++++++++++++++++ internal/db/migrations/012_badge_message_and_host.sql | 11 +++++++++++ internal/event/put.go | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ internal/event/stats_test.go | 324 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ internal/interest/match_test.go | 94 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ internal/notes/notes_test.go | 231 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ internal/qrcode/qrcode.go | 2 +- internal/users/users.go | 64 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ internal/users/users_test.go | 349 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ router/router.go | 36 ++++++++++++++++++++++++++++++++++++ web/resources/static/assets/android-chrome-192x192.png | 0 web/resources/static/assets/android-chrome-512x512.png | 0 web/resources/static/assets/apple-touch-icon.png | 0 web/resources/static/assets/favicon-16x16.png | 0 web/resources/static/assets/favicon-32x32.png | 0 web/resources/static/assets/favicon.ico | 0 web/resources/static/assets/site.webmanifest | 19 +++++++++++++++++++ web/resources/static/css/terminal.css | 220 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------- web/resources/static/js/badge-designer.js | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ web/resources/static/js/badge-toast.js | 42 ++++++++++++++++++++++++++++++++++++++++++ web/resources/static/js/profile.js | 16 ++++++++++++++++ 81 file(s) changed, 6572 insertion(s)(+), 919 deletion(s)(-) diff --git a/features/about/pages/about.templ b/features/about/pages/about.templ --- a/features/about/pages/about.templ +++ b/features/about/pages/about.templ @@ -7,7 +7,7 @@ // Intentionally tiny — its job is to give a curious visitor enough context // to understand what "your data goes to your repo, not ours" means before // they sign in. templ AboutATProto() { - @layouts.Base("What's ATProto? — atmo.quest", "ATProto is an open social protocol — your records live in your repo, not ours.") { + @layouts.Base("What's ATProto?", "ATProto is an open social protocol — your records live in your repo, not ours.") {
diff --git a/features/about/pages/about_templ.go b/features/about/pages/about_templ.go --- a/features/about/pages/about_templ.go +++ b/features/about/pages/about_templ.go @@ -66,7 +66,7 @@ return templ_7745c5c3_Err } return nil }) - templ_7745c5c3_Err = layouts.Base("What's ATProto? — atmo.quest", "ATProto is an open social protocol — your records live in your repo, not ours.").Render(templ.WithChildren(ctx, templ_7745c5c3_Var2), templ_7745c5c3_Buffer) + templ_7745c5c3_Err = layouts.Base("What's ATProto?", "ATProto is an open social protocol — your records live in your repo, not ours.").Render(templ.WithChildren(ctx, templ_7745c5c3_Var2), templ_7745c5c3_Buffer) if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } diff --git a/features/admin/handlers.go b/features/admin/handlers.go --- a/features/admin/handlers.go +++ b/features/admin/handlers.go @@ -5,6 +5,7 @@ // non-admins get a flat 403. package admin import ( + "context" "database/sql" "encoding/json" "errors" @@ -23,6 +24,8 @@ "atmoquest/features/admin/pages" "atmoquest/features/auth" "atmoquest/internal/admincrypto" "atmoquest/internal/badge" + "atmoquest/internal/checkin" + "atmoquest/internal/connection" "atmoquest/internal/event" "atmoquest/internal/users" ) @@ -266,20 +269,28 @@ }, QRPublicURL: strings.TrimRight(config.Global.PublicURL, "/") + "/e/" + token, } + // Which badge type are we editing? + badgeType := r.URL.Query().Get("type") + if badgeType == "" { + badgeType = "event-attendee" + } + view.SelectedBadgeType = badgeType + if h.Signer != nil { - if d, err := badge.Get(r.Context(), h.DB, h.Signer, ev.URI); err == nil { + if d, err := badge.Get(r.Context(), h.DB, h.Signer, ev.URI, badgeType); err == nil { view.Design = pages.AdminBadgeDesign{ - Shape: d.Shape, - PrimaryColor: d.PrimaryColor, - AccentColor: d.AccentColor, - RibbonColor: d.RibbonColor, - Label: d.Label, - Signature: d.Signature, - SigningKeyID: d.SigningKeyID, + Shape: d.Shape, + PrimaryColor: d.PrimaryColor, + AccentColor: d.AccentColor, + RibbonColor: d.RibbonColor, + Label: d.Label, + MessageTemplate: d.MessageTemplate, + Signature: d.Signature, + SigningKeyID: d.SigningKeyID, } view.SVGPreview = badge.RenderSVG(d, 200) } else if !errors.Is(err, badge.ErrNotFound) { - slog.Warn("admin badge: get", "event_uri", ev.URI, "err", err) + slog.Warn("admin badge: get", "event_uri", ev.URI, "type", badgeType, "err", err) } } @@ -295,12 +306,67 @@ Label: view.Design.Label, }, 200) } + // Build event badge overview — show which badge types have designs. + eventBadgeTypes := []struct { + slug, name, desc string + }{ + {"event-attendee", "Event check-in", "Awarded when someone checks into this event"}, + {"event-leaderboard-1st", "Leaderboard 1st place", "Awarded to the top connector at event end"}, + {"event-leaderboard-2nd", "Leaderboard 2nd place", "Awarded to the runner-up at event end"}, + {"event-leaderboard-3rd", "Leaderboard 3rd place", "Awarded to third place at event end"}, + {"event-exceeded", "Beyond expectations", "Awarded when check-ins exceed expected attendees"}, + } + designMap, _ := badge.ListForEvent(r.Context(), h.DB, ev.URI) + for _, bt := range eventBadgeTypes { + eb := pages.EventBadgeOverview{ + Slug: bt.slug, + Name: bt.name, + Description: bt.desc, + } + if d, ok := designMap[bt.slug]; ok { + eb.Designed = true + eb.Label = d.Label + } + view.EventBadges = append(view.EventBadges, eb) + } + w.Header().Set("Content-Type", "text/html; charset=utf-8") if err := pages.AdminEventBadge(view).Render(r.Context(), w); err != nil { slog.Error("render admin badge", "err", err) } } +// BadgePreviewSVG renders a badge SVG from query parameters for the live +// designer preview. No signing or persistence — purely visual. +func (h *Handlers) BadgePreviewSVG(w http.ResponseWriter, r *http.Request) { + d := badge.Design{ + Shape: r.URL.Query().Get("shape"), + PrimaryColor: r.URL.Query().Get("primary_color"), + AccentColor: r.URL.Query().Get("accent_color"), + RibbonColor: r.URL.Query().Get("ribbon_color"), + Label: r.URL.Query().Get("label"), + } + if d.Shape == "" { + d.Shape = "shield" + } + if d.PrimaryColor == "" { + d.PrimaryColor = "#fab387" + } + if d.AccentColor == "" { + d.AccentColor = "#1e1e2e" + } + if d.RibbonColor == "" { + d.RibbonColor = "#f38ba8" + } + if d.Label == "" { + d.Label = "preview" + } + svg := badge.RenderSVG(d, 200) + w.Header().Set("Content-Type", "image/svg+xml") + w.Header().Set("Cache-Control", "no-cache") + _, _ = w.Write([]byte(svg)) +} + // AdminEventBadgeSave handles POST /admin/events/{token}/badge. func (h *Handlers) AdminEventBadgeSave(w http.ResponseWriter, r *http.Request) { if h.Signer == nil { @@ -314,20 +380,27 @@ http.NotFound(w, r) return } + badgeType := r.FormValue("badge_type") + if badgeType == "" { + badgeType = "event-attendee" + } + d := badge.Design{ - EventURI: ev.URI, - Shape: r.FormValue("shape"), - PrimaryColor: r.FormValue("primary_color"), - AccentColor: r.FormValue("accent_color"), - RibbonColor: r.FormValue("ribbon_color"), - Label: strings.TrimSpace(r.FormValue("label")), + EventURI: ev.URI, + BadgeType: badgeType, + Shape: r.FormValue("shape"), + PrimaryColor: r.FormValue("primary_color"), + AccentColor: r.FormValue("accent_color"), + RibbonColor: r.FormValue("ribbon_color"), + Label: strings.TrimSpace(r.FormValue("label")), + MessageTemplate: strings.TrimSpace(r.FormValue("message_template")), } if _, err := badge.Save(r.Context(), h.DB, h.Signer, d); err != nil { slog.Warn("admin badge save", "err", err) http.Error(w, err.Error(), http.StatusBadRequest) return } - http.Redirect(w, r, "/admin/events/"+token+"/badge?saved=1", http.StatusSeeOther) + http.Redirect(w, r, "/admin/events/"+token+"/badge?type="+badgeType+"&saved=1", http.StatusSeeOther) } // parseEventForm pulls form values into a CreateInput, returning a @@ -369,6 +442,320 @@ } in.StartTime = startT in.EndTime = endT return in, view, "" +} + +// AdminEventDelete handles POST /admin/events/{token}/delete — removes the +// event, its PDS record, and all associated local data (checkins, badges, etc.). +func (h *Handlers) AdminEventDelete(w http.ResponseWriter, r *http.Request) { + _, sess, ok := h.Auth.RequireSession(w, r) + if !ok { + return + } + + token := chi.URLParam(r, "token") + ev, err := event.LookupByQRToken(r.Context(), h.DB, token) + if err != nil { + http.NotFound(w, r) + return + } + + if err := event.Delete(r.Context(), sess, h.DB, ev.URI); err != nil { + slog.Error("admin event delete", "uri", ev.URI, "err", err) + http.Error(w, "failed to delete event", http.StatusInternalServerError) + return + } + + slog.Info("admin event deleted", "uri", ev.URI, "name", ev.Name) + http.Redirect(w, r, "/admin/events", http.StatusSeeOther) +} + +// AdminEventFinalize awards end-of-event badges: leaderboard top 3 and +// "exceeded expectations" if check-ins surpassed expected attendees. +// This is a manual admin action triggered after the event ends. +func (h *Handlers) AdminEventFinalize(w http.ResponseWriter, r *http.Request) { + _, _, ok := h.Auth.RequireSession(w, r) + if !ok { + return + } + + token := chi.URLParam(r, "token") + ev, err := event.LookupByQRToken(r.Context(), h.DB, token) + if err != nil { + http.NotFound(w, r) + return + } + + ctx := r.Context() + + // Get all checked-in attendees. + attendeeDIDs, _ := checkin.ListAttendeesForEvent(ctx, h.DB, ev.URI) + + // Build leaderboard (connection counts per attendee at this event). + type connCount struct { + did string + count int + } + var leaderboard []connCount + for _, didStr := range attendeeDIDs { + did, err := syntax.ParseDID(didStr) + if err != nil { + continue + } + // Skip users who opted out of leaderboard. + if users.IsHiddenFromLeaderboard(ctx, h.DB, didStr) { + continue + } + pds := lookupPDSForDIDAdmin(ctx, h.DB, did) + conns, _ := connection.List(ctx, pds, did) + eventConns := 0 + for _, c := range conns { + if c.EventURI == ev.URI { + eventConns++ + } + } + if eventConns > 0 { + leaderboard = append(leaderboard, connCount{did: didStr, count: eventConns}) + } + } + + // Sort by count desc. + for i := 0; i < len(leaderboard); i++ { + for j := i + 1; j < len(leaderboard); j++ { + if leaderboard[j].count > leaderboard[i].count { + leaderboard[i], leaderboard[j] = leaderboard[j], leaderboard[i] + } + } + } + + // Load custom message templates for this event's badges. + msgTemplates := make(map[string]string) + if designs, err := badge.ListForEvent(ctx, h.DB, ev.URI); err == nil { + for badgeType, d := range designs { + msgTemplates[badgeType] = d.MessageTemplate + } + } + + // Award leaderboard badges (1st, 2nd, 3rd) using competition ranking. + placeSlugs := []string{"event-leaderboard-1st", "event-leaderboard-2nd", "event-leaderboard-3rd"} + placeIdx := 0 + prevCount := -1 + for i, entry := range leaderboard { + if placeIdx >= len(placeSlugs) { + break + } + if entry.count != prevCount { + placeIdx = i + prevCount = entry.count + } + if placeIdx < len(placeSlugs) { + def, err := badge.GetDefinitionBySlug(ctx, h.DB, placeSlugs[placeIdx]) + if err == nil && !badge.HasEarned(ctx, h.DB, entry.did, def.ID) { + msg := badgeMessage(msgTemplates, placeSlugs[placeIdx], ev.Name) + _ = badge.RecordEarned(ctx, h.DB, entry.did, def.ID, "", msg) + slog.Info("finalize: awarded leaderboard badge", + "did", entry.did, "place", placeIdx+1, "connections", entry.count) + } + } + } + + // Award "exceeded expectations" badge if check-ins > expected attendees. + if ev.ExpectedAttendees > 0 && len(attendeeDIDs) > ev.ExpectedAttendees { + def, err := badge.GetDefinitionBySlug(ctx, h.DB, "event-exceeded") + if err == nil { + msg := badgeMessage(msgTemplates, "event-exceeded", ev.Name) + for _, didStr := range attendeeDIDs { + if !badge.HasEarned(ctx, h.DB, didStr, def.ID) { + _ = badge.RecordEarned(ctx, h.DB, didStr, def.ID, "", msg) + } + } + slog.Info("finalize: awarded exceeded badge", + "event", ev.Name, "checkins", len(attendeeDIDs), "expected", ev.ExpectedAttendees) + } + } + + // Award "event-host" badge if the event was successful (>1 check-in + >=1 connection). + totalConns := 0 + for _, cc := range leaderboard { + totalConns += cc.count + } + if len(attendeeDIDs) > 1 && totalConns > 0 && ev.OrganizerDID.String() != "" { + def, err := badge.GetDefinitionBySlug(ctx, h.DB, "event-host") + if err == nil && !badge.HasEarned(ctx, h.DB, ev.OrganizerDID.String(), def.ID) { + msg := badgeMessage(msgTemplates, "event-host", ev.Name) + if msg == "" { + msg = "Successfully hosted " + ev.Name + } + _ = badge.RecordEarned(ctx, h.DB, ev.OrganizerDID.String(), def.ID, "", msg) + slog.Info("finalize: awarded event-host badge", + "did", ev.OrganizerDID.String(), "event", ev.Name) + } + } + + slog.Info("admin event finalized", "uri", ev.URI, "name", ev.Name, + "attendees", len(attendeeDIDs), "leaderboard_entries", len(leaderboard)) + http.Redirect(w, r, "/admin/events", http.StatusSeeOther) +} + +// badgeMessage looks up a custom message template for a badge type, +// falling back to a default message with the event name. +func badgeMessage(templates map[string]string, badgeType, eventName string) string { + if msg, ok := templates[badgeType]; ok && msg != "" { + return msg + } + return "Earned at " + eventName +} + +// AdminBadges lists all app-wide badge definitions. +func (h *Handlers) AdminBadges(w http.ResponseWriter, r *http.Request) { + defs, err := badge.ListDefinitions(r.Context(), h.DB) + if err != nil { + slog.Error("admin badges: list", "err", err) + http.Error(w, "internal error", http.StatusInternalServerError) + return + } + + var view pages.AdminBadgesView + for _, d := range defs { + svg := badge.RenderSVG(badge.Design{ + Shape: d.Shape, + PrimaryColor: d.PrimaryColor, + AccentColor: d.AccentColor, + RibbonColor: d.RibbonColor, + Label: d.Label, + }, 80) + view.Badges = append(view.Badges, pages.AdminBadgeRow{ + ID: d.ID, + Slug: d.Slug, + Name: d.Name, + Description: d.Description, + Shape: d.Shape, + PrimaryColor: d.PrimaryColor, + AccentColor: d.AccentColor, + RibbonColor: d.RibbonColor, + Label: d.Label, + Trigger: d.Trigger, + SVGPreview: svg, + }) + } + + w.Header().Set("Content-Type", "text/html; charset=utf-8") + if err := pages.AdminBadges(view).Render(r.Context(), w); err != nil { + slog.Error("render admin badges", "err", err) + } +} + +// AdminBadgeEditPage renders the badge edit form for a specific definition. +func (h *Handlers) AdminBadgeEditPage(w http.ResponseWriter, r *http.Request) { + idStr := chi.URLParam(r, "id") + id, err := strconv.Atoi(idStr) + if err != nil { + http.NotFound(w, r) + return + } + + defs, _ := badge.ListDefinitions(r.Context(), h.DB) + var def *badge.Definition + for i := range defs { + if defs[i].ID == id { + def = &defs[i] + break + } + } + if def == nil { + http.NotFound(w, r) + return + } + + svg := badge.RenderSVG(badge.Design{ + Shape: def.Shape, + PrimaryColor: def.PrimaryColor, + AccentColor: def.AccentColor, + RibbonColor: def.RibbonColor, + Label: def.Label, + }, 200) + + view := pages.AdminBadgeEditView{ + Badge: pages.AdminBadgeRow{ + ID: def.ID, + Slug: def.Slug, + Name: def.Name, + Description: def.Description, + Shape: def.Shape, + PrimaryColor: def.PrimaryColor, + AccentColor: def.AccentColor, + RibbonColor: def.RibbonColor, + Label: def.Label, + Trigger: def.Trigger, + SVGPreview: svg, + }, + Shapes: badge.DefaultShapes, + Primary: badge.DefaultPrimaryColors, + Accent: badge.DefaultAccentColors, + Ribbon: badge.DefaultRibbonColors, + Saved: r.URL.Query().Get("saved") == "1", + } + + w.Header().Set("Content-Type", "text/html; charset=utf-8") + if err := pages.AdminBadgeEdit(view).Render(r.Context(), w); err != nil { + slog.Error("render admin badge edit", "err", err) + } +} + +// AdminBadgeEditSave handles POST /admin/badges/{id}/edit — updates the +// badge definition's visual design. +func (h *Handlers) AdminBadgeEditSave(w http.ResponseWriter, r *http.Request) { + idStr := chi.URLParam(r, "id") + id, err := strconv.Atoi(idStr) + if err != nil { + http.NotFound(w, r) + return + } + + if err := r.ParseForm(); err != nil { + http.Error(w, "bad request", http.StatusBadRequest) + return + } + + _, err = h.DB.ExecContext(r.Context(), ` + UPDATE badge_definitions SET + name = ?, + description = ?, + shape = ?, + primary_color = ?, + accent_color = ?, + ribbon_color = ?, + label = ? + WHERE id = ? + `, + strings.TrimSpace(r.FormValue("name")), + strings.TrimSpace(r.FormValue("description")), + r.FormValue("shape"), + r.FormValue("primary_color"), + r.FormValue("accent_color"), + r.FormValue("ribbon_color"), + strings.TrimSpace(r.FormValue("label")), + id, + ) + if err != nil { + slog.Warn("admin badge edit save", "id", id, "err", err) + http.Error(w, "failed to save", http.StatusInternalServerError) + return + } + + http.Redirect(w, r, fmt.Sprintf("/admin/badges/%d/edit?saved=1", id), http.StatusSeeOther) +} + +// lookupPDSForDIDAdmin is a helper that looks up PDS host from oauth_sessions. +func lookupPDSForDIDAdmin(ctx context.Context, db *sql.DB, did syntax.DID) string { + var host string + err := db.QueryRowContext(ctx, ` + SELECT data ->> 'host_url' FROM oauth_sessions + WHERE did = ? ORDER BY updated_at DESC LIMIT 1 + `, did.String()).Scan(&host) + if err == nil && host != "" { + return host + } + return "https://bsky.social" } // toAdminEventRows projects []event.AdminEvent into the view type. We diff --git a/features/admin/pages/badges.templ b/features/admin/pages/badges.templ new file mode 100644 --- /dev/null +++ b/features/admin/pages/badges.templ @@ -0,0 +1,138 @@ +package pages + +import ( + "fmt" + + "atmoquest/features/common/layouts" +) + +// AdminBadgesView is the data for /admin/badges. +type AdminBadgesView struct { + Badges []AdminBadgeRow +} + +// AdminBadgeRow is one badge definition in the admin list. +type AdminBadgeRow struct { + ID int + Slug string + Name string + Description string + Shape string + PrimaryColor string + AccentColor string + RibbonColor string + Label string + Trigger string + SVGPreview string +} + +// AdminBadgeEditView is the data for /admin/badges/{id}/edit. +type AdminBadgeEditView struct { + Badge AdminBadgeRow + Shapes []string + Primary []string + Accent []string + Ribbon []string + Saved bool + Error string +} + +templ AdminBadges(v AdminBadgesView) { + @layouts.Base("admin · badges", "Manage app-wide badge definitions.") { + @adminShell("badges", "") { +

App badges

+

+ These are the app-wide badge definitions. Click a badge to edit its design. +

+ + if len(v.Badges) == 0 { +

no badge definitions found.

+ } else { +
+ for _, b := range v.Badges { + +
+ @templ.Raw(b.SVGPreview) +
+
+
{ b.Name }
+
{ b.Description }
+ if b.Trigger != "" { +
{ b.Trigger }
+ } +
+ + } +
+ } + } + } +} + +templ AdminBadgeEdit(v AdminBadgeEditView) { + @layouts.Base("admin · edit badge", "Edit a badge definition.") { + @adminShell("badges", "") { +

edit badge — { v.Badge.Name }

+ + if v.Saved { +
+ ✓ badge design saved. +
+ } + if v.Error != "" { + + } + +
+
+ @templ.Raw(v.Badge.SVGPreview) +

{ v.Badge.Slug }

+ if v.Badge.Trigger != "" { +

trigger: { v.Badge.Trigger }

+ } +
+ +
+
+ + +
+
+ + +
+
+ + +
+ @colorSwatchField("primary_color", "primary color", v.Primary, v.Badge.PrimaryColor) + @colorSwatchField("accent_color", "accent color", v.Accent, v.Badge.AccentColor) + @colorSwatchField("ribbon_color", "ribbon color", v.Ribbon, v.Badge.RibbonColor) +
+ + +
+
+ + ← all badges +
+
+
+ + } + } +} + +func badgeIDStr(id int) string { + return fmt.Sprintf("%d", id) +} diff --git a/features/admin/pages/badges_templ.go b/features/admin/pages/badges_templ.go new file mode 100644 --- /dev/null +++ b/features/admin/pages/badges_templ.go @@ -0,0 +1,500 @@ +// Code generated by templ - DO NOT EDIT. + +// templ: version: v0.3.1020 +package pages + +//lint:file-ignore SA4006 This context is only used if a nested component is present. + +import "github.com/a-h/templ" +import templruntime "github.com/a-h/templ/runtime" + +import ( + "fmt" + + "atmoquest/features/common/layouts" +) + +// AdminBadgesView is the data for /admin/badges. +type AdminBadgesView struct { + Badges []AdminBadgeRow +} + +// AdminBadgeRow is one badge definition in the admin list. +type AdminBadgeRow struct { + ID int + Slug string + Name string + Description string + Shape string + PrimaryColor string + AccentColor string + RibbonColor string + Label string + Trigger string + SVGPreview string +} + +// AdminBadgeEditView is the data for /admin/badges/{id}/edit. +type AdminBadgeEditView struct { + Badge AdminBadgeRow + Shapes []string + Primary []string + Accent []string + Ribbon []string + Saved bool + Error string +} + +func AdminBadges(v AdminBadgesView) templ.Component { + return templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) { + templ_7745c5c3_W, ctx := templ_7745c5c3_Input.Writer, templ_7745c5c3_Input.Context + if templ_7745c5c3_CtxErr := ctx.Err(); templ_7745c5c3_CtxErr != nil { + return templ_7745c5c3_CtxErr + } + templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templruntime.GetBuffer(templ_7745c5c3_W) + if !templ_7745c5c3_IsBuffer { + defer func() { + templ_7745c5c3_BufErr := templruntime.ReleaseBuffer(templ_7745c5c3_Buffer) + if templ_7745c5c3_Err == nil { + templ_7745c5c3_Err = templ_7745c5c3_BufErr + } + }() + } + ctx = templ.InitializeContext(ctx) + templ_7745c5c3_Var1 := templ.GetChildren(ctx) + if templ_7745c5c3_Var1 == nil { + templ_7745c5c3_Var1 = templ.NopComponent + } + ctx = templ.ClearChildren(ctx) + templ_7745c5c3_Var2 := templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) { + templ_7745c5c3_W, ctx := templ_7745c5c3_Input.Writer, templ_7745c5c3_Input.Context + templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templruntime.GetBuffer(templ_7745c5c3_W) + if !templ_7745c5c3_IsBuffer { + defer func() { + templ_7745c5c3_BufErr := templruntime.ReleaseBuffer(templ_7745c5c3_Buffer) + if templ_7745c5c3_Err == nil { + templ_7745c5c3_Err = templ_7745c5c3_BufErr + } + }() + } + ctx = templ.InitializeContext(ctx) + templ_7745c5c3_Var3 := templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) { + templ_7745c5c3_W, ctx := templ_7745c5c3_Input.Writer, templ_7745c5c3_Input.Context + templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templruntime.GetBuffer(templ_7745c5c3_W) + if !templ_7745c5c3_IsBuffer { + defer func() { + templ_7745c5c3_BufErr := templruntime.ReleaseBuffer(templ_7745c5c3_Buffer) + if templ_7745c5c3_Err == nil { + templ_7745c5c3_Err = templ_7745c5c3_BufErr + } + }() + } + ctx = templ.InitializeContext(ctx) + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 1, "

App badges

These are the app-wide badge definitions. Click a badge to edit its design.

") + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + if len(v.Badges) == 0 { + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 2, "

no badge definitions found.

") + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + } else { + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 3, "
") + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + for _, b := range v.Badges { + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 4, "
") + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + templ_7745c5c3_Err = templ.Raw(b.SVGPreview).Render(ctx, templ_7745c5c3_Buffer) + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 6, "
") + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + var templ_7745c5c3_Var5 string + templ_7745c5c3_Var5, templ_7745c5c3_Err = templ.JoinStringErrs(b.Name) + if templ_7745c5c3_Err != nil { + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/admin/pages/badges.templ`, Line: 58, Col: 51} + } + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var5)) + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 7, "
") + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + var templ_7745c5c3_Var6 string + templ_7745c5c3_Var6, templ_7745c5c3_Err = templ.JoinStringErrs(b.Description) + if templ_7745c5c3_Err != nil { + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/admin/pages/badges.templ`, Line: 59, Col: 64} + } + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var6)) + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 8, "
") + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + if b.Trigger != "" { + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 9, "
") + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + var templ_7745c5c3_Var7 string + templ_7745c5c3_Var7, templ_7745c5c3_Err = templ.JoinStringErrs(b.Trigger) + if templ_7745c5c3_Err != nil { + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/admin/pages/badges.templ`, Line: 61, Col: 64} + } + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var7)) + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 10, "
") + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + } + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 11, "
") + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + } + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 12, "
") + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + } + return nil + }) + templ_7745c5c3_Err = adminShell("badges", "").Render(templ.WithChildren(ctx, templ_7745c5c3_Var3), templ_7745c5c3_Buffer) + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + return nil + }) + templ_7745c5c3_Err = layouts.Base("admin · badges", "Manage app-wide badge definitions.").Render(templ.WithChildren(ctx, templ_7745c5c3_Var2), templ_7745c5c3_Buffer) + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + return nil + }) +} + +func AdminBadgeEdit(v AdminBadgeEditView) templ.Component { + return templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) { + templ_7745c5c3_W, ctx := templ_7745c5c3_Input.Writer, templ_7745c5c3_Input.Context + if templ_7745c5c3_CtxErr := ctx.Err(); templ_7745c5c3_CtxErr != nil { + return templ_7745c5c3_CtxErr + } + templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templruntime.GetBuffer(templ_7745c5c3_W) + if !templ_7745c5c3_IsBuffer { + defer func() { + templ_7745c5c3_BufErr := templruntime.ReleaseBuffer(templ_7745c5c3_Buffer) + if templ_7745c5c3_Err == nil { + templ_7745c5c3_Err = templ_7745c5c3_BufErr + } + }() + } + ctx = templ.InitializeContext(ctx) + templ_7745c5c3_Var8 := templ.GetChildren(ctx) + if templ_7745c5c3_Var8 == nil { + templ_7745c5c3_Var8 = templ.NopComponent + } + ctx = templ.ClearChildren(ctx) + templ_7745c5c3_Var9 := templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) { + templ_7745c5c3_W, ctx := templ_7745c5c3_Input.Writer, templ_7745c5c3_Input.Context + templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templruntime.GetBuffer(templ_7745c5c3_W) + if !templ_7745c5c3_IsBuffer { + defer func() { + templ_7745c5c3_BufErr := templruntime.ReleaseBuffer(templ_7745c5c3_Buffer) + if templ_7745c5c3_Err == nil { + templ_7745c5c3_Err = templ_7745c5c3_BufErr + } + }() + } + ctx = templ.InitializeContext(ctx) + templ_7745c5c3_Var10 := templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) { + templ_7745c5c3_W, ctx := templ_7745c5c3_Input.Writer, templ_7745c5c3_Input.Context + templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templruntime.GetBuffer(templ_7745c5c3_W) + if !templ_7745c5c3_IsBuffer { + defer func() { + templ_7745c5c3_BufErr := templruntime.ReleaseBuffer(templ_7745c5c3_Buffer) + if templ_7745c5c3_Err == nil { + templ_7745c5c3_Err = templ_7745c5c3_BufErr + } + }() + } + ctx = templ.InitializeContext(ctx) + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 13, "

edit badge — ") + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + var templ_7745c5c3_Var11 string + templ_7745c5c3_Var11, templ_7745c5c3_Err = templ.JoinStringErrs(v.Badge.Name) + if templ_7745c5c3_Err != nil { + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/admin/pages/badges.templ`, Line: 75, Col: 64} + } + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var11)) + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 14, "

") + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + if v.Saved { + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 15, "
✓ badge design saved.
") + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + } + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 16, " ") + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + if v.Error != "" { + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 17, "
error: ") + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + var templ_7745c5c3_Var12 string + templ_7745c5c3_Var12, templ_7745c5c3_Err = templ.JoinStringErrs(v.Error) + if templ_7745c5c3_Err != nil { + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/admin/pages/badges.templ`, Line: 84, Col: 60} + } + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var12)) + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 18, "
") + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + } + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 19, "
") + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + templ_7745c5c3_Err = templ.Raw(v.Badge.SVGPreview).Render(ctx, templ_7745c5c3_Buffer) + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 20, "

") + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + var templ_7745c5c3_Var13 string + templ_7745c5c3_Var13, templ_7745c5c3_Err = templ.JoinStringErrs(v.Badge.Slug) + if templ_7745c5c3_Err != nil { + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/admin/pages/badges.templ`, Line: 91, Col: 65} + } + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var13)) + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 21, "

") + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + if v.Badge.Trigger != "" { + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 22, "

trigger: ") + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + var templ_7745c5c3_Var14 string + templ_7745c5c3_Var14, templ_7745c5c3_Err = templ.JoinStringErrs(v.Badge.Trigger) + if templ_7745c5c3_Err != nil { + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/admin/pages/badges.templ`, Line: 93, Col: 62} + } + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var14)) + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 23, "

") + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + } + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 24, "
") + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + templ_7745c5c3_Err = colorSwatchField("primary_color", "primary color", v.Primary, v.Badge.PrimaryColor).Render(ctx, templ_7745c5c3_Buffer) + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + templ_7745c5c3_Err = colorSwatchField("accent_color", "accent color", v.Accent, v.Badge.AccentColor).Render(ctx, templ_7745c5c3_Buffer) + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + templ_7745c5c3_Err = colorSwatchField("ribbon_color", "ribbon color", v.Ribbon, v.Badge.RibbonColor).Render(ctx, templ_7745c5c3_Buffer) + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 35, "
← all badges
") + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + return nil + }) + templ_7745c5c3_Err = adminShell("badges", "").Render(templ.WithChildren(ctx, templ_7745c5c3_Var10), templ_7745c5c3_Buffer) + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + return nil + }) + templ_7745c5c3_Err = layouts.Base("admin · edit badge", "Edit a badge definition.").Render(templ.WithChildren(ctx, templ_7745c5c3_Var9), templ_7745c5c3_Buffer) + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + return nil + }) +} + +func badgeIDStr(id int) string { + return fmt.Sprintf("%d", id) +} + +var _ = templruntime.GeneratedTemplate diff --git a/features/admin/pages/dashboard.templ b/features/admin/pages/dashboard.templ --- a/features/admin/pages/dashboard.templ +++ b/features/admin/pages/dashboard.templ @@ -19,7 +19,7 @@ CurrentHandle string } templ AdminDashboard(v AdminDashboardView) { - @layouts.Base("admin — atmo.quest", "atmo.quest admin console.") { + @layouts.Base("admin", "atmo.quest admin console.") { @adminShell("dashboard", v.CurrentHandle) {
@statTile("users", intStr(v.TotalUsers), "total signed in") @@ -73,6 +73,7 @@ diff --git a/features/admin/pages/dashboard_templ.go b/features/admin/pages/dashboard_templ.go --- a/features/admin/pages/dashboard_templ.go +++ b/features/admin/pages/dashboard_templ.go @@ -143,7 +143,7 @@ return templ_7745c5c3_Err } return nil }) - templ_7745c5c3_Err = layouts.Base("admin — atmo.quest", "atmo.quest admin console.").Render(templ.WithChildren(ctx, templ_7745c5c3_Var2), templ_7745c5c3_Buffer) + templ_7745c5c3_Err = layouts.Base("admin", "atmo.quest admin console.").Render(templ.WithChildren(ctx, templ_7745c5c3_Var2), templ_7745c5c3_Buffer) if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } @@ -285,6 +285,10 @@ templ_7745c5c3_Err = adminNavLink("/admin/events", "events", active == "events").Render(ctx, templ_7745c5c3_Buffer) if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } + templ_7745c5c3_Err = adminNavLink("/admin/badges", "badges", active == "badges").Render(ctx, templ_7745c5c3_Buffer) + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 13, "← back to app") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err @@ -330,7 +334,7 @@ } var templ_7745c5c3_Var14 templ.SafeURL templ_7745c5c3_Var14, templ_7745c5c3_Err = templ.JoinURLErrs(templ.SafeURL(href)) if templ_7745c5c3_Err != nil { - return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/admin/pages/dashboard.templ`, Line: 92, Col: 64} + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/admin/pages/dashboard.templ`, Line: 93, Col: 64} } _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var14)) if templ_7745c5c3_Err != nil { @@ -343,7 +347,7 @@ } var templ_7745c5c3_Var15 string templ_7745c5c3_Var15, templ_7745c5c3_Err = templ.JoinStringErrs(label) if templ_7745c5c3_Err != nil { - return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/admin/pages/dashboard.templ`, Line: 92, Col: 78} + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/admin/pages/dashboard.templ`, Line: 93, Col: 78} } _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var15)) if templ_7745c5c3_Err != nil { @@ -361,7 +365,7 @@ } var templ_7745c5c3_Var16 templ.SafeURL templ_7745c5c3_Var16, templ_7745c5c3_Err = templ.JoinURLErrs(templ.SafeURL(href)) if templ_7745c5c3_Err != nil { - return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/admin/pages/dashboard.templ`, Line: 94, Col: 54} + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/admin/pages/dashboard.templ`, Line: 95, Col: 54} } _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var16)) if templ_7745c5c3_Err != nil { @@ -374,7 +378,7 @@ } var templ_7745c5c3_Var17 string templ_7745c5c3_Var17, templ_7745c5c3_Err = templ.JoinStringErrs(label) if templ_7745c5c3_Err != nil { - return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/admin/pages/dashboard.templ`, Line: 94, Col: 64} + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/admin/pages/dashboard.templ`, Line: 95, Col: 64} } _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var17)) if templ_7745c5c3_Err != nil { diff --git a/features/admin/pages/events.templ b/features/admin/pages/events.templ --- a/features/admin/pages/events.templ +++ b/features/admin/pages/events.templ @@ -21,7 +21,7 @@ QRPublicURL string } templ AdminEvents(v AdminEventsView) { - @layouts.Base("admin · events — atmo.quest", "Manage atmo.quest events.") { + @layouts.Base("admin · events", "Manage atmo.quest events.") { @adminShell("events", "") {
▸ new event @@ -57,7 +57,14 @@ { ev.StartTime }  →  { ev.EndTime } { intStr(ev.ExpectedAttendees) } { ev.QRPublicURL } + QR ↓ badge → +
+ +
+
+ +
} @@ -81,7 +88,7 @@ Error string } templ AdminEventNew(v AdminEventFormView) { - @layouts.Base("admin · new event — atmo.quest", "Create a new atmo.quest event.") { + @layouts.Base("admin · new event", "Create a new atmo.quest event.") { @adminShell("events", "") {

create event

@@ -136,29 +143,69 @@ Shapes []string Primary []string Accent []string Ribbon []string - Design AdminBadgeDesign - SVGPreview string - QRPublicURL string + Design AdminBadgeDesign + SVGPreview string + QRPublicURL string + EventBadges []EventBadgeOverview // all badge types for this event + SelectedBadgeType string // which badge type is being edited +} + +// EventBadgeOverview shows the status of a badge type for an event. +type EventBadgeOverview struct { + Slug string + Name string + Description string + Designed bool // true if a design has been saved + Label string // the label on the badge (if designed) } // AdminBadgeDesign is the current state of the badge being designed. type AdminBadgeDesign struct { - Shape string - PrimaryColor string - AccentColor string - RibbonColor string - Label string - Signature string - SigningKeyID string + Shape string + PrimaryColor string + AccentColor string + RibbonColor string + Label string + MessageTemplate string + Signature string + SigningKeyID string } templ AdminEventBadge(v AdminEventBadgeView) { - @layouts.Base("admin · badge designer — atmo.quest", "Design an event badge.") { + @layouts.Base("admin · badge designer", "Design an event badge.") { @adminShell("events", "") {

badge designer — { v.EventName }

+ if len(v.EventBadges) > 0 { +
+
Event badges — click to design
+
+ for _, eb := range v.EventBadges { + +
+ if eb.Designed { + ◆ + } else { + ◇ + } +
+
+
{ eb.Name }
+
{ eb.Description }
+
+ if eb.Designed { +
{ eb.Label }
+ } else { +
not designed
+ } + + } +
+
+ } +
-
+
@templ.Raw(v.SVGPreview)

{ v.EventURI } @@ -171,6 +218,7 @@ }

+
+
+ + + shown when someone views their badge +
- download QR + ← all events

@@ -203,6 +256,7 @@ verification on next read.

+ } } } diff --git a/features/admin/pages/events_templ.go b/features/admin/pages/events_templ.go --- a/features/admin/pages/events_templ.go +++ b/features/admin/pages/events_templ.go @@ -191,20 +191,59 @@ if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } var templ_7745c5c3_Var11 templ.SafeURL - templ_7745c5c3_Var11, templ_7745c5c3_Err = templ.JoinURLErrs(templ.SafeURL("/admin/events/" + ev.QRToken + "/badge")) + templ_7745c5c3_Var11, templ_7745c5c3_Err = templ.JoinURLErrs(templ.SafeURL("/e/" + ev.QRToken + "/qr.svg")) if templ_7745c5c3_Err != nil { - return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/admin/pages/events.templ`, Line: 60, Col: 104} + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/admin/pages/events.templ`, Line: 60, Col: 94} } _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var11)) if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 13, "\">badge →") + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 13, "\">QR ↓ badge →
") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } } - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 14, "
") + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 17, "
") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } @@ -217,7 +256,7 @@ return templ_7745c5c3_Err } return nil }) - templ_7745c5c3_Err = layouts.Base("admin · events — atmo.quest", "Manage atmo.quest events.").Render(templ.WithChildren(ctx, templ_7745c5c3_Var2), templ_7745c5c3_Buffer) + templ_7745c5c3_Err = layouts.Base("admin · events", "Manage atmo.quest events.").Render(templ.WithChildren(ctx, templ_7745c5c3_Var2), templ_7745c5c3_Buffer) if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } @@ -252,12 +291,12 @@ } }() } ctx = templ.InitializeContext(ctx) - templ_7745c5c3_Var12 := templ.GetChildren(ctx) - if templ_7745c5c3_Var12 == nil { - templ_7745c5c3_Var12 = templ.NopComponent + templ_7745c5c3_Var15 := templ.GetChildren(ctx) + if templ_7745c5c3_Var15 == nil { + templ_7745c5c3_Var15 = templ.NopComponent } ctx = templ.ClearChildren(ctx) - templ_7745c5c3_Var13 := templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) { + templ_7745c5c3_Var16 := templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) { templ_7745c5c3_W, ctx := templ_7745c5c3_Input.Writer, templ_7745c5c3_Input.Context templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templruntime.GetBuffer(templ_7745c5c3_W) if !templ_7745c5c3_IsBuffer { @@ -269,7 +308,7 @@ } }() } ctx = templ.InitializeContext(ctx) - templ_7745c5c3_Var14 := templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) { + templ_7745c5c3_Var17 := templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) { templ_7745c5c3_W, ctx := templ_7745c5c3_Input.Writer, templ_7745c5c3_Input.Context templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templruntime.GetBuffer(templ_7745c5c3_W) if !templ_7745c5c3_IsBuffer { @@ -281,107 +320,107 @@ } }() } ctx = templ.InitializeContext(ctx) - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 15, "

create event

") + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 18, "

create event

") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } if v.Error != "" { - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 16, "
heads up: ") + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 19, "
heads up: ") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } - var templ_7745c5c3_Var15 string - templ_7745c5c3_Var15, templ_7745c5c3_Err = templ.JoinStringErrs(v.Error) + var templ_7745c5c3_Var18 string + templ_7745c5c3_Var18, templ_7745c5c3_Err = templ.JoinStringErrs(v.Error) if templ_7745c5c3_Err != nil { - return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/admin/pages/events.templ`, Line: 90, Col: 63} + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/admin/pages/events.templ`, Line: 97, Col: 63} } - _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var15)) + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var18)) if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 17, "
") + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 20, "
") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } } - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 18, "
cancel

creating an event writes a quest.atmo.event record to your PDS. you'll be taken to the badge designer next.

") + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 26, "\">
cancel

creating an event writes a quest.atmo.event record to your PDS. you'll be taken to the badge designer next.

") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } return nil }) - templ_7745c5c3_Err = adminShell("events", "").Render(templ.WithChildren(ctx, templ_7745c5c3_Var14), templ_7745c5c3_Buffer) + templ_7745c5c3_Err = adminShell("events", "").Render(templ.WithChildren(ctx, templ_7745c5c3_Var17), templ_7745c5c3_Buffer) if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } return nil }) - templ_7745c5c3_Err = layouts.Base("admin · new event — atmo.quest", "Create a new atmo.quest event.").Render(templ.WithChildren(ctx, templ_7745c5c3_Var13), templ_7745c5c3_Buffer) + templ_7745c5c3_Err = layouts.Base("admin · new event", "Create a new atmo.quest event.").Render(templ.WithChildren(ctx, templ_7745c5c3_Var16), templ_7745c5c3_Buffer) if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } @@ -391,27 +430,39 @@ } // AdminEventBadgeView feeds the badge designer page. type AdminEventBadgeView struct { - EventURI string - EventName string - Token string - Shapes []string - Primary []string - Accent []string - Ribbon []string - Design AdminBadgeDesign - SVGPreview string - QRPublicURL string + EventURI string + EventName string + Token string + Shapes []string + Primary []string + Accent []string + Ribbon []string + Design AdminBadgeDesign + SVGPreview string + QRPublicURL string + EventBadges []EventBadgeOverview // all badge types for this event + SelectedBadgeType string // which badge type is being edited +} + +// EventBadgeOverview shows the status of a badge type for an event. +type EventBadgeOverview struct { + Slug string + Name string + Description string + Designed bool // true if a design has been saved + Label string // the label on the badge (if designed) } // AdminBadgeDesign is the current state of the badge being designed. type AdminBadgeDesign struct { - Shape string - PrimaryColor string - AccentColor string - RibbonColor string - Label string - Signature string - SigningKeyID string + Shape string + PrimaryColor string + AccentColor string + RibbonColor string + Label string + MessageTemplate string + Signature string + SigningKeyID string } func AdminEventBadge(v AdminEventBadgeView) templ.Component { @@ -430,12 +481,12 @@ } }() } ctx = templ.InitializeContext(ctx) - templ_7745c5c3_Var21 := templ.GetChildren(ctx) - if templ_7745c5c3_Var21 == nil { - templ_7745c5c3_Var21 = templ.NopComponent + templ_7745c5c3_Var24 := templ.GetChildren(ctx) + if templ_7745c5c3_Var24 == nil { + templ_7745c5c3_Var24 = templ.NopComponent } ctx = templ.ClearChildren(ctx) - templ_7745c5c3_Var22 := templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) { + templ_7745c5c3_Var25 := templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) { templ_7745c5c3_W, ctx := templ_7745c5c3_Input.Writer, templ_7745c5c3_Input.Context templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templruntime.GetBuffer(templ_7745c5c3_W) if !templ_7745c5c3_IsBuffer { @@ -447,7 +498,7 @@ } }() } ctx = templ.InitializeContext(ctx) - templ_7745c5c3_Var23 := templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) { + templ_7745c5c3_Var26 := templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) { templ_7745c5c3_W, ctx := templ_7745c5c3_Input.Writer, templ_7745c5c3_Input.Context templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templruntime.GetBuffer(templ_7745c5c3_W) if !templ_7745c5c3_IsBuffer { @@ -459,20 +510,140 @@ } }() } ctx = templ.InitializeContext(ctx) - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 24, "

badge designer — ") + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 27, "

badge designer — ") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } - var templ_7745c5c3_Var24 string - templ_7745c5c3_Var24, templ_7745c5c3_Err = templ.JoinStringErrs(v.EventName) + var templ_7745c5c3_Var27 string + templ_7745c5c3_Var27, templ_7745c5c3_Err = templ.JoinStringErrs(v.EventName) if templ_7745c5c3_Err != nil { - return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/admin/pages/events.templ`, Line: 158, Col: 67} + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/admin/pages/events.templ`, Line: 177, Col: 67} } - _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var24)) + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var27)) if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 25, "

") + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 28, "") + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + if len(v.EventBadges) > 0 { + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 29, "
Event badges — click to design
") + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + for _, eb := range v.EventBadges { + var templ_7745c5c3_Var28 = []any{"settings-row", templ.KV("active-badge-type", eb.Slug == v.SelectedBadgeType)} + templ_7745c5c3_Err = templ.RenderCSSItems(ctx, templ_7745c5c3_Buffer, templ_7745c5c3_Var28...) + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 30, "
") + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + if eb.Designed { + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 33, "◆") + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + } else { + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 34, "◇") + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + } + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 35, "
") + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + var templ_7745c5c3_Var31 string + templ_7745c5c3_Var31, templ_7745c5c3_Err = templ.JoinStringErrs(eb.Name) + if templ_7745c5c3_Err != nil { + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/admin/pages/events.templ`, Line: 193, Col: 50} + } + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var31)) + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 36, "
") + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + var templ_7745c5c3_Var32 string + templ_7745c5c3_Var32, templ_7745c5c3_Err = templ.JoinStringErrs(eb.Description) + if templ_7745c5c3_Err != nil { + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/admin/pages/events.templ`, Line: 194, Col: 56} + } + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var32)) + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 37, "
") + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + if eb.Designed { + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 38, "
") + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + var templ_7745c5c3_Var33 string + templ_7745c5c3_Var33, templ_7745c5c3_Err = templ.JoinStringErrs(eb.Label) + if templ_7745c5c3_Err != nil { + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/admin/pages/events.templ`, Line: 197, Col: 57} + } + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var33)) + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 39, "
") + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + } else { + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 40, "
not designed
") + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + } + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 41, "") + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + } + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 42, "
") + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + } + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 43, "
") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } @@ -480,125 +651,138 @@ templ_7745c5c3_Err = templ.Raw(v.SVGPreview).Render(ctx, templ_7745c5c3_Buffer) if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 26, "

") + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 44, "

") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } - var templ_7745c5c3_Var25 string - templ_7745c5c3_Var25, templ_7745c5c3_Err = templ.JoinStringErrs(v.EventURI) + var templ_7745c5c3_Var34 string + templ_7745c5c3_Var34, templ_7745c5c3_Err = templ.JoinStringErrs(v.EventURI) if templ_7745c5c3_Err != nil { - return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/admin/pages/events.templ`, Line: 164, Col: 25} + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/admin/pages/events.templ`, Line: 211, Col: 25} } - _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var25)) + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var34)) if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 27, "

") + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 45, "

") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } if v.Design.Signature != "" { - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 28, "

● signed (key ") + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 46, "

● signed (key ") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } - var templ_7745c5c3_Var26 string - templ_7745c5c3_Var26, templ_7745c5c3_Err = templ.JoinStringErrs(v.Design.SigningKeyID) + var templ_7745c5c3_Var35 string + templ_7745c5c3_Var35, templ_7745c5c3_Err = templ.JoinStringErrs(v.Design.SigningKeyID) if templ_7745c5c3_Err != nil { - return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/admin/pages/events.templ`, Line: 168, Col: 70} + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/admin/pages/events.templ`, Line: 215, Col: 70} } - _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var26)) + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var35)) if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 29, ")

") + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 47, ")

") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } } - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 30, "
") + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 57, "
") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } @@ -614,71 +798,71 @@ templ_7745c5c3_Err = colorSwatchField("ribbon_color", "ribbon color", v.Ribbon, v.Design.RibbonColor).Render(ctx, templ_7745c5c3_Buffer) if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 39, "
download QR ← all events

public scan URL: shown when someone views their badge

← all events

public scan URL: ") + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 61, "\">") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } - var templ_7745c5c3_Var35 string - templ_7745c5c3_Var35, templ_7745c5c3_Err = templ.JoinStringErrs(v.QRPublicURL) + var templ_7745c5c3_Var45 string + templ_7745c5c3_Var45, templ_7745c5c3_Err = templ.JoinStringErrs(v.QRPublicURL) if templ_7745c5c3_Err != nil { - return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/admin/pages/events.templ`, Line: 199, Col: 93} + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/admin/pages/events.templ`, Line: 252, Col: 93} } - _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var35)) + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var45)) if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 43, "
saving signs this design with the server's admin key (ed25519). tampering with the row in the database will fail signature verification on next read.

") + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 62, "
saving signs this design with the server's admin key (ed25519). tampering with the row in the database will fail signature verification on next read.

") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } return nil }) - templ_7745c5c3_Err = adminShell("events", "").Render(templ.WithChildren(ctx, templ_7745c5c3_Var23), templ_7745c5c3_Buffer) + templ_7745c5c3_Err = adminShell("events", "").Render(templ.WithChildren(ctx, templ_7745c5c3_Var26), templ_7745c5c3_Buffer) if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } return nil }) - templ_7745c5c3_Err = layouts.Base("admin · badge designer — atmo.quest", "Design an event badge.").Render(templ.WithChildren(ctx, templ_7745c5c3_Var22), templ_7745c5c3_Buffer) + templ_7745c5c3_Err = layouts.Base("admin · badge designer", "Design an event badge.").Render(templ.WithChildren(ctx, templ_7745c5c3_Var25), templ_7745c5c3_Buffer) if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } @@ -703,128 +887,128 @@ } }() } ctx = templ.InitializeContext(ctx) - templ_7745c5c3_Var36 := templ.GetChildren(ctx) - if templ_7745c5c3_Var36 == nil { - templ_7745c5c3_Var36 = templ.NopComponent + templ_7745c5c3_Var46 := templ.GetChildren(ctx) + if templ_7745c5c3_Var46 == nil { + templ_7745c5c3_Var46 = templ.NopComponent } ctx = templ.ClearChildren(ctx) - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 44, "
") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } diff --git a/features/admin/pages/users.templ b/features/admin/pages/users.templ --- a/features/admin/pages/users.templ +++ b/features/admin/pages/users.templ @@ -25,7 +25,7 @@ IsBanned bool } templ AdminUsers(v AdminUsersView) { - @layouts.Base("admin · users — atmo.quest", "Manage atmo.quest users.") { + @layouts.Base("admin · users", "Manage atmo.quest users.") { @adminShell("users", "") {
> 'host_url' FROM oauth_sessions + WHERE did = ? ORDER BY updated_at DESC LIMIT 1 + `, did.String()).Scan(&host) + if err == nil && host != "" { + pdsHost = host + } + } + + res, err := connection.Drain(ctx, queue, sess, pdsHost, slog.Default(), onDrain) if err != nil { slog.Warn("drain middleware: drain failed", "did", did.String(), "err", err) dm.reset(did) // allow retry on next request @@ -138,6 +151,17 @@ slog.Info("drain middleware: flushed connections", "did", did.String(), "written", res.Written, "skipped", res.Skipped, + ) + } + + // Badge drain: write locally-earned badges to PDS. + badgeRes := badge.DrainPending(ctx, sess, db) + if badgeRes.Written > 0 { + slog.Info("drain middleware: flushed badges", + "did", did.String(), + "written", badgeRes.Written, + "skipped", badgeRes.Skipped, + "names", badgeRes.Names, ) } } diff --git a/features/auth/handlers.go b/features/auth/handlers.go --- a/features/auth/handlers.go +++ b/features/auth/handlers.go @@ -127,7 +127,7 @@ // for the next login. if h.ConnQueue != nil { sess, err := h.OAuth.ResumeSession(r.Context(), sessData.AccountDID, sessData.SessionID) if err == nil { - res, err := connection.Drain(r.Context(), h.ConnQueue, sess, slog.Default(), nil) + res, err := connection.Drain(r.Context(), h.ConnQueue, sess, sess.Data.HostURL, slog.Default(), nil) if err != nil { slog.Warn("connect drain", "did", sessData.AccountDID.String(), "err", err) } else if res.Written > 0 || res.Skipped > 0 { diff --git a/features/auth/pages/signin.templ b/features/auth/pages/signin.templ --- a/features/auth/pages/signin.templ +++ b/features/auth/pages/signin.templ @@ -5,7 +5,7 @@ // Signin renders the chooser: existing Atmosphere account vs create a new one. // The create path is a stub for now — we'll wire it later. templ Signin() { - @layouts.Base("sign in — atmo.quest", "Sign in with your ATProto account.") { + @layouts.Base("sign in", "Sign in with your ATProto account.") {
diff --git a/features/auth/pages/signin_atproto.templ b/features/auth/pages/signin_atproto.templ --- a/features/auth/pages/signin_atproto.templ +++ b/features/auth/pages/signin_atproto.templ @@ -5,7 +5,7 @@ // SigninATProto renders the handle entry form. errorMsg is empty unless we're // re-rendering after a validation or OAuth failure. templ SigninATProto(errorMsg string) { - @layouts.Base("sign in with ATProto — atmo.quest", "Enter your handle, DID, or PDS URL to start the OAuth flow.") { + @layouts.Base("sign in with ATProto", "Enter your handle, DID, or PDS URL to start the OAuth flow.") {
diff --git a/features/auth/pages/signin_atproto_templ.go b/features/auth/pages/signin_atproto_templ.go --- a/features/auth/pages/signin_atproto_templ.go +++ b/features/auth/pages/signin_atproto_templ.go @@ -100,7 +100,7 @@ return templ_7745c5c3_Err } return nil }) - templ_7745c5c3_Err = layouts.Base("sign in with ATProto — atmo.quest", "Enter your handle, DID, or PDS URL to start the OAuth flow.").Render(templ.WithChildren(ctx, templ_7745c5c3_Var2), templ_7745c5c3_Buffer) + templ_7745c5c3_Err = layouts.Base("sign in with ATProto", "Enter your handle, DID, or PDS URL to start the OAuth flow.").Render(templ.WithChildren(ctx, templ_7745c5c3_Var2), templ_7745c5c3_Buffer) if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } diff --git a/features/auth/pages/signin_templ.go b/features/auth/pages/signin_templ.go --- a/features/auth/pages/signin_templ.go +++ b/features/auth/pages/signin_templ.go @@ -64,7 +64,7 @@ return templ_7745c5c3_Err } return nil }) - templ_7745c5c3_Err = layouts.Base("sign in — atmo.quest", "Sign in with your ATProto account.").Render(templ.WithChildren(ctx, templ_7745c5c3_Var2), templ_7745c5c3_Buffer) + templ_7745c5c3_Err = layouts.Base("sign in", "Sign in with your ATProto account.").Render(templ.WithChildren(ctx, templ_7745c5c3_Var2), templ_7745c5c3_Buffer) if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } diff --git a/features/common/layouts/base.templ b/features/common/layouts/base.templ --- a/features/common/layouts/base.templ +++ b/features/common/layouts/base.templ @@ -20,6 +20,10 @@ // families are kept around for non-terminal feature work. + + + + @@ -30,6 +34,7 @@ }
{ children... }
+ } diff --git a/features/common/layouts/base_templ.go b/features/common/layouts/base_templ.go --- a/features/common/layouts/base_templ.go +++ b/features/common/layouts/base_templ.go @@ -73,43 +73,95 @@ _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var4)) if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 4, "\">") + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 6, "\">") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } if config.Global.Environment == config.Dev { - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 7, "
") + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 11, "
") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } } - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 8, "
") + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 12, "
") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } @@ -117,7 +169,20 @@ templ_7745c5c3_Err = templ_7745c5c3_Var1.Render(ctx, templ_7745c5c3_Buffer) if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 9, "
") + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 13, "
") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } diff --git a/features/connect/handlers.go b/features/connect/handlers.go --- a/features/connect/handlers.go +++ b/features/connect/handlers.go @@ -108,8 +108,23 @@ if connection.HasConnection(r.Context(), viewerPDS, viewerDID, target, eventURI) { slog.Debug("connect: duplicate skipped", "viewer", viewerDID.String(), "target", target.String(), "event", eventURI) } else if _, _, err := connection.Put(r.Context(), viewerSess, connRec); err != nil { slog.Warn("connect: viewer record", "viewer", viewerDID.String(), "target", target.String(), "err", err) - // Fall through — still redirect so the user isn't stuck on an error page. - // The reciprocal enqueue below will also attempt, and the user can retry. + } + + // "Besties" badge: awarded when connecting with someone at a new event + // if you already have a connection with them from a different event. + if eventURI != "" { + conns, _ := connection.List(r.Context(), viewerPDS, viewerDID) + eventCount := 0 + for _, c := range conns { + if c.With == target && c.EventURI != "" { + eventCount++ + } + } + if eventCount >= 2 { + if _, err := badge.Award(r.Context(), viewerSess, h.DB, badge.AwardBesties, ""); err != nil { + slog.Info("connect: besties badge", "err", err) + } + } } // Enqueue the target's reciprocal record for next-login drain. @@ -137,6 +152,9 @@ // Award first-connect badge (idempotent). if _, err := badge.Award(r.Context(), viewerSess, h.DB, badge.AwardFirstConnect, eventURI); err != nil { slog.Info("connect: first-connect badge", "err", err) } + + // Check connection milestone badges (10, 50, 100, ...). + badge.AwardConnectionMilestones(r.Context(), viewerSess, h.DB) http.Redirect(w, r, "/connections/"+target.String(), http.StatusSeeOther) } @@ -182,6 +200,11 @@ continue } if target == viewerDID { // silently skip self + continue + } + viewerPDS := h.lookupPDSForDID(r, viewerDID) + if connection.HasConnection(r.Context(), viewerPDS, viewerDID, target, "") { + skipped++ continue } if _, _, err := connection.Put(r.Context(), viewerSess, connection.Record{With: target}); err != nil { diff --git a/features/connect/pages/connect.templ b/features/connect/pages/connect.templ --- a/features/connect/pages/connect.templ +++ b/features/connect/pages/connect.templ @@ -30,7 +30,7 @@ EventURI string } templ Connect(v ConnectView) { - @layouts.Base("connect — atmo.quest", "Connect with another atmo.quest profile.") { + @layouts.Base("connect", "Connect with another atmo.quest profile.") {
diff --git a/features/connect/pages/connect_templ.go b/features/connect/pages/connect_templ.go --- a/features/connect/pages/connect_templ.go +++ b/features/connect/pages/connect_templ.go @@ -330,7 +330,7 @@ return templ_7745c5c3_Err } return nil }) - templ_7745c5c3_Err = layouts.Base("connect — atmo.quest", "Connect with another atmo.quest profile.").Render(templ.WithChildren(ctx, templ_7745c5c3_Var2), templ_7745c5c3_Buffer) + templ_7745c5c3_Err = layouts.Base("connect", "Connect with another atmo.quest profile.").Render(templ.WithChildren(ctx, templ_7745c5c3_Var2), templ_7745c5c3_Buffer) if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } diff --git a/features/connections/pages/connections.templ b/features/connections/pages/connections.templ --- a/features/connections/pages/connections.templ +++ b/features/connections/pages/connections.templ @@ -39,7 +39,7 @@ Name string } templ Connections(v ConnectionsView) { - @layouts.Base("connections — atmo.quest", "Your connections across events.") { + @layouts.Base("connections", "Your connections across events.") {
diff --git a/features/connections/pages/connections_templ.go b/features/connections/pages/connections_templ.go --- a/features/connections/pages/connections_templ.go +++ b/features/connections/pages/connections_templ.go @@ -281,7 +281,7 @@ return templ_7745c5c3_Err } return nil }) - templ_7745c5c3_Err = layouts.Base("connections — atmo.quest", "Your connections across events.").Render(templ.WithChildren(ctx, templ_7745c5c3_Var2), templ_7745c5c3_Buffer) + templ_7745c5c3_Err = layouts.Base("connections", "Your connections across events.").Render(templ.WithChildren(ctx, templ_7745c5c3_Var2), templ_7745c5c3_Buffer) if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } diff --git a/features/connections/pages/profile.templ b/features/connections/pages/profile.templ --- a/features/connections/pages/profile.templ +++ b/features/connections/pages/profile.templ @@ -178,7 +178,7 @@ } func profileTitle(v ProfileView) string { if v.DisplayName != "" { - return v.DisplayName + " — atmo.quest" + return v.DisplayName } - return "profile — atmo.quest" + return "profile" } diff --git a/features/connections/pages/profile_templ.go b/features/connections/pages/profile_templ.go --- a/features/connections/pages/profile_templ.go +++ b/features/connections/pages/profile_templ.go @@ -469,9 +469,9 @@ } func profileTitle(v ProfileView) string { if v.DisplayName != "" { - return v.DisplayName + " — atmo.quest" + return v.DisplayName } - return "profile — atmo.quest" + return "profile" } var _ = templruntime.GeneratedTemplate diff --git a/features/event/pages/event.templ b/features/event/pages/event.templ --- a/features/event/pages/event.templ +++ b/features/event/pages/event.templ @@ -24,7 +24,7 @@ GeofenceRadius int // meters } templ EventScan(v EventScanView) { - @layouts.Base("event — atmo.quest", "Check in to an atmo.quest event.") { + @layouts.Base("event", "Check in to an atmo.quest event.") {
diff --git a/features/event/pages/event_templ.go b/features/event/pages/event_templ.go --- a/features/event/pages/event_templ.go +++ b/features/event/pages/event_templ.go @@ -272,7 +272,7 @@ return templ_7745c5c3_Err } return nil }) - templ_7745c5c3_Err = layouts.Base("event — atmo.quest", "Check in to an atmo.quest event.").Render(templ.WithChildren(ctx, templ_7745c5c3_Var2), templ_7745c5c3_Buffer) + templ_7745c5c3_Err = layouts.Base("event", "Check in to an atmo.quest event.").Render(templ.WithChildren(ctx, templ_7745c5c3_Var2), templ_7745c5c3_Buffer) if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } diff --git a/features/events/handlers.go b/features/events/handlers.go --- a/features/events/handlers.go +++ b/features/events/handlers.go @@ -5,6 +5,8 @@ "database/sql" "fmt" "log/slog" "net/http" + "sort" + "strconv" "time" "github.com/bluesky-social/indigo/atproto/identity" @@ -19,6 +21,7 @@ "atmoquest/internal/connection" "atmoquest/internal/event" "atmoquest/internal/interest" "atmoquest/internal/profile" + "atmoquest/internal/users" ) // Handlers holds dependencies for the events feature. @@ -137,6 +140,12 @@ now := time.Now() stats, _ := event.GetStats(r.Context(), h.DB, ev.URI) filter := r.URL.Query().Get("filter") + page := 1 + if p := r.URL.Query().Get("page"); p != "" { + if n, err := strconv.Atoi(p); err == nil && n > 0 { + page = n + } + } // Get all DIDs who checked into this event. attendeeDIDs, err := checkin.ListAttendeesForEvent(r.Context(), h.DB, ev.URI) @@ -152,8 +161,12 @@ for _, c := range viewerConns { connSet[c.With.String()] = true } - // Build attendee list with enrichment. - var attendees []pages.Attendee + // Build full attendee list (unfiltered) for leaderboard + enrichment. + type enrichedAttendee struct { + attendee pages.Attendee + pds string + } + var allAttendees []enrichedAttendee // Connection counts for leaderboard. type connCount struct { did string @@ -172,11 +185,6 @@ } isConnected := connSet[didStr] || didStr == viewerDID.String() - // Filter: "mine" only shows connected attendees. - if filter == "mine" && !isConnected { - continue - } - a := pages.Attendee{ DID: didStr, Connected: isConnected, @@ -192,11 +200,10 @@ if bsky.Avatar != nil { a.AvatarURL = profile.AvatarURL(pds, did, bsky.Avatar.CID()) } } - attendees = append(attendees, a) + allAttendees = append(allAttendees, enrichedAttendee{attendee: a, pds: pds}) // Count this attendee's connections within the event. - theirPDS := pds - theirConns, _ := connection.List(r.Context(), theirPDS, did) + theirConns, _ := connection.List(r.Context(), pds, did) eventConns := 0 for _, c := range theirConns { if c.EventURI == ev.URI { @@ -214,6 +221,44 @@ } } } + // Apply filter to attendee grid (leaderboard uses unfiltered data above). + var attendees []pages.Attendee + for _, ea := range allAttendees { + // Respect privacy: hide users who opted out of attendee lists + // (but always show the viewer themselves). + if ea.attendee.DID != viewerDID.String() && users.IsHiddenFromAttendees(r.Context(), h.DB, ea.attendee.DID) { + continue + } + switch filter { + case "mine": + if !ea.attendee.Connected { + continue + } + case "unmet": + if ea.attendee.Connected { + continue + } + } + attendees = append(attendees, ea.attendee) + } + + // Paginate attendees (20 per page). + const perPage = 20 + totalFiltered := len(attendees) + totalPages := (totalFiltered + perPage - 1) / perPage + if totalPages < 1 { + totalPages = 1 + } + if page > totalPages { + page = totalPages + } + start := (page - 1) * perPage + end := start + perPage + if end > totalFiltered { + end = totalFiltered + } + attendees = attendees[start:end] + // Build leaderboard (top 10). var leaderboard []pages.LeaderboardRow type ranked struct { @@ -223,6 +268,10 @@ } // Simple sort: collect, sort by count desc, take top 10. var sorted []*connCount for _, cc := range connCounts { + // Respect privacy: skip users who opted out of leaderboard. + if cc.did != viewerDID.String() && users.IsHiddenFromLeaderboard(r.Context(), h.DB, cc.did) { + continue + } sorted = append(sorted, cc) } // Sort manually without importing sort. @@ -238,13 +287,19 @@ if len(sorted) < limit { limit = len(sorted) } for i, cc := range sorted[:limit] { + // Dense ranking: tied connection counts share the same rank. + rank := i + 1 + if i > 0 && cc.count == sorted[i-1].count { + rank = leaderboard[i-1].Rank + } leaderboard = append(leaderboard, pages.LeaderboardRow{ - Rank: i + 1, + Rank: rank, DID: cc.did, DisplayName: cc.displayName, Handle: cc.handle, AvatarURL: cc.avatarURL, ConnectionCount: cc.count, + Connected: connSet[cc.did] || cc.did == viewerDID.String(), }) } @@ -299,6 +354,10 @@ r.Context(), viewerQuest.Interests, attendeeDIDs, viewerDID, connSet, pdsLookup, avatarFn, ) for _, m := range rawMatches { + // Respect privacy: skip users who opted out of attendee lists. + if m.DID != viewerDID && users.IsHiddenFromAttendees(r.Context(), h.DB, m.DID.String()) { + continue + } // Look up handle from already-enriched attendees. var handle string for _, a := range attendees { @@ -318,6 +377,14 @@ }) } } } + + // Sort interest matches: unconnected first, then connected. + sort.SliceStable(interestMatches, func(i, j int) bool { + if interestMatches[i].Connected != interestMatches[j].Connected { + return !interestMatches[i].Connected // unconnected (false) sorts before connected (true) + } + return false + }) // Compute event status text. var status string @@ -360,9 +427,12 @@ DayNumber: dayNumber, TotalDays: totalDays, UniqueConnectors: stats.UniqueConnectors, TotalCheckins: stats.TotalCheckins, + ActualCheckins: len(attendeeDIDs), TotalAttendees: milestoneBase, Attendees: attendees, Filter: filter, + Page: page, + TotalPages: totalPages, Leaderboard: leaderboard, LeaderboardUnlocked: leaderboardUnlocked, InterestMatches: interestMatches, @@ -429,6 +499,16 @@ for { stats, _ := event.GetStats(r.Context(), h.DB, ev.URI) attendeeDIDs, _ := checkin.ListAttendeesForEvent(r.Context(), h.DB, ev.URI) totalAttendees := len(attendeeDIDs) + milestoneBase := totalAttendees + if ev.ExpectedAttendees > 0 { + milestoneBase = ev.ExpectedAttendees + } + + // Progress count label: hide "of N" if check-ins exceed expected. + countLabel := fmt.Sprintf("%d/%d attendees", totalAttendees, milestoneBase) + if totalAttendees > milestoneBase && milestoneBase > 0 { + countLabel = fmt.Sprintf("%d attendees", totalAttendees) + } statsHTML := fmt.Sprintf( `
`+ @@ -440,18 +520,18 @@ stats.UniqueConnectors, stats.TotalCheckins, totalAttendees, ) pct := float64(0) - if totalAttendees > 0 { - pct = float64(stats.UniqueConnectors) / float64(totalAttendees) * 100.0 + if milestoneBase > 0 { + pct = float64(totalAttendees) / float64(milestoneBase) * 100.0 if pct > 100 { pct = 100 } } - m20 := totalAttendees * 20 / 100 - m40 := totalAttendees * 40 / 100 - if m20 < 1 && totalAttendees > 0 { + m20 := milestoneBase * 20 / 100 + m40 := milestoneBase * 40 / 100 + if m20 < 1 && milestoneBase > 0 { m20 = 1 } - if m40 < 1 && totalAttendees > 0 { + if m40 < 1 && milestoneBase > 0 { m40 = 1 } r20 := "" @@ -463,7 +543,7 @@ if stats.UniqueConnectors >= m40 { r40 = " reached" } progressHTML := fmt.Sprintf( - `
`+ + `
`+ `
`+ `
`+ `
`+ @@ -478,7 +558,7 @@ `20%% 🏆`+ `40%% ✨`+ `
`+ `
`, - stats.UniqueConnectors, totalAttendees, pct, m20, r20, m40, r40, r20, r40, + countLabel, pct, m20, r20, m40, r40, r20, r40, ) if err := sse.PatchElements(statsHTML); err != nil { diff --git a/features/events/pages/detail.templ b/features/events/pages/detail.templ --- a/features/events/pages/detail.templ +++ b/features/events/pages/detail.templ @@ -19,9 +19,12 @@ DayNumber int // current day of event (1-based), 0 if not multi-day TotalDays int // total days the event spans, 0 if not multi-day UniqueConnectors int TotalCheckins int - TotalAttendees int // total checked-in attendees (for milestone %) + ActualCheckins int // unique users who checked in (from checkins table) + TotalAttendees int // expected attendees (for milestone %) Attendees []Attendee - Filter string // "all" or "mine" + Filter string // "all", "mine", or "unmet" + Page int // current page (1-based) + TotalPages int // total number of pages Leaderboard []LeaderboardRow LeaderboardUnlocked bool // true when UniqueConnectors >= 20% of TotalAttendees InterestMatches []InterestMatch @@ -46,6 +49,7 @@ DisplayName string Handle string AvatarURL string ConnectionCount int + Connected bool // whether the viewer has connected with this person } // InterestMatch is an attendee matched by shared interests with the viewer. @@ -59,7 +63,7 @@ Connected bool } templ EventDetail(v EventDetailView) { - @layouts.Base("event — atmo.quest", v.Name + " on atmo.quest") { + @layouts.Base("event", v.Name + " on atmo.quest") {
@@ -97,7 +101,7 @@ { v.StartTime } → { v.EndTime }
- @eventDetailProgress(v.UniqueConnectors, v.TotalAttendees) + @eventDetailProgress(v.ActualCheckins, v.TotalAttendees)
if v.LeaderboardUnlocked { @@ -172,7 +176,7 @@ } if v.InterestUnlocked && len(v.InterestMatches) > 0 {
-
✨ people who share your interests
+
✨ people to meet who share your interests
for _, m := range v.InterestMatches { @interestMatchCard(m) @@ -187,6 +191,7 @@ Checked in
all mine + unmet
if len(v.Attendees) > 0 { @@ -195,6 +200,17 @@ for _, a := range v.Attendees { @attendeeCard(a, v.Token) }
+ if v.TotalPages > 1 { + + } } else {

no attendees to show.

} @@ -241,9 +257,9 @@ templ leaderboardRow(row LeaderboardRow) {
{ itoa(row.Rank) } if row.AvatarURL != "" { - { + { } else { -
?
+
?
} if row.DisplayName != "" { @@ -259,12 +275,12 @@
} templ interestMatchCard(m InterestMatch) { -
+
if m.AvatarURL != "" { - { + { } else { -
?
+
?
} if m.DisplayName != "" { @@ -287,24 +303,28 @@
} -templ eventDetailProgress(connectors int, totalAttendees int) { -
+templ eventDetailProgress(checkins int, totalAttendees int) { +
collective progress
-
{ itoa(connectors) }/{ itoa(totalAttendees) } attendees
+ if checkins > totalAttendees && totalAttendees > 0 { +
{ itoa(checkins) } attendees
+ } else { +
{ itoa(checkins) }/{ itoa(totalAttendees) } attendees
+ }
-
+
0
-
= milestone20(totalAttendees)), templ.KV("next", connectors < milestone20(totalAttendees)) }> +
= milestone20(totalAttendees)), templ.KV("next", checkins < milestone20(totalAttendees)) }> { itoa(milestone20(totalAttendees)) }
leaderboard
-
= milestone40(totalAttendees)), templ.KV("next", connectors >= milestone20(totalAttendees) && connectors < milestone40(totalAttendees)) }> +
= milestone40(totalAttendees)), templ.KV("next", checkins >= milestone20(totalAttendees) && checkins < milestone40(totalAttendees)) }> { itoa(milestone40(totalAttendees)) }
matching
-
= milestone80(totalAttendees)), templ.KV("next", connectors >= milestone40(totalAttendees) && connectors < milestone80(totalAttendees)) }> +
= milestone80(totalAttendees)), templ.KV("next", checkins >= milestone40(totalAttendees) && checkins < milestone80(totalAttendees)) }> { itoa(milestone80(totalAttendees)) }
stats
{ itoa(totalAttendees) }
@@ -321,6 +341,19 @@ } func itoa(n int) string { return fmt.Sprintf("%d", n) +} + +func attendeesPageURL(token, filter string, page int) string { + url := "/events/" + token + sep := "?" + if filter != "" && filter != "all" { + url += sep + "filter=" + filter + sep = "&" + } + if page > 1 { + url += sep + "page=" + fmt.Sprintf("%d", page) + } + return url } // connectPct returns the fill percentage: connectors / totalAttendees * 100. diff --git a/features/events/pages/detail_templ.go b/features/events/pages/detail_templ.go --- a/features/events/pages/detail_templ.go +++ b/features/events/pages/detail_templ.go @@ -27,9 +27,12 @@ DayNumber int // current day of event (1-based), 0 if not multi-day TotalDays int // total days the event spans, 0 if not multi-day UniqueConnectors int TotalCheckins int - TotalAttendees int // total checked-in attendees (for milestone %) + ActualCheckins int // unique users who checked in (from checkins table) + TotalAttendees int // expected attendees (for milestone %) Attendees []Attendee - Filter string // "all" or "mine" + Filter string // "all", "mine", or "unmet" + Page int // current page (1-based) + TotalPages int // total number of pages Leaderboard []LeaderboardRow LeaderboardUnlocked bool // true when UniqueConnectors >= 20% of TotalAttendees InterestMatches []InterestMatch @@ -54,6 +57,7 @@ DisplayName string Handle string AvatarURL string ConnectionCount int + Connected bool // whether the viewer has connected with this person } // InterestMatch is an attendee matched by shared interests with the viewer. @@ -114,7 +118,7 @@ } var templ_7745c5c3_Var3 string templ_7745c5c3_Var3, templ_7745c5c3_Err = templ.JoinStringErrs("@") if templ_7745c5c3_Err != nil { - return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/events/pages/detail.templ`, Line: 73, Col: 56} + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/events/pages/detail.templ`, Line: 77, Col: 56} } _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var3)) if templ_7745c5c3_Err != nil { @@ -127,7 +131,7 @@ } var templ_7745c5c3_Var4 string templ_7745c5c3_Var4, templ_7745c5c3_Err = templ.JoinStringErrs(v.Name) if templ_7745c5c3_Err != nil { - return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/events/pages/detail.templ`, Line: 74, Col: 46} + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/events/pages/detail.templ`, Line: 78, Col: 46} } _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var4)) if templ_7745c5c3_Err != nil { @@ -140,7 +144,7 @@ } var templ_7745c5c3_Var5 string templ_7745c5c3_Var5, templ_7745c5c3_Err = templ.ResolveAttributeValue(sseAttr(v.Token)) if templ_7745c5c3_Err != nil { - return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/events/pages/detail.templ`, Line: 77, Col: 61} + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/events/pages/detail.templ`, Line: 81, Col: 61} } _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var5) if templ_7745c5c3_Err != nil { @@ -158,7 +162,7 @@ } var templ_7745c5c3_Var6 string templ_7745c5c3_Var6, templ_7745c5c3_Err = templ.JoinStringErrs(v.Status) if templ_7745c5c3_Err != nil { - return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/events/pages/detail.templ`, Line: 81, Col: 37} + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/events/pages/detail.templ`, Line: 85, Col: 37} } _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var6)) if templ_7745c5c3_Err != nil { @@ -176,7 +180,7 @@ } var templ_7745c5c3_Var7 string templ_7745c5c3_Var7, templ_7745c5c3_Err = templ.JoinStringErrs(v.Status) if templ_7745c5c3_Err != nil { - return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/events/pages/detail.templ`, Line: 83, Col: 48} + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/events/pages/detail.templ`, Line: 87, Col: 48} } _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var7)) if templ_7745c5c3_Err != nil { @@ -194,7 +198,7 @@ } var templ_7745c5c3_Var8 string templ_7745c5c3_Var8, templ_7745c5c3_Err = templ.JoinStringErrs(v.Status) if templ_7745c5c3_Err != nil { - return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/events/pages/detail.templ`, Line: 85, Col: 48} + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/events/pages/detail.templ`, Line: 89, Col: 48} } _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var8)) if templ_7745c5c3_Err != nil { @@ -213,7 +217,7 @@ } var templ_7745c5c3_Var9 string templ_7745c5c3_Var9, templ_7745c5c3_Err = templ.JoinStringErrs(itoa(v.DayNumber)) if templ_7745c5c3_Err != nil { - return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/events/pages/detail.templ`, Line: 88, Col: 34} + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/events/pages/detail.templ`, Line: 92, Col: 34} } _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var9)) if templ_7745c5c3_Err != nil { @@ -226,7 +230,7 @@ } var templ_7745c5c3_Var10 string templ_7745c5c3_Var10, templ_7745c5c3_Err = templ.JoinStringErrs(itoa(v.TotalDays)) if templ_7745c5c3_Err != nil { - return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/events/pages/detail.templ`, Line: 88, Col: 59} + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/events/pages/detail.templ`, Line: 92, Col: 59} } _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var10)) if templ_7745c5c3_Err != nil { @@ -240,7 +244,7 @@ } var templ_7745c5c3_Var11 string templ_7745c5c3_Var11, templ_7745c5c3_Err = templ.JoinStringErrs(v.Name) if templ_7745c5c3_Err != nil { - return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/events/pages/detail.templ`, Line: 91, Col: 46} + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/events/pages/detail.templ`, Line: 95, Col: 46} } _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var11)) if templ_7745c5c3_Err != nil { @@ -254,7 +258,7 @@ if v.Location != "" { var templ_7745c5c3_Var12 string templ_7745c5c3_Var12, templ_7745c5c3_Err = templ.JoinStringErrs(v.Location) if templ_7745c5c3_Err != nil { - return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/events/pages/detail.templ`, Line: 94, Col: 20} + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/events/pages/detail.templ`, Line: 98, Col: 20} } _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var12)) if templ_7745c5c3_Err != nil { @@ -268,7 +272,7 @@ } var templ_7745c5c3_Var13 string templ_7745c5c3_Var13, templ_7745c5c3_Err = templ.JoinStringErrs(v.StartTime) if templ_7745c5c3_Err != nil { - return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/events/pages/detail.templ`, Line: 96, Col: 20} + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/events/pages/detail.templ`, Line: 100, Col: 20} } _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var13)) if templ_7745c5c3_Err != nil { @@ -281,7 +285,7 @@ } var templ_7745c5c3_Var14 string templ_7745c5c3_Var14, templ_7745c5c3_Err = templ.JoinStringErrs(v.EndTime) if templ_7745c5c3_Err != nil { - return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/events/pages/detail.templ`, Line: 96, Col: 38} + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/events/pages/detail.templ`, Line: 100, Col: 38} } _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var14)) if templ_7745c5c3_Err != nil { @@ -291,7 +295,7 @@ templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 18, "
") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } - templ_7745c5c3_Err = eventDetailProgress(v.UniqueConnectors, v.TotalAttendees).Render(ctx, templ_7745c5c3_Buffer) + templ_7745c5c3_Err = eventDetailProgress(v.ActualCheckins, v.TotalAttendees).Render(ctx, templ_7745c5c3_Buffer) if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } @@ -312,7 +316,7 @@ } var templ_7745c5c3_Var15 string templ_7745c5c3_Var15, templ_7745c5c3_Err = templ.JoinStringErrs(remaining(milestone20(v.TotalAttendees), v.UniqueConnectors)) if templ_7745c5c3_Err != nil { - return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/events/pages/detail.templ`, Line: 117, Col: 96} + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/events/pages/detail.templ`, Line: 121, Col: 96} } _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var15)) if templ_7745c5c3_Err != nil { @@ -336,7 +340,7 @@ } var templ_7745c5c3_Var16 string templ_7745c5c3_Var16, templ_7745c5c3_Err = templ.JoinStringErrs(remaining(milestone40(v.TotalAttendees), v.UniqueConnectors)) if templ_7745c5c3_Err != nil { - return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/events/pages/detail.templ`, Line: 136, Col: 96} + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/events/pages/detail.templ`, Line: 140, Col: 96} } _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var16)) if templ_7745c5c3_Err != nil { @@ -360,7 +364,7 @@ } var templ_7745c5c3_Var17 string templ_7745c5c3_Var17, templ_7745c5c3_Err = templ.JoinStringErrs(remaining(milestone80(v.TotalAttendees), v.UniqueConnectors)) if templ_7745c5c3_Err != nil { - return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/events/pages/detail.templ`, Line: 155, Col: 96} + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/events/pages/detail.templ`, Line: 159, Col: 96} } _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var17)) if templ_7745c5c3_Err != nil { @@ -392,7 +396,7 @@ return templ_7745c5c3_Err } } if v.InterestUnlocked && len(v.InterestMatches) > 0 { - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 32, "
✨ people who share your interests
") + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 32, "
✨ people to meet who share your interests
") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } @@ -423,7 +427,7 @@ } var templ_7745c5c3_Var19 templ.SafeURL templ_7745c5c3_Var19, templ_7745c5c3_Err = templ.JoinURLErrs(templ.SafeURL("/events/" + v.Token)) if templ_7745c5c3_Err != nil { - return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/events/pages/detail.templ`, Line: 188, Col: 53} + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/events/pages/detail.templ`, Line: 192, Col: 53} } _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var19)) if templ_7745c5c3_Err != nil { @@ -458,7 +462,7 @@ } var templ_7745c5c3_Var22 templ.SafeURL templ_7745c5c3_Var22, templ_7745c5c3_Err = templ.JoinURLErrs(templ.SafeURL("/events/" + v.Token + "?filter=mine")) if templ_7745c5c3_Err != nil { - return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/events/pages/detail.templ`, Line: 189, Col: 70} + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/events/pages/detail.templ`, Line: 193, Col: 70} } _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var22)) if templ_7745c5c3_Err != nil { @@ -477,12 +481,47 @@ _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var23) if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 40, "\">mine
") + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 40, "\">mine ") + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + var templ_7745c5c3_Var24 = []any{"filter-tab", templ.KV("active", v.Filter == "unmet")} + templ_7745c5c3_Err = templ.RenderCSSItems(ctx, templ_7745c5c3_Buffer, templ_7745c5c3_Var24...) + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 41, "unmet
") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } if len(v.Attendees) > 0 { - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 41, "
") + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 44, "
") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } @@ -492,17 +531,95 @@ if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } } - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 42, "
") + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 45, "
") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } + if v.TotalPages > 1 { + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 46, "
") + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + if v.Page > 1 { + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 47, "← prev ") + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + } + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 49, "page ") + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + var templ_7745c5c3_Var28 string + templ_7745c5c3_Var28, templ_7745c5c3_Err = templ.JoinStringErrs(itoa(v.Page)) + if templ_7745c5c3_Err != nil { + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/events/pages/detail.templ`, Line: 208, Col: 64} + } + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var28)) + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 50, " of ") + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + var templ_7745c5c3_Var29 string + templ_7745c5c3_Var29, templ_7745c5c3_Err = templ.JoinStringErrs(itoa(v.TotalPages)) + if templ_7745c5c3_Err != nil { + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/events/pages/detail.templ`, Line: 208, Col: 90} + } + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var29)) + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 51, " ") + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + if v.Page < v.TotalPages { + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 52, "next →") + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + } + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 54, "
") + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + } } else { - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 43, "

no attendees to show.

") + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 55, "

no attendees to show.

") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } } - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 44, "
atmo.quest
") + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 56, "
atmo.quest
") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } @@ -512,7 +629,7 @@ return templ_7745c5c3_Err } return nil }) - templ_7745c5c3_Err = layouts.Base("event — atmo.quest", v.Name+" on atmo.quest").Render(templ.WithChildren(ctx, templ_7745c5c3_Var2), templ_7745c5c3_Buffer) + templ_7745c5c3_Err = layouts.Base("event", v.Name+" on atmo.quest").Render(templ.WithChildren(ctx, templ_7745c5c3_Var2), templ_7745c5c3_Buffer) if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } @@ -536,150 +653,150 @@ } }() } ctx = templ.InitializeContext(ctx) - templ_7745c5c3_Var24 := templ.GetChildren(ctx) - if templ_7745c5c3_Var24 == nil { - templ_7745c5c3_Var24 = templ.NopComponent + templ_7745c5c3_Var31 := templ.GetChildren(ctx) + if templ_7745c5c3_Var31 == nil { + templ_7745c5c3_Var31 = templ.NopComponent } ctx = templ.ClearChildren(ctx) - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 45, "") + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 59, "\">") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } if a.AvatarURL != "" { - var templ_7745c5c3_Var27 = []any{"attendee-avatar", templ.KV("connected", a.Connected), templ.KV("not-connected", !a.Connected)} - templ_7745c5c3_Err = templ.RenderCSSItems(ctx, templ_7745c5c3_Buffer, templ_7745c5c3_Var27...) + var templ_7745c5c3_Var34 = []any{"attendee-avatar", templ.KV("connected", a.Connected), templ.KV("not-connected", !a.Connected)} + templ_7745c5c3_Err = templ.RenderCSSItems(ctx, templ_7745c5c3_Buffer, templ_7745c5c3_Var34...) if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 48, "\"") ") + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 63, "\" loading=\"lazy\"> ") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } } else { - var templ_7745c5c3_Var31 = []any{"attendee-avatar leaderboard-avatar-empty", templ.KV("connected", a.Connected), templ.KV("not-connected", !a.Connected)} - templ_7745c5c3_Err = templ.RenderCSSItems(ctx, templ_7745c5c3_Buffer, templ_7745c5c3_Var31...) + var templ_7745c5c3_Var38 = []any{"attendee-avatar leaderboard-avatar-empty", templ.KV("connected", a.Connected), templ.KV("not-connected", !a.Connected)} + templ_7745c5c3_Err = templ.RenderCSSItems(ctx, templ_7745c5c3_Buffer, templ_7745c5c3_Var38...) if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 52, "
?
") + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 65, "\">?
") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } } - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 54, "") + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 66, "") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } if a.DisplayName != "" { - var templ_7745c5c3_Var33 string - templ_7745c5c3_Var33, templ_7745c5c3_Err = templ.JoinStringErrs(a.DisplayName) + var templ_7745c5c3_Var40 string + templ_7745c5c3_Var40, templ_7745c5c3_Err = templ.JoinStringErrs(a.DisplayName) if templ_7745c5c3_Err != nil { - return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/events/pages/detail.templ`, Line: 230, Col: 19} + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/events/pages/detail.templ`, Line: 246, Col: 19} } - _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var33)) + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var40)) if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } } else if a.Handle != "" { - var templ_7745c5c3_Var34 string - templ_7745c5c3_Var34, templ_7745c5c3_Err = templ.JoinStringErrs("@" + a.Handle) + var templ_7745c5c3_Var41 string + templ_7745c5c3_Var41, templ_7745c5c3_Err = templ.JoinStringErrs("@" + a.Handle) if templ_7745c5c3_Err != nil { - return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/events/pages/detail.templ`, Line: 232, Col: 20} + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/events/pages/detail.templ`, Line: 248, Col: 20} } - _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var34)) + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var41)) if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } } else { - var templ_7745c5c3_Var35 string - templ_7745c5c3_Var35, templ_7745c5c3_Err = templ.JoinStringErrs(shortDID(a.DID)) + var templ_7745c5c3_Var42 string + templ_7745c5c3_Var42, templ_7745c5c3_Err = templ.JoinStringErrs(shortDID(a.DID)) if templ_7745c5c3_Err != nil { - return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/events/pages/detail.templ`, Line: 234, Col: 21} + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/events/pages/detail.templ`, Line: 250, Col: 21} } - _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var35)) + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var42)) if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } } - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 55, "") + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 67, "") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } @@ -703,136 +820,172 @@ } }() } ctx = templ.InitializeContext(ctx) - templ_7745c5c3_Var36 := templ.GetChildren(ctx) - if templ_7745c5c3_Var36 == nil { - templ_7745c5c3_Var36 = templ.NopComponent + templ_7745c5c3_Var43 := templ.GetChildren(ctx) + if templ_7745c5c3_Var43 == nil { + templ_7745c5c3_Var43 = templ.NopComponent } ctx = templ.ClearChildren(ctx) - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 56, "
") + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 68, "
") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } - var templ_7745c5c3_Var37 = []any{"leaderboard-rank", templ.KV("top-3", row.Rank <= 3)} - templ_7745c5c3_Err = templ.RenderCSSItems(ctx, templ_7745c5c3_Buffer, templ_7745c5c3_Var37...) + var templ_7745c5c3_Var44 = []any{"leaderboard-rank", templ.KV("top-3", row.Rank <= 3)} + templ_7745c5c3_Err = templ.RenderCSSItems(ctx, templ_7745c5c3_Buffer, templ_7745c5c3_Var44...) if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 57, "") + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 70, "\">") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } - var templ_7745c5c3_Var39 string - templ_7745c5c3_Var39, templ_7745c5c3_Err = templ.JoinStringErrs(itoa(row.Rank)) + var templ_7745c5c3_Var46 string + templ_7745c5c3_Var46, templ_7745c5c3_Err = templ.JoinStringErrs(itoa(row.Rank)) if templ_7745c5c3_Err != nil { - return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/events/pages/detail.templ`, Line: 242, Col: 87} + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/events/pages/detail.templ`, Line: 258, Col: 87} } - _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var39)) + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var46)) if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 59, " ") + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 71, " ") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } if row.AvatarURL != "" { - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 60, "\"") ") + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 75, "\" loading=\"lazy\"> ") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } } else { - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 63, "
?
") + var templ_7745c5c3_Var51 = []any{"leaderboard-avatar-empty", templ.KV("not-connected", !row.Connected)} + templ_7745c5c3_Err = templ.RenderCSSItems(ctx, templ_7745c5c3_Buffer, templ_7745c5c3_Var51...) + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 76, "
?
") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } } - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 64, "") + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 78, "") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } if row.DisplayName != "" { - var templ_7745c5c3_Var42 string - templ_7745c5c3_Var42, templ_7745c5c3_Err = templ.JoinStringErrs(row.DisplayName) + var templ_7745c5c3_Var53 string + templ_7745c5c3_Var53, templ_7745c5c3_Err = templ.JoinStringErrs(row.DisplayName) if templ_7745c5c3_Err != nil { - return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/events/pages/detail.templ`, Line: 250, Col: 21} + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/events/pages/detail.templ`, Line: 266, Col: 21} } - _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var42)) + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var53)) if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } } else if row.Handle != "" { - var templ_7745c5c3_Var43 string - templ_7745c5c3_Var43, templ_7745c5c3_Err = templ.JoinStringErrs("@" + row.Handle) + var templ_7745c5c3_Var54 string + templ_7745c5c3_Var54, templ_7745c5c3_Err = templ.JoinStringErrs("@" + row.Handle) if templ_7745c5c3_Err != nil { - return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/events/pages/detail.templ`, Line: 252, Col: 22} + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/events/pages/detail.templ`, Line: 268, Col: 22} } - _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var43)) + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var54)) if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } } else { - var templ_7745c5c3_Var44 string - templ_7745c5c3_Var44, templ_7745c5c3_Err = templ.JoinStringErrs(shortDID(row.DID)) + var templ_7745c5c3_Var55 string + templ_7745c5c3_Var55, templ_7745c5c3_Err = templ.JoinStringErrs(shortDID(row.DID)) if templ_7745c5c3_Err != nil { - return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/events/pages/detail.templ`, Line: 254, Col: 23} + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/events/pages/detail.templ`, Line: 270, Col: 23} } - _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var44)) + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var55)) if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } } - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 65, " ") + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 79, " ") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } - var templ_7745c5c3_Var45 string - templ_7745c5c3_Var45, templ_7745c5c3_Err = templ.JoinStringErrs(itoa(row.ConnectionCount)) + var templ_7745c5c3_Var56 string + templ_7745c5c3_Var56, templ_7745c5c3_Err = templ.JoinStringErrs(itoa(row.ConnectionCount)) if templ_7745c5c3_Err != nil { - return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/events/pages/detail.templ`, Line: 257, Col: 61} + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/events/pages/detail.templ`, Line: 273, Col: 61} } - _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var45)) + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var56)) if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 66, " connections
") + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 80, " connections
") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } @@ -856,139 +1009,157 @@ } }() } ctx = templ.InitializeContext(ctx) - templ_7745c5c3_Var46 := templ.GetChildren(ctx) - if templ_7745c5c3_Var46 == nil { - templ_7745c5c3_Var46 = templ.NopComponent + templ_7745c5c3_Var57 := templ.GetChildren(ctx) + if templ_7745c5c3_Var57 == nil { + templ_7745c5c3_Var57 = templ.NopComponent } ctx = templ.ClearChildren(ctx) - var templ_7745c5c3_Var47 = []any{"interest-match-card", templ.KV("connected", m.Connected)} - templ_7745c5c3_Err = templ.RenderCSSItems(ctx, templ_7745c5c3_Buffer, templ_7745c5c3_Var47...) - if templ_7745c5c3_Err != nil { - return templ_7745c5c3_Err - } - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 67, "
") + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 81, "
") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } if m.AvatarURL != "" { - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 69, "\"") ") + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 85, "\" loading=\"lazy\"> ") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } } else { - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 72, "
?
") + var templ_7745c5c3_Var62 = []any{"interest-match-avatar leaderboard-avatar-empty", templ.KV("not-connected", !m.Connected)} + templ_7745c5c3_Err = templ.RenderCSSItems(ctx, templ_7745c5c3_Buffer, templ_7745c5c3_Var62...) + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 86, "
?
") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } } - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 73, "") + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 88, "") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } if m.DisplayName != "" { - var templ_7745c5c3_Var51 string - templ_7745c5c3_Var51, templ_7745c5c3_Err = templ.JoinStringErrs(m.DisplayName) + var templ_7745c5c3_Var64 string + templ_7745c5c3_Var64, templ_7745c5c3_Err = templ.JoinStringErrs(m.DisplayName) if templ_7745c5c3_Err != nil { - return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/events/pages/detail.templ`, Line: 271, Col: 20} + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/events/pages/detail.templ`, Line: 287, Col: 20} } - _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var51)) + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var64)) if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } } else if m.Handle != "" { - var templ_7745c5c3_Var52 string - templ_7745c5c3_Var52, templ_7745c5c3_Err = templ.JoinStringErrs("@" + m.Handle) + var templ_7745c5c3_Var65 string + templ_7745c5c3_Var65, templ_7745c5c3_Err = templ.JoinStringErrs("@" + m.Handle) if templ_7745c5c3_Err != nil { - return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/events/pages/detail.templ`, Line: 273, Col: 21} + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/events/pages/detail.templ`, Line: 289, Col: 21} } - _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var52)) + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var65)) if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } } else { - var templ_7745c5c3_Var53 string - templ_7745c5c3_Var53, templ_7745c5c3_Err = templ.JoinStringErrs(shortDID(m.DID)) + var templ_7745c5c3_Var66 string + templ_7745c5c3_Var66, templ_7745c5c3_Err = templ.JoinStringErrs(shortDID(m.DID)) if templ_7745c5c3_Err != nil { - return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/events/pages/detail.templ`, Line: 275, Col: 22} + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/events/pages/detail.templ`, Line: 291, Col: 22} } - _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var53)) + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var66)) if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } } - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 74, " ") + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 89, " ") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } if m.Connected { - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 75, "✓ connected") + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 90, "✓ connected") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } } - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 76, "
") + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 91, "
") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } for _, interest := range m.SharedInterests { - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 77, "") + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 92, "") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } - var templ_7745c5c3_Var54 string - templ_7745c5c3_Var54, templ_7745c5c3_Err = templ.JoinStringErrs(interest) + var templ_7745c5c3_Var67 string + templ_7745c5c3_Var67, templ_7745c5c3_Err = templ.JoinStringErrs(interest) if templ_7745c5c3_Err != nil { - return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/events/pages/detail.templ`, Line: 284, Col: 55} + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/events/pages/detail.templ`, Line: 300, Col: 55} } - _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var54)) + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var67)) if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 78, "") + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 93, "") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } } - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 79, "
") + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 94, "
") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } @@ -996,7 +1167,7 @@ return nil }) } -func eventDetailProgress(connectors int, totalAttendees int) templ.Component { +func eventDetailProgress(checkins int, totalAttendees int) templ.Component { return templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) { templ_7745c5c3_W, ctx := templ_7745c5c3_Input.Writer, templ_7745c5c3_Input.Context if templ_7745c5c3_CtxErr := ctx.Err(); templ_7745c5c3_CtxErr != nil { @@ -1012,204 +1183,232 @@ } }() } ctx = templ.InitializeContext(ctx) - templ_7745c5c3_Var55 := templ.GetChildren(ctx) - if templ_7745c5c3_Var55 == nil { - templ_7745c5c3_Var55 = templ.NopComponent + templ_7745c5c3_Var68 := templ.GetChildren(ctx) + if templ_7745c5c3_Var68 == nil { + templ_7745c5c3_Var68 = templ.NopComponent } ctx = templ.ClearChildren(ctx) - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 80, "
collective progress
") - if templ_7745c5c3_Err != nil { - return templ_7745c5c3_Err - } - var templ_7745c5c3_Var57 string - templ_7745c5c3_Var57, templ_7745c5c3_Err = templ.JoinStringErrs(itoa(connectors)) + var templ_7745c5c3_Var69 string + templ_7745c5c3_Var69, templ_7745c5c3_Err = templ.ResolveAttributeValue("Progress: " + itoa(checkins) + " attendees checked in") if templ_7745c5c3_Err != nil { - return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/events/pages/detail.templ`, Line: 294, Col: 49} + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/events/pages/detail.templ`, Line: 307, Col: 121} } - _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var57)) + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var69) if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 82, "/") + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 96, "\">
collective progress
") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } - var templ_7745c5c3_Var58 string - templ_7745c5c3_Var58, templ_7745c5c3_Err = templ.JoinStringErrs(itoa(totalAttendees)) - if templ_7745c5c3_Err != nil { - return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/events/pages/detail.templ`, Line: 294, Col: 91} - } - _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var58)) - if templ_7745c5c3_Err != nil { - return templ_7745c5c3_Err + if checkins > totalAttendees && totalAttendees > 0 { + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 97, "
") + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + var templ_7745c5c3_Var70 string + templ_7745c5c3_Var70, templ_7745c5c3_Err = templ.JoinStringErrs(itoa(checkins)) + if templ_7745c5c3_Err != nil { + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/events/pages/detail.templ`, Line: 311, Col: 48} + } + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var70)) + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 98, " attendees
") + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + } else { + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 99, "
") + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + var templ_7745c5c3_Var71 string + templ_7745c5c3_Var71, templ_7745c5c3_Err = templ.JoinStringErrs(itoa(checkins)) + if templ_7745c5c3_Err != nil { + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/events/pages/detail.templ`, Line: 313, Col: 48} + } + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var71)) + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 100, "/") + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + var templ_7745c5c3_Var72 string + templ_7745c5c3_Var72, templ_7745c5c3_Err = templ.JoinStringErrs(itoa(totalAttendees)) + if templ_7745c5c3_Err != nil { + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/events/pages/detail.templ`, Line: 313, Col: 90} + } + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var72)) + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 101, " attendees
") + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } } - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 83, " attendees
") + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 103, "\">
") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } - var templ_7745c5c3_Var60 = []any{"progress-tick", templ.KV("unlocked", true)} - templ_7745c5c3_Err = templ.RenderCSSItems(ctx, templ_7745c5c3_Buffer, templ_7745c5c3_Var60...) + var templ_7745c5c3_Var74 = []any{"progress-tick", templ.KV("unlocked", true)} + templ_7745c5c3_Err = templ.RenderCSSItems(ctx, templ_7745c5c3_Buffer, templ_7745c5c3_Var74...) if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 85, "
0
") + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 105, "\">0
") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } - var templ_7745c5c3_Var62 = []any{"progress-tick", templ.KV("unlocked", connectors >= milestone20(totalAttendees)), templ.KV("next", connectors < milestone20(totalAttendees))} - templ_7745c5c3_Err = templ.RenderCSSItems(ctx, templ_7745c5c3_Buffer, templ_7745c5c3_Var62...) + var templ_7745c5c3_Var76 = []any{"progress-tick", templ.KV("unlocked", checkins >= milestone20(totalAttendees)), templ.KV("next", checkins < milestone20(totalAttendees))} + templ_7745c5c3_Err = templ.RenderCSSItems(ctx, templ_7745c5c3_Buffer, templ_7745c5c3_Var76...) if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 87, "
") + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 107, "\">") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } - var templ_7745c5c3_Var64 string - templ_7745c5c3_Var64, templ_7745c5c3_Err = templ.JoinStringErrs(itoa(milestone20(totalAttendees))) + var templ_7745c5c3_Var78 string + templ_7745c5c3_Var78, templ_7745c5c3_Err = templ.JoinStringErrs(itoa(milestone20(totalAttendees))) if templ_7745c5c3_Err != nil { - return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/events/pages/detail.templ`, Line: 302, Col: 39} + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/events/pages/detail.templ`, Line: 322, Col: 39} } - _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var64)) + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var78)) if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 89, "
leaderboard
") + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 108, "
leaderboard
") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } - var templ_7745c5c3_Var65 = []any{"progress-tick", templ.KV("unlocked", connectors >= milestone40(totalAttendees)), templ.KV("next", connectors >= milestone20(totalAttendees) && connectors < milestone40(totalAttendees))} - templ_7745c5c3_Err = templ.RenderCSSItems(ctx, templ_7745c5c3_Buffer, templ_7745c5c3_Var65...) + var templ_7745c5c3_Var79 = []any{"progress-tick", templ.KV("unlocked", checkins >= milestone40(totalAttendees)), templ.KV("next", checkins >= milestone20(totalAttendees) && checkins < milestone40(totalAttendees))} + templ_7745c5c3_Err = templ.RenderCSSItems(ctx, templ_7745c5c3_Buffer, templ_7745c5c3_Var79...) if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 90, "
") + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 110, "\">") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } - var templ_7745c5c3_Var67 string - templ_7745c5c3_Var67, templ_7745c5c3_Err = templ.JoinStringErrs(itoa(milestone40(totalAttendees))) + var templ_7745c5c3_Var81 string + templ_7745c5c3_Var81, templ_7745c5c3_Err = templ.JoinStringErrs(itoa(milestone40(totalAttendees))) if templ_7745c5c3_Err != nil { - return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/events/pages/detail.templ`, Line: 305, Col: 39} + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/events/pages/detail.templ`, Line: 325, Col: 39} } - _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var67)) + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var81)) if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 92, "
matching
") + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 111, "
matching
") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } - var templ_7745c5c3_Var68 = []any{"progress-tick", templ.KV("unlocked", connectors >= milestone80(totalAttendees)), templ.KV("next", connectors >= milestone40(totalAttendees) && connectors < milestone80(totalAttendees))} - templ_7745c5c3_Err = templ.RenderCSSItems(ctx, templ_7745c5c3_Buffer, templ_7745c5c3_Var68...) + var templ_7745c5c3_Var82 = []any{"progress-tick", templ.KV("unlocked", checkins >= milestone80(totalAttendees)), templ.KV("next", checkins >= milestone40(totalAttendees) && checkins < milestone80(totalAttendees))} + templ_7745c5c3_Err = templ.RenderCSSItems(ctx, templ_7745c5c3_Buffer, templ_7745c5c3_Var82...) if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 93, "
") + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 113, "\">") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } - var templ_7745c5c3_Var70 string - templ_7745c5c3_Var70, templ_7745c5c3_Err = templ.JoinStringErrs(itoa(milestone80(totalAttendees))) + var templ_7745c5c3_Var84 string + templ_7745c5c3_Var84, templ_7745c5c3_Err = templ.JoinStringErrs(itoa(milestone80(totalAttendees))) if templ_7745c5c3_Err != nil { - return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/events/pages/detail.templ`, Line: 308, Col: 39} + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/events/pages/detail.templ`, Line: 328, Col: 39} } - _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var70)) + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var84)) if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 95, "
stats
") + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 114, "
stats
") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } - var templ_7745c5c3_Var71 string - templ_7745c5c3_Var71, templ_7745c5c3_Err = templ.JoinStringErrs(itoa(totalAttendees)) + var templ_7745c5c3_Var85 string + templ_7745c5c3_Var85, templ_7745c5c3_Err = templ.JoinStringErrs(itoa(totalAttendees)) if templ_7745c5c3_Err != nil { - return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/events/pages/detail.templ`, Line: 310, Col: 52} + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/events/pages/detail.templ`, Line: 330, Col: 52} } - _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var71)) + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var85)) if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 96, "
") + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 115, "
") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } @@ -1226,6 +1425,19 @@ } func itoa(n int) string { return fmt.Sprintf("%d", n) +} + +func attendeesPageURL(token, filter string, page int) string { + url := "/events/" + token + sep := "?" + if filter != "" && filter != "all" { + url += sep + "filter=" + filter + sep = "&" + } + if page > 1 { + url += sep + "page=" + fmt.Sprintf("%d", page) + } + return url } // connectPct returns the fill percentage: connectors / totalAttendees * 100. diff --git a/features/events/pages/events.templ b/features/events/pages/events.templ --- a/features/events/pages/events.templ +++ b/features/events/pages/events.templ @@ -33,7 +33,7 @@ return fmt.Sprintf("%d", n) } templ Events(v EventsView) { - @layouts.Base("events — atmo.quest", "Your events on atmo.quest.") { + @layouts.Base("events", "Your events on atmo.quest.") {
diff --git a/features/events/pages/events_templ.go b/features/events/pages/events_templ.go --- a/features/events/pages/events_templ.go +++ b/features/events/pages/events_templ.go @@ -214,7 +214,7 @@ return templ_7745c5c3_Err } return nil }) - templ_7745c5c3_Err = layouts.Base("events — atmo.quest", "Your events on atmo.quest.").Render(templ.WithChildren(ctx, templ_7745c5c3_Var2), templ_7745c5c3_Buffer) + templ_7745c5c3_Err = layouts.Base("events", "Your events on atmo.quest.").Render(templ.WithChildren(ctx, templ_7745c5c3_Var2), templ_7745c5c3_Buffer) if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } diff --git a/features/index/handlers.go b/features/index/handlers.go --- a/features/index/handlers.go +++ b/features/index/handlers.go @@ -117,7 +117,11 @@ view.QRURL = "/profile/qr.svg" // Debug: expose the connect URL so developers can copy-paste it into // an incognito window to test connections without physically scanning. - view.ConnectURL = strings.TrimRight(config.Global.PublicURL, "/") + "/c/" + did.String() + connectURL := strings.TrimRight(config.Global.PublicURL, "/") + "/c/" + did.String() + view.QRConnectURL = connectURL + if config.Global.Environment == config.Dev { + view.ConnectURL = connectURL + } // Current event: most recent ongoing check-in for this user. If the // user has no check-ins, no events, or no rows match, the card diff --git a/features/index/pages/index.templ b/features/index/pages/index.templ --- a/features/index/pages/index.templ +++ b/features/index/pages/index.templ @@ -23,7 +23,11 @@ // back of the flip card. QRURL string // ConnectURL is the full /c/ URL for testing/debugging — users // can copy-paste it into another browser to simulate a QR scan. + // Only set in dev mode. ConnectURL string + // QRConnectURL is the connect URL shown via delayed copy button on the + // QR flip card. Always set for logged-in users. + QRConnectURL string // CurrentEvent is the user's currently-ongoing check-in target, if any. // Nil pointer means "no active event right now" — the home page renders @@ -72,7 +76,7 @@ // current-event card. We deliberately keep it lighter-weight than the // marketing landing so it feels like an "app home", not a re-hit of the // pitch. templ indexAuthed(v IndexView) { - @layouts.Base("atmo.quest — your quest", "Your atmo.quest home.") { + @layouts.Base("home", "Your atmo.quest home.") {
@@ -89,22 +93,34 @@
-
- +
+
+ +

▸ tap to flip

+ if v.QRConnectURL != "" { + + }
if v.DisplayName != "" { @@ -204,7 +220,7 @@
view all → } else {

- no connections yet — scan a QR at an event! + no connections yet, go meet someone!

} @@ -219,7 +235,7 @@ } // indexGuest is the original marketing landing page. templ indexGuest() { - @layouts.Base("atmo.quest — conference companion on ATProto", "Scan a QR, write a note, leave with a real follow-up list. Your data goes to your repo, not ours.") { + @layouts.Base("atmo.quest", "Scan a QR, write a note, leave with a real follow-up list. Your data goes to your repo, not ours.") {
@@ -237,7 +253,7 @@ a person at a conference. you just met someone interesting and now their handle is gone.
- init: v0.1 · CascadiaJS 2026 + Find your people in the Atmosphere.

atmo.quest 

An event companion { "for" } the open social web. Scan a QR, write a note, leave with a real follow-up list. Your data goes to your repo, not ours. diff --git a/features/index/pages/index_templ.go b/features/index/pages/index_templ.go --- a/features/index/pages/index_templ.go +++ b/features/index/pages/index_templ.go @@ -31,7 +31,11 @@ // back of the flip card. QRURL string // ConnectURL is the full /c/ URL for testing/debugging — users // can copy-paste it into another browser to simulate a QR scan. + // Only set in dev mode. ConnectURL string + // QRConnectURL is the connect URL shown via delayed copy button on the + // QR flip card. Always set for logged-in users. + QRConnectURL string // CurrentEvent is the user's currently-ongoing check-in target, if any. // Nil pointer means "no active event right now" — the home page renders @@ -155,13 +159,13 @@ } var templ_7745c5c3_Var4 string templ_7745c5c3_Var4, templ_7745c5c3_Err = templ.JoinStringErrs("@") if templ_7745c5c3_Err != nil { - return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/index/pages/index.templ`, Line: 86, Col: 56} + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/index/pages/index.templ`, Line: 90, Col: 56} } _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var4)) if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 3, "atmo.quest:~$ whoami --short

▸ tap to flip

") + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 11, "

▸ tap to flip

") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } - if v.DisplayName != "" { - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 12, "

") + if v.QRConnectURL != "" { + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 12, "") + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + } + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 14, "

") + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + if v.DisplayName != "" { + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 15, "

") + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + var templ_7745c5c3_Var9 string + templ_7745c5c3_Var9, templ_7745c5c3_Err = templ.JoinStringErrs(v.DisplayName) + if templ_7745c5c3_Err != nil { + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/index/pages/index.templ`, Line: 127, Col: 45} + } + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var9)) + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 16, "

") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } } else { - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 14, "

(no display name)

") + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 17, "

(no display name)

") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } } if v.Handle != "" { - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 15, "

") + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 18, "

") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } - var templ_7745c5c3_Var9 string - templ_7745c5c3_Var9, templ_7745c5c3_Err = templ.JoinStringErrs("@" + v.Handle) + var templ_7745c5c3_Var10 string + templ_7745c5c3_Var10, templ_7745c5c3_Err = templ.JoinStringErrs("@" + v.Handle) if templ_7745c5c3_Err != nil { - return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/index/pages/index.templ`, Line: 116, Col: 47} + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/index/pages/index.templ`, Line: 132, Col: 47} } - _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var9)) + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var10)) if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 16, "

") + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 19, "

") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } } - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 17, "
view profile → settings →
") + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 20, "
view profile → settings →
") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } if v.ConnectURL != "" { - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 18, "
connect link (for testing): ") + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 21, "
connect link (for testing): ") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } - var templ_7745c5c3_Var10 string - templ_7745c5c3_Var10, templ_7745c5c3_Err = templ.JoinStringErrs(v.ConnectURL) + var templ_7745c5c3_Var11 string + templ_7745c5c3_Var11, templ_7745c5c3_Err = templ.JoinStringErrs(v.ConnectURL) if templ_7745c5c3_Err != nil { - return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/index/pages/index.templ`, Line: 124, Col: 77} + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/index/pages/index.templ`, Line: 140, Col: 77} } - _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var10)) + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var11)) if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 19, "
") + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 22, "
") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } } - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 20, "
") + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 23, "
") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } @@ -307,7 +334,7 @@ templ_7745c5c3_Err = indexRecentConnections(v.RecentConnections).Render(ctx, templ_7745c5c3_Buffer) if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 21, "
atmo.quest
") + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 24, "
atmo.quest
") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } @@ -315,13 +342,13 @@ templ_7745c5c3_Err = layouts.BottomNav("home").Render(ctx, templ_7745c5c3_Buffer) if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 22, " ") + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 25, " ") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } return nil }) - templ_7745c5c3_Err = layouts.Base("atmo.quest — your quest", "Your atmo.quest home.").Render(templ.WithChildren(ctx, templ_7745c5c3_Var3), templ_7745c5c3_Buffer) + templ_7745c5c3_Err = layouts.Base("home", "Your atmo.quest home.").Render(templ.WithChildren(ctx, templ_7745c5c3_Var3), templ_7745c5c3_Buffer) if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } @@ -348,85 +375,85 @@ } }() } ctx = templ.InitializeContext(ctx) - templ_7745c5c3_Var11 := templ.GetChildren(ctx) - if templ_7745c5c3_Var11 == nil { - templ_7745c5c3_Var11 = templ.NopComponent + templ_7745c5c3_Var12 := templ.GetChildren(ctx) + if templ_7745c5c3_Var12 == nil { + templ_7745c5c3_Var12 = templ.NopComponent } ctx = templ.ClearChildren(ctx) if ev != nil { - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 23, "
checked in · live now

") + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 27, "\" class=\"home-event-card\" aria-label=\"current event\" style=\"text-decoration:none;color:inherit\">
checked in · live now

") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } - var templ_7745c5c3_Var13 string - templ_7745c5c3_Var13, templ_7745c5c3_Err = templ.JoinStringErrs(ev.Name) + var templ_7745c5c3_Var14 string + templ_7745c5c3_Var14, templ_7745c5c3_Err = templ.JoinStringErrs(ev.Name) if templ_7745c5c3_Err != nil { - return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/index/pages/index.templ`, Line: 156, Col: 42} + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/index/pages/index.templ`, Line: 172, Col: 42} } - _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var13)) + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var14)) if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 25, "

") + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 28, "

") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } if ev.Location != "" { - var templ_7745c5c3_Var14 string - templ_7745c5c3_Var14, templ_7745c5c3_Err = templ.JoinStringErrs(ev.Location) + var templ_7745c5c3_Var15 string + templ_7745c5c3_Var15, templ_7745c5c3_Err = templ.JoinStringErrs(ev.Location) if templ_7745c5c3_Err != nil { - return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/index/pages/index.templ`, Line: 159, Col: 20} + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/index/pages/index.templ`, Line: 175, Col: 20} } - _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var14)) + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var15)) if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 26, " ·  ") + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 29, " ·  ") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } } - var templ_7745c5c3_Var15 string - templ_7745c5c3_Var15, templ_7745c5c3_Err = templ.JoinStringErrs(ev.StartTime) + var templ_7745c5c3_Var16 string + templ_7745c5c3_Var16, templ_7745c5c3_Err = templ.JoinStringErrs(ev.StartTime) if templ_7745c5c3_Err != nil { - return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/index/pages/index.templ`, Line: 161, Col: 20} + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/index/pages/index.templ`, Line: 177, Col: 20} } - _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var15)) + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var16)) if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 27, " → ") + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 30, " → ") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } - var templ_7745c5c3_Var16 string - templ_7745c5c3_Var16, templ_7745c5c3_Err = templ.JoinStringErrs(ev.EndTime) + var templ_7745c5c3_Var17 string + templ_7745c5c3_Var17, templ_7745c5c3_Err = templ.JoinStringErrs(ev.EndTime) if templ_7745c5c3_Err != nil { - return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/index/pages/index.templ`, Line: 161, Col: 39} + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/index/pages/index.templ`, Line: 177, Col: 39} } - _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var16)) + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var17)) if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 28, "

→
") + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 31, "

→
") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } } else { - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 29, "") + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 32, "") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } @@ -452,129 +479,129 @@ } }() } ctx = templ.InitializeContext(ctx) - templ_7745c5c3_Var17 := templ.GetChildren(ctx) - if templ_7745c5c3_Var17 == nil { - templ_7745c5c3_Var17 = templ.NopComponent + templ_7745c5c3_Var18 := templ.GetChildren(ctx) + if templ_7745c5c3_Var18 == nil { + templ_7745c5c3_Var18 = templ.NopComponent } ctx = templ.ClearChildren(ctx) - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 30, "") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } @@ -606,12 +633,12 @@ } }() } ctx = templ.InitializeContext(ctx) - templ_7745c5c3_Var24 := templ.GetChildren(ctx) - if templ_7745c5c3_Var24 == nil { - templ_7745c5c3_Var24 = templ.NopComponent + templ_7745c5c3_Var25 := templ.GetChildren(ctx) + if templ_7745c5c3_Var25 == nil { + templ_7745c5c3_Var25 = templ.NopComponent } ctx = templ.ClearChildren(ctx) - templ_7745c5c3_Var25 := templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) { + templ_7745c5c3_Var26 := templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) { templ_7745c5c3_W, ctx := templ_7745c5c3_Input.Writer, templ_7745c5c3_Input.Context templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templruntime.GetBuffer(templ_7745c5c3_W) if !templ_7745c5c3_IsBuffer { @@ -623,52 +650,52 @@ } }() } ctx = templ.InitializeContext(ctx) - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 44, "
~/atmo.quest — zsh
you") + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 47, "
~/atmo.quest — zsh
you") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } - var templ_7745c5c3_Var26 string - templ_7745c5c3_Var26, templ_7745c5c3_Err = templ.JoinStringErrs("@") + var templ_7745c5c3_Var27 string + templ_7745c5c3_Var27, templ_7745c5c3_Err = templ.JoinStringErrs("@") if templ_7745c5c3_Err != nil { - return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/index/pages/index.templ`, Line: 232, Col: 56} + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/index/pages/index.templ`, Line: 248, Col: 56} } - _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var26)) + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var27)) if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 45, "cascadiajs:~$ whoami
a person at a conference. you just met someone interesting and now their handle is gone.
init: v0.1 · CascadiaJS 2026

atmo.quest 

An event companion ") + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 48, "cascadiajs:~$ whoami

a person at a conference. you just met someone interesting and now their handle is gone.
Find your people in the Atmosphere.

atmo.quest 

An event companion ") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } - var templ_7745c5c3_Var27 string - templ_7745c5c3_Var27, templ_7745c5c3_Err = templ.JoinStringErrs("for") + var templ_7745c5c3_Var28 string + templ_7745c5c3_Var28, templ_7745c5c3_Err = templ.JoinStringErrs("for") if templ_7745c5c3_Err != nil { - return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/index/pages/index.templ`, Line: 243, Col: 56} + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/index/pages/index.templ`, Line: 259, Col: 56} } - _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var27)) + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var28)) if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 46, " the open social web. Scan a QR, write a note, leave with a real follow-up list. Your data goes to your repo, not ours.

▸ start quest ↵ ? what's ATProto ?
atmo.quest
quest_log.md

Side Quests ") + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 49, " the open social web. Scan a QR, write a note, leave with a real follow-up list. Your data goes to your repo, not ours.

▸ start quest ↵ ? what's ATProto ?

atmo.quest
quest_log.md

Side Quests ") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } - var templ_7745c5c3_Var28 string - templ_7745c5c3_Var28, templ_7745c5c3_Err = templ.JoinStringErrs("// available") + var templ_7745c5c3_Var29 string + templ_7745c5c3_Var29, templ_7745c5c3_Err = templ.JoinStringErrs("// available") if templ_7745c5c3_Err != nil { - return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/index/pages/index.templ`, Line: 265, Col: 57} + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/index/pages/index.templ`, Line: 281, Col: 57} } - _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var28)) + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var29)) if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 47, "

◆
Make your first connection
Scan someone's QR code. A quest.atmo.connection record gets written to your PDS. They get one too. That's the protocol bit.
+1 badge first connect
◆
Check in to CascadiaJS
Drops a checkin record dated June 1–2, 2026. You'll find it in your repo forever.
+1 badge attendee
◆
Take a note while it's fresh
Private notes, attached to each connection. Read them Monday morning when you forget who Sarah was.
unlocks with first connection
◆
Help unlock the conference rewards
As more people join, new things appear — leaderboard, interest matching, end-of-conf stats. Earned together.
group quest see /unlocks
") + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 50, "
◆
Make your first connection
Scan someone's QR code. A quest.atmo.connection record gets written to your PDS. They get one too. That's the protocol bit.
+1 badge first connect
◆
Check in to CascadiaJS
Drops a checkin record dated June 1–2, 2026. You'll find it in your repo forever.
+1 badge attendee
◆
Take a note while it's fresh
Private notes, attached to each connection. Read them Monday morning when you forget who Sarah was.
unlocks with first connection
◆
Help unlock the conference rewards
As more people join, new things appear — leaderboard, interest matching, end-of-conf stats. Earned together.
group quest see /unlocks
") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } return nil }) - templ_7745c5c3_Err = layouts.Base("atmo.quest — conference companion on ATProto", "Scan a QR, write a note, leave with a real follow-up list. Your data goes to your repo, not ours.").Render(templ.WithChildren(ctx, templ_7745c5c3_Var25), templ_7745c5c3_Buffer) + templ_7745c5c3_Err = layouts.Base("atmo.quest", "Scan a QR, write a note, leave with a real follow-up list. Your data goes to your repo, not ours.").Render(templ.WithChildren(ctx, templ_7745c5c3_Var26), templ_7745c5c3_Buffer) if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } diff --git a/features/profile/handlers.go b/features/profile/handlers.go --- a/features/profile/handlers.go +++ b/features/profile/handlers.go @@ -59,6 +59,13 @@ // Load earned badges from local cache. if earned, err := badge.ListEarned(r.Context(), h.DB, did.String()); err == nil { for _, eb := range earned { + svg := badge.RenderSVG(badge.Design{ + Shape: eb.Shape, + PrimaryColor: eb.PrimaryColor, + AccentColor: eb.AccentColor, + RibbonColor: eb.RibbonColor, + Label: eb.Label, + }, 160) view.Badges = append(view.Badges, pages.ProfileBadge{ Name: eb.Name, Description: eb.Description, @@ -68,6 +75,8 @@ AccentColor: eb.AccentColor, RibbonColor: eb.RibbonColor, Label: eb.Label, EarnedAt: eb.EarnedAt.Format("Jan 2, 2006"), + Message: eb.Message, + SVGPreview: svg, }) } } diff --git a/features/profile/pages/profile.templ b/features/profile/pages/profile.templ --- a/features/profile/pages/profile.templ +++ b/features/profile/pages/profile.templ @@ -53,10 +53,12 @@ AccentColor string RibbonColor string Label string EarnedAt string // pre-formatted + Message string // custom message from the badge award + SVGPreview string // rendered SVG for the modal } templ Profile(v ProfileView) { - @layouts.Base("profile — atmo.quest", "Your atmo.quest profile — display name, bio, interests, links.") { + @layouts.Base("profile", "Your atmo.quest profile — display name, bio, interests, links.") {
@@ -207,6 +209,19 @@
atmo.quest
+ + // Badge detail modal + + @layouts.BottomNav("home") } @@ -221,10 +236,21 @@ return displayName + "'s profile picture" } templ profileBadge(b ProfileBadge) { -
+
+ +} + +script showBadgeModal(b ProfileBadge) { + var overlay = document.getElementById("badge-modal-overlay"); + if (!overlay) return; + document.getElementById("badge-modal-svg").innerHTML = b.SVGPreview; + document.getElementById("badge-modal-name").textContent = b.Name; + document.getElementById("badge-modal-desc").textContent = b.Description; + document.getElementById("badge-modal-date").textContent = b.EarnedAt ? "Earned: " + b.EarnedAt : ""; + document.getElementById("badge-modal-message").textContent = b.Message || ""; + overlay.style.display = "flex"; } diff --git a/features/profile/pages/profile_edit.templ b/features/profile/pages/profile_edit.templ --- a/features/profile/pages/profile_edit.templ +++ b/features/profile/pages/profile_edit.templ @@ -53,7 +53,7 @@ "hiring", "looking-for-work", "mentoring", } templ ProfileEdit(v ProfileEditView) { - @layouts.Base("edit profile — atmo.quest", "Edit your atmo.quest profile.") { + @layouts.Base("edit profile", "Edit your atmo.quest profile.") {
diff --git a/features/profile/pages/profile_edit_templ.go b/features/profile/pages/profile_edit_templ.go --- a/features/profile/pages/profile_edit_templ.go +++ b/features/profile/pages/profile_edit_templ.go @@ -424,7 +424,7 @@ return templ_7745c5c3_Err } return nil }) - templ_7745c5c3_Err = layouts.Base("edit profile — atmo.quest", "Edit your atmo.quest profile.").Render(templ.WithChildren(ctx, templ_7745c5c3_Var2), templ_7745c5c3_Buffer) + templ_7745c5c3_Err = layouts.Base("edit profile", "Edit your atmo.quest profile.").Render(templ.WithChildren(ctx, templ_7745c5c3_Var2), templ_7745c5c3_Buffer) if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } diff --git a/features/profile/pages/profile_templ.go b/features/profile/pages/profile_templ.go --- a/features/profile/pages/profile_templ.go +++ b/features/profile/pages/profile_templ.go @@ -61,6 +61,8 @@ AccentColor string RibbonColor string Label string EarnedAt string // pre-formatted + Message string // custom message from the badge award + SVGPreview string // rendered SVG for the modal } func Profile(v ProfileView) templ.Component { @@ -111,7 +113,7 @@ } var templ_7745c5c3_Var3 string templ_7745c5c3_Var3, templ_7745c5c3_Err = templ.JoinStringErrs("@") if templ_7745c5c3_Err != nil { - return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/profile/pages/profile.templ`, Line: 70, Col: 56} + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/profile/pages/profile.templ`, Line: 72, Col: 56} } _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var3)) if templ_7745c5c3_Err != nil { @@ -139,7 +141,7 @@ } var templ_7745c5c3_Var4 string templ_7745c5c3_Var4, templ_7745c5c3_Err = templ.JoinStringErrs(v.ConnectedDID) if templ_7745c5c3_Err != nil { - return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/profile/pages/profile.templ`, Line: 81, Col: 63} + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/profile/pages/profile.templ`, Line: 83, Col: 63} } _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var4)) if templ_7745c5c3_Err != nil { @@ -167,7 +169,7 @@ } var templ_7745c5c3_Var5 string templ_7745c5c3_Var5, templ_7745c5c3_Err = templ.ResolveAttributeValue(v.AvatarURL) if templ_7745c5c3_Err != nil { - return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/profile/pages/profile.templ`, Line: 89, Col: 54} + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/profile/pages/profile.templ`, Line: 91, Col: 54} } _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var5) if templ_7745c5c3_Err != nil { @@ -180,7 +182,7 @@ } var templ_7745c5c3_Var6 string templ_7745c5c3_Var6, templ_7745c5c3_Err = templ.ResolveAttributeValue(avatarAlt(v.DisplayName)) if templ_7745c5c3_Err != nil { - return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/profile/pages/profile.templ`, Line: 89, Col: 87} + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/profile/pages/profile.templ`, Line: 91, Col: 87} } _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var6) if templ_7745c5c3_Err != nil { @@ -208,7 +210,7 @@ } var templ_7745c5c3_Var7 string templ_7745c5c3_Var7, templ_7745c5c3_Err = templ.ResolveAttributeValue(v.QRURL) if templ_7745c5c3_Err != nil { - return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/profile/pages/profile.templ`, Line: 98, Col: 46} + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/profile/pages/profile.templ`, Line: 100, Col: 46} } _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var7) if templ_7745c5c3_Err != nil { @@ -231,7 +233,7 @@ } var templ_7745c5c3_Var8 string templ_7745c5c3_Var8, templ_7745c5c3_Err = templ.JoinStringErrs(v.DisplayName) if templ_7745c5c3_Err != nil { - return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/profile/pages/profile.templ`, Line: 106, Col: 46} + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/profile/pages/profile.templ`, Line: 108, Col: 46} } _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var8)) if templ_7745c5c3_Err != nil { @@ -282,7 +284,7 @@ } var templ_7745c5c3_Var9 string templ_7745c5c3_Var9, templ_7745c5c3_Err = templ.JoinStringErrs(v.Bio) if templ_7745c5c3_Err != nil { - return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/profile/pages/profile.templ`, Line: 133, Col: 51} + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/profile/pages/profile.templ`, Line: 135, Col: 51} } _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var9)) if templ_7745c5c3_Err != nil { @@ -301,7 +303,7 @@ } var templ_7745c5c3_Var10 string templ_7745c5c3_Var10, templ_7745c5c3_Err = templ.JoinStringErrs(v.WorksAt) if templ_7745c5c3_Err != nil { - return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/profile/pages/profile.templ`, Line: 139, Col: 42} + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/profile/pages/profile.templ`, Line: 141, Col: 42} } _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var10)) if templ_7745c5c3_Err != nil { @@ -320,7 +322,7 @@ } var templ_7745c5c3_Var11 string templ_7745c5c3_Var11, templ_7745c5c3_Err = templ.JoinStringErrs(v.Location) if templ_7745c5c3_Err != nil { - return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/profile/pages/profile.templ`, Line: 145, Col: 43} + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/profile/pages/profile.templ`, Line: 147, Col: 43} } _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var11)) if templ_7745c5c3_Err != nil { @@ -339,7 +341,7 @@ } var templ_7745c5c3_Var12 string templ_7745c5c3_Var12, templ_7745c5c3_Err = templ.JoinStringErrs(v.ContactMethod) if templ_7745c5c3_Err != nil { - return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/profile/pages/profile.templ`, Line: 151, Col: 48} + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/profile/pages/profile.templ`, Line: 153, Col: 48} } _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var12)) if templ_7745c5c3_Err != nil { @@ -379,7 +381,7 @@ } var templ_7745c5c3_Var13 string templ_7745c5c3_Var13, templ_7745c5c3_Err = templ.JoinStringErrs(t) if templ_7745c5c3_Err != nil { - return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/profile/pages/profile.templ`, Line: 169, Col: 45} + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/profile/pages/profile.templ`, Line: 171, Col: 45} } _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var13)) if templ_7745c5c3_Err != nil { @@ -408,7 +410,7 @@ } var templ_7745c5c3_Var14 templ.SafeURL templ_7745c5c3_Var14, templ_7745c5c3_Err = templ.JoinURLErrs(templ.URL(l.URL)) if templ_7745c5c3_Err != nil { - return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/profile/pages/profile.templ`, Line: 180, Col: 58} + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/profile/pages/profile.templ`, Line: 182, Col: 58} } _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var14)) if templ_7745c5c3_Err != nil { @@ -421,7 +423,7 @@ } var templ_7745c5c3_Var15 string templ_7745c5c3_Var15, templ_7745c5c3_Err = templ.JoinStringErrs(l.Label) if templ_7745c5c3_Err != nil { - return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/profile/pages/profile.templ`, Line: 181, Col: 49} + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/profile/pages/profile.templ`, Line: 183, Col: 49} } _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var15)) if templ_7745c5c3_Err != nil { @@ -453,7 +455,7 @@ if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } } - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 48, "
▸ edit profile ← home
atmo.quest
") + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 48, "
▸ edit profile ← home
atmo.quest
") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } @@ -463,7 +465,7 @@ return templ_7745c5c3_Err } return nil }) - templ_7745c5c3_Err = layouts.Base("profile — atmo.quest", "Your atmo.quest profile — display name, bio, interests, links.").Render(templ.WithChildren(ctx, templ_7745c5c3_Var2), templ_7745c5c3_Buffer) + templ_7745c5c3_Err = layouts.Base("profile", "Your atmo.quest profile — display name, bio, interests, links.").Render(templ.WithChildren(ctx, templ_7745c5c3_Var2), templ_7745c5c3_Buffer) if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } @@ -500,64 +502,94 @@ if templ_7745c5c3_Var16 == nil { templ_7745c5c3_Var16 = templ.NopComponent } ctx = templ.ClearChildren(ctx) - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 49, "
") + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 51, "\">
") + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 52, "\">") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } var templ_7745c5c3_Var20 string - templ_7745c5c3_Var20, templ_7745c5c3_Err = templ.JoinStringErrs(b.Name) + templ_7745c5c3_Var20, templ_7745c5c3_Err = templ.JoinStringErrs(b.Label) if templ_7745c5c3_Err != nil { - return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/profile/pages/profile.templ`, Line: 228, Col: 43} + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/profile/pages/profile.templ`, Line: 241, Col: 46} } _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var20)) if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 53, "
") + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 53, "
") + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + var templ_7745c5c3_Var21 string + templ_7745c5c3_Var21, templ_7745c5c3_Err = templ.JoinStringErrs(b.Name) + if templ_7745c5c3_Err != nil { + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/profile/pages/profile.templ`, Line: 243, Col: 43} + } + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var21)) + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 54, "") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } return nil }) +} + +func showBadgeModal(b ProfileBadge) templ.ComponentScript { + return templ.ComponentScript{ + Name: `__templ_showBadgeModal_1d85`, + Function: `function __templ_showBadgeModal_1d85(b){var overlay = document.getElementById("badge-modal-overlay"); + if (!overlay) return; + document.getElementById("badge-modal-svg").innerHTML = b.SVGPreview; + document.getElementById("badge-modal-name").textContent = b.Name; + document.getElementById("badge-modal-desc").textContent = b.Description; + document.getElementById("badge-modal-date").textContent = b.EarnedAt ? "Earned: " + b.EarnedAt : ""; + document.getElementById("badge-modal-message").textContent = b.Message || ""; + overlay.style.display = "flex"; +}`, + Call: templ.SafeScript(`__templ_showBadgeModal_1d85`, b), + CallInline: templ.SafeScriptInline(`__templ_showBadgeModal_1d85`, b), + } } var _ = templruntime.GeneratedTemplate diff --git a/features/settings/handlers.go b/features/settings/handlers.go --- a/features/settings/handlers.go +++ b/features/settings/handlers.go @@ -5,6 +5,7 @@ import ( "database/sql" "encoding/csv" + "encoding/json" "fmt" "log/slog" "net/http" @@ -16,7 +17,10 @@ "github.com/bluesky-social/indigo/atproto/syntax" "atmoquest/features/auth" "atmoquest/features/settings/pages" + "atmoquest/internal/badge" + "atmoquest/internal/connection" "atmoquest/internal/notes" + "atmoquest/internal/profile" "atmoquest/internal/users" ) @@ -55,12 +59,14 @@ // Display name initial for avatar. avatarInitial := "?" displayName := "" + avatarURL := "" if handle != "" && handle != "handle.invalid" { avatarInitial = string([]rune(handle)[0]) } // Extract PDS host from session. pds := "" + pdsHost := "" if h.DB != nil { var host string err := h.DB.QueryRowContext(r.Context(), ` @@ -68,57 +74,171 @@ SELECT data ->> 'host_url' FROM oauth_sessions WHERE did = ? ORDER BY updated_at DESC LIMIT 1 `, did.String()).Scan(&host) if err == nil && host != "" { + pdsHost = host // Extract hostname from URL. pds = strings.TrimPrefix(strings.TrimPrefix(host, "https://"), "http://") } } + // Fetch Bluesky profile for display name and avatar. + if pdsHost != "" { + bsky, err := profile.FetchBluesky(r.Context(), pdsHost, did) + if err == nil && bsky != nil { + if bsky.DisplayName != "" { + displayName = bsky.DisplayName + avatarInitial = string([]rune(displayName)[0]) + } + if bsky.Avatar != nil { + avatarURL = profile.AvatarURL(pdsHost, did, bsky.Avatar.CID()) + } + } + } + view := pages.SettingsView{ - Handle: handle, - DisplayName: displayName, - AvatarInitial: avatarInitial, - PDS: pds, - NoteCount: noteCount, - Deleted: deleted, - IsAdmin: isAdmin, + Handle: handle, + DisplayName: displayName, + AvatarInitial: avatarInitial, + AvatarURL: avatarURL, + PDS: pds, + NoteCount: noteCount, + Deleted: deleted, + IsAdmin: isAdmin, + ShowAttendees: true, + ShowLeaderboard: true, } + // Load privacy settings. + privacy, _ := users.GetPrivacy(r.Context(), h.DB, did) + view.ShowAttendees = !privacy.HideFromAttendees + view.ShowLeaderboard = !privacy.HideFromLeaderboard + w.Header().Set("Content-Type", "text/html; charset=utf-8") if err := pages.Settings(view).Render(r.Context(), w); err != nil { slog.Error("render settings", "err", err) } } -// ExportCSV streams the viewer's notes as a CSV download. +// ExportCSV streams the viewer's connections and notes as a CSV download. +// Includes all connections from the user's PDS, merged with any local notes. func (h *Handlers) ExportCSV(w http.ResponseWriter, r *http.Request) { did, _, ok := h.Auth.RequireSession(w, r) if !ok { return } - rows, err := notes.ListAll(r.Context(), h.DB, did.String()) + // Load all notes into a map keyed by target DID. + noteRows, err := notes.ListAll(r.Context(), h.DB, did.String()) if err != nil { slog.Warn("settings: export notes", "did", did.String(), "err", err) - http.Error(w, "failed to export", http.StatusInternalServerError) - return + } + noteMap := make(map[string]notes.ExportRow, len(noteRows)) + for _, nr := range noteRows { + noteMap[nr.TargetDID] = nr + } + + // Load all connections from the user's PDS. + pdsHost := h.lookupPDS(r, did) + conns, err := connection.List(r.Context(), pdsHost, did) + if err != nil { + slog.Warn("settings: export connections", "did", did.String(), "err", err) } w.Header().Set("Content-Type", "text/csv; charset=utf-8") - w.Header().Set("Content-Disposition", "attachment; filename=atmoquest-notes.csv") + w.Header().Set("Content-Disposition", "attachment; filename=atmoquest-connections.csv") cw := csv.NewWriter(w) - _ = cw.Write([]string{"target_did", "handle", "notes", "follow_up", "updated_at"}) - for _, row := range rows { + _ = cw.Write([]string{"target_did", "handle", "connected_at", "event", "notes", "follow_up"}) + + // Track which DIDs we've already written (connections may have dupes across events). + written := make(map[string]bool) + + for _, c := range conns { + targetDID := c.With.String() + handle := h.resolveHandle(r, targetDID) + connectedAt := "" + if !c.ConnectedAt.IsZero() { + connectedAt = c.ConnectedAt.Format("2006-01-02T15:04:05Z") + } + noteText := "" followUp := "no" - if row.FollowUp { + if nr, ok := noteMap[targetDID]; ok { + noteText = nr.Notes + if nr.FollowUp { + followUp = "yes" + } + written[targetDID] = true + } + _ = cw.Write([]string{targetDID, handle, connectedAt, c.EventURI, noteText, followUp}) + } + + // Write any notes for DIDs that didn't appear in the connection list + // (e.g., notes left over after a connection was deleted). + for _, nr := range noteRows { + if written[nr.TargetDID] { + continue + } + handle := h.resolveHandle(r, nr.TargetDID) + followUp := "no" + if nr.FollowUp { followUp = "yes" } - handle := h.resolveHandle(r, row.TargetDID) - _ = cw.Write([]string{row.TargetDID, handle, row.Notes, followUp, row.UpdatedAt}) + _ = cw.Write([]string{nr.TargetDID, handle, "", "", nr.Notes, followUp}) } + cw.Flush() } +// lookupPDS returns the PDS host for the given DID from oauth_sessions. +func (h *Handlers) lookupPDS(r *http.Request, did syntax.DID) string { + if h.DB != nil { + var host string + err := h.DB.QueryRowContext(r.Context(), ` + SELECT data ->> 'host_url' FROM oauth_sessions + WHERE did = ? ORDER BY updated_at DESC LIMIT 1 + `, did.String()).Scan(&host) + if err == nil && host != "" { + return host + } + } + return "https://bsky.social" +} + +// TogglePrivacy handles POST /settings/privacy — toggles a privacy setting. +func (h *Handlers) TogglePrivacy(w http.ResponseWriter, r *http.Request) { + did, _, ok := h.Auth.RequireSession(w, r) + if !ok { + return + } + + if err := r.ParseForm(); err != nil { + http.Error(w, "bad request", http.StatusBadRequest) + return + } + + field := r.FormValue("field") + // value="1" means "toggle ON (hide)", value="0" means "toggle OFF (show)" + value := r.FormValue("value") == "1" + + var column string + switch field { + case "hide_from_attendees": + column = "hide_from_attendees" + case "hide_from_leaderboard": + column = "hide_from_leaderboard" + default: + http.Error(w, "unknown field", http.StatusBadRequest) + return + } + + if err := users.SetPrivacy(r.Context(), h.DB, did, column, value); err != nil { + slog.Warn("settings: toggle privacy", "did", did.String(), "field", field, "err", err) + http.Error(w, "failed to update", http.StatusInternalServerError) + return + } + + http.Redirect(w, r, "/settings", http.StatusSeeOther) +} + // DeleteData handles POST /settings/delete — deletes all the viewer's notes // after verifying the handle confirmation field matches. If the "purge_pds" // checkbox is checked, also deletes all quest.atmo.* records from the user's @@ -239,6 +359,115 @@ _, _ = h.DB.ExecContext(r.Context(), `DELETE FROM oauth_sessions WHERE did = ?`, did.String()) _, _ = h.DB.ExecContext(r.Context(), `DELETE FROM users WHERE did = ? AND is_admin = 0`, did.String()) slog.Info("settings purge: local cache cleared", "did", did.String()) +} + +// NotesList renders /settings/notes — a table of all local notes and follow-up flags. +func (h *Handlers) NotesList(w http.ResponseWriter, r *http.Request) { + did, sess, ok := h.Auth.RequireSession(w, r) + if !ok { + return + } + + // Award "Extra Curious" badge for exploring data pages. + if sess != nil { + _, _ = badge.Award(r.Context(), sess, h.DB, badge.AwardExtraCurious, "") + } + + rows, err := notes.ListAll(r.Context(), h.DB, did.String()) + if err != nil { + slog.Warn("settings: list notes", "err", err) + } + + var view pages.NotesListView + for _, nr := range rows { + handle := h.resolveHandle(r, nr.TargetDID) + view.Notes = append(view.Notes, pages.NoteRow{ + TargetDID: nr.TargetDID, + Handle: handle, + Notes: nr.Notes, + FollowUp: nr.FollowUp, + UpdatedAt: nr.UpdatedAt, + }) + } + + w.Header().Set("Content-Type", "text/html; charset=utf-8") + if err := pages.NotesList(view).Render(r.Context(), w); err != nil { + slog.Error("render notes list", "err", err) + } +} + +// PDSData renders /settings/pds — all quest.atmo.* records from the user's PDS. +func (h *Handlers) PDSData(w http.ResponseWriter, r *http.Request) { + did, sess, ok := h.Auth.RequireSession(w, r) + if !ok { + return + } + + // Award "Extra Curious" badge for exploring data pages. + _, _ = badge.Award(r.Context(), sess, h.DB, badge.AwardExtraCurious, "") + + pds := sess.Data.HostURL + pdsDisplay := strings.TrimPrefix(strings.TrimPrefix(pds, "https://"), "http://") + + collections := []string{ + "quest.atmo.profile", + "quest.atmo.connection", + "quest.atmo.checkin", + "quest.atmo.badge", + "quest.atmo.event", + } + + apiClient := sess.APIClient() + var colls []pages.PDSCollection + + for _, coll := range collections { + pc := pages.PDSCollection{Name: coll} + cursor := "" + for { + params := map[string]any{ + "repo": did.String(), + "collection": coll, + "limit": 100, + } + if cursor != "" { + params["cursor"] = cursor + } + var resp struct { + Records []struct { + URI string `json:"uri"` + Value map[string]any `json:"value"` + } `json:"records"` + Cursor string `json:"cursor,omitempty"` + } + if err := apiClient.Get(r.Context(), syntax.NSID("com.atproto.repo.listRecords"), params, &resp); err != nil { + slog.Warn("settings pds: list", "collection", coll, "err", err) + break + } + for _, rec := range resp.Records { + pretty, _ := json.MarshalIndent(rec.Value, "", " ") + pc.Records = append(pc.Records, pages.PDSRecord{ + URI: rec.URI, + RKey: rkeyFromURI(rec.URI), + Value: string(pretty), + }) + } + if resp.Cursor == "" || len(resp.Records) == 0 { + break + } + cursor = resp.Cursor + } + colls = append(colls, pc) + } + + view := pages.PDSDataView{ + PDS: pdsDisplay, + Collections: colls, + } + + w.Header().Set("Content-Type", "text/html; charset=utf-8") + if err := pages.PDSData(view).Render(r.Context(), w); err != nil { + slog.Error("render pds data", "err", err) + } } // rkeyFromURI extracts the record key (last path segment) from an at:// URI. diff --git a/features/settings/pages/notes_list.templ b/features/settings/pages/notes_list.templ new file mode 100644 --- /dev/null +++ b/features/settings/pages/notes_list.templ @@ -0,0 +1,94 @@ +package pages + +import "atmoquest/features/common/layouts" + +// NotesListView is the data for the /settings/notes page. +type NotesListView struct { + Notes []NoteRow +} + +// NoteRow is one row in the local notes table. +type NoteRow struct { + TargetDID string + Handle string + DisplayName string + Notes string + FollowUp bool + UpdatedAt string +} + +templ NotesList(v NotesListView) { + @layouts.Base("local notes", "Your private notes stored in the app.") { +
+
+
+
+
+
~/atmo.quest — local notes
+ @layouts.TopNav("settings") +
+
+
+
Local notes
+
+ This data is stored in the application's database since it's private data. + The rest of your data is stored in your PDS. + Once private data can be safely stored in your ATProto PDS, we will move this data there. +
+ + ← back to settings + + if len(v.Notes) == 0 { +

no notes yet. visit a connection's profile to add one.

+ } else { +
+ + + + + + + + + + + for _, n := range v.Notes { + + + + + + + } + +
personnotesfollow upupdated
+ + if n.DisplayName != "" { + { n.DisplayName } + } else if n.Handle != "" { + { "@" + n.Handle } + } else { + { n.TargetDID } + } + + { n.Notes } + if n.FollowUp { + ⚑ yes + } else { + — + } + { n.UpdatedAt }
+
+ } +
+
+
+ atmo.quest +
+
+ + @layouts.BottomNav("settings") + } +} diff --git a/features/settings/pages/notes_list_templ.go b/features/settings/pages/notes_list_templ.go new file mode 100644 --- /dev/null +++ b/features/settings/pages/notes_list_templ.go @@ -0,0 +1,217 @@ +// Code generated by templ - DO NOT EDIT. + +// templ: version: v0.3.1020 +package pages + +//lint:file-ignore SA4006 This context is only used if a nested component is present. + +import "github.com/a-h/templ" +import templruntime "github.com/a-h/templ/runtime" + +import "atmoquest/features/common/layouts" + +// NotesListView is the data for the /settings/notes page. +type NotesListView struct { + Notes []NoteRow +} + +// NoteRow is one row in the local notes table. +type NoteRow struct { + TargetDID string + Handle string + DisplayName string + Notes string + FollowUp bool + UpdatedAt string +} + +func NotesList(v NotesListView) templ.Component { + return templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) { + templ_7745c5c3_W, ctx := templ_7745c5c3_Input.Writer, templ_7745c5c3_Input.Context + if templ_7745c5c3_CtxErr := ctx.Err(); templ_7745c5c3_CtxErr != nil { + return templ_7745c5c3_CtxErr + } + templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templruntime.GetBuffer(templ_7745c5c3_W) + if !templ_7745c5c3_IsBuffer { + defer func() { + templ_7745c5c3_BufErr := templruntime.ReleaseBuffer(templ_7745c5c3_Buffer) + if templ_7745c5c3_Err == nil { + templ_7745c5c3_Err = templ_7745c5c3_BufErr + } + }() + } + ctx = templ.InitializeContext(ctx) + templ_7745c5c3_Var1 := templ.GetChildren(ctx) + if templ_7745c5c3_Var1 == nil { + templ_7745c5c3_Var1 = templ.NopComponent + } + ctx = templ.ClearChildren(ctx) + templ_7745c5c3_Var2 := templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) { + templ_7745c5c3_W, ctx := templ_7745c5c3_Input.Writer, templ_7745c5c3_Input.Context + templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templruntime.GetBuffer(templ_7745c5c3_W) + if !templ_7745c5c3_IsBuffer { + defer func() { + templ_7745c5c3_BufErr := templruntime.ReleaseBuffer(templ_7745c5c3_Buffer) + if templ_7745c5c3_Err == nil { + templ_7745c5c3_Err = templ_7745c5c3_BufErr + } + }() + } + ctx = templ.InitializeContext(ctx) + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 1, "
~/atmo.quest — local notes
") + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + templ_7745c5c3_Err = layouts.TopNav("settings").Render(ctx, templ_7745c5c3_Buffer) + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 2, "
Local notes
This data is stored in the application's database since it's private data. The rest of your data is stored in your PDS. Once private data can be safely stored in your ATProto PDS, we will move this data there.
← back to settings ") + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + if len(v.Notes) == 0 { + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 3, "

no notes yet. visit a connection's profile to add one.

") + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + } else { + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 4, "
") + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + for _, n := range v.Notes { + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 5, "") + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + } + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 17, "
personnotesfollow upupdated
") + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + if n.DisplayName != "" { + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 7, "") + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + var templ_7745c5c3_Var4 string + templ_7745c5c3_Var4, templ_7745c5c3_Err = templ.JoinStringErrs(n.DisplayName) + if templ_7745c5c3_Err != nil { + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/settings/pages/notes_list.templ`, Line: 60, Col: 37} + } + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var4)) + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 8, "") + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + } else if n.Handle != "" { + var templ_7745c5c3_Var5 string + templ_7745c5c3_Var5, templ_7745c5c3_Err = templ.JoinStringErrs("@" + n.Handle) + if templ_7745c5c3_Err != nil { + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/settings/pages/notes_list.templ`, Line: 62, Col: 30} + } + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var5)) + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + } else { + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 9, "") + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + var templ_7745c5c3_Var6 string + templ_7745c5c3_Var6, templ_7745c5c3_Err = templ.JoinStringErrs(n.TargetDID) + if templ_7745c5c3_Err != nil { + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/settings/pages/notes_list.templ`, Line: 64, Col: 47} + } + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var6)) + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 10, "") + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + } + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 11, "") + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + var templ_7745c5c3_Var7 string + templ_7745c5c3_Var7, templ_7745c5c3_Err = templ.JoinStringErrs(n.Notes) + if templ_7745c5c3_Err != nil { + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/settings/pages/notes_list.templ`, Line: 68, Col: 91} + } + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var7)) + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 12, "") + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + if n.FollowUp { + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 13, "⚑ yes") + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + } else { + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 14, "—") + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + } + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 15, "") + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + var templ_7745c5c3_Var8 string + templ_7745c5c3_Var8, templ_7745c5c3_Err = templ.JoinStringErrs(n.UpdatedAt) + if templ_7745c5c3_Err != nil { + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/settings/pages/notes_list.templ`, Line: 76, Col: 49} + } + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var8)) + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 16, "
") + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + } + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 18, "
atmo.quest
") + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + templ_7745c5c3_Err = layouts.BottomNav("settings").Render(ctx, templ_7745c5c3_Buffer) + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + return nil + }) + templ_7745c5c3_Err = layouts.Base("local notes", "Your private notes stored in the app.").Render(templ.WithChildren(ctx, templ_7745c5c3_Var2), templ_7745c5c3_Buffer) + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + return nil + }) +} + +var _ = templruntime.GeneratedTemplate diff --git a/features/settings/pages/pds_data.templ b/features/settings/pages/pds_data.templ new file mode 100644 --- /dev/null +++ b/features/settings/pages/pds_data.templ @@ -0,0 +1,93 @@ +package pages + +import ( + "fmt" + + "atmoquest/features/common/layouts" +) + +// PDSDataView is the data for the /settings/pds page. +type PDSDataView struct { + PDS string // PDS hostname + Collections []PDSCollection +} + +// PDSCollection is one quest.atmo.* collection with its records. +type PDSCollection struct { + Name string // e.g. "quest.atmo.connection" + Records []PDSRecord +} + +// PDSRecord is a single record from the user's PDS. +type PDSRecord struct { + URI string + RKey string + Value string // pretty-printed JSON +} + +templ PDSData(v PDSDataView) { + @layouts.Base("PDS data", "Your atmo.quest records stored in your ATProto PDS.") { +
+
+
+
+
+
~/atmo.quest — PDS data
+ @layouts.TopNav("settings") +
+
+
+
PDS data
+
+ These records are stored in your ATProto Personal Data Server + if v.PDS != "" { + ({ v.PDS }) + } + — they're yours and travel with your account. This is the core idea behind ATProto: + your data lives in your repo, not in our database. +
+ + ← back to settings + + for _, coll := range v.Collections { +
+
{ coll.Name } ({ pdsRecordCount(len(coll.Records)) })
+ if len(coll.Records) == 0 { +

no records

+ } else { +
+ for _, rec := range coll.Records { +
+ + { rec.RKey } + + 
{ rec.Value }
+
+ } +
+ } +
+ } +
+
+
+ atmo.quest +
+
+ + @layouts.BottomNav("settings") + } +} + +func pdsRecordCount(n int) string { + if n == 1 { + return "1 record" + } + return pdsItoa(n) + " records" +} + +func pdsItoa(n int) string { + return fmt.Sprintf("%d", n) +} diff --git a/features/settings/pages/pds_data_templ.go b/features/settings/pages/pds_data_templ.go new file mode 100644 --- /dev/null +++ b/features/settings/pages/pds_data_templ.go @@ -0,0 +1,216 @@ +// Code generated by templ - DO NOT EDIT. + +// templ: version: v0.3.1020 +package pages + +//lint:file-ignore SA4006 This context is only used if a nested component is present. + +import "github.com/a-h/templ" +import templruntime "github.com/a-h/templ/runtime" + +import ( + "fmt" + + "atmoquest/features/common/layouts" +) + +// PDSDataView is the data for the /settings/pds page. +type PDSDataView struct { + PDS string // PDS hostname + Collections []PDSCollection +} + +// PDSCollection is one quest.atmo.* collection with its records. +type PDSCollection struct { + Name string // e.g. "quest.atmo.connection" + Records []PDSRecord +} + +// PDSRecord is a single record from the user's PDS. +type PDSRecord struct { + URI string + RKey string + Value string // pretty-printed JSON +} + +func PDSData(v PDSDataView) templ.Component { + return templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) { + templ_7745c5c3_W, ctx := templ_7745c5c3_Input.Writer, templ_7745c5c3_Input.Context + if templ_7745c5c3_CtxErr := ctx.Err(); templ_7745c5c3_CtxErr != nil { + return templ_7745c5c3_CtxErr + } + templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templruntime.GetBuffer(templ_7745c5c3_W) + if !templ_7745c5c3_IsBuffer { + defer func() { + templ_7745c5c3_BufErr := templruntime.ReleaseBuffer(templ_7745c5c3_Buffer) + if templ_7745c5c3_Err == nil { + templ_7745c5c3_Err = templ_7745c5c3_BufErr + } + }() + } + ctx = templ.InitializeContext(ctx) + templ_7745c5c3_Var1 := templ.GetChildren(ctx) + if templ_7745c5c3_Var1 == nil { + templ_7745c5c3_Var1 = templ.NopComponent + } + ctx = templ.ClearChildren(ctx) + templ_7745c5c3_Var2 := templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) { + templ_7745c5c3_W, ctx := templ_7745c5c3_Input.Writer, templ_7745c5c3_Input.Context + templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templruntime.GetBuffer(templ_7745c5c3_W) + if !templ_7745c5c3_IsBuffer { + defer func() { + templ_7745c5c3_BufErr := templruntime.ReleaseBuffer(templ_7745c5c3_Buffer) + if templ_7745c5c3_Err == nil { + templ_7745c5c3_Err = templ_7745c5c3_BufErr + } + }() + } + ctx = templ.InitializeContext(ctx) + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 1, "
~/atmo.quest — PDS data
") + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + templ_7745c5c3_Err = layouts.TopNav("settings").Render(ctx, templ_7745c5c3_Buffer) + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 2, "
PDS data
These records are stored in your ATProto Personal Data Server ") + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + if v.PDS != "" { + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 3, "(") + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + var templ_7745c5c3_Var3 string + templ_7745c5c3_Var3, templ_7745c5c3_Err = templ.JoinStringErrs(v.PDS) + if templ_7745c5c3_Err != nil { + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/settings/pages/pds_data.templ`, Line: 44, Col: 38} + } + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var3)) + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 4, ") ") + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + } + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 5, "— they're yours and travel with your account. This is the core idea behind ATProto: your data lives in your repo, not in our database.
← back to settings ") + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + for _, coll := range v.Collections { + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 6, "
") + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + var templ_7745c5c3_Var4 string + templ_7745c5c3_Var4, templ_7745c5c3_Err = templ.JoinStringErrs(coll.Name) + if templ_7745c5c3_Err != nil { + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/settings/pages/pds_data.templ`, Line: 54, Col: 52} + } + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var4)) + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 7, " (") + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + var templ_7745c5c3_Var5 string + templ_7745c5c3_Var5, templ_7745c5c3_Err = templ.JoinStringErrs(pdsRecordCount(len(coll.Records))) + if templ_7745c5c3_Err != nil { + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/settings/pages/pds_data.templ`, Line: 54, Col: 138} + } + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var5)) + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 8, ")
") + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + if len(coll.Records) == 0 { + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 9, "

no records

") + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + } else { + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 10, "
") + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + for _, rec := range coll.Records { + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 11, "
") + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + var templ_7745c5c3_Var6 string + templ_7745c5c3_Var6, templ_7745c5c3_Err = templ.JoinStringErrs(rec.RKey) + if templ_7745c5c3_Err != nil { + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/settings/pages/pds_data.templ`, Line: 62, Col: 52} + } + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var6)) + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 12, "
")
+						if templ_7745c5c3_Err != nil {
+							return templ_7745c5c3_Err
+						}
+						var templ_7745c5c3_Var7 string
+						templ_7745c5c3_Var7, templ_7745c5c3_Err = templ.JoinStringErrs(rec.Value)
+						if templ_7745c5c3_Err != nil {
+							return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/settings/pages/pds_data.templ`, Line: 64, Col: 51}
+						}
+						_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var7))
+						if templ_7745c5c3_Err != nil {
+							return templ_7745c5c3_Err
+						}
+						templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 13, "
") + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + } + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 14, "
") + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + } + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 15, "
") + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + } + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 16, "
atmo.quest
") + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + templ_7745c5c3_Err = layouts.BottomNav("settings").Render(ctx, templ_7745c5c3_Buffer) + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + return nil + }) + templ_7745c5c3_Err = layouts.Base("PDS data", "Your atmo.quest records stored in your ATProto PDS.").Render(templ.WithChildren(ctx, templ_7745c5c3_Var2), templ_7745c5c3_Buffer) + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + return nil + }) +} + +func pdsRecordCount(n int) string { + if n == 1 { + return "1 record" + } + return pdsItoa(n) + " records" +} + +func pdsItoa(n int) string { + return fmt.Sprintf("%d", n) +} + +var _ = templruntime.GeneratedTemplate diff --git a/features/settings/pages/settings.templ b/features/settings/pages/settings.templ --- a/features/settings/pages/settings.templ +++ b/features/settings/pages/settings.templ @@ -11,19 +11,29 @@ type SettingsView struct { Handle string // user's atproto handle DisplayName string // user's display name AvatarInitial string // first letter for avatar placeholder + AvatarURL string // user's avatar URL from Bluesky profile PDS string // PDS hostname (e.g. "bsky.social") NoteCount int // number of local notes Deleted bool // true after a successful delete DeleteError string // non-empty when confirmation failed IsAdmin bool // show admin link when true + ShowAttendees bool // true = visible on attendee lists (default) + ShowLeaderboard bool // true = visible on leaderboard (default) } func settingsItoa(n int) string { return fmt.Sprintf("%d", n) +} + +func deleteConfirmStyle(deleteError string) string { + if deleteError != "" { + return "margin-top:8px;" + } + return "display:none;margin-top:8px;" } templ Settings(v SettingsView) { - @layouts.Base("settings — atmo.quest", "Manage your account, privacy, and data.") { + @layouts.Base("settings", "Manage your account, privacy, and data.") {
@@ -35,7 +45,7 @@
Settings
-
v0.1 · atmo.quest
+
atmo.quest
if v.Deleted {
@@ -46,7 +56,11 @@ } // ── Account card ── @@ -121,7 +167,7 @@
↗
-
◇
+
◆
Open source
contribute, file issues, fork
@@ -129,7 +175,7 @@
↗
 -
▲
+
◆
Send feedback
tell us what's broken or missing
@@ -141,11 +187,11 @@
// ── Account (danger) ──
-
Account
+
Danger zone
@@ -193,7 +239,7 @@ } templ deleteDataRow(v SettingsView) {
-
▲
+
◆
Delete atmo.quest data
removes local notes and flags
@@ -202,22 +248,30 @@ } - - - - - +
+
+ +
+ + + +
+
+
+
+
+
} diff --git a/features/settings/pages/settings_templ.go b/features/settings/pages/settings_templ.go --- a/features/settings/pages/settings_templ.go +++ b/features/settings/pages/settings_templ.go @@ -16,18 +16,28 @@ ) // SettingsView is the data for the settings page. type SettingsView struct { - Handle string // user's atproto handle - DisplayName string // user's display name - AvatarInitial string // first letter for avatar placeholder - PDS string // PDS hostname (e.g. "bsky.social") - NoteCount int // number of local notes - Deleted bool // true after a successful delete - DeleteError string // non-empty when confirmation failed - IsAdmin bool // show admin link when true + Handle string // user's atproto handle + DisplayName string // user's display name + AvatarInitial string // first letter for avatar placeholder + AvatarURL string // user's avatar URL from Bluesky profile + PDS string // PDS hostname (e.g. "bsky.social") + NoteCount int // number of local notes + Deleted bool // true after a successful delete + DeleteError string // non-empty when confirmation failed + IsAdmin bool // show admin link when true + ShowAttendees bool // true = visible on attendee lists (default) + ShowLeaderboard bool // true = visible on leaderboard (default) } func settingsItoa(n int) string { return fmt.Sprintf("%d", n) +} + +func deleteConfirmStyle(deleteError string) string { + if deleteError != "" { + return "margin-top:8px;" + } + return "display:none;margin-top:8px;" } func Settings(v SettingsView) templ.Component { @@ -71,7 +81,7 @@ templ_7745c5c3_Err = layouts.TopNav("settings").Render(ctx, templ_7745c5c3_Buffer) if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 2, "
Settings
v0.1 · atmo.quest
") + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 2, "
Settings
atmo.quest
") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } @@ -81,107 +91,208 @@ if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } } - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 4, "") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } if v.IsAdmin { - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 14, "
Admin
⚙
Admin console
manage events and users
›
") + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 31, "
Admin
⚙
Admin console
manage events and users
›
") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } } - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 15, "
built on ATProto · open source · made for conferences
atmo.quest v0.1.0-pre
atmo.quest
") + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 32, "
built on ATProto · open source · made for connecting
atmo.quest
atmo.quest
") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } @@ -209,7 +320,7 @@ return templ_7745c5c3_Err } return nil }) - templ_7745c5c3_Err = layouts.Base("settings — atmo.quest", "Manage your account, privacy, and data.").Render(templ.WithChildren(ctx, templ_7745c5c3_Var2), templ_7745c5c3_Buffer) + templ_7745c5c3_Err = layouts.Base("settings", "Manage your account, privacy, and data.").Render(templ.WithChildren(ctx, templ_7745c5c3_Var2), templ_7745c5c3_Buffer) if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } @@ -233,48 +344,61 @@ } }() } ctx = templ.InitializeContext(ctx) - templ_7745c5c3_Var10 := templ.GetChildren(ctx) - if templ_7745c5c3_Var10 == nil { - templ_7745c5c3_Var10 = templ.NopComponent + templ_7745c5c3_Var12 := templ.GetChildren(ctx) + if templ_7745c5c3_Var12 == nil { + templ_7745c5c3_Var12 = templ.NopComponent } ctx = templ.ClearChildren(ctx) - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 16, "
▲
Delete atmo.quest data
removes local notes and flags
") + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 33, "
◆
Delete atmo.quest data
removes local notes and flags
") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } if v.DeleteError != "" { - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 17, "
") + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 34, "
") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } - var templ_7745c5c3_Var11 string - templ_7745c5c3_Var11, templ_7745c5c3_Err = templ.JoinStringErrs(v.DeleteError) + var templ_7745c5c3_Var13 string + templ_7745c5c3_Var13, templ_7745c5c3_Err = templ.JoinStringErrs(v.DeleteError) if templ_7745c5c3_Err != nil { - return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/settings/pages/settings.templ`, Line: 202, Col: 20} + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/settings/pages/settings.templ`, Line: 248, Col: 20} } - _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var11)) + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var13)) if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 18, "
") + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 35, "
") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } } - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 19, "
") + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 38, "\" class=\"settings-confirm-input\" autocomplete=\"off\" required aria-label=\"Type your handle to confirm deletion\">
") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } diff --git a/features/settings/routes.go b/features/settings/routes.go --- a/features/settings/routes.go +++ b/features/settings/routes.go @@ -11,12 +11,17 @@ // SetupRoutes wires the settings feature's HTTP routes. // // - GET /settings — settings page -// - GET /settings/export — CSV download of notes +// - GET /settings/export — CSV download of connections & notes +// - GET /settings/notes — local notes table +// - GET /settings/pds — PDS records viewer // - POST /settings/delete — delete all notes (requires handle confirmation) func SetupRoutes(router chi.Router, conn *sql.DB, authH *auth.Handlers) { h := NewHandlers(conn, authH) router.Get("/settings", h.Page) router.Get("/settings/export", h.ExportCSV) + router.Get("/settings/notes", h.NotesList) + router.Get("/settings/pds", h.PDSData) + router.Post("/settings/privacy", h.TogglePrivacy) router.Post("/settings/delete", h.DeleteData) } diff --git a/internal/admincrypto/signer_test.go b/internal/admincrypto/signer_test.go new file mode 100644 --- /dev/null +++ b/internal/admincrypto/signer_test.go @@ -0,0 +1,235 @@ +package admincrypto + +import ( + "crypto/ed25519" + "crypto/rand" + "encoding/base64" + "os" + "path/filepath" + "testing" +) + +// generateTestSigner creates a fresh Ed25519 Signer for testing. +func generateTestSigner() (*Signer, error) { + pub, priv, err := ed25519.GenerateKey(rand.Reader) + if err != nil { + return nil, err + } + return &Signer{priv: priv, pub: pub, KeyID: "v1"}, nil +} + +func TestSigner_SignAndVerify(t *testing.T) { + signer, err := generateTestSigner() + if err != nil { + t.Fatalf("generate signer: %v", err) + } + + msg := []byte(`{"event_uri":"at://test","label":"CascadiaJS"}`) + sig := signer.Sign(msg) + if sig == "" { + t.Fatal("Sign returned empty string") + } + + if !signer.Verify(msg, sig) { + t.Error("Verify returned false for valid signature") + } +} + +func TestSigner_VerifyRejectsModifiedMessage(t *testing.T) { + signer, _ := generateTestSigner() + + msg := []byte(`{"test":"original"}`) + sig := signer.Sign(msg) + + modified := []byte(`{"test":"modified"}`) + if signer.Verify(modified, sig) { + t.Error("Verify returned true for modified message") + } +} + +func TestSigner_VerifyRejectsModifiedSignature(t *testing.T) { + signer, _ := generateTestSigner() + + msg := []byte(`{"test":"data"}`) + sig := signer.Sign(msg) + + // Flip a character in the base64 signature. + tampered := []byte(sig) + if tampered[10] == 'A' { + tampered[10] = 'B' + } else { + tampered[10] = 'A' + } + if signer.Verify(msg, string(tampered)) { + t.Error("Verify returned true for tampered signature") + } +} + +func TestSigner_VerifyRejectsInvalidBase64(t *testing.T) { + signer, _ := generateTestSigner() + msg := []byte("test") + if signer.Verify(msg, "not-valid-base64!@#$%") { + t.Error("Verify returned true for invalid base64") + } +} + +func TestSigner_NilSafety(t *testing.T) { + var s *Signer + + // Sign on nil signer returns empty. + if got := s.Sign([]byte("test")); got != "" { + t.Errorf("nil Sign = %q; want empty", got) + } + + // Verify on nil signer returns false. + if s.Verify([]byte("test"), "sig") { + t.Error("nil Verify returned true") + } + + // PublicKeyBase64 on nil returns empty. + if got := s.PublicKeyBase64(); got != "" { + t.Errorf("nil PublicKeyBase64 = %q; want empty", got) + } +} + +func TestSigner_KeyID(t *testing.T) { + signer, _ := generateTestSigner() + if signer.KeyID != "v1" { + t.Errorf("KeyID = %q; want 'v1'", signer.KeyID) + } +} + +func TestSigner_PublicKeyBase64NotEmpty(t *testing.T) { + signer, _ := generateTestSigner() + pub := signer.PublicKeyBase64() + if pub == "" { + t.Error("PublicKeyBase64 is empty for valid signer") + } +} + +func TestSigner_DifferentSignersProduceDifferentSigs(t *testing.T) { + s1, _ := generateTestSigner() + s2, _ := generateTestSigner() + + msg := []byte("same message") + sig1 := s1.Sign(msg) + sig2 := s2.Sign(msg) + + if sig1 == sig2 { + t.Error("different signers produced identical signatures") + } + + // Cross-verify should fail. + if s1.Verify(msg, sig2) { + t.Error("signer 1 verified signer 2's signature") + } + if s2.Verify(msg, sig1) { + t.Error("signer 2 verified signer 1's signature") + } +} + +func TestLoad_FromEnvVar(t *testing.T) { + signer, _ := generateTestSigner() + seed := signer.priv.Seed() + + encoded := base64.StdEncoding.EncodeToString(seed) + t.Setenv("ADMIN_SIGNING_KEY", encoded) + + loaded, err := Load(false) + if err != nil { + t.Fatalf("Load from env: %v", err) + } + if loaded.PublicKeyBase64() != signer.PublicKeyBase64() { + t.Error("loaded signer has different public key than original") + } +} + +func TestLoad_InvalidBase64InEnv(t *testing.T) { + t.Setenv("ADMIN_SIGNING_KEY", "not-valid-base64!@#$") + _, err := Load(false) + if err == nil { + t.Error("expected error for invalid base64 in env var") + } +} + +func TestLoad_WrongSizeInEnv(t *testing.T) { + // 16 bytes instead of 32. + t.Setenv("ADMIN_SIGNING_KEY", base64.StdEncoding.EncodeToString(make([]byte, 16))) + _, err := Load(false) + if err == nil { + t.Error("expected error for wrong size key in env var") + } +} + +func TestLoad_NoKeyDisallowGenerate(t *testing.T) { + t.Setenv("ADMIN_SIGNING_KEY", "") + // Use a working dir that definitely has no key file. + origDir, _ := os.Getwd() + _ = os.Chdir(t.TempDir()) + defer func() { _ = os.Chdir(origDir) }() + + _, err := Load(false) + if err == nil { + t.Error("expected error when no key and generate=false") + } +} + +func TestLoad_AllowGenerateCreatesKeyFile(t *testing.T) { + t.Setenv("ADMIN_SIGNING_KEY", "") + origDir, _ := os.Getwd() + tmpDir := t.TempDir() + _ = os.Chdir(tmpDir) + defer func() { _ = os.Chdir(origDir) }() + + signer, err := Load(true) + if err != nil { + t.Fatalf("Load(generate=true): %v", err) + } + if signer == nil { + t.Fatal("signer is nil") + } + + // Key file should exist. + keyPath := filepath.Join(tmpDir, "data", "admin_signing.key") + if _, err := os.Stat(keyPath); os.IsNotExist(err) { + t.Error("key file was not created") + } + + // Loading again should produce the same key. + signer2, err := Load(false) + if err != nil { + t.Fatalf("Load(reload): %v", err) + } + if signer2.PublicKeyBase64() != signer.PublicKeyBase64() { + t.Error("reloaded signer has different public key") + } +} + +func TestLoad_FromFile(t *testing.T) { + t.Setenv("ADMIN_SIGNING_KEY", "") + + origDir, _ := os.Getwd() + tmpDir := t.TempDir() + _ = os.Chdir(tmpDir) + defer func() { _ = os.Chdir(origDir) }() + + // Write a known seed. + _, priv, _ := ed25519.GenerateKey(rand.Reader) + keyDir := filepath.Join(tmpDir, "data") + _ = os.MkdirAll(keyDir, 0o700) + _ = os.WriteFile(filepath.Join(keyDir, "admin_signing.key"), priv.Seed(), 0o600) + + signer, err := Load(false) + if err != nil { + t.Fatalf("Load from file: %v", err) + } + if signer == nil { + t.Fatal("signer is nil") + } + + // The public key should match what we seeded. + expectedPub := priv.Public().(ed25519.PublicKey) + if signer.PublicKeyBase64() != base64.StdEncoding.EncodeToString(expectedPub) { + t.Error("loaded signer has wrong public key") + } +} diff --git a/internal/badge/award.go b/internal/badge/award.go --- a/internal/badge/award.go +++ b/internal/badge/award.go @@ -24,7 +24,70 @@ const ( AwardFirstConnect AwardType = "first-connect" AwardEventAttendee AwardType = "event-attendee" + AwardExtraCurious AwardType = "extra-curious" + AwardBesties AwardType = "besties" ) + +// connectionMilestones are the thresholds that trigger a badge award. +var connectionMilestones = []int{10, 50, 100, 200, 300, 400, 500} + +// AwardConnectionMilestones checks the user's total connection count and +// awards any milestone badges they've reached but haven't earned yet. +// Call after every new connection. Best-effort — errors are logged not returned. +func AwardConnectionMilestones(ctx context.Context, sess *oauth.ClientSession, db *sql.DB) { + if sess == nil || db == nil { + return + } + did := sess.Data.AccountDID.String() + count := CountConnectionsForDID(ctx, db, did) + if count <= 0 { + return + } + + for _, threshold := range connectionMilestones { + if count >= threshold { + trigger := fmt.Sprintf("connections-%d", threshold) + def, err := GetDefinitionByTrigger(ctx, db, trigger) + if err != nil { + continue + } + if HasEarned(ctx, db, did, def.ID) { + continue + } + _, _ = Award(ctx, sess, db, AwardType(trigger), "") + } + } + + // Auto-create badges for multiples of 100 beyond 500. + if count >= 600 { + for t := 600; t <= count; t += 100 { + trigger := fmt.Sprintf("connections-%d", t) + _, err := GetDefinitionByTrigger(ctx, db, trigger) + if err != nil { + // Badge definition doesn't exist yet — create it. + _, _ = CreateDefinition(ctx, db, Definition{ + Slug: trigger, + Name: fmt.Sprintf("%d Connections", t), + Description: fmt.Sprintf("Made %d connections", t), + Shape: "circle", + PrimaryColor: "#cba6f7", + AccentColor: "#1e1e2e", + RibbonColor: "#fab387", + Label: fmt.Sprintf("%d", t), + Trigger: trigger, + }) + } + def, err := GetDefinitionByTrigger(ctx, db, trigger) + if err != nil { + continue + } + if HasEarned(ctx, db, did, def.ID) { + continue + } + _, _ = Award(ctx, sess, db, AwardType(trigger), "") + } + } +} // Award writes a quest.atmo.badge record to the user's PDS and caches // the result in earned_badges. It is idempotent — if the user already @@ -132,3 +195,78 @@ cursor = r.Cursor } return false } + +// DrainResult summarizes the badge drain operation. +type DrainResult struct { + Written int + Skipped int + Names []string // names of newly written badges (for toast notifications) +} + +// DrainPending writes any locally-earned badges (record_uri = '') to the +// user's PDS. Called on login/page load, similar to the connection drain. +// Returns the names of badges that were newly written for toast display. +func DrainPending(ctx context.Context, sess *oauth.ClientSession, db *sql.DB) DrainResult { + res := DrainResult{} + if sess == nil || db == nil { + return res + } + did := sess.Data.AccountDID.String() + + // Find earned badges with no PDS record. + rows, err := db.QueryContext(ctx, ` + SELECT e.badge_id, d.slug, d.name, d.event_uri + FROM earned_badges e + JOIN badge_definitions d ON d.id = e.badge_id + WHERE e.did = ? AND (e.record_uri = '' OR e.record_uri IS NULL) + `, did) + if err != nil { + return res + } + defer rows.Close() + + type pending struct { + badgeID int + slug string + name string + eventURI string + } + var items []pending + for rows.Next() { + var p pending + if err := rows.Scan(&p.badgeID, &p.slug, &p.name, &p.eventURI); err != nil { + continue + } + items = append(items, p) + } + + for _, item := range items { + value := map[string]any{ + "$type": AwardNSID, + "type": item.slug, + "earnedAt": time.Now().UTC().Format(time.RFC3339), + } + if item.eventURI != "" { + value["event"] = item.eventURI + } + input := map[string]any{ + "repo": did, + "collection": AwardNSID, + "record": value, + } + var out struct { + URI string `json:"uri"` + } + if err := sess.APIClient().Post(ctx, syntax.NSID(nsidCreateRecord), input, &out); err != nil { + res.Skipped++ + continue + } + // Update the local record with the PDS URI. + _, _ = db.ExecContext(ctx, ` + UPDATE earned_badges SET record_uri = ? WHERE did = ? AND badge_id = ? + `, out.URI, did, item.badgeID) + res.Written++ + res.Names = append(res.Names, item.name) + } + return res +} diff --git a/internal/badge/badge.go b/internal/badge/badge.go --- a/internal/badge/badge.go +++ b/internal/badge/badge.go @@ -33,7 +33,8 @@ DefaultShapes = []string{"circle", "shield", "star", "hexagon"} // DefaultPrimaryColors / DefaultAccentColors / DefaultRibbonColors // are Catppuccin-ish swatches chosen to read well at small sizes. - DefaultPrimaryColors = []string{"#fab387", "#f9e2af", "#a6e3a1", "#89b4fa", "#cba6f7", "#f38ba8"} + // Includes metallic gold/silver/bronze for leaderboard badges. + DefaultPrimaryColors = []string{"#fab387", "#f9e2af", "#a6e3a1", "#89b4fa", "#cba6f7", "#f38ba8", "#FFD700", "#C0C0C0", "#CD7F32"} DefaultAccentColors = []string{"#11111b", "#1e1e2e", "#313244", "#cdd6f4"} DefaultRibbonColors = []string{"#f38ba8", "#94e2d5", "#89dceb", "#fab387", "#a6e3a1"} ) @@ -48,16 +49,18 @@ var ErrInvalidSignature = errors.New("badge: signature failed verification") // Design is the persisted badge configuration plus signature metadata. type Design struct { - EventURI string - Shape string - PrimaryColor string - AccentColor string - RibbonColor string - Label string - Signature string // base64 - SigningKeyID string // typically "v1" - CreatedAt time.Time - UpdatedAt time.Time + EventURI string + BadgeType string // e.g. "event-attendee", "event-leaderboard-1st" + Shape string + PrimaryColor string + AccentColor string + RibbonColor string + Label string + MessageTemplate string // custom message for badge awards + Signature string // base64 + SigningKeyID string // typically "v1" + CreatedAt time.Time + UpdatedAt time.Time } // canonicalPayload is the deterministic JSON we sign. It deliberately @@ -67,6 +70,7 @@ // Go's encoding/json sorts struct field encoding by the struct order, // so we list fields alphabetically here for stability. type canonicalPayload struct { AccentColor string `json:"accent_color"` + BadgeType string `json:"badge_type"` EventURI string `json:"event_uri"` Label string `json:"label"` PrimaryColor string `json:"primary_color"` @@ -80,6 +84,7 @@ // signature. func canonicalBytes(d Design) ([]byte, error) { p := canonicalPayload{ AccentColor: d.AccentColor, + BadgeType: d.BadgeType, EventURI: d.EventURI, Label: d.Label, PrimaryColor: d.PrimaryColor, @@ -109,21 +114,22 @@ d.SigningKeyID = signer.KeyID _, err = db.ExecContext(ctx, ` INSERT INTO event_badges ( - event_uri, shape, primary_color, accent_color, ribbon_color, - label, signature, signing_key_id, created_at, updated_at - ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP) - ON CONFLICT(event_uri) DO UPDATE SET - shape = excluded.shape, - primary_color = excluded.primary_color, - accent_color = excluded.accent_color, - ribbon_color = excluded.ribbon_color, - label = excluded.label, - signature = excluded.signature, - signing_key_id = excluded.signing_key_id, - updated_at = CURRENT_TIMESTAMP + event_uri, badge_type, shape, primary_color, accent_color, ribbon_color, + label, message_template, signature, signing_key_id, created_at, updated_at + ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP) + ON CONFLICT(event_uri, badge_type) DO UPDATE SET + shape = excluded.shape, + primary_color = excluded.primary_color, + accent_color = excluded.accent_color, + ribbon_color = excluded.ribbon_color, + label = excluded.label, + message_template = excluded.message_template, + signature = excluded.signature, + signing_key_id = excluded.signing_key_id, + updated_at = CURRENT_TIMESTAMP `, - d.EventURI, d.Shape, d.PrimaryColor, d.AccentColor, d.RibbonColor, - d.Label, d.Signature, d.SigningKeyID, + d.EventURI, d.BadgeType, d.Shape, d.PrimaryColor, d.AccentColor, d.RibbonColor, + d.Label, d.MessageTemplate, d.Signature, d.SigningKeyID, ) if err != nil { return Design{}, fmt.Errorf("badge: save: %w", err) @@ -134,17 +140,20 @@ // Get returns the badge design for an event AND verifies its signature. // Returns ErrNotFound when no design is saved; ErrInvalidSignature when // the stored signature doesn't verify under signer. -func Get(ctx context.Context, db *sql.DB, signer *admincrypto.Signer, eventURI string) (Design, error) { +func Get(ctx context.Context, db *sql.DB, signer *admincrypto.Signer, eventURI string, badgeType string) (Design, error) { + if badgeType == "" { + badgeType = "event-attendee" + } row := db.QueryRowContext(ctx, ` - SELECT event_uri, shape, primary_color, accent_color, ribbon_color, - label, signature, signing_key_id, created_at, updated_at + SELECT event_uri, badge_type, shape, primary_color, accent_color, ribbon_color, + label, message_template, signature, signing_key_id, created_at, updated_at FROM event_badges - WHERE event_uri = ? - `, eventURI) + WHERE event_uri = ? AND badge_type = ? + `, eventURI, badgeType) var d Design err := row.Scan( - &d.EventURI, &d.Shape, &d.PrimaryColor, &d.AccentColor, &d.RibbonColor, - &d.Label, &d.Signature, &d.SigningKeyID, &d.CreatedAt, &d.UpdatedAt, + &d.EventURI, &d.BadgeType, &d.Shape, &d.PrimaryColor, &d.AccentColor, &d.RibbonColor, + &d.Label, &d.MessageTemplate, &d.Signature, &d.SigningKeyID, &d.CreatedAt, &d.UpdatedAt, ) if errors.Is(err, sql.ErrNoRows) { return Design{}, ErrNotFound @@ -213,3 +222,28 @@ } } return true } + +// ListForEvent returns all badge designs saved for an event, keyed by badge_type. +func ListForEvent(ctx context.Context, db *sql.DB, eventURI string) (map[string]Design, error) { + rows, err := db.QueryContext(ctx, ` + SELECT event_uri, badge_type, shape, primary_color, accent_color, ribbon_color, + label, message_template, signature, signing_key_id, created_at, updated_at + FROM event_badges + WHERE event_uri = ? + `, eventURI) + if err != nil { + return nil, err + } + defer rows.Close() + out := make(map[string]Design) + for rows.Next() { + var d Design + if err := rows.Scan(&d.EventURI, &d.BadgeType, &d.Shape, &d.PrimaryColor, + &d.AccentColor, &d.RibbonColor, &d.Label, &d.MessageTemplate, &d.Signature, + &d.SigningKeyID, &d.CreatedAt, &d.UpdatedAt); err != nil { + return nil, err + } + out[d.BadgeType] = d + } + return out, rows.Err() +} diff --git a/internal/badge/badge_test.go b/internal/badge/badge_test.go new file mode 100644 --- /dev/null +++ b/internal/badge/badge_test.go @@ -0,0 +1,303 @@ +package badge + +import ( + "context" + "database/sql" + "errors" + "path/filepath" + "testing" + + "atmoquest/internal/admincrypto" + atdb "atmoquest/internal/db" +) + +const testEventURI = "at://did:plc:org/quest.atmo.event/test-badge" + +func newBadgeTestDB(t *testing.T) (context.Context, *sql.DB) { + t.Helper() + dir := t.TempDir() + dsn := "file:" + filepath.Join(dir, "badge_design.db") + "?_pragma=foreign_keys(ON)" + conn, err := atdb.Open(dsn) + if err != nil { + t.Fatalf("db open: %v", err) + } + if err := atdb.Migrate(conn); err != nil { + t.Fatalf("migrate: %v", err) + } + t.Cleanup(func() { _ = conn.Close() }) + return context.Background(), conn +} + +// seedEvent inserts a minimal event row to satisfy FK constraints in event_badges. +func seedEvent(t *testing.T, db *sql.DB, uri string) { + t.Helper() + _, err := db.Exec(` + INSERT INTO events (uri, name, start_time, end_time, location, organizer_did, cached_at) + VALUES (?, 'Test Event', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'Test', 'did:plc:org', CURRENT_TIMESTAMP) + `, uri) + if err != nil { + t.Fatalf("seed event %q: %v", uri, err) + } +} + +func testSigner(t *testing.T) *admincrypto.Signer { + t.Helper() + s, err := admincrypto.Load(true) + if err != nil { + // Load with generate=true might fail if we can't write to data/. + // Fall back to creating directly. + t.Skipf("could not load signer: %v", err) + } + return s +} + +func sampleDesign() Design { + return Design{ + EventURI: testEventURI, + Shape: "shield", + PrimaryColor: "#fab387", + AccentColor: "#11111b", + RibbonColor: "#f38ba8", + Label: "CascadiaJS", + } +} + +func TestSave_AndGet(t *testing.T) { + ctx, db := newBadgeTestDB(t) + signer := testSigner(t) + d := sampleDesign() + seedEvent(t, db, d.EventURI) + + saved, err := Save(ctx, db, signer, d) + if err != nil { + t.Fatalf("Save: %v", err) + } + if saved.Signature == "" { + t.Error("Signature is empty after Save") + } + if saved.SigningKeyID != "v1" { + t.Errorf("SigningKeyID = %q; want 'v1'", saved.SigningKeyID) + } + + got, err := Get(ctx, db, signer, testEventURI) + if err != nil { + t.Fatalf("Get: %v", err) + } + if got.Shape != d.Shape { + t.Errorf("Shape = %q; want %q", got.Shape, d.Shape) + } + if got.PrimaryColor != d.PrimaryColor { + t.Errorf("PrimaryColor = %q; want %q", got.PrimaryColor, d.PrimaryColor) + } + if got.Label != d.Label { + t.Errorf("Label = %q; want %q", got.Label, d.Label) + } +} + +func TestSave_Upsert(t *testing.T) { + ctx, db := newBadgeTestDB(t) + signer := testSigner(t) + + d := sampleDesign() + seedEvent(t, db, d.EventURI) + _, _ = Save(ctx, db, signer, d) + + // Update the label. + d.Label = "Updated Label" + saved, err := Save(ctx, db, signer, d) + if err != nil { + t.Fatalf("Save update: %v", err) + } + + got, _ := Get(ctx, db, signer, testEventURI) + if got.Label != "Updated Label" { + t.Errorf("Label after upsert = %q; want 'Updated Label'", got.Label) + } + // Signature should have changed since the payload changed. + if got.Signature == "" { + t.Error("Signature empty after update") + } + _ = saved +} + +func TestSave_NilSigner(t *testing.T) { + ctx, db := newBadgeTestDB(t) + _, err := Save(ctx, db, nil, sampleDesign()) + if err == nil { + t.Error("Save with nil signer should fail") + } +} + +func TestGet_NotFound(t *testing.T) { + ctx, db := newBadgeTestDB(t) + signer := testSigner(t) + _, err := Get(ctx, db, signer, "at://nonexistent") + if !errors.Is(err, ErrNotFound) { + t.Errorf("Get missing = %v; want ErrNotFound", err) + } +} + +func TestGet_DetectsTampering(t *testing.T) { + ctx, db := newBadgeTestDB(t) + signer := testSigner(t) + + seedEvent(t, db, testEventURI) + _, _ = Save(ctx, db, signer, sampleDesign()) + + // Tamper with the stored label directly in the database. + _, err := db.ExecContext(ctx, ` + UPDATE event_badges SET label = 'TAMPERED' WHERE event_uri = ? + `, testEventURI) + if err != nil { + t.Fatalf("tamper: %v", err) + } + + _, err = Get(ctx, db, signer, testEventURI) + if !errors.Is(err, ErrInvalidSignature) { + t.Errorf("Get tampered = %v; want ErrInvalidSignature", err) + } +} + +func TestGet_NilSignerSkipsVerification(t *testing.T) { + ctx, db := newBadgeTestDB(t) + signer := testSigner(t) + + seedEvent(t, db, testEventURI) + _, _ = Save(ctx, db, signer, sampleDesign()) + + // Tamper with the label. + _, _ = db.ExecContext(ctx, ` + UPDATE event_badges SET label = 'TAMPERED' WHERE event_uri = ? + `, testEventURI) + + // With nil signer, verification is skipped — tampered data is returned. + got, err := Get(ctx, db, nil, testEventURI) + if err != nil { + t.Fatalf("Get nil signer: %v", err) + } + if got.Label != "TAMPERED" { + t.Errorf("Label = %q; expected tampered value since verification was skipped", got.Label) + } +} + +// --- Validation Tests --- + +func TestSave_RejectsEmptyEventURI(t *testing.T) { + ctx, db := newBadgeTestDB(t) + signer := testSigner(t) + d := sampleDesign() + seedEvent(t, db, d.EventURI) + d.EventURI = "" + _, err := Save(ctx, db, signer, d) + if err == nil { + t.Error("Save with empty event URI should fail") + } +} + +func TestSave_RejectsInvalidShape(t *testing.T) { + ctx, db := newBadgeTestDB(t) + signer := testSigner(t) + d := sampleDesign() + seedEvent(t, db, d.EventURI) + d.Shape = "triangle" // not in DefaultShapes + _, err := Save(ctx, db, signer, d) + if err == nil { + t.Error("Save with invalid shape should fail") + } +} + +func TestSave_RejectsInvalidColor(t *testing.T) { + ctx, db := newBadgeTestDB(t) + signer := testSigner(t) + + seedEvent(t, db, testEventURI) + cases := []struct { + name string + mut func(*Design) + }{ + {"short hex primary", func(d *Design) { d.PrimaryColor = "#fff" }}, + {"no hash primary", func(d *Design) { d.PrimaryColor = "fab387" }}, + {"invalid chars primary", func(d *Design) { d.PrimaryColor = "#GGGGGG" }}, + {"short hex accent", func(d *Design) { d.AccentColor = "#abc" }}, + {"short hex ribbon", func(d *Design) { d.RibbonColor = "#123" }}, + } + for _, tc := range cases { + t.Run(tc.name, func(t *testing.T) { + d := sampleDesign() + tc.mut(&d) + _, err := Save(ctx, db, signer, d) + if err == nil { + t.Error("Save with invalid color should fail") + } + }) + } +} + +func TestSave_RejectsEmptyLabel(t *testing.T) { + ctx, db := newBadgeTestDB(t) + signer := testSigner(t) + d := sampleDesign() + seedEvent(t, db, d.EventURI) + d.Label = "" + _, err := Save(ctx, db, signer, d) + if err == nil { + t.Error("Save with empty label should fail") + } +} + +func TestSave_RejectsTooLongLabel(t *testing.T) { + ctx, db := newBadgeTestDB(t) + signer := testSigner(t) + d := sampleDesign() + seedEvent(t, db, d.EventURI) + d.Label = "This label is way too long and exceeds the 40 character maximum allowed by the badge system" + _, err := Save(ctx, db, signer, d) + if err == nil { + t.Error("Save with too-long label should fail") + } +} + +func TestSave_AcceptsAllValidShapes(t *testing.T) { + ctx, db := newBadgeTestDB(t) + signer := testSigner(t) + + for i, shape := range DefaultShapes { + d := sampleDesign() + d.EventURI = testEventURI + "/" + shape // unique URI per shape + seedEvent(t, db, d.EventURI) + d.Shape = shape + _, err := Save(ctx, db, signer, d) + if err != nil { + t.Errorf("shape %q (index %d): %v", shape, i, err) + } + } +} + +// --- isHex Tests --- + +func TestIsHex(t *testing.T) { + cases := []struct { + input string + want bool + }{ + {"#fab387", true}, + {"#11111b", true}, + {"#AABBCC", true}, + {"#aAbBcC", true}, + {"#000000", true}, + {"#ffffff", true}, + {"#fff", false}, // too short + {"fab387", false}, // no hash + {"#GGGGGG", false}, // invalid chars + {"", false}, // empty + {"#1234567", false}, // too long + {"#12345", false}, // wrong length + } + for _, tc := range cases { + t.Run(tc.input, func(t *testing.T) { + if got := isHex(tc.input); got != tc.want { + t.Errorf("isHex(%q) = %v; want %v", tc.input, got, tc.want) + } + }) + } +} diff --git a/internal/badge/definitions.go b/internal/badge/definitions.go --- a/internal/badge/definitions.go +++ b/internal/badge/definitions.go @@ -27,6 +27,7 @@ type EarnedBadge struct { Definition RecordURI string EarnedAt time.Time + Message string } // ListDefinitions returns all badge definitions, ordered by creation time. @@ -115,13 +116,17 @@ } return res.LastInsertId() } -// RecordEarned caches a badge earn in the local DB. -func RecordEarned(ctx context.Context, db *sql.DB, did string, badgeID int, recordURI string) error { +// RecordEarned caches a badge earn in the local DB with an optional message. +func RecordEarned(ctx context.Context, db *sql.DB, did string, badgeID int, recordURI string, message ...string) error { + msg := "" + if len(message) > 0 { + msg = message[0] + } _, err := db.ExecContext(ctx, ` - INSERT INTO earned_badges (did, badge_id, record_uri, earned_at) - VALUES (?, ?, ?, CURRENT_TIMESTAMP) + INSERT INTO earned_badges (did, badge_id, record_uri, message, earned_at) + VALUES (?, ?, ?, ?, CURRENT_TIMESTAMP) ON CONFLICT(did, badge_id) DO NOTHING - `, did, badgeID, recordURI) + `, did, badgeID, recordURI, msg) return err } @@ -131,7 +136,7 @@ rows, err := db.QueryContext(ctx, ` SELECT d.id, d.slug, d.name, d.description, COALESCE(d.event_uri,''), d.shape, d.primary_color, d.accent_color, d.ribbon_color, d.label, COALESCE(d.trigger,''), d.created_at, - e.record_uri, e.earned_at + e.record_uri, e.earned_at, COALESCE(e.message,'') FROM earned_badges e JOIN badge_definitions d ON d.id = e.badge_id WHERE e.did = ? @@ -147,7 +152,7 @@ var eb EarnedBadge if err := rows.Scan(&eb.ID, &eb.Slug, &eb.Name, &eb.Description, &eb.EventURI, &eb.Shape, &eb.PrimaryColor, &eb.AccentColor, &eb.RibbonColor, &eb.Label, &eb.Trigger, &eb.CreatedAt, - &eb.RecordURI, &eb.EarnedAt); err != nil { + &eb.RecordURI, &eb.EarnedAt, &eb.Message); err != nil { return nil, err } out = append(out, eb) diff --git a/internal/badge/definitions_test.go b/internal/badge/definitions_test.go new file mode 100644 --- /dev/null +++ b/internal/badge/definitions_test.go @@ -0,0 +1,291 @@ +package badge + +import ( + "context" + "database/sql" + "path/filepath" + "testing" + + atdb "atmoquest/internal/db" +) + +func newTestDB(t *testing.T) (context.Context, *sql.DB) { + t.Helper() + dir := t.TempDir() + dsn := "file:" + filepath.Join(dir, "badge.db") + "?_pragma=foreign_keys(ON)" + conn, err := atdb.Open(dsn) + if err != nil { + t.Fatalf("db open: %v", err) + } + if err := atdb.Migrate(conn); err != nil { + t.Fatalf("migrate: %v", err) + } + t.Cleanup(func() { _ = conn.Close() }) + return context.Background(), conn +} + +// --- Badge Definition Tests --- + +func TestListDefinitions_SeededDefaults(t *testing.T) { + ctx, db := newTestDB(t) + defs, err := ListDefinitions(ctx, db) + if err != nil { + t.Fatalf("ListDefinitions: %v", err) + } + // Migration 007 seeds 6 badge definitions. + if len(defs) < 6 { + t.Errorf("ListDefinitions returned %d; want at least 6 seeded defaults", len(defs)) + } + // Check known slugs exist. + slugs := make(map[string]bool, len(defs)) + for _, d := range defs { + slugs[d.Slug] = true + } + for _, expected := range []string{"first-connect", "event-attendee", "profile-complete", "connections-50", "connections-100", "connections-200"} { + if !slugs[expected] { + t.Errorf("missing seeded badge definition: %q", expected) + } + } +} + +func TestGetDefinitionBySlug(t *testing.T) { + ctx, db := newTestDB(t) + d, err := GetDefinitionBySlug(ctx, db, "first-connect") + if err != nil { + t.Fatalf("GetDefinitionBySlug: %v", err) + } + if d.Name != "First Connection" { + t.Errorf("Name = %q; want 'First Connection'", d.Name) + } + if d.Trigger != "first-connect" { + t.Errorf("Trigger = %q; want 'first-connect'", d.Trigger) + } + if d.Shape != "star" { + t.Errorf("Shape = %q; want 'star'", d.Shape) + } +} + +func TestGetDefinitionBySlug_NotFound(t *testing.T) { + ctx, db := newTestDB(t) + _, err := GetDefinitionBySlug(ctx, db, "nonexistent-badge") + if err != ErrNotFound { + t.Errorf("err = %v; want ErrNotFound", err) + } +} + +func TestGetDefinitionByTrigger(t *testing.T) { + ctx, db := newTestDB(t) + d, err := GetDefinitionByTrigger(ctx, db, "event-attendee") + if err != nil { + t.Fatalf("GetDefinitionByTrigger: %v", err) + } + if d.Slug != "event-attendee" { + t.Errorf("Slug = %q; want 'event-attendee'", d.Slug) + } +} + +func TestGetDefinitionByTrigger_NotFound(t *testing.T) { + ctx, db := newTestDB(t) + _, err := GetDefinitionByTrigger(ctx, db, "nonexistent-trigger") + if err != ErrNotFound { + t.Errorf("err = %v; want ErrNotFound", err) + } +} + +func TestCreateDefinition(t *testing.T) { + ctx, db := newTestDB(t) + d := Definition{ + Slug: "custom-badge", + Name: "Custom Badge", + Description: "A custom test badge", + Shape: "hexagon", + PrimaryColor: "#fab387", + AccentColor: "#11111b", + RibbonColor: "#f38ba8", + Label: "Custom", + } + id, err := CreateDefinition(ctx, db, d) + if err != nil { + t.Fatalf("CreateDefinition: %v", err) + } + if id <= 0 { + t.Errorf("id = %d; want positive", id) + } + + // Retrieve by slug. + got, err := GetDefinitionBySlug(ctx, db, "custom-badge") + if err != nil { + t.Fatalf("GetDefinitionBySlug: %v", err) + } + if got.Name != "Custom Badge" { + t.Errorf("Name = %q; want 'Custom Badge'", got.Name) + } + if got.Description != "A custom test badge" { + t.Errorf("Description = %q", got.Description) + } +} + +func TestCreateDefinition_WithEventURI(t *testing.T) { + ctx, db := newTestDB(t) + d := Definition{ + Slug: "event-specific", + Name: "Event Specific", + EventURI: "at://did:plc:org/quest.atmo.event/abc", + Shape: "shield", + PrimaryColor: "#89b4fa", + AccentColor: "#11111b", + RibbonColor: "#94e2d5", + Label: "ESB", + } + _, err := CreateDefinition(ctx, db, d) + if err != nil { + t.Fatalf("CreateDefinition: %v", err) + } + got, _ := GetDefinitionBySlug(ctx, db, "event-specific") + if got.EventURI != d.EventURI { + t.Errorf("EventURI = %q; want %q", got.EventURI, d.EventURI) + } +} + +func TestCreateDefinition_WithTrigger(t *testing.T) { + ctx, db := newTestDB(t) + d := Definition{ + Slug: "triggered-badge", + Name: "Triggered", + Trigger: "custom-trigger", + Shape: "circle", + PrimaryColor: "#fab387", + AccentColor: "#11111b", + RibbonColor: "#f38ba8", + Label: "T", + } + _, err := CreateDefinition(ctx, db, d) + if err != nil { + t.Fatalf("CreateDefinition: %v", err) + } + got, err := GetDefinitionByTrigger(ctx, db, "custom-trigger") + if err != nil { + t.Fatalf("GetDefinitionByTrigger: %v", err) + } + if got.Slug != "triggered-badge" { + t.Errorf("Slug = %q; want 'triggered-badge'", got.Slug) + } +} + +func TestCreateDefinition_DuplicateSlugFails(t *testing.T) { + ctx, db := newTestDB(t) + // "first-connect" is seeded by migration. + d := Definition{ + Slug: "first-connect", + Name: "Duplicate", + Shape: "circle", + PrimaryColor: "#fab387", + AccentColor: "#11111b", + RibbonColor: "#f38ba8", + Label: "Dup", + } + _, err := CreateDefinition(ctx, db, d) + if err == nil { + t.Fatal("expected error for duplicate slug") + } +} + +// --- Earned Badge Tests --- + +func TestRecordEarned_And_HasEarned(t *testing.T) { + ctx, db := newTestDB(t) + did := "did:plc:testuser1234567890abcd" + + d, _ := GetDefinitionBySlug(ctx, db, "first-connect") + + // Not earned yet. + if HasEarned(ctx, db, did, d.ID) { + t.Error("HasEarned = true before earning") + } + + // Record it. + err := RecordEarned(ctx, db, did, d.ID, "at://did:plc:x/quest.atmo.badge/abc") + if err != nil { + t.Fatalf("RecordEarned: %v", err) + } + + // Now earned. + if !HasEarned(ctx, db, did, d.ID) { + t.Error("HasEarned = false after earning") + } +} + +func TestRecordEarned_Idempotent(t *testing.T) { + ctx, db := newTestDB(t) + did := "did:plc:testuser1234567890abcd" + d, _ := GetDefinitionBySlug(ctx, db, "first-connect") + + // Insert twice — ON CONFLICT DO NOTHING should not error. + if err := RecordEarned(ctx, db, did, d.ID, "at://uri1"); err != nil { + t.Fatalf("first RecordEarned: %v", err) + } + if err := RecordEarned(ctx, db, did, d.ID, "at://uri2"); err != nil { + t.Fatalf("second RecordEarned: %v", err) + } +} + +func TestListEarned(t *testing.T) { + ctx, db := newTestDB(t) + did := "did:plc:testuser1234567890abcd" + + fc, _ := GetDefinitionBySlug(ctx, db, "first-connect") + ea, _ := GetDefinitionBySlug(ctx, db, "event-attendee") + + _ = RecordEarned(ctx, db, did, fc.ID, "at://uri-fc") + _ = RecordEarned(ctx, db, did, ea.ID, "at://uri-ea") + + earned, err := ListEarned(ctx, db, did) + if err != nil { + t.Fatalf("ListEarned: %v", err) + } + if len(earned) != 2 { + t.Fatalf("ListEarned returned %d; want 2", len(earned)) + } + // Both earned at ~same time; just verify both slugs are present. + slugs := make(map[string]bool, len(earned)) + for _, e := range earned { + slugs[e.Slug] = true + } + if !slugs["first-connect"] || !slugs["event-attendee"] { + t.Errorf("expected both 'first-connect' and 'event-attendee'; got slugs %v", slugs) + } +} + +func TestListEarned_Empty(t *testing.T) { + ctx, db := newTestDB(t) + earned, err := ListEarned(ctx, db, "did:plc:nobody") + if err != nil { + t.Fatalf("ListEarned: %v", err) + } + if len(earned) != 0 { + t.Errorf("ListEarned empty = %d; want 0", len(earned)) + } +} + +func TestListEarned_IsolatedByDID(t *testing.T) { + ctx, db := newTestDB(t) + didA := "did:plc:useraaaa1234567890abcd" + didB := "did:plc:userbbbb1234567890abcd" + + fc, _ := GetDefinitionBySlug(ctx, db, "first-connect") + _ = RecordEarned(ctx, db, didA, fc.ID, "at://a") + _ = RecordEarned(ctx, db, didB, fc.ID, "at://b") + + earnedA, _ := ListEarned(ctx, db, didA) + if len(earnedA) != 1 { + t.Errorf("user A has %d earned; want 1", len(earnedA)) + } +} + +func TestHasEarned_UnknownBadgeID(t *testing.T) { + ctx, db := newTestDB(t) + // Badge ID 9999 doesn't exist. + if HasEarned(ctx, db, "did:plc:x", 9999) { + t.Error("HasEarned should be false for unknown badge ID") + } +} diff --git a/internal/checkin/list_test.go b/internal/checkin/list_test.go new file mode 100644 --- /dev/null +++ b/internal/checkin/list_test.go @@ -0,0 +1,216 @@ +package checkin + +import ( + "context" + "database/sql" + "path/filepath" + "testing" + "time" + + "github.com/bluesky-social/indigo/atproto/syntax" + + atdb "atmoquest/internal/db" +) + +// newListTestDB returns a freshly-migrated SQLite DB. Separate from +// checkin_test.go's newTestDB to avoid redeclaration. +func newListTestDB(t *testing.T) (context.Context, *sql.DB) { + t.Helper() + dir := t.TempDir() + dsn := "file:" + filepath.Join(dir, "list.db") + "?_pragma=foreign_keys(ON)" + conn, err := atdb.Open(dsn) + if err != nil { + t.Fatalf("db open: %v", err) + } + if err := atdb.Migrate(conn); err != nil { + t.Fatalf("migrate: %v", err) + } + t.Cleanup(func() { _ = conn.Close() }) + return context.Background(), conn +} + +const ( + listUserDID = "did:plc:listuser123456789abcde" + listOrgDID = "did:plc:listorg1234567890abcde" +) + +func seedListEvent(t *testing.T, db *sql.DB, uri, name string, start, end time.Time) { + t.Helper() + _, err := db.Exec(` + INSERT INTO events (uri, name, start_time, end_time, location, organizer_did, cached_at) + VALUES (?, ?, ?, ?, ?, ?, CURRENT_TIMESTAMP) + `, uri, name, start.UTC(), end.UTC(), "TestLocation", listOrgDID) + if err != nil { + t.Fatalf("seed event %q: %v", uri, err) + } +} + +func seedListCheckin(t *testing.T, db *sql.DB, recordURI, did, eventURI string, at time.Time) { + t.Helper() + _, err := db.Exec(` + INSERT INTO checkins (record_uri, did, event_uri, checked_in_at, cached_at) + VALUES (?, ?, ?, ?, CURRENT_TIMESTAMP) + `, recordURI, did, eventURI, at.UTC()) + if err != nil { + t.Fatalf("seed checkin: %v", err) + } +} + +func TestListForUser_Empty(t *testing.T) { + ctx, db := newListTestDB(t) + events, err := ListForUser(ctx, db, syntax.DID(listUserDID), time.Now()) + if err != nil { + t.Fatalf("ListForUser: %v", err) + } + if len(events) != 0 { + t.Errorf("ListForUser empty = %d; want 0", len(events)) + } +} + +func TestListForUser_ReturnsEventsWithMetadata(t *testing.T) { + ctx, db := newListTestDB(t) + now := time.Now().UTC() + evURI := "at://did:plc:org/quest.atmo.event/cascadia" + seedListEvent(t, db, evURI, "CascadiaJS 2026", now.Add(-1*time.Hour), now.Add(8*time.Hour)) + seedListCheckin(t, db, "at://did:plc:user/quest.atmo.checkin/1", listUserDID, evURI, now) + + events, err := ListForUser(ctx, db, syntax.DID(listUserDID), now) + if err != nil { + t.Fatalf("ListForUser: %v", err) + } + if len(events) != 1 { + t.Fatalf("ListForUser returned %d; want 1", len(events)) + } + if events[0].EventName != "CascadiaJS 2026" { + t.Errorf("EventName = %q", events[0].EventName) + } + if events[0].EventURI != evURI { + t.Errorf("EventURI = %q", events[0].EventURI) + } + if events[0].Location != "TestLocation" { + t.Errorf("Location = %q", events[0].Location) + } +} + +func TestListForUser_OngoingFlag(t *testing.T) { + ctx, db := newListTestDB(t) + now := time.Now().UTC() + + ongoingURI := "at://did:plc:org/quest.atmo.event/ongoing" + endedURI := "at://did:plc:org/quest.atmo.event/ended" + + seedListEvent(t, db, ongoingURI, "Ongoing", now.Add(-1*time.Hour), now.Add(8*time.Hour)) + seedListEvent(t, db, endedURI, "Ended", now.Add(-48*time.Hour), now.Add(-24*time.Hour)) + seedListCheckin(t, db, "at://u/c/1", listUserDID, ongoingURI, now) + seedListCheckin(t, db, "at://u/c/2", listUserDID, endedURI, now.Add(-30*time.Hour)) + + events, err := ListForUser(ctx, db, syntax.DID(listUserDID), now) + if err != nil { + t.Fatalf("ListForUser: %v", err) + } + if len(events) != 2 { + t.Fatalf("expected 2 events; got %d", len(events)) + } + + ongoingCount := 0 + for _, e := range events { + if e.IsOngoing { + ongoingCount++ + } + } + if ongoingCount != 1 { + t.Errorf("ongoing count = %d; want 1", ongoingCount) + } +} + +func TestListForUser_DeduplicatesMultipleCheckins(t *testing.T) { + ctx, db := newListTestDB(t) + now := time.Now().UTC() + evURI := "at://did:plc:org/quest.atmo.event/dedup" + seedListEvent(t, db, evURI, "Dedup Event", now.Add(-2*time.Hour), now.Add(6*time.Hour)) + + // User checked in twice to the same event. + seedListCheckin(t, db, "at://u/c/a", listUserDID, evURI, now.Add(-1*time.Hour)) + seedListCheckin(t, db, "at://u/c/b", listUserDID, evURI, now) + + events, err := ListForUser(ctx, db, syntax.DID(listUserDID), now) + if err != nil { + t.Fatalf("ListForUser: %v", err) + } + // Should return 1 event, not 2. + if len(events) != 1 { + t.Errorf("expected 1 event (deduplicated); got %d", len(events)) + } +} + +func TestListForUser_IsolatedByUser(t *testing.T) { + ctx, db := newListTestDB(t) + now := time.Now().UTC() + evURI := "at://did:plc:org/quest.atmo.event/shared" + seedListEvent(t, db, evURI, "Shared Event", now.Add(-1*time.Hour), now.Add(8*time.Hour)) + seedListCheckin(t, db, "at://other/c/1", "did:plc:otheruser12345678abcde", evURI, now) + + events, _ := ListForUser(ctx, db, syntax.DID(listUserDID), now) + if len(events) != 0 { + t.Errorf("should not see other user's checkins; got %d events", len(events)) + } +} + +func TestListForUser_OrderedMostRecentFirst(t *testing.T) { + ctx, db := newListTestDB(t) + now := time.Now().UTC() + + evA := "at://did:plc:org/quest.atmo.event/A" + evB := "at://did:plc:org/quest.atmo.event/B" + seedListEvent(t, db, evA, "Event A", now.Add(-10*time.Hour), now.Add(-2*time.Hour)) + seedListEvent(t, db, evB, "Event B", now.Add(-1*time.Hour), now.Add(8*time.Hour)) + seedListCheckin(t, db, "at://u/c/a", listUserDID, evA, now.Add(-8*time.Hour)) + seedListCheckin(t, db, "at://u/c/b", listUserDID, evB, now) + + events, _ := ListForUser(ctx, db, syntax.DID(listUserDID), now) + if len(events) != 2 { + t.Fatalf("expected 2; got %d", len(events)) + } + // Most recent checkin first → Event B. + if events[0].EventName != "Event B" { + t.Errorf("first event = %q; want 'Event B' (most recent)", events[0].EventName) + } +} + +// --- ListAttendeesForEvent --- + +func TestListAttendeesForEvent_Empty(t *testing.T) { + ctx, db := newListTestDB(t) + dids, err := ListAttendeesForEvent(ctx, db, "at://did:plc:org/quest.atmo.event/none") + if err != nil { + t.Fatalf("ListAttendeesForEvent: %v", err) + } + if len(dids) != 0 { + t.Errorf("expected 0; got %d", len(dids)) + } +} + +func TestListAttendeesForEvent_ReturnsDistinctDIDs(t *testing.T) { + ctx, db := newListTestDB(t) + now := time.Now().UTC() + evURI := "at://did:plc:org/quest.atmo.event/attendees" + seedListEvent(t, db, evURI, "Attendee Event", now.Add(-1*time.Hour), now.Add(8*time.Hour)) + + userA := "did:plc:usera12345678901234567" + userB := "did:plc:userb12345678901234567" + seedListCheckin(t, db, "at://a/c/1", userA, evURI, now.Add(-30*time.Minute)) + seedListCheckin(t, db, "at://a/c/2", userA, evURI, now) // duplicate + seedListCheckin(t, db, "at://b/c/1", userB, evURI, now.Add(-15*time.Minute)) + + dids, err := ListAttendeesForEvent(ctx, db, evURI) + if err != nil { + t.Fatalf("ListAttendeesForEvent: %v", err) + } + if len(dids) != 2 { + t.Fatalf("expected 2 distinct attendees; got %d", len(dids)) + } + // Ordered by earliest check-in. + if dids[0] != userA { + t.Errorf("first attendee = %q; want %q (checked in earliest)", dids[0], userA) + } +} diff --git a/internal/connection/drain.go b/internal/connection/drain.go --- a/internal/connection/drain.go +++ b/internal/connection/drain.go @@ -27,6 +27,9 @@ // Put for each, then deleting the row on success. Errors on individual rows // are logged (if logger is non-nil) and the row is left in the queue for a // future retry. // +// pdsHost is the PDS URL of the draining user, used to dedup against existing +// connection records on their PDS. +// // If onDrain is non-nil it is called after each successfully written + // deleted pending item, e.g. to auto-check-in the user to the event. // @@ -35,7 +38,7 @@ // from the per-row writes — the goal is best-effort flush on login, not // blocking the user's redirect to /profile. // // A wrapper-level error (e.g. queue lookup failure) is returned as-is. -func Drain(ctx context.Context, q *Queue, sess *oauth.ClientSession, logger *slog.Logger, onDrain DrainHook) (DrainResult, error) { +func Drain(ctx context.Context, q *Queue, sess *oauth.ClientSession, pdsHost string, logger *slog.Logger, onDrain DrainHook) (DrainResult, error) { res := DrainResult{} if sess == nil { return res, errNoSession @@ -46,6 +49,24 @@ if err != nil { return res, err } for _, item := range items { + // Dedup: skip if the user already has this connection on their PDS. + if pdsHost != "" && HasConnection(ctx, pdsHost, target, item.InitiatorDID, item.EventURI) { + if logger != nil { + logger.Debug("connection drain: duplicate skipped", + "target", target.String(), + "initiator", item.InitiatorDID.String(), + "event", item.EventURI, + ) + } + // Delete the queue row — no need to retry. + _ = q.Delete(ctx, item.ID) + res.Skipped++ + // Still fire the hook so auto-checkin happens even for skipped connections. + if onDrain != nil { + onDrain(ctx, sess, item) + } + continue + } _, _, err := Put(ctx, sess, Record{With: item.InitiatorDID, EventURI: item.EventURI}) if err != nil { if logger != nil { diff --git a/internal/db/migrations/009_privacy_toggles.sql b/internal/db/migrations/009_privacy_toggles.sql new file mode 100644 --- /dev/null +++ b/internal/db/migrations/009_privacy_toggles.sql @@ -0,0 +1,6 @@ +-- 009_privacy_toggles.sql +-- Adds per-user privacy settings for event attendee lists and leaderboard. +-- Stored in the users table (not PDS) because these are private preferences. + +ALTER TABLE users ADD COLUMN hide_from_attendees INTEGER NOT NULL DEFAULT 0; +ALTER TABLE users ADD COLUMN hide_from_leaderboard INTEGER NOT NULL DEFAULT 0; diff --git a/internal/db/migrations/010_new_badge_definitions.sql b/internal/db/migrations/010_new_badge_definitions.sql new file mode 100644 --- /dev/null +++ b/internal/db/migrations/010_new_badge_definitions.sql @@ -0,0 +1,15 @@ +-- 010_new_badge_definitions.sql +-- Seeds additional badge definitions for connection milestones and special badges. + +INSERT OR IGNORE INTO badge_definitions (slug, name, description, shape, primary_color, accent_color, ribbon_color, label, trigger) +VALUES + ('connections-10', '10 Connections', 'Made 10 connections', 'circle', '#f9e2af', '#1e1e2e', '#94e2d5', '10', 'connections-10'), + ('connections-300', '300 Connections', 'Made 300 connections', 'circle', '#cba6f7', '#1e1e2e', '#fab387', '300', 'connections-300'), + ('connections-400', '400 Connections', 'Made 400 connections', 'circle', '#cba6f7', '#1e1e2e', '#fab387', '400', 'connections-400'), + ('connections-500', '500 Connections', 'Made 500 connections', 'circle', '#cba6f7', '#1e1e2e', '#fab387', '500', 'connections-500'), + ('extra-curious', 'Extra Curious', 'Explored your data in settings', 'hexagon', '#89b4fa', '#1e1e2e', '#89dceb', '?', 'extra-curious'), + ('besties', 'Besties', 'Connected with the same person at multiple events', 'star', '#fab387', '#1e1e2e', '#f38ba8', '♥', 'besties'), + ('event-leaderboard-1st', 'Event Champion', 'First place on the event leaderboard', 'shield', '#FFD700', '#1e1e2e', '#f38ba8', '1st', 'event-leaderboard-1st'), + ('event-leaderboard-2nd', 'Event Runner-Up', 'Second place on the event leaderboard', 'shield', '#C0C0C0', '#1e1e2e', '#94e2d5', '2nd', 'event-leaderboard-2nd'), + ('event-leaderboard-3rd', 'Event Third Place', 'Third place on the event leaderboard', 'shield', '#CD7F32', '#1e1e2e', '#a6e3a1', '3rd', 'event-leaderboard-3rd'), + ('event-exceeded', 'Beyond Expectations', 'Checked in when attendance exceeded expectations', 'star', '#FFD700', '#1e1e2e', '#fab387', '★', 'event-exceeded'); diff --git a/internal/db/migrations/011_event_badges_per_type.sql b/internal/db/migrations/011_event_badges_per_type.sql new file mode 100644 --- /dev/null +++ b/internal/db/migrations/011_event_badges_per_type.sql @@ -0,0 +1,31 @@ +-- 011_event_badges_per_type.sql +-- Changes event_badges to support multiple badge designs per event, +-- one per badge type (e.g. check-in, leaderboard-1st, exceeded). + +-- Create new table with composite primary key. +CREATE TABLE event_badges_new ( + event_uri TEXT NOT NULL, + badge_type TEXT NOT NULL DEFAULT 'event-attendee', + shape TEXT NOT NULL, + primary_color TEXT NOT NULL, + accent_color TEXT NOT NULL, + ribbon_color TEXT NOT NULL, + label TEXT NOT NULL, + signature TEXT NOT NULL, + signing_key_id TEXT NOT NULL DEFAULT 'v1', + created_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP, + updated_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP, + PRIMARY KEY (event_uri, badge_type), + FOREIGN KEY (event_uri) REFERENCES events (uri) ON DELETE CASCADE +); + +-- Migrate existing data (all existing designs become 'event-attendee' type). +INSERT INTO event_badges_new + (event_uri, badge_type, shape, primary_color, accent_color, ribbon_color, + label, signature, signing_key_id, created_at, updated_at) +SELECT event_uri, 'event-attendee', shape, primary_color, accent_color, ribbon_color, + label, signature, signing_key_id, created_at, updated_at +FROM event_badges; + +DROP TABLE event_badges; +ALTER TABLE event_badges_new RENAME TO event_badges; diff --git a/internal/db/migrations/012_badge_message_and_host.sql b/internal/db/migrations/012_badge_message_and_host.sql new file mode 100644 --- /dev/null +++ b/internal/db/migrations/012_badge_message_and_host.sql @@ -0,0 +1,11 @@ +-- 012_badge_message_and_host.sql +-- Adds a customizable message to earned badges and the event-host badge type. + +ALTER TABLE earned_badges ADD COLUMN message TEXT NOT NULL DEFAULT ''; + +-- Add message template column to event_badges for admin-customizable text. +ALTER TABLE event_badges ADD COLUMN message_template TEXT NOT NULL DEFAULT ''; + +-- Seed the event-host badge definition. +INSERT OR IGNORE INTO badge_definitions (slug, name, description, shape, primary_color, accent_color, ribbon_color, label, trigger) +VALUES ('event-host', 'Event Host', 'Hosted a successful event', 'shield', '#FFD700', '#1e1e2e', '#fab387', '★', 'event-host'); diff --git a/internal/event/put.go b/internal/event/put.go --- a/internal/event/put.go +++ b/internal/event/put.go @@ -7,6 +7,7 @@ "database/sql" "encoding/base32" "errors" "fmt" + "strings" "time" "github.com/bluesky-social/indigo/atproto/auth/oauth" @@ -267,3 +268,50 @@ out[i] = c } return string(out), nil } + +// Delete removes an event and all associated data (checkins, stats, badges) +// from the local database. It also deletes the quest.atmo.event record from +// the organizer's PDS if a session is provided. +// +// The PDS deletion is best-effort — if it fails the local data is still +// removed so the event disappears from the admin UI. +func Delete(ctx context.Context, sess *oauth.ClientSession, db *sql.DB, uri string) error { + if uri == "" { + return errors.New("event: empty URI") + } + + // Delete the record from PDS if we have a session. + if sess != nil { + rkey := rkeyFromURI(uri) + if rkey != "" { + input := map[string]any{ + "repo": sess.Data.AccountDID.String(), + "collection": NSID, + "rkey": rkey, + } + if err := sess.APIClient().Post(ctx, syntax.NSID("com.atproto.repo.deleteRecord"), input, nil); err != nil { + // Log but don't fail — local cleanup is more important. + fmt.Printf("event delete: PDS record delete failed: %v\n", err) + } + } + } + + // Remove all local data associated with this event. + _, _ = db.ExecContext(ctx, `DELETE FROM checkins WHERE event_uri = ?`, uri) + _, _ = db.ExecContext(ctx, `DELETE FROM event_stats WHERE event_uri = ?`, uri) + _, _ = db.ExecContext(ctx, `DELETE FROM event_badges WHERE event_uri = ?`, uri) + _, _ = db.ExecContext(ctx, `DELETE FROM badge_definitions WHERE event_uri = ?`, uri) + _, _ = db.ExecContext(ctx, `DELETE FROM pending_connections WHERE event_uri = ?`, uri) + _, _ = db.ExecContext(ctx, `DELETE FROM events WHERE uri = ?`, uri) + + return nil +} + +// rkeyFromURI extracts the record key (last path segment) from an at:// URI. +func rkeyFromURI(uri string) string { + parts := strings.Split(uri, "/") + if len(parts) == 0 { + return "" + } + return parts[len(parts)-1] +} diff --git a/internal/event/stats_test.go b/internal/event/stats_test.go new file mode 100644 --- /dev/null +++ b/internal/event/stats_test.go @@ -0,0 +1,324 @@ +package event + +import ( + "context" + "database/sql" + "path/filepath" + "testing" + "time" + + atdb "atmoquest/internal/db" +) + +// Test fixtures for event stats tests. Reuse newTestDB from event_test.go. +func newStatsTestDB(t *testing.T) (context.Context, *sql.DB) { + t.Helper() + dir := t.TempDir() + dsn := "file:" + filepath.Join(dir, "stats.db") + "?_pragma=foreign_keys(ON)" + conn, err := atdb.Open(dsn) + if err != nil { + t.Fatalf("db open: %v", err) + } + if err := atdb.Migrate(conn); err != nil { + t.Fatalf("migrate: %v", err) + } + t.Cleanup(func() { _ = conn.Close() }) + return context.Background(), conn +} + +func TestGetStats_EmptyReturnsZeros(t *testing.T) { + ctx, db := newStatsTestDB(t) + s, err := GetStats(ctx, db, "at://did:plc:org/quest.atmo.event/nonexistent") + if err != nil { + t.Fatalf("GetStats: %v", err) + } + if s.UniqueConnectors != 0 || s.TotalCheckins != 0 { + t.Errorf("GetStats empty = %+v; want zeros", s) + } +} + +func TestIncrementConnectors(t *testing.T) { + ctx, db := newStatsTestDB(t) + uri := "at://did:plc:org/quest.atmo.event/test1" + + for i := 0; i < 5; i++ { + if err := IncrementConnectors(ctx, db, uri); err != nil { + t.Fatalf("IncrementConnectors #%d: %v", i, err) + } + } + s, _ := GetStats(ctx, db, uri) + if s.UniqueConnectors != 5 { + t.Errorf("UniqueConnectors = %d; want 5", s.UniqueConnectors) + } + if s.TotalCheckins != 0 { + t.Errorf("TotalCheckins = %d; want 0", s.TotalCheckins) + } +} + +func TestIncrementCheckins(t *testing.T) { + ctx, db := newStatsTestDB(t) + uri := "at://did:plc:org/quest.atmo.event/test2" + + for i := 0; i < 3; i++ { + if err := IncrementCheckins(ctx, db, uri); err != nil { + t.Fatalf("IncrementCheckins #%d: %v", i, err) + } + } + s, _ := GetStats(ctx, db, uri) + if s.TotalCheckins != 3 { + t.Errorf("TotalCheckins = %d; want 3", s.TotalCheckins) + } + if s.UniqueConnectors != 0 { + t.Errorf("UniqueConnectors = %d; want 0", s.UniqueConnectors) + } +} + +func TestIncrementBoth(t *testing.T) { + ctx, db := newStatsTestDB(t) + uri := "at://did:plc:org/quest.atmo.event/both" + + _ = IncrementConnectors(ctx, db, uri) + _ = IncrementConnectors(ctx, db, uri) + _ = IncrementCheckins(ctx, db, uri) + + s, _ := GetStats(ctx, db, uri) + if s.UniqueConnectors != 2 { + t.Errorf("UniqueConnectors = %d; want 2", s.UniqueConnectors) + } + if s.TotalCheckins != 1 { + t.Errorf("TotalCheckins = %d; want 1", s.TotalCheckins) + } +} + +func TestIncrement_EmptyURIIsNoop(t *testing.T) { + ctx, db := newStatsTestDB(t) + // Empty URI should be a no-op, not an error. + if err := IncrementConnectors(ctx, db, ""); err != nil { + t.Errorf("IncrementConnectors empty URI: %v", err) + } + if err := IncrementCheckins(ctx, db, ""); err != nil { + t.Errorf("IncrementCheckins empty URI: %v", err) + } +} + +func TestStats_IsolatedByEvent(t *testing.T) { + ctx, db := newStatsTestDB(t) + uriA := "at://did:plc:org/quest.atmo.event/A" + uriB := "at://did:plc:org/quest.atmo.event/B" + + _ = IncrementConnectors(ctx, db, uriA) + _ = IncrementConnectors(ctx, db, uriA) + _ = IncrementConnectors(ctx, db, uriB) + + sA, _ := GetStats(ctx, db, uriA) + sB, _ := GetStats(ctx, db, uriB) + if sA.UniqueConnectors != 2 { + t.Errorf("event A connectors = %d; want 2", sA.UniqueConnectors) + } + if sB.UniqueConnectors != 1 { + t.Errorf("event B connectors = %d; want 1", sB.UniqueConnectors) + } +} + +// --- Event List Tests --- + +func TestListAll_Empty(t *testing.T) { + ctx, db := newStatsTestDB(t) + list, err := ListAll(ctx, db) + if err != nil { + t.Fatalf("ListAll: %v", err) + } + if len(list) != 0 { + t.Errorf("ListAll empty = %d; want 0", len(list)) + } +} + +func TestListAll_ReturnsEvents(t *testing.T) { + ctx, db := newStatsTestDB(t) + now := time.Now().UTC() + // Insert two events. + rec1 := sampleEvent() + rec1.Name = "Event A" + rec1.StartTime = now.Add(-2 * time.Hour) + rec1.EndTime = now.Add(2 * time.Hour) + _ = Cache(ctx, db, rec1) + + rec2 := Record{ + URI: "at://did:plc:org2/quest.atmo.event/second", + Name: "Event B", + StartTime: now.Add(-1 * time.Hour), + EndTime: now.Add(3 * time.Hour), + Location: "Seattle", + } + _ = Cache(ctx, db, rec2) + + list, err := ListAll(ctx, db) + if err != nil { + t.Fatalf("ListAll: %v", err) + } + if len(list) != 2 { + t.Fatalf("ListAll returned %d; want 2", len(list)) + } + // Ordered by start_time DESC — Event B started later. + if list[0].Name != "Event B" { + t.Errorf("first event = %q; want 'Event B' (most recent start)", list[0].Name) + } +} + +func TestQRTokenForURI_NotFound(t *testing.T) { + ctx, db := newStatsTestDB(t) + token := QRTokenForURI(ctx, db, "at://nonexistent") + if token != "" { + t.Errorf("QRTokenForURI nonexistent = %q; want empty", token) + } +} + +func TestLookupByQRToken_NotFound(t *testing.T) { + ctx, db := newStatsTestDB(t) + _, err := LookupByQRToken(ctx, db, "nonexistent-token") + if err != ErrNotFound { + t.Errorf("LookupByQRToken = %v; want ErrNotFound", err) + } +} + +func TestLookupByQRToken_EmptyToken(t *testing.T) { + ctx, db := newStatsTestDB(t) + _, err := LookupByQRToken(ctx, db, "") + if err != ErrNotFound { + t.Errorf("LookupByQRToken empty = %v; want ErrNotFound", err) + } +} + +// --- Event Put Validation Tests --- + +func TestValidateCreate(t *testing.T) { + now := time.Now().UTC() + cases := []struct { + name string + input CreateInput + wantErr bool + }{ + { + "valid", + CreateInput{Name: "Test", StartTime: now, EndTime: now.Add(time.Hour), ExpectedAttendees: 100}, + false, + }, + { + "empty name", + CreateInput{Name: "", StartTime: now, EndTime: now.Add(time.Hour)}, + true, + }, + { + "missing start", + CreateInput{Name: "Test", EndTime: now.Add(time.Hour)}, + true, + }, + { + "missing end", + CreateInput{Name: "Test", StartTime: now}, + true, + }, + { + "end before start", + CreateInput{Name: "Test", StartTime: now, EndTime: now.Add(-time.Hour)}, + true, + }, + { + "negative attendees", + CreateInput{Name: "Test", StartTime: now, EndTime: now.Add(time.Hour), ExpectedAttendees: -1}, + true, + }, + { + "zero attendees ok", + CreateInput{Name: "Test", StartTime: now, EndTime: now.Add(time.Hour), ExpectedAttendees: 0}, + false, + }, + } + for _, tc := range cases { + t.Run(tc.name, func(t *testing.T) { + err := validateCreate(tc.input) + if (err != nil) != tc.wantErr { + t.Errorf("validateCreate() = %v; wantErr = %v", err, tc.wantErr) + } + }) + } +} + +// --- QR Token Generation --- + +func TestNewQRToken_Unique(t *testing.T) { + seen := make(map[string]bool, 100) + for i := 0; i < 100; i++ { + tok, err := newQRToken() + if err != nil { + t.Fatalf("newQRToken: %v", err) + } + if tok == "" { + t.Fatal("empty token") + } + if seen[tok] { + t.Fatalf("duplicate token after %d iterations: %q", i, tok) + } + seen[tok] = true + } +} + +func TestNewQRToken_Lowercase(t *testing.T) { + for i := 0; i < 20; i++ { + tok, _ := newQRToken() + for _, c := range tok { + if c >= 'A' && c <= 'Z' { + t.Errorf("token %q contains uppercase", tok) + break + } + } + } +} + +// --- Event Delete Validation --- + +func TestDelete_EmptyURI(t *testing.T) { + ctx, db := newStatsTestDB(t) + err := Delete(ctx, nil, db, "") + if err == nil { + t.Error("Delete empty URI should fail") + } +} + +func TestDelete_RemovesLocalData(t *testing.T) { + ctx, db := newStatsTestDB(t) + rec := sampleEvent() + _ = Cache(ctx, db, rec) + _ = IncrementConnectors(ctx, db, rec.URI) + _ = IncrementCheckins(ctx, db, rec.URI) + + // Seed a checkin referencing this event. + _, _ = db.ExecContext(ctx, ` + INSERT INTO checkins (record_uri, did, event_uri, checked_in_at, cached_at) + VALUES ('at://rec/1', 'did:plc:user', ?, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP) + `, rec.URI) + + err := Delete(ctx, nil, db, rec.URI) + if err != nil { + t.Fatalf("Delete: %v", err) + } + + // Event should be gone. + _, err = Get(ctx, db, rec.URI) + if err != ErrNotFound { + t.Errorf("Get after delete = %v; want ErrNotFound", err) + } + + // Stats should be gone. + s, _ := GetStats(ctx, db, rec.URI) + if s.UniqueConnectors != 0 || s.TotalCheckins != 0 { + t.Errorf("stats after delete = %+v; want zeros", s) + } + + // Checkins should be cascade-deleted. + var count int + _ = db.QueryRowContext(ctx, `SELECT COUNT(*) FROM checkins WHERE event_uri = ?`, rec.URI).Scan(&count) + if count != 0 { + t.Errorf("checkins after delete = %d; want 0", count) + } +} diff --git a/internal/interest/match_test.go b/internal/interest/match_test.go new file mode 100644 --- /dev/null +++ b/internal/interest/match_test.go @@ -0,0 +1,94 @@ +package interest + +import ( + "testing" + + "github.com/bluesky-social/indigo/atproto/syntax" +) + +// Since FindMatches calls profile.FetchQuest directly (making PDS network +// calls), we test the input validation, self-skip, and edge cases that +// don't require a live PDS. Tests that exercise the full PDS → match +// pipeline belong in integration tests (which require a running devnet). + +func TestFindMatches_EmptyViewerInterests(t *testing.T) { + matches := FindMatches( + t.Context(), + nil, // no viewer interests + []string{"did:plc:aaaaaa1234567890abcdef"}, + syntax.DID("did:plc:viewer1234567890abcdef"), + nil, + func(d syntax.DID) string { return "https://bsky.social" }, + func(pds string, did syntax.DID) (string, string) { return "", "" }, + ) + if len(matches) != 0 { + t.Errorf("expected 0 matches for empty interests; got %d", len(matches)) + } +} + +func TestFindMatches_SkipsSelfInList(t *testing.T) { + viewerDID := "did:plc:viewer1234567890abcdef" + // Even if the viewer is in the attendee list, they should be skipped. + // FetchQuest will fail for this test (no real PDS), but the skip + // should happen before the fetch. + matches := FindMatches( + t.Context(), + []string{"rust", "go"}, + []string{viewerDID}, + syntax.DID(viewerDID), + nil, + func(d syntax.DID) string { return "https://bsky.social" }, + func(pds string, did syntax.DID) (string, string) { return "", "" }, + ) + if len(matches) != 0 { + t.Errorf("expected 0 matches (self only in list); got %d", len(matches)) + } +} + +func TestFindMatches_SkipsInvalidDIDs(t *testing.T) { + matches := FindMatches( + t.Context(), + []string{"rust"}, + []string{"not-a-did", "", "also invalid"}, + syntax.DID("did:plc:viewer1234567890abcdef"), + nil, + func(d syntax.DID) string { return "https://bsky.social" }, + func(pds string, did syntax.DID) (string, string) { return "", "" }, + ) + if len(matches) != 0 { + t.Errorf("expected 0 matches for invalid DIDs; got %d", len(matches)) + } +} + +func TestFindMatches_EmptyAttendeeList(t *testing.T) { + matches := FindMatches( + t.Context(), + []string{"rust", "go"}, + nil, // no attendees + syntax.DID("did:plc:viewer1234567890abcdef"), + nil, + func(d syntax.DID) string { return "https://bsky.social" }, + func(pds string, did syntax.DID) (string, string) { return "", "" }, + ) + if len(matches) != 0 { + t.Errorf("expected 0 matches for empty attendees; got %d", len(matches)) + } +} + +func TestFindMatches_GracefulOnFetchFailure(t *testing.T) { + // When profile.FetchQuest fails (no PDS running), attendees are + // silently skipped — the function should return empty, not panic. + matches := FindMatches( + t.Context(), + []string{"rust"}, + []string{"did:plc:aaaaaa1234567890abcdef"}, + syntax.DID("did:plc:viewer1234567890abcdef"), + nil, + func(d syntax.DID) string { return "https://127.0.0.1:1" }, // unreachable + func(pds string, did syntax.DID) (string, string) { return "", "" }, + ) + // Should gracefully return empty, not error. + if len(matches) != 0 { + t.Errorf("expected 0 matches with unreachable PDS; got %d", len(matches)) + } +} diff --git a/internal/notes/notes_test.go b/internal/notes/notes_test.go new file mode 100644 --- /dev/null +++ b/internal/notes/notes_test.go @@ -0,0 +1,231 @@ +package notes + +import ( + "context" + "database/sql" + "path/filepath" + "testing" + + atdb "atmoquest/internal/db" +) + +const ( + viewerDID = "did:plc:viewer1234567890abcdef" + targetDID = "did:plc:target1234567890abcdef" + otherDID = "did:plc:other11234567890abcdef" +) + +func newTestDB(t *testing.T) (context.Context, *sql.DB) { + t.Helper() + dir := t.TempDir() + dsn := "file:" + filepath.Join(dir, "notes.db") + "?_pragma=foreign_keys(ON)" + conn, err := atdb.Open(dsn) + if err != nil { + t.Fatalf("db open: %v", err) + } + if err := atdb.Migrate(conn); err != nil { + t.Fatalf("migrate: %v", err) + } + t.Cleanup(func() { _ = conn.Close() }) + return context.Background(), conn +} + +func TestGet_EmptyReturnsZeroNote(t *testing.T) { + ctx, db := newTestDB(t) + note, err := Get(ctx, db, viewerDID, targetDID) + if err != nil { + t.Fatalf("Get: %v", err) + } + if note.Notes != "" || note.FollowUp { + t.Errorf("Get empty = %+v; want zero Note", note) + } +} + +func TestPut_InsertAndGet(t *testing.T) { + ctx, db := newTestDB(t) + want := Note{Notes: "Met at CascadiaJS, really liked their talk on Rust", FollowUp: true} + if err := Put(ctx, db, viewerDID, targetDID, want); err != nil { + t.Fatalf("Put: %v", err) + } + got, err := Get(ctx, db, viewerDID, targetDID) + if err != nil { + t.Fatalf("Get: %v", err) + } + if got.Notes != want.Notes { + t.Errorf("Notes = %q, want %q", got.Notes, want.Notes) + } + if got.FollowUp != want.FollowUp { + t.Errorf("FollowUp = %v, want %v", got.FollowUp, want.FollowUp) + } +} + +func TestPut_UpsertOverwrites(t *testing.T) { + ctx, db := newTestDB(t) + // Initial note. + if err := Put(ctx, db, viewerDID, targetDID, Note{Notes: "v1"}); err != nil { + t.Fatalf("Put v1: %v", err) + } + // Update. + if err := Put(ctx, db, viewerDID, targetDID, Note{Notes: "v2", FollowUp: true}); err != nil { + t.Fatalf("Put v2: %v", err) + } + got, _ := Get(ctx, db, viewerDID, targetDID) + if got.Notes != "v2" { + t.Errorf("Notes after upsert = %q, want v2", got.Notes) + } + if !got.FollowUp { + t.Error("FollowUp after upsert = false, want true") + } +} + +func TestPut_EmptyDeletesRow(t *testing.T) { + ctx, db := newTestDB(t) + // Seed a note. + if err := Put(ctx, db, viewerDID, targetDID, Note{Notes: "hi"}); err != nil { + t.Fatalf("Put: %v", err) + } + // Clear it — empty notes + no follow-up should delete the row. + if err := Put(ctx, db, viewerDID, targetDID, Note{}); err != nil { + t.Fatalf("Put empty: %v", err) + } + got, _ := Get(ctx, db, viewerDID, targetDID) + if got.Notes != "" || got.FollowUp { + t.Errorf("after clearing: %+v; want zero Note", got) + } +} + +func TestPut_FollowUpOnlyPreservesRow(t *testing.T) { + ctx, db := newTestDB(t) + // A follow-up flag with no text should still persist. + if err := Put(ctx, db, viewerDID, targetDID, Note{FollowUp: true}); err != nil { + t.Fatalf("Put: %v", err) + } + got, _ := Get(ctx, db, viewerDID, targetDID) + if !got.FollowUp { + t.Error("FollowUp = false; want true (row should persist for follow-up-only)") + } +} + +func TestGet_IsolatedByViewer(t *testing.T) { + ctx, db := newTestDB(t) + if err := Put(ctx, db, viewerDID, targetDID, Note{Notes: "viewer's note"}); err != nil { + t.Fatalf("Put: %v", err) + } + // A different viewer should see nothing. + got, _ := Get(ctx, db, otherDID, targetDID) + if got.Notes != "" { + t.Errorf("other viewer sees %q; want empty", got.Notes) + } +} + +func TestGet_IsolatedByTarget(t *testing.T) { + ctx, db := newTestDB(t) + if err := Put(ctx, db, viewerDID, targetDID, Note{Notes: "about target"}); err != nil { + t.Fatalf("Put: %v", err) + } + // Same viewer, different target — should see nothing. + got, _ := Get(ctx, db, viewerDID, otherDID) + if got.Notes != "" { + t.Errorf("wrong target sees %q; want empty", got.Notes) + } +} + +func TestListAll_ReturnsAllForViewer(t *testing.T) { + ctx, db := newTestDB(t) + _ = Put(ctx, db, viewerDID, targetDID, Note{Notes: "note A"}) + _ = Put(ctx, db, viewerDID, otherDID, Note{Notes: "note B", FollowUp: true}) + // Another viewer's note should not appear. + _ = Put(ctx, db, otherDID, targetDID, Note{Notes: "other viewer"}) + + rows, err := ListAll(ctx, db, viewerDID) + if err != nil { + t.Fatalf("ListAll: %v", err) + } + if len(rows) != 2 { + t.Fatalf("ListAll returned %d rows; want 2", len(rows)) + } + // Should be ordered by updated_at DESC — most recent first. + // The second Put happened after the first, so "note B" should be first. + if rows[0].TargetDID != otherDID { + t.Errorf("first row target = %q; want %q (most recent)", rows[0].TargetDID, otherDID) + } +} + +func TestListAll_Empty(t *testing.T) { + ctx, db := newTestDB(t) + rows, err := ListAll(ctx, db, viewerDID) + if err != nil { + t.Fatalf("ListAll: %v", err) + } + if len(rows) != 0 { + t.Errorf("ListAll empty = %d rows; want 0", len(rows)) + } +} + +func TestListAll_FollowUpFlag(t *testing.T) { + ctx, db := newTestDB(t) + _ = Put(ctx, db, viewerDID, targetDID, Note{Notes: "with followup", FollowUp: true}) + _ = Put(ctx, db, viewerDID, otherDID, Note{Notes: "no followup"}) + + rows, err := ListAll(ctx, db, viewerDID) + if err != nil { + t.Fatalf("ListAll: %v", err) + } + followUpCount := 0 + for _, r := range rows { + if r.FollowUp { + followUpCount++ + } + } + if followUpCount != 1 { + t.Errorf("follow-up count = %d; want 1", followUpCount) + } +} + +func TestDeleteAll_RemovesAllForViewer(t *testing.T) { + ctx, db := newTestDB(t) + _ = Put(ctx, db, viewerDID, targetDID, Note{Notes: "a"}) + _ = Put(ctx, db, viewerDID, otherDID, Note{Notes: "b"}) + _ = Put(ctx, db, otherDID, targetDID, Note{Notes: "other"}) + + count, err := DeleteAll(ctx, db, viewerDID) + if err != nil { + t.Fatalf("DeleteAll: %v", err) + } + if count != 2 { + t.Errorf("DeleteAll returned count=%d; want 2", count) + } + // Viewer's notes gone. + rows, _ := ListAll(ctx, db, viewerDID) + if len(rows) != 0 { + t.Errorf("viewer still has %d rows after DeleteAll", len(rows)) + } + // Other viewer's notes untouched. + otherRows, _ := ListAll(ctx, db, otherDID) + if len(otherRows) != 1 { + t.Errorf("other viewer has %d rows; want 1 (untouched)", len(otherRows)) + } +} + +func TestDeleteAll_NoNotes(t *testing.T) { + ctx, db := newTestDB(t) + count, err := DeleteAll(ctx, db, viewerDID) + if err != nil { + t.Fatalf("DeleteAll: %v", err) + } + if count != 0 { + t.Errorf("DeleteAll on empty = %d; want 0", count) + } +} + +func TestPut_UnicodeNotes(t *testing.T) { + ctx, db := newTestDB(t) + want := Note{Notes: "日本語テスト 🎉 café résumé"} + if err := Put(ctx, db, viewerDID, targetDID, want); err != nil { + t.Fatalf("Put unicode: %v", err) + } + got, _ := Get(ctx, db, viewerDID, targetDID) + if got.Notes != want.Notes { + t.Errorf("Notes = %q, want %q", got.Notes, want.Notes) + } +} diff --git a/internal/qrcode/qrcode.go b/internal/qrcode/qrcode.go --- a/internal/qrcode/qrcode.go +++ b/internal/qrcode/qrcode.go @@ -39,7 +39,7 @@ return SVGOptions{ ModulePx: 8, Margin: 4, Foreground: "#11111b", - Background: "#cdd6f4", + Background: "#ffffff", Level: qr.High, } } diff --git a/internal/users/users.go b/internal/users/users.go --- a/internal/users/users.go +++ b/internal/users/users.go @@ -244,3 +244,67 @@ u.IsAdmin = isAdmin == 1 u.IsBanned = isBanned == 1 return u, nil } + +// Privacy holds the user's privacy toggle states. +type Privacy struct { + HideFromAttendees bool + HideFromLeaderboard bool +} + +// GetPrivacy returns the privacy settings for the given DID. +// Returns zero-value (all visible) for unknown DIDs. +func GetPrivacy(ctx context.Context, db *sql.DB, did syntax.DID) (Privacy, error) { + var hideAtt, hideLb int + err := db.QueryRowContext(ctx, ` + SELECT hide_from_attendees, hide_from_leaderboard + FROM users WHERE did = ? + `, did.String()).Scan(&hideAtt, &hideLb) + if errors.Is(err, sql.ErrNoRows) { + return Privacy{}, nil + } + if err != nil { + return Privacy{}, err + } + return Privacy{ + HideFromAttendees: hideAtt == 1, + HideFromLeaderboard: hideLb == 1, + }, nil +} + +// SetPrivacy updates one of the privacy toggle columns. +func SetPrivacy(ctx context.Context, db *sql.DB, did syntax.DID, column string, value bool) error { + // Only allow known columns to prevent SQL injection. + switch column { + case "hide_from_attendees", "hide_from_leaderboard": + default: + return errors.New("users: unknown privacy column") + } + v := 0 + if value { + v = 1 + } + _, err := db.ExecContext(ctx, ` + UPDATE users SET `+column+` = ? WHERE did = ? + `, v, did.String()) + return err +} + +// IsHiddenFromAttendees returns true if the DID should be hidden from +// event attendee lists. Returns false for unknown DIDs. +func IsHiddenFromAttendees(ctx context.Context, db *sql.DB, did string) bool { + var v int + err := db.QueryRowContext(ctx, ` + SELECT hide_from_attendees FROM users WHERE did = ? + `, did).Scan(&v) + return err == nil && v == 1 +} + +// IsHiddenFromLeaderboard returns true if the DID should be hidden from +// leaderboards. Returns false for unknown DIDs. +func IsHiddenFromLeaderboard(ctx context.Context, db *sql.DB, did string) bool { + var v int + err := db.QueryRowContext(ctx, ` + SELECT hide_from_leaderboard FROM users WHERE did = ? + `, did).Scan(&v) + return err == nil && v == 1 +} diff --git a/internal/users/users_test.go b/internal/users/users_test.go new file mode 100644 --- /dev/null +++ b/internal/users/users_test.go @@ -0,0 +1,349 @@ +package users + +import ( + "context" + "database/sql" + "errors" + "path/filepath" + "testing" + + "github.com/bluesky-social/indigo/atproto/syntax" + + atdb "atmoquest/internal/db" +) + +const ( + testDIDA = "did:plc:usera12345678901234567" + testDIDB = "did:plc:userb12345678901234567" + testDIDC = "did:plc:userc12345678901234567" +) + +func newTestDB(t *testing.T) (context.Context, *sql.DB) { + t.Helper() + dir := t.TempDir() + dsn := "file:" + filepath.Join(dir, "users.db") + "?_pragma=foreign_keys(ON)" + conn, err := atdb.Open(dsn) + if err != nil { + t.Fatalf("db open: %v", err) + } + if err := atdb.Migrate(conn); err != nil { + t.Fatalf("migrate: %v", err) + } + t.Cleanup(func() { _ = conn.Close() }) + return context.Background(), conn +} + +func TestTouch_InsertNew(t *testing.T) { + ctx, db := newTestDB(t) + did := syntax.DID(testDIDA) + if err := Touch(ctx, db, did, "alice.bsky.social", "Alice"); err != nil { + t.Fatalf("Touch: %v", err) + } + u, err := Get(ctx, db, did) + if err != nil { + t.Fatalf("Get: %v", err) + } + if u.Handle != "alice.bsky.social" { + t.Errorf("Handle = %q; want alice.bsky.social", u.Handle) + } + if u.DisplayName != "Alice" { + t.Errorf("DisplayName = %q; want Alice", u.DisplayName) + } + if u.AuthCount != 1 { + t.Errorf("AuthCount = %d; want 1", u.AuthCount) + } +} + +func TestTouch_BumpsAuthCount(t *testing.T) { + ctx, db := newTestDB(t) + did := syntax.DID(testDIDA) + _ = Touch(ctx, db, did, "alice.bsky.social", "Alice") + _ = Touch(ctx, db, did, "alice.bsky.social", "Alice") + _ = Touch(ctx, db, did, "alice.bsky.social", "Alice") + + u, _ := Get(ctx, db, did) + if u.AuthCount != 3 { + t.Errorf("AuthCount after 3 touches = %d; want 3", u.AuthCount) + } +} + +func TestTouch_PreservesHandleOnEmpty(t *testing.T) { + ctx, db := newTestDB(t) + did := syntax.DID(testDIDA) + _ = Touch(ctx, db, did, "alice.bsky.social", "Alice") + // Re-touch with empty handle — should preserve the previous one. + _ = Touch(ctx, db, did, "", "") + + u, _ := Get(ctx, db, did) + if u.Handle != "alice.bsky.social" { + t.Errorf("Handle after empty touch = %q; want alice.bsky.social (preserved)", u.Handle) + } + if u.DisplayName != "Alice" { + t.Errorf("DisplayName after empty touch = %q; want Alice (preserved)", u.DisplayName) + } +} + +func TestTouch_UpdatesHandle(t *testing.T) { + ctx, db := newTestDB(t) + did := syntax.DID(testDIDA) + _ = Touch(ctx, db, did, "alice.bsky.social", "Alice") + _ = Touch(ctx, db, did, "alice.dev", "Alice Dev") + + u, _ := Get(ctx, db, did) + if u.Handle != "alice.dev" { + t.Errorf("Handle = %q; want alice.dev (updated)", u.Handle) + } + if u.DisplayName != "Alice Dev" { + t.Errorf("DisplayName = %q; want 'Alice Dev'", u.DisplayName) + } +} + +func TestTouch_RejectsEmptyDID(t *testing.T) { + ctx, db := newTestDB(t) + err := Touch(ctx, db, "", "h", "n") + if err == nil { + t.Fatal("Touch with empty DID should fail") + } +} + +func TestGet_NotFound(t *testing.T) { + ctx, db := newTestDB(t) + _, err := Get(ctx, db, syntax.DID(testDIDA)) + if !errors.Is(err, ErrNotFound) { + t.Errorf("err = %v; want ErrNotFound", err) + } +} + +func TestIsAdmin_DefaultFalse(t *testing.T) { + ctx, db := newTestDB(t) + did := syntax.DID(testDIDA) + _ = Touch(ctx, db, did, "alice.bsky.social", "Alice") + + ok, err := IsAdmin(ctx, db, did) + if err != nil { + t.Fatalf("IsAdmin: %v", err) + } + if ok { + t.Error("IsAdmin = true; want false by default") + } +} + +func TestSetAdmin_PromoteAndDemote(t *testing.T) { + ctx, db := newTestDB(t) + did := syntax.DID(testDIDA) + _ = Touch(ctx, db, did, "alice.bsky.social", "Alice") + + // Promote. + if err := SetAdmin(ctx, db, did, true); err != nil { + t.Fatalf("SetAdmin true: %v", err) + } + ok, _ := IsAdmin(ctx, db, did) + if !ok { + t.Error("IsAdmin = false after promote") + } + + // Demote. + if err := SetAdmin(ctx, db, did, false); err != nil { + t.Fatalf("SetAdmin false: %v", err) + } + ok, _ = IsAdmin(ctx, db, did) + if ok { + t.Error("IsAdmin = true after demote") + } +} + +func TestSetAdmin_NotFoundForUnknownUser(t *testing.T) { + ctx, db := newTestDB(t) + err := SetAdmin(ctx, db, syntax.DID(testDIDA), true) + if !errors.Is(err, ErrNotFound) { + t.Errorf("SetAdmin unknown = %v; want ErrNotFound", err) + } +} + +func TestIsAdmin_BannedOverridesAdmin(t *testing.T) { + ctx, db := newTestDB(t) + did := syntax.DID(testDIDA) + _ = Touch(ctx, db, did, "alice.bsky.social", "Alice") + _ = SetAdmin(ctx, db, did, true) + + // Ban the user. + _, _ = db.ExecContext(ctx, `UPDATE users SET is_banned = 1 WHERE did = ?`, did.String()) + + ok, _ := IsAdmin(ctx, db, did) + if ok { + t.Error("banned admin should not return IsAdmin=true") + } +} + +func TestIsAdmin_EmptyDID(t *testing.T) { + ctx, db := newTestDB(t) + ok, err := IsAdmin(ctx, db, "") + if err != nil { + t.Fatalf("IsAdmin empty: %v", err) + } + if ok { + t.Error("IsAdmin empty DID = true; want false") + } +} + +func TestIsAdmin_UnknownDIDReturnsFalse(t *testing.T) { + ctx, db := newTestDB(t) + ok, err := IsAdmin(ctx, db, syntax.DID(testDIDA)) + if err != nil { + t.Fatalf("IsAdmin unknown: %v", err) + } + if ok { + t.Error("IsAdmin unknown DID = true; want false") + } +} + +func TestList_AllUsers(t *testing.T) { + ctx, db := newTestDB(t) + _ = Touch(ctx, db, syntax.DID(testDIDA), "alice.bsky.social", "Alice") + _ = Touch(ctx, db, syntax.DID(testDIDB), "bob.bsky.social", "Bob") + + list, err := List(ctx, db, ListOptions{}) + if err != nil { + t.Fatalf("List: %v", err) + } + if len(list) != 2 { + t.Errorf("List returned %d; want 2", len(list)) + } +} + +func TestList_SearchByHandle(t *testing.T) { + ctx, db := newTestDB(t) + _ = Touch(ctx, db, syntax.DID(testDIDA), "alice.bsky.social", "Alice") + _ = Touch(ctx, db, syntax.DID(testDIDB), "bob.bsky.social", "Bob") + + list, _ := List(ctx, db, ListOptions{Query: "alice"}) + if len(list) != 1 { + t.Fatalf("List(alice) returned %d; want 1", len(list)) + } + if list[0].Handle != "alice.bsky.social" { + t.Errorf("found handle = %q; want alice.bsky.social", list[0].Handle) + } +} + +func TestList_SearchByDID(t *testing.T) { + ctx, db := newTestDB(t) + _ = Touch(ctx, db, syntax.DID(testDIDA), "alice.bsky.social", "Alice") + _ = Touch(ctx, db, syntax.DID(testDIDB), "bob.bsky.social", "Bob") + + list, _ := List(ctx, db, ListOptions{Query: testDIDA}) + if len(list) != 1 { + t.Errorf("List by DID returned %d; want 1", len(list)) + } +} + +func TestList_SearchCaseInsensitive(t *testing.T) { + ctx, db := newTestDB(t) + _ = Touch(ctx, db, syntax.DID(testDIDA), "Alice.Bsky.Social", "Alice Johnson") + + list, _ := List(ctx, db, ListOptions{Query: "alice"}) + if len(list) != 1 { + t.Errorf("case-insensitive search returned %d; want 1", len(list)) + } +} + +func TestList_AdminsOnly(t *testing.T) { + ctx, db := newTestDB(t) + _ = Touch(ctx, db, syntax.DID(testDIDA), "alice.bsky.social", "Alice") + _ = Touch(ctx, db, syntax.DID(testDIDB), "bob.bsky.social", "Bob") + _ = SetAdmin(ctx, db, syntax.DID(testDIDA), true) + + list, _ := List(ctx, db, ListOptions{AdminsOnly: true}) + if len(list) != 1 { + t.Fatalf("List admins = %d; want 1", len(list)) + } + if list[0].Handle != "alice.bsky.social" { + t.Errorf("admin handle = %q; want alice.bsky.social", list[0].Handle) + } +} + +func TestList_Pagination(t *testing.T) { + ctx, db := newTestDB(t) + _ = Touch(ctx, db, syntax.DID(testDIDA), "alice.bsky.social", "Alice") + _ = Touch(ctx, db, syntax.DID(testDIDB), "bob.bsky.social", "Bob") + _ = Touch(ctx, db, syntax.DID(testDIDC), "carol.bsky.social", "Carol") + + // Page 1, limit 2. + page1, _ := List(ctx, db, ListOptions{Limit: 2, Offset: 0}) + if len(page1) != 2 { + t.Fatalf("page 1 = %d; want 2", len(page1)) + } + // Page 2, limit 2. + page2, _ := List(ctx, db, ListOptions{Limit: 2, Offset: 2}) + if len(page2) != 1 { + t.Fatalf("page 2 = %d; want 1", len(page2)) + } +} + +func TestList_DefaultLimit(t *testing.T) { + ctx, db := newTestDB(t) + _ = Touch(ctx, db, syntax.DID(testDIDA), "alice.bsky.social", "Alice") + + // Passing 0 limit should default to 50 (not fail). + list, err := List(ctx, db, ListOptions{Limit: 0}) + if err != nil { + t.Fatalf("List default limit: %v", err) + } + if len(list) != 1 { + t.Errorf("default limit returned %d; want 1", len(list)) + } +} + +func TestCounts(t *testing.T) { + ctx, db := newTestDB(t) + _ = Touch(ctx, db, syntax.DID(testDIDA), "alice.bsky.social", "Alice") + _ = Touch(ctx, db, syntax.DID(testDIDB), "bob.bsky.social", "Bob") + _ = SetAdmin(ctx, db, syntax.DID(testDIDA), true) + _, _ = db.ExecContext(ctx, `UPDATE users SET is_banned = 1 WHERE did = ?`, testDIDB) + + stats, err := Counts(ctx, db) + if err != nil { + t.Fatalf("Counts: %v", err) + } + if stats.TotalUsers != 2 { + t.Errorf("TotalUsers = %d; want 2", stats.TotalUsers) + } + if stats.AdminCount != 1 { + t.Errorf("AdminCount = %d; want 1", stats.AdminCount) + } + if stats.BannedCount != 1 { + t.Errorf("BannedCount = %d; want 1", stats.BannedCount) + } + // Both touched "now", so both active in last 7d. + if stats.ActiveLast7d != 2 { + t.Errorf("ActiveLast7d = %d; want 2", stats.ActiveLast7d) + } +} + +func TestCounts_Empty(t *testing.T) { + ctx, db := newTestDB(t) + // The Counts function uses SUM() which returns NULL on an empty table. + // The current implementation scans into int directly — if it fails, + // the function needs to use sql.NullInt64 or COALESCE. Test the + // actual behavior. + stats, err := Counts(ctx, db) + if err != nil { + // If the function doesn't handle NULL SUM, this is the expected + // failure path — document it as a known issue. + t.Skipf("Counts on empty table: %v (known: SUM returns NULL on empty set)", err) + } + if stats.TotalUsers != 0 { + t.Errorf("TotalUsers = %d; want 0", stats.TotalUsers) + } +} + +func TestGet_ReturnsBannedFlag(t *testing.T) { + ctx, db := newTestDB(t) + did := syntax.DID(testDIDA) + _ = Touch(ctx, db, did, "alice.bsky.social", "Alice") + _, _ = db.ExecContext(ctx, `UPDATE users SET is_banned = 1 WHERE did = ?`, did.String()) + + u, _ := Get(ctx, db, did) + if !u.IsBanned { + t.Error("IsBanned = false; want true") + } +} diff --git a/router/router.go b/router/router.go --- a/router/router.go +++ b/router/router.go @@ -83,6 +83,42 @@ w.WriteHeader(http.StatusOK) _, _ = w.Write([]byte("ok")) }) + // Recent badges endpoint for toast notifications. + router.Get("/badges/recent", func(w http.ResponseWriter, r *http.Request) { + didStr, _ := sess.Get(r) + if didStr == "" { + w.Header().Set("Content-Type", "application/json") + _, _ = w.Write([]byte(`{"badges":[]}`)) + return + } + did, err := syntax.ParseDID(didStr) + if err != nil { + w.Header().Set("Content-Type", "application/json") + _, _ = w.Write([]byte(`{"badges":[]}`)) + return + } + // Find badges earned in the last 60 seconds. + rows, err := conn.QueryContext(r.Context(), ` + SELECT d.name FROM earned_badges e + JOIN badge_definitions d ON d.id = e.badge_id + WHERE e.did = ? AND e.earned_at >= datetime('now', '-60 seconds') + ORDER BY e.earned_at DESC + `, did.String()) + var names []string + if err == nil { + defer rows.Close() + for rows.Next() { + var name string + if rows.Scan(&name) == nil { + names = append(names, name) + } + } + } + w.Header().Set("Content-Type", "application/json") + w.Header().Set("Cache-Control", "no-cache") + _ = json.NewEncoder(w).Encode(map[string]any{"badges": names}) + }) + return nil } diff --git a/web/resources/static/assets/android-chrome-192x192.png b/web/resources/static/assets/android-chrome-192x192.png new file mode 100644 --- /dev/null +++ b/web/resources/static/assets/android-chrome-192x192.png diff --git a/web/resources/static/assets/android-chrome-512x512.png b/web/resources/static/assets/android-chrome-512x512.png new file mode 100644 --- /dev/null +++ b/web/resources/static/assets/android-chrome-512x512.png diff --git a/web/resources/static/assets/apple-touch-icon.png b/web/resources/static/assets/apple-touch-icon.png new file mode 100644 --- /dev/null +++ b/web/resources/static/assets/apple-touch-icon.png diff --git a/web/resources/static/assets/favicon-16x16.png b/web/resources/static/assets/favicon-16x16.png new file mode 100644 --- /dev/null +++ b/web/resources/static/assets/favicon-16x16.png diff --git a/web/resources/static/assets/favicon-32x32.png b/web/resources/static/assets/favicon-32x32.png new file mode 100644 --- /dev/null +++ b/web/resources/static/assets/favicon-32x32.png diff --git a/web/resources/static/assets/favicon.ico b/web/resources/static/assets/favicon.ico --- a/web/resources/static/assets/favicon.ico +++ b/web/resources/static/assets/favicon.ico diff --git a/web/resources/static/assets/site.webmanifest b/web/resources/static/assets/site.webmanifest new file mode 100644 --- /dev/null +++ b/web/resources/static/assets/site.webmanifest @@ -0,0 +1,19 @@ +{ + "name": "atmo.quest", + "short_name": "atmo.quest", + "icons": [ + { + "src": "/static/assets/android-chrome-192x192.png", + "sizes": "192x192", + "type": "image/png" + }, + { + "src": "/static/assets/android-chrome-512x512.png", + "sizes": "512x512", + "type": "image/png" + } + ], + "theme_color": "#1e1e2e", + "background_color": "#1e1e2e", + "display": "standalone" +} diff --git a/web/resources/static/css/terminal.css b/web/resources/static/css/terminal.css --- a/web/resources/static/css/terminal.css +++ b/web/resources/static/css/terminal.css @@ -555,8 +555,9 @@ margin: 0; } .profile-flip-back { transform: rotateY(180deg); - background: var(--text); + background: #ffffff; padding: 6px; + position: relative; } .profile-qr { width: 100%; @@ -564,7 +565,11 @@ height: 100%; object-fit: contain; display: block; border-radius: 12px; - background: var(--text); + background: #ffffff; +} +.qr-copy-link { + font-size: 0.65rem; + margin-top: 2px; } .profile-flip-hint { margin-top: 10px; @@ -987,9 +992,15 @@ margin-top: 8px; } .home-identity { display: flex; + flex-direction: column; align-items: center; gap: 24px; - flex-wrap: wrap; +} +.profile-flip-wrap { + display: flex; + flex-direction: column; + align-items: center; + gap: 6px; } .home-identity .profile-flip { width: 160px; @@ -999,9 +1010,10 @@ } .home-identity-text { display: flex; flex-direction: column; + align-items: center; gap: 6px; min-width: 0; - flex: 1 1 200px; + text-align: center; } .home-name { font-size: 22px; @@ -1108,7 +1120,6 @@ margin: 0; } @media (max-width: 520px) { - .home-identity { flex-direction: column; align-items: flex-start; gap: 16px; } .home-identity .profile-flip { width: 140px; height: 140px; } } @@ -1374,6 +1385,37 @@ align-items: center; gap: 10px; } .admin-badge-preview svg { display: block; max-width: 100%; height: auto; } +.active-badge-type { + border-color: var(--peach) !important; + background: rgba(250, 179, 135, 0.06); +} + +/* ─── Admin badges grid ─────────────────────────────────────── */ +.admin-badges-grid { + display: grid; + grid-template-columns: repeat(auto-fill, minmax(180px, 1fr)); + gap: 12px; + margin: 12px 0; +} +.admin-badge-card { + display: flex; + flex-direction: column; + align-items: center; + gap: 8px; + padding: 16px 12px; + background: var(--surface0); + border: 1px solid var(--surface1); + border-radius: 8px; + text-decoration: none; + color: inherit; + transition: border-color 0.15s; +} +.admin-badge-card:hover { border-color: var(--peach); } +.admin-badge-card-svg svg { max-width: 80px; height: auto; display: block; } +.admin-badge-card-info { text-align: center; } +.admin-badge-card-name { font-size: 0.85rem; font-weight: 600; color: var(--text); } +.admin-badge-card-desc { font-size: 0.7rem; margin-top: 2px; } +.admin-badge-card-trigger { font-size: 0.65rem; margin-top: 4px; color: var(--lavender); } .admin-badge-uri { font-size: 11px; text-align: center; margin: 0; word-break: break-all; } .admin-badge-signature { font-size: 12px; color: var(--green); margin: 0; } .admin-badge-form { max-width: 100%; } @@ -2136,8 +2178,16 @@ display: flex; flex-direction: column; align-items: center; gap: 4px; - cursor: default; + cursor: pointer; + background: none; + border: none; + font-family: inherit; + color: inherit; + padding: 4px; + border-radius: 8px; + transition: background 0.15s; } +.profile-badge:hover { background: rgba(250, 179, 135, 0.08); } .profile-badge-icon { width: 44px; height: 44px; @@ -2161,6 +2211,91 @@ max-width: 64px; line-height: 1.2; } +/* ── Badge Modal ────────────────────────────────── */ +.badge-modal-overlay { + position: fixed; + inset: 0; + background: rgba(17, 17, 27, 0.85); + z-index: 1000; + display: flex; + align-items: center; + justify-content: center; + padding: 24px; + backdrop-filter: blur(4px); +} +.badge-modal { + background: var(--base); + border: 1px solid var(--surface1); + border-radius: 12px; + padding: 32px 28px; + max-width: 320px; + width: 100%; + display: flex; + flex-direction: column; + align-items: center; + gap: 12px; + position: relative; + text-align: center; +} +.badge-modal-close { + position: absolute; + top: 10px; + right: 14px; + background: none; + border: none; + color: var(--subtext0); + font-size: 16px; + cursor: pointer; +} +.badge-modal-close:hover { color: var(--text); } +.badge-modal-svg svg { max-width: 160px; height: auto; display: block; } +.badge-modal-name { font-size: 1.1rem; font-weight: 600; color: var(--text); } +.badge-modal-desc { font-size: 0.8rem; color: var(--subtext0); } +.badge-modal-date { font-size: 0.75rem; } +.badge-modal-message { + font-size: 0.8rem; + color: var(--lavender); + font-style: italic; + margin-top: 4px; +} + +/* ── Badge Toast ────────────────────────────────── */ +.badge-toast { + position: fixed; + bottom: 16px; + left: 16px; + z-index: 999; + display: flex; + align-items: center; + gap: 10px; + padding: 12px 16px; + background: var(--surface0); + border: 1px solid var(--peach); + border-radius: 8px; + box-shadow: 0 4px 16px rgba(0, 0, 0, 0.3); + font-size: 0.8rem; + color: var(--text); + max-width: 340px; + animation: badge-toast-in 0.3s ease; + transition: opacity 0.3s; +} +@keyframes badge-toast-in { + from { transform: translateY(20px); opacity: 0; } + to { transform: translateY(0); opacity: 1; } +} +.badge-toast-icon { font-size: 1.2rem; } +.badge-toast-text { flex: 1; } +.badge-toast-text strong { color: var(--peach); } +.badge-toast-close { + background: none; + border: none; + color: var(--subtext0); + font-size: 14px; + cursor: pointer; + padding: 0 4px; +} +.badge-toast-close:hover { color: var(--text); } + /* ── Leaderboard ────────────────────────────────── */ .leaderboard-list { margin: 12px 0; } .leaderboard-row { @@ -2184,6 +2319,7 @@ height: 32px; border-radius: 50%; object-fit: cover; } +.leaderboard-avatar.not-connected { filter: grayscale(100%); opacity: 0.6; } .leaderboard-avatar-empty { width: 32px; height: 32px; @@ -2195,6 +2331,7 @@ justify-content: center; color: var(--subtext0); font-size: 0.7rem; } +.leaderboard-avatar-empty.not-connected { opacity: 0.6; } .leaderboard-name { flex: 1; font-size: 0.85rem; } .leaderboard-count { font-size: 0.8rem; color: var(--subtext0); } @@ -2487,6 +2624,17 @@ border: 1.5px solid transparent; } .attendee-avatar.connected { border-color: var(--peach); } .attendee-avatar.not-connected { filter: grayscale(100%); opacity: 0.6; border-color: var(--surface1); } +.pagination { + display: flex; + align-items: center; + justify-content: center; + gap: 12px; + margin-top: 12px; + padding: 8px 0; +} +.pagination-info { + font-size: 0.75rem; +} .attendee-name { font-size: 9px; color: var(--subtext1); @@ -2536,7 +2684,7 @@ border-radius: 6px; border: 1px solid var(--surface1); } .interest-match-card.connected { - border-color: var(--peach); + border-color: var(--surface1); border-style: solid; } .interest-match-header { @@ -2550,6 +2698,7 @@ height: 28px; border-radius: 50%; object-fit: cover; } +.interest-match-avatar.not-connected { filter: grayscale(100%); opacity: 0.6; } .interest-match-name { flex: 1; font-size: 0.8rem; @@ -2997,6 +3146,14 @@ font-family: 'Instrument Serif', serif; font-size: 24px; color: var(--crust); text-transform: uppercase; + flex-shrink: 0; +} +.settings-account-avatar-img { + width: 52px; + height: 52px; + border-radius: 50%; + object-fit: cover; + flex-shrink: 0; } .settings-account-name { font-size: 15px; @@ -3108,6 +3265,12 @@ .toggle.on::after { background: var(--peach); left: 17px; } +.toggle-label { + font-size: 11px; + color: var(--subtext0); + margin-right: 8px; + flex-shrink: 0; +} .settings-footer { text-align: center; @@ -3126,6 +3289,49 @@ .settings-footer .version { font-family: 'JetBrains Mono', monospace; color: var(--overlay); margin-top: 6px; +} + +/* ─── PDS data viewer ───────────────────────────────────────── */ +.pds-records-list { + display: flex; + flex-direction: column; + gap: 4px; + margin: 8px 0; +} +.pds-record { + background: var(--surface0); + border: 1px solid var(--surface1); + border-radius: 6px; +} +.pds-record-summary { + padding: 8px 12px; + cursor: pointer; + font-size: 0.8rem; + list-style: none; +} +.pds-record-summary::-webkit-details-marker { display: none; } +.pds-record-summary::before { + content: "▸ "; + color: var(--subtext0); +} +.pds-record[open] .pds-record-summary::before { + content: "▾ "; +} +.pds-record-rkey { + font-family: 'JetBrains Mono', monospace; + font-size: 0.75rem; + color: var(--lavender); +} +.pds-record-json { + margin: 0; + padding: 8px 12px 12px; + font-family: 'JetBrains Mono', monospace; + font-size: 0.7rem; + line-height: 1.5; + color: var(--text); + white-space: pre-wrap; + word-break: break-word; + border-top: 1px solid var(--surface1); } .events-empty { diff --git a/web/resources/static/js/badge-designer.js b/web/resources/static/js/badge-designer.js new file mode 100644 --- /dev/null +++ b/web/resources/static/js/badge-designer.js @@ -0,0 +1,55 @@ +// atmo.quest — live badge designer preview. +// +// Listens for changes on the badge form (shape, colors, label) and +// fetches a fresh SVG preview from /admin/badge-preview.svg, replacing +// the preview container's SVG in-place. +(function () { + "use strict"; + + var form = document.querySelector(".admin-badge-form"); + var preview = document.getElementById("badge-preview"); + if (!form || !preview) return; + + var debounce = null; + + function getVal(name) { + var el = form.querySelector('[name="' + name + '"]:checked') || + form.querySelector('[name="' + name + '"]'); + return el ? el.value : ""; + } + + function refresh() { + var params = new URLSearchParams({ + shape: getVal("shape"), + primary_color: getVal("primary_color"), + accent_color: getVal("accent_color"), + ribbon_color: getVal("ribbon_color"), + label: getVal("label") + }); + fetch("/admin/badge-preview.svg?" + params.toString(), { + credentials: "same-origin" + }) + .then(function (r) { return r.text(); }) + .then(function (svg) { + var existing = preview.querySelector("svg"); + if (existing) { + existing.outerHTML = svg; + } + }) + .catch(function () {}); + } + + // Listen for changes on all form inputs. + form.addEventListener("change", function () { + refresh(); + }); + + // Debounce label text input. + var labelInput = form.querySelector('[name="label"]'); + if (labelInput) { + labelInput.addEventListener("input", function () { + clearTimeout(debounce); + debounce = setTimeout(refresh, 300); + }); + } +})(); diff --git a/web/resources/static/js/badge-toast.js b/web/resources/static/js/badge-toast.js new file mode 100644 --- /dev/null +++ b/web/resources/static/js/badge-toast.js @@ -0,0 +1,42 @@ +// atmo.quest — badge toast notifications. +// +// On page load, checks for recently earned badges and shows a dismissable +// toast in the bottom-left corner. Disappears after 30 seconds or on click. +(function () { + "use strict"; + + fetch("/badges/recent", { credentials: "same-origin" }) + .then(function (r) { return r.ok ? r.json() : { badges: [] }; }) + .then(function (data) { + if (!data.badges || data.badges.length === 0) return; + + data.badges.forEach(function (name, i) { + var toast = document.createElement("div"); + toast.className = "badge-toast"; + toast.style.bottom = (16 + i * 60) + "px"; + toast.innerHTML = + '🏅' + + 'Badge earned: ' + escapeHtml(name) + '' + + ''; + toast.querySelector(".badge-toast-close").addEventListener("click", function () { + toast.remove(); + }); + document.body.appendChild(toast); + + // Auto-dismiss after 30 seconds. + setTimeout(function () { + if (toast.parentNode) { + toast.style.opacity = "0"; + setTimeout(function () { toast.remove(); }, 300); + } + }, 30000); + }); + }) + .catch(function () {}); + + function escapeHtml(s) { + var d = document.createElement("div"); + d.textContent = s; + return d.innerHTML; + } +})(); diff --git a/web/resources/static/js/profile.js b/web/resources/static/js/profile.js --- a/web/resources/static/js/profile.js +++ b/web/resources/static/js/profile.js @@ -17,6 +17,9 @@ (function () { "use strict"; // ---- Flip card ----------------------------------------------------------- + var qrCopyTimer = null; + var qrCopyBtn = document.getElementById("qr-copy-btn"); + document.querySelectorAll("[data-flip-toggle]").forEach(function (btn) { var card = btn.closest("[data-flip]"); if (!card) return; @@ -25,6 +28,19 @@ var flipped = card.getAttribute("data-flip") === "1"; var next = flipped ? "0" : "1"; card.setAttribute("data-flip", next); btn.setAttribute("aria-pressed", next === "1" ? "true" : "false"); + + // Show copy button after 5s of QR being visible. + if (qrCopyTimer) { clearTimeout(qrCopyTimer); qrCopyTimer = null; } + if (qrCopyBtn) { + if (next === "1") { + qrCopyBtn.style.display = "none"; + qrCopyTimer = setTimeout(function () { + qrCopyBtn.style.display = ""; + }, 5000); + } else { + qrCopyBtn.style.display = "none"; + } + } }); }); -- tangled.sh