diff options
Diffstat (limited to 'internal/processing/media')
-rw-r--r-- | internal/processing/media/delete.go | 4 | ||||
-rw-r--r-- | internal/processing/media/getfile.go | 2 | ||||
-rw-r--r-- | internal/processing/media/media.go | 6 |
3 files changed, 6 insertions, 6 deletions
diff --git a/internal/processing/media/delete.go b/internal/processing/media/delete.go index 1c81417c3..e99b4e950 100644 --- a/internal/processing/media/delete.go +++ b/internal/processing/media/delete.go @@ -24,14 +24,14 @@ func (p *processor) Delete(ctx context.Context, mediaAttachmentID string) gtserr // delete the thumbnail from storage if attachment.Thumbnail.Path != "" { - if err := p.store.Delete(attachment.Thumbnail.Path); err != nil { + if err := p.storage.Delete(attachment.Thumbnail.Path); err != nil { errs = append(errs, fmt.Sprintf("remove thumbnail at path %s: %s", attachment.Thumbnail.Path, err)) } } // delete the file from storage if attachment.File.Path != "" { - if err := p.store.Delete(attachment.File.Path); err != nil { + if err := p.storage.Delete(attachment.File.Path); err != nil { errs = append(errs, fmt.Sprintf("remove file at path %s: %s", attachment.File.Path, err)) } } diff --git a/internal/processing/media/getfile.go b/internal/processing/media/getfile.go index f0d27c841..3cfdbe56b 100644 --- a/internal/processing/media/getfile.go +++ b/internal/processing/media/getfile.go @@ -110,7 +110,7 @@ func (p *processor) GetFile(ctx context.Context, account *gtsmodel.Account, form } } - bytes, err := p.store.Get(storagePath) + bytes, err := p.storage.Get(storagePath) if err != nil { return nil, gtserror.NewErrorNotFound(fmt.Errorf("error retrieving from storage: %s", err)) } diff --git a/internal/processing/media/media.go b/internal/processing/media/media.go index 0f6711dae..4c8416483 100644 --- a/internal/processing/media/media.go +++ b/internal/processing/media/media.go @@ -47,18 +47,18 @@ type processor struct { tc typeutils.TypeConverter config *config.Config mediaHandler media.Handler - store *kv.KVStore + storage *kv.KVStore db db.DB log *logrus.Logger } // New returns a new media processor. -func New(db db.DB, tc typeutils.TypeConverter, mediaHandler media.Handler, store *kv.KVStore, config *config.Config, log *logrus.Logger) Processor { +func New(db db.DB, tc typeutils.TypeConverter, mediaHandler media.Handler, storage *kv.KVStore, config *config.Config, log *logrus.Logger) Processor { return &processor{ tc: tc, config: config, mediaHandler: mediaHandler, - store: store, + storage: storage, db: db, log: log, } |