Update DeleteAccountPipeline, handle flysystem v3 changes by checking…

… files exist before attempting to delete
pixelfed · Dec 5, 2022 · 23e2998 · 23e2998
1 parent 2214161
commit 23e2998
Showing 1 changed file with 17 additions and 5 deletions.
diff --git a/app/Jobs/DeletePipeline/DeleteAccountPipeline.php b/app/Jobs/DeletePipeline/DeleteAccountPipeline.php
@@ -88,10 +88,14 @@ public function handle()
 				])) {
 					if(config('pixelfed.cloud_storage')) {
 						$disk = Storage::disk(config('filesystems.cloud'));
-						$disk->delete($path);
+						if($disk->exists($path)) {
+							$disk->delete($path);
+						}
 					}
 					$disk = Storage::disk(config('filesystems.local'));
-					$disk->delete($path);
+					if($disk->exists($path)) {
+						$disk->delete($path);
+					}
 				}
 
 				$avatar->forceDelete();
@@ -152,12 +156,20 @@ public function handle()
 			foreach($medias as $media) {
 				if(config('pixelfed.cloud_storage')) {
 					$disk = Storage::disk(config('filesystems.cloud'));
+					if($disk->exists($media->media_path)) {
+						$disk->delete($media->media_path);
+					}
+					if($disk->exists($media->thumbnail_path)) {
+						$disk->delete($media->thumbnail_path);
+					}
+				}
+				$disk = Storage::disk(config('filesystems.local'));
+				if($disk->exists($media->media_path)) {
 					$disk->delete($media->media_path);
+				}
+				if($disk->exists($media->thumbnail_path)) {
 					$disk->delete($media->thumbnail_path);
 				}
-				$disk = Storage::disk(config('filesystems.local'));
-				$disk->delete($media->media_path);
-				$disk->delete($media->thumbnail_path);
 				$media->forceDelete();
 			}
 		});