diff options
| author |  Michael Manfre <mmanfre@gmail.com> | 2022-11-19 04:07:51 -0500 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2022-11-19 10:07:51 +0100 |
| commit | 67106c9dc4b2139878ba1fc44ef268f0a4efd804 (patch) | |
| tree | f338cf04f46b4246f6dc85a1b6f3be133f483531 /internal/processing/account/update.go | |
| parent | [docs] Move and document logs (#1076) (diff) | |
| download | gotosocial-67106c9dc4b2139878ba1fc44ef268f0a4efd804.tar.xz | |
[feature] Support markdown format for Account bio/note (#1037)
* [feature] Status format also controls bio format
* test
Diffstat (limited to 'internal/processing/account/update.go')
| -rw-r--r-- | internal/processing/account/update.go | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/internal/processing/account/update.go b/internal/processing/account/update.go index bc4570c76..ed9fa6d4d 100644 --- a/internal/processing/account/update.go +++ b/internal/processing/account/update.go @@ -66,7 +66,7 @@ func (p *processor) Update(ctx context.Context, account *gtsmodel.Account, form account.NoteRaw = *form.Note // Process note to generate a valid HTML representation - note, err := p.processNote(ctx, *form.Note, account.ID) + note, err := p.processNote(ctx, *form.Note, account) if err != nil { return nil, gtserror.NewErrorBadRequest(err) } @@ -241,13 +241,13 @@ func (p *processor) UpdateHeader(ctx context.Context, header *multipart.FileHead return processingMedia.LoadAttachment(ctx) } -func (p *processor) processNote(ctx context.Context, note string, accountID string) (string, error) { +func (p *processor) processNote(ctx context.Context, note string, account *gtsmodel.Account) (string, error) { if note == "" { return "", nil } tagStrings := util.DeriveHashtagsFromText(note) - tags, err := p.db.TagStringsToTags(ctx, tagStrings, accountID) + tags, err := p.db.TagStringsToTags(ctx, tagStrings, account.ID) if err != nil { return "", err } @@ -255,7 +255,7 @@ func (p *processor) processNote(ctx context.Context, note string, accountID stri mentionStrings := util.DeriveMentionNamesFromText(note) mentions := []*gtsmodel.Mention{} for _, mentionString := range mentionStrings { - mention, err := p.parseMention(ctx, mentionString, accountID, "") + mention, err := p.parseMention(ctx, mentionString, account.ID, "") if err != nil { continue } @@ -266,5 +266,9 @@ func (p *processor) processNote(ctx context.Context, note string, accountID stri // emojiStrings := util.DeriveEmojisFromText(note) // emojis, err := p.db.EmojiStringsToEmojis(ctx, emojiStrings) + if account.StatusFormat == "markdown" { + return p.formatter.FromMarkdown(ctx, note, mentions, tags, nil), nil + } + return p.formatter.FromPlain(ctx, note, mentions, tags), nil } |