Update ImageOptimizePipeline, improve support for disabling image opt…

…imizations
pixelfed · Apr 9, 2023 · e76289e · e76289e · lapineige · May 3, 2023
1 parent 153cea4
commit e76289e
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 9 deletions.
diff --git a/app/Jobs/ImageOptimizePipeline/ImageOptimize.php b/app/Jobs/ImageOptimizePipeline/ImageOptimize.php
@@ -39,16 +39,18 @@ public function __construct(Media $media)
      */
     public function handle()
     {
-    	if(config('pixelfed.optimize_image') == false) {
-    		return;
-    	}
-
         $media = $this->media;
         $path = storage_path('app/'.$media->media_path);
         if (!is_file($path) || $media->skip_optimize) {
             return;
         }
 
-        ImageResize::dispatch($media)->onQueue('mmo');
+        if(config('pixelfed.optimize_image') == false) {
+        	ImageThumbnail::dispatch($media)->onQueue('mmo');
+    		return;
+    	} else {
+        	ImageResize::dispatch($media)->onQueue('mmo');
+    		return;
+    	}
     }
 }
diff --git a/app/Jobs/ImageOptimizePipeline/ImageResize.php b/app/Jobs/ImageOptimizePipeline/ImageResize.php
@@ -49,6 +49,10 @@ public function handle()
             return;
         }
 
+        if(!config('pixelfed.optimize_image')) {
+        	ImageThumbnail::dispatch($media)->onQueue('mmo');
+        	return;
+        }
         try {
             $img = new Image();
             $img->resizeImage($media);

diff --git a/app/Jobs/ImageOptimizePipeline/ImageUpdate.php b/app/Jobs/ImageOptimizePipeline/ImageUpdate.php
@@ -61,10 +61,12 @@ public function handle()
 			return;
 		}
 
-		if (in_array($media->mime, $this->protectedMimes) == true) {
-			ImageOptimizer::optimize($thumb);
-			if(!$media->skip_optimize) {
-				ImageOptimizer::optimize($path);
+		if(config('pixelfed.optimize_image')) {
+			if (in_array($media->mime, $this->protectedMimes) == true) {
+				ImageOptimizer::optimize($thumb);
+				if(!$media->skip_optimize) {
+					ImageOptimizer::optimize($path);
+				}
 			}
 		}