Improve the Nova\Notifications\ChannelManager

nova-framework · May 11, 2018 · 2333ee8 · 2333ee8
1 parent c6ab98e
commit 2333ee8
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/src/Foundation/Application.php b/src/Foundation/Application.php
@@ -41,7 +41,7 @@ class Application extends Container implements ResponsePreparerInterface
      *
      * @var string
      */
-    const VERSION = '4.0.49';
+    const VERSION = '4.0.50';
 
     /**
      * Indicates if the application has "booted".

diff --git a/src/Notifications/ChannelManager.php b/src/Notifications/ChannelManager.php
@@ -166,11 +166,17 @@ protected function shouldSendNotification($notifiable, $notification, $channel)
     protected function queueToNotifiable($notifiable, $id, $notification, $channel)
     {
         $notification->id = $id;
+
+        $connection = isset($notification->connection) ? $notification->connection : null;
+
+        $queue = isset($notification->queue) ? $notification->queue : null;
+
+        $delay = isset($notification->delay) ? $notification->delay : null;
 
         $job = with(new SendQueuedNotifications($notifiable, $notification, array($channel)))
-            ->onConnection($notification->connection)
-            ->onQueue($notification->queue)
-            ->delay($notification->delay);
+            ->onConnection($connection)
+            ->onQueue($queue)
+            ->delay($delay);
 
         $this->bus->dispatch($job);
     }