Don't convert some symbols if they are part of a URL

CHANGELOG.md

@@ -9,10 +9,19 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 ### Added
 
+### Changed
+
+[0.1.3] - 2019-09-18
+--------------------
+
+### Added
+
 - API interface to send requests to the API
 
 ### Changed
 
+- Improved the way we convert < and > symbols to make sure that link inclusion can work.
+
 [0.1.2] - 2017-01-19
 --------------------
 

README.md

@@ -98,6 +98,9 @@ In order to instantiate a connection to the API, you will need a token. You can
 
 Each section of the [API documentation](https://api.slack.com/methods) has its own class with the corresponding methods.
 
+
+### API
+
 ```php
 use Strime\Slackify\Api\Api;
 
@@ -110,6 +113,8 @@ The following links will give you more details about the methods, specially abou
 - [test](https://api.slack.com/methods/api.test)
 
 
+### Auth
+
 ```php
 use Strime\Slackify\Api\Auth;
 
@@ -124,6 +129,8 @@ The following links will give you more details about the methods:
 - [test](https://api.slack.com/methods/auth.test)
 
 
+### Bots
+
 ```php
 use Strime\Slackify\Api\Bots;
 
@@ -176,6 +183,8 @@ The following links will give you more details about the methods:
 - [unarchive](https://api.slack.com/methods/channels.unarchive)
 
 
+### Chats
+
 ```php
 use Strime\Slackify\Api\Chat;
 
@@ -194,6 +203,8 @@ The following links will give you more details about the methods:
 - [update](https://api.slack.com/methods/chat.update)
 
 
+### Dnd
+
 ```php
 use Strime\Slackify\Api\Dnd;
 
@@ -214,6 +225,8 @@ The following links will give you more details about the methods:
 - [teamInfo](https://api.slack.com/methods/dnd.teamInfo)
 
 
+### Emoji
+
 ```php
 use Strime\Slackify\Api\Emoji;
 
@@ -226,6 +239,8 @@ The following links will give you more details about the methods:
 - [list](https://api.slack.com/methods/emoji.list)
 
 
+### FilesComments
+
 ```php
 use Strime\Slackify\Api\FilesComments;
 
@@ -242,6 +257,8 @@ The following links will give you more details about the methods:
 - [edit](https://api.slack.com/methods/files.comments.edit)
 
 
+### Files
+
 ```php
 use Strime\Slackify\Api\Files;
 
@@ -264,6 +281,8 @@ The following links will give you more details about the methods:
 - [upload](https://api.slack.com/methods/files.upload)
 
 
+### Groups
+
 ```php
 use Strime\Slackify\Api\Groups;
 
@@ -308,6 +327,8 @@ The following links will give you more details about the methods:
 - [unarchive](https://api.slack.com/methods/groups.unarchive)
 
 
+### Im
+
 ```php
 use Strime\Slackify\Api\Im;
 
@@ -330,6 +351,8 @@ The following links will give you more details about the methods:
 - [replies](https://api.slack.com/methods/im.replies)
 
 
+### Mpim
+
 ```php
 use Strime\Slackify\Api\Mpim;
 
@@ -352,6 +375,8 @@ The following links will give you more details about the methods:
 - [replies](https://api.slack.com/methods/mpim.replies)
 
 
+### Oauth
+
 ```php
 use Strime\Slackify\Api\Oauth;
 
@@ -363,6 +388,9 @@ $api_oauth_request->access("client_id", "client_secret", "code", "https://www.fo
 The following links will give you more details about the methods:
 - [access](https://api.slack.com/methods/oauth.access)
 
+
+### Pin
+
 ```php
 use Strime\Slackify\Api\Pin;
 
@@ -378,6 +406,9 @@ The following links will give you more details about the methods:
 - [list](https://api.slack.com/methods/pins.list)
 - [remove](https://api.slack.com/methods/pins.remove)
 
+
+### Reactions
+
 ```php
 use Strime\Slackify\Api\Reactions;
 
@@ -395,6 +426,9 @@ The following links will give you more details about the methods:
 - [list](https://api.slack.com/methods/reactions.list)
 - [remove](https://api.slack.com/methods/reactions.remove)
 
+
+### Reminders
+
 ```php
 use Strime\Slackify\Api\Reminders;
 
@@ -414,6 +448,9 @@ The following links will give you more details about the methods:
 - [info](https://api.slack.com/methods/reminders.info)
 - [list](https://api.slack.com/methods/reminders.list)
 
+
+### Rtm
+
 ```php
 use Strime\Slackify\Api\Rtm;
 
@@ -425,6 +462,9 @@ $api_rtm_request->start(TRUE, FALSE, TRUE);
 The following links will give you more details about the methods:
 - [start](https://api.slack.com/methods/rtm.start)
 
+
+### Search
+
 ```php
 use Strime\Slackify\Api\Search;
 
@@ -440,6 +480,9 @@ The following links will give you more details about the methods:
 - [files](https://api.slack.com/methods/search.files)
 - [messages](https://api.slack.com/methods/search.messages)
 
+
+### Stars
+
 ```php
 use Strime\Slackify\Api\Stars;
 
@@ -455,6 +498,9 @@ The following links will give you more details about the methods:
 - [list](https://api.slack.com/methods/stars.list)
 - [remove](https://api.slack.com/methods/stars.remove)
 
+
+### Team
+
 ```php
 use Strime\Slackify\Api\Team;
 
@@ -474,6 +520,9 @@ The following links will give you more details about the methods:
 - [integrationLogs](https://api.slack.com/methods/team.integrationLogs)
 - [profile.get](https://api.slack.com/methods/team.profile.get)
 
+
+### UserGroups
+
 ```php
 use Strime\Slackify\Api\UserGroups;
 
@@ -497,6 +546,9 @@ The following links will give you more details about the methods:
 - [users.list](https://api.slack.com/methods/usergroups.users.list)
 - [users.update](https://api.slack.com/methods/usergroups.users.update)
 
+
+### Users
+
 ```php
 use Strime\Slackify\Api\Users;
 
@@ -521,6 +573,9 @@ The following links will give you more details about the methods:
 - [setPhoto](https://api.slack.com/methods/users.setPhoto)
 - [setPresence](https://api.slack.com/methods/users.setPresence)
 
+
+### UsersProfile
+
 ```php
 use Strime\Slackify\Api\UsersProfile;
 

src/Strime/Slackify/Webhooks/Webhook.php

@@ -68,7 +68,7 @@ public function sendMessage($values) {
 
         // Parse the values to make sure they are valid
         foreach ($values as $key => $value) {
-            
+
             // Create an array with the valid values
             $valid_values = explode(",", self::SLACK_VALID_VALUES);
 
@@ -89,13 +89,13 @@ public function sendMessage($values) {
 
         // Encode the message
         $values["message"] = str_replace('&', '&', $values["message"]);
-        $values["message"] = str_replace('<', '&lt;', $values["message"]);
-        $values["message"] = str_replace('>', '&gt;', $values["message"]);
+        $values["message"] = str_replace(' < ', ' &lt; ', $values["message"]);
+        $values["message"] = str_replace(' > ', ' &gt; ', $values["message"]);
 
         // Add the link to the message if needed.
         if (isset($values["link"]) && ($values["link"] !== NULL)) {
             $values["message"] .= "\n";
-            $values["message"] .= "<" . $values["link"]; 
+            $values["message"] .= "<" . $values["link"];
             if (isset($values["link_text"]) && ($values["link_text"] !== NULL)) {
                 $values["message"] .= "|" . $values["link_text"];
             }
@@ -171,7 +171,7 @@ public function setAttachments($attachments)
         // Browse the attachments to see if the key is valid.
         foreach ($attachments as $attachment) {
             foreach ($attachment as $key => $value) {
-            
+
                 // Create an array with the valid values
                 $valid_values = explode(",", self::SLACK_VALID_ATTACHMENTS);