From c67b8aad4a77b2d7d009ecbed87af94fd70b8f0b Mon Sep 17 00:00:00 2001
From: Sebastian <sebastian@squidex.io>
Date: Wed, 25 May 2022 18:37:23 +0200
Subject: [PATCH] Better cache keys.

---
 .../Controllers/Assets/Models/AssetContentQueryDto.cs    | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/backend/src/Squidex/Areas/Api/Controllers/Assets/Models/AssetContentQueryDto.cs b/backend/src/Squidex/Areas/Api/Controllers/Assets/Models/AssetContentQueryDto.cs
index e6f1767d8..2ba1981d7 100644
--- a/backend/src/Squidex/Areas/Api/Controllers/Assets/Models/AssetContentQueryDto.cs
+++ b/backend/src/Squidex/Areas/Api/Controllers/Assets/Models/AssetContentQueryDto.cs
@@ -111,12 +111,12 @@ namespace Squidex.Areas.Api.Controllers.Assets.Models
             result.FocusY = y;
             result.TargetWidth = Width;
             result.TargetHeight = Height;
-            result.Format = GetFormat(assetThumbnailGenerator, request);
+            result.Format = GetFormat(asset, assetThumbnailGenerator, request);
 
             return result;
         }
 
-        private ImageFormat? GetFormat(IAssetThumbnailGenerator assetThumbnailGenerator, HttpRequest request)
+        private ImageFormat? GetFormat(IAssetEntity asset, IAssetThumbnailGenerator assetThumbnailGenerator, HttpRequest request)
         {
             if (Format.HasValue || !Auto)
             {
@@ -125,6 +125,11 @@ namespace Squidex.Areas.Api.Controllers.Assets.Models
 
             bool Accepts(string mimeType)
             {
+                if (string.Equals(asset.MimeType, mimeType, StringComparison.OrdinalIgnoreCase))
+                {
+                    return false;
+                }
+
                 request.Headers.TryGetValue("Accept", out var accept);
 
                 return accept.Any(x => x.Contains(mimeType, StringComparison.OrdinalIgnoreCase)) && assetThumbnailGenerator.CanReadAndWrite(mimeType);