SuperSeriousBusiness/GoToSocial
1
1
Fork 0
mirror of https://github.com/superseriousbusiness/gotosocial synced 2025-06-05 21:59:39 +02:00
Code Issues Projects Releases Wiki Activity

rework data function to provide filesize

Browse Source
This commit is contained in:
tsmethurst
2022-01-23 14:41:58 +01:00
parent 7d024ce74d
commit c157b1b20b
12 changed files with 56 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
internal/processing/account/update.go
View File

@@ -140,8 +140,9 @@ func (p *processor) UpdateAvatar(ctx context.Context, avatar *multipart.FileHead
return nil, fmt.Errorf("UpdateAvatar: avatar with size %d exceeded max image size of %d bytes", avatar.Size, maxImageSize)
}
dataFunc := func(ctx context.Context) (io.Reader, error) {
return avatar.Open()
dataFunc := func(ctx context.Context) (io.Reader, int, error) {
f, err := avatar.Open()
return f, int(avatar.Size), err
}
isAvatar := true
@@ -166,8 +167,9 @@ func (p *processor) UpdateHeader(ctx context.Context, header *multipart.FileHead
return nil, fmt.Errorf("UpdateHeader: header with size %d exceeded max image size of %d bytes", header.Size, maxImageSize)
}
dataFunc := func(ctx context.Context) (io.Reader, error) {
return header.Open()
dataFunc := func(ctx context.Context) (io.Reader, int, error) {
f, err := header.Open()
return f, int(header.Size), err
}
isHeader := true

5
internal/processing/admin/emoji.go
View File

@@ -36,8 +36,9 @@ 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) (io.Reader, error) {
return form.Image.Open()
data := func(innerCtx context.Context) (io.Reader, int, error) {
f, err := form.Image.Open()
return f, int(form.Image.Size), err
}
emojiID, err := id.NewRandomULID()

5
internal/processing/media/create.go
View File

@@ -29,8 +29,9 @@ import (
)
func (p *processor) Create(ctx context.Context, account *gtsmodel.Account, form *apimodel.AttachmentRequest) (*apimodel.Attachment, error) {
data := func(innerCtx context.Context) (io.Reader, error) {
return form.File.Open()
data := func(innerCtx context.Context) (io.Reader, int, error) {
f, err := form.File.Open()
return f, int(form.File.Size), err
}
focusX, focusY, err := parseFocus(form.Focus)