From 63007891152eb6cf0529f572764ecd39e32015d9 Mon Sep 17 00:00:00 2001
From: Daniel Supernault <danielsupernault@gmail.com>
Date: Fri, 12 Jun 2020 23:12:15 -0600
Subject: [PATCH] Update Api Transformers, fixes #2234

---
 app/Transformer/Api/Mastodon/v1/NotificationTransformer.php | 4 ++--
 app/Transformer/Api/Mastodon/v1/StatusTransformer.php       | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/Transformer/Api/Mastodon/v1/NotificationTransformer.php b/app/Transformer/Api/Mastodon/v1/NotificationTransformer.php
index 0282f2aa..690d4f32 100644
--- a/app/Transformer/Api/Mastodon/v1/NotificationTransformer.php
+++ b/app/Transformer/Api/Mastodon/v1/NotificationTransformer.php
@@ -37,10 +37,10 @@ class NotificationTransformer extends Fractal\TransformerAbstract
 			if($status) {
 				return $this->item($status, new StatusTransformer());
 			} else {
-				return null;
+				return $this->collection([], new StatusTransformer());
 			}
 		} else {
-			return null;
+			return $this->collection([], new StatusTransformer());
 		}
 	}
 
diff --git a/app/Transformer/Api/Mastodon/v1/StatusTransformer.php b/app/Transformer/Api/Mastodon/v1/StatusTransformer.php
index f73f3810..deadd585 100644
--- a/app/Transformer/Api/Mastodon/v1/StatusTransformer.php
+++ b/app/Transformer/Api/Mastodon/v1/StatusTransformer.php
@@ -63,6 +63,8 @@ class StatusTransformer extends Fractal\TransformerAbstract
             if(in_array($status->type, ['photo', 'video', 'photo:album', 'loop', 'photo:video:album'])) {
                 $media = $status->media()->orderBy('order')->get();
                 return $this->collection($media, new MediaTransformer());
+            } else {
+                return $this->collection([], new MediaTransformer());
             }
         });
     }