better tada.wav

Author: tstromberg

.DS_Store

@@ -24,17 +24,6 @@ import (
 // githubTokenRegex matches valid GitHub token formats.
 var githubTokenRegex = regexp.MustCompile(`^(ghp_[a-zA-Z0-9]{36}|gho_[a-zA-Z0-9]{36}|github_pat_[a-zA-Z0-9]{22}_[a-zA-Z0-9]{59})$`)
 
-// validateGitHubToken validates a GitHub token format.
-func validateGitHubToken(token string) error {
-	if token == "" {
-		return errors.New("empty token")
-	}
-	if !githubTokenRegex.MatchString(token) {
-		return errors.New("invalid GitHub token format")
-	}
-	return nil
-}
-
 // initClients initializes GitHub and Turn API clients.
 func (app *App) initClients(ctx context.Context) error {
 	token, err := app.token(ctx)
@@ -64,8 +53,12 @@ func (*App) token(ctx context.Context) (string, error) {
 	// Check GITHUB_TOKEN environment variable first
 	if token := os.Getenv("GITHUB_TOKEN"); token != "" {
 		token = strings.TrimSpace(token)
-		if err := validateGitHubToken(token); err != nil {
-			return "", fmt.Errorf("invalid GITHUB_TOKEN: %w", err)
+		// Validate token format inline
+		if token == "" {
+			return "", errors.New("GITHUB_TOKEN is empty")
+		}
+		if !githubTokenRegex.MatchString(token) {
+			return "", errors.New("GITHUB_TOKEN has invalid format")
 		}
 		log.Println("Using GitHub token from GITHUB_TOKEN environment variable")
 		return token, nil

cmd/goose/github.go

@@ -37,7 +37,8 @@ const (
 	cacheCleanupInterval = 5 * 24 * time.Hour
 
 	// PR settings.
-	stalePRThreshold = 90 * 24 * time.Hour
+	dailyInterval    = 24 * time.Hour
+	stalePRThreshold = 90 * dailyInterval
 	maxPRsToProcess  = 200 // Limit for performance
 
 	// Update interval settings.
@@ -535,35 +536,6 @@ func (app *App) updatePRsWithWait(ctx context.Context) {
 	app.checkForNewlyBlockedPRs(ctx)
 }
 
-// shouldNotifyForPR determines if we should send a notification for a PR.
-func shouldNotifyForPR(
-	_ string,
-	isBlocked bool,
-	prevState NotificationState,
-	hasHistory bool,
-	reminderInterval time.Duration,
-	enableReminders bool,
-) (shouldNotify bool, reason string) {
-	if !hasHistory && isBlocked {
-		return true, "newly blocked"
-	}
-
-	if !hasHistory {
-		return false, ""
-	}
-
-	switch {
-	case isBlocked && !prevState.WasBlocked:
-		return true, "became blocked"
-	case !isBlocked && prevState.WasBlocked:
-		return false, "unblocked"
-	case isBlocked && prevState.WasBlocked && enableReminders && time.Since(prevState.LastNotified) > reminderInterval:
-		return true, "reminder"
-	default:
-		return false, ""
-	}
-}
-
 // processPRNotifications handles notification logic for a single PR.
 func (app *App) processPRNotifications(
 	ctx context.Context,
@@ -576,7 +548,30 @@ func (app *App) processPRNotifications(
 	reminderInterval time.Duration,
 ) {
 	prevState, hasHistory := notificationHistory[pr.URL]
-	shouldNotify, notifyReason := shouldNotifyForPR(pr.URL, isBlocked, prevState, hasHistory, reminderInterval, app.enableReminders)
+
+	// Inline notification decision logic
+	var shouldNotify bool
+	var notifyReason string
+	switch {
+	case !hasHistory && isBlocked:
+		shouldNotify = true
+		notifyReason = "newly blocked"
+	case !hasHistory:
+		shouldNotify = false
+		notifyReason = ""
+	case isBlocked && !prevState.WasBlocked:
+		shouldNotify = true
+		notifyReason = "became blocked"
+	case !isBlocked && prevState.WasBlocked:
+		shouldNotify = false
+		notifyReason = "unblocked"
+	case isBlocked && prevState.WasBlocked && app.enableReminders && time.Since(prevState.LastNotified) > reminderInterval:
+		shouldNotify = true
+		notifyReason = "reminder"
+	default:
+		shouldNotify = false
+		notifyReason = ""
+	}
 
 	// Update state for unblocked PRs
 	if notifyReason == "unblocked" {

cmd/goose/main.go

@@ -16,23 +16,6 @@ import (
 )
 
 // formatAge formats a duration in human-readable form.
-func formatAge(updatedAt time.Time) string {
-	duration := time.Since(updatedAt)
-
-	switch {
-	case duration < time.Hour:
-		return fmt.Sprintf("%dm", int(duration.Minutes()))
-	case duration < 24*time.Hour:
-		return fmt.Sprintf("%dh", int(duration.Hours()))
-	case duration < 30*24*time.Hour:
-		return fmt.Sprintf("%dd", int(duration.Hours()/24))
-	case duration < 365*24*time.Hour:
-		return fmt.Sprintf("%dmo", int(duration.Hours()/(24*30)))
-	default:
-		return updatedAt.Format("2006")
-	}
-}
-
 // openURL safely opens a URL in the default browser after validation.
 func openURL(ctx context.Context, rawURL string) error {
 	// Parse and validate the URL
@@ -193,9 +176,8 @@ func (app *App) addPRSection(ctx context.Context, prs []PR, sectionTitle string,
 	// Add PR items in sorted order
 	for i := range sortedPRs {
 		// Apply filters
-		// Skip stale PRs if configured (older than 90 days)
-		const stalePRDays = 90
-		if app.hideStaleIncoming && sortedPRs[i].UpdatedAt.Before(time.Now().Add(-stalePRDays*24*time.Hour)) {
+		// Skip stale PRs if configured
+		if app.hideStaleIncoming && sortedPRs[i].UpdatedAt.Before(time.Now().Add(-stalePRThreshold)) {
 			continue
 		}
 
@@ -204,7 +186,22 @@ func (app *App) addPRSection(ctx context.Context, prs []PR, sectionTitle string,
 		if sortedPRs[i].NeedsReview {
 			title = fmt.Sprintf("• %s", title)
 		}
-		tooltip := fmt.Sprintf("%s (%s)", sortedPRs[i].Title, formatAge(sortedPRs[i].UpdatedAt))
+		// Format age inline for tooltip
+		duration := time.Since(sortedPRs[i].UpdatedAt)
+		var age string
+		switch {
+		case duration < time.Hour:
+			age = fmt.Sprintf("%dm", int(duration.Minutes()))
+		case duration < dailyInterval:
+			age = fmt.Sprintf("%dh", int(duration.Hours()))
+		case duration < 30*dailyInterval:
+			age = fmt.Sprintf("%dd", int(duration.Hours()/24))
+		case duration < 365*dailyInterval:
+			age = fmt.Sprintf("%dmo", int(duration.Hours()/(24*30)))
+		default:
+			age = sortedPRs[i].UpdatedAt.Format("2006")
+		}
+		tooltip := fmt.Sprintf("%s (%s)", sortedPRs[i].Title, age)
 		// Add action reason for blocked PRs
 		if (sortedPRs[i].NeedsReview || sortedPRs[i].IsBlocked) && sortedPRs[i].ActionReason != "" {
 			tooltip = fmt.Sprintf("%s - %s", tooltip, sortedPRs[i].ActionReason)