Pagination, factoids: Hotfix and semantics correction

r-Techsupport · Aug 13, 2023 · 47d95cd · 47d95cd
1 parent aad7f52
commit 47d95cd
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/src/core/pagination.ts b/src/core/pagination.ts
@@ -16,6 +16,7 @@ import * as util from '../core/util.js';
 
 let currentPage = 1;
 let stoppedManually = false;
+let deletedManually = false;
 
 const prevButton: ButtonBuilder = new ButtonBuilder()
   .setCustomId('prevButton')
@@ -182,6 +183,7 @@ async function paginate(
           case 'trashButton':
             await buttonInteraction.deferUpdate();
 
+            deletedManually = true;
             await interaction.deleteReply();
 
             continueButtonListener.stop();
@@ -198,13 +200,14 @@ async function paginate(
       await interaction.deleteReply();
     }
     // Otherwise just remove the buttons
-    else {
-      const payload = await getPayload(payloads);
+    else if (!deletedManually) {
+      const payload = getPayload(payloads);
       await interaction.editReply(payload);
     }
     // Resets the variables for further uses
     currentPage = 1;
     stoppedManually = false;
+    deletedManually = false;
   });
 }
 

diff --git a/src/modules/factoids/factoids.ts b/src/modules/factoids/factoids.ts
@@ -227,13 +227,11 @@ async function confirmDeletion(
       interaction
     )
   ) {
-    case util.ConfirmEmbedResponse.Denied: {
+    case util.ConfirmEmbedResponse.Denied:
       return false;
-    }
 
-    case util.ConfirmEmbedResponse.Confirmed: {
+    case util.ConfirmEmbedResponse.Confirmed:
       return true;
-    }
   }
 }