Check server-supported thumbnail types too

Fixes #460
t2bot · Sep 8, 2023 · af45aaf · af45aaf
1 parent a877bd2
commit af45aaf
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,6 +10,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 ### Fixed
 
 * Fixed media purge API not being able to delete thumbnails.
+* Fixed thumbnails being attempted for disabled media types.
 
 ## [1.3.0] - September 8, 2023
 

diff --git a/thumbnailing/thumbnail.go b/thumbnailing/thumbnail.go
@@ -26,6 +26,10 @@ func GenerateThumbnail(imgStream io.ReadCloser, contentType string, width int, h
 		ctx.Log.Debugf("Unsupported content type '%s'", contentType)
 		return nil, ErrUnsupported
 	}
+	if !util.ArrayContains(ctx.Config.Thumbnails.Types, contentType) {
+		ctx.Log.Debugf("Disabled content type '%s'", contentType)
+		return nil, ErrUnsupported
+	}
 
 	generator, reconstructed := i.GetGenerator(imgStream, contentType, animated)
 	if generator == nil {