diff options
Diffstat (limited to 'internal/processing')
| -rw-r--r-- | internal/processing/account/update.go | 8 | ||||
| -rw-r--r-- | internal/processing/status/util.go | 17 |
2 files changed, 23 insertions, 2 deletions
diff --git a/internal/processing/account/update.go b/internal/processing/account/update.go index 78791dcce..804e7ba7e 100644 --- a/internal/processing/account/update.go +++ b/internal/processing/account/update.go @@ -114,6 +114,14 @@ func (p *processor) Update(ctx context.Context, account *gtsmodel.Account, form privacy := p.tc.APIVisToVis(apimodel.Visibility(*form.Source.Privacy)) account.Privacy = privacy } + + if form.Source.StatusFormat != nil { + if err := validate.StatusFormat(*form.Source.StatusFormat); err != nil { + return nil, gtserror.NewErrorBadRequest(err, err.Error()) + } + + account.StatusFormat = *form.Source.StatusFormat + } } updatedAccount, err := p.db.UpdateAccount(ctx, account) diff --git a/internal/processing/status/util.go b/internal/processing/status/util.go index 52214e95f..64b496673 100644 --- a/internal/processing/status/util.go +++ b/internal/processing/status/util.go @@ -23,6 +23,7 @@ import ( "errors" "fmt" + "github.com/superseriousbusiness/gotosocial/internal/api/model" apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" "github.com/superseriousbusiness/gotosocial/internal/db" "github.com/superseriousbusiness/gotosocial/internal/gtserror" @@ -269,9 +270,21 @@ func (p *processor) ProcessContent(ctx context.Context, form *apimodel.AdvancedS return nil } - // if format wasn't specified we should set the default + // if format wasn't specified we should try to figure out what format this user prefers if form.Format == "" { - form.Format = apimodel.StatusFormatDefault + acct, err := p.db.GetAccountByID(ctx, accountID) + if err != nil { + return fmt.Errorf("error processing new content: couldn't retrieve account from db to check post format: %s", err) + } + + switch acct.StatusFormat { + case "plain": + form.Format = model.StatusFormatPlain + case "markdown": + form.Format = model.StatusFormatMarkdown + default: + form.Format = model.StatusFormatDefault + } } // parse content out of the status depending on what format has been submitted |