Add ability to send to both platforms in a single shot

Author: themsaid

README.md

@@ -94,6 +94,30 @@ class AccountApproved extends Notification
 - `badge(1)`: Accepts an integer value for the badge. (iOS Only)
 - `setOption($key, $value)`: Allows you to set any value in the message payload. For more information [check here for iOS](https://pusher.com/docs/push_notifications/ios/server), [or here for Android](https://pusher.com/docs/push_notifications/android/server).
 
+### Sending to multiple platforms
+
+You can send a single message to an iOS device and an Android device at the same time using the `withiOS()` and `withAndroid()` method:
+
+```php
+public function toPushNotification($notifiable)
+{
+    $message = "Your {$notifiable->service} account was approved!";
+
+    return PusherMessage::create()
+        ->iOS()
+        ->badge(1)
+        ->body($message)
+        ->withAndroid(
+            PusherMessage::create()
+                ->title($message)
+                ->icon('icon')
+        );
+}
+```
+
+> - Notice that iOS is the default platform, which means you don't have to call `->iOS()`.
+> - When using `withAndroid()` or `withiOS()` you don't have to define the platform, it's done behind the scenes for you.
+
 ### Routing a message
 
 By default the pusher "interest" messages will be sent to will be defined using the {notifiable}.{id} convention, for example `App.User.1`, however you can change this behaviour by including a `routeNotificationForPusherPushNotifications()` in the notifiable class method that returns the interest name.

src/Exceptions/CouldNotCreateMessage.php

@@ -8,11 +8,19 @@ class CouldNotCreateMessage extends Exception
 {
     /**
      * @param string $platform
-     *
      * @return static
      */
     public static function invalidPlatformGiven($platform)
     {
         return new static("Platform `{$platform}` is invalid. It should be either `iOS` or `Android`.");
     }
+
+    /**
+     * @param $platform
+     * @return static
+     */
+    public static function platformConflict($platform)
+    {
+        return new static("You are trying to send an extra message to `{$platform}` while the original message is to `{$platform}`.");
+    }
 }

src/PusherMessage.php

@@ -56,6 +56,13 @@ class PusherMessage
      */
     protected $options = [];
 
+    /**
+     * An extra message to the other platform.
+     *
+     * @var
+     */
+    protected $extraMessage;
+
     /**
      * @param string $body
      *
@@ -118,6 +125,47 @@ public function android()
         return $this;
     }
 
+    /**
+     * Set an extra message to be sent to Android.
+     *
+     * @param \NotificationChannels\PusherPushNotifications\PusherMessage $message
+     * @return $this
+     */
+    public function withAndroid(PusherMessage $message)
+    {
+        $this->withExtra($message->android());
+
+        return $this;
+    }
+
+    /**
+     * Set an extra message to be sent to iOS.
+     *
+     * @param \NotificationChannels\PusherPushNotifications\PusherMessage $message
+     * @return $this
+     */
+    public function withiOS(PusherMessage $message)
+    {
+        $this->withExtra($message->iOS());
+
+        return $this;
+    }
+
+    /**
+     * Set an extra message to be sent to another platform.
+     *
+     * @param \NotificationChannels\PusherPushNotifications\PusherMessage $message
+     * @return void
+     */
+    private function withExtra(PusherMessage $message)
+    {
+        if ($message->getPlatform() == $this->platform) {
+            throw CouldNotCreateMessage::platformConflict($this->platform);
+        }
+
+        $this->extraMessage = $message;
+    }
+
     /**
      * Set the message title.
      *
@@ -229,13 +277,11 @@ public function toiOS()
                     ],
                     'sound' => $this->sound,
                     'badge' => $this->badge,
-                ],
-            ],
+                ]
+            ]
         ];
 
-        foreach ($this->options as $option => $value) {
-            Arr::set($message, $option, $value);
-        }
+        $this->formatMessage($message);
 
         return $message;
     }
@@ -258,10 +304,34 @@ public function toAndroid()
             ],
         ];
 
+        $this->formatMessage($message);
+
+        return $message;
+    }
+
+    /**
+     * Return the current platform.
+     *
+     * @return string
+     */
+    public function getPlatform()
+    {
+        return $this->platform;
+    }
+
+    /**
+     * Format the final Payload.
+     *
+     * @param $message
+     */
+    private function formatMessage(&$message)
+    {
+        if ($this->extraMessage) {
+            $message = array_merge($message, $this->extraMessage->toArray());
+        }
+
         foreach ($this->options as $option => $value) {
             Arr::set($message, $option, $value);
         }
-
-        return $message;
     }
 }