Allow using custom words only; Fixes #384

Author: Bios-Marcel

internal/api/v1.go

@@ -114,7 +114,8 @@ func (handler *V1Handler) postLobby(writer http.ResponseWriter, request *http.Re
 	}
 
 	scoreCalculation, scoreCalculationInvalid := ParseScoreCalculation(request.Form.Get("score_calculation"))
-	languageData, languageKey, languageInvalid := ParseLanguage(request.Form.Get("language"))
+	languageRawValue := strings.ToLower(strings.TrimSpace(request.Form.Get("language")))
+	languageData, languageKey, languageInvalid := ParseLanguage(languageRawValue)
 	drawingTime, drawingTimeInvalid := ParseDrawingTime(handler.cfg, request.Form.Get("drawing_time"))
 	rounds, roundsInvalid := ParseRounds(handler.cfg, request.Form.Get("rounds"))
 	maxPlayers, maxPlayersInvalid := ParseMaxPlayers(handler.cfg, request.Form.Get("max_players"))
@@ -133,6 +134,7 @@ func (handler *V1Handler) postLobby(writer http.ResponseWriter, request *http.Re
 	} else {
 		lowercaser = languageData.Lowercaser()
 	}
+
 	customWords, customWordsInvalid := ParseCustomWords(lowercaser, request.Form.Get("custom_words"))
 
 	if scoreCalculationInvalid != nil {
@@ -155,6 +157,10 @@ func (handler *V1Handler) postLobby(writer http.ResponseWriter, request *http.Re
 	}
 	if customWordsPerTurnInvalid != nil {
 		requestErrors = append(requestErrors, customWordsPerTurnInvalid.Error())
+	} else {
+		if languageRawValue == "custom" && len(customWords) == 0 {
+			requestErrors = append(requestErrors, "custom words must be provided when using custom language")
+		}
 	}
 	if clientsPerIPLimitInvalid != nil {
 		requestErrors = append(requestErrors, clientsPerIPLimitInvalid.Error())

internal/frontend/index.go

@@ -185,7 +185,8 @@ func (handler *SSRHandler) ssrCreateLobby(writer http.ResponseWriter, request *h
 	}
 
 	scoreCalculation, scoreCalculationInvalid := api.ParseScoreCalculation(request.Form.Get("score_calculation"))
-	languageData, languageKey, languageInvalid := api.ParseLanguage(request.Form.Get("language"))
+	languageRawValue := request.Form.Get("language")
+	languageData, languageKey, languageInvalid := api.ParseLanguage(languageRawValue)
 	drawingTime, drawingTimeInvalid := api.ParseDrawingTime(handler.cfg, request.Form.Get("drawing_time"))
 	rounds, roundsInvalid := api.ParseRounds(handler.cfg, request.Form.Get("rounds"))
 	maxPlayers, maxPlayersInvalid := api.ParseMaxPlayers(handler.cfg, request.Form.Get("max_players"))
@@ -247,6 +248,10 @@ func (handler *SSRHandler) ssrCreateLobby(writer http.ResponseWriter, request *h
 	}
 	if customWordsPerTurnInvalid != nil {
 		pageData.Errors = append(pageData.Errors, customWordsPerTurnInvalid.Error())
+	} else {
+		if languageRawValue == "custom" && len(customWords) == 0 {
+			pageData.Errors = append(pageData.Errors, "custom words must be provided when using custom language")
+		}
 	}
 	if clientsPerIPLimitInvalid != nil {
 		pageData.Errors = append(pageData.Errors, clientsPerIPLimitInvalid.Error())

internal/game/data.go

@@ -36,7 +36,10 @@ type Lobby struct {
 	DrawingTimeNew int
 
 	CustomWords []string
-	words       []string
+	// customWordIndex is used to keep track of the next word to be drawn from
+	// the custom word stack. Only used if exclusive custom word mode is active.
+	customWordIndex int
+	words           []string
 
 	// players references all participants of the Lobby.
 	players []*Player

internal/game/lobby.go

@@ -26,6 +26,7 @@ var SupportedScoreCalculations = []string{
 }
 
 var SupportedLanguages = map[string]string{
+	"custom":     "Custom words only",
 	"english_gb": "English (GB)",
 	"english":    "English (US)",
 	"italian":    "Italian",

internal/game/words.go

@@ -22,6 +22,10 @@ type LanguageData struct {
 var (
 	ErrUnknownWordList = errors.New("wordlist unknown")
 	WordlistData       = map[string]LanguageData{
+		"custom": {
+			LanguageCode: "en_gb",
+			Lowercaser:   func() cases.Caser { return cases.Lower(language.BritishEnglish) },
+		},
 		"english_gb": {
 			LanguageCode: "en_gb",
 			Lowercaser:   func() cases.Caser { return cases.Lower(language.BritishEnglish) },
@@ -142,6 +146,19 @@ func GetRandomWords(wordCount int, lobby *Lobby) []string {
 func getRandomWords(wordCount int, lobby *Lobby, reloadWords func(lobby *Lobby) ([]string, error)) []string {
 	words := make([]string, wordCount)
 
+	// If we have custom words only, we don't want to pop them off the stack.
+	// We want to keep going in circles, worstcase returning the same word 3 times.
+	if lobby.Wordpack == "custom" && len(lobby.CustomWords) > 0 {
+		for i := range wordCount {
+			if lobby.customWordIndex >= len(lobby.CustomWords) {
+				lobby.customWordIndex = 0
+			}
+			words[i] = lobby.CustomWords[lobby.customWordIndex]
+			lobby.customWordIndex++
+		}
+		return words
+	}
+
 	for customWordsLeft, i := lobby.CustomWordsPerTurn, 0; i < wordCount; i++ {
 		if customWordsLeft > 0 && len(lobby.CustomWords) > 0 {
 			customWordsLeft--