From 2e1f496eea060b5f2ab38684671680862b719744 Mon Sep 17 00:00:00 2001
From: NH Gooi <techniek@nhgooi.nl>
Date: Tue, 18 Mar 2025 21:51:18 +0100
Subject: [PATCH] Render articles directly from block source instead of
 prerendered text

---
 app/Http/Controllers/NewsController.php | 16 +++++++++-------
 resources/views/newsitem.blade.php      |  6 ++++--
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/app/Http/Controllers/NewsController.php b/app/Http/Controllers/NewsController.php
index 247d5720..fab80ecc 100644
--- a/app/Http/Controllers/NewsController.php
+++ b/app/Http/Controllers/NewsController.php
@@ -22,22 +22,24 @@ class NewsController extends Controller
 
         switch ($apiResult->version) {
             case 1:
-                if (!$newsItem->content) return redirect('//nhnieuws.nl/gooi');
-                return view('newsitem', ['news' => $newsItem, 'metadata' => $newsItem->metadata]);
-                break;
+	        if (!$newsItem->content) return redirect('//nhnieuws.nl/gooi');
 
-            case 2:
+	    case 2:
+		if(isset($apiResult->source->article)) {
                 $source = $apiResult->source->article;
                 $newsItem->published = self::TimestampToDateTime($source->created);
                 $newsItem->edited = self::TimestampToDateTime($source->updated);
                 $newsItem->author = $source->author;
                 $newsItem->images = null; // Images will be embedded
                 $newsItem->video = null; // Videos will be embedded
-                $newsItem->content = $source->blocks;
+		$newsItem->content = $source->blocks;
+		} elseif(isset($apiResult->source->blocks)) {
+			$newsItem->content = $apiResult->source->blocks; 
+		}
+		
 
 
-
-                return view('newsitem', array_merge($this->getSidebareData(), ['news' => $newsItem, 'metadata' => $newsItem->metadata, 'searchURL' => 'nieuws/zoeken']));
+                return view('newsitem', array_merge($this->getSidebareData(), ['type' => $apiResult->type, 'news' => $newsItem, 'metadata' => $newsItem->metadata, 'searchURL' => 'nieuws/zoeken']));
         }
     }
 
diff --git a/resources/views/newsitem.blade.php b/resources/views/newsitem.blade.php
index 6b2b81a2..5302ca44 100644
--- a/resources/views/newsitem.blade.php
+++ b/resources/views/newsitem.blade.php
@@ -87,8 +87,10 @@
 					@endif
 				@endif
 
-				@if(is_array($news->content))
-					@include('partial/nh_story', ['content' => $news->content])
+				@if($type == "nhnieuws")
+				@include('partial/nh_story', ['content' => $news->content])
+				@elseif($type == "artikel")
+				@include('partial/block_story', ['content' => $news->content])
 				@else
 				<div class="text">
 					<p>{!!$news->content!!}</p>