diff options
| author | 2024-03-22 14:03:46 +0100 | |
|---|---|---|
| committer | 2024-03-22 14:03:46 +0100 | |
| commit | 7f4a0a1aeb8a294ee967c63d7a48446df013ec44 (patch) | |
| tree | b9b3836fa0abe1d7a5758d07d6ebb6486a353d56 /internal/processing/status | |
| parent | [bugfix] add all possible busy result codes to the sqlite errBusy catching ch... (diff) | |
| download | gotosocial-7f4a0a1aeb8a294ee967c63d7a48446df013ec44.tar.xz | |
[chore] Move local account settings to separate db table (#2770)
* [chore] Move local account settings to separate database model
* don't use separate settings_id
Diffstat (limited to 'internal/processing/status')
| -rw-r--r-- | internal/processing/status/create.go | 11 | 
1 files changed, 8 insertions, 3 deletions
| diff --git a/internal/processing/status/create.go b/internal/processing/status/create.go index 01ded74bd..d758fc0fb 100644 --- a/internal/processing/status/create.go +++ b/internal/processing/status/create.go @@ -50,6 +50,11 @@ func (p *Processor) Create(  	*apimodel.Status,  	gtserror.WithCode,  ) { +	// Ensure account populated; we'll need settings. +	if err := p.state.DB.PopulateAccount(ctx, requester); err != nil { +		log.Errorf(ctx, "error(s) populating account, will continue: %s", err) +	} +  	// Generate new ID for status.  	statusID := id.NewULID() @@ -112,11 +117,11 @@ func (p *Processor) Create(  		return nil, errWithCode  	} -	if err := processVisibility(form, requester.Privacy, status); err != nil { +	if err := processVisibility(form, requester.Settings.Privacy, status); err != nil {  		return nil, gtserror.NewErrorInternalError(err)  	} -	if err := processLanguage(form, requester.Language, status); err != nil { +	if err := processLanguage(form, requester.Settings.Language, status); err != nil {  		return nil, gtserror.NewErrorInternalError(err)  	} @@ -369,7 +374,7 @@ func processLanguage(form *apimodel.AdvancedStatusCreateForm, accountDefaultLang  func (p *Processor) processContent(ctx context.Context, parseMention gtsmodel.ParseMentionFunc, form *apimodel.AdvancedStatusCreateForm, status *gtsmodel.Status) error {  	if form.ContentType == "" {  		// If content type wasn't specified, use the author's preferred content-type. -		contentType := apimodel.StatusContentType(status.Account.StatusContentType) +		contentType := apimodel.StatusContentType(status.Account.Settings.StatusContentType)  		form.ContentType = contentType  	} | 
