From 67a87ccb1e99cc8f693a0509c98088b6daa97fb5 Mon Sep 17 00:00:00 2001 From: paule Date: Wed, 1 Nov 2023 04:45:41 +0100 Subject: [PATCH] fix: CatchUnoptimizedMedia, prevent skipping of imported posts --- app/Console/Commands/CatchUnoptimizedMedia.php | 5 +++-- app/Media.php | 7 ++++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/app/Console/Commands/CatchUnoptimizedMedia.php b/app/Console/Commands/CatchUnoptimizedMedia.php index a62bd8651..4887cb8e3 100644 --- a/app/Console/Commands/CatchUnoptimizedMedia.php +++ b/app/Console/Commands/CatchUnoptimizedMedia.php @@ -41,8 +41,8 @@ class CatchUnoptimizedMedia extends Command public function handle() { Media::whereNull('processed_at') - ->where('created_at', '>', now()->subHours(1)) - ->where('skip_optimize', '!=', true) + // This is commented out because Instagram imported posts would not get uploaded to remote storage + // ->where('created_at', '>', now()->subHours(1)) ->whereNull('remote_url') ->whereNotNull('status_id') ->whereNotNull('media_path') @@ -52,6 +52,7 @@ class CatchUnoptimizedMedia extends Command ]) ->chunk(50, function($medias) { foreach ($medias as $media) { + if ($media->skip_optimize) continue; ImageOptimize::dispatch($media); } }); diff --git a/app/Media.php b/app/Media.php index b3f9ccba0..1c709e7f3 100644 --- a/app/Media.php +++ b/app/Media.php @@ -21,7 +21,8 @@ class Media extends Model protected $casts = [ 'srcset' => 'array', - 'deleted_at' => 'datetime' + 'deleted_at' => 'datetime', + 'skip_optimize' => 'boolean' ]; public function status() @@ -91,7 +92,7 @@ class Media extends Model case 'audio': $verb = 'Audio'; break; - + case 'image': $verb = 'Image'; break; @@ -99,7 +100,7 @@ class Media extends Model case 'video': $verb = 'Video'; break; - + default: $verb = 'Document'; break;