From a9b2d4ee355dbf7d154c30bd869f628829d038fa Mon Sep 17 00:00:00 2001 From: tobi Date: Sun, 15 Jun 2025 12:36:51 +0200 Subject: [feature] Handle retractions of domain permission subscription entries (#4261) # Description > If this is a code change, please include a summary of what you've coded, and link to the issue(s) it closes/implements. > > If this is a documentation change, please briefly describe what you've changed and why. This pull request adds logic for nicely handling retractions of entries from domain permission subscriptions. See docs for how this works but basically retracted entries will either be removed (and possibly picked up by a lower-prio subscription), or orphaned (and then possibly adopted), depending on the config of the domain permission subscription. closes https://codeberg.org/superseriousbusiness/gotosocial/issues/4101 ## Checklist Please put an x inside each checkbox to indicate that you've read and followed it: `[ ]` -> `[x]` If this is a documentation change, only the first checkbox must be filled (you can delete the others if you want). - [x] I/we have read the [GoToSocial contribution guidelines](https://codeberg.org/superseriousbusiness/gotosocial/src/branch/main/CONTRIBUTING.md). - [x] I/we have discussed the proposed changes already, either in an issue on the repository, or in the Matrix chat. - [x] I/we have not leveraged AI to create the proposed changes. - [x] I/we have performed a self-review of added code. - [x] I/we have written code that is legible and maintainable by others. - [x] I/we have commented the added code, particularly in hard-to-understand areas. - [x] I/we have made any necessary changes to documentation. - [x] I/we have added tests that cover new code. - [ ] I/we have run tests and they pass locally with the changes. - [x] I/we have run `go fmt ./...` and `golangci-lint run`. Reviewed-on: https://codeberg.org/superseriousbusiness/gotosocial/pulls/4261 Co-authored-by: tobi Co-committed-by: tobi --- .../api/client/admin/domainpermissionsubscriptionupdate.go | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'internal/api/client/admin/domainpermissionsubscriptionupdate.go') diff --git a/internal/api/client/admin/domainpermissionsubscriptionupdate.go b/internal/api/client/admin/domainpermissionsubscriptionupdate.go index 364e75f80..416f8ec10 100644 --- a/internal/api/client/admin/domainpermissionsubscriptionupdate.go +++ b/internal/api/client/admin/domainpermissionsubscriptionupdate.go @@ -97,6 +97,15 @@ import ( // type: boolean // default: false // - +// name: remove_retracted +// in: formData +// description: >- +// If true, then when a list is processed, if the list does *not* contain entries that +// it *did* contain previously, ie., retracted entries, then domain permissions +// corresponding to those entries will be removed. If false, they will just be orphaned instead. +// type: boolean +// default: true +// - // name: content_type // in: formData // description: >- @@ -227,6 +236,7 @@ func (m *Module) DomainPermissionSubscriptionPATCHHandler(c *gin.Context) { contentType == nil && form.AsDraft == nil && form.AdoptOrphans == nil && + form.RemoveRetracted == nil && form.FetchUsername == nil && form.FetchPassword == nil { const errText = "no updateable fields set on request" @@ -244,6 +254,7 @@ func (m *Module) DomainPermissionSubscriptionPATCHHandler(c *gin.Context) { contentType, form.AsDraft, form.AdoptOrphans, + form.RemoveRetracted, form.FetchUsername, form.FetchPassword, ) -- cgit v1.2.3