diff options
| author | 2025-06-10 14:29:42 +0200 | |
|---|---|---|
| committer | 2025-09-03 16:53:54 +0200 | |
| commit | 56f98dc3b98d7220947957551ec5aa2f82f9b997 (patch) | |
| tree | 91068d6fd6d524f3b23a05bff85a8857d2e75419 /testrig | |
| parent | [docs] Various little docs updates (#4144) (diff) | |
| download | gotosocial-56f98dc3b98d7220947957551ec5aa2f82f9b997.tar.xz | |
[chore] Update interactionPolicy sub-policy parsing in line with documented defaults (#4229)
> 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
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 'testrig')
| -rw-r--r-- | testrig/testmodels.go | 24 | ||||
| -rw-r--r-- | testrig/teststructs.go | 2 |
2 files changed, 14 insertions, 12 deletions
diff --git a/testrig/testmodels.go b/testrig/testmodels.go index 7d868ce4d..8b8ea7104 100644 --- a/testrig/testmodels.go +++ b/testrig/testmodels.go @@ -2238,13 +2238,13 @@ func NewTestStatuses() map[string]*gtsmodel.Status { CreatedWithApplicationID: "01F8MGY43H3N2C8EWPR2FPYEXG", Federated: util.Ptr(true), InteractionPolicy: >smodel.InteractionPolicy{ - CanLike: gtsmodel.PolicyRules{ + CanLike: >smodel.PolicyRules{ Always: gtsmodel.PolicyValues{gtsmodel.PolicyValueAuthor}, }, - CanReply: gtsmodel.PolicyRules{ + CanReply: >smodel.PolicyRules{ Always: gtsmodel.PolicyValues{gtsmodel.PolicyValueAuthor}, }, - CanAnnounce: gtsmodel.PolicyRules{ + CanAnnounce: >smodel.PolicyRules{ Always: gtsmodel.PolicyValues{gtsmodel.PolicyValueAuthor}, }, }, @@ -2419,13 +2419,13 @@ func NewTestStatuses() map[string]*gtsmodel.Status { CreatedWithApplicationID: "01F8MGYG9E893WRHW0TAEXR8GJ", Federated: util.Ptr(true), InteractionPolicy: >smodel.InteractionPolicy{ - CanLike: gtsmodel.PolicyRules{ + CanLike: >smodel.PolicyRules{ Always: gtsmodel.PolicyValues{gtsmodel.PolicyValuePublic}, }, - CanReply: gtsmodel.PolicyRules{ + CanReply: >smodel.PolicyRules{ Always: gtsmodel.PolicyValues{gtsmodel.PolicyValueAuthor}, }, - CanAnnounce: gtsmodel.PolicyRules{ + CanAnnounce: >smodel.PolicyRules{ Always: gtsmodel.PolicyValues{gtsmodel.PolicyValuePublic}, }, }, @@ -2451,14 +2451,14 @@ func NewTestStatuses() map[string]*gtsmodel.Status { CreatedWithApplicationID: "01F8MGYG9E893WRHW0TAEXR8GJ", Federated: util.Ptr(true), InteractionPolicy: >smodel.InteractionPolicy{ - CanLike: gtsmodel.PolicyRules{ + CanLike: >smodel.PolicyRules{ Always: gtsmodel.PolicyValues{gtsmodel.PolicyValuePublic}, }, - CanReply: gtsmodel.PolicyRules{ + CanReply: >smodel.PolicyRules{ Always: gtsmodel.PolicyValues{gtsmodel.PolicyValueAuthor}, WithApproval: gtsmodel.PolicyValues{gtsmodel.PolicyValuePublic}, }, - CanAnnounce: gtsmodel.PolicyRules{ + CanAnnounce: >smodel.PolicyRules{ Always: gtsmodel.PolicyValues{gtsmodel.PolicyValuePublic}, }, }, @@ -2483,13 +2483,13 @@ func NewTestStatuses() map[string]*gtsmodel.Status { CreatedWithApplicationID: "01F8MGYG9E893WRHW0TAEXR8GJ", Federated: util.Ptr(false), InteractionPolicy: >smodel.InteractionPolicy{ - CanLike: gtsmodel.PolicyRules{ + CanLike: >smodel.PolicyRules{ Always: gtsmodel.PolicyValues{gtsmodel.PolicyValuePublic}, }, - CanReply: gtsmodel.PolicyRules{ + CanReply: >smodel.PolicyRules{ Always: gtsmodel.PolicyValues{gtsmodel.PolicyValuePublic}, }, - CanAnnounce: gtsmodel.PolicyRules{ + CanAnnounce: >smodel.PolicyRules{ Always: gtsmodel.PolicyValues{gtsmodel.PolicyValueAuthor}, }, }, diff --git a/testrig/teststructs.go b/testrig/teststructs.go index edba34263..919d4c443 100644 --- a/testrig/teststructs.go +++ b/testrig/teststructs.go @@ -49,6 +49,7 @@ type TestStructs struct { EmailSender email.Sender WebPushSender *WebPushMockSender TransportController transport.Controller + InteractionFilter *interaction.Filter } func SetupTestStructs( @@ -122,6 +123,7 @@ func SetupTestStructs( EmailSender: emailSender, WebPushSender: webPushSender, TransportController: transportController, + InteractionFilter: intFilter, } } |
