From e33643c295a679ba8ae5898e624b244063f7838b Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Fri, 21 Jun 2024 03:45:14 -0600 Subject: [PATCH] Update Media model, fix broken thumbnail/gray thumbnail bug --- app/Media.php | 36 +++++++++++++++++++----------------- 1 file changed, 19 insertions(+), 17 deletions(-) diff --git a/app/Media.php b/app/Media.php index b3f9ccba..30a1b33b 100644 --- a/app/Media.php +++ b/app/Media.php @@ -2,11 +2,11 @@ namespace App; +use App\Util\Media\License; use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\SoftDeletes; -use App\Util\Media\License; -use Storage; use Illuminate\Support\Str; +use Storage; class Media extends Model { @@ -21,7 +21,7 @@ class Media extends Model protected $casts = [ 'srcset' => 'array', - 'deleted_at' => 'datetime' + 'deleted_at' => 'datetime', ]; public function status() @@ -36,12 +36,12 @@ class Media extends Model public function url() { - if($this->cdn_url) { + if ($this->cdn_url) { // return Storage::disk(config('filesystems.cloud'))->url($this->media_path); return $this->cdn_url; } - if($this->remote_media && $this->remote_url) { + if ($this->remote_media && $this->remote_url) { return $this->remote_url; } @@ -50,19 +50,19 @@ class Media extends Model public function thumbnailUrl() { - if($this->thumbnail_url) { + if ($this->thumbnail_url) { return $this->thumbnail_url; } - if(!$this->remote_media && $this->thumbnail_path) { + if (! $this->remote_media && $this->thumbnail_path) { return url(Storage::url($this->thumbnail_path)); } - if($this->remote_media && !$this->thumbnail_path && $this->cdn_url) { + if (! $this->thumbnail_path && $this->cdn_url) { return $this->cdn_url; } - if($this->media_path && $this->mime && in_array($this->mime, ['image/jpeg', 'image/png'])) { + if ($this->media_path && $this->mime && in_array($this->mime, ['image/jpeg', 'image/png'])) { return $this->remote_media || Str::startsWith($this->media_path, 'http') ? $this->media_path : url(Storage::url($this->media_path)); @@ -78,9 +78,10 @@ class Media extends Model public function mimeType() { - if(!$this->mime) { + if (! $this->mime) { return; } + return explode('/', $this->mime)[0]; } @@ -91,7 +92,7 @@ class Media extends Model case 'audio': $verb = 'Audio'; break; - + case 'image': $verb = 'Image'; break; @@ -99,11 +100,12 @@ class Media extends Model case 'video': $verb = 'Video'; break; - + default: $verb = 'Document'; break; } + return $verb; } @@ -114,11 +116,11 @@ class Media extends Model public function getModel() { - if(empty($this->metadata)) { + if (empty($this->metadata)) { return false; } $meta = $this->getMetadata(); - if($meta && isset($meta['Model'])) { + if ($meta && isset($meta['Model'])) { return $meta['Model']; } } @@ -127,11 +129,11 @@ class Media extends Model { $license = $this->license; - if(!$license || strlen($license) > 2 || $license == 1) { + if (! $license || strlen($license) > 2 || $license == 1) { return null; } - if(!in_array($license, License::keys())) { + if (! in_array($license, License::keys())) { return null; } @@ -140,7 +142,7 @@ class Media extends Model return [ 'id' => $res['id'], 'title' => $res['title'], - 'url' => $res['url'] + 'url' => $res['url'], ]; } }