From 05a85b6bfdc1e538771d43ca51d7d4eaf3fe7486 Mon Sep 17 00:00:00 2001
From: Umputun <umputun@gmail.com>
Date: Sat, 3 Jul 2021 23:48:00 -0500
Subject: [PATCH] reformat tg message to make it readable again

---
 backend/app/notify/telegram.go | 46 ++++++++++------------------------
 1 file changed, 13 insertions(+), 33 deletions(-)

diff --git a/backend/app/notify/telegram.go b/backend/app/notify/telegram.go
index 60ccde71..83200af2 100644
--- a/backend/app/notify/telegram.go
+++ b/backend/app/notify/telegram.go
@@ -181,42 +181,22 @@ func (t *Telegram) sendMessage(ctx context.Context, b []byte, chatID string) err
 func buildTelegramMessage(req Request) ([]byte, error) {
 	commentURLPrefix := req.Comment.Locator.URL + uiNav
 
-	msg := "↦ "
+	msg := fmt.Sprintf("[%s](%s)", escapeText(req.Comment.User.Name), commentURLPrefix+req.Comment.ID)
+
+	if req.Comment.ParentID != "" {
+		msg += fmt.Sprintf(" -> [%s](%s)", escapeText(req.parent.User.Name), commentURLPrefix+req.parent.ID)
+	}
+
+	msg += fmt.Sprintf("\n\n_%s_", escapeText(req.Comment.Orig))
+
+	if req.Comment.ParentID != "" {
+		msg += fmt.Sprintf("\n\n\"_%s_\"", escapeText(req.parent.Orig))
+	}
+
 	if req.Comment.PostTitle != "" {
-		msg += fmt.Sprintf("\"%q\" ", req.Comment.PostTitle)
+		msg += fmt.Sprintf("\n\n↦ \"%q\" ", req.Comment.PostTitle)
 	}
 
-	msg += fmt.Sprintf(
-		"[%s](%s)",
-		escapeText(req.Comment.User.Name),
-		commentURLPrefix+req.Comment.ID,
-	)
-
-	if req.Comment.ParentID != "" {
-		msg += fmt.Sprintf(
-			" -> [%s](%s)",
-			escapeText(req.parent.User.Name),
-			commentURLPrefix+req.parent.ID,
-		)
-	}
-
-	msg += fmt.Sprintf(
-		"at %s",
-		escapeText(req.Comment.Timestamp.Format("02.01.2006 at 15:04")),
-	)
-
-	if req.Comment.ParentID != "" {
-		msg += fmt.Sprintf(
-			"\n\n\"_%s_\"",
-			escapeText(req.parent.Orig),
-		)
-	}
-
-	msg += fmt.Sprintf(
-		"\n\n_%s_",
-		escapeText(req.Comment.Orig),
-	)
-
 	msg = html.UnescapeString(msg)
 	body := telegramMsg{Text: msg, ParseMode: "MarkdownV2"}
 	b, err := json.Marshal(body)