From e6cde25466e03ec864cd9defed96957e741b5e7c Mon Sep 17 00:00:00 2001 From: Vyr Cossont Date: Thu, 2 Mar 2023 03:06:40 -0800 Subject: [feature] Advertise rich text formats, support content_type field (#1370) * Advertise rich text formats, support content_type field * Update JSON in instance patch tests * Replace format with content_type everywhere * update migration to work with both pg and sqlite * regenerate swagger docs * update instance serialization + tests * fix up * learn to code tobi please, i'm begging you --------- Co-authored-by: tsmethurst --- internal/validate/formvalidation.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'internal/validate/formvalidation.go') 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 { -- cgit v1.2.3