diff options
| author |  Vyr Cossont <VyrCossont@users.noreply.github.com> | 2023-08-07 01:25:54 -0700 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2023-08-07 10:25:54 +0200 |
| commit | 0f812746b7fd9dfeef41e329af5215772672689a (patch) | |
| tree | adfc0c9e4412982224d32019b8abfc2895cd3f66 /internal/processing/account | |
| parent | [chore]: Bump golang.org/x/oauth2 from 0.10.0 to 0.11.0 (#2076) (diff) | |
| download | gotosocial-0f812746b7fd9dfeef41e329af5215772672689a.tar.xz | |
[feature] Allow full BCP 47 in language inputs (#2067)
* Allow full BCP 47 in language inputs
Fixes #2066
* Fuse validation and normalization for languages
* Remove outdated comment line
* Move post language canonicalization test
Diffstat (limited to 'internal/processing/account')
| -rw-r--r-- | internal/processing/account/create.go | 3 | ||||
| -rw-r--r-- | internal/processing/account/update.go | 5 |
2 files changed, 4 insertions, 4 deletions
diff --git a/internal/processing/account/create.go b/internal/processing/account/create.go index 1a172b865..32a59d1ef 100644 --- a/internal/processing/account/create.go +++ b/internal/processing/account/create.go @@ -34,8 +34,7 @@ import ( // Create processes the given form for creating a new account, // returning an oauth token for that account if successful. // -// Fields on the form should have already been validated by the -// caller, before this function is called. +// Precondition: the form's fields should have already been validated and normalized by the caller. func (p *Processor) Create( ctx context.Context, appToken oauth2.TokenInfo, diff --git a/internal/processing/account/update.go b/internal/processing/account/update.go index 01c62d7e3..f75b3c8d9 100644 --- a/internal/processing/account/update.go +++ b/internal/processing/account/update.go @@ -222,10 +222,11 @@ func (p *Processor) Update(ctx context.Context, account *gtsmodel.Account, form if form.Source != nil { if form.Source.Language != nil { - if err := validate.Language(*form.Source.Language); err != nil { + language, err := validate.Language(*form.Source.Language) + if err != nil { return nil, gtserror.NewErrorBadRequest(err) } - account.Language = *form.Source.Language + account.Language = language } if form.Source.Sensitive != nil { |