diff options
Diffstat (limited to 'internal/api/client/accounts')
| -rw-r--r-- | internal/api/client/accounts/accountupdate.go | 10 | ||||
| -rw-r--r-- | internal/api/client/accounts/accountupdate_test.go | 14 |
2 files changed, 12 insertions, 12 deletions
diff --git a/internal/api/client/accounts/accountupdate.go b/internal/api/client/accounts/accountupdate.go index 3983fe8e1..b5d0dd5f9 100644 --- a/internal/api/client/accounts/accountupdate.go +++ b/internal/api/client/accounts/accountupdate.go @@ -99,9 +99,9 @@ import ( // description: Default language to use for authored statuses (ISO 6391). // type: string // - -// name: source[status_format] +// name: source[status_content_type] // in: formData -// description: Default format to use for authored statuses (plain or markdown). +// description: Default content type to use for authored statuses (text/plain or text/markdown). // type: string // - // name: custom_css @@ -190,8 +190,8 @@ func parseUpdateAccountForm(c *gin.Context) (*apimodel.UpdateCredentialsRequest, form.Source.Language = &language } - if statusFormat, ok := sourceMap["status_format"]; ok { - form.Source.StatusFormat = &statusFormat + if statusContentType, ok := sourceMap["status_content_type"]; ok { + form.Source.StatusContentType = &statusContentType } if form == nil || @@ -205,7 +205,7 @@ func parseUpdateAccountForm(c *gin.Context) (*apimodel.UpdateCredentialsRequest, form.Source.Privacy == nil && form.Source.Sensitive == nil && form.Source.Language == nil && - form.Source.StatusFormat == nil && + form.Source.StatusContentType == nil && form.FieldsAttributes == nil && form.CustomCSS == nil && form.EnableRSS == nil) { diff --git a/internal/api/client/accounts/accountupdate_test.go b/internal/api/client/accounts/accountupdate_test.go index 95387f3d7..f898e64da 100644 --- a/internal/api/client/accounts/accountupdate_test.go +++ b/internal/api/client/accounts/accountupdate_test.go @@ -414,13 +414,13 @@ func (suite *AccountUpdateTestSuite) TestAccountUpdateCredentialsPATCHHandlerUpd suite.True(apimodelAccount.Locked) } -func (suite *AccountUpdateTestSuite) TestAccountUpdateCredentialsPATCHHandlerUpdateStatusFormatOK() { +func (suite *AccountUpdateTestSuite) TestAccountUpdateCredentialsPATCHHandlerUpdateStatusContentTypeOK() { // set up the request // we're updating the language of zork requestBody, w, err := testrig.CreateMultipartFormData( "", "", map[string]string{ - "source[status_format]": "markdown", + "source[status_content_type]": "text/markdown", }) if err != nil { panic(err) @@ -450,22 +450,22 @@ func (suite *AccountUpdateTestSuite) TestAccountUpdateCredentialsPATCHHandlerUpd // check the returned api model account // fields should be updated - suite.Equal("markdown", apimodelAccount.Source.StatusFormat) + suite.Equal("text/markdown", apimodelAccount.Source.StatusContentType) dbAccount, err := suite.db.GetAccountByID(context.Background(), suite.testAccounts["local_account_1"].ID) if err != nil { suite.FailNow(err.Error()) } - suite.Equal(dbAccount.StatusFormat, "markdown") + suite.Equal(dbAccount.StatusContentType, "text/markdown") } -func (suite *AccountUpdateTestSuite) TestAccountUpdateCredentialsPATCHHandlerUpdateStatusFormatBad() { +func (suite *AccountUpdateTestSuite) TestAccountUpdateCredentialsPATCHHandlerUpdateStatusContentTypeBad() { // set up the request // we're updating the language of zork requestBody, w, err := testrig.CreateMultipartFormData( "", "", map[string]string{ - "source[status_format]": "peepeepoopoo", + "source[status_content_type]": "peepeepoopoo", }) if err != nil { panic(err) @@ -486,7 +486,7 @@ func (suite *AccountUpdateTestSuite) TestAccountUpdateCredentialsPATCHHandlerUpd b, err := ioutil.ReadAll(result.Body) suite.NoError(err) - suite.Equal(`{"error":"Bad Request: status format 'peepeepoopoo' was not recognized, valid options are 'plain', 'markdown'"}`, string(b)) + suite.Equal(`{"error":"Bad Request: status content type 'peepeepoopoo' was not recognized, valid options are 'text/plain', 'text/markdown'"}`, string(b)) } func TestAccountUpdateTestSuite(t *testing.T) { |