From 03a4bb8d8077a95070af930521dc67353e892c38 Mon Sep 17 00:00:00 2001
From: Daniel Supernault <danielsupernault@gmail.com>
Date: Sun, 3 Mar 2019 22:39:52 -0700
Subject: [PATCH] Add missing thumbnail fallback

---
 app/Media.php                     |   6 ++----
 app/Status.php                    |   2 +-
 storage/app/public/.gitignore     |   1 +
 storage/app/public/no-preview.png | Bin 0 -> 2192 bytes
 4 files changed, 4 insertions(+), 5 deletions(-)
 create mode 100644 storage/app/public/no-preview.png

diff --git a/app/Media.php b/app/Media.php
index 2b77abe43..e6ed99126 100644
--- a/app/Media.php
+++ b/app/Media.php
@@ -41,10 +41,8 @@ class Media extends Model
 
     public function thumbnailUrl()
     {
-        $path = $this->thumbnail_path;
-        $url = Storage::url($path);
-
-        return url($url);
+        $path = $this->thumbnail_path ?? 'public/no-preview.png';
+        return url(Storage::url($path));
     }
 
     public function thumb()
diff --git a/app/Status.php b/app/Status.php
index 6d8defa25..1e729cf35 100644
--- a/app/Status.php
+++ b/app/Status.php
@@ -80,7 +80,7 @@ class Status extends Model
             $type = $this->type ?? $this->setType();
             $is_nsfw = !$showNsfw ? $this->is_nsfw : false;
             if ($this->media->count() == 0 || $is_nsfw || !in_array($type,['photo', 'photo:album'])) {
-                return 'data:image/gif;base64,R0lGODlhAQABAIAAAMLCwgAAACH5BAAAAAAALAAAAAABAAEAAAICRAEAOw==';
+                return url(Storage::url('public/no-preview.png'));
             }
 
             return url(Storage::url($this->firstMedia()->thumbnail_path));
diff --git a/storage/app/public/.gitignore b/storage/app/public/.gitignore
index d6b7ef32c..6c7dbc108 100755
--- a/storage/app/public/.gitignore
+++ b/storage/app/public/.gitignore
@@ -1,2 +1,3 @@
 *
 !.gitignore
+!no-preview.png
\ No newline at end of file
diff --git a/storage/app/public/no-preview.png b/storage/app/public/no-preview.png
new file mode 100644
index 0000000000000000000000000000000000000000..254fc88ccfa77bfcb0ead42dd817b3ac8aadcbf2
GIT binary patch
literal 2192
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

literal 0
HcmV?d00001