Update RemoteStatusDelete pipeline

pixelfed · Aug 1, 2023 · 71e9226 · 71e9226
1 parent 45be6e1
commit 71e9226
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/app/Jobs/StatusPipeline/RemoteStatusDelete.php b/app/Jobs/StatusPipeline/RemoteStatusDelete.php
@@ -54,7 +54,6 @@ class RemoteStatusDelete implements ShouldQueue
     public $timeout = 90;
     public $tries = 2;
     public $maxExceptions = 1;
-    public $deleteWhenMissingModels = true;
 
     /**
      * Create a new job instance.
@@ -74,6 +73,11 @@ public function __construct(Status $status)
     public function handle()
     {
         $status = $this->status;
+
+        if($status->deleted_at) {
+            $status->forceDelete();
+            return;
+        }
         $profile = $this->status->profile;
 
         StatusService::del($status->id, true);
@@ -127,7 +131,7 @@ public function unlinkRemoveMedia($status)
         StatusView::whereStatusId($status->id)->delete();
         Status::whereInReplyToId($status->id)->update(['in_reply_to_id' => null]);
 
-        $status->delete();
+        $status->forceDelete();
 
         StatusService::del($status->id, true);
         AccountService::del($status->profile_id);