mirror
/
pixelfed
mirror of https://github.com/pixelfed/pixelfed.git
1
0
Fork 1
Code Issues Releases Wiki Activity

Merge pull request #949 from pixelfed/frontend-ui-refactor 

Add missing thumbnail fallback
This commit is contained in:
daniel 2019-03-03 22:40:39 -07:00 committed by GitHub
parent 78992835a6 03a4bb8d80
commit 983b48de51
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/Media.php
View File

@ -41,10 +41,8 @@ class Media extends Model
public function thumbnailUrl() public function thumbnailUrl()
{ {
$path = $this->thumbnail_path; $path = $this->thumbnail_path ?? 'public/no-preview.png';
$url = Storage::url($path); return url(Storage::url($path));
return url($url);
} }
public function thumb() public function thumb()

2
app/Status.php
View File

@ -80,7 +80,7 @@ class Status extends Model
$type = $this->type ?? $this->setType(); $type = $this->type ?? $this->setType();
$is_nsfw = !$showNsfw ? $this->is_nsfw : false; $is_nsfw = !$showNsfw ? $this->is_nsfw : false;
if ($this->media->count() == 0 || $is_nsfw || !in_array($type,['photo', 'photo:album'])) { 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)); return url(Storage::url($this->firstMedia()->thumbnail_path));

1
storage/app/public/.gitignore vendored
View File

@ -1,2 +1,3 @@
* *
!.gitignore !.gitignore
!no-preview.png

BIN
storage/app/public/no-preview.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.1 KiB