Also change the joining logic a bit in case of a failure.

poki · Sep 6, 2023 · e56fd50 · e56fd50
1 parent 7832dec
commit e56fd50
Showing 1 changed file with 4 additions and 5 deletions.
diff --git a/internal/signaling/peer.go b/internal/signaling/peer.go
@@ -380,15 +380,14 @@ func (p *Peer) HandleJoinPacket(ctx context.Context, packet JoinPacket) error {
 		return fmt.Errorf("lobby code too long")
 	}
 
-	p.Lobby = packet.Lobby
-
-	p.store.Subscribe(ctx, p.Game+p.Lobby+p.ID, p.ForwardMessage)
-
-	others, err := p.store.JoinLobby(ctx, p.Game, p.Lobby, p.ID)
+	others, err := p.store.JoinLobby(ctx, p.Game, packet.Lobby, p.ID)
 	if err != nil {
 		return err
 	}
 
+	p.Lobby = packet.Lobby
+	p.store.Subscribe(ctx, p.Game+p.Lobby+p.ID, p.ForwardMessage)
+
 	err = p.Send(ctx, JoinedPacket{
 		RequestID: packet.RequestID,
 		Type:      "joined",