diff --git a/internal/admin/actions.go b/internal/admin/actions.go index 6d031519f..057bfe07d 100644 --- a/internal/admin/actions.go +++ b/internal/admin/actions.go @@ -69,7 +69,7 @@ func New(db db.DB, workers *workers.Workers) *Actions { } } -type AdminActionF func(context.Context) gtserror.MultiError +type ActionF func(context.Context) gtserror.MultiError // Run runs the given admin action by executing the supplied function. // @@ -83,7 +83,7 @@ type AdminActionF func(context.Context) gtserror.MultiError func (a *Actions) Run( ctx context.Context, adminAction *gtsmodel.AdminAction, - f AdminActionF, + f ActionF, ) gtserror.WithCode { actionKey := adminAction.Key() diff --git a/internal/admin/domainkeys.go b/internal/admin/domainkeys.go index 019f7d2d1..ad943ce80 100644 --- a/internal/admin/domainkeys.go +++ b/internal/admin/domainkeys.go @@ -25,7 +25,7 @@ import ( "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" ) -func (a *Actions) DomainKeysExpireF(domain string) AdminActionF { +func (a *Actions) DomainKeysExpireF(domain string) ActionF { return func(ctx context.Context) gtserror.MultiError { var ( expiresAt = time.Now() diff --git a/internal/admin/domainperms.go b/internal/admin/domainperms.go index c10db574d..fa686df43 100644 --- a/internal/admin/domainperms.go +++ b/internal/admin/domainperms.go @@ -38,7 +38,7 @@ import ( func (a *Actions) DomainAllowF( actionID string, domainAllow *gtsmodel.DomainAllow, -) AdminActionF { +) ActionF { return func(ctx context.Context) gtserror.MultiError { l := log. WithContext(ctx). @@ -104,7 +104,7 @@ func (a *Actions) domainAllowSideEffects( func (a *Actions) DomainUnallowF( actionID string, domainAllow *gtsmodel.DomainAllow, -) AdminActionF { +) ActionF { return func(ctx context.Context) gtserror.MultiError { l := log. WithContext(ctx). @@ -169,7 +169,7 @@ func (a *Actions) domainUnallowSideEffects( func (a *Actions) DomainBlockF( actionID string, domainBlock *gtsmodel.DomainBlock, -) AdminActionF { +) ActionF { return func(ctx context.Context) gtserror.MultiError { l := log. WithContext(ctx). @@ -250,7 +250,7 @@ func (a *Actions) domainBlockSideEffects( func (a *Actions) DomainUnblockF( actionID string, domainBlock *gtsmodel.DomainBlock, -) AdminActionF { +) ActionF { return func(ctx context.Context) gtserror.MultiError { l := log. WithContext(ctx). diff --git a/internal/subscriptions/domainperms.go b/internal/subscriptions/domainperms.go index d60f1e9fb..00946d5f3 100644 --- a/internal/subscriptions/domainperms.go +++ b/internal/subscriptions/domainperms.go @@ -426,7 +426,7 @@ func (s *Subscriptions) processDomainPermission( var ( insertF func() error action *gtsmodel.AdminAction - actionF admin.AdminActionF + actionF admin.ActionF ) if permSub.PermissionType == gtsmodel.DomainPermissionBlock {