From a34d86f5c037127cd892e0d13623b436abc33b44 Mon Sep 17 00:00:00 2001
From: Buster Neece <buster@busterneece.com>
Date: Sat, 20 Apr 2024 01:33:57 -0500
Subject: [PATCH] Fixes #6086 -- Prevent overnight scheduled items from playing
 again at the end of the last scheduled day.

---
 src/Radio/AutoDJ/Scheduler.php | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/Radio/AutoDJ/Scheduler.php b/src/Radio/AutoDJ/Scheduler.php
index 25f5b1744..4b53e2558 100644
--- a/src/Radio/AutoDJ/Scheduler.php
+++ b/src/Radio/AutoDJ/Scheduler.php
@@ -407,7 +407,10 @@ final class Scheduler
             $startDate = CarbonImmutable::createFromFormat('Y-m-d', $startDate, $now->getTimezone());
 
             if (null !== $startDate) {
-                $startDate = $startDate->setTime(0, 0);
+                $startDate = StationSchedule::getDateTime(
+                    $schedule->getStartTime(),
+                    $startDate
+                );
                 if ($now->lt($startDate)) {
                     return false;
                 }
@@ -418,7 +421,10 @@ final class Scheduler
             $endDate = CarbonImmutable::createFromFormat('Y-m-d', $endDate, $now->getTimezone());
 
             if (null !== $endDate) {
-                $endDate = $endDate->setTime(23, 59, 59);
+                $endDate = StationSchedule::getDateTime(
+                    $schedule->getEndTime(),
+                    $endDate
+                );
                 if ($now->gt($endDate)) {
                     return false;
                 }