Fix editing lobby settings

Author: Bios-Marcel

internal/api/v1.go

@@ -544,7 +544,7 @@ func GetPlayer(lobby *game.Lobby, request *http.Request) *game.Player {
 		return nil
 	}
 
-	return lobby.GetPlayer(userSession)
+	return lobby.GetPlayerBySession(userSession)
 }
 
 // GetPlayername either retrieves the playername from a cookie, the URL form.

internal/api/ws.go

@@ -61,7 +61,7 @@ func (handler *V1Handler) websocketUpgrade(writer http.ResponseWriter, request *
 	}
 
 	lobby.Synchronized(func() {
-		player := lobby.GetPlayer(userSession)
+		player := lobby.GetPlayerBySession(userSession)
 		if player == nil {
 			http.Error(writer, "you don't have access to this lobby;usersession unknown", http.StatusUnauthorized)
 			return

internal/game/data.go

@@ -164,8 +164,17 @@ const (
 	Spectating PlayerState = "spectating"
 )
 
-// GetPlayer searches for a player, identifying them by usersession.
-func (lobby *Lobby) GetPlayer(userSession uuid.UUID) *Player {
+func (lobby *Lobby) GetPlayerByID(id uuid.UUID) *Player {
+	for _, player := range lobby.Players {
+		if player.ID == player.ID {
+			return player
+		}
+	}
+
+	return nil
+}
+
+func (lobby *Lobby) GetPlayerBySession(userSession uuid.UUID) *Player {
 	for index, uuid := range lobby.UserSessions {
 		if uuid == userSession {
 			return lobby.Players[index]
@@ -175,7 +184,7 @@ func (lobby *Lobby) GetPlayer(userSession uuid.UUID) *Player {
 }
 
 func (lobby *Lobby) GetOwner() *Player {
-	return lobby.GetPlayer(lobby.OwnerID)
+	return lobby.GetPlayerByID(lobby.OwnerID)
 }
 
 func (lobby *Lobby) ClearDrawing() {