From 721b3f6cc7a07fdf2aaf6dbc63e7737b61c537ee Mon Sep 17 00:00:00 2001 From: Lan Tian Date: Mon, 29 Jun 2020 13:44:48 +0800 Subject: [PATCH] frontend: cleanup telegram replies --- frontend/dn42.go | 6 +++++- frontend/telegram_bot.go | 6 ++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/frontend/dn42.go b/frontend/dn42.go index 7559a3e..c3f8a18 100644 --- a/frontend/dn42.go +++ b/frontend/dn42.go @@ -43,5 +43,9 @@ func dn42WhoisFilter(whois string) string { commandResult += s + "\n" } - return commandResult + fmt.Sprintf("\n%d line(s) skipped.\n", skippedLines) + if skippedLines > 0 { + return commandResult + fmt.Sprintf("\n%d line(s) skipped.\n", skippedLines) + } else { + return commandResult + } } diff --git a/frontend/telegram_bot.go b/frontend/telegram_bot.go index a43fd76..8491f9e 100644 --- a/frontend/telegram_bot.go +++ b/frontend/telegram_bot.go @@ -45,7 +45,9 @@ func telegramBatchRequestFormat(servers []string, endpoint string, command strin results := batchRequest(servers, endpoint, command) result := "" for i, r := range results { - result += servers[i] + "\n" + if len(servers) > 1 { + result += servers[i] + "\n" + } result += postProcess(r) + "\n\n" } return result @@ -149,7 +151,7 @@ func webHandlerTelegramBot(w http.ResponseWriter, r *http.Request) { response := &tgWebhookResponse{ Method: "sendMessage", ChatID: request.Message.Chat.ID, - Text: "```\n" + strings.TrimSpace(commandResult) + "\n```", + Text: "```\n" + commandResult + "\n```", ReplyToMessageID: request.Message.MessageID, ParseMode: "Markdown", }