pass a function into the manager, start work on emoji

3 files changed, 85 insertions, 75 deletions

diff --git a/internal/processing/account/update.go b/internal/processing/account/update.go
index 6d15b5afb..7b305dc95 100644
--- a/internal/processing/account/update.go
+++ b/internal/processing/account/update.go
@@ -137,84 +137,87 @@ func (p *processor) Update(ctx context.Context, account *gtsmodel.Account, form
 // parsing and checking the image, and doing the necessary updates in the database for this to become
 // the account's new avatar image.
 func (p *processor) UpdateAvatar(ctx context.Context, avatar *multipart.FileHeader, accountID string) (*gtsmodel.MediaAttachment, error) {
-	var err error
 	maxImageSize := viper.GetInt(config.Keys.MediaImageMaxSize)
 	if int(avatar.Size) > maxImageSize {
-		err = fmt.Errorf("UpdateAvatar: avatar with size %d exceeded max image size of %d bytes", avatar.Size, maxImageSize)
-		return nil, err
-	}
-	f, err := avatar.Open()
-	if err != nil {
-		return nil, fmt.Errorf("UpdateAvatar: could not read provided avatar: %s", err)
+		return nil, fmt.Errorf("UpdateAvatar: avatar with size %d exceeded max image size of %d bytes", avatar.Size, maxImageSize)
 	}
 
-	// extract the bytes
-	buf := new(bytes.Buffer)
-	size, err := io.Copy(buf, f)
-	if err != nil {
-		return nil, fmt.Errorf("UpdateAvatar: could not read provided avatar: %s", err)
-	}
-	if size == 0 {
-		return nil, errors.New("UpdateAvatar: could not read provided avatar: size 0 bytes")
-	}
+	dataFunc := func(ctx context.Context) ([]byte, error) {
+		// pop open the fileheader
+		f, err := avatar.Open()
+		if err != nil {
+			return nil, fmt.Errorf("UpdateAvatar: could not read provided avatar: %s", err)
+		}
 
-	// we're done with the FileHeader now
-	if err := f.Close(); err != nil {
-		return nil, fmt.Errorf("UpdateAvatar: error closing multipart fileheader: %s", err)
+		// extract the bytes
+		buf := new(bytes.Buffer)
+		size, err := io.Copy(buf, f)
+		if err != nil {
+			return nil, fmt.Errorf("UpdateAvatar: could not read provided avatar: %s", err)
+		}
+		if size == 0 {
+			return nil, errors.New("UpdateAvatar: could not read provided avatar: size 0 bytes")
+		}
+
+		return buf.Bytes(), f.Close()
 	}
 
-	// do the setting
 	isAvatar := true
-	processingMedia, err := p.mediaManager.ProcessMedia(ctx, buf.Bytes(), accountID, &media.AdditionalInfo{
+	ai := &media.AdditionalMediaInfo{
 		Avatar: &isAvatar,
-	})
+	}
+
+	processingMedia, err := p.mediaManager.ProcessMedia(ctx, dataFunc, accountID, ai)
 	if err != nil {
 		return nil, fmt.Errorf("UpdateAvatar: error processing avatar: %s", err)
 	}
 
-	return processingMedia.Load(ctx)
+	return processingMedia.LoadAttachment(ctx)
 }
 
 // UpdateHeader does the dirty work of checking the header part of an account update form,
 // parsing and checking the image, and doing the necessary updates in the database for this to become
 // the account's new header image.
 func (p *processor) UpdateHeader(ctx context.Context, header *multipart.FileHeader, accountID string) (*gtsmodel.MediaAttachment, error) {
-	var err error
 	maxImageSize := viper.GetInt(config.Keys.MediaImageMaxSize)
 	if int(header.Size) > maxImageSize {
-		err = fmt.Errorf("UpdateHeader: header with size %d exceeded max image size of %d bytes", header.Size, maxImageSize)
-		return nil, err
-	}
-	f, err := header.Open()
-	if err != nil {
-		return nil, fmt.Errorf("UpdateHeader: could not read provided header: %s", err)
+		return nil, fmt.Errorf("UpdateHeader: header with size %d exceeded max image size of %d bytes", header.Size, maxImageSize)
 	}
 
-	// extract the bytes
-	buf := new(bytes.Buffer)
-	size, err := io.Copy(buf, f)
-	if err != nil {
-		return nil, fmt.Errorf("UpdateHeader: could not read provided header: %s", err)
-	}
-	if size == 0 {
-		return nil, errors.New("UpdateHeader: could not read provided header: size 0 bytes")
-	}
+	dataFunc := func(ctx context.Context) ([]byte, error) {
+		// pop open the fileheader
+		f, err := header.Open()
+		if err != nil {
+			return nil, fmt.Errorf("UpdateHeader: could not read provided header: %s", err)
+		}
+
+		// extract the bytes
+		buf := new(bytes.Buffer)
+		size, err := io.Copy(buf, f)
+		if err != nil {
+			return nil, fmt.Errorf("UpdateHeader: could not read provided header: %s", err)
+		}
+		if size == 0 {
+			return nil, errors.New("UpdateHeader: could not read provided header: size 0 bytes")
+		}
 
-	// we're done with the FileHeader now
-	if err := f.Close(); err != nil {
-		return nil, fmt.Errorf("UpdateHeader: error closing multipart fileheader: %s", err)
+		return buf.Bytes(), f.Close()
 	}
 
-	// do the setting
 	isHeader := true
-	processingMedia, err := p.mediaManager.ProcessMedia(ctx, buf.Bytes(), accountID, &media.AdditionalInfo{
+	ai := &media.AdditionalMediaInfo{
 		Header: &isHeader,
-	})
+	}
+
+	processingMedia, err := p.mediaManager.ProcessMedia(ctx, dataFunc, accountID, ai)
+	if err != nil {
+		return nil, fmt.Errorf("UpdateHeader: error processing header: %s", err)
+	}
 	if err != nil {
 		return nil, fmt.Errorf("UpdateHeader: error processing header: %s", err)
 	}
 
-	return processingMedia.Load(ctx)
+	return processingMedia.LoadAttachment(ctx)
 }
 
 func (p *processor) processNote(ctx context.Context, note string, accountID string) (string, error) {
diff --git a/internal/processing/admin/emoji.go b/internal/processing/admin/emoji.go
index 737a4ebe2..8858dbd02 100644
--- a/internal/processing/admin/emoji.go
+++ b/internal/processing/admin/emoji.go
@@ -30,30 +30,34 @@ import (
 )
 
 func (p *processor) EmojiCreate(ctx context.Context, account *gtsmodel.Account, user *gtsmodel.User, form *apimodel.EmojiCreateRequest) (*apimodel.Emoji, error) {
-	if user.Admin {
+	if !user.Admin {
 		return nil, fmt.Errorf("user %s not an admin", user.ID)
 	}
 
-	// open the emoji and extract the bytes from it
-	f, err := form.Image.Open()
-	if err != nil {
-		return nil, fmt.Errorf("error opening emoji: %s", err)
-	}
-	buf := new(bytes.Buffer)
-	size, err := io.Copy(buf, f)
-	if err != nil {
-		return nil, fmt.Errorf("error reading emoji: %s", err)
-	}
-	if size == 0 {
-		return nil, errors.New("could not read provided emoji: size 0 bytes")
+	data := func(innerCtx context.Context) ([]byte, error) {
+		// open the emoji and extract the bytes from it
+		f, err := form.Image.Open()
+		if err != nil {
+			return nil, fmt.Errorf("error opening emoji: %s", err)
+		}
+		buf := new(bytes.Buffer)
+		size, err := io.Copy(buf, f)
+		if err != nil {
+			return nil, fmt.Errorf("error reading emoji: %s", err)
+		}
+		if size == 0 {
+			return nil, errors.New("could not read provided emoji: size 0 bytes")
+		}
+
+		return buf.Bytes(), f.Close()
 	}
 
-	media, err := p.mediaManager.ProcessEmoji(ctx, buf.Bytes(), account.ID)
+	processingEmoji, err := p.mediaManager.ProcessEmoji(ctx, data, form.Shortcode, nil)
 	if err != nil {
 		return nil, err
 	}
 
-	emoji, err := media.LoadEmoji(ctx)
+	emoji, err := processingEmoji.LoadEmoji(ctx)
 	if err != nil {
 		return nil, err
 	}
diff --git a/internal/processing/media/create.go b/internal/processing/media/create.go
index 9df5c7c1f..0896315b1 100644
--- a/internal/processing/media/create.go
+++ b/internal/processing/media/create.go
@@ -31,18 +31,21 @@ import (
 )
 
 func (p *processor) Create(ctx context.Context, account *gtsmodel.Account, form *apimodel.AttachmentRequest) (*apimodel.Attachment, error) {
-	// open the attachment and extract the bytes from it
-	f, err := form.File.Open()
-	if err != nil {
-		return nil, fmt.Errorf("error opening attachment: %s", err)
-	}
-	buf := new(bytes.Buffer)
-	size, err := io.Copy(buf, f)
-	if err != nil {
-		return nil, fmt.Errorf("error reading attachment: %s", err)
-	}
-	if size == 0 {
-		return nil, errors.New("could not read provided attachment: size 0 bytes")
+	data := func(innerCtx context.Context) ([]byte, error) {
+		// open the attachment and extract the bytes from it
+		f, err := form.File.Open()
+		if err != nil {
+			return nil, fmt.Errorf("error opening attachment: %s", err)
+		}
+		buf := new(bytes.Buffer)
+		size, err := io.Copy(buf, f)
+		if err != nil {
+			return nil, fmt.Errorf("error reading attachment: %s", err)
+		}
+		if size == 0 {
+			return nil, errors.New("could not read provided attachment: size 0 bytes")
+		}
+		return buf.Bytes(), f.Close()
 	}
 
 	focusX, focusY, err := parseFocus(form.Focus)
@@ -51,7 +54,7 @@ func (p *processor) Create(ctx context.Context, account *gtsmodel.Account, form
 	}
 
 	// process the media attachment and load it immediately
-	media, err := p.mediaManager.ProcessMedia(ctx, buf.Bytes(), account.ID, &media.AdditionalInfo{
+	media, err := p.mediaManager.ProcessMedia(ctx, data, account.ID, &media.AdditionalMediaInfo{
 		Description: &form.Description,
 		FocusX:      &focusX,
 		FocusY:      &focusY,
@@ -60,7 +63,7 @@ func (p *processor) Create(ctx context.Context, account *gtsmodel.Account, form
 		return nil, err
 	}
 
-	attachment, err := media.Load(ctx)
+	attachment, err := media.LoadAttachment(ctx)
 	if err != nil {
 		return nil, err
 	}