From 6b022a02d0b03c2eb87d03ced69cf43fe04e1282 Mon Sep 17 00:00:00 2001
From: Oliver Davies <oliver@oliverdavies.uk>
Date: Mon, 20 May 2019 01:44:35 +0100
Subject: [PATCH] wip

---
 src/Talks/src/TwigExtension/TalksExtension.php | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/src/Talks/src/TwigExtension/TalksExtension.php b/src/Talks/src/TwigExtension/TalksExtension.php
index 4790f31f..8526db7f 100644
--- a/src/Talks/src/TwigExtension/TalksExtension.php
+++ b/src/Talks/src/TwigExtension/TalksExtension.php
@@ -65,9 +65,7 @@ class TalksExtension extends AbstractExtension
      */
     public function getUpcoming($talks): Collection
     {
-        return $this->getAll($talks)->filter(function ($talk) {
-            return $this->getLastDate($talk) >= $this->today;
-        })->values();
+        return $this->getAll($talks);
     }
 
     /**
@@ -79,9 +77,7 @@ class TalksExtension extends AbstractExtension
      */
     public function getPast($talks): Collection
     {
-        return $this->getAll($talks)->filter(function ($talk) {
-            return $this->getLastDate($talk) < $this->today;
-        })->values();
+        return $this->getAll($talks);
     }
 
     /**
@@ -94,7 +90,8 @@ class TalksExtension extends AbstractExtension
 
     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