Merge pull request #845 from EdiWang/feature/svg

Support SVG Images
EdiWang · Nov 20, 2024 · dc1bc23 · dc1bc23
2 parents 2ca1329 + 17f5d29
commit dc1bc23
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 4 deletions.
diff --git a/src/Moonglade.ImageStorage/ImageInfo.cs b/src/Moonglade.ImageStorage/ImageInfo.cs
@@ -6,5 +6,8 @@ public class ImageInfo
 
     public string ImageExtensionName { get; set; }
 
-    public string ImageContentType => $"image/{ImageExtensionName}";
+    public string ImageContentType => 
+        ImageExtensionName.ToLowerInvariant() == "svg" ? 
+            "image/svg+xml" : 
+            $"image/{ImageExtensionName}";
 }
diff --git a/src/Moonglade.Web/Controllers/ImageController.cs b/src/Moonglade.Web/Controllers/ImageController.cs
@@ -19,7 +19,7 @@ public class ImageController(IBlogImageStorage imageStorage,
 {
     private readonly ImageStorageSettings _imageStorageSettings = imageStorageSettings.Value;
 
-    [HttpGet(@"{filename:regex((?!-)([[a-z0-9-]]+)\.(png|jpg|jpeg|gif|bmp|webp))}")]
+    [HttpGet(@"{filename:regex((?!-)([[a-z0-9-]]+)\.(png|jpg|jpeg|gif|bmp|webp|svg))}")]
     [ProducesResponseType(StatusCodes.Status200OK)]
     [ProducesResponseType(StatusCodes.Status302Found)]
     [ProducesResponseType(StatusCodes.Status400BadRequest)]
@@ -100,7 +100,8 @@ private byte[] AddWatermarkIfNeeded(MemoryStream stream, string ext, bool skipWa
     {
         if (!blogConfig.ImageSettings.IsWatermarkEnabled || skipWatermark) return null;
 
-        if (ext.Equals(".gif", StringComparison.OrdinalIgnoreCase))
+        if (ext.Equals(".gif", StringComparison.OrdinalIgnoreCase) ||
+            ext.Equals(".svg", StringComparison.OrdinalIgnoreCase))
         {
             logger.LogInformation($"Skipped watermark for extension name: {ext}");
             return null;

diff --git a/src/Moonglade.Web/appsettings.json b/src/Moonglade.Web/appsettings.json
@@ -38,7 +38,7 @@
     "KnownProxies": []
   },
   "ImageStorage": {
-    "AllowedExtensions": [ ".png", ".jpg", ".jpeg", ".gif", ".webp" ],
+    "AllowedExtensions": [ ".png", ".jpg", ".jpeg", ".gif", ".webp", ".svg" ],
     "CacheMinutes": 60,
     "Provider": "filesystem",
     "FileSystemPath": "C:\\UploadedImages",

diff --git a/src/Moonglade.Web/wwwroot/js/app/admin.editor.module.js b/src/Moonglade.Web/wwwroot/js/app/admin.editor.module.js
@@ -138,6 +138,7 @@ export function loadTinyMCE(textareaSelector) {
             document.querySelector('#btn-save').click();
         },
         paste_data_images: true,
+        images_file_types: 'png,jpg,jpeg,gif,webp,svg',
         images_upload_url: '/image',
         images_upload_credentials: true,
         extended_valid_elements: 'img[class|src|border=0|alt|title|hspace|vspace|width|height|align|onmouseover|onmouseout|name|loading=lazy]',