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/media/processingemoji.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'internal/media/processingemoji.go') diff --git a/internal/media/processingemoji.go b/internal/media/processingemoji.go index 7dfe51cb3..6495b991e 100644 --- a/internal/media/processingemoji.go +++ b/internal/media/processingemoji.go @@ -210,11 +210,11 @@ func (p *ProcessingEmoji) store(ctx context.Context) error { // concatenate the first bytes with the existing bytes still in the reader (thanks Mara) readerToStore := io.MultiReader(bytes.NewBuffer(firstBytes), reader) - var maxEmojiSize int + var maxEmojiSize int64 if p.emoji.Domain == "" { - maxEmojiSize = config.GetMediaEmojiLocalMaxSize() + maxEmojiSize = int64(config.GetMediaEmojiLocalMaxSize()) } else { - maxEmojiSize = config.GetMediaEmojiRemoteMaxSize() + maxEmojiSize = int64(config.GetMediaEmojiRemoteMaxSize()) } // if we know the fileSize already, make sure it's not bigger than our limit @@ -241,7 +241,7 @@ func (p *ProcessingEmoji) store(ctx context.Context) error { return fmt.Errorf("store: discovered emoji fileSize (%db) is larger than allowed emojiRemoteMaxSize (%db)", fileSize, maxEmojiSize) } - p.emoji.ImageFileSize = fileSize + p.emoji.ImageFileSize = int(fileSize) p.read = true if p.postData != nil { -- cgit v1.2.3