chore(config): Replace GitHub stats params config with username

gabe565 · Jan 19, 2025 · c694e7a · c694e7a
1 parent a86fa26
commit c694e7a
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 26 deletions.
diff --git a/internal/config/config.go b/internal/config/config.go
@@ -23,10 +23,9 @@ type Turnstile struct {
 }
 
 type GitHubStats struct {
-	Interval    time.Duration
-	SourceURL   URL
-	UserParams  map[string]string
-	LangsParams map[string]string
+	Interval  time.Duration
+	SourceURL URL
+	Username  string
 }
 
 func New() *Config {
@@ -47,20 +46,7 @@ func New() *Config {
 					Host:   "github-readme-stats.vercel.app",
 				},
 			},
-			UserParams: map[string]string{
-				"username":      "gabe565",
-				"show_icons":    "true",
-				"theme":         "transparent",
-				"hide_border":   "true",
-				"count_private": "true",
-			},
-			LangsParams: map[string]string{
-				"username":      "gabe565",
-				"show_icons":    "true",
-				"theme":         "transparent",
-				"hide_border":   "true",
-				"count_private": "true",
-			},
+			Username: "gabe565",
 		},
 	}
 }
diff --git a/internal/config/flags.go b/internal/config/flags.go
@@ -11,10 +11,9 @@ const (
 
 	FlagTurnstileSecret = "turnstile-secret"
 
-	FlagStatsInterval    = "stats-interval"
-	FlagStatsSource      = "stats-source"
-	FlagStatsUserParams  = "stats-user-params"
-	FlagStatsLangsParams = "stats-langs-params"
+	FlagStatsInterval = "stats-interval"
+	FlagStatsSource   = "stats-source"
+	FlagStatsUsername = "stats-username"
 )
 
 func (c *Config) RegisterFlags(cmd *cobra.Command) {
@@ -27,6 +26,5 @@ func (c *Config) RegisterFlags(cmd *cobra.Command) {
 
 	fs.DurationVar(&c.GitHubStats.Interval, FlagStatsInterval, c.GitHubStats.Interval, "GitHub readme stats update interval")
 	fs.Var(&c.GitHubStats.SourceURL, FlagStatsSource, "GitHub readme stats source URL")
-	fs.StringToStringVar(&c.GitHubStats.UserParams, FlagStatsUserParams, c.GitHubStats.UserParams, "GitHub readme stats params")
-	fs.StringToStringVar(&c.GitHubStats.LangsParams, FlagStatsLangsParams, c.GitHubStats.LangsParams, "GitHub readme stats top-langs params")
+	fs.StringVar(&c.GitHubStats.Username, FlagStatsUsername, c.GitHubStats.Username, "GitHub username to use for stats")
 }
diff --git a/internal/handlers/githubstats/routes.go b/internal/handlers/githubstats/routes.go
@@ -11,11 +11,11 @@ import (
 
 func RegisterRoutes(ctx context.Context, conf *config.Config, e *core.ServeEvent) error {
 	stats := NewCache(
-		formatURL(conf.GitHubStats.SourceURL.URL, "api", conf.GitHubStats.UserParams),
+		formatURL(conf.GitHubStats.SourceURL.URL, "api", userParams(conf.GitHubStats.Username)),
 	).RegisterRoutes(e, "/api/github-stats/stats")
 
 	topLangs := NewCache(
-		formatURL(conf.GitHubStats.SourceURL.URL, "api/top-langs", conf.GitHubStats.LangsParams),
+		formatURL(conf.GitHubStats.SourceURL.URL, "api/top-langs", langsParams(conf.GitHubStats.Username)),
 	).RegisterRoutes(e, "/api/github-stats/top-langs")
 
 	update := func() {
@@ -49,3 +49,23 @@ func formatURL(src *url.URL, path string, params map[string]string) string {
 
 	return u.String()
 }
+
+func userParams(username string) map[string]string {
+	return map[string]string{
+		"username":      username,
+		"show_icons":    "true",
+		"theme":         "transparent",
+		"hide_border":   "true",
+		"count_private": "true",
+	}
+}
+
+func langsParams(username string) map[string]string {
+	return map[string]string{
+		"username":      username,
+		"show_icons":    "true",
+		"theme":         "transparent",
+		"hide_border":   "true",
+		"count_private": "true",
+	}
+}