WebTimer reads room and timerUser from configuration

- NewWebTimer now takes only config.Configuration; room and timerUser
  are read from configuration.TimerRoom / configuration.TimerUser
- GetTimers, RunTimer, RunBreakTimer drop the separate room/timerUser
  parameters — just configuration is passed through
- main resolves the effective room (incl. WipBranchQualifier logic) and
  timerUser into the configuration copy before calling the timer package

https://claude.ai/code/session_01DTB35xCmhRgW5SQUsYAtAq

Author: claude

timer.go

@@ -13,9 +13,9 @@ func StartTimer(timerInMinutes string, configuration config.Configuration) {
 }
 
 func startTimer(timerInMinutes string, configuration config.Configuration) error {
-	room := getMobTimerRoom(configuration)
-	timerUser := getUserForMobTimer(configuration.TimerUser)
-	return timerpkg.RunTimer(timerInMinutes, room, timerUser, configuration)
+	configuration.TimerRoom = getMobTimerRoom(configuration)
+	configuration.TimerUser = getUserForMobTimer(configuration.TimerUser)
+	return timerpkg.RunTimer(timerInMinutes, configuration)
 }
 
 func StartBreakTimer(timerInMinutes string, configuration config.Configuration) {
@@ -25,9 +25,9 @@ func StartBreakTimer(timerInMinutes string, configuration config.Configuration)
 }
 
 func startBreakTimer(timerInMinutes string, configuration config.Configuration) error {
-	room := getMobTimerRoom(configuration)
-	timerUser := getUserForMobTimer(configuration.TimerUser)
-	return timerpkg.RunBreakTimer(timerInMinutes, room, timerUser, configuration)
+	configuration.TimerRoom = getMobTimerRoom(configuration)
+	configuration.TimerUser = getUserForMobTimer(configuration.TimerUser)
+	return timerpkg.RunBreakTimer(timerInMinutes, configuration)
 }
 
 func getMobTimerRoom(configuration config.Configuration) string {
@@ -59,4 +59,3 @@ func getUserForMobTimer(userOverride string) string {
 	}
 	return userOverride
 }
-

timer/timer.go

@@ -19,9 +19,9 @@ type Timer interface {
 }
 
 // GetTimers returns all timers that report themselves as active.
-func GetTimers(room string, timerUser string, configuration config.Configuration) []Timer {
+func GetTimers(configuration config.Configuration) []Timer {
 	all := []Timer{
-		NewWebTimer(room, timerUser, configuration),
+		NewWebTimer(configuration),
 		NewProcessLocalTimer(configuration),
 	}
 	var active []Timer
@@ -34,7 +34,7 @@ func GetTimers(room string, timerUser string, configuration config.Configuration
 }
 
 // RunTimer parses timerInMinutes, starts all active timers and returns any error.
-func RunTimer(timerInMinutes string, room string, timerUser string, configuration config.Configuration) error {
+func RunTimer(timerInMinutes string, configuration config.Configuration) error {
 	err, timeoutInMinutes := toMinutes(timerInMinutes)
 	if err != nil {
 		return err
@@ -44,7 +44,7 @@ func RunTimer(timerInMinutes string, room string, timerUser string, configuratio
 	timeOfTimeout := time.Now().Add(time.Minute * time.Duration(timeoutInMinutes)).Format("15:04")
 	say.Debug(fmt.Sprintf("Starting timer at %s for %d minutes = %d seconds (parsed from user input %s)", timeOfTimeout, timeoutInMinutes, timeoutInSeconds, timerInMinutes))
 
-	timers := GetTimers(room, timerUser, configuration)
+	timers := GetTimers(configuration)
 	if len(timers) == 0 {
 		say.Error("No timer configured, not starting timer")
 		exit.Exit(1)
@@ -62,7 +62,7 @@ func RunTimer(timerInMinutes string, room string, timerUser string, configuratio
 }
 
 // RunBreakTimer parses timerInMinutes, starts all active break timers and returns any error.
-func RunBreakTimer(timerInMinutes string, room string, timerUser string, configuration config.Configuration) error {
+func RunBreakTimer(timerInMinutes string, configuration config.Configuration) error {
 	err, timeoutInMinutes := toMinutes(timerInMinutes)
 	if err != nil {
 		return err
@@ -72,7 +72,7 @@ func RunBreakTimer(timerInMinutes string, room string, timerUser string, configu
 	timeOfTimeout := time.Now().Add(time.Minute * time.Duration(timeoutInMinutes)).Format("15:04")
 	say.Debug(fmt.Sprintf("Starting break timer at %s for %d minutes = %d seconds (parsed from user input %s)", timeOfTimeout, timeoutInMinutes, timeoutInSeconds, timerInMinutes))
 
-	timers := GetTimers(room, timerUser, configuration)
+	timers := GetTimers(configuration)
 	if len(timers) == 0 {
 		say.Error("No break timer configured, not starting break timer")
 		exit.Exit(1)

timer/webtimer.go

@@ -16,10 +16,10 @@ type WebTimer struct {
 	timerInsecure  bool
 }
 
-func NewWebTimer(room string, timerUser string, configuration config.Configuration) WebTimer {
+func NewWebTimer(configuration config.Configuration) WebTimer {
 	return WebTimer{
-		room:          room,
-		timerUser:     timerUser,
+		room:          configuration.TimerRoom,
+		timerUser:     configuration.TimerUser,
 		timerUrl:      configuration.TimerUrl,
 		timerInsecure: configuration.TimerInsecure,
 	}