From aad4259a47f3830fac1d4625dd3625c19e863ff2 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Thu, 25 May 2023 01:13:43 -0600 Subject: [PATCH] Update ap inbox --- app/Jobs/StatusPipeline/StatusRemoteUpdatePipeline.php | 6 ++---- app/Util/ActivityPub/Inbox.php | 6 +----- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/app/Jobs/StatusPipeline/StatusRemoteUpdatePipeline.php b/app/Jobs/StatusPipeline/StatusRemoteUpdatePipeline.php index 5d545573..980a88b7 100644 --- a/app/Jobs/StatusPipeline/StatusRemoteUpdatePipeline.php +++ b/app/Jobs/StatusPipeline/StatusRemoteUpdatePipeline.php @@ -18,15 +18,13 @@ class StatusRemoteUpdatePipeline implements ShouldQueue { use Dispatchable, InteractsWithQueue, Queueable, SerializesModels; - public $actor; public $activity; /** * Create a new job instance. */ - public function __construct($actor, $activity) + public function __construct($activity) { - $this->actor = $actor; $this->activity = $activity; } @@ -36,7 +34,7 @@ class StatusRemoteUpdatePipeline implements ShouldQueue public function handle(): void { $activity = $this->activity; - $status = Status::with('media')->whereProfileId($this->actor['id'])->whereObjectUrl($activity['id'])->first(); + $status = Status::with('media')->whereObjectUrl($activity['id'])->first(); if(!$status) { return; } diff --git a/app/Util/ActivityPub/Inbox.php b/app/Util/ActivityPub/Inbox.php index 5ac29f91..325d9b0c 100644 --- a/app/Util/ActivityPub/Inbox.php +++ b/app/Util/ActivityPub/Inbox.php @@ -1212,10 +1212,6 @@ class Inbox public function handleUpdateActivity() { $activity = $this->payload['object']; - $actor = $this->actorFirstOrCreate($this->payload['actor']); - if(!$actor || $actor->domain == null) { - return; - } if(!isset($activity['type'], $activity['id'])) { return; @@ -1223,7 +1219,7 @@ class Inbox if($activity['type'] === 'Note') { if(Status::whereObjectUrl($activity['id'])->exists()) { - StatusRemoteUpdatePipeline::dispatch($actor, $activity); + StatusRemoteUpdatePipeline::dispatch($activity); } } }