[chore] move client/federator workerpools to Workers{} (#1575)

* replace concurrency worker pools with base models in State.Workers, update code and tests accordingly

* improve code comment

* change back testrig default log level

* un-comment-out TestAnnounceTwice() and fix

---------

Signed-off-by: kim <grufwub@gmail.com>
Reviewed-by: tobi

1 files changed, 6 insertions, 6 deletions

diff --git a/internal/processing/media/getfile.go b/internal/processing/media/getfile.go
index 2a4ef2097..f9c6c23c2 100644
--- a/internal/processing/media/getfile.go
+++ b/internal/processing/media/getfile.go
@@ -54,7 +54,7 @@ func (p *Processor) GetFile(ctx context.Context, requestingAccount *gtsmodel.Acc
 	owningAccountID := form.AccountID
 
 	// get the account that owns the media and make sure it's not suspended
-	owningAccount, err := p.db.GetAccountByID(ctx, owningAccountID)
+	owningAccount, err := p.state.DB.GetAccountByID(ctx, owningAccountID)
 	if err != nil {
 		return nil, gtserror.NewErrorNotFound(fmt.Errorf("account with id %s could not be selected from the db: %s", owningAccountID, err))
 	}
@@ -64,7 +64,7 @@ func (p *Processor) GetFile(ctx context.Context, requestingAccount *gtsmodel.Acc
 
 	// make sure the requesting account and the media account don't block each other
 	if requestingAccount != nil {
-		blocked, err := p.db.IsBlocked(ctx, requestingAccount.ID, owningAccountID, true)
+		blocked, err := p.state.DB.IsBlocked(ctx, requestingAccount.ID, owningAccountID, true)
 		if err != nil {
 			return nil, gtserror.NewErrorNotFound(fmt.Errorf("block status could not be established between accounts %s and %s: %s", owningAccountID, requestingAccount.ID, err))
 		}
@@ -117,7 +117,7 @@ func parseSize(s string) (media.Size, error) {
 
 func (p *Processor) getAttachmentContent(ctx context.Context, requestingAccount *gtsmodel.Account, wantedMediaID string, owningAccountID string, mediaSize media.Size) (*apimodel.Content, gtserror.WithCode) {
 	// retrieve attachment from the database and do basic checks on it
-	a, err := p.db.GetAttachmentByID(ctx, wantedMediaID)
+	a, err := p.state.DB.GetAttachmentByID(ctx, wantedMediaID)
 	if err != nil {
 		return nil, gtserror.NewErrorNotFound(fmt.Errorf("attachment %s could not be taken from the db: %s", wantedMediaID, err))
 	}
@@ -209,7 +209,7 @@ func (p *Processor) getEmojiContent(ctx context.Context, fileName string, owning
 	// so this is more reliable than using full size url
 	imageStaticURL := uris.GenerateURIForAttachment(owningAccountID, string(media.TypeEmoji), string(media.SizeStatic), fileName, "png")
 
-	e, err := p.db.GetEmojiByStaticURL(ctx, imageStaticURL)
+	e, err := p.state.DB.GetEmojiByStaticURL(ctx, imageStaticURL)
 	if err != nil {
 		return nil, gtserror.NewErrorNotFound(fmt.Errorf("emoji %s could not be taken from the db: %s", fileName, err))
 	}
@@ -237,12 +237,12 @@ func (p *Processor) getEmojiContent(ctx context.Context, fileName string, owning
 func (p *Processor) retrieveFromStorage(ctx context.Context, storagePath string, content *apimodel.Content) (*apimodel.Content, gtserror.WithCode) {
 	// If running on S3 storage with proxying disabled then
 	// just fetch a pre-signed URL instead of serving the content.
-	if url := p.storage.URL(ctx, storagePath); url != nil {
+	if url := p.state.Storage.URL(ctx, storagePath); url != nil {
 		content.URL = url
 		return content, nil
 	}
 
-	reader, err := p.storage.GetStream(ctx, storagePath)
+	reader, err := p.state.Storage.GetStream(ctx, storagePath)
 	if err != nil {
 		return nil, gtserror.NewErrorNotFound(fmt.Errorf("error retrieving from storage: %s", err))
 	}