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/typeutils/internaltofrontend.go | 54 +++++++++++++++++++++++++++----- 1 file changed, 46 insertions(+), 8 deletions(-) (limited to 'internal/typeutils/internaltofrontend.go') diff --git a/internal/typeutils/internaltofrontend.go b/internal/typeutils/internaltofrontend.go index b6cb2bb37..bdb33243d 100644 --- a/internal/typeutils/internaltofrontend.go +++ b/internal/typeutils/internaltofrontend.go @@ -2782,7 +2782,10 @@ func (c *Converter) ThemesToAPIThemes(themes []*gtsmodel.Theme) []apimodel.Theme // into an apimodel interaction policy. // // Provided status can be nil to convert a -// policy without a particular status in mind. +// policy without a particular status in mind, +// but ***if status is nil then sub-policies +// CanLike, CanReply, and CanAnnounce on +// the given policy must *not* be nil.*** // // RequestingAccount can also be nil for // unauthorized requests (web, public api etc). @@ -2792,19 +2795,54 @@ func (c *Converter) InteractionPolicyToAPIInteractionPolicy( status *gtsmodel.Status, requester *gtsmodel.Account, ) (*apimodel.InteractionPolicy, error) { - apiPolicy := &apimodel.InteractionPolicy{ - CanFavourite: apimodel.PolicyRules{ + apiPolicy := new(apimodel.InteractionPolicy) + + // gtsmodel CanLike -> apimodel CanFavourite + if policy.CanLike != nil { + // Use the set CanLike value. + apiPolicy.CanFavourite = apimodel.PolicyRules{ AutomaticApproval: policyValsToAPIPolicyVals(policy.CanLike.AutomaticApproval), ManualApproval: policyValsToAPIPolicyVals(policy.CanLike.ManualApproval), - }, - CanReply: apimodel.PolicyRules{ + } + } else { + // Use default CanLike value for this vis. + pCanLike := gtsmodel.DefaultCanLikeFor(status.Visibility) + apiPolicy.CanFavourite = apimodel.PolicyRules{ + AutomaticApproval: policyValsToAPIPolicyVals(pCanLike.AutomaticApproval), + ManualApproval: policyValsToAPIPolicyVals(pCanLike.ManualApproval), + } + } + + // gtsmodel CanReply -> apimodel CanReply + if policy.CanReply != nil { + // Use the set CanReply value. + apiPolicy.CanReply = apimodel.PolicyRules{ AutomaticApproval: policyValsToAPIPolicyVals(policy.CanReply.AutomaticApproval), ManualApproval: policyValsToAPIPolicyVals(policy.CanReply.ManualApproval), - }, - CanReblog: apimodel.PolicyRules{ + } + } else { + // Use default CanReply value for this vis. + pCanReply := gtsmodel.DefaultCanReplyFor(status.Visibility) + apiPolicy.CanReply = apimodel.PolicyRules{ + AutomaticApproval: policyValsToAPIPolicyVals(pCanReply.AutomaticApproval), + ManualApproval: policyValsToAPIPolicyVals(pCanReply.ManualApproval), + } + } + + // gtsmodel CanAnnounce -> apimodel CanReblog + if policy.CanAnnounce != nil { + // Use the set CanAnnounce value. + apiPolicy.CanReblog = apimodel.PolicyRules{ AutomaticApproval: policyValsToAPIPolicyVals(policy.CanAnnounce.AutomaticApproval), ManualApproval: policyValsToAPIPolicyVals(policy.CanAnnounce.ManualApproval), - }, + } + } else { + // Use default CanAnnounce value for this vis. + pCanAnnounce := gtsmodel.DefaultCanAnnounceFor(status.Visibility) + apiPolicy.CanReblog = apimodel.PolicyRules{ + AutomaticApproval: policyValsToAPIPolicyVals(pCanAnnounce.AutomaticApproval), + ManualApproval: policyValsToAPIPolicyVals(pCanAnnounce.ManualApproval), + } } defer func() { -- cgit v1.2.3