diff options
| author |  tobi <31960611+tsmethurst@users.noreply.github.com> | 2022-02-21 11:26:26 +0100 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2022-02-21 11:26:26 +0100 |
| commit | 15d1e6b3a130547862a15ad2997bcce0fea45132 (patch) | |
| tree | ef48f3b7d1151be31900bd01afa3b4c1620d56f5 /internal/media | |
| parent | [feature] Gin enable gzip encoding (#405) (diff) | |
| download | gotosocial-15d1e6b3a130547862a15ad2997bcce0fea45132.tar.xz | |
[bugfix] Fix thumbnail image type (#406)
* fix thumbnail content-type
* test fix thumbnail content-type
Diffstat (limited to 'internal/media')
| -rw-r--r-- | internal/media/manager_test.go | 4 | ||||
| -rw-r--r-- | internal/media/processingmedia.go | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/internal/media/manager_test.go b/internal/media/manager_test.go index a9419754c..8443f825e 100644 --- a/internal/media/manager_test.go +++ b/internal/media/manager_test.go @@ -77,6 +77,7 @@ func (suite *ManagerTestSuite) TestSimpleJpegProcessBlocking() { Width: 512, Height: 288, Size: 147456, Aspect: 1.7777777777777777, }, attachment.FileMeta.Small) suite.Equal("image/jpeg", attachment.File.ContentType) + suite.Equal("image/jpeg", attachment.Thumbnail.ContentType) suite.Equal(269739, attachment.File.FileSize) suite.Equal("LjBzUo#6RQR._NvzRjWF?urqV@a$", attachment.Blurhash) @@ -155,6 +156,7 @@ func (suite *ManagerTestSuite) TestSimpleJpegProcessAsync() { Width: 512, Height: 288, Size: 147456, Aspect: 1.7777777777777777, }, attachment.FileMeta.Small) suite.Equal("image/jpeg", attachment.File.ContentType) + suite.Equal("image/jpeg", attachment.Thumbnail.ContentType) suite.Equal(269739, attachment.File.FileSize) suite.Equal("LjBzUo#6RQR._NvzRjWF?urqV@a$", attachment.Blurhash) @@ -237,6 +239,7 @@ func (suite *ManagerTestSuite) TestSimpleJpegQueueSpamming() { Width: 512, Height: 288, Size: 147456, Aspect: 1.7777777777777777, }, attachment.FileMeta.Small) suite.Equal("image/jpeg", attachment.File.ContentType) + suite.Equal("image/jpeg", attachment.Thumbnail.ContentType) suite.Equal(269739, attachment.File.FileSize) suite.Equal("LjBzUo#6RQR._NvzRjWF?urqV@a$", attachment.Blurhash) @@ -325,6 +328,7 @@ func (suite *ManagerTestSuite) TestSimpleJpegProcessBlockingWithDiskStorage() { Width: 512, Height: 288, Size: 147456, Aspect: 1.7777777777777777, }, attachment.FileMeta.Small) suite.Equal("image/jpeg", attachment.File.ContentType) + suite.Equal("image/jpeg", attachment.Thumbnail.ContentType) suite.Equal(269739, attachment.File.FileSize) suite.Equal("LjBzUo#6RQR._NvzRjWF?urqV@a$", attachment.Blurhash) diff --git a/internal/media/processingmedia.go b/internal/media/processingmedia.go index 0f47ee4e6..2df5fe584 100644 --- a/internal/media/processingmedia.go +++ b/internal/media/processingmedia.go @@ -331,7 +331,7 @@ func (m *manager) preProcessMedia(ctx context.Context, data DataFunc, accountID thumbnail := gtsmodel.Thumbnail{ URL: uris.GenerateURIForAttachment(accountID, string(TypeAttachment), string(SizeSmall), id, mimeJpeg), // all thumbnails are encoded as jpeg, Path: fmt.Sprintf("%s/%s/%s/%s.%s", accountID, TypeAttachment, SizeSmall, id, mimeJpeg), // all thumbnails are encoded as jpeg, - ContentType: mimeJpeg, + ContentType: mimeImageJpeg, UpdatedAt: time.Now(), } |