[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 <tobi.smethurst@protonmail.com>
Co-committed-by: tobi <tobi.smethurst@protonmail.com>
This commit is contained in:
tobi 2025-06-15 12:36:51 +02:00 committed by tobi
commit a9b2d4ee35
19 changed files with 662 additions and 34 deletions

View file

@ -176,7 +176,7 @@ func (p *Processor) deleteDomainAllow(
ID: id.NewULID(),
TargetCategory: gtsmodel.AdminActionCategoryDomain,
TargetID: domainAllow.Domain,
Type: gtsmodel.AdminActionUnsuspend,
Type: gtsmodel.AdminActionUnallow,
AccountID: adminAcct.ID,
}

View file

@ -142,6 +142,8 @@ func (p *Processor) DomainPermissionSubscriptionCreate(
contentType gtsmodel.DomainPermSubContentType,
permType gtsmodel.DomainPermissionType,
asDraft bool,
adoptOrphans *bool,
removeRetracted *bool,
fetchUsername string,
fetchPassword string,
) (*apimodel.DomainPermissionSubscription, gtserror.WithCode) {
@ -151,12 +153,14 @@ func (p *Processor) DomainPermissionSubscriptionCreate(
Title: title,
PermissionType: permType,
AsDraft: &asDraft,
AdoptOrphans: adoptOrphans,
CreatedByAccountID: acct.ID,
CreatedByAccount: acct,
URI: uri,
ContentType: contentType,
FetchUsername: fetchUsername,
FetchPassword: fetchPassword,
RemoveRetracted: removeRetracted,
}
err := p.state.DB.PutDomainPermissionSubscription(ctx, permSub)
@ -184,6 +188,7 @@ func (p *Processor) DomainPermissionSubscriptionUpdate(
contentType *gtsmodel.DomainPermSubContentType,
asDraft *bool,
adoptOrphans *bool,
removeRetracted *bool,
fetchUsername *string,
fetchPassword *string,
) (*apimodel.DomainPermissionSubscription, gtserror.WithCode) {
@ -230,6 +235,11 @@ func (p *Processor) DomainPermissionSubscriptionUpdate(
columns = append(columns, "adopt_orphans")
}
if removeRetracted != nil {
permSub.RemoveRetracted = removeRetracted
columns = append(columns, "remove_retracted")
}
if fetchPassword != nil {
permSub.FetchPassword = *fetchPassword
columns = append(columns, "fetch_password")
@ -342,12 +352,13 @@ func (p *Processor) DomainPermissionSubscriptionTest(
// Call the permSub.URI and parse a list of perms from it.
// Any error returned here is a "real" one, not an error
// from fetching / parsing the list.
createdPerms, err := p.subscriptions.ProcessDomainPermissionSubscription(
createdPerms, _, err := p.subscriptions.ProcessDomainPermissionSubscription(
ctx,
permSub,
tsport,
higherPrios,
true, // Dry run.
true, // Skip caching.
)
if err != nil {
err := gtserror.Newf("error doing dry-run: %w", err)