mirror of
https://github.com/superseriousbusiness/gotosocial.git
synced 2025-11-03 22:52:25 -06: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
95 lines
3.2 KiB
Go
95 lines
3.2 KiB
Go
/*
|
|
GoToSocial
|
|
Copyright (C) GoToSocial Authors admin@gotosocial.org
|
|
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 statuses_test
|
|
|
|
import (
|
|
"encoding/json"
|
|
"errors"
|
|
"fmt"
|
|
"io"
|
|
"net/http"
|
|
"net/http/httptest"
|
|
"strings"
|
|
"testing"
|
|
|
|
"github.com/gin-gonic/gin"
|
|
"github.com/stretchr/testify/suite"
|
|
"github.com/superseriousbusiness/gotosocial/internal/api/client/statuses"
|
|
apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model"
|
|
"github.com/superseriousbusiness/gotosocial/internal/db"
|
|
"github.com/superseriousbusiness/gotosocial/internal/oauth"
|
|
"github.com/superseriousbusiness/gotosocial/testrig"
|
|
)
|
|
|
|
type StatusDeleteTestSuite struct {
|
|
StatusStandardTestSuite
|
|
}
|
|
|
|
func (suite *StatusDeleteTestSuite) TestPostDelete() {
|
|
t := suite.testTokens["local_account_1"]
|
|
oauthToken := oauth.DBTokenToToken(t)
|
|
targetStatus := suite.testStatuses["local_account_1_status_1"]
|
|
|
|
// setup
|
|
recorder := httptest.NewRecorder()
|
|
ctx, _ := testrig.CreateGinTestContext(recorder, nil)
|
|
ctx.Set(oauth.SessionAuthorizedApplication, suite.testApplications["application_1"])
|
|
ctx.Set(oauth.SessionAuthorizedToken, oauthToken)
|
|
ctx.Set(oauth.SessionAuthorizedUser, suite.testUsers["local_account_1"])
|
|
ctx.Set(oauth.SessionAuthorizedAccount, suite.testAccounts["local_account_1"])
|
|
ctx.Request = httptest.NewRequest(http.MethodDelete, fmt.Sprintf("http://localhost:8080%s", strings.Replace(statuses.BasePathWithID, ":id", targetStatus.ID, 1)), nil) // the endpoint we're hitting
|
|
ctx.Request.Header.Set("accept", "application/json")
|
|
|
|
// normally the router would populate these params from the path values,
|
|
// but because we're calling the function directly, we need to set them manually.
|
|
ctx.Params = gin.Params{
|
|
gin.Param{
|
|
Key: statuses.IDKey,
|
|
Value: targetStatus.ID,
|
|
},
|
|
}
|
|
|
|
suite.statusModule.StatusDELETEHandler(ctx)
|
|
|
|
// check response
|
|
suite.EqualValues(http.StatusOK, recorder.Code)
|
|
|
|
result := recorder.Result()
|
|
defer result.Body.Close()
|
|
b, err := io.ReadAll(result.Body)
|
|
suite.NoError(err)
|
|
|
|
statusReply := &apimodel.Status{}
|
|
err = json.Unmarshal(b, statusReply)
|
|
suite.NoError(err)
|
|
suite.NotNil(statusReply)
|
|
|
|
// Check that text and content type are returned for delete and redraft
|
|
suite.Equal("hello everyone!", statusReply.Text)
|
|
suite.Equal(apimodel.StatusContentTypePlain, statusReply.ContentType)
|
|
|
|
if !testrig.WaitFor(func() bool {
|
|
_, err := suite.db.GetStatusByID(ctx, targetStatus.ID)
|
|
return errors.Is(err, db.ErrNoEntries)
|
|
}) {
|
|
suite.FailNow("time out waiting for status to be deleted")
|
|
}
|
|
|
|
}
|
|
|
|
func TestStatusDeleteTestSuite(t *testing.T) {
|
|
suite.Run(t, new(StatusDeleteTestSuite))
|
|
}
|