diff --git a/server/src/game/game.go b/server/src/game/game.go index fe377f0..11a6d1c 100644 --- a/server/src/game/game.go +++ b/server/src/game/game.go @@ -4,10 +4,11 @@ import ( "encoding/json" "fmt" "os" + "time" + "sirlab.de/go/knowyt/engine" "sirlab.de/go/knowyt/fileutil" "sirlab.de/go/knowyt/quote" - "time" ) func NewGameFromFile(id, fileName string) (*Game, error) { @@ -18,7 +19,7 @@ func NewGameFromFile(id, fileName string) (*Game, error) { var gmJson GameJson if err := json.Unmarshal(jsonBytes, &gmJson); err != nil { - return nil, fmt.Errorf("%s: %v\n", fileName, err) + return nil, fmt.Errorf("%s: %v", fileName, err) } else { lang := gmJson.Lang if lang == "" { diff --git a/server/src/game/getGameInfo.go b/server/src/game/getGameInfo.go index dcd6d76..5d5ac10 100644 --- a/server/src/game/getGameInfo.go +++ b/server/src/game/getGameInfo.go @@ -3,7 +3,7 @@ package game func (gm *Game) GetGameInfo() *GameInfoJson { gameInfo := gm.initGameInfoJson() - for i, _ := range gameInfo.Players { + for i := range gameInfo.Players { quotes := gm.getQuotesInfoByUserId(gameInfo.Players[i].Id) gameInfo.Players[i].NumberOfQuotes = len(quotes) } diff --git a/server/src/game/getPlayer.go b/server/src/game/getPlayer.go index fb13e85..e15bcb3 100644 --- a/server/src/game/getPlayer.go +++ b/server/src/game/getPlayer.go @@ -13,5 +13,5 @@ func (gm *Game) getPlayerById(id string) (*playerInfo, error) { return &plInfo, nil } - return nil, fmt.Errorf("player id \"%s\" not found in game\n", id) + return nil, fmt.Errorf("player id \"%s\" not found in game", id) } diff --git a/server/src/game/getQuote.go b/server/src/game/getQuote.go index 4297d64..bea0be3 100644 --- a/server/src/game/getQuote.go +++ b/server/src/game/getQuote.go @@ -2,6 +2,7 @@ package game import ( "fmt" + "sirlab.de/go/knowyt/quote" ) @@ -11,7 +12,7 @@ func (gm *Game) getQuoteById(id string) (*quote.Quote, error) { quote := gm.quotes[id] if quote == nil { - return nil, fmt.Errorf("quote id \"%s\" not found in game\n", id) + return nil, fmt.Errorf("quote id \"%s\" not found in game", id) } return quote, nil