From 3d36346a4e5a23713d5cab4b148a23351f2db80c Mon Sep 17 00:00:00 2001 From: The-Foxon Date: Wed, 28 Jun 2023 04:30:39 +1200 Subject: [PATCH] fix --- .env.prod | 1 + src/controller/ConfigManager.ts | 7 ++----- src/updateCommands.ts | 7 ++++++- storage/config.json | 2 +- 4 files changed, 10 insertions(+), 7 deletions(-) diff --git a/.env.prod b/.env.prod index 6961289..0ab6c31 100644 --- a/.env.prod +++ b/.env.prod @@ -1,5 +1,6 @@ DISCORD_TOKEN='' CLIENT_ID= +GUILD_ID= ECO_API_BASE='https://eco.kamgames.xyz' ECO_API_KEY= STORAGE=/app/storage \ No newline at end of file diff --git a/src/controller/ConfigManager.ts b/src/controller/ConfigManager.ts index cf5dc08..d0d4c32 100644 --- a/src/controller/ConfigManager.ts +++ b/src/controller/ConfigManager.ts @@ -4,7 +4,6 @@ import UserI from "../types/UserI"; export default class ConfigManager { configPath = path.join(process.env.STORAGE || "/app/storage", "config.json") - public guildId: string | null | undefined = null public userManager: { users: UserI[]; discord: String[]; @@ -20,18 +19,16 @@ export default class ConfigManager { setInterval(() => this.save(), 10000) } save() { - const r = { userManager: this.userManager, guildId: this.guildId } + const r = { userManager: this.userManager } fs.writeFileSync(this.configPath, JSON.stringify(r)) } load() { - const r = { userManager: this.userManager, guildId: this.guildId } + const r = { userManager: this.userManager } if (!fs.existsSync(this.configPath)) { fs.writeFileSync(this.configPath, JSON.stringify(r)) } try { const t: ConfigManager = JSON.parse(String(fs.readFileSync(this.configPath))) - if (!!t?.guildId) - this.guildId = t.guildId if (!!t?.userManager) this.userManager = { ...this.userManager, ...t.userManager } } catch (error) { diff --git a/src/updateCommands.ts b/src/updateCommands.ts index 970dca5..a1f6c8f 100644 --- a/src/updateCommands.ts +++ b/src/updateCommands.ts @@ -19,8 +19,13 @@ export default function updateCommands(config: ConfigManager) { try { console.log(`Started refreshing ${commands.length} application (/) commands.`); - const data: any = await rest.put( + await rest.put( Routes.applicationCommands(String(process.env.CLIENT_ID)), + { body: [] }, + ); + + const data: any = await rest.put( + Routes.applicationGuildCommands(String(process.env.CLIENT_ID), String(process.env.GUILD_ID)), { body: commands }, ); diff --git a/storage/config.json b/storage/config.json index eb39db5..aafa801 100644 --- a/storage/config.json +++ b/storage/config.json @@ -1 +1 @@ -{"userManager":{"users":[{"Name":"The Foxon","SlgId":"slg228303","SteamId":"76561198815942994"},{"Name":"New Horizon","SlgId":"1f4c47eb-36d2-40cd-950e-cbca060172bd","SteamId":"1f4c47eb-36d2-40cd-950e-cbca060172bd"},{"Name":"Admin","SlgId":"d6a49268-230a-4e9a-92a7-da38db78f006","SteamId":"d6a49268-230a-4e9a-92a7-da38db78f006"},{"Name":"xxx","SlgId":"bf3b78db-d298-47e3-b695-fa5e7e1398a1","SteamId":"bf3b78db-d298-47e3-b695-fa5e7e1398a1"}],"discord":[],"authCodes":[]},"guildId":"759631786434232300"} \ No newline at end of file +{"userManager":{"users":[{"Name":"The Foxon","SlgId":"slg228303","SteamId":"76561198815942994"},{"Name":"New Horizon","SlgId":"1f4c47eb-36d2-40cd-950e-cbca060172bd","SteamId":"1f4c47eb-36d2-40cd-950e-cbca060172bd"},{"Name":"Admin","SlgId":"d6a49268-230a-4e9a-92a7-da38db78f006","SteamId":"d6a49268-230a-4e9a-92a7-da38db78f006"},{"Name":"xxx","SlgId":"bf3b78db-d298-47e3-b695-fa5e7e1398a1","SteamId":"bf3b78db-d298-47e3-b695-fa5e7e1398a1"}],"discord":[],"authCodes":[]}} \ No newline at end of file