diff options
| author |  tobi <31960611+tsmethurst@users.noreply.github.com> | 2023-10-30 18:35:11 +0100 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2023-10-30 17:35:11 +0000 |
| commit | 4dc0547dc0e80a4289f46cd8ee5b3aaf855f1f1e (patch) | |
| tree | 465b66e88a1defdae6c29f86e9e1a3269dc474ff /internal/processing/admin | |
| parent | [chore]: Bump github.com/google/uuid from 1.3.1 to 1.4.0 (#2315) (diff) | |
| download | gotosocial-4dc0547dc0e80a4289f46cd8ee5b3aaf855f1f1e.tar.xz | |
[feature] Customizable media cleaner schedule (#2304)
Diffstat (limited to 'internal/processing/admin')
| -rw-r--r-- | internal/processing/admin/admin.go | 11 | ||||
| -rw-r--r-- | internal/processing/admin/admin_test.go | 2 |
2 files changed, 11 insertions, 2 deletions
diff --git a/internal/processing/admin/admin.go b/internal/processing/admin/admin.go index 51429c11c..3093b3e36 100644 --- a/internal/processing/admin/admin.go +++ b/internal/processing/admin/admin.go @@ -45,10 +45,17 @@ func (p *Processor) Actions() *Actions { } // New returns a new admin processor. -func New(state *state.State, converter *typeutils.Converter, mediaManager *media.Manager, transportController transport.Controller, emailSender email.Sender) Processor { +func New( + state *state.State, + cleaner *cleaner.Cleaner, + converter *typeutils.Converter, + mediaManager *media.Manager, + transportController transport.Controller, + emailSender email.Sender, +) Processor { return Processor{ state: state, - cleaner: cleaner.New(state), + cleaner: cleaner, converter: converter, mediaManager: mediaManager, transportController: transportController, diff --git a/internal/processing/admin/admin_test.go b/internal/processing/admin/admin_test.go index a5a790763..614735ee1 100644 --- a/internal/processing/admin/admin_test.go +++ b/internal/processing/admin/admin_test.go @@ -19,6 +19,7 @@ package admin_test import ( "github.com/stretchr/testify/suite" + "github.com/superseriousbusiness/gotosocial/internal/cleaner" "github.com/superseriousbusiness/gotosocial/internal/db" "github.com/superseriousbusiness/gotosocial/internal/email" "github.com/superseriousbusiness/gotosocial/internal/federation" @@ -105,6 +106,7 @@ func (suite *AdminStandardTestSuite) SetupTest() { suite.emailSender = testrig.NewEmailSender("../../../web/template/", suite.sentEmails) suite.processor = processing.NewProcessor( + cleaner.New(&suite.state), suite.tc, suite.federator, suite.oauthServer, |