summaryrefslogtreecommitdiff
path: root/internal/processing/admin/emoji.go
diff options
context:
space:
mode:
authorLibravatar tsmethurst <tobi.smethurst@protonmail.com>2022-01-16 18:52:55 +0100
committerLibravatar tsmethurst <tobi.smethurst@protonmail.com>2022-01-16 18:52:55 +0100
commit589bb9df0275457b5f9c3790e67517ec1be1745d (patch)
tree8b15a4a457bb7ac1d4b209e5cb930cb4ec315ca8 /internal/processing/admin/emoji.go
parentupdate dependencies (diff)
downloadgotosocial-589bb9df0275457b5f9c3790e67517ec1be1745d.tar.xz
pass reader around instead of []byte
Diffstat (limited to 'internal/processing/admin/emoji.go')
-rw-r--r--internal/processing/admin/emoji.go20
1 files changed, 2 insertions, 18 deletions
diff --git a/internal/processing/admin/emoji.go b/internal/processing/admin/emoji.go
index fcc17c4be..e0068858b 100644
--- a/internal/processing/admin/emoji.go
+++ b/internal/processing/admin/emoji.go
@@ -19,9 +19,7 @@
package admin
import (
- "bytes"
"context"
- "errors"
"fmt"
"io"
@@ -38,22 +36,8 @@ func (p *processor) EmojiCreate(ctx context.Context, account *gtsmodel.Account,
return nil, gtserror.NewErrorNotAuthorized(fmt.Errorf("user %s not an admin", user.ID), "user is not an admin")
}
- 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()
+ data := func(innerCtx context.Context) (io.Reader, error) {
+ return form.Image.Open()
}
emojiID, err := id.NewRandomULID()