Fix in-game connect flow for selected servers

Author: Trysha-rbrn

src/containers/MainBody/ServerList/Item.tsx

@@ -7,7 +7,9 @@ import { images } from "../../../constants/images";
 import { useDraggableItem } from "../../../hooks/draggable";
 import { useContextMenu } from "../../../states/contextMenu";
 import { useJoinServerPrompt } from "../../../states/joinServerPrompt";
+import { useSettings } from "../../../states/settings";
 import { useTheme } from "../../../states/theme";
+import { startGame } from "../../../utils/game";
 import { PING_TIMEOUT_VALUE } from "../../../utils/query";
 import { sc } from "../../../utils/sizeScaler";
 import { Server } from "../../../utils/types";
@@ -27,13 +29,19 @@ const ServerItem = memo((props: IProps) => {
   const lastPressTime = useRef(0);
   const { showPrompt, setServer } = useJoinServerPrompt();
   const { show: showContextMenu } = useContextMenu();
+  const { nickName, gtasaPath } = useSettings();
 
   const { attributes, listeners, setNodeRef, isDragging, style } =
     useDraggableItem(`${server.ip}:${server.port}`, isDraggable);
 
   const onDoublePress = () => {
-    setServer(server);
-    showPrompt(true);
+    if (server.hasPassword) {
+      setServer(server);
+      showPrompt(true);
+      return;
+    }
+
+    startGame(server, nickName, gtasaPath, "");
   };
 
   const onPress = () => {

src/containers/MainBody/ServerList/SearchBar.tsx

@@ -17,7 +17,9 @@ import {
 } from "../../../states/genericStates";
 import { useJoinServerPrompt } from "../../../states/joinServerPrompt";
 import { usePersistentServers, useServers } from "../../../states/servers";
+import { useSettings } from "../../../states/settings";
 import { useTheme } from "../../../states/theme";
+import { startGame } from "../../../utils/game";
 import { sc } from "../../../utils/sizeScaler";
 import { Log } from "../../../utils/logger";
 
@@ -74,6 +76,7 @@ const SearchBar = memo<SearchBarProps>(({ onChange }) => {
   const { filterMenu, showFilterMenu, searchData } = useGenericTempState();
   const { sideLists, showSideLists } = useGenericPersistentState();
   const { selected } = useServers();
+  const { nickName, gtasaPath } = useSettings();
   const {
     favorites,
     removeFromFavorites,
@@ -112,12 +115,17 @@ const SearchBar = memo<SearchBarProps>(({ onChange }) => {
     if (!selected) return;
 
     try {
-      setServer(selected);
-      showPrompt(true);
+      if (selected.hasPassword) {
+        setServer(selected);
+        showPrompt(true);
+        return;
+      }
+
+      startGame(selected, nickName, gtasaPath, "");
     } catch (error) {
       Log.error("Error playing selected server:", error);
     }
-  }, [selected, setServer, showPrompt]);
+  }, [selected, setServer, showPrompt, nickName, gtasaPath]);
 
   const toggleFavorite = useCallback(() => {
     if (!selected) return;

src/utils/game.ts

@@ -74,13 +74,14 @@ export const startGame = async (
   const { setSelected } = useServers.getState();
 
   if (IN_GAME) {
+    const resolvedIp = await getIpAddress(server.ip);
+    const message = password.length
+      ? `connect:${resolvedIp}:${server.port}:${nickname}:${password}`
+      : `connect:${resolvedIp}:${server.port}:${nickname}`;
+
     invoke("send_message_to_game", {
       id: IN_GAME_PROCESS_ID,
-      message: password.length
-        ? `connect:${await getIpAddress(server.ip)}:${
-            server.port
-          }:${nickname}:${password}`
-        : `connect:${await getIpAddress(server.ip)}:${server.port}:${nickname}`,
+      message,
     });
     return;
   }