From 824f9357eeaff0717cab830f5c7fc1836df9a5c0 Mon Sep 17 00:00:00 2001 From: Leonid Pospelov Date: Tue, 3 Sep 2024 02:30:56 +0500 Subject: [PATCH] feat: update default api domain (#2152) --- cmake/scripts/generate_client_settings.cmake | 2 +- cmake/scripts/generate_server_settings.cmake | 2 +- skymp5-client/src/services/services/authService.ts | 2 +- skymp5-server/ts/settings.ts | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cmake/scripts/generate_client_settings.cmake b/cmake/scripts/generate_client_settings.cmake index b401c7369a..5306c4734d 100644 --- a/cmake/scripts/generate_client_settings.cmake +++ b/cmake/scripts/generate_client_settings.cmake @@ -23,7 +23,7 @@ if(OFFLINE_MODE) string(JSON CLIENT_SETTINGS_JSON SET "${CLIENT_SETTINGS_JSON}" "server-master-key" "null") else() string(JSON CLIENT_SETTINGS_JSON REMOVE "${CLIENT_SETTINGS_JSON}" "gameData") - string(JSON CLIENT_SETTINGS_JSON SET "${CLIENT_SETTINGS_JSON}" "master" "\"https://sweetpie.nic11.xyz\"") + string(JSON CLIENT_SETTINGS_JSON SET "${CLIENT_SETTINGS_JSON}" "master" "\"https://gateway.skymp.net\"") # if ip in config is 127.0.0.1 string(JSON server_ip ERROR_VARIABLE dummy GET "${CLIENT_SETTINGS_JSON}" "server-ip") diff --git a/cmake/scripts/generate_server_settings.cmake b/cmake/scripts/generate_server_settings.cmake index 23a5f6d4d3..6ab8d3ed3c 100644 --- a/cmake/scripts/generate_server_settings.cmake +++ b/cmake/scripts/generate_server_settings.cmake @@ -23,7 +23,7 @@ if(OFFLINE_MODE) string(JSON SERVER_SETTINGS_JSON SET "${SERVER_SETTINGS_JSON}" "master" "\"\"") else() string(JSON SERVER_SETTINGS_JSON SET "${SERVER_SETTINGS_JSON}" "offlineMode" "false") - string(JSON SERVER_SETTINGS_JSON SET "${SERVER_SETTINGS_JSON}" "master" "\"https://sweetpie.nic11.xyz\"") + string(JSON SERVER_SETTINGS_JSON SET "${SERVER_SETTINGS_JSON}" "master" "\"https://gateway.skymp.net\"") file(DOWNLOAD "https://api.ipify.org" "${CMAKE_CURRENT_BINARY_DIR}/ip.txt") file(READ "${CMAKE_CURRENT_BINARY_DIR}/ip.txt" ip) string(JSON SERVER_SETTINGS_JSON SET "${SERVER_SETTINGS_JSON}" "ip" "\"${ip}\"") diff --git a/skymp5-client/src/services/services/authService.ts b/skymp5-client/src/services/services/authService.ts index 8dc5fb5a62..e7ad24db1d 100644 --- a/skymp5-client/src/services/services/authService.ts +++ b/skymp5-client/src/services/services/authService.ts @@ -357,7 +357,7 @@ export class AuthService extends ClientListener { }; private getMasterUrl() { - return this.normalizeUrl((this.sp.settings["skymp5-client"]["master"] as string) || "https://sweetpie.nic11.xyz"); + return this.normalizeUrl((this.sp.settings["skymp5-client"]["master"] as string) || "https://gateway.skymp.net"); } private normalizeUrl(url: string) { diff --git a/skymp5-server/ts/settings.ts b/skymp5-server/ts/settings.ts index 3bfc1d6f77..3cbaa660ed 100644 --- a/skymp5-server/ts/settings.ts +++ b/skymp5-server/ts/settings.ts @@ -16,7 +16,7 @@ export class Settings { ip: string | null = null; port = 7777; maxPlayers = 100; - master: string = "https://sweetpie.nic11.xyz"; + master: string = "https://gateway.skymp.net"; name = 'Yet Another Server'; gamemodePath = '...'; loadOrder = new Array();