From 2dc9fc1626507bb54417fc4a1920b847cafb27a2 Mon Sep 17 00:00:00 2001 From: tobi <31960611+tsmethurst@users.noreply.github.com> Date: Wed, 25 Aug 2021 15:34:33 +0200 Subject: Pg to bun (#148) * start moving to bun * changing more stuff * more * and yet more * tests passing * seems stable now * more big changes * small fix * little fixes --- internal/text/plain.go | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'internal/text/plain.go') diff --git a/internal/text/plain.go b/internal/text/plain.go index a44e02c80..34cc3fa06 100644 --- a/internal/text/plain.go +++ b/internal/text/plain.go @@ -19,26 +19,27 @@ package text import ( + "context" "fmt" "strings" "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" ) -func (f *formatter) FromPlain(plain string, mentions []*gtsmodel.Mention, tags []*gtsmodel.Tag) string { +func (f *formatter) FromPlain(ctx context.Context, 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) + content = f.ReplaceLinks(ctx, content) // format tags nicely - content = f.ReplaceTags(content, tags) + content = f.ReplaceTags(ctx, content, tags) // format mentions nicely - content = f.ReplaceMentions(content, mentions) + content = f.ReplaceMentions(ctx, content, mentions) // replace newlines with breaks content = strings.ReplaceAll(content, "\n", "
") -- cgit v1.2.3