From 275a804e28c4ab04db33fa6c00ca352f3aa34154 Mon Sep 17 00:00:00 2001 From: Ethan Lane Date: Fri, 19 Jan 2024 18:05:46 +0000 Subject: [PATCH] Update gdrivesync command to error if JSON parsing fails (#143) # Description Please include a summary of the change and which issue is fixed. Please also include relevant motivation and context. List any dependencies that are required for this change. - Update the gdrivesync command so if the JSON parse function fails, it returns an error message #134 ## Type of change Please delete options that are not relevant. - [x] New feature (non-breaking change which adds functionality) # How Has This Been Tested? Please describe the tests that you ran to verify the changes. Provide instructions so we can reproduce. Please also list any relevant details to your test configuration. # Checklist - [ ] My code follows the style guidelines of this project - [ ] I have performed a self-review of my own code - [ ] I have commented my code, particularly in hard-to-understand areas - [ ] I have made corresponding changes to the documentation - [ ] My changes generate no new warnings - [ ] I have added tests that provde my fix is effective or that my feature works - [ ] New and existing unit tests pass locally with my changes - [ ] Any dependent changes have been merged and published in downstream modules Reviewed-on: https://gitea.vylpes.xyz/External/card-drop/pulls/143 Reviewed-by: VylpesTester Co-authored-by: Ethan Lane Co-committed-by: Ethan Lane --- .dev.env | 2 +- .prod.env | 2 +- .stage.env | 2 +- src/commands/gdrivesync.ts | 14 ++++++++++---- 4 files changed, 13 insertions(+), 7 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 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)"}`); + } } }); }