From 08a9d833848435dd3a7e25428f04b6d953ed3a29 Mon Sep 17 00:00:00 2001 From: brookjeynes Date: Mon, 13 Oct 2025 10:05:01 +1000 Subject: [PATCH] refactor: move computed data code to function to simplify visuals Change-Id: ttprpxmrrnnuvoqrvqwprowxzvtxnpwl Signed-off-by: brookjeynes --- internal/server/app.go | 38 +++++++++++++++++++++----------------- 1 file changed, 21 insertions(+), 17 deletions(-) diff --git a/internal/server/app.go b/internal/server/app.go index a47459d..4abc452 100644 --- a/internal/server/app.go +++ b/internal/server/app.go @@ -97,7 +97,22 @@ func Make(ctx context.Context, config *config.Config) (*Server, error) { return nil, fmt.Errorf("failed to start jetstream watcher: %w", err) } - // -- Computed data + computed := computeData() + + state := &Server{ + Db: d, + Oauth: oauth, + Config: config, + Posthog: posthog, + IdResolver: idResolver, + Session: sess, + ComputedData: computed, + } + + return state, nil +} + +func computeData() ComputedData { sortedLanguages := make([]db.Language, 0, len(db.Languages)) for _, l := range db.Languages { sortedLanguages = append(sortedLanguages, l) @@ -129,24 +144,13 @@ func Make(ctx context.Context, config *config.Config) (*Server, error) { slices.SortFunc(sortedReactions, func(a, b db.Reaction) int { return cmp.Compare(a.ID, b.ID) }) - // -- - state := &Server{ - Db: d, - Oauth: oauth, - Config: config, - Posthog: posthog, - IdResolver: idResolver, - Session: sess, - ComputedData: ComputedData{ - SortedLanguages: sortedLanguages, - SortedCategories: sortedCategories, - SortedResourceTypes: sortedResourceTypes, - SortedReactions: sortedReactions, - }, + return ComputedData{ + SortedLanguages: sortedLanguages, + SortedCategories: sortedCategories, + SortedResourceTypes: sortedResourceTypes, + SortedReactions: sortedReactions, } - - return state, nil } func (s *Server) HandleIndexPage(w http.ResponseWriter, r *http.Request) { -- 2.43.0