From c44ac9cc00fc224f54574e3869d0aceb516649c5 Mon Sep 17 00:00:00 2001
From: Sorunome <mail@sorunome.de>
Date: Tue, 20 Mar 2018 15:00:16 +0100
Subject: [PATCH] add config to force animated thumbnails
---
config.sample.yaml | 3 +++
.../turt2live/matrix-media-repo/client/r0/thumbnail.go | 4 ++++
src/github.com/turt2live/matrix-media-repo/config/config.go | 2 ++
3 files changed, 9 insertions(+)
diff --git a/config.sample.yaml b/config.sample.yaml
index 795900e5..46681043 100644
--- a/config.sample.yaml
+++ b/config.sample.yaml
@@ -168,6 +168,9 @@ thumbnails:
# thumbnails, set this to false. If disabled, regular thumbnails will be returned.
allowAnimated: true
+ # Force animated thumbnails, if available
+ forceAnimated: true
+
# The maximum file size to thumbnail when a capable animated thumbnail is requested. If the image
# is larger than this, the thumbnail will be generated as a static image.
maxAnimateSizeBytes: 10485760 # 10MB default, 0 to disable
diff --git a/src/github.com/turt2live/matrix-media-repo/client/r0/thumbnail.go b/src/github.com/turt2live/matrix-media-repo/client/r0/thumbnail.go
index cd02d692..783c4ab9 100644
--- a/src/github.com/turt2live/matrix-media-repo/client/r0/thumbnail.go
+++ b/src/github.com/turt2live/matrix-media-repo/client/r0/thumbnail.go
@@ -60,6 +60,10 @@ func ThumbnailMedia(w http.ResponseWriter, r *http.Request, log *logrus.Entry) i
if method == "" {
method = "scale"
}
+
+ if config.Get().Thumbnails.AllowAnimated && config.Get().Thumbnails.ForceAnimated {
+ animated = true
+ }
log = log.WithFields(logrus.Fields{
"requestedWidth": width,
diff --git a/src/github.com/turt2live/matrix-media-repo/config/config.go b/src/github.com/turt2live/matrix-media-repo/config/config.go
index 3ac71e3c..bfdd88a9 100644
--- a/src/github.com/turt2live/matrix-media-repo/config/config.go
+++ b/src/github.com/turt2live/matrix-media-repo/config/config.go
@@ -52,6 +52,7 @@ type ThumbnailsConfig struct {
MaxAnimateSizeBytes int64 `yaml:"maxAnimateSizeBytes"`
Sizes []*ThumbnailSize `yaml:"sizes,flow"`
AllowAnimated bool `yaml:"allowAnimated"`
+ ForceAnimated bool `yaml:"forceAnimated"`
}
type ThumbnailSize struct {
@@ -233,6 +234,7 @@ func NewDefaultConfig() *MediaRepoConfig {
MaxAnimateSizeBytes: 10485760, // 10mb
NumWorkers: 10,
AllowAnimated: true,
+ ForceAnimated: true,
Sizes: []*ThumbnailSize{
{32, 32},
{96, 96},
--
GitLab