Show connected clients and their last human action in Status

internal/server/hub.go

@@ -3,17 +3,36 @@ package server
 import (
 	"sort"
 	"sync"
+	"time"
 
 	"g.fc.run/misc/byre/internal/api"
 )
 
+type clientKey struct{ login, host, commit string }
+
 type hub struct {
-	mu   sync.Mutex
-	subs map[chan api.Event]api.ConnectedClient
+	mu           sync.Mutex
+	subs         map[chan api.Event]api.ConnectedClient
+	lastAction   map[clientKey]time.Time
+	lastNotified map[clientKey]time.Time
 }
 
 func newHub() *hub {
-	return &hub{subs: map[chan api.Event]api.ConnectedClient{}}
+	return &hub{subs: map[chan api.Event]api.ConnectedClient{}, lastAction: map[clientKey]time.Time{}, lastNotified: map[clientKey]time.Time{}}
+}
+
+func (h *hub) acted(login, host, commit string) bool {
+	h.mu.Lock()
+	defer h.mu.Unlock()
+	k := clientKey{login, host, commit}
+	now := time.Now()
+	h.lastAction[k] = now
+	prev, ok := h.lastNotified[k]
+	if ok && now.Sub(prev) < time.Second {
+		return false
+	}
+	h.lastNotified[k] = now
+	return true
 }
 
 func (h *hub) subscribe(client api.ConnectedClient) chan api.Event {
@@ -57,10 +76,9 @@ func (h *hub) count() int {
 func (h *hub) clients() []api.ConnectedClient {
 	h.mu.Lock()
 	defer h.mu.Unlock()
-	type key struct{ login, host, commit string }
-	oldest := map[key]api.ConnectedClient{}
+	oldest := map[clientKey]api.ConnectedClient{}
 	for _, c := range h.subs {
-		k := key{c.Login, c.Host, c.Commit}
+		k := clientKey{c.Login, c.Host, c.Commit}
 		prev, ok := oldest[k]
 		if ok && !c.ConnectedAt.Before(prev.ConnectedAt) {
 			continue
@@ -68,7 +86,11 @@ func (h *hub) clients() []api.ConnectedClient {
 		oldest[k] = c
 	}
 	out := []api.ConnectedClient{}
-	for _, c := range oldest {
+	for k, c := range oldest {
+		at, ok := h.lastAction[k]
+		if ok {
+			c.LastActionAt = &at
+		}
 		out = append(out, c)
 	}
 	sort.Slice(out, func(i, j int) bool { return out[i].ConnectedAt.Before(out[j].ConnectedAt) })