diff --git a/.dev.env b/.dev.env index 26a975e..02c46a1 100644 --- a/.dev.env +++ b/.dev.env @@ -7,7 +7,7 @@ # any secret values. BOT_TOKEN= -BOT_VER=0.2.1 DEV +BOT_VER=0.2 DEV BOT_AUTHOR=Vylpes BOT_OWNERID=147392775707426816 BOT_CLIENTID=682942374040961060 diff --git a/.prod.env b/.prod.env index f2356de..1f338a2 100644 --- a/.prod.env +++ b/.prod.env @@ -7,7 +7,7 @@ # any secret values. BOT_TOKEN= -BOT_VER=0.2.1 +BOT_VER=0.2 BOT_AUTHOR=Vylpes BOT_OWNERID=147392775707426816 BOT_CLIENTID=1093810443589529631 diff --git a/.stage.env b/.stage.env index ab0babf..0a63651 100644 --- a/.stage.env +++ b/.stage.env @@ -7,7 +7,7 @@ # any secret values. BOT_TOKEN= -BOT_VER=0.2.1 BETA +BOT_VER=0.2 BETA BOT_AUTHOR=Vylpes BOT_OWNERID=147392775707426816 BOT_CLIENTID=1147976642942214235 diff --git a/src/Functions/CardSetupFunction.ts b/src/Functions/CardSetupFunction.ts index ea8c2c6..037b87b 100644 --- a/src/Functions/CardSetupFunction.ts +++ b/src/Functions/CardSetupFunction.ts @@ -7,8 +7,8 @@ import { CardRarity, CardRarityToString } from "../constants/CardRarity"; import Config from "../database/entities/app/Config"; export default class CardSetupFunction { - public static async Execute(): Promise { - if (await Config.GetValue('safemode') == "true") return false; + public static async Execute() { + if (await Config.GetValue('safemode') == "true") return; try { await this.ClearDatabase(); @@ -16,10 +16,7 @@ export default class CardSetupFunction { await this.ReadCards(); } catch { await Config.SetValue('safemode', 'true'); - return false; } - - return true; } private static async ClearDatabase() { diff --git a/src/commands/resync.ts b/src/commands/resync.ts deleted file mode 100644 index a3ea823..0000000 --- a/src/commands/resync.ts +++ /dev/null @@ -1,38 +0,0 @@ -import { CacheType, CommandInteraction, PermissionsBitField, SlashCommandBuilder } from "discord.js"; -import { Command } from "../type/command"; -import CardSetupFunction from "../Functions/CardSetupFunction"; -import Config from "../database/entities/app/Config"; - -export default class Resync extends Command { - constructor() { - super(); - - super.CommandBuilder = new SlashCommandBuilder() - .setName('resync') - .setDescription('Resync the card database') - .setDefaultMemberPermissions(PermissionsBitField.Flags.Administrator); - } - - public override async execute(interaction: CommandInteraction) { - if (!interaction.isChatInputCommand()) return; - - const whitelistedUsers = process.env.GDRIVESYNC_WHITELIST!.split(','); - - if (!whitelistedUsers.find(x => x == interaction.user.id)) { - await interaction.reply("Only whitelisted users can use this command."); - return; - } - - if (await CardSetupFunction.Execute()) { - if (await Config.GetValue('safemode') == "true") { - await Config.SetValue('safemode', 'false'); - await interaction.reply("Resynced database and disabled safe mode."); - - return; - } - await interaction.reply("Resynced database."); - } else { - await interaction.reply("Resync failed, safe mode has been activated until successful resync."); - } - } -} \ No newline at end of file diff --git a/src/registry.ts b/src/registry.ts index e602198..9619437 100644 --- a/src/registry.ts +++ b/src/registry.ts @@ -4,7 +4,6 @@ import { CoreClient } from "./client/client"; import About from "./commands/about"; import Drop from "./commands/drop"; import Gdrivesync from "./commands/gdrivesync"; -import Resync from "./commands/resync"; // Test Command Imports import Dropnumber from "./commands/stage/dropnumber"; @@ -21,7 +20,6 @@ export default class Registry { CoreClient.RegisterCommand('about', new About()); CoreClient.RegisterCommand('drop', new Drop()); CoreClient.RegisterCommand('gdrivesync', new Gdrivesync()); - CoreClient.RegisterCommand('resync', new Resync()); // Test Commands CoreClient.RegisterCommand('dropnumber', new Dropnumber(), Environment.Test);