From ca12742a7ac0aec95fc0d7897e54a2272a68c34f Mon Sep 17 00:00:00 2001 From: tobi Date: Tue, 13 May 2025 14:48:11 +0000 Subject: [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 Co-committed-by: tobi --- testrig/testmodels.go | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'testrig/testmodels.go') 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: >smodel.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: >smodel.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: >smodel.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: >smodel.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, -- cgit v1.2.3