From 64768555198abc229305fa5f4d5ef3a6ad9a8fbb Mon Sep 17 00:00:00 2001
From: Daniel Supernault <danielsupernault@gmail.com>
Date: Fri, 22 May 2020 15:53:59 -0600
Subject: [PATCH] Update jobs, add retry and timeout attributes

---
 app/Jobs/CommentPipeline/CommentPipeline.php  | 3 +++
 app/Jobs/LikePipeline/LikePipeline.php        | 3 +++
 app/Jobs/StatusPipeline/NewStatusPipeline.php | 3 +++
 app/Jobs/StatusPipeline/StatusEntityLexer.php | 9 ++++++++-
 4 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/app/Jobs/CommentPipeline/CommentPipeline.php b/app/Jobs/CommentPipeline/CommentPipeline.php
index b1cd5df38..0ca74e78b 100644
--- a/app/Jobs/CommentPipeline/CommentPipeline.php
+++ b/app/Jobs/CommentPipeline/CommentPipeline.php
@@ -30,6 +30,9 @@ class CommentPipeline implements ShouldQueue
      * @var bool
      */
     public $deleteWhenMissingModels = true;
+
+    public $timeout = 5;
+    public $tries = 1;
     
     /**
      * Create a new job instance.
diff --git a/app/Jobs/LikePipeline/LikePipeline.php b/app/Jobs/LikePipeline/LikePipeline.php
index 593b4c4bc..3e4d28506 100644
--- a/app/Jobs/LikePipeline/LikePipeline.php
+++ b/app/Jobs/LikePipeline/LikePipeline.php
@@ -28,6 +28,9 @@ class LikePipeline implements ShouldQueue
      */
     public $deleteWhenMissingModels = true;
 
+    public $timeout = 5;
+    public $tries = 1;
+
     /**
      * Create a new job instance.
      *
diff --git a/app/Jobs/StatusPipeline/NewStatusPipeline.php b/app/Jobs/StatusPipeline/NewStatusPipeline.php
index e2f2a4c69..8ccb2926f 100644
--- a/app/Jobs/StatusPipeline/NewStatusPipeline.php
+++ b/app/Jobs/StatusPipeline/NewStatusPipeline.php
@@ -23,6 +23,9 @@ class NewStatusPipeline implements ShouldQueue
      * @var bool
      */
     public $deleteWhenMissingModels = true;
+
+    public $timeout = 5;
+    public $tries = 1;
     
     /**
      * Create a new job instance.
diff --git a/app/Jobs/StatusPipeline/StatusEntityLexer.php b/app/Jobs/StatusPipeline/StatusEntityLexer.php
index 197477672..82ef38890 100644
--- a/app/Jobs/StatusPipeline/StatusEntityLexer.php
+++ b/app/Jobs/StatusPipeline/StatusEntityLexer.php
@@ -8,6 +8,7 @@ use App\Mention;
 use App\Profile;
 use App\Status;
 use App\StatusHashtag;
+use App\Services\PublicTimelineService;
 use App\Util\Lexer\Autolink;
 use App\Util\Lexer\Extractor;
 use DB;
@@ -136,7 +137,13 @@ class StatusEntityLexer implements ShouldQueue
 
     public function deliver()
     {
-        if(config('federation.activitypub.enabled') == true) {
+        $status = $this->status;
+
+        if($status->uri == null && $status->scope == 'public') {
+            PublicTimelineService::add($status->id);
+        }
+
+        if(config('federation.activitypub.enabled') == true && config('app.env') == 'production') {
             StatusActivityPubDeliver::dispatch($this->status);
         }
     }