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 --- internal/typeutils/frontendtointernal.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'internal/typeutils/frontendtointernal.go') diff --git a/internal/typeutils/frontendtointernal.go b/internal/typeutils/frontendtointernal.go index daf64a0d2..973b20632 100644 --- a/internal/typeutils/frontendtointernal.go +++ b/internal/typeutils/frontendtointernal.go @@ -228,16 +228,16 @@ func APIInteractionPolicyToInteractionPolicy( return >smodel.InteractionPolicy{ CanLike: gtsmodel.PolicyRules{ - Always: canLikeAlways, - WithApproval: canLikeWithApproval, + AutomaticApproval: canLikeAlways, + ManualApproval: canLikeWithApproval, }, CanReply: gtsmodel.PolicyRules{ - Always: canReplyAlways, - WithApproval: canReplyWithApproval, + AutomaticApproval: canReplyAlways, + ManualApproval: canReplyWithApproval, }, CanAnnounce: gtsmodel.PolicyRules{ - Always: canAnnounceAlways, - WithApproval: canAnnounceWithApproval, + AutomaticApproval: canAnnounceAlways, + ManualApproval: canAnnounceWithApproval, }, }, nil } -- cgit v1.2.3