tests are passing, but there's still much to be done

cmd/gotosocial/action/server/server.go

@@ -105,7 +105,10 @@ var Start action.GTSAction = func(ctx context.Context) error {
 	}
 
 	// build backend handlers
-	mediaManager := media.New(dbService, storage)
+	mediaManager, err := media.New(dbService, storage)
+	if err != nil {
+		return fmt.Errorf("error creating media manager: %s", err)
+	}
 	oauthServer := oauth.New(ctx, dbService)
 	transportController := transport.NewController(dbService, &federation.Clock{}, http.DefaultClient)
 	federator := federation.NewFederator(dbService, federatingDB, transportController, typeConverter, mediaManager)

internal/ap/extract.go

@@ -395,20 +395,20 @@ func ExtractAttachment(i Attachmentable) (*gtsmodel.MediaAttachment, error) {
 		attachment.Description = name
 	}
 
+	attachment.Blurhash = ExtractBlurhash(i)
+
 	attachment.Processing = gtsmodel.ProcessingStatusReceived
 
 	return attachment, nil
 }
 
-// func extractBlurhash(i withBlurhash) (string, error) {
+// ExtractBlurhash extracts the blurhash value (if present) from a WithBlurhash interface.
-// 	if i.GetTootBlurhashProperty() == nil {
+func ExtractBlurhash(i WithBlurhash) string {
-// 		return "", errors.New("blurhash property was nil")
+	if i.GetTootBlurhash() == nil {
-// 	}
+		return ""
-// 	if i.GetTootBlurhashProperty().Get() == "" {
+	}
-// 		return "", errors.New("empty blurhash string")
+	return i.GetTootBlurhash().Get()
-// 	}
+}
-// 	return i.GetTootBlurhashProperty().Get(), nil
-// }
 
 // ExtractHashtags returns a slice of tags on the interface.
 func ExtractHashtags(i WithTag) ([]*gtsmodel.Tag, error) {

internal/ap/extractattachments_test.go

@@ -42,7 +42,7 @@ func (suite *ExtractAttachmentsTestSuite) TestExtractAttachments() {
 	suite.Equal("image/jpeg", attachment1.File.ContentType)
 	suite.Equal("https://s3-us-west-2.amazonaws.com/plushcity/media_attachments/files/106/867/380/219/163/828/original/88e8758c5f011439.jpg", attachment1.RemoteURL)
 	suite.Equal("It's a cute plushie.", attachment1.Description)
-	suite.Empty(attachment1.Blurhash) // atm we discard blurhashes and generate them ourselves during processing
+	suite.Equal("UxQ0EkRP_4tRxtRjWBt7%hozM_ayV@oLf6WB", attachment1.Blurhash)
 }
 
 func (suite *ExtractAttachmentsTestSuite) TestExtractNoAttachments() {

internal/ap/interfaces.go

@@ -70,6 +70,7 @@ type Attachmentable interface {
 	WithMediaType
 	WithURL
 	WithName
+	WithBlurhash
 }
 
 // Hashtaggable represents the minimum activitypub interface for representing a 'hashtag' tag.
@@ -284,9 +285,10 @@ type WithMediaType interface {
 	GetActivityStreamsMediaType() vocab.ActivityStreamsMediaTypeProperty
 }
 
-// type withBlurhash interface {
+// WithBlurhash represents an activity with TootBlurhashProperty
-// 	GetTootBlurhashProperty() vocab.TootBlurhashProperty
+type WithBlurhash interface {
-// }
+	GetTootBlurhash() vocab.TootBlurhashProperty
+}
 
 // type withFocalPoint interface {
 // 	// TODO

internal/federation/dereferencing/account.go

@@ -32,6 +32,7 @@ import (
 	"github.com/superseriousbusiness/gotosocial/internal/ap"
 	"github.com/superseriousbusiness/gotosocial/internal/gtsmodel"
 	"github.com/superseriousbusiness/gotosocial/internal/id"
+	"github.com/superseriousbusiness/gotosocial/internal/media"
 	"github.com/superseriousbusiness/gotosocial/internal/transport"
 )
 
@@ -256,16 +257,16 @@ func (d *deref) fetchHeaderAndAviForAccount(ctx context.Context, targetAccount *
 			return err
 		}
 
-		media, err := d.mediaManager.ProcessMedia(ctx, data, targetAccount.ID, targetAccount.AvatarRemoteURL)
+		avatar := true
+		processingMedia, err := d.mediaManager.ProcessMedia(ctx, data, targetAccount.ID, &media.AdditionalInfo{
+			RemoteURL: &targetAccount.AvatarRemoteURL,
+			Avatar: &avatar,
+		})
 		if err != nil {
 			return err
 		}
 
-		if err := media.SetAsAvatar(ctx); err != nil {
+		targetAccount.AvatarMediaAttachmentID = processingMedia.AttachmentID()
-			return err
-		}
-
-		targetAccount.AvatarMediaAttachmentID = media.AttachmentID()
 	}
 
 	if targetAccount.HeaderRemoteURL != "" && (targetAccount.HeaderMediaAttachmentID == "" || refresh) {
@@ -279,16 +280,16 @@ func (d *deref) fetchHeaderAndAviForAccount(ctx context.Context, targetAccount *
 			return err
 		}
 
-		media, err := d.mediaManager.ProcessMedia(ctx, data, targetAccount.ID, targetAccount.HeaderRemoteURL)
+		header := true
+		processingMedia, err := d.mediaManager.ProcessMedia(ctx, data, targetAccount.ID, &media.AdditionalInfo{
+			RemoteURL: &targetAccount.HeaderRemoteURL,
+			Header: &header,
+		})
 		if err != nil {
 			return err
 		}
 
-		if err := media.SetAsHeader(ctx); err != nil {
+		targetAccount.HeaderMediaAttachmentID = processingMedia.AttachmentID()
-			return err
-		}
-
-		targetAccount.HeaderMediaAttachmentID = media.AttachmentID()
 	}
 	return nil
 }

