fix: ignore matches with no teams + change initial cursor strategy

Author: matthieugusmini

internal/timeutil/day.go

@@ -16,6 +16,12 @@ func IsToday(date time.Time) bool {
 	return compareDay(date, today)
 }
 
+func IsBeforeToday(date time.Time) bool {
+	now := time.Now()
+	today := time.Date(now.Year(), now.Month(), now.Day(), 0, 0, 0, 0, now.Location())
+	return date.Before(today)
+}
+
 // IsTomorrow returns true if the given date is tomorrow, false otherwise.
 func IsTomorrow(date time.Time) bool {
 	tomorrow := time.Now().AddDate(0, 0, 1)

internal/timeutil/day_test.go

@@ -17,12 +17,12 @@ func TestIsYesterday(t *testing.T) {
 		want bool
 	}{
 		{
-			name: "with yesterday date returns true",
+			name: "yesterday returns true",
 			date: time.Now().AddDate(0, 0, -1),
 			want: true,
 		},
 		{
-			name: "with Faker birthday returns false",
+			name: "Faker birthday returns false",
 			date: goatBirthday,
 			want: false,
 		},
@@ -43,12 +43,12 @@ func TestIsToday(t *testing.T) {
 		want bool
 	}{
 		{
-			name: "with current date returns true",
+			name: "current date returns true",
 			date: time.Now(),
 			want: true,
 		},
 		{
-			name: "with Faker birthday returns false",
+			name: "Faker birthday returns false",
 			date: goatBirthday,
 			want: false,
 		},
@@ -62,19 +62,44 @@ func TestIsToday(t *testing.T) {
 	}
 }
 
+func TestIsBeforeToday(t *testing.T) {
+	tt := []struct {
+		name string
+		date time.Time
+		want bool
+	}{
+		{
+			name: "yesterday returns true",
+			date: time.Now().AddDate(0, 0, -1),
+			want: true,
+		},
+		{
+			name: "today returns false",
+			date: time.Now(),
+			want: false,
+		},
+	}
+	for _, tc := range tt {
+		t.Run(tc.name, func(t *testing.T) {
+			got := timeutil.IsBeforeToday(tc.date)
+			require.Equal(t, tc.want, got)
+		})
+	}
+}
+
 func TestIsTomorrow(t *testing.T) {
 	tt := []struct {
 		name string
 		date time.Time
 		want bool
 	}{
 		{
-			name: "with tomorrow date returns true",
+			name: "tomorrow returns true",
 			date: time.Now().AddDate(0, 0, 1),
 			want: true,
 		},
 		{
-			name: "with Faker birthday returns false",
+			name: "Faker birthday returns false",
 			date: goatBirthday,
 			want: false,
 		},

internal/ui/matches.go

@@ -13,7 +13,6 @@ import (
 	"github.com/charmbracelet/lipgloss"
 	"github.com/charmbracelet/x/ansi"
 	"github.com/matthieugusmini/go-lolesports"
-
 	"github.com/matthieugusmini/rift/internal/timeutil"
 )
 
@@ -93,15 +92,25 @@ func newMatchList(events []lolesports.Event, width, height int) list.Model {
 	l.SetSpinner(spinner.MiniDot)
 	l.SetShowHelp(false)
 
-	// We use the first match of the day as the starting position for the list cursor.
-	firstTodayMatchIndex := slices.IndexFunc(events, func(event lolesports.Event) bool {
-		return timeutil.IsToday(event.StartTime)
-	})
-	l.Select(firstTodayMatchIndex)
+	cursorStartingPos := indexMatchListInitialCursor(events)
+	l.Select(cursorStartingPos)
 
 	return l
 }
 
+func indexMatchListInitialCursor(events []lolesports.Event) int {
+	// The starting position of the cursor is the first match of the first day
+	// with a match starting from today.
+	cursorStartingPos := slices.IndexFunc(events, func(event lolesports.Event) bool {
+		return !timeutil.IsBeforeToday(event.StartTime)
+	})
+	// Fallback to 0 but it should never happen. Right?
+	if cursorStartingPos == -1 {
+		return 0
+	}
+	return cursorStartingPos
+}
+
 type matchItemStyles struct {
 	// Item
 	normalItem   lipgloss.Style

internal/ui/schedule_page.go

@@ -528,6 +528,11 @@ func filterMatchEvents(events []lolesports.Event) []lolesports.Event {
 			continue
 		}
 
+		// Matches does not always have teams somehow.
+		if len(event.Match.Teams) != 2 {
+			continue
+		}
+
 		matches = append(matches, event)
 	}