diff options
Diffstat (limited to 'internal/api')
| -rw-r--r-- | internal/api/client/admin/reportsget_test.go | 45 | ||||
| -rw-r--r-- | internal/api/client/statuses/statusboost_test.go | 98 | ||||
| -rw-r--r-- | internal/api/client/statuses/statuscreate_test.go | 194 | ||||
| -rw-r--r-- | internal/api/client/statuses/statusfave_test.go | 30 | ||||
| -rw-r--r-- | internal/api/client/statuses/statusmute_test.go | 30 | ||||
| -rw-r--r-- | internal/api/model/interactionpolicy.go | 7 |
6 files changed, 404 insertions, 0 deletions
diff --git a/internal/api/client/admin/reportsget_test.go b/internal/api/client/admin/reportsget_test.go index 8489d5c28..8ba1338b6 100644 --- a/internal/api/client/admin/reportsget_test.go +++ b/internal/api/client/admin/reportsget_test.go @@ -572,6 +572,11 @@ func (suite *ReportsGetTestSuite) TestReportsGetAll() { "poll": null, "interaction_policy": { "can_favourite": { + "automatic_approval": [ + "public", + "me" + ], + "manual_approval": [], "always": [ "public", "me" @@ -579,6 +584,11 @@ func (suite *ReportsGetTestSuite) TestReportsGetAll() { "with_approval": [] }, "can_reply": { + "automatic_approval": [ + "public", + "me" + ], + "manual_approval": [], "always": [ "public", "me" @@ -586,6 +596,11 @@ func (suite *ReportsGetTestSuite) TestReportsGetAll() { "with_approval": [] }, "can_reblog": { + "automatic_approval": [ + "public", + "me" + ], + "manual_approval": [], "always": [ "public", "me" @@ -829,6 +844,11 @@ func (suite *ReportsGetTestSuite) TestReportsGetCreatedByAccount() { "poll": null, "interaction_policy": { "can_favourite": { + "automatic_approval": [ + "public", + "me" + ], + "manual_approval": [], "always": [ "public", "me" @@ -836,6 +856,11 @@ func (suite *ReportsGetTestSuite) TestReportsGetCreatedByAccount() { "with_approval": [] }, "can_reply": { + "automatic_approval": [ + "public", + "me" + ], + "manual_approval": [], "always": [ "public", "me" @@ -843,6 +868,11 @@ func (suite *ReportsGetTestSuite) TestReportsGetCreatedByAccount() { "with_approval": [] }, "can_reblog": { + "automatic_approval": [ + "public", + "me" + ], + "manual_approval": [], "always": [ "public", "me" @@ -1086,6 +1116,11 @@ func (suite *ReportsGetTestSuite) TestReportsGetTargetAccount() { "poll": null, "interaction_policy": { "can_favourite": { + "automatic_approval": [ + "public", + "me" + ], + "manual_approval": [], "always": [ "public", "me" @@ -1093,6 +1128,11 @@ func (suite *ReportsGetTestSuite) TestReportsGetTargetAccount() { "with_approval": [] }, "can_reply": { + "automatic_approval": [ + "public", + "me" + ], + "manual_approval": [], "always": [ "public", "me" @@ -1100,6 +1140,11 @@ func (suite *ReportsGetTestSuite) TestReportsGetTargetAccount() { "with_approval": [] }, "can_reblog": { + "automatic_approval": [ + "public", + "me" + ], + "manual_approval": [], "always": [ "public", "me" diff --git a/internal/api/client/statuses/statusboost_test.go b/internal/api/client/statuses/statusboost_test.go index 333334bbc..abbe4857b 100644 --- a/internal/api/client/statuses/statusboost_test.go +++ b/internal/api/client/statuses/statusboost_test.go @@ -113,6 +113,11 @@ func (suite *StatusBoostTestSuite) TestPostBoost() { "public", "me" ], + "automatic_approval": [ + "public", + "me" + ], + "manual_approval": [], "with_approval": [] }, "can_reblog": { @@ -120,6 +125,11 @@ func (suite *StatusBoostTestSuite) TestPostBoost() { "public", "me" ], + "automatic_approval": [ + "public", + "me" + ], + "manual_approval": [], "with_approval": [] }, "can_reply": { @@ -127,6 +137,11 @@ func (suite *StatusBoostTestSuite) TestPostBoost() { "public", "me" ], + "automatic_approval": [ + "public", + "me" + ], + "manual_approval": [], "with_approval": [] } }, @@ -168,6 +183,11 @@ func (suite *StatusBoostTestSuite) TestPostBoost() { "public", "me" ], + "automatic_approval": [ + "public", + "me" + ], + "manual_approval": [], "with_approval": [] }, "can_reblog": { @@ -175,6 +195,11 @@ func (suite *StatusBoostTestSuite) TestPostBoost() { "public", "me" ], + "automatic_approval": [ + "public", + "me" + ], + "manual_approval": [], "with_approval": [] }, "can_reply": { @@ -182,6 +207,11 @@ func (suite *StatusBoostTestSuite) TestPostBoost() { "public", "me" ], + "automatic_approval": [ + "public", + "me" + ], + "manual_approval": [], "with_approval": [] } }, @@ -298,6 +328,13 @@ func (suite *StatusBoostTestSuite) TestPostBoostOwnFollowersOnly() { "mentioned", "me" ], + "automatic_approval": [ + "author", + "followers", + "mentioned", + "me" + ], + "manual_approval": [], "with_approval": [] }, "can_reblog": { @@ -305,6 +342,11 @@ func (suite *StatusBoostTestSuite) TestPostBoostOwnFollowersOnly() { "author", "me" ], + "automatic_approval": [ + "author", + "me" + ], + "manual_approval": [], "with_approval": [] }, "can_reply": { @@ -314,6 +356,13 @@ func (suite *StatusBoostTestSuite) TestPostBoostOwnFollowersOnly() { "mentioned", "me" ], + "automatic_approval": [ + "author", + "followers", + "mentioned", + "me" + ], + "manual_approval": [], "with_approval": [] } }, @@ -349,6 +398,13 @@ func (suite *StatusBoostTestSuite) TestPostBoostOwnFollowersOnly() { "mentioned", "me" ], + "automatic_approval": [ + "author", + "followers", + "mentioned", + "me" + ], + "manual_approval": [], "with_approval": [] }, "can_reblog": { @@ -356,6 +412,11 @@ func (suite *StatusBoostTestSuite) TestPostBoostOwnFollowersOnly() { "author", "me" ], + "automatic_approval": [ + "author", + "me" + ], + "manual_approval": [], "with_approval": [] }, "can_reply": { @@ -365,6 +426,13 @@ func (suite *StatusBoostTestSuite) TestPostBoostOwnFollowersOnly() { "mentioned", "me" ], + "automatic_approval": [ + "author", + "followers", + "mentioned", + "me" + ], + "manual_approval": [], "with_approval": [] } }, @@ -513,6 +581,11 @@ func (suite *StatusBoostTestSuite) TestPostBoostImplicitAccept() { "public", "me" ], + "automatic_approval": [ + "public", + "me" + ], + "manual_approval": [], "with_approval": [] }, "can_reblog": { @@ -520,6 +593,11 @@ func (suite *StatusBoostTestSuite) TestPostBoostImplicitAccept() { "public", "me" ], + "automatic_approval": [ + "public", + "me" + ], + "manual_approval": [], "with_approval": [] }, "can_reply": { @@ -527,6 +605,11 @@ func (suite *StatusBoostTestSuite) TestPostBoostImplicitAccept() { "public", "me" ], + "automatic_approval": [ + "public", + "me" + ], + "manual_approval": [], "with_approval": [] } }, @@ -560,6 +643,11 @@ func (suite *StatusBoostTestSuite) TestPostBoostImplicitAccept() { "public", "me" ], + "automatic_approval": [ + "public", + "me" + ], + "manual_approval": [], "with_approval": [] }, "can_reblog": { @@ -567,6 +655,11 @@ func (suite *StatusBoostTestSuite) TestPostBoostImplicitAccept() { "public", "me" ], + "automatic_approval": [ + "public", + "me" + ], + "manual_approval": [], "with_approval": [] }, "can_reply": { @@ -574,6 +667,11 @@ func (suite *StatusBoostTestSuite) TestPostBoostImplicitAccept() { "public", "me" ], + "automatic_approval": [ + "public", + "me" + ], + "manual_approval": [], "with_approval": [] } }, diff --git a/internal/api/client/statuses/statuscreate_test.go b/internal/api/client/statuses/statuscreate_test.go index 514109223..60069d362 100644 --- a/internal/api/client/statuses/statuscreate_test.go +++ b/internal/api/client/statuses/statuscreate_test.go @@ -156,6 +156,13 @@ func (suite *StatusCreateTestSuite) TestPostNewStatus() { "mentioned", "me" ], + "automatic_approval": [ + "author", + "followers", + "mentioned", + "me" + ], + "manual_approval": [], "with_approval": [] }, "can_reblog": { @@ -163,6 +170,11 @@ func (suite *StatusCreateTestSuite) TestPostNewStatus() { "author", "me" ], + "automatic_approval": [ + "author", + "me" + ], + "manual_approval": [], "with_approval": [] }, "can_reply": { @@ -172,6 +184,13 @@ func (suite *StatusCreateTestSuite) TestPostNewStatus() { "mentioned", "me" ], + "automatic_approval": [ + "author", + "followers", + "mentioned", + "me" + ], + "manual_approval": [], "with_approval": [] } }, @@ -241,6 +260,11 @@ func (suite *StatusCreateTestSuite) TestPostNewStatusIntPolicy() { "author", "me" ], + "automatic_approval": [ + "author", + "me" + ], + "manual_approval": [], "with_approval": [] }, "can_reblog": { @@ -248,6 +272,11 @@ func (suite *StatusCreateTestSuite) TestPostNewStatusIntPolicy() { "author", "me" ], + "automatic_approval": [ + "author", + "me" + ], + "manual_approval": [], "with_approval": [] }, "can_reply": { @@ -258,6 +287,16 @@ func (suite *StatusCreateTestSuite) TestPostNewStatusIntPolicy() { "mentioned", "me" ], + "automatic_approval": [ + "author", + "followers", + "following", + "mentioned", + "me" + ], + "manual_approval": [ + "public" + ], "with_approval": [ "public" ] @@ -338,6 +377,11 @@ func (suite *StatusCreateTestSuite) TestPostNewStatusIntPolicyJSON() { "author", "me" ], + "automatic_approval": [ + "author", + "me" + ], + "manual_approval": [], "with_approval": [] }, "can_reblog": { @@ -345,6 +389,11 @@ func (suite *StatusCreateTestSuite) TestPostNewStatusIntPolicyJSON() { "author", "me" ], + "automatic_approval": [ + "author", + "me" + ], + "manual_approval": [], "with_approval": [] }, "can_reply": { @@ -355,6 +404,16 @@ func (suite *StatusCreateTestSuite) TestPostNewStatusIntPolicyJSON() { "mentioned", "me" ], + "automatic_approval": [ + "author", + "followers", + "following", + "mentioned", + "me" + ], + "manual_approval": [ + "public" + ], "with_approval": [ "public" ] @@ -553,6 +612,11 @@ func (suite *StatusCreateTestSuite) TestPostNewStatusMarkdown() { "public", "me" ], + "automatic_approval": [ + "public", + "me" + ], + "manual_approval": [], "with_approval": [] }, "can_reblog": { @@ -560,6 +624,11 @@ func (suite *StatusCreateTestSuite) TestPostNewStatusMarkdown() { "public", "me" ], + "automatic_approval": [ + "public", + "me" + ], + "manual_approval": [], "with_approval": [] }, "can_reply": { @@ -567,6 +636,11 @@ func (suite *StatusCreateTestSuite) TestPostNewStatusMarkdown() { "public", "me" ], + "automatic_approval": [ + "public", + "me" + ], + "manual_approval": [], "with_approval": [] } }, @@ -638,6 +712,11 @@ func (suite *StatusCreateTestSuite) TestMentionUnknownAccount() { "public", "me" ], + "automatic_approval": [ + "public", + "me" + ], + "manual_approval": [], "with_approval": [] }, "can_reblog": { @@ -645,6 +724,11 @@ func (suite *StatusCreateTestSuite) TestMentionUnknownAccount() { "public", "me" ], + "automatic_approval": [ + "public", + "me" + ], + "manual_approval": [], "with_approval": [] }, "can_reply": { @@ -652,6 +736,11 @@ func (suite *StatusCreateTestSuite) TestMentionUnknownAccount() { "public", "me" ], + "automatic_approval": [ + "public", + "me" + ], + "manual_approval": [], "with_approval": [] } }, @@ -717,6 +806,11 @@ func (suite *StatusCreateTestSuite) TestPostStatusWithLinksAndTags() { "public", "me" ], + "automatic_approval": [ + "public", + "me" + ], + "manual_approval": [], "with_approval": [] }, "can_reblog": { @@ -724,6 +818,11 @@ func (suite *StatusCreateTestSuite) TestPostStatusWithLinksAndTags() { "public", "me" ], + "automatic_approval": [ + "public", + "me" + ], + "manual_approval": [], "with_approval": [] }, "can_reply": { @@ -731,6 +830,11 @@ func (suite *StatusCreateTestSuite) TestPostStatusWithLinksAndTags() { "public", "me" ], + "automatic_approval": [ + "public", + "me" + ], + "manual_approval": [], "with_approval": [] } }, @@ -810,6 +914,11 @@ func (suite *StatusCreateTestSuite) TestPostNewStatusWithEmoji() { "public", "me" ], + "automatic_approval": [ + "public", + "me" + ], + "manual_approval": [], "with_approval": [] }, "can_reblog": { @@ -817,6 +926,11 @@ func (suite *StatusCreateTestSuite) TestPostNewStatusWithEmoji() { "public", "me" ], + "automatic_approval": [ + "public", + "me" + ], + "manual_approval": [], "with_approval": [] }, "can_reply": { @@ -824,6 +938,11 @@ func (suite *StatusCreateTestSuite) TestPostNewStatusWithEmoji() { "public", "me" ], + "automatic_approval": [ + "public", + "me" + ], + "manual_approval": [], "with_approval": [] } }, @@ -901,6 +1020,11 @@ func (suite *StatusCreateTestSuite) TestReplyToLocalStatus() { "public", "me" ], + "automatic_approval": [ + "public", + "me" + ], + "manual_approval": [], "with_approval": [] }, "can_reblog": { @@ -908,6 +1032,11 @@ func (suite *StatusCreateTestSuite) TestReplyToLocalStatus() { "public", "me" ], + "automatic_approval": [ + "public", + "me" + ], + "manual_approval": [], "with_approval": [] }, "can_reply": { @@ -915,6 +1044,11 @@ func (suite *StatusCreateTestSuite) TestReplyToLocalStatus() { "public", "me" ], + "automatic_approval": [ + "public", + "me" + ], + "manual_approval": [], "with_approval": [] } }, @@ -985,6 +1119,11 @@ func (suite *StatusCreateTestSuite) TestAttachNewMediaSuccess() { "public", "me" ], + "automatic_approval": [ + "public", + "me" + ], + "manual_approval": [], "with_approval": [] }, "can_reblog": { @@ -992,6 +1131,11 @@ func (suite *StatusCreateTestSuite) TestAttachNewMediaSuccess() { "public", "me" ], + "automatic_approval": [ + "public", + "me" + ], + "manual_approval": [], "with_approval": [] }, "can_reply": { @@ -999,6 +1143,11 @@ func (suite *StatusCreateTestSuite) TestAttachNewMediaSuccess() { "public", "me" ], + "automatic_approval": [ + "public", + "me" + ], + "manual_approval": [], "with_approval": [] } }, @@ -1091,6 +1240,11 @@ func (suite *StatusCreateTestSuite) TestPostNewStatusWithNoncanonicalLanguageTag "public", "me" ], + "automatic_approval": [ + "public", + "me" + ], + "manual_approval": [], "with_approval": [] }, "can_reblog": { @@ -1098,6 +1252,11 @@ func (suite *StatusCreateTestSuite) TestPostNewStatusWithNoncanonicalLanguageTag "public", "me" ], + "automatic_approval": [ + "public", + "me" + ], + "manual_approval": [], "with_approval": [] }, "can_reply": { @@ -1105,6 +1264,11 @@ func (suite *StatusCreateTestSuite) TestPostNewStatusWithNoncanonicalLanguageTag "public", "me" ], + "automatic_approval": [ + "public", + "me" + ], + "manual_approval": [], "with_approval": [] } }, @@ -1167,6 +1331,11 @@ func (suite *StatusCreateTestSuite) TestPostNewStatusWithPollForm() { "public", "me" ], + "automatic_approval": [ + "public", + "me" + ], + "manual_approval": [], "with_approval": [] }, "can_reblog": { @@ -1174,6 +1343,11 @@ func (suite *StatusCreateTestSuite) TestPostNewStatusWithPollForm() { "public", "me" ], + "automatic_approval": [ + "public", + "me" + ], + "manual_approval": [], "with_approval": [] }, "can_reply": { @@ -1181,6 +1355,11 @@ func (suite *StatusCreateTestSuite) TestPostNewStatusWithPollForm() { "public", "me" ], + "automatic_approval": [ + "public", + "me" + ], + "manual_approval": [], "with_approval": [] } }, @@ -1265,6 +1444,11 @@ func (suite *StatusCreateTestSuite) TestPostNewStatusWithPollJSON() { "public", "me" ], + "automatic_approval": [ + "public", + "me" + ], + "manual_approval": [], "with_approval": [] }, "can_reblog": { @@ -1272,6 +1456,11 @@ func (suite *StatusCreateTestSuite) TestPostNewStatusWithPollJSON() { "public", "me" ], + "automatic_approval": [ + "public", + "me" + ], + "manual_approval": [], "with_approval": [] }, "can_reply": { @@ -1279,6 +1468,11 @@ func (suite *StatusCreateTestSuite) TestPostNewStatusWithPollJSON() { "public", "me" ], + "automatic_approval": [ + "public", + "me" + ], + "manual_approval": [], "with_approval": [] } }, diff --git a/internal/api/client/statuses/statusfave_test.go b/internal/api/client/statuses/statusfave_test.go index 11ac4fc5f..11c03cc5b 100644 --- a/internal/api/client/statuses/statusfave_test.go +++ b/internal/api/client/statuses/statusfave_test.go @@ -119,6 +119,11 @@ func (suite *StatusFaveTestSuite) TestPostFave() { "public", "me" ], + "automatic_approval": [ + "public", + "me" + ], + "manual_approval": [], "with_approval": [] }, "can_reblog": { @@ -126,6 +131,11 @@ func (suite *StatusFaveTestSuite) TestPostFave() { "public", "me" ], + "automatic_approval": [ + "public", + "me" + ], + "manual_approval": [], "with_approval": [] }, "can_reply": { @@ -133,6 +143,11 @@ func (suite *StatusFaveTestSuite) TestPostFave() { "public", "me" ], + "automatic_approval": [ + "public", + "me" + ], + "manual_approval": [], "with_approval": [] } }, @@ -244,6 +259,11 @@ func (suite *StatusFaveTestSuite) TestPostFaveImplicitAccept() { "public", "me" ], + "automatic_approval": [ + "public", + "me" + ], + "manual_approval": [], "with_approval": [] }, "can_reblog": { @@ -251,6 +271,11 @@ func (suite *StatusFaveTestSuite) TestPostFaveImplicitAccept() { "public", "me" ], + "automatic_approval": [ + "public", + "me" + ], + "manual_approval": [], "with_approval": [] }, "can_reply": { @@ -258,6 +283,11 @@ func (suite *StatusFaveTestSuite) TestPostFaveImplicitAccept() { "public", "me" ], + "automatic_approval": [ + "public", + "me" + ], + "manual_approval": [], "with_approval": [] } }, diff --git a/internal/api/client/statuses/statusmute_test.go b/internal/api/client/statuses/statusmute_test.go index d3c880f09..3ef82da31 100644 --- a/internal/api/client/statuses/statusmute_test.go +++ b/internal/api/client/statuses/statusmute_test.go @@ -152,6 +152,11 @@ func (suite *StatusMuteTestSuite) TestMuteUnmuteStatus() { "content_type": "text/plain", "interaction_policy": { "can_favourite": { + "automatic_approval": [ + "public", + "me" + ], + "manual_approval": [], "always": [ "public", "me" @@ -159,6 +164,11 @@ func (suite *StatusMuteTestSuite) TestMuteUnmuteStatus() { "with_approval": [] }, "can_reply": { + "automatic_approval": [ + "public", + "me" + ], + "manual_approval": [], "always": [ "public", "me" @@ -166,6 +176,11 @@ func (suite *StatusMuteTestSuite) TestMuteUnmuteStatus() { "with_approval": [] }, "can_reblog": { + "automatic_approval": [ + "public", + "me" + ], + "manual_approval": [], "always": [ "public", "me" @@ -242,6 +257,11 @@ func (suite *StatusMuteTestSuite) TestMuteUnmuteStatus() { "content_type": "text/plain", "interaction_policy": { "can_favourite": { + "automatic_approval": [ + "public", + "me" + ], + "manual_approval": [], "always": [ "public", "me" @@ -249,6 +269,11 @@ func (suite *StatusMuteTestSuite) TestMuteUnmuteStatus() { "with_approval": [] }, "can_reply": { + "automatic_approval": [ + "public", + "me" + ], + "manual_approval": [], "always": [ "public", "me" @@ -256,6 +281,11 @@ func (suite *StatusMuteTestSuite) TestMuteUnmuteStatus() { "with_approval": [] }, "can_reblog": { + "automatic_approval": [ + "public", + "me" + ], + "manual_approval": [], "always": [ "public", "me" diff --git a/internal/api/model/interactionpolicy.go b/internal/api/model/interactionpolicy.go index 7c5df09e8..c43142d58 100644 --- a/internal/api/model/interactionpolicy.go +++ b/internal/api/model/interactionpolicy.go @@ -48,9 +48,16 @@ const ( // // swagger:model interactionPolicyRules type PolicyRules struct { + // Policy entries for accounts that will receive automatic approval for this type of interaction. + AutomaticApproval []PolicyValue `form:"automatic_approval" json:"automatic_approval"` + // Policy entries for accounts that require manual approval for this type of interaction. + ManualApproval []PolicyValue `form:"manual_approval" json:"manual_approval"` + // Policy entries for accounts that can always do this type of interaction. + // Deprecated: Use "automatic_approval" instead. Always []PolicyValue `form:"always" json:"always"` // Policy entries for accounts that require approval to do this type of interaction. + // Deprecated: Use "manual_approval" instead. WithApproval []PolicyValue `form:"with_approval" json:"with_approval"` } |