Fixes

Author: breadddevv

.gitignore

@@ -3,6 +3,6 @@
 .env
 src/generated/
 
-src/commands/*.make.ts 
-src/events/*.make.ts 
+src/commands/*.make.ts
+src/events/*.make.ts
 # ^ For commands/events that are being made - not ready for commits

src/commands/booster.ts

@@ -146,7 +146,7 @@ export default new Command({
 
       if (booster.boostCounts == 0) {
         try {
-          removeBoost(booster.userId, interaction.guild.id);
+          await removeBoost(booster.userId, interaction.guild.id);
         } catch (err) {
           logger.error(
             `An error occured while removing ${booster.userId}'s data: ${err}`,
@@ -180,14 +180,18 @@ export default new Command({
         }
       }
 
+      const premiumSince = member?.premiumSince;
+      const isActiveBooster =
+        booster.active && booster.boostCounts > 0 && !!premiumSince;
+
       const embed = new EmbedBuilder()
         .setColor(booster.active ? 0xf47fff : 0x99aab5)
         .setTitle(`Booster Info: ${user.username}`)
         .setThumbnail(avatarUrl)
         .addFields(
           {
             name: "Status",
-            value: booster.active && booster.boostCounts > 0 ? "🟢 Active" : "🔴 Inactive",
+            value: isActiveBooster ? "🟢 Active" : "🔴 Inactive",
             inline: true,
           },
           {
@@ -199,7 +203,9 @@ export default new Command({
           },
           {
             name: "Boosting since",
-            value: `<t:${Math.floor(member!.premiumSince!.getTime() / 1000)}:D>`,
+            value: premiumSince
+              ? `<t:${Math.floor(premiumSince.getTime() / 1000)}:D>`
+              : "Not currently boosting",
             inline: true,
           },
           {
@@ -228,14 +234,17 @@ export default new Command({
         return;
       }
 
-      await registerBoost(
+      const registered = await registerBoost(
         user.id,
         discordGuild.id,
         discordGuild.name,
         discordGuild.iconURL(),
       );
 
-      const updated = await addBoostCount(user.id, discordGuild.id, amount);
+      const updated =
+        amount > 1
+          ? await addBoostCount(user.id, discordGuild.id, amount - 1)
+          : registered;
       if (!updated) {
         await interaction.editReply({
           content: "Failed to update boost count.",

src/libs/loops.ts

@@ -25,24 +25,36 @@ export async function loadLoops() {
 
   for (const file of loopFiles) {
     const filePath = path.join(loops, file);
-    const fileInfo = (await import(pathToFileURL(filePath).href)).default;
-    console.log(file);
+    let fileInfo;
+    try {
+      fileInfo = (await import(pathToFileURL(filePath).href)).default;
+    } catch (err) {
+      logger.error(`Failed to load loop "${file}": ${err}`);
+      continue;
+    }
 
     if (!fileInfo?.runEvery || !fileInfo?.execute) {
       logger.warn(`Skipping ${file} - missing runEvery or execute`);
       continue;
     }
 
     const run = async () => {
+      if (running) return;
+      running = true;
       try {
         await fileInfo.execute();
       } catch (err) {
         logger.error(`Loop "${file}" failed: ${err}`);
+      } finally {
+        running = false;
       }
     };
 
-    run();
-    setInterval(run, fileInfo.runEvery * 1000);
+    let running = false;
+    void run();
+    setInterval(() => {
+      void run();
+    }, fileInfo.runEvery * 1000);
 
     logger.success(`Loaded loop "${file}"`);
   }