From ca12742a7ac0aec95fc0d7897e54a2272a68c34f Mon Sep 17 00:00:00 2001
From: tobi <tobi.smethurst@protonmail.com>
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 <tobi.smethurst@protonmail.com>
Co-committed-by: tobi <tobi.smethurst@protonmail.com>
---
 internal/api/client/admin/reportsget_test.go | 45 ++++++++++++++++++++++++++++
 1 file changed, 45 insertions(+)

(limited to 'internal/api/client/admin')

diff --git a/internal/api/client/admin/reportsget_test.go b/internal/api/client/admin/reportsget_test.go
index 8489d5c28..8ba1338b6 100644
--- a/internal/api/client/admin/reportsget_test.go
+++ b/internal/api/client/admin/reportsget_test.go
@@ -572,6 +572,11 @@ func (suite *ReportsGetTestSuite) TestReportsGetAll() {
         "poll": null,
         "interaction_policy": {
           "can_favourite": {
+            "automatic_approval": [
+              "public",
+              "me"
+            ],
+            "manual_approval": [],
             "always": [
               "public",
               "me"
@@ -579,6 +584,11 @@ func (suite *ReportsGetTestSuite) TestReportsGetAll() {
             "with_approval": []
           },
           "can_reply": {
+            "automatic_approval": [
+              "public",
+              "me"
+            ],
+            "manual_approval": [],
             "always": [
               "public",
               "me"
@@ -586,6 +596,11 @@ func (suite *ReportsGetTestSuite) TestReportsGetAll() {
             "with_approval": []
           },
           "can_reblog": {
+            "automatic_approval": [
+              "public",
+              "me"
+            ],
+            "manual_approval": [],
             "always": [
               "public",
               "me"
@@ -829,6 +844,11 @@ func (suite *ReportsGetTestSuite) TestReportsGetCreatedByAccount() {
         "poll": null,
         "interaction_policy": {
           "can_favourite": {
+            "automatic_approval": [
+              "public",
+              "me"
+            ],
+            "manual_approval": [],
             "always": [
               "public",
               "me"
@@ -836,6 +856,11 @@ func (suite *ReportsGetTestSuite) TestReportsGetCreatedByAccount() {
             "with_approval": []
           },
           "can_reply": {
+            "automatic_approval": [
+              "public",
+              "me"
+            ],
+            "manual_approval": [],
             "always": [
               "public",
               "me"
@@ -843,6 +868,11 @@ func (suite *ReportsGetTestSuite) TestReportsGetCreatedByAccount() {
             "with_approval": []
           },
           "can_reblog": {
+            "automatic_approval": [
+              "public",
+              "me"
+            ],
+            "manual_approval": [],
             "always": [
               "public",
               "me"
@@ -1086,6 +1116,11 @@ func (suite *ReportsGetTestSuite) TestReportsGetTargetAccount() {
         "poll": null,
         "interaction_policy": {
           "can_favourite": {
+            "automatic_approval": [
+              "public",
+              "me"
+            ],
+            "manual_approval": [],
             "always": [
               "public",
               "me"
@@ -1093,6 +1128,11 @@ func (suite *ReportsGetTestSuite) TestReportsGetTargetAccount() {
             "with_approval": []
           },
           "can_reply": {
+            "automatic_approval": [
+              "public",
+              "me"
+            ],
+            "manual_approval": [],
             "always": [
               "public",
               "me"
@@ -1100,6 +1140,11 @@ func (suite *ReportsGetTestSuite) TestReportsGetTargetAccount() {
             "with_approval": []
           },
           "can_reblog": {
+            "automatic_approval": [
+              "public",
+              "me"
+            ],
+            "manual_approval": [],
             "always": [
               "public",
               "me"
-- 
cgit v1.2.3