From 899ff3633404f41df7e8c142409b5f4edecf27b7 Mon Sep 17 00:00:00 2001
From: fsociety <fsociety.mp3@pm.me>
Date: Tue, 17 Dec 2024 15:31:55 +0100
Subject: [PATCH] =?UTF-8?q?=F0=9F=8E=A8=20refactor(election):=20improve=20?=
 =?UTF-8?q?event=20mapping=20with=20filter=20for=20valid=20events=20in=20e?=
 =?UTF-8?q?lection=20views=20and=20mockup=20file.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../election/[Election:year].blade.php        | 24 ++++++++++++-------
 .../election/admin/[Election:year].blade.php  | 24 ++++++++++++-------
 .../views/pages/association/profile.blade.php | 23 +++++++++++-------
 .../views/pages/meetups/mockup.blade.php      | 24 ++++++++++++-------
 4 files changed, 59 insertions(+), 36 deletions(-)

diff --git a/resources/views/pages/association/election/[Election:year].blade.php b/resources/views/pages/association/election/[Election:year].blade.php
index d98fb26..560f3c1 100644
--- a/resources/views/pages/association/election/[Election:year].blade.php
+++ b/resources/views/pages/association/election/[Election:year].blade.php
@@ -108,15 +108,21 @@ $loadNostrEvents = function ($kinds) {
     $request = new Request($relaySet, $requestMessage);
     $response = $request->send();
     return collect($response[config('services.relay')])
-        ->map(fn($event)
-            => [
-            'id' => $event->event->id,
-            'kind' => $event->event->kind,
-            'content' => $event->event->content,
-            'pubkey' => $event->event->pubkey,
-            'tags' => $event->event->tags,
-            'created_at' => $event->event->created_at,
-        ])->toArray();
+        ->map(function($event) {
+            if(!isset($event->event)) {
+                return false;
+            }
+            return [
+                'id' => $event->event->id,
+                'kind' => $event->event->kind,
+                'content' => $event->event->content,
+                'pubkey' => $event->event->pubkey,
+                'tags' => $event->event->tags,
+                'created_at' => $event->event->created_at,
+            ];
+        })
+        ->filter()
+        ->toArray();
 };
 
 $vote = function ($pubkey, $type, $board = false) {
diff --git a/resources/views/pages/association/election/admin/[Election:year].blade.php b/resources/views/pages/association/election/admin/[Election:year].blade.php
index 2f9e010..cc7e829 100644
--- a/resources/views/pages/association/election/admin/[Election:year].blade.php
+++ b/resources/views/pages/association/election/admin/[Election:year].blade.php
@@ -158,15 +158,21 @@ $loadNostrEvents = function ($kinds) {
     $request = new Request($relaySet, $requestMessage);
     $response = $request->send();
     return collect($response[config('services.relay')])
-        ->map(fn($event)
-            => [
-            'id' => $event->event->id,
-            'kind' => $event->event->kind,
-            'content' => $event->event->content,
-            'pubkey' => $event->event->pubkey,
-            'tags' => $event->event->tags,
-            'created_at' => $event->event->created_at,
-        ])->toArray();
+        ->map(function($event) {
+            if(!isset($event->event)) {
+                return false;
+            }
+            return [
+                'id' => $event->event->id,
+                'kind' => $event->event->kind,
+                'content' => $event->event->content,
+                'pubkey' => $event->event->pubkey,
+                'tags' => $event->event->tags,
+                'created_at' => $event->event->created_at,
+            ];
+        })
+        ->filter()
+        ->toArray();
 };
 
 ?>
diff --git a/resources/views/pages/association/profile.blade.php b/resources/views/pages/association/profile.blade.php
index 7bc034e..9f4296b 100644
--- a/resources/views/pages/association/profile.blade.php
+++ b/resources/views/pages/association/profile.blade.php
@@ -233,15 +233,20 @@ $loadEvents = function () {
     $response = $request->send();
 
     $this->events = collect($response[config('services.relay')])
-        ->map(fn($event)
-            => [
-            'id' => $event->event->id,
-            'kind' => $event->event->kind,
-            'content' => $event->event->content,
-            'pubkey' => $event->event->pubkey,
-            'tags' => $event->event->tags,
-            'created_at' => $event->event->created_at,
-        ])
+        ->map(function($event) {
+            if(!isset($event->event)) {
+                return false;
+            }
+            return [
+                'id' => $event->event->id,
+                'kind' => $event->event->kind,
+                'content' => $event->event->content,
+                'pubkey' => $event->event->pubkey,
+                'tags' => $event->event->tags,
+                'created_at' => $event->event->created_at,
+            ];
+        })
+        ->filter()
         ->unique('id')
         ->toArray();
 };
diff --git a/resources/views/pages/meetups/mockup.blade.php b/resources/views/pages/meetups/mockup.blade.php
index 4a6d1eb..384bc0c 100644
--- a/resources/views/pages/meetups/mockup.blade.php
+++ b/resources/views/pages/meetups/mockup.blade.php
@@ -56,15 +56,21 @@ $loadEvents = function() {
     $response = $request->send();
 
     $this->events = collect($response['ws://nostream:8008'])
-        ->map(fn($event)
-            => [
-            'id' => $event->event->id,
-            'kind' => $event->event->kind,
-            'content' => $event->event->content,
-            'pubkey' => $event->event->pubkey,
-            'tags' => $event->event->tags,
-            'created_at' => $event->event->created_at,
-        ])->toArray();
+        ->map(function($event) {
+            if(!isset($event->event)) {
+                return false;
+            }
+            return [
+                'id' => $event->event->id,
+                'kind' => $event->event->kind,
+                'content' => $event->event->content,
+                'pubkey' => $event->event->pubkey,
+                'tags' => $event->event->tags,
+                'created_at' => $event->event->created_at,
+            ];
+        })
+        ->filter()
+        ->toArray();
 };
 
 $save = function () {