diff options
| author |  tobi <tobi.smethurst@protonmail.com> | 2025-05-13 14:48:11 +0000 |
|---|---|---|
| committer |  kim <gruf@noreply.codeberg.org> | 2025-05-13 14:48:11 +0000 |
| commit | ca12742a7ac0aec95fc0d7897e54a2272a68c34f (patch) | |
| tree | c25b5ae66b927d1dbe61833f2c228a3b24164355 /internal/transport/dereference_test.go | |
| parent | [chore] Update woodpecker to catch `len(fromJSON(CI_PIPELINE_FILES)) == 0` (#... (diff) | |
| download | gotosocial-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 'internal/transport/dereference_test.go')
| -rw-r--r-- | internal/transport/dereference_test.go | 22 |
1 files changed, 17 insertions, 5 deletions
diff --git a/internal/transport/dereference_test.go b/internal/transport/dereference_test.go index c1d6fb952..d3778563e 100644 --- a/internal/transport/dereference_test.go +++ b/internal/transport/dereference_test.go @@ -115,8 +115,8 @@ func (suite *DereferenceTestSuite) TestDerefLocalStatus() { defer resp.Body.Close() suite.Equal(http.StatusOK, resp.StatusCode) - suite.EqualValues(1502, resp.ContentLength) - suite.Equal("1502", resp.Header.Get("Content-Length")) + suite.EqualValues(1769, resp.ContentLength) + suite.Equal("1769", resp.Header.Get("Content-Length")) suite.Equal(apiutil.AppActivityLDJSON, resp.Header.Get("Content-Type")) b, err := io.ReadAll(resp.Body) @@ -150,19 +150,31 @@ func (suite *DereferenceTestSuite) TestDerefLocalStatus() { "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-20T10:40:37Z", |