diff --git a/config/general.json b/config/general.json index b45ca8f..4905aa3 100644 --- a/config/general.json +++ b/config/general.json @@ -5,7 +5,7 @@ "version":"open-ticket-v4.0.0" }, - "token":"your bot token here! Or leave empty when you use tokenFromENV", + "token":"your bot token here! (or leave empty when using 'tokenFromENV')", "tokenFromENV":false, "mainColor":"#f8ba00", diff --git a/src/data/framework/checkerLoader.ts b/src/data/framework/checkerLoader.ts index 8d7f271..70603a3 100644 --- a/src/data/framework/checkerLoader.ts +++ b/src/data/framework/checkerLoader.ts @@ -169,6 +169,12 @@ const createPanelEmbedStructure = (id:api.ODValidId) => { ]})}) } +function loadFromEnv(){ + const generalConfig = openticket.configs.get("openticket:general") + if (generalConfig.data && generalConfig.data.tokenFromENV && typeof generalConfig.data.tokenFromENV == "boolean") return generalConfig.data.tokenFromENV + else return false +} + //STRUCTURES export const defaultGeneralStructure = new api.ODCheckerObjectStructure("openticket:general",{children:[ //STATUS @@ -187,7 +193,7 @@ export const defaultGeneralStructure = new api.ODCheckerObjectStructure("opentic ]})}, //BASIC - {key:"token",optional:false,priority:0,checker:new api.ODCheckerCustomStructure_DiscordToken("openticket:token")}, + {key:"token",optional:false,priority:0,checker:(loadFromEnv()) ? new api.ODCheckerStringStructure("openticket:token-disabled",{}) : new api.ODCheckerCustomStructure_DiscordToken("openticket:token")}, {key:"tokenFromENV",optional:false,priority:0,checker:new api.ODCheckerBooleanStructure("openticket:token-env",{})}, {key:"mainColor",optional:false,priority:0,checker:new api.ODCheckerCustomStructure_HexColor("openticket:main-color",true,false)}, {key:"language",optional:false,priority:0,checker:new api.ODCheckerStringStructure("openticket:language",{