summaryrefslogtreecommitdiff
path: root/internal/text/markdown.go
diff options
context:
space:
mode:
Diffstat (limited to 'internal/text/markdown.go')
-rw-r--r--internal/text/markdown.go11
1 files changed, 2 insertions, 9 deletions
diff --git a/internal/text/markdown.go b/internal/text/markdown.go
index f9d12209a..5a7603615 100644
--- a/internal/text/markdown.go
+++ b/internal/text/markdown.go
@@ -23,21 +23,14 @@ import (
"github.com/superseriousbusiness/gotosocial/internal/gtsmodel"
)
-var bfExtensions = blackfriday.NoIntraEmphasis |
- blackfriday.FencedCode |
- blackfriday.Autolink |
- blackfriday.Strikethrough |
- blackfriday.SpaceHeadings |
- blackfriday.BackslashLineBreak
-
func (f *formatter) FromMarkdown(md string, mentions []*gtsmodel.Mention, tags []*gtsmodel.Tag) string {
content := preformat(md)
// do the markdown parsing *first*
- content = string(blackfriday.Run([]byte(content), blackfriday.WithExtensions(bfExtensions)))
+ contentBytes := blackfriday.Run([]byte(content))
// format tags nicely
- content = f.ReplaceTags(content, tags)
+ content = f.ReplaceTags(string(contentBytes), tags)
// format mentions nicely
content = f.ReplaceMentions(content, mentions)