From c589b5d65c24f77b46b22b2f9a3a4089ad628bea Mon Sep 17 00:00:00 2001
From: Umputun <umputun@gmail.com>
Date: Fri, 26 Oct 2018 13:58:31 -0500
Subject: [PATCH] eliminate manual json marshaling in tg

---
 backend/app/notify/telegram.go | 17 ++++++++++++++---
 compose-dev-backend.yml        |  3 +++
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/backend/app/notify/telegram.go b/backend/app/notify/telegram.go
index ecaa0d92..ed4fc89a 100644
--- a/backend/app/notify/telegram.go
+++ b/backend/app/notify/telegram.go
@@ -1,6 +1,7 @@
 package notify
 
 import (
+	"bytes"
 	"context"
 	"encoding/json"
 	"fmt"
@@ -75,18 +76,28 @@ func NewTelegram(token string, channelName string, timeout time.Duration, api st
 func (t *Telegram) Send(ctx context.Context, req request) error {
 	client := http.Client{Timeout: telegramTimeOut}
 	log.Printf("[DEBUG] send telegram notification to %s, comment id %s", t.channelName, req.comment.ID)
+
 	from := req.comment.User.Name
 	if req.comment.ParentID != "" {
 		from += " → " + req.parent.User.Name
 	}
 	from = "*" + from + "*"
 	link := fmt.Sprintf("↦ [original comment](%s)", req.comment.Locator.URL+uiNav+req.comment.ID)
-	msg := fmt.Sprintf("%s\n\n%s\n\n%s", from, req.comment.Orig, link)
-	msg = html.UnescapeString(msg)
 	u := fmt.Sprintf("%s%s/sendMessage?chat_id=@%s&parse_mode=Markdown&disable_web_page_preview=true",
 		t.apiPrefix, t.token, t.channelName)
 
-	r, err := http.NewRequest("POST", u, strings.NewReader(`{"text": "`+msg+`"}`))
+	msg := fmt.Sprintf("%s\n\n%s\n\n%s", from, req.comment.Orig, link)
+	msg = html.UnescapeString(msg)
+	body := struct {
+		Text string `json:"text"`
+	}{Text: msg}
+
+	b, err := json.Marshal(body)
+	if err != nil {
+		return errors.Wrap(err, "failed to make telegram body")
+	}
+
+	r, err := http.NewRequest("POST", u, bytes.NewReader(b))
 	r.Header.Set("Content-Type", "application/json; charset=utf-8")
 	if err != nil {
 		return errors.Wrap(err, "failed to make telegram request")
diff --git a/compose-dev-backend.yml b/compose-dev-backend.yml
index bf9a252f..a213f5ca 100644
--- a/compose-dev-backend.yml
+++ b/compose-dev-backend.yml
@@ -43,5 +43,8 @@ services:
             - DEV_PASSWD=password
             - AUTH_DEV=true   # activate local oauth "dev"
             - ADMIN_SHARED_ID=dev_user  # set admin flag for default user on local ouath2
+            - NOTIFY_TYPE
+            - NOTIFY_TELEGRAM_TOKEN
+            - NOTIFY_TELEGRAM_CHAN
         volumes:
             - ./var:/srv/var