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/federation/dereferencing/account.go | 4 ++-- internal/federation/dereferencing/emoji.go | 2 +- internal/federation/dereferencing/media.go | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'internal/federation') diff --git a/internal/federation/dereferencing/account.go b/internal/federation/dereferencing/account.go index 41a8aa8a9..dfe7693fb 100644 --- a/internal/federation/dereferencing/account.go +++ b/internal/federation/dereferencing/account.go @@ -496,7 +496,7 @@ func (d *deref) fetchRemoteAccountMedia(ctx context.Context, targetAccount *gtsm } } - data := func(innerCtx context.Context) (io.Reader, int, error) { + data := func(innerCtx context.Context) (io.Reader, int64, error) { return t.DereferenceMedia(innerCtx, avatarIRI) } @@ -562,7 +562,7 @@ func (d *deref) fetchRemoteAccountMedia(ctx context.Context, targetAccount *gtsm } } - data := func(innerCtx context.Context) (io.Reader, int, error) { + data := func(innerCtx context.Context) (io.Reader, int64, error) { return t.DereferenceMedia(innerCtx, headerIRI) } diff --git a/internal/federation/dereferencing/emoji.go b/internal/federation/dereferencing/emoji.go index 87d0bd515..622b131c9 100644 --- a/internal/federation/dereferencing/emoji.go +++ b/internal/federation/dereferencing/emoji.go @@ -42,7 +42,7 @@ func (d *deref) GetRemoteEmoji(ctx context.Context, requestingUsername string, r return nil, fmt.Errorf("GetRemoteEmoji: error parsing url: %s", err) } - dataFunc := func(innerCtx context.Context) (io.Reader, int, error) { + dataFunc := func(innerCtx context.Context) (io.Reader, int64, error) { return t.DereferenceMedia(innerCtx, derefURI) } diff --git a/internal/federation/dereferencing/media.go b/internal/federation/dereferencing/media.go index 05fd70589..1b99eaa96 100644 --- a/internal/federation/dereferencing/media.go +++ b/internal/federation/dereferencing/media.go @@ -42,7 +42,7 @@ func (d *deref) GetRemoteMedia(ctx context.Context, requestingUsername string, a return nil, fmt.Errorf("GetRemoteMedia: error parsing url: %s", err) } - dataFunc := func(innerCtx context.Context) (io.Reader, int, error) { + dataFunc := func(innerCtx context.Context) (io.Reader, int64, error) { return t.DereferenceMedia(innerCtx, derefURI) } -- cgit v1.2.3