prettier

Author: ryanbarlow97

src/client/Main.ts

@@ -45,6 +45,7 @@ import {
   SendKickPlayerIntentEvent,
   SendUpdateGameConfigIntentEvent,
 } from "./Transport";
+import { TurnstileManager } from "./TurnstileManager";
 import { UserSettingModal } from "./UserSettingModal";
 import "./UsernameInput";
 import { UsernameInput } from "./UsernameInput";
@@ -54,7 +55,6 @@ import {
   isInIframe,
   translateText,
 } from "./Utils";
-import { TurnstileManager } from "./TurnstileManager";
 import "./components/DesktopNavBar";
 import "./components/Footer";
 import "./components/MainLayout";
@@ -234,6 +234,7 @@ class Client {
   private matchmakingModal: MatchmakingModal;
 
   private gutterAds: GutterAds;
+  private isJoiningLobby = false;
 
   private turnstileManager: TurnstileManager;
   private serverConfigPrefetch: Promise<
@@ -697,6 +698,9 @@ class Client {
   }
 
   private handleUrl() {
+    if (this.isJoiningLobby) {
+      return;
+    }
     // Check if CrazyGames SDK is enabled first (no hash needed in CrazyGames)
     if (crazyGamesSDK.isOnCrazyGames()) {
       const lobbyId = crazyGamesSDK.getInviteGameId();
@@ -802,13 +806,15 @@ class Client {
   private async handleJoinLobby(event: CustomEvent<JoinLobbyEvent>) {
     const lobby = event.detail;
     const joinAttemptId = ++this.joinAttemptId;
+    this.isJoiningLobby = true;
     console.log(`joining lobby ${lobby.gameID}`);
     if (this.gameStop !== null) {
       console.log("joining lobby, stopping existing game");
       this.gameStop(true);
       document.body.classList.remove("in-game");
     }
     if (lobby.source === "public") {
+      this.joinModal?.close();
       this.joinPublicModal?.open(lobby.gameID, lobby.publicLobbyInfo);
     }
     const configPromise = this.getServerConfigPrefetched();
@@ -907,6 +913,7 @@ class Client {
         this.gutterAds.hide();
       },
       () => {
+        this.isJoiningLobby = false;
         this.joinModal.close();
         this.joinPublicModal?.closeWithoutLeaving();
         this.publicLobby.stop();
@@ -950,6 +957,7 @@ class Client {
 
   private async handleLeaveLobby(/* event: CustomEvent */) {
     this.joinAttemptId++;
+    this.isJoiningLobby = false;
     if (this.gameStop === null) {
       try {
         history.replaceState(null, "", "/");

src/client/TurnstileManager.ts

@@ -52,9 +52,7 @@ export class TurnstileManager {
     }
   }
 
-  async getTokenForJoin(
-    gameStartInfo?: GameStartInfo,
-  ): Promise<string | null> {
+  async getTokenForJoin(gameStartInfo?: GameStartInfo): Promise<string | null> {
     const config = await this.getServerConfig();
     if (
       config.env() === GameEnv.Dev ||