diff options
| author |  tobi <31960611+tsmethurst@users.noreply.github.com> | 2022-07-19 15:21:17 +0200 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2022-07-19 15:21:17 +0200 |
| commit | c84384e6608368a13a774d6d33a8cc32da7cf209 (patch) | |
| tree | a18aa9c1ced1299d2682c1993e1ba38f46448dba /internal/text/sanitize.go | |
| parent | [chore] use our own logging implementation (#716) (diff) | |
| download | gotosocial-c84384e6608368a13a774d6d33a8cc32da7cf209.tar.xz | |
[bugfix] html escape special characters in text instead of totally removing them (#719)
* remove minify dependency
* tidy up some tests
* remove pre + postformat funcs
* rework sanitization + formatting
* update tests
* add some more markdown tests
Diffstat (limited to 'internal/text/sanitize.go')
| -rw-r--r-- | internal/text/sanitize.go | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/internal/text/sanitize.go b/internal/text/sanitize.go index d4faabbb1..96b7ef994 100644 --- a/internal/text/sanitize.go +++ b/internal/text/sanitize.go @@ -19,7 +19,9 @@ package text import ( + "html" "regexp" + "strings" "github.com/microcosm-cc/bluemonday" ) @@ -59,7 +61,8 @@ func SanitizeHTML(in string) string { // SanitizePlaintext runs text through basic sanitization. This removes // any html elements that were in the string, and returns clean plaintext. func SanitizePlaintext(in string) string { - content := preformat(in) + content := html.UnescapeString(in) content = removeHTML(content) - return postformat(content) + content = html.UnescapeString(content) + return strings.TrimSpace(content) } |