From bb1cccbe030314d2d33c04d2c7cab05a0a556508 Mon Sep 17 00:00:00 2001
From: Daniel Supernault <danielsupernault@gmail.com>
Date: Sun, 19 Jun 2022 06:52:06 -0600
Subject: [PATCH] Update MediaDeletePipeline, fix async media deletion

---
 app/Console/Commands/MediaGarbageCollector.php | 4 ++--
 app/Http/Controllers/ComposeController.php     | 2 --
 app/Jobs/MediaPipeline/MediaDeletePipeline.php | 4 +++-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/Console/Commands/MediaGarbageCollector.php b/app/Console/Commands/MediaGarbageCollector.php
index 11d330ee8..c8fce9199 100644
--- a/app/Console/Commands/MediaGarbageCollector.php
+++ b/app/Console/Commands/MediaGarbageCollector.php
@@ -51,10 +51,10 @@ class MediaGarbageCollector extends Command
 		$bar = $this->output->createProgressBar($gc->count());
 		$bar->start();
 		foreach($gc as $media) {
-			MediaStorageService::delete($media);
-			$media->forceDelete();
+			MediaStorageService::delete($media, true);
 			$bar->advance();
 		}
 		$bar->finish();
+		$this->line('');
 	}
 }
diff --git a/app/Http/Controllers/ComposeController.php b/app/Http/Controllers/ComposeController.php
index b6b40bc6e..4ce4ed03a 100644
--- a/app/Http/Controllers/ComposeController.php
+++ b/app/Http/Controllers/ComposeController.php
@@ -228,8 +228,6 @@ class ComposeController extends Controller
 
 		MediaStorageService::delete($media, true);
 
-		$media->forceDelete();
-
 		return response()->json([
 			'msg' => 'Successfully deleted',
 			'code' => 200
diff --git a/app/Jobs/MediaPipeline/MediaDeletePipeline.php b/app/Jobs/MediaPipeline/MediaDeletePipeline.php
index 3c486a9cc..df91c8316 100644
--- a/app/Jobs/MediaPipeline/MediaDeletePipeline.php
+++ b/app/Jobs/MediaPipeline/MediaDeletePipeline.php
@@ -57,7 +57,9 @@ class MediaDeletePipeline implements ShouldQueue
 			$disk->deleteDirectory($i);
 		}
 
-		return 1;
+		$media->forceDelete();
+
+		return;
 	}
 
 }