diff options
| author | 2025-06-10 14:29:42 +0200 | |
|---|---|---|
| committer | 2025-06-10 14:29:42 +0200 | |
| commit | 1dc79c95862e083bc743e3ecdf63e6e8d3cc406a (patch) | |
| tree | 28ed327ba266b967c292f7988da258a23936706c /internal/gtsmodel/interactionpolicy.go | |
| parent | [chore] update to modernc.org/sqlite v1.38.0 with our concurrency workaround ... (diff) | |
| download | gotosocial-1dc79c95862e083bc743e3ecdf63e6e8d3cc406a.tar.xz | |
[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 <tobi.smethurst@protonmail.com>
Co-committed-by: tobi <tobi.smethurst@protonmail.com>
Diffstat (limited to 'internal/gtsmodel/interactionpolicy.go')
| -rw-r--r-- | internal/gtsmodel/interactionpolicy.go | 246 |
1 files changed, 163 insertions, 83 deletions
diff --git a/internal/gtsmodel/interactionpolicy.go b/internal/gtsmodel/interactionpolicy.go index 886c2e44b..0e248e49e 100644 --- a/internal/gtsmodel/interactionpolicy.go +++ b/internal/gtsmodel/interactionpolicy.go @@ -129,6 +129,19 @@ const ( PolicyPermissionAutomaticApproval ) +func (p PolicyPermission) String() string { + switch p { + case PolicyPermissionForbidden: + return "forbidden" + case PolicyPermissionManualApproval: + return "manualApproval" + case PolicyPermissionAutomaticApproval: + return "automaticApproval" + default: + return "unknown" + } +} + // PolicyCheckResult encapsulates the results // of checking a certain Actor URI + type // of interaction against an interaction policy. @@ -186,15 +199,15 @@ type InteractionPolicy struct { // Conditions in which a Like // interaction will be accepted // for an item with this policy. - CanLike PolicyRules + CanLike *PolicyRules // Conditions in which a Reply // interaction will be accepted // for an item with this policy. - CanReply PolicyRules + CanReply *PolicyRules // Conditions in which an Announce // interaction will be accepted // for an item with this policy. - CanAnnounce PolicyRules + CanAnnounce *PolicyRules } // PolicyRules represents the rules according @@ -236,37 +249,144 @@ func DefaultInteractionPolicyFor(v Visibility) *InteractionPolicy { } } +// DefaultCanLikeFor returns the default +// policy rules for the canLike sub-policy. +func DefaultCanLikeFor(v Visibility) *PolicyRules { + switch v { + + // Anyone can like. + case VisibilityPublic, VisibilityUnlocked: + return &PolicyRules{ + AutomaticApproval: PolicyValues{ + PolicyValuePublic, + }, + ManualApproval: make(PolicyValues, 0), + } + + // Self, followers and + // mentioned can like. + case VisibilityFollowersOnly, VisibilityMutualsOnly: + return &PolicyRules{ + AutomaticApproval: PolicyValues{ + PolicyValueAuthor, + PolicyValueFollowers, + PolicyValueMentioned, + }, + ManualApproval: make(PolicyValues, 0), + } + + // Mentioned and self + // can always like. + case VisibilityDirect: + return &PolicyRules{ + AutomaticApproval: PolicyValues{ + PolicyValueAuthor, + PolicyValueMentioned, + }, + ManualApproval: make(PolicyValues, 0), + } + + default: + panic("invalid visibility") + } +} + +// DefaultCanReplyFor returns the default +// policy rules for the canReply sub-policy. +func DefaultCanReplyFor(v Visibility) *PolicyRules { + switch v { + + // Anyone can reply. + case VisibilityPublic, VisibilityUnlocked: + return &PolicyRules{ + AutomaticApproval: PolicyValues{ + PolicyValuePublic, + }, + ManualApproval: make(PolicyValues, 0), + } + + // Self, followers and + // mentioned can reply. + case VisibilityFollowersOnly, VisibilityMutualsOnly: + return &PolicyRules{ + + AutomaticApproval: PolicyValues{ + PolicyValueAuthor, + PolicyValueFollowers, + PolicyValueMentioned, + }, + ManualApproval: make(PolicyValues, 0), + } + + // Mentioned and self + // can always reply. + case VisibilityDirect: + return &PolicyRules{ + AutomaticApproval: PolicyValues{ + PolicyValueAuthor, + PolicyValueMentioned, + }, + ManualApproval: make(PolicyValues, 0), + } + + default: + panic("invalid visibility") + } +} + +// DefaultCanAnnounceFor returns the default +// policy rules for the canAnnounce sub-policy. +func DefaultCanAnnounceFor(v Visibility) *PolicyRules { + switch v { + + // Anyone can announce. + case VisibilityPublic, VisibilityUnlocked: + return &PolicyRules{ + AutomaticApproval: PolicyValues{ + PolicyValuePublic, + }, + ManualApproval: make(PolicyValues, 0), + } + + // Only self can announce. + case VisibilityFollowersOnly, VisibilityMutualsOnly: + return &PolicyRules{ + AutomaticApproval: PolicyValues{ + PolicyValueAuthor, + }, + ManualApproval: make(PolicyValues, 0), + } + + // Only self can announce. + case VisibilityDirect: + return &PolicyRules{ + AutomaticApproval: PolicyValues{ + PolicyValueAuthor, + }, + ManualApproval: make(PolicyValues, 0), + } + + default: + panic("invalid visibility") + } +} + var defaultPolicyPublic = &InteractionPolicy{ - CanLike: PolicyRules{ - // Anyone can like. - AutomaticApproval: PolicyValues{ - PolicyValuePublic, - }, - ManualApproval: make(PolicyValues, 0), - }, - CanReply: PolicyRules{ - // Anyone can reply. - AutomaticApproval: PolicyValues{ - PolicyValuePublic, - }, - ManualApproval: make(PolicyValues, 0), - }, - CanAnnounce: PolicyRules{ - // Anyone can announce. - AutomaticApproval: PolicyValues{ - PolicyValuePublic, - }, - ManualApproval: make(PolicyValues, 0), - }, + CanLike: DefaultCanLikeFor(VisibilityPublic), + CanReply: DefaultCanReplyFor(VisibilityPublic), + CanAnnounce: DefaultCanAnnounceFor(VisibilityPublic), } -// Returns the default interaction policy +// Returns a default interaction policy // for a post with visibility of public. func DefaultInteractionPolicyPublic() *InteractionPolicy { - return defaultPolicyPublic + // Copy global. + c := new(InteractionPolicy) + *c = *defaultPolicyPublic + return c } -// Returns the default interaction policy +// Returns a default interaction policy // for a post with visibility of unlocked. func DefaultInteractionPolicyUnlocked() *InteractionPolicy { // Same as public (for now). @@ -274,71 +394,31 @@ func DefaultInteractionPolicyUnlocked() *InteractionPolicy { } var defaultPolicyFollowersOnly = &InteractionPolicy{ - CanLike: PolicyRules{ - // Self, followers and - // mentioned can like. - AutomaticApproval: PolicyValues{ - PolicyValueAuthor, - PolicyValueFollowers, - PolicyValueMentioned, - }, - ManualApproval: make(PolicyValues, 0), - }, - CanReply: PolicyRules{ - // Self, followers and - // mentioned can reply. - AutomaticApproval: PolicyValues{ - PolicyValueAuthor, - PolicyValueFollowers, - PolicyValueMentioned, - }, - ManualApproval: make(PolicyValues, 0), - }, - CanAnnounce: PolicyRules{ - // Only self can announce. - AutomaticApproval: PolicyValues{ - PolicyValueAuthor, - }, - ManualApproval: make(PolicyValues, 0), - }, + CanLike: DefaultCanLikeFor(VisibilityFollowersOnly), + CanReply: DefaultCanReplyFor(VisibilityFollowersOnly), + CanAnnounce: DefaultCanAnnounceFor(VisibilityFollowersOnly), } -// Returns the default interaction policy for +// Returns a default interaction policy for // a post with visibility of followers only. func DefaultInteractionPolicyFollowersOnly() *InteractionPolicy { - return defaultPolicyFollowersOnly + // Copy global. + c := new(InteractionPolicy) + *c = *defaultPolicyFollowersOnly + return c } var defaultPolicyDirect = &InteractionPolicy{ - CanLike: PolicyRules{ - // Mentioned and self - // can always like. - AutomaticApproval: PolicyValues{ - PolicyValueAuthor, - PolicyValueMentioned, - }, - ManualApproval: make(PolicyValues, 0), - }, - CanReply: PolicyRules{ - // Mentioned and self - // can always reply. - AutomaticApproval: PolicyValues{ - PolicyValueAuthor, - PolicyValueMentioned, - }, - ManualApproval: make(PolicyValues, 0), - }, - CanAnnounce: PolicyRules{ - // Only self can announce. - AutomaticApproval: PolicyValues{ - PolicyValueAuthor, - }, - ManualApproval: make(PolicyValues, 0), - }, + CanLike: DefaultCanLikeFor(VisibilityDirect), + CanReply: DefaultCanReplyFor(VisibilityDirect), + CanAnnounce: DefaultCanAnnounceFor(VisibilityDirect), } -// Returns the default interaction policy +// Returns a default interaction policy // for a post with visibility of direct. func DefaultInteractionPolicyDirect() *InteractionPolicy { - return defaultPolicyDirect + // Copy global. + c := new(InteractionPolicy) + *c = *defaultPolicyDirect + return c } |
