Fix the button to allow player to view private games + remove legacy …

…button
Talishar · May 3, 2024 · 488e2ec · 488e2ec
1 parent 9bef915
commit 488e2ec
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 12 deletions.
diff --git a/src/app/ParseGameState.ts b/src/app/ParseGameState.ts
@@ -122,7 +122,7 @@ function ParseEquipment(input: any) {
 
 export default function ParseGameState(input: any) {
   const result: GameState = {
-    gameInfo: { gameID: 0, playerID: 0, authKey: '', isPrivate: false },
+    gameInfo: { gameID: 0, playerID: 0, authKey: '', isPrivateLobby: false },
     gameDynamicInfo: {},
     playerOne: {},
     playerTwo: {},

diff --git a/src/features/GameStaticInfo.ts b/src/features/GameStaticInfo.ts
@@ -2,7 +2,7 @@ export default interface GameStaticInfo {
   gameID: number;
   playerID: number;
   authKey: string;
-  isPrivate: boolean;
+  isPrivateLobby: boolean;
   roguelikeGameID?: number;
   altArts?: AltArt[];
   isRoguelike?: boolean;

diff --git a/src/features/game/GameSlice.ts b/src/features/game/GameSlice.ts
@@ -479,8 +479,8 @@ export const gameSlice = createSlice({
       state.isUpdateInProgress = false;
       state.isPlayerInputInProgress = false;
 
-      state.gameInfo.isPrivate =
-        action.payload.isPrivateLobby ?? state.gameInfo.isPrivate;
+      state.gameInfo.isPrivateLobby =
+        action.payload.isPrivateLobby ?? state.gameInfo.isPrivateLobby;
       state.gameDynamicInfo.lastUpdate = action.payload.lastUpdate;
       state.chatLog = action.payload.gameLog?.split('<br>');
       state.playerTwo.Name = action.payload.theirName;

diff --git a/src/routes/game/components/elements/optionsMenu/OptionsMenu.tsx b/src/routes/game/components/elements/optionsMenu/OptionsMenu.tsx
@@ -18,15 +18,15 @@ import OptionsSettings from './OptionsSettings';
 import { shallowEqual } from 'react-redux';
 
 const OptionsContent = () => {
-  const { gameID, playerID, isPrivate } = useAppSelector(
+  const { gameID, playerID, isPrivateLobby } = useAppSelector(
     getGameInfo,
     shallowEqual
   );
   const dispatch = useAppDispatch();
   const navigate = useNavigate();
   const [allowSpectator, setAllowSpectator] = useState(false);
 
-  const gameURL = `http://fe.talishar.net/game/play/${gameID}`;
+  const gameURL = `http://talishar.net/game/play/${gameID}`;
 
   const clickCloseOptionsHandler = () => {
     dispatch(closeOptionsMenu());
@@ -38,11 +38,11 @@ const OptionsContent = () => {
     dispatch(submitButton({ button: { mode: PROCESS_INPUT.CONCEDE_GAME } }));
   };
 
-  const clickPlayLegacyHandler = async (e: React.MouseEvent) => {
+/*   const clickPlayLegacyHandler = async (e: React.MouseEvent) => {
     e.preventDefault;
     await screenfull.exit();
     window.location.href = `https://legacy.talishar.net/game/NextTurn4.php?gameName=${gameID}&playerID=${playerID}`;
-  };
+  }; */
 
   // going to main menu means you concede the game
   const handleClickMainMenuButton = async (e: React.MouseEvent) => {
@@ -110,9 +110,9 @@ const OptionsContent = () => {
       <div className={styles.column}>
         <h3>Navigation</h3>
         <div className={styles.buttonColumn}>
-          <button className={styles.buttonDiv} onClick={clickPlayLegacyHandler}>
+          {/*<button className={styles.buttonDiv} onClick={clickPlayLegacyHandler}>
             Legacy Talishar Client
-          </button>
+          </button> */}
           <button
             className={styles.buttonDiv}
             onClick={handleClickMainMenuButton}
@@ -164,7 +164,7 @@ const OptionsContent = () => {
         </div>
         <h3>Invite Spectators</h3>
         <div className={styles.buttonColumn}>
-          {isPrivate && allowSpectator ? (
+          {isPrivateLobby && !allowSpectator ? (
             <>
               <button
                 style={{ marginTop: '0.5em' }}
@@ -181,7 +181,7 @@ const OptionsContent = () => {
                 className={styles.buttonDiv}
                 onClick={clickCopySpectateToClipboardHandler}
               >
-                Copy Spectate Link
+                <FaLink />&nbsp;Copy Spectate Link
               </button>
             </>
           )}