From 24bd9c2f5a057ba3f5d7e1fd6377068175b6b7df Mon Sep 17 00:00:00 2001
From: Louis Jeckel <louis.jeckel@outlook.cm>
Date: Tue, 14 Apr 2020 16:23:50 +0200
Subject: [PATCH] add env to email tags

---
 app/Events/ProcessMailgunWebhook.php     | 10 ++++++++++
 app/Jobs/ProcessEmailBatch.php           |  2 +-
 app/Providers/HorizonServiceProvider.php |  2 +-
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/app/Events/ProcessMailgunWebhook.php b/app/Events/ProcessMailgunWebhook.php
index 6e657d9..9346d65 100644
--- a/app/Events/ProcessMailgunWebhook.php
+++ b/app/Events/ProcessMailgunWebhook.php
@@ -26,6 +26,8 @@ class ProcessMailgunWebhook implements ShouldBroadcast
 
     public $data;
 
+    private $broadcast;
+
 
     /**
      * Create a new event instance.
@@ -36,6 +38,9 @@ class ProcessMailgunWebhook implements ShouldBroadcast
     {
         $tags = Arr::get($webhookData, 'event-data.tags');
 
+        $broadcast = in_array(env('APP_ENV'), $tags, true);
+
+
         /** @todo check webhook key */
 
         $this->batch_id = Str::after(Arr::first($tags, function($tag) {
@@ -63,6 +68,11 @@ class ProcessMailgunWebhook implements ShouldBroadcast
         return new PrivateChannel('emailBatch.'.$this->batch_id);
     }
 
+    public function broadcastWhen()
+    {
+        return $this->broadcast;
+    }
+
     /**
      * The event's broadcast name.
      */
diff --git a/app/Jobs/ProcessEmailBatch.php b/app/Jobs/ProcessEmailBatch.php
index 5b81529..59e0a0c 100644
--- a/app/Jobs/ProcessEmailBatch.php
+++ b/app/Jobs/ProcessEmailBatch.php
@@ -83,7 +83,7 @@ class ProcessEmailBatch implements ShouldQueue
                 'subject' => $this->batch->subject,
                 'recipient-variables' => $variables,
                 'html' => $view,
-                'o:tag' => [$this->batch->getTag(), 'psq'],
+                'o:tag' => [$this->batch->getTag(), 'psq', env('APP_ENV')],
                 'o:testmode' => env('MAILGUN_TEST_MODE', 'yes'),
             ];
 
diff --git a/app/Providers/HorizonServiceProvider.php b/app/Providers/HorizonServiceProvider.php
index 45ccba3..0ef1ae5 100644
--- a/app/Providers/HorizonServiceProvider.php
+++ b/app/Providers/HorizonServiceProvider.php
@@ -34,7 +34,7 @@ class HorizonServiceProvider extends HorizonApplicationServiceProvider
      */
     protected function gate()
     {
-        Gate::define('viewHorizon', function ($user) {
+        Gate::define('viewHorizon', function ($user = null) {
             return true;
         });
     }
-- 
2.39.5