From 25cab0e1f4fdd89512088d0d02c4abd7b4d11773 Mon Sep 17 00:00:00 2001
From: tobi <31960611+tsmethurst@users.noreply.github.com>
Date: Mon, 21 Mar 2022 19:46:51 +0100
Subject: [bugfix] Fix images not being processed correctly sometimes (#437)

* bump exif-terminator to latest version

* add and test giant turnip from turnip.farm

* don't error if content property is nil
---
 internal/media/image.go | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'internal/media/image.go')

diff --git a/internal/media/image.go b/internal/media/image.go
index e5390cee5..4f2db0e95 100644
--- a/internal/media/image.go
+++ b/internal/media/image.go
@@ -125,7 +125,7 @@ func deriveThumbnail(r io.Reader, contentType string, createBlurhash bool) (*ima
 	}
 
 	if err != nil {
-		return nil, err
+		return nil, fmt.Errorf("error decoding image as %s: %s", contentType, err)
 	}
 
 	if i == nil {
@@ -151,7 +151,7 @@ func deriveThumbnail(r io.Reader, contentType string, createBlurhash bool) (*ima
 		tiny := resize.Thumbnail(32, 32, thumb, resize.NearestNeighbor)
 		bh, err := blurhash.Encode(4, 3, tiny)
 		if err != nil {
-			return nil, err
+			return nil, fmt.Errorf("error creating blurhash: %s", err)
 		}
 		im.blurhash = bh
 	}
@@ -161,7 +161,7 @@ func deriveThumbnail(r io.Reader, contentType string, createBlurhash bool) (*ima
 		// Quality isn't extremely important for thumbnails, so 75 is "good enough"
 		Quality: 75,
 	}); err != nil {
-		return nil, err
+		return nil, fmt.Errorf("error encoding thumbnail: %s", err)
 	}
 	im.small = out.Bytes()
 
-- 
cgit v1.2.3