Merge pull request #1 from tobiasehlert/master

enable html formatting in Pushover message
LeonardoTeixeira · Jan 4, 2016 · 74b88f8 · 74b88f8
2 parents 0a453b0 + 94e0d99
commit 74b88f8
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 4 deletions.
diff --git a/README.md b/README.md
@@ -76,12 +76,13 @@ use LeonardoTeixeira\Pushover\Exceptions\PushoverException;
 $client = new Client('YOUR_USER_CODE_HERE', 'YOUR_TOKEN_HERE');
 
 $message = new Message();
-$message->setMessage('Your messsage here.');
+$message->setMessage('Your messsage <b>here</b>.');
 $message->setTitle('Title here');
 $message->setUrl('http://www.example.com/');
 $message->setUrlTitle('Click me!');
 $message->setPriority(Priority::HIGH);
 $message->setSound(Sound::SIREN);
+$message->setHtml(true);
 $message->setDate(new \DateTime());
 
 try {

diff --git a/examples/complete-example.php b/examples/complete-example.php
@@ -13,12 +13,13 @@
 $client = new Client('YOUR_USER_CODE_HERE', 'YOUR_TOKEN_HERE');
 
 $message = new Message();
-$message->setMessage('Your messsage here.');
+$message->setMessage('Your messsage <b>here</b>.');
 $message->setTitle('Title here');
 $message->setUrl('http://www.example.com/');
 $message->setUrlTitle('Click me!');
 $message->setPriority(Priority::HIGH);
 $message->setSound(Sound::SIREN);
+$message->setHtml(true);
 $message->setDate(new \DateTime());
 
 try {

diff --git a/src/LeonardoTeixeira/Pushover/Client.php b/src/LeonardoTeixeira/Pushover/Client.php
@@ -75,6 +75,10 @@ public function push(Message $message, $device = null)
             $postData['sound'] = $message->getSound();
         }
 
+        if ($message->hasHtml()) {
+            $postData['html'] = $message->getHtml();
+        }
+
         if ($message->hasDate()) {
             $postData['timestamp'] = $message->getDate()->getTimestamp();
         }

diff --git a/src/LeonardoTeixeira/Pushover/Message.php b/src/LeonardoTeixeira/Pushover/Message.php
@@ -12,6 +12,7 @@ class Message
     private $urlTitle;
     private $priority;
     private $sound;
+    private $html;
     private $date;
 
     public function __construct($message = null, $title = null, $priority = Priority::NORMAL)
@@ -51,6 +52,11 @@ public function getSound()
         return $this->sound;
     }
 
+    public function getHtml()
+    {
+        return $this->html;
+    }
+
     public function getDate()
     {
         return $this->date;
@@ -92,6 +98,14 @@ public function setSound($sound)
         $this->sound = $sound;
     }
 
+    public function setHtml($html)
+    {
+        if ($html)
+            $this->html = 1;
+        else
+            $this->html = 0;
+    }
+
     public function setDate(\DateTime $date)
     {
         $this->date = $date;
@@ -117,6 +131,11 @@ public function hasSound()
         return !is_null($this->sound);
     }
 
+    public function hasHtml()
+    {
+        return !is_null($this->html);
+    }
+
     public function hasDate()
     {
         return ($this->date instanceof \DateTime);

diff --git a/tests/LeonardoTeixeira/Pushover/MessageTest.php b/tests/LeonardoTeixeira/Pushover/MessageTest.php
@@ -11,20 +11,22 @@ public function setUp()
         $this->messages = [
             [
                 'title' => 'Example Message 1',
-                'message' => 'Example content message 1.',
+                'message' => 'Example content message <b>1</b>.',
                 'url' => 'http://www.google.com/',
                 'url_title' => 'Google',
                 'priority' => - 2,
                 'sound' => 'classical',
+                'html' => 1,
                 'date' => '2014-08-14'
             ],
             [
                 'title' => 'Example Message 2',
-                'message' => 'Example content message 2.',
+                'message' => 'Example content message <b>2</b>.',
                 'url' => 'https://github.com/',
                 'url_title' => 'Github',
                 'priority' => 1,
                 'sound' => 'spacealarm',
+                'html' => 0,
                 'date' => '2014-08-10'
             ]
         ];
@@ -51,6 +53,7 @@ public function testGettersAndSetters()
             $m->setUrlTitle($message['url_title']);
             $m->setPriority($message['priority']);
             $m->setSound($message['sound']);
+            $m->setHtml($message['html']);
             $m->setDate(new \DateTime($message['date']));
 
             $this->assertEquals($message['title'], $m->getTitle());
@@ -59,6 +62,7 @@ public function testGettersAndSetters()
             $this->assertEquals($message['url_title'], $m->getUrlTitle());
             $this->assertEquals($message['priority'], $m->getPriority());
             $this->assertEquals($message['sound'], $m->getSound());
+            $this->assertEquals($message['html'], $m->getHtml());
             $this->assertEquals($message['date'], $m->getDate()
                 ->format('Y-m-d'));
         }
@@ -76,6 +80,7 @@ public function testHasMethods()
             $this->assertFalse($m->hasUrl());
             $this->assertFalse($m->hasUrlTitle());
             $this->assertFalse($m->hasSound());
+            $this->assertFalse($m->hasHtml());
             $this->assertFalse($m->hasDate());
         }
 
@@ -88,12 +93,14 @@ public function testHasMethods()
             $m->setUrlTitle($message['url_title']);
             $m->setPriority($message['priority']);
             $m->setSound($message['sound']);
+            $m->setHtml($message['html']);
             $m->setDate(new \DateTime($message['date']));
 
             $this->assertTrue($m->hasTitle());
             $this->assertTrue($m->hasUrl());
             $this->assertTrue($m->hasUrlTitle());
             $this->assertTrue($m->hasSound());
+            $this->assertTrue($m->hasHtml());
             $this->assertTrue($m->hasDate());
         }
     }