From 80256669b1d0b78cf71b7e787af96149e829a29e Mon Sep 17 00:00:00 2001
From: NH Gooi <techniek@nhgooi.nl>
Date: Mon, 17 Jun 2024 23:11:07 +0200
Subject: [PATCH] Wijzigingen voor nieuwe API

---
 app/Http/Controllers/Controller.php     | 14 +++++---------
 app/Http/Controllers/NewsController.php |  2 +-
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/app/Http/Controllers/Controller.php b/app/Http/Controllers/Controller.php
index 58237b3c..dc9efaf4 100644
--- a/app/Http/Controllers/Controller.php
+++ b/app/Http/Controllers/Controller.php
@@ -56,10 +56,8 @@ class Controller extends BaseController
             $programs = [];
             foreach ($data as $item_data) {
                 $programs[] = $program = new \Model\Program($item_data->program);
-                $program->start = new \DateTimeImmutable($item_data->start->date,
-                    new \DateTimeZone($item_data->start->timezone));
-                $program->end = new \DateTimeImmutable($item_data->end->date,
-                    new \DateTimeZone($item_data->end->timezone));
+                $program->start = self::JsonToDateTime($item_data->start);
+                $program->end = self::JsonToDateTime($item_data->end);
             }
 
             // Need a bit of slack here, otherwise the current program may show up
@@ -68,10 +66,8 @@ class Controller extends BaseController
             $i = 0;
             foreach (array_reverse($data) as $item_data) {
                 $recent = $program = new \Model\Program($item_data->program);
-                $recent->start = new \DateTimeImmutable($item_data->start->date,
-                    new \DateTimeZone($item_data->start->timezone));
-                $recent->end = new \DateTimeImmutable($item_data->end->date,
-                    new \DateTimeZone($item_data->end->timezone));
+                $recent->start = self::JsonToDateTime($item_data->start);
+                $recent->end = self::JsonToDateTime($item_data->end);
                 if (($recent->end < $now) && (!$recent->nonstop) && (!$recent->rerun)) {
                     $view->with('recent', $recent);
                     break;
@@ -148,7 +144,7 @@ class Controller extends BaseController
 
     protected static function JsonToDateTime($obj)
     {
-        return new \DateTime($obj->date, new \DateTimeZone($obj->timezone));
+        return is_object($obj) ? new \DateTime($obj->date, new \DateTimeZone($obj->timezone)) : new \DateTime($obj);
     }
 
     public function __call($method, $arguments)
diff --git a/app/Http/Controllers/NewsController.php b/app/Http/Controllers/NewsController.php
index 6e827c06..268f685b 100644
--- a/app/Http/Controllers/NewsController.php
+++ b/app/Http/Controllers/NewsController.php
@@ -27,7 +27,7 @@ class NewsController extends Controller
                 break;
 
             case 2:
-                $source = $apiResult->source;
+                $source = $apiResult->source->article;
                 $newsItem->published = self::TimestampToDateTime($source->created);
                 $newsItem->edited = self::TimestampToDateTime($source->updated);
                 $newsItem->author = $source->author;