diff options
Diffstat (limited to 'internal/validate')
-rw-r--r-- | internal/validate/account_test.go | 2 | ||||
-rw-r--r-- | internal/validate/formvalidation.go | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/internal/validate/account_test.go b/internal/validate/account_test.go index 3c918e1fc..0e23a2409 100644 --- a/internal/validate/account_test.go +++ b/internal/validate/account_test.go @@ -63,7 +63,7 @@ func happyAccount() *gtsmodel.Account { Privacy: gtsmodel.VisibilityPublic, Sensitive: testrig.FalseBool(), Language: "en", - StatusFormat: "plain", + StatusContentType: "text/plain", URI: "http://localhost:8080/users/the_mighty_zork", URL: "http://localhost:8080/@the_mighty_zork", FetchedAt: time.Time{}, diff --git a/internal/validate/formvalidation.go b/internal/validate/formvalidation.go index 48e0b7015..32aa1fd1e 100644 --- a/internal/validate/formvalidation.go +++ b/internal/validate/formvalidation.go @@ -150,16 +150,16 @@ func Privacy(privacy string) error { return fmt.Errorf("privacy '%s' was not recognized, valid options are 'direct', 'mutuals_only', 'private', 'public', 'unlisted'", privacy) } -// StatusFormat checks that the desired status format setting is valid. -func StatusFormat(statusFormat string) error { - if statusFormat == "" { +// StatusContentType checks that the desired status format setting is valid. +func StatusContentType(statusContentType string) error { + if statusContentType == "" { return fmt.Errorf("empty string for status format not allowed") } - switch apimodel.StatusFormat(statusFormat) { - case apimodel.StatusFormatPlain, apimodel.StatusFormatMarkdown: + switch apimodel.StatusContentType(statusContentType) { + case apimodel.StatusContentTypePlain, apimodel.StatusContentTypeMarkdown: return nil } - return fmt.Errorf("status format '%s' was not recognized, valid options are 'plain', 'markdown'", statusFormat) + return fmt.Errorf("status content type '%s' was not recognized, valid options are 'text/plain', 'text/markdown'", statusContentType) } func CustomCSS(customCSS string) error { |