Use one build number across phone, Mac and Status

This commit is contained in:
Ian Gulliver
2026-10-22 07:19:28 -07:00
parent 9952170aae
commit e1eeaad925
14 changed files with 377 additions and 368 deletions
+2 -2
View File
@@ -35,7 +35,7 @@ func (s *Server) ConnectClient(w http.ResponseWriter, r *http.Request) {
}
defer ws.CloseNow()
s.clients.Serve(r.Context(), ws, id, actor(r), host, r.Header.Get("Byre-Commit"), r.Header.Get("Byre-Device"))
s.clients.Serve(r.Context(), ws, id, actor(r), host, r.Header.Get("Byre-Commit"), r.Header.Get("Byre-Build"), r.Header.Get("Byre-Device"))
}
func (s *Server) SetClientSync(w http.ResponseWriter, r *http.Request) {
@@ -58,7 +58,7 @@ func (s *Server) SetClientSync(w http.ResponseWriter, r *http.Request) {
}
slog.Warn("client icloud sync failing", "id", id, "host", host, "error", *sync.Error)
}
s.clients.Synced(id, actor(r), host, r.Header.Get("Byre-Commit"), sync)
s.clients.Synced(id, actor(r), host, r.Header.Get("Byre-Commit"), r.Header.Get("Byre-Build"), sync)
s.clientsChanged()
w.WriteHeader(http.StatusNoContent)
}
+2 -1
View File
@@ -200,7 +200,7 @@ func (s *Server) identify(next http.Handler) http.Handler {
}
func (s *Server) acted(login string, r *http.Request) {
if s.clients.Acted(r.Header.Get("Byre-Client"), login, r.Header.Get("Byre-Host"), r.Header.Get("Byre-Commit")) {
if s.clients.Acted(r.Header.Get("Byre-Client"), login, r.Header.Get("Byre-Host"), r.Header.Get("Byre-Commit"), r.Header.Get("Byre-Build")) {
s.clientsChanged()
}
}
@@ -214,6 +214,7 @@ func (s *Server) connectedClients() []api.ConnectedClient {
Host: c.Host,
Device: c.Device,
Commit: c.Commit,
Build: c.Build,
ConnectedAt: c.ConnectedAt,
LastActionAt: c.LastActionAt,
Sync: c.Sync,