summaryrefslogtreecommitdiff
path: root/internal/processing
diff options
context:
space:
mode:
authorLibravatar kim <89579420+NyaaaWhatsUpDoc@users.noreply.github.com>2023-05-28 13:08:35 +0100
committerLibravatar GitHub <noreply@github.com>2023-05-28 14:08:35 +0200
commit5faeb4de2032e112ab49751eeeb906ac43826f3d (patch)
treeea94b86f27384954ff93aec864b13b83c7f46db0 /internal/processing
parent[docs] Update + simplify roadmap, revise beta estimate (#1826) (diff)
downloadgotosocial-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')
-rw-r--r--internal/processing/account/account.go4
-rw-r--r--internal/processing/account/account_test.go2
-rw-r--r--internal/processing/account/update.go4
-rw-r--r--internal/processing/admin/admin.go4
-rw-r--r--internal/processing/admin/emoji.go6
-rw-r--r--internal/processing/fromfederator.go9
-rw-r--r--internal/processing/media/create.go2
-rw-r--r--internal/processing/media/getfile.go5
-rw-r--r--internal/processing/media/media.go4
-rw-r--r--internal/processing/media/media_test.go2
-rw-r--r--internal/processing/processor.go4
-rw-r--r--internal/processing/processor_test.go2
-rw-r--r--internal/processing/status/status_test.go2
13 files changed, 22 insertions, 28 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)
}
diff --git a/internal/processing/admin/admin.go b/internal/processing/admin/admin.go
index ad0279dbf..9b243e06d 100644
--- a/internal/processing/admin/admin.go
+++ b/internal/processing/admin/admin.go
@@ -28,13 +28,13 @@ import (
type Processor struct {
state *state.State
tc typeutils.TypeConverter
- mediaManager media.Manager
+ mediaManager *media.Manager
transportController transport.Controller
emailSender email.Sender
}
// New returns a new admin processor.
-func New(state *state.State, tc typeutils.TypeConverter, mediaManager media.Manager, transportController transport.Controller, emailSender email.Sender) Processor {
+func New(state *state.State, tc typeutils.TypeConverter, mediaManager *media.Manager, transportController transport.Controller, emailSender email.Sender) Processor {
return Processor{
state: state,
tc: tc,
diff --git a/internal/processing/admin/emoji.go b/internal/processing/admin/emoji.go
index acea85116..3a7868eb1 100644
--- a/internal/processing/admin/emoji.go
+++ b/internal/processing/admin/emoji.go
@@ -74,7 +74,7 @@ func (p *Processor) EmojiCreate(ctx context.Context, account *gtsmodel.Account,
}
}
- processingEmoji, err := p.mediaManager.PreProcessEmoji(ctx, data, nil, form.Shortcode, emojiID, emojiURI, ai, false)
+ processingEmoji, err := p.mediaManager.PreProcessEmoji(ctx, data, form.Shortcode, emojiID, emojiURI, ai, false)
if err != nil {
return nil, gtserror.NewErrorInternalError(fmt.Errorf("error processing emoji: %s", err), "error processing emoji")
}
@@ -355,7 +355,7 @@ func (p *Processor) emojiUpdateCopy(ctx context.Context, emoji *gtsmodel.Emoji,
}
}
- processingEmoji, err := p.mediaManager.PreProcessEmoji(ctx, data, nil, *shortcode, newEmojiID, newEmojiURI, ai, false)
+ processingEmoji, err := p.mediaManager.PreProcessEmoji(ctx, data, *shortcode, newEmojiID, newEmojiURI, ai, false)
if err != nil {
err = fmt.Errorf("emojiUpdateCopy: error processing emoji %s: %s", emoji.ID, err)
return nil, gtserror.NewErrorInternalError(err)
@@ -461,7 +461,7 @@ func (p *Processor) emojiUpdateModify(ctx context.Context, emoji *gtsmodel.Emoji
}
}
- processingEmoji, err := p.mediaManager.PreProcessEmoji(ctx, data, nil, emoji.Shortcode, emoji.ID, emoji.URI, ai, true)
+ processingEmoji, err := p.mediaManager.PreProcessEmoji(ctx, data, emoji.Shortcode, emoji.ID, emoji.URI, ai, true)
if err != nil {
err = fmt.Errorf("emojiUpdateModify: error processing emoji %s: %s", emoji.ID, err)
return nil, gtserror.NewErrorInternalError(err)
diff --git a/internal/processing/fromfederator.go b/internal/processing/fromfederator.go
index ecb7934c9..f91f5ae8b 100644
--- a/internal/processing/fromfederator.go
+++ b/internal/processing/fromfederator.go
@@ -379,8 +379,8 @@ func (p *Processor) processUpdateAccountFromFederator(ctx context.Context, feder
return errors.New("Accountable was not parseable on update account message")
}
- // Call RefreshAccount to fetch up-to-date bio, avatar, header, etc.
- updatedAccount, _, err := p.federator.RefreshAccount(
+ // Fetch up-to-date bio, avatar, header, etc.
+ _, _, err := p.federator.RefreshAccount(
ctx,
federatorMsg.ReceivingAccount.Username,
incomingAccount,
@@ -391,11 +391,6 @@ func (p *Processor) processUpdateAccountFromFederator(ctx context.Context, feder
return fmt.Errorf("error enriching updated account from federator: %s", err)
}
- // RefreshAccount doesn't make DB update calls, so do that here.
- if err := p.state.DB.UpdateAccount(ctx, updatedAccount); err != nil {
- return fmt.Errorf("error enriching updated account from federator: %s", err)
- }
-
return nil
}
diff --git a/internal/processing/media/create.go b/internal/processing/media/create.go
index 6bedb9380..cdc65dfa4 100644
--- a/internal/processing/media/create.go
+++ b/internal/processing/media/create.go
@@ -42,7 +42,7 @@ func (p *Processor) Create(ctx context.Context, account *gtsmodel.Account, form
}
// process the media attachment and load it immediately
- media, err := p.mediaManager.PreProcessMedia(ctx, data, nil, account.ID, &media.AdditionalMediaInfo{
+ media, err := p.mediaManager.PreProcessMedia(ctx, data, account.ID, &media.AdditionalMediaInfo{
Description: &form.Description,
FocusX: &focusX,
FocusY: &focusY,
diff --git a/internal/processing/media/getfile.go b/internal/processing/media/getfile.go
index 2694fde13..27b08600e 100644
--- a/internal/processing/media/getfile.go
+++ b/internal/processing/media/getfile.go
@@ -148,8 +148,7 @@ func (p *Processor) getAttachmentContent(ctx context.Context, requestingAccount
// [
// the reason it was removed was because a slow
// client connection could hold open a storage
- // recache operation, and so holding open a media
- // worker worker.
+ // recache operation -> holding open a media worker.
// ]
dataFn := func(innerCtx context.Context) (io.ReadCloser, int64, error) {
@@ -161,7 +160,7 @@ func (p *Processor) getAttachmentContent(ctx context.Context, requestingAccount
}
// Start recaching this media with the prepared data function.
- processingMedia, err := p.mediaManager.PreProcessMediaRecache(ctx, dataFn, nil, wantedMediaID)
+ processingMedia, err := p.mediaManager.PreProcessMediaRecache(ctx, dataFn, wantedMediaID)
if err != nil {
return nil, gtserror.NewErrorNotFound(fmt.Errorf("error recaching media: %s", err))
}
diff --git a/internal/processing/media/media.go b/internal/processing/media/media.go
index d0192c67f..cec912874 100644
--- a/internal/processing/media/media.go
+++ b/internal/processing/media/media.go
@@ -27,12 +27,12 @@ import (
type Processor struct {
state *state.State
tc typeutils.TypeConverter
- mediaManager media.Manager
+ mediaManager *media.Manager
transportController transport.Controller
}
// New returns a new media processor.
-func New(state *state.State, tc typeutils.TypeConverter, mediaManager media.Manager, transportController transport.Controller) Processor {
+func New(state *state.State, tc typeutils.TypeConverter, mediaManager *media.Manager, transportController transport.Controller) Processor {
return Processor{
state: state,
tc: tc,
diff --git a/internal/processing/media/media_test.go b/internal/processing/media/media_test.go
index 7c66cfdaa..97e490a9c 100644
--- a/internal/processing/media/media_test.go
+++ b/internal/processing/media/media_test.go
@@ -37,7 +37,7 @@ type MediaStandardTestSuite struct {
tc typeutils.TypeConverter
storage *storage.Driver
state state.State
- mediaManager media.Manager
+ mediaManager *media.Manager
transportController transport.Controller
// standard suite models
diff --git a/internal/processing/processor.go b/internal/processing/processor.go
index d5f88bfb2..b67e5252e 100644
--- a/internal/processing/processor.go
+++ b/internal/processing/processor.go
@@ -45,7 +45,7 @@ type Processor struct {
federator federation.Federator
tc typeutils.TypeConverter
oauthServer oauth.Server
- mediaManager mm.Manager
+ mediaManager *mm.Manager
state *state.State
emailSender email.Sender
filter *visibility.Filter
@@ -111,7 +111,7 @@ func NewProcessor(
tc typeutils.TypeConverter,
federator federation.Federator,
oauthServer oauth.Server,
- mediaManager mm.Manager,
+ mediaManager *mm.Manager,
state *state.State,
emailSender email.Sender,
) *Processor {
diff --git a/internal/processing/processor_test.go b/internal/processing/processor_test.go
index 68c33aa04..fc85b38ba 100644
--- a/internal/processing/processor_test.go
+++ b/internal/processing/processor_test.go
@@ -43,7 +43,7 @@ type ProcessingStandardTestSuite struct {
db db.DB
storage *storage.Driver
state state.State
- mediaManager media.Manager
+ mediaManager *media.Manager
typeconverter typeutils.TypeConverter
httpClient *testrig.MockHTTPClient
transportController transport.Controller
diff --git a/internal/processing/status/status_test.go b/internal/processing/status/status_test.go
index 01d8d3acd..a64143df4 100644
--- a/internal/processing/status/status_test.go
+++ b/internal/processing/status/status_test.go
@@ -40,7 +40,7 @@ type StatusStandardTestSuite struct {
tc transport.Controller
storage *storage.Driver
state state.State
- mediaManager media.Manager
+ mediaManager *media.Manager
federator federation.Federator
// standard suite models
generated by cgit v1.2.3 (git 2.46.0) at 2025-07-12 23:29:47 +0000