[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>
This commit is contained in:
tobi
2025-05-13 14:48:11 +00:00
committed by kim
parent 5925644ad3
commit ca12742a7a
28 changed files with 1214 additions and 248 deletions

View File

@ -156,6 +156,13 @@ func (suite *StatusCreateTestSuite) TestPostNewStatus() {
"mentioned",
"me"
],
"automatic_approval": [
"author",
"followers",
"mentioned",
"me"
],
"manual_approval": [],
"with_approval": []
},
"can_reblog": {
@ -163,6 +170,11 @@ func (suite *StatusCreateTestSuite) TestPostNewStatus() {
"author",
"me"
],
"automatic_approval": [
"author",
"me"
],
"manual_approval": [],
"with_approval": []
},
"can_reply": {
@ -172,6 +184,13 @@ func (suite *StatusCreateTestSuite) TestPostNewStatus() {
"mentioned",
"me"
],
"automatic_approval": [
"author",
"followers",
"mentioned",
"me"
],
"manual_approval": [],
"with_approval": []
}
},
@ -241,6 +260,11 @@ func (suite *StatusCreateTestSuite) TestPostNewStatusIntPolicy() {
"author",
"me"
],
"automatic_approval": [
"author",
"me"
],
"manual_approval": [],
"with_approval": []
},
"can_reblog": {
@ -248,6 +272,11 @@ func (suite *StatusCreateTestSuite) TestPostNewStatusIntPolicy() {
"author",
"me"
],
"automatic_approval": [
"author",
"me"
],
"manual_approval": [],
"with_approval": []
},
"can_reply": {
@ -258,6 +287,16 @@ func (suite *StatusCreateTestSuite) TestPostNewStatusIntPolicy() {
"mentioned",
"me"
],
"automatic_approval": [
"author",
"followers",
"following",
"mentioned",
"me"
],
"manual_approval": [
"public"
],
"with_approval": [
"public"
]
@ -338,6 +377,11 @@ func (suite *StatusCreateTestSuite) TestPostNewStatusIntPolicyJSON() {
"author",
"me"
],
"automatic_approval": [
"author",
"me"
],
"manual_approval": [],
"with_approval": []
},
"can_reblog": {
@ -345,6 +389,11 @@ func (suite *StatusCreateTestSuite) TestPostNewStatusIntPolicyJSON() {
"author",
"me"
],
"automatic_approval": [
"author",
"me"
],
"manual_approval": [],
"with_approval": []
},
"can_reply": {
@ -355,6 +404,16 @@ func (suite *StatusCreateTestSuite) TestPostNewStatusIntPolicyJSON() {
"mentioned",
"me"
],
"automatic_approval": [
"author",
"followers",
"following",
"mentioned",
"me"
],
"manual_approval": [
"public"
],
"with_approval": [
"public"
]
@ -553,6 +612,11 @@ func (suite *StatusCreateTestSuite) TestPostNewStatusMarkdown() {
"public",
"me"
],
"automatic_approval": [
"public",
"me"
],
"manual_approval": [],
"with_approval": []
},
"can_reblog": {
@ -560,6 +624,11 @@ func (suite *StatusCreateTestSuite) TestPostNewStatusMarkdown() {
"public",
"me"
],
"automatic_approval": [
"public",
"me"
],
"manual_approval": [],
"with_approval": []
},
"can_reply": {
@ -567,6 +636,11 @@ func (suite *StatusCreateTestSuite) TestPostNewStatusMarkdown() {
"public",
"me"
],
"automatic_approval": [
"public",
"me"
],
"manual_approval": [],
"with_approval": []
}
},
@ -638,6 +712,11 @@ func (suite *StatusCreateTestSuite) TestMentionUnknownAccount() {
"public",
"me"
],
"automatic_approval": [
"public",
"me"
],
"manual_approval": [],
"with_approval": []
},
"can_reblog": {
@ -645,6 +724,11 @@ func (suite *StatusCreateTestSuite) TestMentionUnknownAccount() {
"public",
"me"
],
"automatic_approval": [
"public",
"me"
],
"manual_approval": [],
"with_approval": []
},
"can_reply": {
@ -652,6 +736,11 @@ func (suite *StatusCreateTestSuite) TestMentionUnknownAccount() {
"public",
"me"
],
"automatic_approval": [
"public",
"me"
],
"manual_approval": [],
"with_approval": []
}
},
@ -717,6 +806,11 @@ func (suite *StatusCreateTestSuite) TestPostStatusWithLinksAndTags() {
"public",
"me"
],
"automatic_approval": [
"public",
"me"
],
"manual_approval": [],
"with_approval": []
},
"can_reblog": {
@ -724,6 +818,11 @@ func (suite *StatusCreateTestSuite) TestPostStatusWithLinksAndTags() {
"public",
"me"
],
"automatic_approval": [
"public",
"me"
],
"manual_approval": [],
"with_approval": []
},
"can_reply": {
@ -731,6 +830,11 @@ func (suite *StatusCreateTestSuite) TestPostStatusWithLinksAndTags() {
"public",
"me"
],
"automatic_approval": [
"public",
"me"
],
"manual_approval": [],
"with_approval": []
}
},
@ -810,6 +914,11 @@ func (suite *StatusCreateTestSuite) TestPostNewStatusWithEmoji() {
"public",
"me"
],
"automatic_approval": [
"public",
"me"
],
"manual_approval": [],
"with_approval": []
},
"can_reblog": {
@ -817,6 +926,11 @@ func (suite *StatusCreateTestSuite) TestPostNewStatusWithEmoji() {
"public",
"me"
],
"automatic_approval": [
"public",
"me"
],
"manual_approval": [],
"with_approval": []
},
"can_reply": {
@ -824,6 +938,11 @@ func (suite *StatusCreateTestSuite) TestPostNewStatusWithEmoji() {
"public",
"me"
],
"automatic_approval": [
"public",
"me"
],
"manual_approval": [],
"with_approval": []
}
},
@ -901,6 +1020,11 @@ func (suite *StatusCreateTestSuite) TestReplyToLocalStatus() {
"public",
"me"
],
"automatic_approval": [
"public",
"me"
],
"manual_approval": [],
"with_approval": []
},
"can_reblog": {
@ -908,6 +1032,11 @@ func (suite *StatusCreateTestSuite) TestReplyToLocalStatus() {
"public",
"me"
],
"automatic_approval": [
"public",
"me"
],
"manual_approval": [],
"with_approval": []
},
"can_reply": {
@ -915,6 +1044,11 @@ func (suite *StatusCreateTestSuite) TestReplyToLocalStatus() {
"public",
"me"
],
"automatic_approval": [
"public",
"me"
],
"manual_approval": [],
"with_approval": []
}
},
@ -985,6 +1119,11 @@ func (suite *StatusCreateTestSuite) TestAttachNewMediaSuccess() {
"public",
"me"
],
"automatic_approval": [
"public",
"me"
],
"manual_approval": [],
"with_approval": []
},
"can_reblog": {
@ -992,6 +1131,11 @@ func (suite *StatusCreateTestSuite) TestAttachNewMediaSuccess() {
"public",
"me"
],
"automatic_approval": [
"public",
"me"
],
"manual_approval": [],
"with_approval": []
},
"can_reply": {
@ -999,6 +1143,11 @@ func (suite *StatusCreateTestSuite) TestAttachNewMediaSuccess() {
"public",
"me"
],
"automatic_approval": [
"public",
"me"
],
"manual_approval": [],
"with_approval": []
}
},
@ -1091,6 +1240,11 @@ func (suite *StatusCreateTestSuite) TestPostNewStatusWithNoncanonicalLanguageTag
"public",
"me"
],
"automatic_approval": [
"public",
"me"
],
"manual_approval": [],
"with_approval": []
},
"can_reblog": {
@ -1098,6 +1252,11 @@ func (suite *StatusCreateTestSuite) TestPostNewStatusWithNoncanonicalLanguageTag
"public",
"me"
],
"automatic_approval": [
"public",
"me"
],
"manual_approval": [],
"with_approval": []
},
"can_reply": {
@ -1105,6 +1264,11 @@ func (suite *StatusCreateTestSuite) TestPostNewStatusWithNoncanonicalLanguageTag
"public",
"me"
],
"automatic_approval": [
"public",
"me"
],
"manual_approval": [],
"with_approval": []
}
},
@ -1167,6 +1331,11 @@ func (suite *StatusCreateTestSuite) TestPostNewStatusWithPollForm() {
"public",
"me"
],
"automatic_approval": [
"public",
"me"
],
"manual_approval": [],
"with_approval": []
},
"can_reblog": {
@ -1174,6 +1343,11 @@ func (suite *StatusCreateTestSuite) TestPostNewStatusWithPollForm() {
"public",
"me"
],
"automatic_approval": [
"public",
"me"
],
"manual_approval": [],
"with_approval": []
},
"can_reply": {
@ -1181,6 +1355,11 @@ func (suite *StatusCreateTestSuite) TestPostNewStatusWithPollForm() {
"public",
"me"
],
"automatic_approval": [
"public",
"me"
],
"manual_approval": [],
"with_approval": []
}
},
@ -1265,6 +1444,11 @@ func (suite *StatusCreateTestSuite) TestPostNewStatusWithPollJSON() {
"public",
"me"
],
"automatic_approval": [
"public",
"me"
],
"manual_approval": [],
"with_approval": []
},
"can_reblog": {
@ -1272,6 +1456,11 @@ func (suite *StatusCreateTestSuite) TestPostNewStatusWithPollJSON() {
"public",
"me"
],
"automatic_approval": [
"public",
"me"
],
"manual_approval": [],
"with_approval": []
},
"can_reply": {
@ -1279,6 +1468,11 @@ func (suite *StatusCreateTestSuite) TestPostNewStatusWithPollJSON() {
"public",
"me"
],
"automatic_approval": [
"public",
"me"
],
"manual_approval": [],
"with_approval": []
}
},