From 03035d1a2d32eda1ff71e08d5bdde9e939e9995f Mon Sep 17 00:00:00 2001 From: Svilen Markov <7613769+svilenmarkov@users.noreply.github.com> Date: Fri, 29 Nov 2024 20:45:33 +0000 Subject: [PATCH] Move template vars --- internal/glance/glance.go | 6 +++++- internal/glance/templates.go | 8 +------- internal/glance/widget-shared.go | 2 ++ 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/internal/glance/glance.go b/internal/glance/glance.go index 8c0068c..1a05476 100644 --- a/internal/glance/glance.go +++ b/internal/glance/glance.go @@ -14,7 +14,11 @@ import ( "time" ) -var pageThemeStyleTemplate = mustParseTemplate("theme-style.gotmpl") +var ( + pageTemplate = mustParseTemplate("page.html", "document.html") + pageContentTemplate = mustParseTemplate("page-content.html") + pageThemeStyleTemplate = mustParseTemplate("theme-style.gotmpl") +) type application struct { Version string diff --git a/internal/glance/templates.go b/internal/glance/templates.go index db14d7e..f3e6158 100644 --- a/internal/glance/templates.go +++ b/internal/glance/templates.go @@ -11,11 +11,7 @@ import ( "golang.org/x/text/message" ) -var ( - pageTemplate = mustParseTemplate("page.html", "document.html") - pageContentTemplate = mustParseTemplate("page-content.html") - forumPostsTemplate = mustParseTemplate("forum-posts.html", "widget-base.html") -) +var intl = message.NewPrinter(language.English) var globalTemplateFunctions = template.FuncMap{ "formatViewerCount": formatViewerCount, @@ -43,8 +39,6 @@ func mustParseTemplate(primary string, dependencies ...string) *template.Templat return t } -var intl = message.NewPrinter(language.English) - func formatViewerCount(count int) string { if count < 1_000 { return strconv.Itoa(count) diff --git a/internal/glance/widget-shared.go b/internal/glance/widget-shared.go index 30c4bd3..45144ac 100644 --- a/internal/glance/widget-shared.go +++ b/internal/glance/widget-shared.go @@ -9,6 +9,8 @@ import ( const twitchGqlEndpoint = "https://gql.twitch.tv/gql" const twitchGqlClientId = "kimne78kx3ncx6brgo4mv6wki5h1ko" +var forumPostsTemplate = mustParseTemplate("forum-posts.html", "widget-base.html") + type forumPost struct { Title string DiscussionUrl string