diff --git a/src/config.ts b/src/config.ts index 63c482ff..d9ef6d57 100644 --- a/src/config.ts +++ b/src/config.ts @@ -1,3 +1,5 @@ +import * as CompileConfig from "../config.json"; + interface SBConfig { userID: string, sponsorTimes: SBMap, @@ -20,7 +22,7 @@ interface SBConfig { invidiousUpdateInfoShowCount: number, autoUpvote: boolean, supportInvidious: false, - customServerAddress: string, + serverAddress: string, minDuration: number } @@ -114,7 +116,7 @@ var Config: SBObject = { invidiousUpdateInfoShowCount: 0, autoUpvote: true, supportInvidious: false, - customServerAddress: null, + serverAddress: CompileConfig.serverAddress, minDuration: 0 }, localConfig: null, diff --git a/src/options.ts b/src/options.ts index 8d96f4f0..06528a02 100644 --- a/src/options.ts +++ b/src/options.ts @@ -1,5 +1,4 @@ import Config from "./config"; -import * as CompileConfig from "../config.json"; import Utils from "./utils"; var utils = new Utils(); @@ -73,11 +72,6 @@ async function init() { let saveButton = optionsElements[i].querySelector(".option-button"); stringInput.value = Config.config[stringChangeOption]; - // Devs can use config.json to set server address - if (stringChangeOption === "customServerAddress") { - stringInput.value = (Config.config.customServerAddress) ? Config.config.customServerAddress : CompileConfig.serverAddress; - } - saveButton.addEventListener("click", () => { setStringConfigOption(stringInput.value, stringChangeOption); diff --git a/src/utils.ts b/src/utils.ts index 29240dd0..b4d4e639 100644 --- a/src/utils.ts +++ b/src/utils.ts @@ -1,4 +1,3 @@ -import * as CompileConfig from "../config.json"; import Config from "./config"; class Utils { @@ -240,9 +239,7 @@ class Utils { sendRequestToServer(type: string, address: string, callback?: (xmlhttp: XMLHttpRequest, err: boolean) => any) { let xmlhttp = new XMLHttpRequest(); - let serverAddress = (Config.config.customServerAddress) ? Config.config.customServerAddress : CompileConfig.serverAddress; - - xmlhttp.open(type, serverAddress + address, true); + xmlhttp.open(type, Config.config.serverAddress + address, true); if (callback != undefined) { xmlhttp.onreadystatechange = function () {