diff options
| author |  kim <89579420+NyaaaWhatsUpDoc@users.noreply.github.com> | 2023-05-28 13:08:35 +0100 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2023-05-28 14:08:35 +0200 |
| commit | 5faeb4de2032e112ab49751eeeb906ac43826f3d (patch) | |
| tree | ea94b86f27384954ff93aec864b13b83c7f46db0 /internal/processing/account | |
| parent | [docs] Update + simplify roadmap, revise beta estimate (#1826) (diff) | |
| download | gotosocial-5faeb4de2032e112ab49751eeeb906ac43826f3d.tar.xz | |
[chore] tidy up media manager, add calling func to errors, build-script improvements (#1835)
* media manager tidy-up: de-interface and remove unused PostDataFunc
Signed-off-by: kim <grufwub@gmail.com>
* remove last traces of media.Manager being an interface
Signed-off-by: kim <grufwub@gmail.com>
* update error to provide caller, allow tuneable via build tags
Signed-off-by: kim <grufwub@gmail.com>
* remove kim-specific build script changes
Signed-off-by: kim <grufwub@gmail.com>
* fix merge conflicts
Signed-off-by: kim <grufwub@gmail.com>
* update build-script to support externally setting build variables
Signed-off-by: kim <grufwub@gmail.com>
---------
Signed-off-by: kim <grufwub@gmail.com>
Diffstat (limited to 'internal/processing/account')
| -rw-r--r-- | internal/processing/account/account.go | 4 | ||||
| -rw-r--r-- | internal/processing/account/account_test.go | 2 | ||||
| -rw-r--r-- | internal/processing/account/update.go | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/internal/processing/account/account.go b/internal/processing/account/account.go index 328b682ac..7bef8b0c5 100644 --- a/internal/processing/account/account.go +++ b/internal/processing/account/account.go @@ -34,7 +34,7 @@ import ( type Processor struct { state *state.State tc typeutils.TypeConverter - mediaManager media.Manager + mediaManager *media.Manager oauthServer oauth.Server filter *visibility.Filter formatter text.Formatter @@ -46,7 +46,7 @@ type Processor struct { func New( state *state.State, tc typeutils.TypeConverter, - mediaManager media.Manager, + mediaManager *media.Manager, oauthServer oauth.Server, federator federation.Federator, filter *visibility.Filter, diff --git a/internal/processing/account/account_test.go b/internal/processing/account/account_test.go index 3fa8c8991..4ba7de16e 100644 --- a/internal/processing/account/account_test.go +++ b/internal/processing/account/account_test.go @@ -45,7 +45,7 @@ type AccountStandardTestSuite struct { tc typeutils.TypeConverter storage *storage.Driver state state.State - mediaManager media.Manager + mediaManager *media.Manager oauthServer oauth.Server fromClientAPIChan chan messages.FromClientAPI transportController transport.Controller diff --git a/internal/processing/account/update.go b/internal/processing/account/update.go index d7018367d..01c62d7e3 100644 --- a/internal/processing/account/update.go +++ b/internal/processing/account/update.go @@ -300,7 +300,7 @@ func (p *Processor) UpdateAvatar(ctx context.Context, avatar *multipart.FileHead Description: description, } - processingMedia, err := p.mediaManager.PreProcessMedia(ctx, dataFunc, nil, accountID, ai) + processingMedia, err := p.mediaManager.PreProcessMedia(ctx, dataFunc, accountID, ai) if err != nil { return nil, fmt.Errorf("UpdateAvatar: error processing avatar: %s", err) } @@ -327,7 +327,7 @@ func (p *Processor) UpdateHeader(ctx context.Context, header *multipart.FileHead Header: &isHeader, } - processingMedia, err := p.mediaManager.PreProcessMedia(ctx, dataFunc, nil, accountID, ai) + processingMedia, err := p.mediaManager.PreProcessMedia(ctx, dataFunc, accountID, ai) if err != nil { return nil, fmt.Errorf("UpdateHeader: error processing header: %s", err) } |