From ec335288dfefec0513c98721aab453ab59f5a020 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Sun, 30 Jul 2023 05:45:14 -0600 Subject: [PATCH] Update SharePipeline --- app/Jobs/SharePipeline/SharePipeline.php | 7 +++++-- app/Jobs/SharePipeline/UndoSharePipeline.php | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/app/Jobs/SharePipeline/SharePipeline.php b/app/Jobs/SharePipeline/SharePipeline.php index 0b580500b..ae184957e 100644 --- a/app/Jobs/SharePipeline/SharePipeline.php +++ b/app/Jobs/SharePipeline/SharePipeline.php @@ -49,7 +49,10 @@ class SharePipeline implements ShouldQueue public function handle() { $status = $this->status; - $parent = $this->status->parent(); + $parent = Status::find($this->status->reblog_of_id); + if(!$parent) { + return; + } $actor = $status->profile; $target = $parent->profile; @@ -84,7 +87,7 @@ class SharePipeline implements ShouldQueue public function remoteAnnounceDeliver() { - if(config_cache('federation.activitypub.enabled') == false) { + if(config('app.env') !== 'production' || config_cache('federation.activitypub.enabled') == false) { return true; } $status = $this->status; diff --git a/app/Jobs/SharePipeline/UndoSharePipeline.php b/app/Jobs/SharePipeline/UndoSharePipeline.php index 6d39dfa39..3f50d9bba 100644 --- a/app/Jobs/SharePipeline/UndoSharePipeline.php +++ b/app/Jobs/SharePipeline/UndoSharePipeline.php @@ -70,7 +70,7 @@ class UndoSharePipeline implements ShouldQueue public function remoteAnnounceDeliver() { - if(config_cache('federation.activitypub.enabled') == false) { + if(config('app.env') !== 'production' || config_cache('federation.activitypub.enabled') == false) { return 1; }