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/typeutils/internaltoas_test.go | 72 +++++++++++++++++++++++++++------
 1 file changed, 60 insertions(+), 12 deletions(-)

(limited to 'internal/typeutils/internaltoas_test.go')

diff --git a/internal/typeutils/internaltoas_test.go b/internal/typeutils/internaltoas_test.go
index f8d69491c..5ba23a77e 100644
--- a/internal/typeutils/internaltoas_test.go
+++ b/internal/typeutils/internaltoas_test.go
@@ -540,19 +540,31 @@ func (suite *InternalToASTestSuite) TestStatusToAS() {
       "always": [
         "https://www.w3.org/ns/activitystreams#Public"
       ],
-      "approvalRequired": []
+      "approvalRequired": [],
+      "automaticApproval": [
+        "https://www.w3.org/ns/activitystreams#Public"
+      ],
+      "manualApproval": []
     },
     "canLike": {
       "always": [
         "https://www.w3.org/ns/activitystreams#Public"
       ],
-      "approvalRequired": []
+      "approvalRequired": [],
+      "automaticApproval": [
+        "https://www.w3.org/ns/activitystreams#Public"
+      ],
+      "manualApproval": []
     },
     "canReply": {
       "always": [
         "https://www.w3.org/ns/activitystreams#Public"
       ],
-      "approvalRequired": []
+      "approvalRequired": [],
+      "automaticApproval": [
+        "https://www.w3.org/ns/activitystreams#Public"
+      ],
+      "manualApproval": []
     }
   },
   "published": "2021-10-20T12:40:37+02:00",
@@ -630,19 +642,31 @@ func (suite *InternalToASTestSuite) TestStatusWithTagsToASWithIDs() {
       "always": [
         "https://www.w3.org/ns/activitystreams#Public"
       ],
-      "approvalRequired": []
+      "approvalRequired": [],
+      "automaticApproval": [
+        "https://www.w3.org/ns/activitystreams#Public"
+      ],
+      "manualApproval": []
     },
     "canLike": {
       "always": [
         "https://www.w3.org/ns/activitystreams#Public"
       ],
-      "approvalRequired": []
+      "approvalRequired": [],
+      "automaticApproval": [
+        "https://www.w3.org/ns/activitystreams#Public"
+      ],
+      "manualApproval": []
     },
     "canReply": {
       "always": [
         "https://www.w3.org/ns/activitystreams#Public"
       ],
-      "approvalRequired": []
+      "approvalRequired": [],
+      "automaticApproval": [
+        "https://www.w3.org/ns/activitystreams#Public"
+      ],
+      "manualApproval": []
     }
   },
   "published": "2021-10-20T11:36:45Z",
@@ -738,19 +762,31 @@ func (suite *InternalToASTestSuite) TestStatusWithTagsToASFromDB() {
       "always": [
         "https://www.w3.org/ns/activitystreams#Public"
       ],
-      "approvalRequired": []
+      "approvalRequired": [],
+      "automaticApproval": [
+        "https://www.w3.org/ns/activitystreams#Public"
+      ],
+      "manualApproval": []
     },
     "canLike": {
       "always": [
         "https://www.w3.org/ns/activitystreams#Public"
       ],
-      "approvalRequired": []
+      "approvalRequired": [],
+      "automaticApproval": [
+        "https://www.w3.org/ns/activitystreams#Public"
+      ],
+      "manualApproval": []
     },
     "canReply": {
       "always": [
         "https://www.w3.org/ns/activitystreams#Public"
       ],
-      "approvalRequired": []
+      "approvalRequired": [],
+      "automaticApproval": [
+        "https://www.w3.org/ns/activitystreams#Public"
+      ],
+      "manualApproval": []
     }
   },
   "published": "2021-10-20T11:36:45Z",
@@ -831,19 +867,31 @@ func (suite *InternalToASTestSuite) TestStatusToASWithMentions() {
       "always": [
         "https://www.w3.org/ns/activitystreams#Public"
       ],
-      "approvalRequired": []
+      "approvalRequired": [],
+      "automaticApproval": [
+        "https://www.w3.org/ns/activitystreams#Public"
+      ],
+      "manualApproval": []
     },
     "canLike": {
       "always": [
         "https://www.w3.org/ns/activitystreams#Public"
       ],
-      "approvalRequired": []
+      "approvalRequired": [],
+      "automaticApproval": [
+        "https://www.w3.org/ns/activitystreams#Public"
+      ],
+      "manualApproval": []
     },
     "canReply": {
       "always": [
         "https://www.w3.org/ns/activitystreams#Public"
       ],
-      "approvalRequired": []
+      "approvalRequired": [],
+      "automaticApproval": [
+        "https://www.w3.org/ns/activitystreams#Public"
+      ],
+      "manualApproval": []
     }
   },
   "published": "2021-11-20T13:32:16Z",
-- 
cgit v1.2.3