From 1f7f6ca3a332a5721e24222fce3430a084993353 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Mon, 14 Nov 2022 01:47:53 -0700 Subject: [PATCH] Update MediaDeletePipeline to handle flysystem v3 --- app/Jobs/MediaPipeline/MediaDeletePipeline.php | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/app/Jobs/MediaPipeline/MediaDeletePipeline.php b/app/Jobs/MediaPipeline/MediaDeletePipeline.php index df91c8316..2b7a5f733 100644 --- a/app/Jobs/MediaPipeline/MediaDeletePipeline.php +++ b/app/Jobs/MediaPipeline/MediaDeletePipeline.php @@ -38,8 +38,14 @@ class MediaDeletePipeline implements ShouldQueue if(config_cache('pixelfed.cloud_storage') == true) { $disk = Storage::disk(config('filesystems.cloud')); - $disk->delete($path); - $disk->delete($thumb); + + if($path) { + $disk->delete($path); + } + + if($thumb) { + $disk->delete($thumb); + } if(count($e) > 4 && count($disk->files($i)) == 0) { $disk->deleteDirectory($i); @@ -47,10 +53,10 @@ class MediaDeletePipeline implements ShouldQueue } $disk = Storage::disk(config('filesystems.local')); - if($disk->exists($path)) { + if($path && $disk->exists($path)) { $disk->delete($path); } - if($disk->exists($thumb)) { + if($thumb && $disk->exists($thumb)) { $disk->delete($thumb); } if(count($e) > 4 && count($disk->files($i)) == 0) {