internal/federation/dereferencing/dereferencer.go

@@ -41,7 +41,7 @@ type Dereferencer interface {
 
 	GetRemoteInstance(ctx context.Context, username string, remoteInstanceURI *url.URL) (*gtsmodel.Instance, error)
 
-	GetRemoteMedia(ctx context.Context, requestingUsername string, accountID string, remoteURL string) (*media.Media, error)
+	GetRemoteMedia(ctx context.Context, requestingUsername string, accountID string, remoteURL string, ai *media.AdditionalInfo) (*media.Media, error)
 
 	DereferenceAnnounce(ctx context.Context, announce *gtsmodel.Status, requestingUsername string) error
 	DereferenceThread(ctx context.Context, username string, statusIRI *url.URL) error

internal/federation/dereferencing/media.go

@@ -26,7 +26,7 @@ import (
 	"github.com/superseriousbusiness/gotosocial/internal/media"
 )
 
-func (d *deref) GetRemoteMedia(ctx context.Context, requestingUsername string, accountID string, remoteURL string) (*media.Media, error) {
+func (d *deref) GetRemoteMedia(ctx context.Context, requestingUsername string, accountID string, remoteURL string, ai *media.AdditionalInfo) (*media.Media, error) {
 	if accountID == "" {
 		return nil, fmt.Errorf("RefreshAttachment: minAttachment account ID was empty")
 	}
@@ -46,7 +46,7 @@ func (d *deref) GetRemoteMedia(ctx context.Context, requestingUsername string, a
 		return nil, fmt.Errorf("RefreshAttachment: error dereferencing media: %s", err)
 	}
 
-	m, err := d.mediaManager.ProcessMedia(ctx, data, accountID, remoteURL)
+	m, err := d.mediaManager.ProcessMedia(ctx, data, accountID, ai)
 	if err != nil {
 		return nil, fmt.Errorf("RefreshAttachment: error processing attachment: %s", err)
 	}

internal/federation/dereferencing/media_test.go

@@ -24,6 +24,7 @@ import (
 
 	"github.com/stretchr/testify/suite"
 	"github.com/superseriousbusiness/gotosocial/internal/gtsmodel"
+	"github.com/superseriousbusiness/gotosocial/internal/media"
 )
 
 type AttachmentTestSuite struct {
@@ -40,8 +41,14 @@ func (suite *AttachmentTestSuite) TestDereferenceAttachmentOK() {
 	attachmentContentType := "image/jpeg"
 	attachmentURL := "https://s3-us-west-2.amazonaws.com/plushcity/media_attachments/files/106/867/380/219/163/828/original/88e8758c5f011439.jpg"
 	attachmentDescription := "It's a cute plushie."
+	attachmentBlurhash := "LwP?p=aK_4%N%MRjWXt7%hozM_a}"
 
-	media, err := suite.dereferencer.GetRemoteMedia(ctx, fetchingAccount.Username, attachmentOwner, attachmentURL)
+	media, err := suite.dereferencer.GetRemoteMedia(ctx, fetchingAccount.Username, attachmentOwner, attachmentURL, &media.AdditionalInfo{
+		StatusID:    &attachmentStatus,
+		RemoteURL:   &attachmentURL,
+		Description: &attachmentDescription,
+		Blurhash:    &attachmentBlurhash,
+	})
 	suite.NoError(err)
 
 	attachment, err := media.LoadAttachment(ctx)
@@ -61,7 +68,7 @@ func (suite *AttachmentTestSuite) TestDereferenceAttachmentOK() {
 	suite.Equal(2071680, attachment.FileMeta.Original.Size)
 	suite.Equal(1245, attachment.FileMeta.Original.Height)
 	suite.Equal(1664, attachment.FileMeta.Original.Width)
-	suite.Equal("LwP?p=aK_4%N%MRjWXt7%hozM_a}", attachment.Blurhash)
+	suite.Equal(attachmentBlurhash, attachment.Blurhash)
 	suite.Equal(gtsmodel.ProcessingStatusProcessed, attachment.Processing)
 	suite.NotEmpty(attachment.File.Path)
 	suite.Equal(attachmentContentType, attachment.File.ContentType)
@@ -87,7 +94,7 @@ func (suite *AttachmentTestSuite) TestDereferenceAttachmentOK() {
 	suite.Equal(2071680, dbAttachment.FileMeta.Original.Size)
 	suite.Equal(1245, dbAttachment.FileMeta.Original.Height)
 	suite.Equal(1664, dbAttachment.FileMeta.Original.Width)
-	suite.Equal("LwP?p=aK_4%N%MRjWXt7%hozM_a}", dbAttachment.Blurhash)
+	suite.Equal(attachmentBlurhash, dbAttachment.Blurhash)
 	suite.Equal(gtsmodel.ProcessingStatusProcessed, dbAttachment.Processing)
 	suite.NotEmpty(dbAttachment.File.Path)
 	suite.Equal(attachmentContentType, dbAttachment.File.ContentType)

internal/federation/dereferencing/status.go

@@ -32,6 +32,7 @@ import (
 	"github.com/superseriousbusiness/gotosocial/internal/ap"
 	"github.com/superseriousbusiness/gotosocial/internal/gtsmodel"
 	"github.com/superseriousbusiness/gotosocial/internal/id"
+	"github.com/superseriousbusiness/gotosocial/internal/media"
 )
 
 // EnrichRemoteStatus takes a status that's already been inserted into the database in a minimal form,
@@ -393,7 +394,13 @@ func (d *deref) populateStatusAttachments(ctx context.Context, status *gtsmodel.
 		a.AccountID = status.AccountID
 		a.StatusID = status.ID
 
-		media, err := d.GetRemoteMedia(ctx, requestingUsername, a.AccountID, a.RemoteURL)
+		media, err := d.GetRemoteMedia(ctx, requestingUsername, a.AccountID, a.RemoteURL, &media.AdditionalInfo{
+			CreatedAt:   &a.CreatedAt,
+			StatusID:    &a.StatusID,
+			RemoteURL:   &a.RemoteURL,
+			Description: &a.Description,
+			Blurhash:    &a.Blurhash,
+		})
 		if err != nil {
 			logrus.Errorf("populateStatusAttachments: couldn't get remote media %s: %s", a.RemoteURL, err)
 			continue

internal/media/image.go

@@ -108,7 +108,7 @@ func decodeImage(b []byte, contentType string) (*ImageMeta, error) {
 //
 // Note that the aspect ratio of the image will be retained,
 // so it will not necessarily be a square, even if x and y are set as the same value.
-func deriveThumbnail(b []byte, contentType string) (*ImageMeta, error) {
+func deriveThumbnail(b []byte, contentType string, createBlurhash bool) (*ImageMeta, error) {
 	var i image.Image
 	var err error
 
@@ -138,11 +138,21 @@ func deriveThumbnail(b []byte, contentType string) (*ImageMeta, error) {
 	size := width * height
 	aspect := float64(width) / float64(height)
 
+	im := &ImageMeta{
+		width:  width,
+		height: height,
+		size:   size,
+		aspect: aspect,
+	}
+
+	if createBlurhash {
 		tiny := resize.Thumbnail(32, 32, thumb, resize.NearestNeighbor)
 		bh, err := blurhash.Encode(4, 3, tiny)
 		if err != nil {
 			return nil, err
 		}
+		im.blurhash = bh
+	}
 
 	out := &bytes.Buffer{}
 	if err := jpeg.Encode(out, thumb, &jpeg.Options{
@@ -150,14 +160,10 @@ func deriveThumbnail(b []byte, contentType string) (*ImageMeta, error) {
 	}); err != nil {
 		return nil, err
 	}
-	return &ImageMeta{
+
-		image:    out.Bytes(),
+	im.image = out.Bytes()
-		width:    width,
+
-		height:   height,
+	return im, nil
-		size:     size,
-		aspect:   aspect,
-		blurhash: bh,
-	}, nil
 }
 
 // deriveStaticEmojji takes a given gif or png of an emoji, decodes it, and re-encodes it as a static png.

internal/media/manager.go

@@ -45,9 +45,9 @@ type Manager interface {
 	//
 	// RemoteURL is optional, and can be an empty string. Setting this to a non-empty string indicates that
 	// the piece of media originated on a remote instance and has been dereferenced to be cached locally.
-	ProcessMedia(ctx context.Context, data []byte, accountID string, remoteURL string) (*Media, error)
+	ProcessMedia(ctx context.Context, data []byte, accountID string, ai *AdditionalInfo) (*Media, error)
 
-	ProcessEmoji(ctx context.Context, data []byte, accountID string, remoteURL string) (*Media, error)
+	ProcessEmoji(ctx context.Context, data []byte, accountID string) (*Media, error)
 }
 
 type manager struct {
@@ -80,7 +80,7 @@ func New(database db.DB, storage *kv.KVStore) (Manager, error) {
 	INTERFACE FUNCTIONS
 */
 
-func (m *manager) ProcessMedia(ctx context.Context, data []byte, accountID string, remoteURL string) (*Media, error) {
+func (m *manager) ProcessMedia(ctx context.Context, data []byte, accountID string, ai *AdditionalInfo) (*Media, error) {
 	contentType, err := parseContentType(data)
 	if err != nil {
 		return nil, err
@@ -95,7 +95,7 @@ func (m *manager) ProcessMedia(ctx context.Context, data []byte, accountID strin
 
 	switch mainType {
 	case mimeImage:
-		media, err := m.preProcessImage(ctx, data, contentType, accountID, remoteURL)
+		media, err := m.preProcessImage(ctx, data, contentType, accountID, ai)
 		if err != nil {
 			return nil, err
 		}
@@ -117,12 +117,12 @@ func (m *manager) ProcessMedia(ctx context.Context, data []byte, accountID strin
 	}
 }
 
-func (m *manager) ProcessEmoji(ctx context.Context, data []byte, accountID string, remoteURL string) (*Media, error)  {
+func (m *manager) ProcessEmoji(ctx context.Context, data []byte, accountID string) (*Media, error) {
 	return nil, nil
 }
 
 // preProcessImage initializes processing
-func (m *manager) preProcessImage(ctx context.Context, data []byte, contentType string, accountID string, remoteURL string) (*Media, error) {
+func (m *manager) preProcessImage(ctx context.Context, data []byte, contentType string, accountID string, ai *AdditionalInfo) (*Media, error) {
 	if !supportedImage(contentType) {
 		return nil, fmt.Errorf("image type %s not supported", contentType)
 	}
@@ -140,11 +140,22 @@ func (m *manager) preProcessImage(ctx context.Context, data []byte, contentType
 
 	attachment := &gtsmodel.MediaAttachment{
 		ID:        id,
+		CreatedAt: time.Now(),
 		UpdatedAt: time.Now(),
+		StatusID:  "",
 		URL:       uris.GenerateURIForAttachment(accountID, string(TypeAttachment), string(SizeOriginal), id, extension),
-		RemoteURL:  remoteURL,
+		RemoteURL: "",
 		Type:      gtsmodel.FileTypeImage,
+		FileMeta: gtsmodel.FileMeta{
+			Focus: gtsmodel.Focus{
+				X: 0,
+				Y: 0,
+			},
+		},
 		AccountID:         accountID,
+		Description:       "",
+		ScheduledStatusID: "",
+		Blurhash:          "",
 		Processing:        0,
 		File: gtsmodel.File{
 			Path:        fmt.Sprintf("%s/%s/%s/%s.%s", accountID, TypeAttachment, SizeOriginal, id, extension),
@@ -161,6 +172,49 @@ func (m *manager) preProcessImage(ctx context.Context, data []byte, contentType
 		Header: false,
 	}
 
+	// check if we have additional info to add to the attachment
+	if ai != nil {
+		if ai.CreatedAt != nil {
+			attachment.CreatedAt = *ai.CreatedAt
+		}
+
+		if ai.StatusID != nil {
+			attachment.StatusID = *ai.StatusID
+		}
+
+		if ai.RemoteURL != nil {
+			attachment.RemoteURL = *ai.RemoteURL
+		}
+
+		if ai.Description != nil {
+			attachment.Description = *ai.Description
+		}
+
+		if ai.ScheduledStatusID != nil {
+			attachment.ScheduledStatusID = *ai.ScheduledStatusID
+		}
+
+		if ai.Blurhash != nil {
+			attachment.Blurhash = *ai.Blurhash
+		}
+
+		if ai.Avatar != nil {
+			attachment.Avatar = *ai.Avatar
+		}
+
+		if ai.Header != nil {
+			attachment.Header = *ai.Header
+		}
+
+		if ai.FocusX != nil {
+			attachment.FileMeta.Focus.X = *ai.FocusX
+		}
+
+		if ai.FocusY != nil {
+			attachment.FileMeta.Focus.Y = *ai.FocusY
+		}
+	}
+
 	media := &Media{
 		attachment:    attachment,
 		rawData:       data,

internal/media/manager_test.go

@@ -1,4 +1,54 @@
+/*
+   GoToSocial
+   Copyright (C) 2021-2022 GoToSocial Authors admin@gotosocial.org
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU Affero General Public License as published by
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU Affero General Public License for more details.
+
+   You should have received a copy of the GNU Affero General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
 package media_test
 
+import (
+	"codeberg.org/gruf/go-store/kv"
+	"github.com/stretchr/testify/suite"
+	"github.com/superseriousbusiness/gotosocial/internal/db"
+	"github.com/superseriousbusiness/gotosocial/internal/media"
+	"github.com/superseriousbusiness/gotosocial/testrig"
+)
 
+type MediaManagerStandardTestSuite struct {
+	suite.Suite
 
+	db      db.DB
+	storage *kv.KVStore
+	manager media.Manager
+}
+
+func (suite *MediaManagerStandardTestSuite) SetupSuite() {
+	testrig.InitTestLog()
+	testrig.InitTestConfig()
+
+	suite.db = testrig.NewTestDB()
+	suite.storage = testrig.NewTestStorage()
+}
+
+func (suite *MediaManagerStandardTestSuite) SetupTest() {
+	testrig.StandardStorageSetup(suite.storage, "../../testrig/media")
+	testrig.StandardDBSetup(suite.db, nil)
+	suite.manager = testrig.NewTestMediaManager(suite.db, suite.storage)
+}
+
+func (suite *MediaManagerStandardTestSuite) TearDownTest() {
+	testrig.StandardDBTeardown(suite.db)
+	testrig.StandardStorageTeardown(suite.storage)
+}

internal/media/media.go

@@ -47,6 +47,7 @@ type Media struct {
 
 	attachment *gtsmodel.MediaAttachment // will only be set if the media is an attachment
 	emoji      *gtsmodel.Emoji           // will only be set if the media is an emoji
+
 	rawData []byte
 
 	/*
@@ -81,7 +82,15 @@ func (m *Media) Thumb(ctx context.Context) (*ImageMeta, error) {
 	switch m.thumbstate {
 	case received:
 		// we haven't processed a thumbnail for this media yet so do it now
-		thumb, err := deriveThumbnail(m.rawData, m.attachment.File.ContentType)
+
+		// check if we need to create a blurhash or if there's already one set
+		var createBlurhash bool
+		if m.attachment.Blurhash == "" {
+			// no blurhash created yet
+			createBlurhash = true
+		}
+
+		thumb, err := deriveThumbnail(m.rawData, m.attachment.File.ContentType, createBlurhash)
 		if err != nil {
 			m.err = fmt.Errorf("error deriving thumbnail: %s", err)
 			m.thumbstate = errored
@@ -96,7 +105,10 @@ func (m *Media) Thumb(ctx context.Context) (*ImageMeta, error) {
 		}
 
 		// set appropriate fields on the attachment based on the thumbnail we derived
+		if createBlurhash {
 			m.attachment.Blurhash = thumb.blurhash
+		}
+
 		m.attachment.FileMeta.Small = gtsmodel.Small{
 			Width:  thumb.width,
 			Height: thumb.height,
@@ -105,7 +117,6 @@ func (m *Media) Thumb(ctx context.Context) (*ImageMeta, error) {
 		}
 		m.attachment.Thumbnail.FileSize = thumb.size
 
-		// put or update the attachment in the database
 		if err := putOrUpdateAttachment(ctx, m.database, m.attachment); err != nil {
 			m.err = err
 			m.thumbstate = errored
@@ -177,8 +188,8 @@ func (m *Media) FullSize(ctx context.Context) (*ImageMeta, error) {
 		}
 		m.attachment.File.FileSize = decoded.size
 		m.attachment.File.UpdatedAt = time.Now()
+		m.attachment.Processing = gtsmodel.ProcessingStatusProcessed
 
-		// put or update the attachment in the database
 		if err := putOrUpdateAttachment(ctx, m.database, m.attachment); err != nil {
 			m.err = err
 			m.fullSizeState = errored
@@ -200,30 +211,6 @@ func (m *Media) FullSize(ctx context.Context) (*ImageMeta, error) {
 	return nil, fmt.Errorf("full size processing status %d unknown", m.fullSizeState)
 }
 
-func (m *Media) SetAsAvatar(ctx context.Context) error {
-	m.mu.Lock()
-	defer m.mu.Unlock()
-
-	m.attachment.Avatar = true
-	return putOrUpdateAttachment(ctx, m.database, m.attachment)
-}
-
-func (m *Media) SetAsHeader(ctx context.Context) error {
-	m.mu.Lock()
-	defer m.mu.Unlock()
-
-	m.attachment.Header = true
-	return putOrUpdateAttachment(ctx, m.database, m.attachment)
-}
-
-func (m *Media) SetStatusID(ctx context.Context, statusID string) error {
-	m.mu.Lock()
-	defer m.mu.Unlock()
-
-	m.attachment.StatusID = statusID
-	return putOrUpdateAttachment(ctx, m.database, m.attachment)
-}
-
 // AttachmentID returns the ID of the underlying media attachment without blocking processing.
 func (m *Media) AttachmentID() string {
 	return m.attachment.ID
@@ -237,8 +224,8 @@ func (m *Media) preLoad(ctx context.Context) {
 	go m.FullSize(ctx)
 }
 
-// Load is the blocking equivalent of pre-load. It makes sure the thumbnail and full-size image
+// Load is the blocking equivalent of pre-load. It makes sure the thumbnail and full-size
-// have been processed, then it returns the full-size image.
+// image have been processed, then it returns the completed attachment.
 func (m *Media) LoadAttachment(ctx context.Context) (*gtsmodel.MediaAttachment, error) {
 	if _, err := m.Thumb(ctx); err != nil {
 		return nil, err
@@ -255,6 +242,8 @@ func (m *Media) LoadEmoji(ctx context.Context) (*gtsmodel.Emoji, error) {
 	return nil, nil
 }
 
+// putOrUpdateAttachment is just a convenience function for first trying to PUT the attachment in the database,
+// and then if that doesn't work because the attachment already exists, updating it instead.
 func putOrUpdateAttachment(ctx context.Context, database db.DB, attachment *gtsmodel.MediaAttachment) error {
 	if err := database.Put(ctx, attachment); err != nil {
 		if err != db.ErrAlreadyExists {

internal/media/media_test.go

@@ -1,65 +0,0 @@
-/*
-   GoToSocial
-   Copyright (C) 2021-2022 GoToSocial Authors admin@gotosocial.org
-
-   This program is free software: you can redistribute it and/or modify
-   it under the terms of the GNU Affero General Public License as published by
-   the Free Software Foundation, either version 3 of the License, or
-   (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU Affero General Public License for more details.
-
-   You should have received a copy of the GNU Affero General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-package media_test
-
-import (
-	"testing"
-
-	"codeberg.org/gruf/go-store/kv"
-	"github.com/stretchr/testify/suite"
-	"github.com/superseriousbusiness/gotosocial/internal/db"
-	"github.com/superseriousbusiness/gotosocial/internal/media"
-	"github.com/superseriousbusiness/gotosocial/testrig"
-)
-
-type MediaStandardTestSuite struct {
-	suite.Suite
-
-	db      db.DB
-	storage *kv.KVStore
-	manager media.Manager
-}
-
-func (suite *MediaStandardTestSuite) SetupSuite() {
-	testrig.InitTestLog()
-	testrig.InitTestConfig()
-
-	suite.db = testrig.NewTestDB()
-	suite.storage = testrig.NewTestStorage()
-}
-
-func (suite *MediaStandardTestSuite) SetupTest() {
-	testrig.StandardStorageSetup(suite.storage, "../../testrig/media")
-	testrig.StandardDBSetup(suite.db, nil)
-
-	m, err := media.New(suite.db, suite.storage)
-	if err != nil {
-		panic(err)
-	}
-	suite.manager = m
-}
-
-func (suite *MediaStandardTestSuite) TearDownTest() {
-	testrig.StandardDBTeardown(suite.db)
-	testrig.StandardStorageTeardown(suite.storage)
-}
-
-func TestMediaStandardTestSuite(t *testing.T) {
-	suite.Run(t, &MediaStandardTestSuite{})
-}

internal/media/types.go

@@ -22,6 +22,7 @@ import (
 	"bytes"
 	"errors"
 	"fmt"
+	"time"
 
 	"github.com/h2non/filetype"
 )
@@ -67,6 +68,31 @@ const (
 	TypeEmoji      Type = "emoji"      // TypeEmoji is the key for emoji type requests
 )
 
+// AdditionalInfo represents additional information that should be added to an attachment
+// when processing a piece of media.
+type AdditionalInfo struct {
+	// Time that this media was created; defaults to time.Now().
+	CreatedAt *time.Time
+	// ID of the status to which this media is attached; defaults to "".
+	StatusID *string
+	// URL of the media on a remote instance; defaults to "".
+	RemoteURL *string
+	// Image description of this media; defaults to "".
+	Description *string
+	// Blurhash of this media; defaults to "".
+	Blurhash *string
+	// ID of the scheduled status to which this media is attached; defaults to "".
+	ScheduledStatusID *string
+	// Mark this media as in-use as an avatar; defaults to false.
+	Avatar *bool
+	// Mark this media as in-use as a header; defaults to false.
+	Header *bool
+	// X focus coordinate for this media; defaults to 0.
+	FocusX *float32
+	// Y focus coordinate for this media; defaults to 0.
+	FocusY *float32
+}
+
 // parseContentType parses the MIME content type from a file, returning it as a string in the form (eg., "image/jpeg").
 // Returns an error if the content type is not something we can process.
 func parseContentType(content []byte) (string, error) {

internal/processing/account/update.go

@@ -33,6 +33,7 @@ import (
 	apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model"
 	"github.com/superseriousbusiness/gotosocial/internal/config"
 	"github.com/superseriousbusiness/gotosocial/internal/gtsmodel"
+	"github.com/superseriousbusiness/gotosocial/internal/media"
 	"github.com/superseriousbusiness/gotosocial/internal/messages"
 	"github.com/superseriousbusiness/gotosocial/internal/text"
 	"github.com/superseriousbusiness/gotosocial/internal/util"
@@ -163,16 +164,15 @@ func (p *processor) UpdateAvatar(ctx context.Context, avatar *multipart.FileHead
 	}
 
 	// do the setting
-	media, err := p.mediaManager.ProcessMedia(ctx, buf.Bytes(), accountID, "")
+	isAvatar := true
+	processingMedia, err := p.mediaManager.ProcessMedia(ctx, buf.Bytes(), accountID, &media.AdditionalInfo{
+		Avatar: &isAvatar,
+	})
 	if err != nil {
 		return nil, fmt.Errorf("UpdateAvatar: error processing avatar: %s", err)
 	}
 
-	if err := media.SetAsAvatar(ctx); err != nil {
+	return processingMedia.LoadAttachment(ctx)
-		return nil, fmt.Errorf("UpdateAvatar: error setting media as avatar: %s", err)
-	}
-
-	return media.LoadAttachment(ctx)
 }
 
 // UpdateHeader does the dirty work of checking the header part of an account update form,
@@ -206,16 +206,15 @@ func (p *processor) UpdateHeader(ctx context.Context, header *multipart.FileHead
 	}
 
 	// do the setting
-	media, err := p.mediaManager.ProcessMedia(ctx, buf.Bytes(), accountID, "")
+	isHeader := true
+	processingMedia, err := p.mediaManager.ProcessMedia(ctx, buf.Bytes(), accountID, &media.AdditionalInfo{
+		Header: &isHeader,
+	})
 	if err != nil {
 		return nil, fmt.Errorf("UpdateHeader: error processing header: %s", err)
 	}
 
-	if err := media.SetAsHeader(ctx); err != nil {
+	return processingMedia.LoadAttachment(ctx)
-		return nil, fmt.Errorf("UpdateHeader: error setting media as header: %s", err)
-	}
-
-	return media.LoadAttachment(ctx)
 }
 
 func (p *processor) processNote(ctx context.Context, note string, accountID string) (string, error) {

internal/processing/admin/emoji.go

@@ -48,7 +48,7 @@ func (p *processor) EmojiCreate(ctx context.Context, account *gtsmodel.Account,
 		return nil, errors.New("could not read provided emoji: size 0 bytes")
 	}
 
-	media, err := p.mediaManager.ProcessEmoji(ctx, buf.Bytes(), account.ID, "")
+	media, err := p.mediaManager.ProcessEmoji(ctx, buf.Bytes(), account.ID)
 	if err != nil {
 		return nil, err
 	}

internal/processing/media/create.go

@@ -27,6 +27,7 @@ import (
 
 	apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model"
 	"github.com/superseriousbusiness/gotosocial/internal/gtsmodel"
+	"github.com/superseriousbusiness/gotosocial/internal/media"
 )
 
 func (p *processor) Create(ctx context.Context, account *gtsmodel.Account, form *apimodel.AttachmentRequest) (*apimodel.Attachment, error) {
@@ -44,8 +45,17 @@ func (p *processor) Create(ctx context.Context, account *gtsmodel.Account, form
 		return nil, errors.New("could not read provided attachment: size 0 bytes")
 	}
 
+	focusX, focusY, err := parseFocus(form.Focus)
+	if err != nil {
+		return nil, fmt.Errorf("could not parse focus value %s: %s", form.Focus, err)
+	}
+
 	// process the media attachment and load it immediately
-	media, err := p.mediaManager.ProcessMedia(ctx, buf.Bytes(), account.ID, "")
+	media, err := p.mediaManager.ProcessMedia(ctx, buf.Bytes(), account.ID, &media.AdditionalInfo{
+		Description: &form.Description,
+		FocusX:      &focusX,
+		FocusY:      &focusY,
+	})
 	if err != nil {
 		return nil, err
 	}