summaryrefslogtreecommitdiff
path: root/testrig
diff options
context:
space:
mode:
authorLibravatar tobi <tobi.smethurst@protonmail.com>2025-06-10 14:29:42 +0200
committerLibravatar tobi <kipvandenbos@noreply.codeberg.org>2025-06-10 14:29:42 +0200
commit1dc79c95862e083bc743e3ecdf63e6e8d3cc406a (patch)
tree28ed327ba266b967c292f7988da258a23936706c /testrig
parent[chore] update to modernc.org/sqlite v1.38.0 with our concurrency workaround ... (diff)
downloadgotosocial-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 'testrig')
-rw-r--r--testrig/testmodels.go24
-rw-r--r--testrig/teststructs.go2
2 files changed, 14 insertions, 12 deletions
diff --git a/testrig/testmodels.go b/testrig/testmodels.go
index db221459b..86ea32fce 100644
--- a/testrig/testmodels.go
+++ b/testrig/testmodels.go
@@ -2245,13 +2245,13 @@ func NewTestStatuses() map[string]*gtsmodel.Status {
CreatedWithApplicationID: "01F8MGY43H3N2C8EWPR2FPYEXG",
Federated: util.Ptr(true),
InteractionPolicy: &gtsmodel.InteractionPolicy{
- CanLike: gtsmodel.PolicyRules{
+ CanLike: &gtsmodel.PolicyRules{
AutomaticApproval: gtsmodel.PolicyValues{gtsmodel.PolicyValueAuthor},
},
- CanReply: gtsmodel.PolicyRules{
+ CanReply: &gtsmodel.PolicyRules{
AutomaticApproval: gtsmodel.PolicyValues{gtsmodel.PolicyValueAuthor},
},
- CanAnnounce: gtsmodel.PolicyRules{
+ CanAnnounce: &gtsmodel.PolicyRules{
AutomaticApproval: gtsmodel.PolicyValues{gtsmodel.PolicyValueAuthor},
},
},
@@ -2428,13 +2428,13 @@ func NewTestStatuses() map[string]*gtsmodel.Status {
CreatedWithApplicationID: "01F8MGYG9E893WRHW0TAEXR8GJ",
Federated: util.Ptr(true),
InteractionPolicy: &gtsmodel.InteractionPolicy{
- CanLike: gtsmodel.PolicyRules{
+ CanLike: &gtsmodel.PolicyRules{
AutomaticApproval: gtsmodel.PolicyValues{gtsmodel.PolicyValuePublic},
},
- CanReply: gtsmodel.PolicyRules{
+ CanReply: &gtsmodel.PolicyRules{
AutomaticApproval: gtsmodel.PolicyValues{gtsmodel.PolicyValueAuthor},
},
- CanAnnounce: gtsmodel.PolicyRules{
+ CanAnnounce: &gtsmodel.PolicyRules{
AutomaticApproval: gtsmodel.PolicyValues{gtsmodel.PolicyValuePublic},
},
},
@@ -2460,14 +2460,14 @@ func NewTestStatuses() map[string]*gtsmodel.Status {
CreatedWithApplicationID: "01F8MGYG9E893WRHW0TAEXR8GJ",
Federated: util.Ptr(true),
InteractionPolicy: &gtsmodel.InteractionPolicy{
- CanLike: gtsmodel.PolicyRules{
+ CanLike: &gtsmodel.PolicyRules{
AutomaticApproval: gtsmodel.PolicyValues{gtsmodel.PolicyValuePublic},
},
- CanReply: gtsmodel.PolicyRules{
+ CanReply: &gtsmodel.PolicyRules{
AutomaticApproval: gtsmodel.PolicyValues{gtsmodel.PolicyValueAuthor},
ManualApproval: gtsmodel.PolicyValues{gtsmodel.PolicyValuePublic},
},
- CanAnnounce: gtsmodel.PolicyRules{
+ CanAnnounce: &gtsmodel.PolicyRules{
AutomaticApproval: gtsmodel.PolicyValues{gtsmodel.PolicyValuePublic},
},
},
@@ -2492,13 +2492,13 @@ func NewTestStatuses() map[string]*gtsmodel.Status {
CreatedWithApplicationID: "01F8MGYG9E893WRHW0TAEXR8GJ",
Federated: util.Ptr(false),
InteractionPolicy: &gtsmodel.InteractionPolicy{
- CanLike: gtsmodel.PolicyRules{
+ CanLike: &gtsmodel.PolicyRules{
AutomaticApproval: gtsmodel.PolicyValues{gtsmodel.PolicyValuePublic},
},
- CanReply: gtsmodel.PolicyRules{
+ CanReply: &gtsmodel.PolicyRules{
AutomaticApproval: gtsmodel.PolicyValues{gtsmodel.PolicyValuePublic},
},
- CanAnnounce: gtsmodel.PolicyRules{
+ CanAnnounce: &gtsmodel.PolicyRules{
AutomaticApproval: gtsmodel.PolicyValues{gtsmodel.PolicyValueAuthor},
},
},
diff --git a/testrig/teststructs.go b/testrig/teststructs.go
index f119bd113..a1e241f4e 100644
--- a/testrig/teststructs.go
+++ b/testrig/teststructs.go
@@ -50,6 +50,7 @@ type TestStructs struct {
EmailSender email.Sender
WebPushSender *WebPushMockSender
TransportController transport.Controller
+ InteractionFilter *interaction.Filter
}
func SetupTestStructs(
@@ -120,6 +121,7 @@ func SetupTestStructs(
EmailSender: emailSender,
WebPushSender: webPushSender,
TransportController: transportController,
+ InteractionFilter: intFilter,
}
}