diff options
| author |  kim <89579420+NyaaaWhatsUpDoc@users.noreply.github.com> | 2022-09-29 21:50:43 +0100 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2022-09-29 21:50:43 +0100 |
| commit | 1d999712e6902414bbac30db8a5603758c5c539c (patch) | |
| tree | 6d4da7aaa8c1e7fc94c5723703f13e5b6d062dfc /internal/processing/media | |
| parent | [chore] Add ipv6 localhost to trusted proxies by default (#868) (diff) | |
| download | gotosocial-1d999712e6902414bbac30db8a5603758c5c539c.tar.xz | |
[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 <grufwub@gmail.com>
Co-authored-by: tobi <31960611+tsmethurst@users.noreply.github.com>
Diffstat (limited to 'internal/processing/media')
| -rw-r--r-- | internal/processing/media/create.go | 4 | ||||
| -rw-r--r-- | internal/processing/media/getfile.go | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/internal/processing/media/create.go b/internal/processing/media/create.go index 1f40ac48f..eb0c251e9 100644 --- a/internal/processing/media/create.go +++ b/internal/processing/media/create.go @@ -30,9 +30,9 @@ import ( ) func (p *processor) Create(ctx context.Context, account *gtsmodel.Account, form *apimodel.AttachmentRequest) (*apimodel.Attachment, gtserror.WithCode) { - data := func(innerCtx context.Context) (io.Reader, int, error) { + data := func(innerCtx context.Context) (io.Reader, int64, error) { f, err := form.File.Open() - return f, int(form.File.Size), err + return f, form.File.Size, err } focusX, focusY, err := parseFocus(form.Focus) diff --git a/internal/processing/media/getfile.go b/internal/processing/media/getfile.go index 7435a241d..104bca770 100644 --- a/internal/processing/media/getfile.go +++ b/internal/processing/media/getfile.go @@ -138,7 +138,7 @@ func (p *processor) getAttachmentContent(ctx context.Context, requestingAccount // if it's the thumbnail that's requested then the user will have to wait a bit while we process the // large version and derive a thumbnail from it, so use the normal recaching procedure: fetch the media, // process it, then return the thumbnail data - data = func(innerCtx context.Context) (io.Reader, int, error) { + data = func(innerCtx context.Context) (io.Reader, int64, error) { transport, err := p.transportController.NewTransportForUsername(innerCtx, requestingUsername) if err != nil { return nil, 0, err @@ -169,7 +169,7 @@ func (p *processor) getAttachmentContent(ctx context.Context, requestingAccount // the caller will read from the buffered reader, so it doesn't matter if they drop out without reading everything attachmentContent.Content = bufferedReader - data = func(innerCtx context.Context) (io.Reader, int, error) { + data = func(innerCtx context.Context) (io.Reader, int64, error) { transport, err := p.transportController.NewTransportForUsername(innerCtx, requestingUsername) if err != nil { return nil, 0, err |