Merge pull request #54 from 0xjuanma/replay-improvements

feat[replay]: enhance goal replay matching, ui and caching improvements

Author: 0xjuanma

CHANGELOG.md

@@ -10,8 +10,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
 
 ### Changed
+- **Goal Link Indicator** - Replaced 📺 emoji with [▶REPLAY] text indicator for better terminal compatibility
+- **Goal Link Alignment** - Positioned replay links between player name and goal symbol for proper home/away expansion
+- **Goal Display** - Removed assist information from goal events, showing only the scorer's name
 
 ### Fixed
+- **Goal Link Cache Logic** - Improved caching behavior for goal replay links and fixed cache expiration logic for not-found
 
 ## [0.10.0] - 2026-01-03
 

internal/reddit/cache.go

@@ -18,7 +18,7 @@ const (
 	CacheTTL = 7 * 24 * time.Hour // 7 days
 	// NotFoundTTL defines how long to cache "not found" results.
 	// Shorter than CacheTTL since links might appear later.
-	NotFoundTTL = 24 * time.Hour // 1 day
+	NotFoundTTL = 5 * time.Minute // 5 minutes
 	// NotFoundMarker is a special URL indicating "searched but not found"
 	NotFoundMarker = "__NOT_FOUND__"
 )

internal/reddit/client.go

