Refactor.

Author: irazasyed

src/TelegramChannel.php

@@ -31,63 +31,41 @@ public function __construct(Telegram $telegram)
      */
     public function send($notifiable, Notification $notification)
     {
+        if (!$this->shouldSendMessage($notifiable, $notification)) {
+            return;
+        }
+
         $message = $notification->toTelegram($notifiable);
 
         if (is_string($message)) {
-            $message = new TelegramMessage($message);
+            $message = TelegramMessage::create($message);
         }
 
-        if (!$chatId = $this->chatId($message, $notifiable)) {
-            return;
-        }
+        if ($message->toNotGiven()) {
+            if (!$to = $notifiable->routeNotificationFor('telegram')) {
+                return;
+            }
 
-        $shouldSendMessage = event(new SendingMessage($notifiable, $notification), [], true) !== false;
-
-        if (!$shouldSendMessage) {
-            return;
+            $message->to($to);
         }
 
-        $params = array_merge([
-            'chat_id'      => $chatId,
-            'text'         => trim($message->content),
-            'parse_mode'   => 'Markdown',
-            'reply_markup' => $this->getReplyMarkup($message),
-        ], $message->options);
+        $params = $message->toArray();
 
         $this->telegram->sendMessage($params);
 
         event(new MessageWasSent($notifiable, $notification));
     }
 
     /**
-     * @param TelegramMessage $message
-     * @param                 $notifiable
+     * Check if we can send the notification.
      *
-     * @return mixed
-     */
-    protected function chatId(TelegramMessage $message, $notifiable)
-    {
-        return $message->chatId ?: $notifiable->routeNotificationFor('telegram') ?: null;
-    }
-
-    /**
-     * Get Reply Markup (Inline Keyboard).
-     *
-     * @param TelegramMessage $message
+     * @param              $notifiable
+     * @param Notification $notification
      *
-     * @return $this|void
+     * @return bool
      */
-    protected function getReplyMarkup(TelegramMessage $message)
+    protected function shouldSendMessage($notifiable, Notification $notification)
     {
-        if (!$message->actionText) {
-            return;
-        }
-
-        return (new Telegram())
-            ->buttons([
-                'text' => $message->actionText,
-                'url'  => $message->actionUrl,
-            ])
-            ->getKeyboardMarkup();
+        return event(new SendingMessage($notifiable, $notification), [], true) !== false;
     }
 }

src/TelegramMessage.php

@@ -5,39 +5,14 @@
 class TelegramMessage
 {
     /**
-     * The Telegram Chat ID the message should be sent to.
-     *
-     * @var string
-     */
-    public $chatId;
-
-    /**
-     * The message content.
-     *
-     * @var string
+     * @var array Params payload.
      */
-    public $content;
+    public $payload = [];
 
     /**
-     * The text / label for the action.
-     *
-     * @var string
+     * @var array Inline Keyboard Buttons.
      */
-    public $actionText;
-
-    /**
-     * The action URL.
-     *
-     * @var string
-     */
-    public $actionUrl;
-
-    /**
-     * Additional options to be passed to the sendMessage method.
-     *
-     * @var array
-     */
-    public $options = [];
+    protected $buttons = [];
 
     /**
      * @param string $content
@@ -56,45 +31,52 @@ public static function create($content = '')
      */
     public function __construct($content = '')
     {
-        $this->content = $content;
+        $this->content($content);
+        $this->payload['parse_mode'] = 'Markdown';
     }
 
     /**
+     * Recipient's Chat ID.
+     *
      * @param $chatId
      *
      * @return $this
      */
     public function to($chatId)
     {
-        $this->chatId = $chatId;
+        $this->payload['chat_id'] = $chatId;
 
         return $this;
     }
 
     /**
+     * Notification message (Supports Markdown).
+     *
      * @param $content
      *
      * @return $this
      */
     public function content($content)
     {
-        $this->content = $content;
+        $this->payload['text'] = $content;
 
         return $this;
     }
 
     /**
-     * Configure the "call to action" button.
+     * Add an inline button.
      *
      * @param string $text
      * @param string $url
      *
      * @return $this
      */
-    public function action($text, $url)
+    public function button($text, $url)
     {
-        $this->actionText = $text;
-        $this->actionUrl = $url;
+        $this->buttons[] = compact('text', 'url');
+
+        $replyMarkup['inline_keyboard'] = array_chunk($this->buttons, 2);
+        $this->payload['reply_markup'] = json_encode($replyMarkup);
 
         return $this;
     }
@@ -108,8 +90,28 @@ public function action($text, $url)
      */
     public function options(array $options)
     {
-        $this->options = $options;
+        $this->payload = array_merge($this->payload, $options);
 
         return $this;
     }
+
+    /**
+     * Determine if chat id is not given.
+     *
+     * @return bool
+     */
+    public function toNotGiven()
+    {
+        return !isset($this->payload['chat_id']);
+    }
+
+    /**
+     * Returns params payload.
+     *
+     * @return array
+     */
+    public function toArray()
+    {
+        return $this->payload;
+    }
 }