From 1dc79c95862e083bc743e3ecdf63e6e8d3cc406a Mon Sep 17 00:00:00 2001 From: tobi Date: Tue, 10 Jun 2025 14:29:42 +0200 Subject: [chore] Update interactionPolicy sub-policy parsing in line with documented defaults (#4229) # Description > If this is a code change, please include a summary of what you've coded, and link to the issue(s) it closes/implements. > > If this is a documentation change, please briefly describe what you've changed and why. Brings our parsing of unset sub-policies in line with the defaults documented here: https://docs.gotosocial.org/en/v0.19.1/federation/interaction_policy/#defaults-per-sub-policy Closes https://codeberg.org/superseriousbusiness/gotosocial/issues/4146 Part of https://codeberg.org/superseriousbusiness/gotosocial/issues/4026 ## Checklist Please put an x inside each checkbox to indicate that you've read and followed it: `[ ]` -> `[x]` If this is a documentation change, only the first checkbox must be filled (you can delete the others if you want). - [x] I/we have read the [GoToSocial contribution guidelines](https://codeberg.org/superseriousbusiness/gotosocial/src/branch/main/CONTRIBUTING.md). - [x] I/we have discussed the proposed changes already, either in an issue on the repository, or in the Matrix chat. - [x] I/we have not leveraged AI to create the proposed changes. - [x] I/we have performed a self-review of added code. - [x] I/we have written code that is legible and maintainable by others. - [x] I/we have commented the added code, particularly in hard-to-understand areas. - [ ] I/we have made any necessary changes to documentation. - [x] I/we have added tests that cover new code. - [x] I/we have run tests and they pass locally with the changes. - [x] I/we have run `go fmt ./...` and `golangci-lint run`. Reviewed-on: https://codeberg.org/superseriousbusiness/gotosocial/pulls/4229 Co-authored-by: tobi Co-committed-by: tobi --- internal/ap/extractpolicy_test.go | 80 ++++++++++++++++++++++++++++++++++++--- 1 file changed, 74 insertions(+), 6 deletions(-) (limited to 'internal/ap/extractpolicy_test.go') diff --git a/internal/ap/extractpolicy_test.go b/internal/ap/extractpolicy_test.go index 24b198b29..85221dcef 100644 --- a/internal/ap/extractpolicy_test.go +++ b/internal/ap/extractpolicy_test.go @@ -102,13 +102,13 @@ func (suite *ExtractPolicyTestSuite) TestExtractPolicy() { ) expectedPolicy := >smodel.InteractionPolicy{ - CanLike: gtsmodel.PolicyRules{ + CanLike: >smodel.PolicyRules{ AutomaticApproval: gtsmodel.PolicyValues{ gtsmodel.PolicyValuePublic, }, ManualApproval: gtsmodel.PolicyValues{}, }, - CanReply: gtsmodel.PolicyRules{ + CanReply: >smodel.PolicyRules{ AutomaticApproval: gtsmodel.PolicyValues{ gtsmodel.PolicyValueAuthor, gtsmodel.PolicyValueFollowers, @@ -119,7 +119,75 @@ func (suite *ExtractPolicyTestSuite) TestExtractPolicy() { gtsmodel.PolicyValuePublic, }, }, - CanAnnounce: gtsmodel.PolicyRules{ + CanAnnounce: >smodel.PolicyRules{ + AutomaticApproval: gtsmodel.PolicyValues{ + gtsmodel.PolicyValueAuthor, + }, + ManualApproval: gtsmodel.PolicyValues{ + gtsmodel.PolicyValuePublic, + }, + }, + } + suite.EqualValues(expectedPolicy, policy) +} + +func (suite *ExtractPolicyTestSuite) TestExtractPolicyUnsetProps() { + rawNote := `{ + "@context": [ + "https://gotosocial.org/ns", + "https://www.w3.org/ns/activitystreams" + ], + "content": "hey @f0x and @dumpsterqueer", + "contentMap": { + "en": "hey @f0x and @dumpsterqueer", + "fr": "bonjour @f0x et @dumpsterqueer" + }, + "interactionPolicy": { + "canAnnounce": { + "automaticApproval": [ + "http://localhost:8080/users/the_mighty_zork" + ], + "manualApproval": [ + "https://www.w3.org/ns/activitystreams#Public" + ] + } + }, + "tag": [ + { + "href": "https://gts.superseriousbusiness.org/users/dumpsterqueer", + "name": "@dumpsterqueer@superseriousbusiness.org", + "type": "Mention" + }, + { + "href": "https://gts.superseriousbusiness.org/users/f0x", + "name": "@f0x@superseriousbusiness.org", + "type": "Mention" + } + ], + "type": "Note" +}` + + statusable, err := ap.ResolveStatusable( + suite.T().Context(), + io.NopCloser( + bytes.NewBufferString(rawNote), + ), + ) + if err != nil { + suite.FailNow(err.Error()) + } + + policy := ap.ExtractInteractionPolicy( + statusable, + // Zork didn't actually create + // this status but nevermind. + suite.testAccounts["local_account_1"], + ) + + expectedPolicy := >smodel.InteractionPolicy{ + CanLike: nil, + CanReply: nil, + CanAnnounce: >smodel.PolicyRules{ AutomaticApproval: gtsmodel.PolicyValues{ gtsmodel.PolicyValueAuthor, }, @@ -202,13 +270,13 @@ func (suite *ExtractPolicyTestSuite) TestExtractPolicyDeprecated() { ) expectedPolicy := >smodel.InteractionPolicy{ - CanLike: gtsmodel.PolicyRules{ + CanLike: >smodel.PolicyRules{ AutomaticApproval: gtsmodel.PolicyValues{ gtsmodel.PolicyValuePublic, }, ManualApproval: gtsmodel.PolicyValues{}, }, - CanReply: gtsmodel.PolicyRules{ + CanReply: >smodel.PolicyRules{ AutomaticApproval: gtsmodel.PolicyValues{ gtsmodel.PolicyValueAuthor, gtsmodel.PolicyValueFollowers, @@ -219,7 +287,7 @@ func (suite *ExtractPolicyTestSuite) TestExtractPolicyDeprecated() { gtsmodel.PolicyValuePublic, }, }, - CanAnnounce: gtsmodel.PolicyRules{ + CanAnnounce: >smodel.PolicyRules{ AutomaticApproval: gtsmodel.PolicyValues{ gtsmodel.PolicyValueAuthor, }, -- cgit v1.2.3