fix lint issues

Author: tstromberg

cmd/goose/main_test.go

@@ -644,7 +644,7 @@ func TestNotificationScenarios(t *testing.T) {
 					t.Errorf("%s: Expected PR to be tracked as blocked", tt.description)
 				}
 				// Should have set FirstBlockedAt in state manager
-				if state, exists := app.stateManager.GetPRState("https://github.com/test/repo/pull/1"); !exists || state.FirstBlockedAt.IsZero() {
+				if state, exists := app.stateManager.PRState("https://github.com/test/repo/pull/1"); !exists || state.FirstBlockedAt.IsZero() {
 					t.Errorf("%s: Expected FirstBlockedAt to be set in state manager", tt.description)
 				}
 			}
@@ -699,7 +699,7 @@ func TestNewlyBlockedPRAfterGracePeriod(t *testing.T) {
 	}
 
 	// Verify FirstBlockedAt was set in state manager
-	if state, exists := app.stateManager.GetPRState("https://github.com/test/repo/pull/1"); !exists || state.FirstBlockedAt.IsZero() {
+	if state, exists := app.stateManager.PRState("https://github.com/test/repo/pull/1"); !exists || state.FirstBlockedAt.IsZero() {
 		t.Error("Expected FirstBlockedAt to be set for newly blocked PR in state manager")
 	}
 }

cmd/goose/notifications.go

@@ -33,7 +33,7 @@ func (app *App) processNotifications(ctx context.Context) {
 	app.mu.Lock()
 	app.previousBlockedPRs = make(map[string]bool)
 	app.blockedPRTimes = make(map[string]time.Time)
-	states := app.stateManager.GetBlockedPRs()
+	states := app.stateManager.BlockedPRs()
 	for url, state := range states {
 		app.previousBlockedPRs[url] = true
 		app.blockedPRTimes[url] = state.FirstBlockedAt

cmd/goose/pr_state.go

@@ -120,8 +120,8 @@ func (m *PRStateManager) UpdatePRs(incoming, outgoing []PR, hiddenOrgs map[strin
 	return toNotify
 }
 
-// GetBlockedPRs returns all currently blocked PRs with their states.
-func (m *PRStateManager) GetBlockedPRs() map[string]*PRState {
+// BlockedPRs returns all currently blocked PRs with their states.
+func (m *PRStateManager) BlockedPRs() map[string]*PRState {
 	m.mu.RLock()
 	defer m.mu.RUnlock()
 
@@ -132,8 +132,8 @@ func (m *PRStateManager) GetBlockedPRs() map[string]*PRState {
 	return result
 }
 
-// GetPRState returns the state for a specific PR.
-func (m *PRStateManager) GetPRState(url string) (*PRState, bool) {
+// PRState returns the state for a specific PR.
+func (m *PRStateManager) PRState(url string) (*PRState, bool) {
 	m.mu.RLock()
 	defer m.mu.RUnlock()
 

cmd/goose/pr_state_test.go

@@ -36,7 +36,7 @@ func TestPRStateManager(t *testing.T) {
 	}
 
 	// Verify state was removed
-	if _, exists := mgr.GetPRState(pr1.URL); exists {
+	if _, exists := mgr.PRState(pr1.URL); exists {
 		t.Error("Expected PR state to be removed when unblocked")
 	}
 
@@ -66,7 +66,7 @@ func TestPRStateManagerGracePeriod(t *testing.T) {
 	}
 
 	// Verify state is still tracked
-	if _, exists := mgr.GetPRState(pr1.URL); !exists {
+	if _, exists := mgr.PRState(pr1.URL); !exists {
 		t.Error("Expected PR state to be tracked even during grace period")
 	}
 

cmd/goose/systray_interface.go

@@ -1,15 +1,13 @@
 package main
 
 import (
-	"reflect"
-
 	"github.com/energye/systray"
 )
 
 // SystrayInterface abstracts systray operations for testing.
 type SystrayInterface interface {
 	ResetMenu()
-	AddMenuItem(title, tooltip string) *systray.MenuItem
+	AddMenuItem(title, tooltip string) MenuItem
 	AddSeparator()
 	SetTitle(title string)
 	SetOnClick(fn func(menu systray.IMenu))
@@ -23,8 +21,9 @@ func (*RealSystray) ResetMenu() {
 	systray.ResetMenu()
 }
 
-func (*RealSystray) AddMenuItem(title, tooltip string) *systray.MenuItem {
-	return systray.AddMenuItem(title, tooltip)
+func (*RealSystray) AddMenuItem(title, tooltip string) MenuItem {
+	item := systray.AddMenuItem(title, tooltip)
+	return &RealMenuItem{MenuItem: item}
 }
 
 func (*RealSystray) AddSeparator() {
@@ -53,24 +52,13 @@ func (m *MockSystray) ResetMenu() {
 	m.menuItems = nil
 }
 
-func (m *MockSystray) AddMenuItem(title, _ string) *systray.MenuItem {
+func (m *MockSystray) AddMenuItem(title, tooltip string) MenuItem {
 	m.menuItems = append(m.menuItems, title)
-	// Create a MenuItem with initialized internal maps using reflection
-	// This prevents nil map panics when methods are called
-	item := &systray.MenuItem{}
-
-	// Use reflection to initialize internal maps if they exist
-	// This is a hack but necessary for testing
-	rv := reflect.ValueOf(item).Elem()
-	rt := rv.Type()
-	for i := 0; i < rt.NumField(); i++ {
-		field := rv.Field(i)
-		if field.Kind() == reflect.Map && field.IsNil() && field.CanSet() {
-			field.Set(reflect.MakeMap(field.Type()))
-		}
+	// Return a MockMenuItem that won't panic when methods are called
+	return &MockMenuItem{
+		title:   title,
+		tooltip: tooltip,
 	}
-
-	return item
 }
 
 func (m *MockSystray) AddSeparator() {

cmd/goose/ui.go

@@ -217,7 +217,7 @@ func (app *App) addPRSection(ctx context.Context, prs []PR, sectionTitle string,
 		// Add bullet point or emoji for blocked PRs
 		if sortedPRs[prIndex].NeedsReview || sortedPRs[prIndex].IsBlocked {
 			// Get the blocked time from state manager
-			prState, hasState := app.stateManager.GetPRState(sortedPRs[prIndex].URL)
+			prState, hasState := app.stateManager.PRState(sortedPRs[prIndex].URL)
 
 			// Show emoji for PRs blocked within the last 5 minutes
 			if hasState && !prState.FirstBlockedAt.IsZero() && time.Since(prState.FirstBlockedAt) < blockedPRIconDuration {
@@ -369,7 +369,7 @@ func (app *App) generatePRSectionTitles(prs []PR, sectionTitle string, hiddenOrg
 
 		// Add bullet point or emoji for blocked PRs (same logic as in addPRSection)
 		if sortedPRs[prIndex].NeedsReview || sortedPRs[prIndex].IsBlocked {
-			prState, hasState := app.stateManager.GetPRState(sortedPRs[prIndex].URL)
+			prState, hasState := app.stateManager.PRState(sortedPRs[prIndex].URL)
 
 			if hasState && !prState.FirstBlockedAt.IsZero() && time.Since(prState.FirstBlockedAt) < blockedPRIconDuration {
 				if sectionTitle == "Outgoing" {