From d35e8e477668b5c6e74f6c604fdfa0c29694984d Mon Sep 17 00:00:00 2001 From: Pavel Date: Tue, 22 Oct 2024 01:57:19 +0300 Subject: [PATCH] move adding
to template function --- senders/common.go | 2 +- wctools/tools.go | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/senders/common.go b/senders/common.go index bf392ca..bbf3d2f 100644 --- a/senders/common.go +++ b/senders/common.go @@ -94,7 +94,7 @@ func SplitContent(content string) template.HTML { return template.HTML(fmt.Sprintf(`%s`, url, filename)) } - return template.HTML(content) + return template.HTML(strings.ReplaceAll(content, "\n", "
")) } func sanitizeHTMLData(data TemplateData) TemplateData { diff --git a/wctools/tools.go b/wctools/tools.go index 3d4d447..afb22da 100644 --- a/wctools/tools.go +++ b/wctools/tools.go @@ -147,7 +147,8 @@ func ToJSON(data interface{}) (string, error) { func CleanNullContent(answers []model.ResultAnswer) []model.ResultAnswer { var results []model.ResultAnswer for _, answer := range answers { - answer.Content = strings.ReplaceAll(strings.ReplaceAll(answer.Content, "`,`", "`
`"),"\n","
") + // пока закоментил так как разделитель у нас используется + //answer.Content = strings.ReplaceAll(strings.ReplaceAll(answer.Content, "`,`", "`
`"),"\n","
") if answer.Content != "" { results = append(results, answer) }