🐛 fix gh issue link

♻️ improve settings processing

Author: ad2ien

internal/settings.go

@@ -17,6 +17,8 @@ type SettingsService struct {
 // NewSettingsService creates a new SettingsService instance.
 func NewSettingsService(settings *Settings) *SettingsService {
 	settings.checkSettings()
+	settings.setMaxAge()
+	settings.setLabelSlice()
 
 	return &SettingsService{
 		settings: settings,
@@ -31,14 +33,16 @@ type Settings struct {
 	DBFile   string
 	// labels to look for
 	// ex: "\"help-wanted\", \"help wanted\",\"junior friendly\",\"good first issue\""
-	Labels string
+	ConfiguredLabels string
 	// optional
 	MatrixRoomID   string
 	MatrixUsername string
 	MatrixPassword string
 	MatrixServer   string
 
-	maxAge string
+	// computed
+	MaxAge string
+	Labels []string
 }
 
 // GetSettings : Get all the settings.
@@ -52,7 +56,7 @@ func (ss *SettingsService) Print() {
 	log.Info("  Github token: **")
 	log.Infof("  Interval: %d hours", ss.GetSettings().Interval)
 	log.Infof("  Database file: %s", ss.GetSettings().DBFile)
-	log.Infof("  Labels: %s", ss.GetSettings().Labels)
+	log.Infof("  Labels: %s", ss.GetSettings().ConfiguredLabels)
 	log.Infof("  Matrix room ID: %s", ss.GetSettings().MatrixRoomID)
 	log.Infof("  Matrix username: %s", ss.GetSettings().MatrixUsername)
 	log.Info("  Matrix password: ***")
@@ -68,27 +72,24 @@ func (s *Settings) IsMatrixConfigured() bool {
 }
 
 // GetLabelSlice gets label slice from settings.
-func (s *Settings) GetLabelSlice() []string {
+func (s *Settings) setLabelSlice() {
 	// Regex to extract labels inside double quotes
 	re := regexp.MustCompile(`"([^"]+)"`)
-	matches := re.FindAllStringSubmatch(s.Labels, -1)
+	matches := re.FindAllStringSubmatch(s.ConfiguredLabels, -1)
 
-	var labels = make([]string, len(matches))
-	for _, match := range matches {
-		labels = append(labels, match[1])
+	if matches == nil {
+		log.Fatal("Invalid labels, format should be \"label1\", \"label2\", ...")
 	}
 
-	return labels
+	s.Labels = make([]string, len(matches))
+	for i, match := range matches {
+		s.Labels[i] = match[1]
+	}
 }
 
 // GetMaxAge gets the max time before which data is not fresh anymore.
-func (ss *SettingsService) GetMaxAge() string {
-	s := ss.GetSettings()
-	if s.maxAge == "" {
-		s.maxAge = strconv.Itoa(hoursInSeconds * s.Interval)
-	}
-
-	return s.maxAge
+func (s *Settings) setMaxAge() {
+	s.MaxAge = strconv.Itoa(hoursInSeconds * s.Interval)
 }
 
 func (s *Settings) checkSettings() {
@@ -108,11 +109,7 @@ func (s *Settings) checkSettings() {
 		log.Warn("Matrix notif not fully configured")
 	}
 
-	if s.Labels == "" {
+	if s.ConfiguredLabels == "" {
 		log.Fatal("Missing labels")
 	}
-
-	if s.GetLabelSlice() == nil {
-		log.Fatal("Invalid labels, format should be \"label1\", \"label2\", ...")
-	}
 }

internal/stars.go

@@ -151,7 +151,7 @@ func (ghs *GhStarsService) buildQueryFromTemplate(repoCursor string) (string, er
 		MaxIssues  int
 	}{
 		RepoCursor: repoCursor,
-		Labels:     ghs.settingsService.GetSettings().Labels,
+		Labels:     ghs.settingsService.GetSettings().ConfiguredLabels,
 		MaxIssues:  MAX_ISSUES_PER_REPO,
 	}
 

internal/webpageHandler.go

@@ -67,7 +67,7 @@ func (wph *WebpageHandler) HandleWebPage(w http.ResponseWriter, r *http.Request)
 	}
 
 	w.Header().Set("ETag", etag)
-	w.Header().Set("Cache-Control", "public, max-age="+wph.settingsService.GetMaxAge())
+	w.Header().Set("Cache-Control", "public, max-age="+wph.settingsService.settings.MaxAge)
 
 	err = tmpl.Execute(w, data)
 	if err != nil {
@@ -97,14 +97,14 @@ func (wph *WebpageHandler) buildHelpIssuesLink(repoOwner string) string {
 // to have something like
 // https://github.com/OWNER/REPO/issues?q=is"issue state=open (label="good first issue" OR label="help wanted").
 func (wph *WebpageHandler) labelsToGhUrlParam() string {
-	labelSettings := wph.settingsService.GetSettings().GetLabelSlice()
+	labelSettings := wph.settingsService.GetSettings().Labels
 
 	var labels = make([]string, len(labelSettings))
 
-	for _, label := range labelSettings {
+	for i, label := range labelSettings {
 		// URL encode the label (replace spaces with %20)
 		encodedLabel := strings.ReplaceAll(url.QueryEscape(label), "+", "%20")
-		labels = append(labels, fmt.Sprintf("label:%%22%s%%22", encodedLabel))
+		labels[i] = fmt.Sprintf("label:%%22%s%%22", encodedLabel)
 	}
 
 	// Join labels with " OR " and wrap in parentheses

main.go

@@ -46,7 +46,7 @@ func main() {
 		&internal.Settings{
 			GhToken:        *ghTokenFlag,
 			Interval:       *interval,
-			Labels:         *labels,
+			ConfiguredLabels:         *labels,
 			DBFile:         *dbFile,
 			MatrixServer:   *matrixServer,
 			MatrixUsername: *matrixUsername,