diff options
Diffstat (limited to 'internal/processing/admin')
| -rw-r--r-- | internal/processing/admin/domainallow.go | 2 | ||||
| -rw-r--r-- | internal/processing/admin/domainpermissionsubscription.go | 13 |
2 files changed, 13 insertions, 2 deletions
diff --git a/internal/processing/admin/domainallow.go b/internal/processing/admin/domainallow.go index 388ca5cb1..bdf70642b 100644 --- a/internal/processing/admin/domainallow.go +++ b/internal/processing/admin/domainallow.go @@ -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, } diff --git a/internal/processing/admin/domainpermissionsubscription.go b/internal/processing/admin/domainpermissionsubscription.go index b4dc72aa3..9afe6ee5c 100644 --- a/internal/processing/admin/domainpermissionsubscription.go +++ b/internal/processing/admin/domainpermissionsubscription.go @@ -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) |