lobby owner now stored as ID

Author: Bios-Marcel

internal/api/v1.go

@@ -354,7 +354,7 @@ func (handler *V1Handler) patchLobby(writer http.ResponseWriter, request *http.R
 	clientsPerIPLimit, clientsPerIPLimitInvalid := ParseClientsPerIPLimit(handler.cfg, request.Form.Get("clients_per_ip_limit"))
 	publicLobby, publicLobbyInvalid := ParseBoolean("public", request.Form.Get("public"))
 
-	owner := lobby.Owner
+	owner := lobby.GetOwner()
 	if owner == nil || owner.GetUserSession() != userSession {
 		http.Error(writer, "only the lobby owner can edit the lobby", http.StatusForbidden)
 		return

internal/game/data.go

@@ -37,9 +37,9 @@ type Lobby struct {
 
 	// Whether the game has started, is ongoing or already over.
 	State State
-	// Owner references the Player that currently owns the lobby.
+	// OwnerID references the Player that currently owns the lobby.
 	// Meaning this player has rights to restart or change certain settings.
-	Owner *Player
+	OwnerID uuid.UUID
 	// ScoreCalculation decides how scores for both guessers and drawers are
 	// determined.
 	ScoreCalculation ScoreCalculation
@@ -149,6 +149,10 @@ func (lobby *Lobby) GetPlayer(userSession uuid.UUID) *Player {
 	return nil
 }
 
+func (lobby *Lobby) GetOwner() *Player {
+	return lobby.GetPlayer(lobby.OwnerID)
+}
+
 func (lobby *Lobby) ClearDrawing() {
 	lobby.currentDrawing = make([]any, 0)
 	lobby.connectedDrawEventsIndexStack = nil

internal/game/lobby.go

@@ -178,7 +178,7 @@ func (lobby *Lobby) HandleEvent(eventType string, payload []byte, player *Player
 	} else if eventType == EventTypeToggleReadiness {
 		lobby.handleToggleReadinessEvent(player)
 	} else if eventType == EventTypeStart {
-		if lobby.State != Ongoing && player == lobby.Owner {
+		if lobby.State != Ongoing && player.ID == lobby.OwnerID {
 			lobby.startGame()
 		}
 	} else if eventType == EventTypeNameChange {
@@ -429,7 +429,7 @@ func handleKickVoteEvent(lobby *Lobby, player *Player, toKickID uuid.UUID) {
 		}
 	}
 
-	votesRequired := calculateVotesNeededToKick(playerToKick, lobby)
+	votesRequired := calculateVotesNeededToKick(lobby)
 
 	// We send the kick event to all players, since it was a valid vote.
 	lobby.Broadcast(&Event{
@@ -464,11 +464,11 @@ func kickPlayer(lobby *Lobby, playerToKick *Player, playerToKickIndex int) {
 	}
 
 	// If the owner is kicked, we choose the next best person as the owner.
-	if lobby.Owner == playerToKick {
+	if lobby.OwnerID == playerToKick.ID {
 		for _, otherPlayer := range lobby.players {
 			potentialOwner := otherPlayer
 			if potentialOwner.Connected {
-				lobby.Owner = potentialOwner
+				lobby.OwnerID = potentialOwner.ID
 				lobby.Broadcast(&Event{
 					Type: EventTypeOwnerChange,
 					Data: &OwnerChangeEvent{
@@ -517,7 +517,7 @@ func (lobby *Lobby) Drawer() *Player {
 	return nil
 }
 
-func calculateVotesNeededToKick(playerToKick *Player, lobby *Lobby) int {
+func calculateVotesNeededToKick(lobby *Lobby) int {
 	connectedPlayerCount := lobby.GetConnectedPlayerCount()
 
 	// If there are only two players, e.g. none of them should be able to
@@ -971,7 +971,7 @@ func CreateLobby(
 	}
 
 	player := lobby.JoinPlayer(playerName)
-	lobby.Owner = player
+	lobby.OwnerID = player.ID
 
 	return player, lobby, nil
 }
@@ -990,7 +990,7 @@ func generateReadyData(lobby *Lobby, player *Player) *ReadyEvent {
 		PlayerName:   player.Name,
 
 		GameState:          lobby.State,
-		OwnerID:            lobby.Owner.ID,
+		OwnerID:            lobby.OwnerID,
 		Round:              lobby.Round,
 		Rounds:             lobby.Rounds,
 		DrawingTimeSetting: lobby.DrawingTime,

internal/game/lobby_test.go

@@ -17,7 +17,7 @@ import (
 func createLobbyWithDemoPlayers(playercount int) *Lobby {
 	owner := &Player{}
 	lobby := &Lobby{
-		Owner: owner,
+		OwnerID: owner.ID,
 	}
 	for range playercount {
 		lobby.players = append(lobby.players, &Player{
@@ -65,7 +65,7 @@ func Test_CalculateVotesNeededToKick(t *testing.T) {
 
 	for playerCount, expctedRequiredVotes := range expectedResults {
 		lobby := createLobbyWithDemoPlayers(playerCount)
-		result := calculateVotesNeededToKick(nil, lobby)
+		result := calculateVotesNeededToKick(lobby)
 		if result != expctedRequiredVotes {
 			t.Errorf("Error. Necessary vote amount was %d, but should've been %d", result, expctedRequiredVotes)
 		}
@@ -277,7 +277,7 @@ func Test_wordSelectionEvent(t *testing.T) {
 
 	drawer := lobby.JoinPlayer("Drawer")
 	drawer.Connected = true
-	lobby.Owner = drawer
+	lobby.OwnerID = drawer.ID
 
 	if err := lobby.HandleEvent(EventTypeStart, nil, drawer); err != nil {
 		t.Errorf("Couldn't start lobby: %s", err)
@@ -343,7 +343,7 @@ func Test_kickDrawer(t *testing.T) {
 
 	marcel := lobby.JoinPlayer("marcel")
 	marcel.Connected = true
-	lobby.Owner = marcel
+	lobby.OwnerID = marcel.ID
 
 	kevin := lobby.JoinPlayer("kevin")
 	kevin.Connected = true