Merge pull request #3940 from pixelfed/staging

Update InboxPipeline, dispatch Follow/Accept Follow jobs to follow queue

CHANGELOG.md

@@ -53,6 +53,7 @@
 - Update MediaStorageService, improve support for pleroma .blob avatars ([66226658](https://github.com/pixelfed/pixelfed/commit/66226658))
 - Update ApiV1Controller, remove min avatar size limit, fixes #3715 ([2b0db812](https://github.com/pixelfed/pixelfed/commit/2b0db812))
 - Update InboxPipeline, add inbox job queue and separate http sig validation from activity handling ([e6c1604d](https://github.com/pixelfed/pixelfed/commit/e6c1604d))
+- Update InboxPipeline, dispatch Follow/Accept Follow jobs to follow queue ([f62d2494](https://github.com/pixelfed/pixelfed/commit/f62d2494))
 -  ([](https://github.com/pixelfed/pixelfed/commit/))
 
 ## [v0.11.4 (2022-10-04)](https://github.com/pixelfed/pixelfed/compare/v0.11.3...v0.11.4)

app/Jobs/InboxPipeline/InboxValidator.php

@@ -78,7 +78,11 @@ class InboxValidator implements ShouldQueue
         }
 
         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;
         } else {
             return;

app/Jobs/InboxPipeline/SharedInboxWorker.php

@@ -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();
-    }
-}