Enha: stop timer if turn ended

handlers/actions.go

@@ -303,7 +303,12 @@ func notify(event, msg string) {
 }
 
 func loadCards(room *models.Room) {
-	wl := wordloader.InitDefaultLoader("assets/words/en_nouns.txt")
+	// store it somewhere
+	wordMap := map[string]string{
+		"en": "assets/words/en_nouns.txt",
+		"ru": "assets/words/ru_nouns.txt",
+	}
+	wl := wordloader.InitDefaultLoader(wordMap[room.Settings.Language])
 	cards, err := wl.Load()
 	if err != nil {
 		// no logger

handlers/elements.go

@@ -84,6 +84,7 @@ func HandleShowColor(w http.ResponseWriter, r *http.Request) {
 		fi.Room.OpenedThisTurn = 0
 		fi.Room.ThisTurnLimit = 0
 		fi.Room.ClearMarks()
+		StopTurnTimer(fi.Room.ID)
 	}
 	switch string(color) {
 	case string(models.WordColorBlack):
@@ -102,6 +103,7 @@ func HandleShowColor(w http.ResponseWriter, r *http.Request) {
 		fi.Room.ThisTurnLimit = 0
 		fi.Room.ActionHistory = append(fi.Room.ActionHistory, action)
 		fi.Room.ClearMarks()
+		StopTurnTimer(fi.Room.ID)
 	case string(models.WordColorWhite), string(oppositeColor):
 		log.Debug("opened opposite color word", "room", fi.Room, "opposite-color", oppositeColor)
 		// end turn
@@ -109,6 +111,7 @@ func HandleShowColor(w http.ResponseWriter, r *http.Request) {
 		fi.Room.MimeDone = false
 		fi.Room.OpenedThisTurn = 0
 		fi.Room.ThisTurnLimit = 0
+		StopTurnTimer(fi.Room.ID)
 		// check if no cards left => game over
 		if fi.Room.BlueCounter == 0 {
 			// blue won

handlers/timer.go

@@ -1,13 +1,19 @@
 package handlers
 
 import (
+	"fmt"
 	"gralias/models"
 	"sync"
 	"time"
 )
 
+type roomTimer struct {
+	ticker *time.Ticker
+	done   chan bool
+}
+
 var (
-	timers = make(map[string]*time.Ticker)
+	timers = make(map[string]*roomTimer)
 	mu     sync.Mutex
 )
 
@@ -18,33 +24,41 @@ func StartTurnTimer(roomID string, duration time.Duration) {
 	if _, exists := timers[roomID]; exists {
 		return // Timer already running
 	}
+
 	ticker := time.NewTicker(1 * time.Second)
-	timers[roomID] = ticker
+	done := make(chan bool)
+	timers[roomID] = &roomTimer{ticker: ticker, done: done}
+
 	go func() {
-		for range ticker.C {
-			room, err := getRoomByID(roomID)
-			if err != nil {
-				log.Error("failed to get room by id", "error", err)
-				StopTurnTimer(roomID)
+		for {
+			select {
+			case <-done:
 				return
-			}
-			if room.Settings.TurnSecondsLeft == 0 {
-				log.Info("turn time is over", "room_id", roomID)
-				room.ChangeTurn()
-				room.MimeDone = false
+			case <-ticker.C:
+				room, err := getRoomByID(roomID)
+				if err != nil {
+					log.Error("failed to get room by id", "error", err)
+					StopTurnTimer(roomID)
+					return
+				}
+				if room.Settings.TurnSecondsLeft <= 0 {
+					log.Info("turn time is over", "room_id", roomID)
+					room.ChangeTurn()
+					room.MimeDone = false
+					if err := saveRoom(room); err != nil {
+						log.Error("failed to save room", "error", err)
+					}
+					notify(models.NotifyTurnTimerPrefix+room.ID, fmt.Sprintf("%d", room.Settings.TurnSecondsLeft))
+					notifyBotIfNeeded(room)
+					StopTurnTimer(roomID)
+					return
+				}
+				room.Settings.TurnSecondsLeft--
 				if err := saveRoom(room); err != nil {
 					log.Error("failed to save room", "error", err)
 				}
 				notify(models.NotifyRoomUpdatePrefix+room.ID, "")
-				notifyBotIfNeeded(room)
-				StopTurnTimer(roomID)
-				return
 			}
-			room.Settings.TurnSecondsLeft--
-			if err := saveRoom(room); err != nil {
-				log.Error("failed to save room", "error", err)
-			}
-			notify(models.NotifyRoomUpdatePrefix+room.ID, "")
 		}
 	}()
 }
@@ -52,9 +66,10 @@ func StartTurnTimer(roomID string, duration time.Duration) {
 func StopTurnTimer(roomID string) {
 	mu.Lock()
 	defer mu.Unlock()
-
-	if ticker, exists := timers[roomID]; exists {
-		ticker.Stop()
+	if timer, exists := timers[roomID]; exists {
+		timer.ticker.Stop()
+		close(timer.done)
 		delete(timers, roomID)
 	}
 }
+