fix: troubles with getting server information if the port is specified

Author: Fundi1330

frontend/src/config.ts

@@ -10,6 +10,7 @@ const config = {
         username_occupied: 'Даний юзернейм уже використовується!',
         user_delete_success: 'Ваш акаунт видалено успішно!'
     },
+    defaultServerIcon: 'https://media.minecraftforum.net/attachments/thumbnails/300/619/115/115/636977108000120237.png',
 }
 export default config;
 export type StatusKey = keyof typeof config.MESSAGES; 

frontend/src/pages/Server/Server.tsx

@@ -12,6 +12,7 @@ import { toast } from "sonner";
 import moment from "moment";
 import { RiArrowLeftLine } from "react-icons/ri";
 import { useAuth } from "../../hooks/useAuth";
+import config from "../../config";
 
 const ServerPage = () => {
     const {id} = useParams();
@@ -89,7 +90,7 @@ const ServerPage = () => {
             </div>
             <div className="bg-green-700 p-4 sm:w-2/5 rounded">
                 <div className="flex w-full items-center justify-between">
-                    <img className="h-16 w-16" src={serverInfo.icon} />
+                    <img className="h-16 w-16" src={serverInfo.icon ?? config.defaultServerIcon} />
                     <div className="text-sm sm:text-base whitespace-pre-wrap max-w-52">
                         {serverInfo.motd ? <>
                         <p>{parse(serverInfo.motd.html[0])}</p>
@@ -101,8 +102,8 @@ const ServerPage = () => {
                     <div className="bg-gray-400 rounded p-1">
                         <p>IP адреса:</p>
                         <div className="flex items-center">
-                            <p>{server.formatted_address}</p>
-                            <CopyBtn text={server.formatted_address} />
+                            <p>{serverInfo.debug.srv ? server.address : server.formatted_address}</p>
+                            <CopyBtn text={serverInfo.debug.srv ? server.address : server.formatted_address} />
                         </div>
                     </div>
                     <div className="grid grid-cols-2">

frontend/src/util/getServerStatusInfo.ts

@@ -16,18 +16,24 @@ interface ServerStatusInfoType {
     software: string;
     debug: {
         cachetime: number;
+        srv: boolean;
     };
     address: string;
     port: number;
 }
 
 const getServerStatusInfo = async (address: string, port?: number): Promise<void | ServerStatusInfoType> => {
-    return await apiClient.get<ServerStatusInfoType>(port ? `/${address}:${port}` : `/${address}`, {
+    let info = await apiClient.get<ServerStatusInfoType>(port ? `/${address}:${port}` : `/${address}`, {
         baseURL: 'https://api.mcsrvstat.us/3/',
         withCredentials: false,
-    })
-        .then(resp => resp.data)
-        .catch(err => console.log(err));
+    });
+    if (port && info.data.port != port) {
+        info = await apiClient.get<ServerStatusInfoType>(`/${address}`, {
+            baseURL: 'https://api.mcsrvstat.us/3/',
+            withCredentials: false,
+        });
+    };
+    return info.data;
 }
 
 export default getServerStatusInfo;