Skip to content

Commit

Permalink
feat: update default api domain (skyrim-multiplayer#2152)
Browse files Browse the repository at this point in the history
  • Loading branch information
Pospelove authored Sep 2, 2024
1 parent ceb2b7f commit 824f935
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion cmake/scripts/generate_client_settings.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
2 changes: 1 addition & 1 deletion cmake/scripts/generate_server_settings.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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}\"")
Expand Down
2 changes: 1 addition & 1 deletion skymp5-client/src/services/services/authService.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion skymp5-server/ts/settings.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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<string>();
Expand Down

0 comments on commit 824f935

Please sign in to comment.