This commit is contained in:
tsmethurst 2021-08-16 16:13:30 +02:00
commit 53b0331048
9 changed files with 198 additions and 33 deletions

View file

@ -19,6 +19,7 @@
package text
import (
"fmt"
"strings"
"github.com/superseriousbusiness/gotosocial/internal/gtsmodel"
@ -27,6 +28,9 @@ import (
func (f *formatter) FromPlain(plain string, mentions []*gtsmodel.Mention, tags []*gtsmodel.Tag) string {
content := preformat(plain)
// sanitize any html elements
content = RemoveHTML(content)
// format links nicely
content = f.ReplaceLinks(content)
@ -39,5 +43,10 @@ func (f *formatter) FromPlain(plain string, mentions []*gtsmodel.Mention, tags [
// replace newlines with breaks
content = strings.ReplaceAll(content, "\n", "<br />")
// wrap the whole thing in a pee
content = fmt.Sprintf(`<p>%s</p>`, content)
content = SanitizeHTML(content)
return postformat(content)
}