Merge pull request #4001 from pixelfed/staging

Update DeletePipeline

app/Jobs/DeletePipeline/DeleteRemoteStatusPipeline.php

@@ -30,6 +30,10 @@ class DeleteRemoteStatusPipeline implements ShouldQueue
 
     protected $status;
 
+    public $timeout = 300;
+    public $tries = 3;
+    public $maxExceptions = 1;
+
     /**
      * Create a new job instance.
      *
@@ -62,7 +66,7 @@ class DeleteRemoteStatusPipeline implements ShouldQueue
         Media::whereStatusId($status->id)
             ->get()
             ->each(function($media) {
-                MediaDeletePipeline::dispatchNow($media);
+                MediaDeletePipeline::dispatch($media)->onQueue('mmo');
             });
         Mention::whereStatusId($status->id)->forceDelete();
         Report::whereObjectType('App\Status')->whereObjectId($status->id)->delete();

app/Jobs/MediaPipeline/MediaDeletePipeline.php

@@ -17,6 +17,10 @@ class MediaDeletePipeline implements ShouldQueue
 
 	protected $media;
 
+    public $timeout = 300;
+    public $tries = 3;
+    public $maxExceptions = 1;
+
 	public function __construct(Media $media)
 	{
 		$this->media = $media;

app/Util/ActivityPub/Inbox.php

@@ -681,7 +681,7 @@ class Inbox
 						if(!$status) {
 							return;
 						}
-						DeleteRemoteStatusPipeline::dispatch($status)->onQueue('delete');
+						DeleteRemoteStatusPipeline::dispatch($status)->onQueue('high');
 						return;
 					break;