Update image pipeline, use config_cache

pixelfed · Mar 12, 2024 · a72188a · a72188a
1 parent ad506e9
commit a72188a
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 8 deletions.
diff --git a/app/Jobs/ImageOptimizePipeline/ImageOptimize.php b/app/Jobs/ImageOptimizePipeline/ImageOptimize.php
@@ -45,7 +45,7 @@ public function handle()
             return;
         }
 
-        if(config('pixelfed.optimize_image') == false) {
+        if((bool) config_cache('pixelfed.optimize_image') == false) {
         	ImageThumbnail::dispatch($media)->onQueue('mmo');
     		return;
     	} else {

diff --git a/app/Jobs/ImageOptimizePipeline/ImageResize.php b/app/Jobs/ImageOptimizePipeline/ImageResize.php
@@ -51,7 +51,7 @@ public function handle()
             return;
         }
 
-        if(!config('pixelfed.optimize_image')) {
+        if((bool) config_cache('pixelfed.optimize_image') === false) {
         	ImageThumbnail::dispatch($media)->onQueue('mmo');
         	return;
         }

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

diff --git a/app/Services/ConfigCacheService.php b/app/Services/ConfigCacheService.php
@@ -98,6 +98,10 @@ public static function get($key)
                 'captcha.triggers.login.enabled',
                 'captcha.triggers.login.attempts',
                 'federation.custom_emoji.enabled',
+
+                'pixelfed.optimize_image',
+                'pixelfed.optimize_video',
+                'pixelfed.max_collection_length',
                 // 'system.user_mode'
             ];
 

diff --git a/app/Util/Site/Config.php b/app/Util/Site/Config.php
@@ -36,10 +36,10 @@ public static function get()
                     'album_limit' => (int) config_cache('pixelfed.max_album_length'),
                     'image_quality' => (int) config_cache('pixelfed.image_quality'),
 
-                    'max_collection_length' => (int) config('pixelfed.max_collection_length', 18),
+                    'max_collection_length' => (int) config_cache('pixelfed.max_collection_length', 18),
 
-                    'optimize_image' => (bool) config('pixelfed.optimize_image'),
-                    'optimize_video' => (bool) config('pixelfed.optimize_video'),
+                    'optimize_image' => (bool) config_cache('pixelfed.optimize_image'),
+                    'optimize_video' => (bool) config_cache('pixelfed.optimize_video'),
 
                     'media_types' => config_cache('pixelfed.media_types'),
                     'mime_types' => config_cache('pixelfed.media_types') ? explode(',', config_cache('pixelfed.media_types')) : [],

diff --git a/resources/views/admin/diagnostics/home.blade.php b/resources/views/admin/diagnostics/home.blade.php
@@ -750,12 +750,12 @@
 	<tr>
 		<td><span class="badge badge-primary">PIXELFED</span></td>
 		<td><strong>PF_OPTIMIZE_IMAGES</strong></td>
-		<td><span>{{config_cache('pixelfed.optimize_image') ? '✅ true' : '❌ false' }}</span></td>
+		<td><span>{{(bool) config_cache('pixelfed.optimize_image') ? '✅ true' : '❌ false' }}</span></td>
 	</tr>
 	<tr>
 		<td><span class="badge badge-primary">PIXELFED</span></td>
 		<td><strong>PF_OPTIMIZE_VIDEOS</strong></td>
-		<td><span>{{config_cache('pixelfed.optimize_video') ? '✅ true' : '❌ false' }}</span></td>
+		<td><span>{{(bool) config_cache('pixelfed.optimize_video') ? '✅ true' : '❌ false' }}</span></td>
 	</tr>
 	<tr>
 		<td><span class="badge badge-primary">PIXELFED</span></td>