This commit is contained in:
Oliver Davies 2019-05-20 01:44:35 +01:00
parent 9105143dac
commit 6b022a02d0

View file

@ -65,9 +65,7 @@ class TalksExtension extends AbstractExtension
*/ */
public function getUpcoming($talks): Collection public function getUpcoming($talks): Collection
{ {
return $this->getAll($talks)->filter(function ($talk) { return $this->getAll($talks);
return $this->getLastDate($talk) >= $this->today;
})->values();
} }
/** /**
@ -79,9 +77,7 @@ class TalksExtension extends AbstractExtension
*/ */
public function getPast($talks): Collection public function getPast($talks): Collection
{ {
return $this->getAll($talks)->filter(function ($talk) { return $this->getAll($talks);
return $this->getLastDate($talk) < $this->today;
})->values();
} }
/** /**
@ -94,7 +90,8 @@ class TalksExtension extends AbstractExtension
private function getLastDate($talk): string private function getLastDate($talk): string
{ {
return (string) collect($talk['events'])->pluck('date')->sort()->last(); return $this->getEvents(collect([$talk]))
->pluck('date')->max();
} }
public function getEvents(Collection $talks): Collection public function getEvents(Collection $talks): Collection