Refactor Timer interface: constructor injection and IsActive()

- Timer interface now has IsActive() bool, StartTimer(minutes int),
  StartBreakTimer(minutes int) — configuration no longer passed per call
- ProcessLocalTimer and WebTimer receive config via constructor
  (NewProcessLocalTimer / NewWebTimer)
- ProcessLocalTimer.IsActive() returns configuration.TimerLocal
- WebTimer.IsActive() returns room != ""
- GetTimers() constructs all implementations and filters by IsActive(),
  so each implementation decides itself whether it should run

https://claude.ai/code/session_01DTB35xCmhRgW5SQUsYAtAq

Author: claude

timer/localtimer.go

@@ -13,27 +13,37 @@ import (
 )
 
 // ProcessLocalTimer is a Timer implementation that uses background OS processes.
-type ProcessLocalTimer struct{}
+type ProcessLocalTimer struct {
+	configuration config.Configuration
+}
+
+func NewProcessLocalTimer(configuration config.Configuration) ProcessLocalTimer {
+	return ProcessLocalTimer{configuration: configuration}
+}
+
+func (t ProcessLocalTimer) IsActive() bool {
+	return t.configuration.TimerLocal
+}
 
-func (t ProcessLocalTimer) StartTimer(minutes int, configuration config.Configuration) error {
+func (t ProcessLocalTimer) StartTimer(minutes int) error {
 	timeoutInSeconds := minutes * 60
 	if err := ExecuteCommandsInBackgroundProcess(
 		sleepCommand(timeoutInSeconds),
-		VoiceCommand(configuration.VoiceMessage, configuration.VoiceCommand),
-		notifyCommand(configuration.NotifyMessage, configuration.NotifyCommand),
+		VoiceCommand(t.configuration.VoiceMessage, t.configuration.VoiceCommand),
+		notifyCommand(t.configuration.NotifyMessage, t.configuration.NotifyCommand),
 		"echo \"mobTimer\"",
 	); err != nil {
 		return fmt.Errorf("timer couldn't be started on your system (%s): %w", runtime.GOOS, err)
 	}
 	return nil
 }
 
-func (t ProcessLocalTimer) StartBreakTimer(minutes int, configuration config.Configuration) error {
+func (t ProcessLocalTimer) StartBreakTimer(minutes int) error {
 	timeoutInSeconds := minutes * 60
 	if err := ExecuteCommandsInBackgroundProcess(
 		sleepCommand(timeoutInSeconds),
-		VoiceCommand("mob start", configuration.VoiceCommand),
-		notifyCommand("mob start", configuration.NotifyCommand),
+		VoiceCommand("mob start", t.configuration.VoiceCommand),
+		notifyCommand("mob start", t.configuration.NotifyCommand),
 		"echo \"mobTimer\"",
 	); err != nil {
 		return fmt.Errorf("break timer couldn't be started on your system (%s): %w", runtime.GOOS, err)

timer/timer.go

@@ -13,24 +13,27 @@ import (
 
 // Timer abstracts timer functionality so different implementations can be used.
 type Timer interface {
-	StartTimer(minutes int, configuration config.Configuration) error
-	StartBreakTimer(minutes int, configuration config.Configuration) error
+	IsActive() bool
+	StartTimer(minutes int) error
+	StartBreakTimer(minutes int) error
 }
 
-// GetTimers returns the list of active timers based on room and configuration.
-// Both WebTimer and ProcessLocalTimer can be active simultaneously.
+// GetTimers returns all timers that report themselves as active.
 func GetTimers(room string, timerUser string, configuration config.Configuration) []Timer {
-	var timers []Timer
-	if room != "" {
-		timers = append(timers, WebTimer{Room: room, TimerUser: timerUser})
+	all := []Timer{
+		NewWebTimer(room, timerUser, configuration),
+		NewProcessLocalTimer(configuration),
 	}
-	if configuration.TimerLocal {
-		timers = append(timers, ProcessLocalTimer{})
+	var active []Timer
+	for _, t := range all {
+		if t.IsActive() {
+			active = append(active, t)
+		}
 	}
-	return timers
+	return active
 }
 
-// RunTimer parses timerInMinutes, starts all configured timers and returns any error.
+// RunTimer parses timerInMinutes, starts all active timers and returns any error.
 func RunTimer(timerInMinutes string, room string, timerUser string, configuration config.Configuration) error {
 	err, timeoutInMinutes := toMinutes(timerInMinutes)
 	if err != nil {
@@ -48,7 +51,7 @@ func RunTimer(timerInMinutes string, room string, timerUser string, configuratio
 	}
 
 	for _, t := range timers {
-		if err := t.StartTimer(timeoutInMinutes, configuration); err != nil {
+		if err := t.StartTimer(timeoutInMinutes); err != nil {
 			say.Error(err.Error())
 			exit.Exit(1)
 		}
@@ -58,7 +61,7 @@ func RunTimer(timerInMinutes string, room string, timerUser string, configuratio
 	return nil
 }
 
-// RunBreakTimer parses timerInMinutes, starts all configured break timers and returns any error.
+// RunBreakTimer parses timerInMinutes, starts all active break timers and returns any error.
 func RunBreakTimer(timerInMinutes string, room string, timerUser string, configuration config.Configuration) error {
 	err, timeoutInMinutes := toMinutes(timerInMinutes)
 	if err != nil {
@@ -76,7 +79,7 @@ func RunBreakTimer(timerInMinutes string, room string, timerUser string, configu
 	}
 
 	for _, t := range timers {
-		if err := t.StartBreakTimer(timeoutInMinutes, configuration); err != nil {
+		if err := t.StartBreakTimer(timeoutInMinutes); err != nil {
 			say.Error(err.Error())
 			exit.Exit(1)
 		}

timer/webtimer.go

@@ -10,19 +10,34 @@ import (
 
 // WebTimer is a Timer implementation that notifies a remote timer service via HTTP.
 type WebTimer struct {
-	Room      string
-	TimerUser string
+	room           string
+	timerUser      string
+	timerUrl       string
+	timerInsecure  bool
 }
 
-func (t WebTimer) StartTimer(minutes int, configuration config.Configuration) error {
-	if err := httpPutTimer(minutes, t.Room, t.TimerUser, configuration.TimerUrl, configuration.TimerInsecure); err != nil {
+func NewWebTimer(room string, timerUser string, configuration config.Configuration) WebTimer {
+	return WebTimer{
+		room:          room,
+		timerUser:     timerUser,
+		timerUrl:      configuration.TimerUrl,
+		timerInsecure: configuration.TimerInsecure,
+	}
+}
+
+func (t WebTimer) IsActive() bool {
+	return t.room != ""
+}
+
+func (t WebTimer) StartTimer(minutes int) error {
+	if err := httpPutTimer(minutes, t.room, t.timerUser, t.timerUrl, t.timerInsecure); err != nil {
 		return fmt.Errorf("remote timer couldn't be started: %w", err)
 	}
 	return nil
 }
 
-func (t WebTimer) StartBreakTimer(minutes int, configuration config.Configuration) error {
-	if err := httpPutBreakTimer(minutes, t.Room, t.TimerUser, configuration.TimerUrl, configuration.TimerInsecure); err != nil {
+func (t WebTimer) StartBreakTimer(minutes int) error {
+	if err := httpPutBreakTimer(minutes, t.room, t.timerUser, t.timerUrl, t.timerInsecure); err != nil {
 		return fmt.Errorf("remote break timer couldn't be started: %w", err)
 	}
 	return nil