mirror of
https://github.com/superseriousbusiness/gotosocial.git
synced 2025-03-13 14:02:41 +00:00
424f62dd70
* Add ContentType to internal models * Add ContentType to API models StatusSource and StatusEdit * Add helpers to convert between API/internal StatusContentType * Write status content type on create/edit * Add migration * Update API docs go run github.com/go-swagger/go-swagger/cmd/swagger generate spec --scan-models --exclude-deps --output docs/api/swagger.yaml * ensure ContentType is updated anywhere Text is * Update docs, take care of TODOs * Set ContentType in more places where Text is set * We don't actually use ContentType on the API status model * Update StatusSource test * Remove unused helper function I copied * Revert change to StatusContentType swagger annotation I'm going to include this in a follow-on PR instead. * Add test for updating content type in edits * Return a value from processContentType instead of modifying the existing status Fixes an issue that was caught by the test I just added - the recorded edit would be marked with the *new* content type instead of the old one, which is obviously bad * Add test for handling of statuses with no stored content type * repurpose an existing test status instead of adding a new one to avoid breaking other tests * Add test to ensure newly created statuses always have content type saved * Do include content type on status API model actually This is mostly important when deleting and redrafting. The comment on `apimodel.Status.Text` implies that it's not sent except in response to status deletion, but actually this doesn't seem to be the case; it also appears to be present in responses to creations and normal fetches and stuff. So I'm treating `ContentType` the same here. * Update new tests to check content type on API statuses * Check content type of API statuses in all tests where text is checked * update other api tests with status content type field * Add test ensuring text and content type are returned when deleting a status * Convert processContentType to free function and remove unused parameter * check for the correct value in the deletion test * Be explicit about this test status having an empty content type * Use omitempty consistently on API models * clean up the final diff a bit * one more swagger regen for the road * Handle nil statuses in processContentType * Don't pass processContentType the entire edit form, it doesn't need it * Move processContentType to common.go and use for creation as well * Remove unused parameters to ContentTypeToAPIContentType
273 lines
8.8 KiB
Go
273 lines
8.8 KiB
Go
// GoToSocial
|
|
// Copyright (C) GoToSocial Authors admin@gotosocial.org
|
|
// SPDX-License-Identifier: AGPL-3.0-or-later
|
|
//
|
|
// This program is free software: you can redistribute it and/or modify
|
|
// it under the terms of the GNU Affero General Public License as published by
|
|
// the Free Software Foundation, either version 3 of the License, or
|
|
// (at your option) any later version.
|
|
//
|
|
// This program is distributed in the hope that it will be useful,
|
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
// GNU Affero General Public License for more details.
|
|
//
|
|
// You should have received a copy of the GNU Affero General Public License
|
|
// along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
package status_test
|
|
|
|
import (
|
|
"context"
|
|
"testing"
|
|
|
|
"github.com/stretchr/testify/suite"
|
|
apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model"
|
|
"github.com/superseriousbusiness/gotosocial/internal/config"
|
|
"github.com/superseriousbusiness/gotosocial/internal/db"
|
|
"github.com/superseriousbusiness/gotosocial/internal/gtsmodel"
|
|
"github.com/superseriousbusiness/gotosocial/internal/util"
|
|
)
|
|
|
|
type StatusCreateTestSuite struct {
|
|
StatusStandardTestSuite
|
|
}
|
|
|
|
func (suite *StatusCreateTestSuite) TestProcessContentWarningWithQuotationMarks() {
|
|
ctx := context.Background()
|
|
|
|
creatingAccount := suite.testAccounts["local_account_1"]
|
|
creatingApplication := suite.testApplications["application_1"]
|
|
|
|
statusCreateForm := &apimodel.StatusCreateRequest{
|
|
Status: "poopoo peepee",
|
|
MediaIDs: []string{},
|
|
Poll: nil,
|
|
InReplyToID: "",
|
|
Sensitive: false,
|
|
SpoilerText: "\"test\"", // these should not be html-escaped when the final text is rendered
|
|
Visibility: apimodel.VisibilityPublic,
|
|
LocalOnly: util.Ptr(false),
|
|
ScheduledAt: nil,
|
|
Language: "en",
|
|
ContentType: apimodel.StatusContentTypePlain,
|
|
}
|
|
|
|
apiStatus, err := suite.status.Create(ctx, creatingAccount, creatingApplication, statusCreateForm)
|
|
suite.NoError(err)
|
|
suite.NotNil(apiStatus)
|
|
|
|
suite.Equal("\"test\"", apiStatus.SpoilerText)
|
|
}
|
|
|
|
func (suite *StatusCreateTestSuite) TestProcessContentWarningWithHTMLEscapedQuotationMarks() {
|
|
ctx := context.Background()
|
|
|
|
creatingAccount := suite.testAccounts["local_account_1"]
|
|
creatingApplication := suite.testApplications["application_1"]
|
|
|
|
statusCreateForm := &apimodel.StatusCreateRequest{
|
|
Status: "poopoo peepee",
|
|
MediaIDs: []string{},
|
|
Poll: nil,
|
|
InReplyToID: "",
|
|
Sensitive: false,
|
|
SpoilerText: ""test"", // the html-escaped quotation marks should appear as normal quotation marks in the finished text
|
|
Visibility: apimodel.VisibilityPublic,
|
|
LocalOnly: util.Ptr(false),
|
|
ScheduledAt: nil,
|
|
Language: "en",
|
|
ContentType: apimodel.StatusContentTypePlain,
|
|
}
|
|
|
|
apiStatus, err := suite.status.Create(ctx, creatingAccount, creatingApplication, statusCreateForm)
|
|
suite.NoError(err)
|
|
suite.NotNil(apiStatus)
|
|
|
|
suite.Equal("\"test\"", apiStatus.SpoilerText)
|
|
}
|
|
|
|
func (suite *StatusCreateTestSuite) TestProcessStatusMarkdownWithUnderscoreEmoji() {
|
|
ctx := context.Background()
|
|
|
|
// update the shortcode of the rainbow emoji to surround it in underscores
|
|
if err := suite.db.UpdateWhere(ctx, []db.Where{{Key: "shortcode", Value: "rainbow"}}, "shortcode", "_rainbow_", >smodel.Emoji{}); err != nil {
|
|
suite.FailNow(err.Error())
|
|
}
|
|
|
|
creatingAccount := suite.testAccounts["local_account_1"]
|
|
creatingApplication := suite.testApplications["application_1"]
|
|
|
|
statusCreateForm := &apimodel.StatusCreateRequest{
|
|
Status: "poopoo peepee :_rainbow_:",
|
|
MediaIDs: []string{},
|
|
Poll: nil,
|
|
InReplyToID: "",
|
|
Sensitive: false,
|
|
Visibility: apimodel.VisibilityPublic,
|
|
LocalOnly: util.Ptr(false),
|
|
ScheduledAt: nil,
|
|
Language: "en",
|
|
ContentType: apimodel.StatusContentTypeMarkdown,
|
|
}
|
|
|
|
apiStatus, err := suite.status.Create(ctx, creatingAccount, creatingApplication, statusCreateForm)
|
|
suite.NoError(err)
|
|
suite.NotNil(apiStatus)
|
|
|
|
suite.Equal("<p>poopoo peepee :_rainbow_:</p>", apiStatus.Content)
|
|
suite.NotEmpty(apiStatus.Emojis)
|
|
}
|
|
|
|
func (suite *StatusCreateTestSuite) TestProcessStatusMarkdownWithSpoilerTextEmoji() {
|
|
ctx := context.Background()
|
|
creatingAccount := suite.testAccounts["local_account_1"]
|
|
creatingApplication := suite.testApplications["application_1"]
|
|
|
|
statusCreateForm := &apimodel.StatusCreateRequest{
|
|
Status: "poopoo peepee",
|
|
SpoilerText: "testing something :rainbow:",
|
|
MediaIDs: []string{},
|
|
Poll: nil,
|
|
InReplyToID: "",
|
|
Sensitive: false,
|
|
Visibility: apimodel.VisibilityPublic,
|
|
LocalOnly: util.Ptr(false),
|
|
ScheduledAt: nil,
|
|
Language: "en",
|
|
ContentType: apimodel.StatusContentTypeMarkdown,
|
|
}
|
|
|
|
apiStatus, err := suite.status.Create(ctx, creatingAccount, creatingApplication, statusCreateForm)
|
|
suite.NoError(err)
|
|
suite.NotNil(apiStatus)
|
|
|
|
suite.Equal("<p>poopoo peepee</p>", apiStatus.Content)
|
|
suite.Equal("testing something :rainbow:", apiStatus.SpoilerText)
|
|
suite.NotEmpty(apiStatus.Emojis)
|
|
}
|
|
|
|
func (suite *StatusCreateTestSuite) TestProcessMediaDescriptionTooShort() {
|
|
ctx := context.Background()
|
|
|
|
config.SetMediaDescriptionMinChars(100)
|
|
|
|
creatingAccount := suite.testAccounts["local_account_1"]
|
|
creatingApplication := suite.testApplications["application_1"]
|
|
|
|
statusCreateForm := &apimodel.StatusCreateRequest{
|
|
Status: "poopoo peepee",
|
|
MediaIDs: []string{suite.testAttachments["local_account_1_unattached_1"].ID},
|
|
Poll: nil,
|
|
InReplyToID: "",
|
|
Sensitive: false,
|
|
SpoilerText: "",
|
|
Visibility: apimodel.VisibilityPublic,
|
|
LocalOnly: util.Ptr(false),
|
|
ScheduledAt: nil,
|
|
Language: "en",
|
|
ContentType: apimodel.StatusContentTypePlain,
|
|
}
|
|
|
|
apiStatus, err := suite.status.Create(ctx, creatingAccount, creatingApplication, statusCreateForm)
|
|
suite.EqualError(err, "media description less than min chars (100)")
|
|
suite.Nil(apiStatus)
|
|
}
|
|
|
|
func (suite *StatusCreateTestSuite) TestProcessLanguageWithScriptPart() {
|
|
ctx := context.Background()
|
|
|
|
creatingAccount := suite.testAccounts["local_account_1"]
|
|
creatingApplication := suite.testApplications["application_1"]
|
|
|
|
statusCreateForm := &apimodel.StatusCreateRequest{
|
|
Status: "你好世界", // hello world
|
|
MediaIDs: []string{},
|
|
Poll: nil,
|
|
InReplyToID: "",
|
|
Sensitive: false,
|
|
SpoilerText: "",
|
|
Visibility: apimodel.VisibilityPublic,
|
|
LocalOnly: util.Ptr(false),
|
|
ScheduledAt: nil,
|
|
Language: "zh-Hans",
|
|
ContentType: apimodel.StatusContentTypePlain,
|
|
}
|
|
|
|
apiStatus, err := suite.status.Create(ctx, creatingAccount, creatingApplication, statusCreateForm)
|
|
suite.NoError(err)
|
|
suite.NotNil(apiStatus)
|
|
|
|
suite.Equal("zh-Hans", *apiStatus.Language)
|
|
}
|
|
|
|
func (suite *StatusCreateTestSuite) TestProcessReplyToUnthreadedRemoteStatus() {
|
|
ctx := context.Background()
|
|
|
|
creatingAccount := suite.testAccounts["local_account_1"]
|
|
creatingApplication := suite.testApplications["application_1"]
|
|
inReplyTo := suite.testStatuses["remote_account_1_status_1"]
|
|
|
|
// Reply to a remote status that
|
|
// doesn't have a threadID set on it.
|
|
statusCreateForm := &apimodel.StatusCreateRequest{
|
|
Status: "boobies",
|
|
MediaIDs: []string{},
|
|
Poll: nil,
|
|
InReplyToID: inReplyTo.ID,
|
|
Sensitive: false,
|
|
SpoilerText: "this is a reply",
|
|
Visibility: apimodel.VisibilityPublic,
|
|
LocalOnly: util.Ptr(false),
|
|
ScheduledAt: nil,
|
|
Language: "en",
|
|
ContentType: apimodel.StatusContentTypePlain,
|
|
}
|
|
|
|
apiStatus, err := suite.status.Create(ctx, creatingAccount, creatingApplication, statusCreateForm)
|
|
suite.NoError(err)
|
|
suite.NotNil(apiStatus)
|
|
|
|
// ThreadID should be set on the status,
|
|
// even though the replied-to status does
|
|
// not have a threadID.
|
|
dbStatus, dbErr := suite.state.DB.GetStatusByID(ctx, apiStatus.ID)
|
|
if dbErr != nil {
|
|
suite.FailNow(err.Error())
|
|
}
|
|
suite.NotEmpty(dbStatus.ThreadID)
|
|
}
|
|
|
|
func (suite *StatusCreateTestSuite) TestProcessNoContentTypeUsesDefault() {
|
|
ctx := context.Background()
|
|
creatingAccount := suite.testAccounts["local_account_1"]
|
|
creatingApplication := suite.testApplications["application_1"]
|
|
|
|
statusCreateForm := &apimodel.StatusCreateRequest{
|
|
Status: "poopoo peepee",
|
|
SpoilerText: "",
|
|
MediaIDs: []string{},
|
|
Poll: nil,
|
|
InReplyToID: "",
|
|
Sensitive: false,
|
|
Visibility: apimodel.VisibilityPublic,
|
|
LocalOnly: util.Ptr(false),
|
|
ScheduledAt: nil,
|
|
Language: "en",
|
|
ContentType: "",
|
|
}
|
|
|
|
apiStatus, errWithCode := suite.status.Create(ctx, creatingAccount, creatingApplication, statusCreateForm)
|
|
suite.NoError(errWithCode)
|
|
suite.NotNil(apiStatus)
|
|
|
|
suite.Equal("<p>poopoo peepee</p>", apiStatus.Content)
|
|
|
|
// the test accounts don't have settings, so we're comparing to
|
|
// the global default value instead of the requester's default
|
|
suite.Equal(apimodel.StatusContentTypeDefault, apiStatus.ContentType)
|
|
}
|
|
|
|
func TestStatusCreateTestSuite(t *testing.T) {
|
|
suite.Run(t, new(StatusCreateTestSuite))
|
|
}
|