From b8754ade41a6596679dac02798da16d1f5e06419 Mon Sep 17 00:00:00 2001 From: Ethan Lane Date: Wed, 17 Jan 2024 18:23:39 +0000 Subject: [PATCH 1/2] Update .env version --- .dev.env | 2 +- .prod.env | 2 +- .stage.env | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.dev.env b/.dev.env index 28da9df..b61d698 100644 --- a/.dev.env +++ b/.dev.env @@ -7,7 +7,7 @@ # any secret values. BOT_TOKEN= -BOT_VER=0.4.0 +BOT_VER=0.5.0 BOT_AUTHOR=Vylpes BOT_OWNERID=147392775707426816 BOT_CLIENTID=682942374040961060 diff --git a/.prod.env b/.prod.env index 79e98fb..a3d5a1e 100644 --- a/.prod.env +++ b/.prod.env @@ -7,7 +7,7 @@ # any secret values. BOT_TOKEN= -BOT_VER=0.4.0 +BOT_VER=0.5.0 BOT_AUTHOR=Vylpes BOT_OWNERID=147392775707426816 BOT_CLIENTID=1093810443589529631 diff --git a/.stage.env b/.stage.env index 8db9eb5..c2f65e6 100644 --- a/.stage.env +++ b/.stage.env @@ -7,7 +7,7 @@ # any secret values. BOT_TOKEN= -BOT_VER=0.4.0 +BOT_VER=0.5.0 BOT_AUTHOR=Vylpes BOT_OWNERID=147392775707426816 BOT_CLIENTID=1147976642942214235 -- 2.43.4 From 6cf5a59074a9511b202fb6f77af333db6ff06b5f Mon Sep 17 00:00:00 2001 From: Ethan Lane Date: Wed, 17 Jan 2024 18:28:45 +0000 Subject: [PATCH 2/2] Update gdrivesync command to fail upon json error --- src/commands/gdrivesync.ts | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/src/commands/gdrivesync.ts b/src/commands/gdrivesync.ts index be36fc1..35cf9cd 100644 --- a/src/commands/gdrivesync.ts +++ b/src/commands/gdrivesync.ts @@ -34,12 +34,18 @@ export default class Gdrivesync extends Command { await interaction.editReply(`Error while running sync command. Safe Mode has been activated. Code: ${error.code}`); await Config.SetValue("safemode", "true"); } else { - await CardMetadataFunction.Execute(); + const result = await CardMetadataFunction.Execute(); - await interaction.editReply("Synced successfully."); + if (result) { + await interaction.editReply("Synced successfully."); - CoreClient.AllowDrops = true; - await Config.SetValue("safemode", "false"); + CoreClient.AllowDrops = true; + await Config.SetValue("safemode", "false"); + } else { + const safemode = await Config.GetValue("safemode"); + + await interaction.editReply(`Sync failed. ${safemode == "true" ? "(Safe Mode is on)": "(Safe Mode is off)"}`); + } } }); } -- 2.43.4