From d83d7ef6218a0e677bc37a1def97d21a8141214f Mon Sep 17 00:00:00 2001
From: Chris Raible <chris@ghost.org>
Date: Wed, 28 Aug 2024 22:18:50 -0700
Subject: [PATCH] Ensured that delivery time is never after the deadline

---
 ghost/email-service/lib/BatchSendingService.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ghost/email-service/lib/BatchSendingService.js b/ghost/email-service/lib/BatchSendingService.js
index 37b6b4bbc3..ad65785625 100644
--- a/ghost/email-service/lib/BatchSendingService.js
+++ b/ghost/email-service/lib/BatchSendingService.js
@@ -380,7 +380,7 @@ class BatchSendingService {
                     // Calculate the target delivery time for the batch
                     const timeRemaining = deadline.getTime() - lastDeliveryTime.getTime();
                     const targetDeliveryDelay = Math.abs(timeRemaining / (queue.length + 1));
-                    const targetDeliveryTime = new Date(lastDeliveryTime.getTime() + targetDeliveryDelay);
+                    const targetDeliveryTime = new Date(Math.min(lastDeliveryTime.getTime() + targetDeliveryDelay, deadline.getTime()));
                     batchData.deliveryTime = targetDeliveryTime;
                     lastDeliveryTime = targetDeliveryTime;
                 }