Merge pull request #108 from dunice/master

Added attributes to PushMessage class and adjustmented PushChannel
Edujugon · Jan 25, 2020 · cc3e61d · cc3e61d
2 parents 9ab69b7 + f68e218
commit cc3e61d
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 5 deletions.
diff --git a/src/Channels/GcmChannel.php b/src/Channels/GcmChannel.php
@@ -26,6 +26,7 @@ protected function buildData(PushMessage $message)
                     'title' => $message->title,
                     'body' => $message->body,
                     'sound' => $message->sound,
+                    'color' => $message->color,
                     'click_action' => $message->click_action,
                 ],
             ];

diff --git a/src/Channels/PushChannel.php b/src/Channels/PushChannel.php
@@ -32,13 +32,13 @@ public function __construct(PushNotification $push)
      */
     public function send($notifiable, Notification $notification)
     {
-        if (! $to = $notifiable->routeNotificationFor($this->notificationFor())) {
-            return;
-        }
-
         $message = $this->buildMessage($notifiable, $notification);
-
         $data = $this->buildData($message);
+        $to = $message->to ?? $notifiable->routeNotificationFor($this->notificationFor());
+
+        if (! $to) {
+            return;
+        }
 
         $this->push($this->pushServiceName(), $to, $data, $message);
     }

diff --git a/src/Messages/PushMessage.php b/src/Messages/PushMessage.php
@@ -4,6 +4,11 @@
 
 class PushMessage
 {
+    /**
+     * @var string
+     */
+    public $to;
+
     /**
      * @var string
      */
@@ -49,6 +54,11 @@ class PushMessage
      */
     public $config = [];
 
+    /**
+     * @var string
+     */
+    public $color = '#000000';
+
     /**
      * Create a new message instance.
      *
@@ -60,6 +70,13 @@ public function __construct($body = '')
         $this->body = $body;
     }
 
+    public function to($to)
+    {
+        $this->to = $to;
+
+        return $this;
+    }
+
     /**
      * Set the message body.
      *
@@ -151,6 +168,19 @@ public function badge($badge)
         return $this;
     }
 
+    /**
+     * Set notification icon color.
+     *
+     * @param string $color
+     * @return $this
+     */
+    public function color($color)
+    {
+        $this->color = $color;
+
+        return $this;
+    }
+
     /**
      * Set message extra data.
      *