From 1d999712e6902414bbac30db8a5603758c5c539c Mon Sep 17 00:00:00 2001 From: kim <89579420+NyaaaWhatsUpDoc@users.noreply.github.com> Date: Thu, 29 Sep 2022 21:50:43 +0100 Subject: [feature] update config types to use bytesize.Size (#828) * update config size types to use bytesize.Size * submit unchecked-out file ... :facepalm: * fix bytesize config var decoding * bump bytesize version * update kim's libraries in readme * update envparse.sh to output more useful errors * improve envparse.sh * remove reliance on jq * instead, use uint64 for bytesize flag types * remove redundant type * fix viper unmarshaling * Update envparsing.sh * fix envparsing test Signed-off-by: kim Co-authored-by: tobi <31960611+tsmethurst@users.noreply.github.com> --- internal/processing/account/update.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'internal/processing/account') diff --git a/internal/processing/account/update.go b/internal/processing/account/update.go index eddaeab27..94e91ca4c 100644 --- a/internal/processing/account/update.go +++ b/internal/processing/account/update.go @@ -184,13 +184,13 @@ func (p *processor) Update(ctx context.Context, account *gtsmodel.Account, form // the account's new avatar image. func (p *processor) UpdateAvatar(ctx context.Context, avatar *multipart.FileHeader, accountID string) (*gtsmodel.MediaAttachment, error) { maxImageSize := config.GetMediaImageMaxSize() - if int(avatar.Size) > maxImageSize { + if avatar.Size > int64(maxImageSize) { return nil, fmt.Errorf("UpdateAvatar: avatar with size %d exceeded max image size of %d bytes", avatar.Size, maxImageSize) } - dataFunc := func(innerCtx context.Context) (io.Reader, int, error) { + dataFunc := func(innerCtx context.Context) (io.Reader, int64, error) { f, err := avatar.Open() - return f, int(avatar.Size), err + return f, avatar.Size, err } isAvatar := true @@ -211,13 +211,13 @@ func (p *processor) UpdateAvatar(ctx context.Context, avatar *multipart.FileHead // the account's new header image. func (p *processor) UpdateHeader(ctx context.Context, header *multipart.FileHeader, accountID string) (*gtsmodel.MediaAttachment, error) { maxImageSize := config.GetMediaImageMaxSize() - if int(header.Size) > maxImageSize { + if header.Size > int64(maxImageSize) { return nil, fmt.Errorf("UpdateHeader: header with size %d exceeded max image size of %d bytes", header.Size, maxImageSize) } - dataFunc := func(innerCtx context.Context) (io.Reader, int, error) { + dataFunc := func(innerCtx context.Context) (io.Reader, int64, error) { f, err := header.Open() - return f, int(header.Size), err + return f, header.Size, err } isHeader := true -- cgit v1.2.3