forked from mirror/pixelfed
Update InboxPipeline, dispatch Follow/Accept Follow jobs to follow queue
This commit is contained in:
parent
99a674bab6
commit
f62d2494a4
|
@ -78,7 +78,11 @@ class InboxValidator implements ShouldQueue
|
||||||
}
|
}
|
||||||
|
|
||||||
if($this->verifySignature($headers, $profile, $payload) == true) {
|
if($this->verifySignature($headers, $profile, $payload) == true) {
|
||||||
ActivityHandler::dispatch($headers, $profile, $payload)->onQueue('inbox');
|
if(isset($payload['type']) && in_array($payload['type'], ['Follow', 'Accept']) ) {
|
||||||
|
ActivityHandler::dispatch($headers, $profile, $payload)->onQueue('follow');
|
||||||
|
} else {
|
||||||
|
ActivityHandler::dispatch($headers, $profile, $payload)->onQueue('inbox');
|
||||||
|
}
|
||||||
return;
|
return;
|
||||||
} else {
|
} else {
|
||||||
return;
|
return;
|
||||||
|
|
|
@ -1,43 +0,0 @@
|
||||||
<?php
|
|
||||||
|
|
||||||
namespace App\Jobs\InboxPipeline;
|
|
||||||
|
|
||||||
use App\Util\ActivityPub\Inbox;
|
|
||||||
use Illuminate\Bus\Queueable;
|
|
||||||
use Illuminate\Contracts\Queue\ShouldQueue;
|
|
||||||
use Illuminate\Foundation\Bus\Dispatchable;
|
|
||||||
use Illuminate\Queue\InteractsWithQueue;
|
|
||||||
use Illuminate\Queue\SerializesModels;
|
|
||||||
|
|
||||||
class SharedInboxWorker implements ShouldQueue
|
|
||||||
{
|
|
||||||
use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
|
|
||||||
|
|
||||||
protected $request;
|
|
||||||
protected $profile;
|
|
||||||
protected $payload;
|
|
||||||
|
|
||||||
public $timeout = 300;
|
|
||||||
public $tries = 1;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Create a new job instance.
|
|
||||||
*
|
|
||||||
* @return void
|
|
||||||
*/
|
|
||||||
public function __construct($request, $payload)
|
|
||||||
{
|
|
||||||
$this->request = $request;
|
|
||||||
$this->payload = $payload;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Execute the job.
|
|
||||||
*
|
|
||||||
* @return void
|
|
||||||
*/
|
|
||||||
public function handle()
|
|
||||||
{
|
|
||||||
(new Inbox($this->request, null, $this->payload))->handleSharedInbox();
|
|
||||||
}
|
|
||||||
}
|
|
Loading…
Reference in New Issue