diff options
Diffstat (limited to 'internal/api/client')
6 files changed, 25 insertions, 1 deletions
diff --git a/internal/api/client/statuses/statusboost_test.go b/internal/api/client/statuses/statusboost_test.go index 51b7d7652..fc750ca38 100644 --- a/internal/api/client/statuses/statusboost_test.go +++ b/internal/api/client/statuses/statusboost_test.go @@ -145,6 +145,7 @@ func (suite *StatusBoostTestSuite) TestPostBoost() { "bookmarked": true, "card": null, "content": "hello world! #welcome ! first post on the instance :rainbow: !", + "content_type": "text/plain", "created_at": "right the hell just now babyee", "edited_at": null, "emojis": [ @@ -331,6 +332,7 @@ func (suite *StatusBoostTestSuite) TestPostBoostOwnFollowersOnly() { "bookmarked": false, "card": null, "content": "hi!", + "content_type": "text/plain", "created_at": "right the hell just now babyee", "edited_at": null, "emojis": [], @@ -543,6 +545,7 @@ func (suite *StatusBoostTestSuite) TestPostBoostImplicitAccept() { "bookmarked": false, "card": null, "content": "<p>Hi <span class=\"h-card\"><a href=\"http://localhost:8080/@1happyturtle\" class=\"u-url mention\" rel=\"nofollow noreferrer noopener\" target=\"_blank\">@<span>1happyturtle</span></a></span>, can I reply?</p>", + "content_type": "text/markdown", "created_at": "right the hell just now babyee", "edited_at": null, "emojis": [], diff --git a/internal/api/client/statuses/statuscreate_test.go b/internal/api/client/statuses/statuscreate_test.go index 53e517a6e..aba39ba23 100644 --- a/internal/api/client/statuses/statuscreate_test.go +++ b/internal/api/client/statuses/statuscreate_test.go @@ -139,6 +139,7 @@ func (suite *StatusCreateTestSuite) TestPostNewStatus() { "bookmarked": false, "card": null, "content": "<p>this is a brand new status! <a href=\"http://localhost:8080/tags/helloworld\" class=\"mention hashtag\" rel=\"tag nofollow noreferrer noopener\" target=\"_blank\">#<span>helloworld</span></a></p>", + "content_type": "text/plain", "created_at": "right the hell just now babyee", "edited_at": null, "emojis": [], @@ -225,6 +226,7 @@ func (suite *StatusCreateTestSuite) TestPostNewStatusIntPolicy() { "bookmarked": false, "card": null, "content": "<p>this is a brand new status! <a href=\"http://localhost:8080/tags/helloworld\" class=\"mention hashtag\" rel=\"tag nofollow noreferrer noopener\" target=\"_blank\">#<span>helloworld</span></a></p>", + "content_type": "text/plain", "created_at": "right the hell just now babyee", "edited_at": null, "emojis": [], @@ -321,6 +323,7 @@ func (suite *StatusCreateTestSuite) TestPostNewStatusIntPolicyJSON() { "bookmarked": false, "card": null, "content": "<p>this is a brand new status! <a href=\"http://localhost:8080/tags/helloworld\" class=\"mention hashtag\" rel=\"tag nofollow noreferrer noopener\" target=\"_blank\">#<span>helloworld</span></a></p>", + "content_type": "text/plain", "created_at": "right the hell just now babyee", "edited_at": null, "emojis": [], @@ -535,6 +538,7 @@ func (suite *StatusCreateTestSuite) TestPostNewStatusMarkdown() { "bookmarked": false, "card": null, "content": "<h1>Title</h1><h2>Smaller title</h2><p>This is a post written in <a href=\"https://www.markdownguide.org/\" rel=\"nofollow noreferrer noopener\" target=\"_blank\">markdown</a></p>", + "content_type": "text/markdown", "created_at": "right the hell just now babyee", "edited_at": null, "emojis": [], @@ -619,6 +623,7 @@ func (suite *StatusCreateTestSuite) TestMentionUnknownAccount() { "bookmarked": false, "card": null, "content": "<p>hello <span class=\"h-card\"><a href=\"https://unknown-instance.com/@brand_new_person\" class=\"u-url mention\" rel=\"nofollow noreferrer noopener\" target=\"_blank\">@<span>brand_new_person</span></a></span></p>", + "content_type": "text/plain", "created_at": "right the hell just now babyee", "edited_at": null, "emojis": [], @@ -697,6 +702,7 @@ func (suite *StatusCreateTestSuite) TestPostStatusWithLinksAndTags() { "bookmarked": false, "card": null, "content": "<p><a href=\"http://localhost:8080/tags/test\" class=\"mention hashtag\" rel=\"tag nofollow noreferrer noopener\" target=\"_blank\">#<span>test</span></a> alright, should be able to post <a href=\"http://localhost:8080/tags/links\" class=\"mention hashtag\" rel=\"tag nofollow noreferrer noopener\" target=\"_blank\">#<span>links</span></a> with fragments in them now, let's see........<br><br><a href=\"https://docs.gotosocial.org/en/latest/user_guide/posts/#links\" rel=\"nofollow noreferrer noopener\" target=\"_blank\">https://docs.gotosocial.org/en/latest/user_guide/posts/#links</a><br><br><a href=\"http://localhost:8080/tags/gotosocial\" class=\"mention hashtag\" rel=\"tag nofollow noreferrer noopener\" target=\"_blank\">#<span>gotosocial</span></a><br><br>(tobi remember to pull the docker image challenge)</p>", + "content_type": "text/plain", "created_at": "right the hell just now babyee", "edited_at": null, "emojis": [], @@ -781,6 +787,7 @@ func (suite *StatusCreateTestSuite) TestPostNewStatusWithEmoji() { "bookmarked": false, "card": null, "content": "<p>here is a rainbow emoji a few times! :rainbow: :rainbow: :rainbow:<br>here's an emoji that isn't in the db: :test_emoji:</p>", + "content_type": "text/plain", "created_at": "right the hell just now babyee", "edited_at": null, "emojis": [ @@ -879,6 +886,7 @@ func (suite *StatusCreateTestSuite) TestReplyToLocalStatus() { "bookmarked": false, "card": null, "content": "<p>hello <span class=\"h-card\"><a href=\"http://localhost:8080/@1happyturtle\" class=\"u-url mention\" rel=\"nofollow noreferrer noopener\" target=\"_blank\">@<span>1happyturtle</span></a></span> this reply should work!</p>", + "content_type": "text/plain", "created_at": "right the hell just now babyee", "edited_at": null, "emojis": [], @@ -962,6 +970,7 @@ func (suite *StatusCreateTestSuite) TestAttachNewMediaSuccess() { "bookmarked": false, "card": null, "content": "<p>here's an image attachment</p>", + "content_type": "text/plain", "created_at": "right the hell just now babyee", "edited_at": null, "emojis": [], @@ -1067,6 +1076,7 @@ func (suite *StatusCreateTestSuite) TestPostNewStatusWithNoncanonicalLanguageTag "bookmarked": false, "card": null, "content": "<p>English? what's English? i speak American</p>", + "content_type": "text/plain", "created_at": "right the hell just now babyee", "edited_at": null, "emojis": [], @@ -1142,6 +1152,7 @@ func (suite *StatusCreateTestSuite) TestPostNewStatusWithPollForm() { "bookmarked": false, "card": null, "content": "<p>this is a status with a poll!</p>", + "content_type": "text/plain", "created_at": "right the hell just now babyee", "edited_at": null, "emojis": [], @@ -1239,6 +1250,7 @@ func (suite *StatusCreateTestSuite) TestPostNewStatusWithPollJSON() { "bookmarked": false, "card": null, "content": "<p>this is a status with a poll!</p>", + "content_type": "text/plain", "created_at": "right the hell just now babyee", "edited_at": null, "emojis": [], diff --git a/internal/api/client/statuses/statusdelete_test.go b/internal/api/client/statuses/statusdelete_test.go index 6f62ef45f..d7efd5725 100644 --- a/internal/api/client/statuses/statusdelete_test.go +++ b/internal/api/client/statuses/statusdelete_test.go @@ -77,6 +77,10 @@ func (suite *StatusDeleteTestSuite) TestPostDelete() { 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) diff --git a/internal/api/client/statuses/statusfave_test.go b/internal/api/client/statuses/statusfave_test.go index 8851b4d58..42b812fdf 100644 --- a/internal/api/client/statuses/statusfave_test.go +++ b/internal/api/client/statuses/statusfave_test.go @@ -104,6 +104,7 @@ func (suite *StatusFaveTestSuite) TestPostFave() { "bookmarked": false, "card": null, "content": "🐕🐕🐕🐕🐕", + "content_type": "text/plain", "created_at": "right the hell just now babyee", "edited_at": null, "emojis": [], @@ -228,6 +229,7 @@ func (suite *StatusFaveTestSuite) TestPostFaveImplicitAccept() { "bookmarked": false, "card": null, "content": "<p>Hi <span class=\"h-card\"><a href=\"http://localhost:8080/@1happyturtle\" class=\"u-url mention\" rel=\"nofollow noreferrer noopener\" target=\"_blank\">@<span>1happyturtle</span></a></span>, can I reply?</p>", + "content_type": "text/markdown", "created_at": "right the hell just now babyee", "edited_at": null, "emojis": [], diff --git a/internal/api/client/statuses/statusmute_test.go b/internal/api/client/statuses/statusmute_test.go index 20ee590f8..174ac14dc 100644 --- a/internal/api/client/statuses/statusmute_test.go +++ b/internal/api/client/statuses/statusmute_test.go @@ -149,6 +149,7 @@ func (suite *StatusMuteTestSuite) TestMuteUnmuteStatus() { "card": null, "poll": null, "text": "hello everyone!", + "content_type": "text/plain", "interaction_policy": { "can_favourite": { "always": [ @@ -238,6 +239,7 @@ func (suite *StatusMuteTestSuite) TestMuteUnmuteStatus() { "card": null, "poll": null, "text": "hello everyone!", + "content_type": "text/plain", "interaction_policy": { "can_favourite": { "always": [ diff --git a/internal/api/client/statuses/statussource_test.go b/internal/api/client/statuses/statussource_test.go index 797a462ed..e36a939ef 100644 --- a/internal/api/client/statuses/statussource_test.go +++ b/internal/api/client/statuses/statussource_test.go @@ -92,7 +92,8 @@ func (suite *StatusSourceTestSuite) TestGetSource() { suite.Equal(`{ "id": "01F8MHAMCHF6Y650WCRSCP4WMY", "text": "hello everyone!", - "spoiler_text": "introduction post" + "spoiler_text": "introduction post", + "content_type": "text/plain" }`, dst.String()) } |