summaryrefslogtreecommitdiff
path: root/testrig
diff options
context:
space:
mode:
authorLibravatar tobi <tobi.smethurst@protonmail.com>2025-05-13 14:48:11 +0000
committerLibravatar kim <gruf@noreply.codeberg.org>2025-05-13 14:48:11 +0000
commitca12742a7ac0aec95fc0d7897e54a2272a68c34f (patch)
treec25b5ae66b927d1dbe61833f2c228a3b24164355 /testrig
parent[chore] Update woodpecker to catch `len(fromJSON(CI_PIPELINE_FILES)) == 0` (#... (diff)
downloadgotosocial-ca12742a7ac0aec95fc0d7897e54a2272a68c34f.tar.xz
[chore] Deprecate `with_approval`, `always` (client API), `approvalRequired`, `always` (fedi API) (#4173)
This pull request deprecates `with_approval` and `always` on the client API side, and `approvalRequired` and `always` on the fedi API side, replacing them with `automatic_approval` and `manual_approval` and `automaticApproval` and `manualApproval`, respectively. Back-compat is kept with these deprecated fields, and they're still serialized to the client API and fedi APIs respectively, in addition to the new non-deprecated properties. This will stay the case until v0.21.0 when they'll be removed. For the sake of not doing a massive database migration, the fields are still named `Always` and `WithApproval` in storage. I think this is probably fine! Part of https://codeberg.org/superseriousbusiness/gotosocial/issues/4026 Reviewed-on: https://codeberg.org/superseriousbusiness/gotosocial/pulls/4173 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.go26
1 files changed, 13 insertions, 13 deletions
diff --git a/testrig/testmodels.go b/testrig/testmodels.go
index 30010c58c..a17e2fae6 100644
--- a/testrig/testmodels.go
+++ b/testrig/testmodels.go
@@ -2245,13 +2245,13 @@ func NewTestStatuses() map[string]*gtsmodel.Status {
Federated: util.Ptr(true),
InteractionPolicy: &gtsmodel.InteractionPolicy{
CanLike: gtsmodel.PolicyRules{
- Always: gtsmodel.PolicyValues{gtsmodel.PolicyValueAuthor},
+ AutomaticApproval: gtsmodel.PolicyValues{gtsmodel.PolicyValueAuthor},
},
CanReply: gtsmodel.PolicyRules{
- Always: gtsmodel.PolicyValues{gtsmodel.PolicyValueAuthor},
+ AutomaticApproval: gtsmodel.PolicyValues{gtsmodel.PolicyValueAuthor},
},
CanAnnounce: gtsmodel.PolicyRules{
- Always: gtsmodel.PolicyValues{gtsmodel.PolicyValueAuthor},
+ AutomaticApproval: gtsmodel.PolicyValues{gtsmodel.PolicyValueAuthor},
},
},
ActivityStreamsType: ap.ObjectNote,
@@ -2426,13 +2426,13 @@ func NewTestStatuses() map[string]*gtsmodel.Status {
Federated: util.Ptr(true),
InteractionPolicy: &gtsmodel.InteractionPolicy{
CanLike: gtsmodel.PolicyRules{
- Always: gtsmodel.PolicyValues{gtsmodel.PolicyValuePublic},
+ AutomaticApproval: gtsmodel.PolicyValues{gtsmodel.PolicyValuePublic},
},
CanReply: gtsmodel.PolicyRules{
- Always: gtsmodel.PolicyValues{gtsmodel.PolicyValueAuthor},
+ AutomaticApproval: gtsmodel.PolicyValues{gtsmodel.PolicyValueAuthor},
},
CanAnnounce: gtsmodel.PolicyRules{
- Always: gtsmodel.PolicyValues{gtsmodel.PolicyValuePublic},
+ AutomaticApproval: gtsmodel.PolicyValues{gtsmodel.PolicyValuePublic},
},
},
ActivityStreamsType: ap.ObjectNote,
@@ -2458,14 +2458,14 @@ func NewTestStatuses() map[string]*gtsmodel.Status {
Federated: util.Ptr(true),
InteractionPolicy: &gtsmodel.InteractionPolicy{
CanLike: gtsmodel.PolicyRules{
- Always: gtsmodel.PolicyValues{gtsmodel.PolicyValuePublic},
+ AutomaticApproval: gtsmodel.PolicyValues{gtsmodel.PolicyValuePublic},
},
CanReply: gtsmodel.PolicyRules{
- Always: gtsmodel.PolicyValues{gtsmodel.PolicyValueAuthor},
- WithApproval: gtsmodel.PolicyValues{gtsmodel.PolicyValuePublic},
+ AutomaticApproval: gtsmodel.PolicyValues{gtsmodel.PolicyValueAuthor},
+ ManualApproval: gtsmodel.PolicyValues{gtsmodel.PolicyValuePublic},
},
CanAnnounce: gtsmodel.PolicyRules{
- Always: gtsmodel.PolicyValues{gtsmodel.PolicyValuePublic},
+ AutomaticApproval: gtsmodel.PolicyValues{gtsmodel.PolicyValuePublic},
},
},
ActivityStreamsType: ap.ObjectNote,
@@ -2490,13 +2490,13 @@ func NewTestStatuses() map[string]*gtsmodel.Status {
Federated: util.Ptr(false),
InteractionPolicy: &gtsmodel.InteractionPolicy{
CanLike: gtsmodel.PolicyRules{
- Always: gtsmodel.PolicyValues{gtsmodel.PolicyValuePublic},
+ AutomaticApproval: gtsmodel.PolicyValues{gtsmodel.PolicyValuePublic},
},
CanReply: gtsmodel.PolicyRules{
- Always: gtsmodel.PolicyValues{gtsmodel.PolicyValuePublic},
+ AutomaticApproval: gtsmodel.PolicyValues{gtsmodel.PolicyValuePublic},
},
CanAnnounce: gtsmodel.PolicyRules{
- Always: gtsmodel.PolicyValues{gtsmodel.PolicyValueAuthor},
+ AutomaticApproval: gtsmodel.PolicyValues{gtsmodel.PolicyValueAuthor},
},
},
ActivityStreamsType: ap.ObjectNote,