let Claude do some magic

Author: marcorieser

src/Types/Event.php

@@ -67,9 +67,9 @@ public function occurrencesBetween(string|CarbonInterface $from, string|CarbonIn
         $tz = $this->timezone['name'];
 
         return $this->collect($this->rule()->getOccurrencesBetween(
-            begin: $from->shiftTimezone($tz),
-            end: $to->shiftTimezone($tz)
-        ));
+            begin: $from->toImmutable()->shiftTimezone($tz)->subDay(),
+            end: $to->toImmutable()->shiftTimezone($tz)->addDay()
+        ))->filter(fn (Entry $entry) => $entry->start >= $from && $entry->start <= $to);
     }
 
     public function occursOnDate(string|CarbonInterface $date): bool
@@ -159,10 +159,12 @@ protected function eventUrl(): ?string
 
     protected function supplement(CarbonInterface $date): ?Entry
     {
+        $appTz = config('app.timezone');
+
         return unserialize(serialize($this->event))
             ->setSupplement('multi_day', false)
-            ->setSupplement('start', $date->setTimeFromTimeString($this->startTime()))
-            ->setSupplement('end', $date->setTimeFromTimeString($this->endTime()))
+            ->setSupplement('start', $date->setTimeFromTimeString($this->startTime())->setTimezone($appTz))
+            ->setSupplement('end', $date->setTimeFromTimeString($this->endTime())->setTimezone($appTz))
             ->setSupplement('has_end_time', $this->hasEndTime());
     }