From b6fbdc66c1ce1ec61ebfb6fcc0351ea627a1d288 Mon Sep 17 00:00:00 2001 From: tobi <31960611+tsmethurst@users.noreply.github.com> Date: Wed, 22 Feb 2023 16:05:26 +0100 Subject: [chore] Deinterface processor and subprocessors (#1501) * [chore] Deinterface processor and subprocessors * expose subprocessors via function calls * missing license header --- internal/api/fileserver/fileserver.go | 4 ++-- internal/api/fileserver/fileserver_test.go | 2 +- internal/api/fileserver/servefile.go | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'internal/api/fileserver') diff --git a/internal/api/fileserver/fileserver.go b/internal/api/fileserver/fileserver.go index ba2552caa..aa4696f6f 100644 --- a/internal/api/fileserver/fileserver.go +++ b/internal/api/fileserver/fileserver.go @@ -39,10 +39,10 @@ const ( ) type Module struct { - processor processing.Processor + processor *processing.Processor } -func New(processor processing.Processor) *Module { +func New(processor *processing.Processor) *Module { return &Module{ processor: processor, } diff --git a/internal/api/fileserver/fileserver_test.go b/internal/api/fileserver/fileserver_test.go index 5b139454e..0a6879e70 100644 --- a/internal/api/fileserver/fileserver_test.go +++ b/internal/api/fileserver/fileserver_test.go @@ -45,7 +45,7 @@ type FileserverTestSuite struct { storage *storage.Driver federator federation.Federator tc typeutils.TypeConverter - processor processing.Processor + processor *processing.Processor mediaManager media.Manager oauthServer oauth.Server emailSender email.Sender diff --git a/internal/api/fileserver/servefile.go b/internal/api/fileserver/servefile.go index a344e3e53..d963df749 100644 --- a/internal/api/fileserver/servefile.go +++ b/internal/api/fileserver/servefile.go @@ -80,7 +80,7 @@ func (m *Module) ServeFile(c *gin.Context) { // Acquire context from gin request. ctx := c.Request.Context() - content, errWithCode := m.processor.FileGet(ctx, authed, &apimodel.GetContentRequestForm{ + content, errWithCode := m.processor.Media().GetFile(ctx, authed.Account, &apimodel.GetContentRequestForm{ AccountID: accountID, MediaType: mediaType, MediaSize: mediaSize, -- cgit v1.2.3