Merge pull request #5186 from pixelfed/staging

Update Media model, fix broken thumbnail/gray thumbnail bug

CHANGELOG.md

@@ -31,7 +31,7 @@
 - Update DirectMessageController, add timestamps to threads ([b24d2554](https://github.com/pixelfed/pixelfed/commit/b24d2554))
 - Update DirectMessageController, add carousel entity to threads ([96f24f33](https://github.com/pixelfed/pixelfed/commit/96f24f33))
 - Update and refactor total local post count logic, cache value and schedule updates twice daily to eliminate the perf issue on larger instances ([4f2b8ed2](https://github.com/pixelfed/pixelfed/commit/4f2b8ed2))
--  ([](https://github.com/pixelfed/pixelfed/commit/))
+- Update Media model, fix broken thumbnail/gray thumbnail bug ([e33643c2](https://github.com/pixelfed/pixelfed/commit/e33643c2))
 -  ([](https://github.com/pixelfed/pixelfed/commit/))
 
 ## [v0.12.1 (2024-05-07)](https://github.com/pixelfed/pixelfed/compare/v0.12.0...v0.12.1)

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()
@@ -58,7 +58,7 @@ class Media extends Model
             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;
         }
 
@@ -81,6 +81,7 @@ class Media extends Model
         if (! $this->mime) {
             return;
         }
+
         return explode('/', $this->mime)[0];
     }
 
@@ -104,6 +105,7 @@ class Media extends Model
                 $verb = 'Document';
                 break;
         }
+
         return $verb;
     }
 
@@ -140,7 +142,7 @@ class Media extends Model
         return [
             'id' => $res['id'],
             'title' => $res['title'],
-            'url' => $res['url']
+            'url' => $res['url'],
         ];
     }
 }