more refactoring, media handler => manager

9 files changed, 27 insertions, 27 deletions

diff --git a/internal/processing/account/account.go b/internal/processing/account/account.go
index ae005f4f6..b2321f414 100644
--- a/internal/processing/account/account.go
+++ b/internal/processing/account/account.go
@@ -77,7 +77,7 @@ type Processor interface {
 
 type processor struct {
 	tc            typeutils.TypeConverter
-	mediaHandler  media.Handler
+	mediaManager  media.Manager
 	fromClientAPI chan messages.FromClientAPI
 	oauthServer   oauth.Server
 	filter        visibility.Filter
@@ -87,10 +87,10 @@ type processor struct {
 }
 
 // New returns a new account processor.
-func New(db db.DB, tc typeutils.TypeConverter, mediaHandler media.Handler, oauthServer oauth.Server, fromClientAPI chan messages.FromClientAPI, federator federation.Federator) Processor {
+func New(db db.DB, tc typeutils.TypeConverter, mediaManager media.Manager, oauthServer oauth.Server, fromClientAPI chan messages.FromClientAPI, federator federation.Federator) Processor {
 	return &processor{
 		tc:            tc,
-		mediaHandler:  mediaHandler,
+		mediaManager:  mediaManager,
 		fromClientAPI: fromClientAPI,
 		oauthServer:   oauthServer,
 		filter:        visibility.NewFilter(db),
diff --git a/internal/processing/account/account_test.go b/internal/processing/account/account_test.go
index e4611ba23..9c7f0fe67 100644
--- a/internal/processing/account/account_test.go
+++ b/internal/processing/account/account_test.go
@@ -41,7 +41,7 @@ type AccountStandardTestSuite struct {
 	db                  db.DB
 	tc                  typeutils.TypeConverter
 	storage             *kv.KVStore
-	mediaHandler        media.Handler
+	mediaManager        media.Manager
 	oauthServer         oauth.Server
 	fromClientAPIChan   chan messages.FromClientAPI
 	httpClient          pub.HttpClient
@@ -80,7 +80,7 @@ func (suite *AccountStandardTestSuite) SetupTest() {
 	suite.db = testrig.NewTestDB()
 	suite.tc = testrig.NewTestTypeConverter(suite.db)
 	suite.storage = testrig.NewTestStorage()
-	suite.mediaHandler = testrig.NewTestMediaHandler(suite.db, suite.storage)
+	suite.mediaManager = testrig.NewTestMediaManager(suite.db, suite.storage)
 	suite.oauthServer = testrig.NewTestOauthServer(suite.db)
 	suite.fromClientAPIChan = make(chan messages.FromClientAPI, 100)
 	suite.httpClient = testrig.NewMockHTTPClient(nil)
@@ -88,7 +88,7 @@ func (suite *AccountStandardTestSuite) SetupTest() {
 	suite.federator = testrig.NewTestFederator(suite.db, suite.transportController, suite.storage)
 	suite.sentEmails = make(map[string]string)
 	suite.emailSender = testrig.NewEmailSender("../../../web/template/", suite.sentEmails)
-	suite.accountProcessor = account.New(suite.db, suite.tc, suite.mediaHandler, suite.oauthServer, suite.fromClientAPIChan, suite.federator)
+	suite.accountProcessor = account.New(suite.db, suite.tc, suite.mediaManager, suite.oauthServer, suite.fromClientAPIChan, suite.federator)
 	testrig.StandardDBSetup(suite.db, nil)
 	testrig.StandardStorageSetup(suite.storage, "../../../testrig/media")
 }
diff --git a/internal/processing/account/update.go b/internal/processing/account/update.go
index a32dd9ac0..8de6c83f0 100644
--- a/internal/processing/account/update.go
+++ b/internal/processing/account/update.go
@@ -159,7 +159,7 @@ func (p *processor) UpdateAvatar(ctx context.Context, avatar *multipart.FileHead
 	}
 
 	// do the setting
-	avatarInfo, err := p.mediaHandler.ProcessHeaderOrAvatar(ctx, buf.Bytes(), accountID, media.TypeAvatar, "")
+	avatarInfo, err := p.mediaManager.ProcessHeaderOrAvatar(ctx, buf.Bytes(), accountID, media.TypeAvatar, "")
 	if err != nil {
 		return nil, fmt.Errorf("error processing avatar: %s", err)
 	}
@@ -193,7 +193,7 @@ func (p *processor) UpdateHeader(ctx context.Context, header *multipart.FileHead
 	}
 
 	// do the setting
-	headerInfo, err := p.mediaHandler.ProcessHeaderOrAvatar(ctx, buf.Bytes(), accountID, media.TypeHeader, "")
+	headerInfo, err := p.mediaManager.ProcessHeaderOrAvatar(ctx, buf.Bytes(), accountID, media.TypeHeader, "")
 	if err != nil {
 		return nil, fmt.Errorf("error processing header: %s", err)
 	}
diff --git a/internal/processing/admin/admin.go b/internal/processing/admin/admin.go
index 217d10dfe..27a7da47a 100644
--- a/internal/processing/admin/admin.go
+++ b/internal/processing/admin/admin.go
@@ -43,16 +43,16 @@ type Processor interface {
 
 type processor struct {
 	tc            typeutils.TypeConverter
-	mediaHandler  media.Handler
+	mediaManager  media.Manager
 	fromClientAPI chan messages.FromClientAPI
 	db            db.DB
 }
 
 // New returns a new admin processor.
-func New(db db.DB, tc typeutils.TypeConverter, mediaHandler media.Handler, fromClientAPI chan messages.FromClientAPI) Processor {
+func New(db db.DB, tc typeutils.TypeConverter, mediaManager media.Manager, fromClientAPI chan messages.FromClientAPI) Processor {
 	return &processor{
 		tc:            tc,
-		mediaHandler:  mediaHandler,
+		mediaManager:  mediaManager,
 		fromClientAPI: fromClientAPI,
 		db:            db,
 	}
diff --git a/internal/processing/admin/emoji.go b/internal/processing/admin/emoji.go
index 4989d8e8d..5620374b8 100644
--- a/internal/processing/admin/emoji.go
+++ b/internal/processing/admin/emoji.go
@@ -49,8 +49,8 @@ func (p *processor) EmojiCreate(ctx context.Context, account *gtsmodel.Account,
 		return nil, errors.New("could not read provided emoji: size 0 bytes")
 	}
 
-	// allow the mediaHandler to work its magic of processing the emoji bytes, and putting them in whatever storage backend we're using
-	emoji, err := p.mediaHandler.ProcessLocalEmoji(ctx, buf.Bytes(), form.Shortcode)
+	// allow the mediaManager to work its magic of processing the emoji bytes, and putting them in whatever storage backend we're using
+	emoji, err := p.mediaManager.ProcessLocalEmoji(ctx, buf.Bytes(), form.Shortcode)
 	if err != nil {
 		return nil, fmt.Errorf("error reading emoji: %s", err)
 	}
diff --git a/internal/processing/media/create.go b/internal/processing/media/create.go
index de15d3162..68a011683 100644
--- a/internal/processing/media/create.go
+++ b/internal/processing/media/create.go
@@ -65,8 +65,8 @@ func (p *processor) Create(ctx context.Context, account *gtsmodel.Account, form
 		},
 	}
 
-	// allow the mediaHandler to work its magic of processing the attachment bytes, and putting them in whatever storage backend we're using
-	attachment, err := p.mediaHandler.ProcessAttachment(ctx, buf.Bytes(), minAttachment)
+	// allow the mediaManager to work its magic of processing the attachment bytes, and putting them in whatever storage backend we're using
+	attachment, err := p.mediaManager.ProcessAttachment(ctx, buf.Bytes(), minAttachment)
 	if err != nil {
 		return nil, fmt.Errorf("error reading attachment: %s", err)
 	}
diff --git a/internal/processing/media/media.go b/internal/processing/media/media.go
index 9e050fe84..3d4ae5009 100644
--- a/internal/processing/media/media.go
+++ b/internal/processing/media/media.go
@@ -43,16 +43,16 @@ type Processor interface {
 
 type processor struct {
 	tc           typeutils.TypeConverter
-	mediaHandler media.Handler
+	mediaManager media.Manager
 	storage      *kv.KVStore
 	db           db.DB
 }
 
 // New returns a new media processor.
-func New(db db.DB, tc typeutils.TypeConverter, mediaHandler media.Handler, storage *kv.KVStore) Processor {
+func New(db db.DB, tc typeutils.TypeConverter, mediaManager media.Manager, storage *kv.KVStore) Processor {
 	return &processor{
 		tc:           tc,
-		mediaHandler: mediaHandler,
+		mediaManager: mediaManager,
 		storage:      storage,
 		db:           db,
 	}
diff --git a/internal/processing/processor.go b/internal/processing/processor.go
index f5334a1ef..2626c1fea 100644
--- a/internal/processing/processor.go
+++ b/internal/processing/processor.go
@@ -235,7 +235,7 @@ type processor struct {
 	stop            chan interface{}
 	tc              typeutils.TypeConverter
 	oauthServer     oauth.Server
-	mediaHandler    media.Handler
+	mediaManager    media.Manager
 	storage         *kv.KVStore
 	timelineManager timeline.Manager
 	db              db.DB
@@ -259,7 +259,7 @@ func NewProcessor(
 	tc typeutils.TypeConverter,
 	federator federation.Federator,
 	oauthServer oauth.Server,
-	mediaHandler media.Handler,
+	mediaManager media.Manager,
 	storage *kv.KVStore,
 	timelineManager timeline.Manager,
 	db db.DB,
@@ -269,9 +269,9 @@ func NewProcessor(
 
 	statusProcessor := status.New(db, tc, fromClientAPI)
 	streamingProcessor := streaming.New(db, oauthServer)
-	accountProcessor := account.New(db, tc, mediaHandler, oauthServer, fromClientAPI, federator)
-	adminProcessor := admin.New(db, tc, mediaHandler, fromClientAPI)
-	mediaProcessor := mediaProcessor.New(db, tc, mediaHandler, storage)
+	accountProcessor := account.New(db, tc, mediaManager, oauthServer, fromClientAPI, federator)
+	adminProcessor := admin.New(db, tc, mediaManager, fromClientAPI)
+	mediaProcessor := mediaProcessor.New(db, tc, mediaManager, storage)
 	userProcessor := user.New(db, emailSender)
 	federationProcessor := federationProcessor.New(db, tc, federator, fromFederator)
 
@@ -282,7 +282,7 @@ func NewProcessor(
 		stop:            make(chan interface{}),
 		tc:              tc,
 		oauthServer:     oauthServer,
-		mediaHandler:    mediaHandler,
+		mediaManager:    mediaManager,
 		storage:         storage,
 		timelineManager: timelineManager,
 		db:              db,
diff --git a/internal/processing/processor_test.go b/internal/processing/processor_test.go
index dc7562a2e..04793898f 100644
--- a/internal/processing/processor_test.go
+++ b/internal/processing/processor_test.go
@@ -51,7 +51,7 @@ type ProcessingStandardTestSuite struct {
 	transportController transport.Controller
 	federator           federation.Federator
 	oauthServer         oauth.Server
-	mediaHandler        media.Handler
+	mediaManager        media.Manager
 	timelineManager     timeline.Manager
 	emailSender         email.Sender
 
@@ -218,11 +218,11 @@ func (suite *ProcessingStandardTestSuite) SetupTest() {
 	suite.transportController = testrig.NewTestTransportController(httpClient, suite.db)
 	suite.federator = testrig.NewTestFederator(suite.db, suite.transportController, suite.storage)
 	suite.oauthServer = testrig.NewTestOauthServer(suite.db)
-	suite.mediaHandler = testrig.NewTestMediaHandler(suite.db, suite.storage)
+	suite.mediaManager = testrig.NewTestMediaManager(suite.db, suite.storage)
 	suite.timelineManager = testrig.NewTestTimelineManager(suite.db)
 	suite.emailSender = testrig.NewEmailSender("../../web/template/", nil)
 
-	suite.processor = processing.NewProcessor(suite.typeconverter, suite.federator, suite.oauthServer, suite.mediaHandler, suite.storage, suite.timelineManager, suite.db, suite.emailSender)
+	suite.processor = processing.NewProcessor(suite.typeconverter, suite.federator, suite.oauthServer, suite.mediaManager, suite.storage, suite.timelineManager, suite.db, suite.emailSender)
 
 	testrig.StandardDBSetup(suite.db, suite.testAccounts)
 	testrig.StandardStorageSetup(suite.storage, "../../testrig/media")