refactor: recurrenceIsActive logic

starfolksoftware · Nov 9, 2022 · c11880c · c11880c
1 parent 59fc07e
commit c11880c
Showing 1 changed file with 2 additions and 6 deletions.
diff --git a/src/Recurs.php b/src/Recurs.php
@@ -94,12 +94,8 @@ public function pauseRecurrence(bool $value = true)
      */
     public function recurrenceIsActive(): bool
     {
-        return ($this->recurrence?->starts_at >= now()) &&
-            $this->recurrence?->status === 'active' && (
-                (! is_null($this->recurrence->ends_at) && ($this->recurrence->ends_at >= now())) ||
-                (! is_null($this->recurrence->ends_after) && $this->nextRecurrence()) ||
-                (is_null($this->recurrence->ends_at) && is_null($this->recurrence->ends_after))
-            );
+        return $this->recurrence?->status === 'active' && 
+            !!$this->nextRecurrence();
     }
 
     /**