@@ -243,17 +243,56 @@ func (c *Client) GetGoalLinks(goals []GoalInfo) map[GoalLinkKey]*GoalLink {
 
 // searchForGoal searches Reddit for a specific goal.
 func (c *Client) searchForGoal(goal GoalInfo) (*GoalLink, error) {
-	// Build search query with team names and minute
-	// Posts usually follow: "Team A [1] - 0 Team B - Player Name 45'"
-	query := fmt.Sprintf("%s %s %d'", goal.HomeTeam, goal.AwayTeam, goal.Minute)
-
-	results, err := c.fetcher.Search(query, 10, goal.MatchTime)
-	if err != nil {
-		return nil, fmt.Errorf("search reddit: %w", err)
+	// Strategy 1: Both teams + minute (most specific, try first)
+	query1 := fmt.Sprintf("%s %s %d'", goal.HomeTeam, goal.AwayTeam, goal.Minute)
+	results1, err := c.fetcher.Search(query1, 15, goal.MatchTime)
+	if err == nil {
+		// Check if we found a good match with the first strategy
+		match := findBestMatch(results1, goal)
+		if match != nil {
+			// Found a match, return it immediately to avoid additional API calls
+			return &GoalLink{
+				MatchID:   goal.MatchID,
+				Minute:    goal.Minute,
+				URL:       match.URL,
+				Title:     match.Title,
+				PostURL:   match.PostURL,
+				FetchedAt: time.Now(),
+			}, nil
+		}
+	}
+	
+	// Strategy 1 didn't find a match, try broader searches
+	// Only try one additional strategy to balance coverage vs rate limiting
+	var allResults []SearchResult
+	if err == nil {
+		allResults = append(allResults, results1...)
+	}
+	
+	// Strategy 2: Try with just the scoring team + minute
+	// Determine which team scored
+	scoringTeam := goal.AwayTeam
+	if goal.IsHomeTeam {
+		scoringTeam = goal.HomeTeam
+	}
+	query2 := fmt.Sprintf("%s %d'", scoringTeam, goal.Minute)
+	results2, err := c.fetcher.Search(query2, 15, goal.MatchTime)
+	if err == nil {
+		allResults = append(allResults, results2...)
+	}
+	
+	// Remove duplicates based on URL
+	seen := make(map[string]bool)
+	uniqueResults := make([]SearchResult, 0, len(allResults))
+	for _, result := range allResults {
+		if !seen[result.URL] {
+			seen[result.URL] = true
+			uniqueResults = append(uniqueResults, result)
+		}
 	}
 
 	// Find the best matching result
-	match := findBestMatch(results, goal)
+	match := findBestMatch(uniqueResults, goal)
 	if match == nil {
 		return nil, nil // No match found, but not an error
 	}

internal/reddit/matcher.go

@@ -101,6 +101,12 @@ func normalizeTeamName(name string) string {
 	// Convert to lowercase
 	norm := strings.ToLower(name)
 
+	// Remove common prefixes (e.g., "fc barcelona" -> "barcelona")
+	prefixes := []string{"fc ", "cf ", "sc ", "afc ", "ac ", "as "}
+	for _, prefix := range prefixes {
+		norm = strings.TrimPrefix(norm, prefix)
+	}
+
 	// Remove common suffixes
 	suffixes := []string{" fc", " cf", " sc", " afc", " united", " city"}
 	for _, suffix := range suffixes {
@@ -122,23 +128,40 @@ func normalizeName(name string) string {
 }
 
 // containsTeamName checks if a title contains a team name (or part of it).
+// Normalizes the title first to handle variations like "FC Barcelona" vs "Barcelona".
 func containsTeamName(title, teamNorm string) bool {
-	// First try exact match
-	if strings.Contains(title, teamNorm) {
+	// Normalize the title for comparison (handles "FC Barcelona" -> "barcelona")
+	titleNorm := normalizeTeamName(title)
+
+	// First try exact match on normalized title
+	if strings.Contains(titleNorm, teamNorm) {
 		return true
 	}
 
 	// Try matching individual words (for multi-word team names)
 	words := strings.Fields(teamNorm)
 	if len(words) > 1 {
-		// Check if the main word (usually the first significant word) is present
+		// Check if significant words are present
 		for _, word := range words {
-			if len(word) > 3 && strings.Contains(title, word) {
+			if len(word) > 3 && strings.Contains(titleNorm, word) {
 				return true
 			}
 		}
 	}
 
+	// Also check original title (case-insensitive) for better coverage
+	titleLower := strings.ToLower(title)
+	if strings.Contains(titleLower, teamNorm) {
+		return true
+	}
+
+	// Check individual words in original title too
+	for _, word := range words {
+		if len(word) > 3 && strings.Contains(titleLower, word) {
+			return true
+		}
+	}
+
 	return false
 }
 

internal/ui/colors.go

@@ -1,14 +1,13 @@
 package ui
 
-import "github.com/charmbracelet/lipgloss"
-
 // Consolidated color palette for all views - Red & Cyan theme
+// These aliases reference the main color definitions in neon_styles.go
 var (
 	// Primary colors
-	textColor      = lipgloss.Color("15")  // White
-	accentColor    = lipgloss.Color("51")  // Bright cyan
-	secondaryColor = lipgloss.Color("196") // Bright red
-	dimColor       = lipgloss.Color("244") // Gray
-	highlightColor = lipgloss.Color("51")  // Cyan highlight (same as accent)
-	borderColor    = lipgloss.Color("51")  // Cyan borders (same as accent)
+	textColor      = neonWhiteAlt // Standard white
+	accentColor    = neonCyan     // Bright cyan
+	secondaryColor = neonRed      // Bright red
+	dimColor       = neonDim      // Gray
+	highlightColor = neonCyan     // Cyan highlight (same as accent)
+	borderColor    = neonCyan     // Cyan borders (same as accent)
 )

internal/ui/hyperlink.go

@@ -67,7 +67,7 @@ func CreateGoalLinkDisplay(goalText, replayURL string) string {
 	// Otherwise, return unchanged text (no visible change to user)
 	if supportsHyperlinks() {
 		// Create a clickable indicator
-		indicator := "📺"
+		indicator := ReplayLinkIndicator
 		linkedIndicator := Hyperlink(indicator, replayURL)
 		if goalText == "" {
 			return linkedIndicator
@@ -157,7 +157,7 @@ func OpenURL(url string) error {
 }
 
 // ReplayLinkIndicator is the visual indicator for replay links.
-const ReplayLinkIndicator = "📺"
+const ReplayLinkIndicator = "[▶REPLAY]"
 
 // ReplayLinkIndicatorAlt is an alternative ASCII indicator for terminals without emoji.
-const ReplayLinkIndicatorAlt = "[▶]"
+const ReplayLinkIndicatorAlt = "[replay]"

internal/ui/list_delegate.go

@@ -5,13 +5,14 @@ import (
 	"github.com/charmbracelet/lipgloss"
 )
 
-// Neon colors used across delegates.
+// Use consolidated neon colors from neon_styles.go
+// These aliases are kept for backward compatibility but reference the main color definitions
 var (
-	delegateNeonRed   = lipgloss.Color("196")
-	delegateNeonCyan  = lipgloss.Color("51")
-	delegateNeonWhite = lipgloss.Color("255")
-	delegateNeonGray  = lipgloss.Color("244")
-	delegateNeonDim   = lipgloss.Color("238")
+	delegateNeonRed   = neonRed
+	delegateNeonCyan  = neonCyan
+	delegateNeonWhite = neonWhite
+	delegateNeonGray  = neonDim
+	delegateNeonDim   = neonDimGray
 )
 
 // NewMatchListDelegate creates a custom list delegate for match items.
@@ -23,12 +24,7 @@ func NewMatchListDelegate() list.DefaultDelegate {
 	// Set height to 3 lines: title (1) + description with KO time (2)
 	d.SetHeight(3)
 
-	// Neon colors
-	neonRed := lipgloss.Color("196")
-	neonCyan := lipgloss.Color("51")
-	neonWhite := lipgloss.Color("255")
-	neonGray := lipgloss.Color("244")
-	neonDim := lipgloss.Color("238")
+	// Use consolidated neon colors from neon_styles.go
 
 	// Selected items: Neon red title, cyan description, red left border
 	d.Styles.SelectedTitle = lipgloss.NewStyle().

internal/ui/list_panels.go

@@ -469,7 +469,7 @@ func renderStatsMatchDetailsPanel(width, height int, details *api.MatchDetails,
 		lines = append(lines, largeScore)
 	} else {
 		vsText := lipgloss.NewStyle().
-			Foreground(lipgloss.Color("244")).
+			Foreground(neonDim).
 			Width(contentWidth).
 			Align(lipgloss.Center).
 			Render("vs")
@@ -516,19 +516,16 @@ func renderStatsMatchDetailsPanel(width, height int, details *api.MatchDetails,
 				player = *g.Player
 			}
 			playerDetails := neonValueStyle.Render(player)
-			if g.Assist != nil && *g.Assist != "" {
-				playerDetails += neonDimStyle.Render(fmt.Sprintf(" (%s)", *g.Assist))
-			}
 
-			// Check for replay link and add indicator
+			// Check for replay link and create indicator
 			replayURL := goalLinks.GetReplayURL(details.ID, g.Minute)
 			replayIndicator := ""
 			if replayURL != "" {
-				// Add clickable replay indicator with hyperlink
-				replayIndicator = " " + CreateGoalLinkDisplay("", replayURL)
+				// Create clickable replay indicator with hyperlink
+				replayIndicator = CreateGoalLinkDisplay("", replayURL)
 			}
 
-			goalContent := buildEventContent(playerDetails+replayIndicator, "●", neonScoreStyle.Render("GOAL"), isHome)
+			goalContent := buildEventContent(playerDetails, replayIndicator, "●", neonScoreStyle.Render("GOAL"), isHome)
 			goalLine := renderCenterAlignedEvent(fmt.Sprintf("%d'", g.Minute), goalContent, isHome, contentWidth)
 			lines = append(lines, goalLine)
 		}
@@ -565,7 +562,7 @@ func renderStatsMatchDetailsPanel(width, height int, details *api.MatchDetails,
 
 			// Build card content with symbol+type adjacent to center time
 			playerDetails := neonValueStyle.Render(player)
-			cardContent := buildEventContent(playerDetails, cardSymbol, cardStyle.Render("CARD"), isHome)
+			cardContent := buildEventContent(playerDetails, "", cardSymbol, cardStyle.Render("CARD"), isHome)
 			cardLine := renderCenterAlignedEvent(fmt.Sprintf("%d'", card.Minute), cardContent, isHome, contentWidth)
 			lines = append(lines, cardLine)
 		}
@@ -726,7 +723,7 @@ func renderStatComparison(label, homeVal, awayVal string, maxWidth int) string {
 	}
 	awayEmpty := halfBar - awayFilled
 	awayBar := strings.Repeat("▪", awayFilled) + strings.Repeat(" ", awayEmpty)
-	awayBarStyled := lipgloss.NewStyle().Foreground(lipgloss.Color("240")).Render(awayBar)
+	awayBarStyled := lipgloss.NewStyle().Foreground(neonGray).Render(awayBar)
 
 	// Line 1: Label (centered via parent, no width constraint)
 	labelStyle := lipgloss.NewStyle().Foreground(neonDim)

internal/ui/neon_styles.go

@@ -15,13 +15,20 @@ const (
 
 var (
 	// Neon color palette - Golazo brand
-	neonRed     = lipgloss.Color("196") // Bright red
-	neonCyan    = lipgloss.Color("51")  // Electric cyan
-	neonYellow  = lipgloss.Color("226") // Bright yellow for cards
-	neonWhite   = lipgloss.Color("255") // Pure white
+	// Primary colors
+	neonRed      = lipgloss.Color("196") // Bright red
+	neonCyan     = lipgloss.Color("51")  // Electric cyan
+	neonYellow   = lipgloss.Color("226") // Bright yellow for cards
+	neonWhite    = lipgloss.Color("255") // Pure white (bright)
+	neonWhiteAlt = lipgloss.Color("15")  // Standard white
+	neonBlack    = lipgloss.Color("0")   // Black
+
+	// Gray scale
 	neonDark    = lipgloss.Color("236") // Dark background
-	neonDim     = lipgloss.Color("244") // Gray dim text
 	neonDarkDim = lipgloss.Color("239") // Slightly lighter dark
+	neonGray    = lipgloss.Color("240") // Medium gray
+	neonDim     = lipgloss.Color("244") // Gray dim text
+	neonDimGray = lipgloss.Color("238") // Dim gray (for delegates)
 
 	// Card styles - reusable across all views
 	neonYellowCardStyle = lipgloss.NewStyle().Foreground(neonYellow).Bold(true)