ci: Bump version. v4.0.0

Rishats · Mar 11, 2021 · 695778b · 695778b
1 parent 4a991a8
commit 695778b
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 9 deletions.
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -4,10 +4,11 @@ services:
     container_name: notifyer-ci
     build: ./
     environment:
-      NOTIFYER_TELEGRAM_BOT_TOKEN: "your_token"
+      NOTIFYER_TELEGRAM_BOT_TOKEN: ""
       CI_PROJECT_URL: ""
       CI_PIPELINE_ID: ""
       CI_COMMIT_REF_SLUG: ""
       NOTIFYER_TELEGRAM_CHAT_ID:
       NOTIFYER_TEXT: "Release ready!"
-    command: notifyer -t "TEXT" release ready
+      NOTIFYER_TELEGRAM_PARSE_MODE: "HTML"
+    command: notifyer --text "<pre>Release done</pre><pre>pre-formatted</pre>" --telegram_parse_mode "HTML" deploy done
diff --git a/main.go b/main.go
@@ -9,7 +9,7 @@ import (
 )
 
 func main() {
-	var telegramBotToken, ciProjectUrl, ciPipelineId, ciCommitSlug, text string
+	var telegramBotToken, telegramParseMode, ciProjectUrl, ciPipelineId, ciCommitSlug, text string
 	var telegramChatId int
 
 	app := &cli.App{
@@ -52,6 +52,14 @@ func main() {
 				EnvVars:     []string{"NOTIFYER_TELEGRAM_CHAT_ID"},
 				Destination: &telegramChatId,
 			},
+			&cli.StringFlag{
+				Name:        "telegram_parse_mode",
+				Aliases:     []string{"tpm"},
+				Usage:       "TELEGRAM_PARSE_MODE - Telegram",
+				EnvVars:     []string{"NOTIFYER_TELEGRAM_PARSE_MODE"},
+				DefaultText: "HTML",
+				Destination: &telegramParseMode,
+			},
 			&cli.StringFlag{
 				Name:        "text",
 				Aliases:     []string{"t"},
@@ -71,7 +79,7 @@ func main() {
 						Usage: "release ready",
 						Action: func(c *cli.Context) error {
 							fmt.Println("[Notifyer] Release ready")
-							sendTextToTelegramChat(telegramChatId, text, telegramBotToken)
+							sendTextToTelegramChat(telegramChatId, text, telegramBotToken, telegramParseMode)
 							return nil
 						},
 					},
@@ -87,7 +95,7 @@ func main() {
 						Usage: "deploy done",
 						Action: func(c *cli.Context) error {
 							fmt.Println("[Notifyer] Deploy done")
-							sendTextToTelegramChat(telegramChatId, text, telegramBotToken)
+							sendTextToTelegramChat(telegramChatId, text, telegramBotToken, telegramParseMode)
 							return nil
 						},
 					},

diff --git a/sender.go b/sender.go
@@ -9,15 +9,16 @@ import (
 )
 
 // sendTextToTelegramChat sends a text message to the Telegram chat identified by its chat Id
-func sendTextToTelegramChat(chatId int, text string, telegramBotToken string, ) (string, error) {
+func sendTextToTelegramChat(chatId int, text string, telegramBotToken string, telegramParseMode string) (string, error) {
 
 	log.Printf("Sending %s to chat_id: %d", text, chatId)
 	var telegramApi string = "https://api.telegram.org/bot" + telegramBotToken + "/sendMessage"
 	response, err := http.PostForm(
 		telegramApi,
 		url.Values{
-			"chat_id": {strconv.Itoa(chatId)},
-			"text":    {text},
+			"chat_id":    {strconv.Itoa(chatId)},
+			"text":       {text},
+			"parse_mode": {telegramParseMode},
 		})
 
 	if err != nil {
@@ -35,4 +36,4 @@ func sendTextToTelegramChat(chatId int, text string, telegramBotToken string, )
 	log.Printf("Body of Telegram Response: %s", bodyString)
 
 	return bodyString, nil
-}
+}