diff --git a/CHANGELOG.md b/CHANGELOG.md index dbd11401850314f164c7c56e062686b289098fc2..2642f52cd81445096b67f91fc0f88f20d91bb174 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -24,6 +24,7 @@ - Updated BaseApiController, invalidate session after account deletion ([826978ce](https://github.com/pixelfed/pixelfed/commit/826978ce)) - Updated AdminUserController, add account deletion handler ([9be19ad8](https://github.com/pixelfed/pixelfed/commit/9be19ad8)) - Updated ContactController, fixes #2042 ([c9057e87](https://github.com/pixelfed/pixelfed/commit/c9057e87)) +- Updated Media model, fix remote media preview ([9947050b](https://github.com/pixelfed/pixelfed/commit/9947050b)) ## [v0.10.8 (2020-01-29)](https://github.com/pixelfed/pixelfed/compare/v0.10.7...v0.10.8) ### Added diff --git a/app/Media.php b/app/Media.php index 8c3de944b6186a6656e57d853735bd11c3336996..2bc1d0334fd551bcb3ea3216d1bf2cd27e38ba67 100644 --- a/app/Media.php +++ b/app/Media.php @@ -42,8 +42,12 @@ class Media extends Model public function thumbnailUrl() { - $path = $this->thumbnail_path ?? 'public/no-preview.png'; - return url(Storage::url($path)); + if($this->remote_media == true) { + return $this->remote_url; + } else { + $path = $this->thumbnail_path ?? 'public/no-preview.png'; + return url(Storage::url($path)); + } } public function thumb()