chris
/
pixelfed
forked from mirror/pixelfed
1
0
Fork 0
Code Pull Requests Activity

Merge pull request #4001 from pixelfed/staging 

Update DeletePipeline
This commit is contained in:
daniel 2022-12-24 02:02:18 -07:00 committed by GitHub
parent 73d2d6916d aa32eb8780
commit 1dd205ed06
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/Jobs/DeletePipeline/DeleteRemoteStatusPipeline.php
View File

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

4
app/Jobs/MediaPipeline/MediaDeletePipeline.php
View File

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

2
app/Util/ActivityPub/Inbox.php
View File

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