From eb64f47329df2a4880bc1e5669767030fde838ac Mon Sep 17 00:00:00 2001
From: Jon Basniak <740416+gm112@users.noreply.github.com>
Date: Mon, 15 Apr 2024 18:48:46 -0400
Subject: [PATCH 1/3] fix: add check for if we have remaining messages

---
 src/undiscord-core.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/undiscord-core.js b/src/undiscord-core.js
index 955467f2..11ab3cf8 100644
--- a/src/undiscord-core.js
+++ b/src/undiscord-core.js
@@ -151,6 +151,7 @@ class UndiscordCore {
       this.calcEtr();
       log.verb(`Estimated time remaining: ${msToHMS(this.stats.etr)}`);
 
+      const messagesRemaining = this.state.grandTotal - this.state.offset;
       // if there are messages to delete, delete them
       if (this.state._messagesToDelete.length > 0) {
 
@@ -169,6 +170,9 @@ class UndiscordCore {
         log.verb('There\'s nothing we can delete on this page, checking next page...');
         log.verb(`Skipped ${this.state._skippedMessages.length} out of ${this.state._seachResponse.messages.length} in this page.`, `(Offset was ${oldOffset}, ajusted to ${this.state.offset})`);
       }
+      else if (messagesRemaining === this.state.delCount) {
+	        log.verb('There\'s messages remaining, checking next page...');
+	    }
       else {
         log.verb('Ended because API returned an empty page.');
         log.verb('[End state]', this.state);

From e17760ec4cb4049b018ac348cae7fbe966674286 Mon Sep 17 00:00:00 2001
From: Jon Basniak <740416+gm112@users.noreply.github.com>
Date: Mon, 15 Apr 2024 18:51:24 -0400
Subject: [PATCH 2/3] chore: clean up formatting

---
 src/undiscord-core.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/undiscord-core.js b/src/undiscord-core.js
index 11ab3cf8..964ca5c8 100644
--- a/src/undiscord-core.js
+++ b/src/undiscord-core.js
@@ -171,8 +171,8 @@ class UndiscordCore {
         log.verb(`Skipped ${this.state._skippedMessages.length} out of ${this.state._seachResponse.messages.length} in this page.`, `(Offset was ${oldOffset}, ajusted to ${this.state.offset})`);
       }
       else if (messagesRemaining === this.state.delCount) {
-	        log.verb('There\'s messages remaining, checking next page...');
-	    }
+        log.verb('There\'s messages remaining, checking next page...');
+      }
       else {
         log.verb('Ended because API returned an empty page.');
         log.verb('[End state]', this.state);

From 996dc971ddb88e85058bbd4efba7ac595cdfcbf6 Mon Sep 17 00:00:00 2001
From: Jon Basniak <740416+gm112@users.noreply.github.com>
Date: Mon, 15 Apr 2024 19:00:15 -0400
Subject: [PATCH 3/3] fix: use less than comparison for clarity of intent

---
 src/undiscord-core.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/undiscord-core.js b/src/undiscord-core.js
index 964ca5c8..5bd28dc5 100644
--- a/src/undiscord-core.js
+++ b/src/undiscord-core.js
@@ -170,7 +170,7 @@ class UndiscordCore {
         log.verb('There\'s nothing we can delete on this page, checking next page...');
         log.verb(`Skipped ${this.state._skippedMessages.length} out of ${this.state._seachResponse.messages.length} in this page.`, `(Offset was ${oldOffset}, ajusted to ${this.state.offset})`);
       }
-      else if (messagesRemaining === this.state.delCount) {
+      else if (this.state.delCount < messagesRemaining) {
         log.verb('There\'s messages remaining, checking next page...');
       }
       else {