diff --git a/utils/parser.go b/utils/parser.go
index 0be29ab..02daaba 100644
--- a/utils/parser.go
+++ b/utils/parser.go
@@ -3,6 +3,7 @@ package utils
import (
"fmt"
"github-telegram-notify/types"
+ "html"
"strings"
)
@@ -108,7 +109,7 @@ func createPushText(event *types.PushEvent) string {
text += fmt.Sprintf("• %s - %s by %s\n",
commit.Url,
commit.Id[:7],
- commit.Message,
+ html.EscapeString(commit.Message),
commit.Author.HTMLURL,
commit.Author.Name,
)
@@ -133,7 +134,7 @@ func createIssueCommentText(event *types.IssueCommentEvent) string {
event.Sender.HTMLURL,
event.Sender.Login,
event.Issue.HTMLURL,
- event.Issue.Title,
+ html.EscapeString(event.Issue.Title),
event.Repo.HTMLURL,
event.Repo.FullName,
)
@@ -145,7 +146,7 @@ func createIssuesText(event *types.IssuesEvent) string {
event.Sender.Login,
event.Action,
event.Issue.HTMLURL,
- event.Issue.Title,
+ html.EscapeString(event.Issue.Title),
event.Repo.HTMLURL,
event.Repo.FullName,
)
@@ -158,7 +159,7 @@ func createPullRequestText(event *types.PullRequestEvent) (text string) {
text += " a new"
}
text += " pull request "
- text += fmt.Sprintf("%s", event.PullRequest.HTMLURL, event.PullRequest.Title)
+ text += fmt.Sprintf("%s", event.PullRequest.HTMLURL, html.EscapeString(event.PullRequest.Title))
text += fmt.Sprintf(" in %s", event.Repo.HTMLURL, event.Repo.FullName)
return text
}
@@ -168,7 +169,7 @@ func createPullRequestReviewCommentText(event *types.PullRequestReviewCommentEve
event.Sender.HTMLURL,
event.Sender.Login,
event.PullRequest.HTMLURL,
- event.PullRequest.Title,
+ html.EscapeString(event.PullRequest.Title),
event.Repo.HTMLURL,
event.Repo.FullName,
)
@@ -190,7 +191,7 @@ func createReleaseText(event *types.ReleaseEvent) (text string) {
if event.Release.Assets != nil {
text += "📦 Assets:\n"
for _, asset := range event.Release.Assets {
- text += fmt.Sprintf("• %s\n", asset.BrowserDownloadURL, asset.Name)
+ text += fmt.Sprintf("• %s\n", asset.BrowserDownloadURL, html.EscapeString(asset.Name))
}
}
diff --git a/utils/telegram.go b/utils/telegram.go
index 84975d9..d024ebf 100644
--- a/utils/telegram.go
+++ b/utils/telegram.go
@@ -4,7 +4,6 @@ import (
"encoding/json"
"fmt"
"github-telegram-notify/types"
- "html"
"io/ioutil"
"net/http"
"net/url"
@@ -15,8 +14,7 @@ func SendMessage(token string, chatID string, text string, markupText string, ma
req_url, _ := url.Parse(fmt.Sprint(apiBaseUri, "/bot", token, "/sendMessage"))
params := url.Values{}
params.Set("chat_id", chatID)
- escaped_text := html.EscapeString(text)
- params.Set("text", escaped_text)
+ params.Set("text", text)
params.Set("parse_mode", "html")
params.Set("disable_web_page_preview", "true")
kyb, err := json.Marshal(map[string][][]map[string]string{