From 5d213eea7ee640f6cbe62cf056ac9b20b1eb0571 Mon Sep 17 00:00:00 2001
From: zadam <zadam.apps@gmail.com>
Date: Sun, 23 Jun 2019 15:22:05 +0200
Subject: [PATCH] basic webp support

---
 src/routes/api/image.js       | 2 +-
 src/services/image.js         | 7 +++++++
 src/services/import/enex.js   | 2 +-
 src/services/import/single.js | 2 +-
 4 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/routes/api/image.js b/src/routes/api/image.js
index f22903799..a0f6ba4aa 100644
--- a/src/routes/api/image.js
+++ b/src/routes/api/image.js
@@ -34,7 +34,7 @@ async function uploadImage(req) {
         return [404, `Note ${noteId} doesn't exist.`];
     }
 
-    if (!["image/png", "image/jpeg", "image/gif"].includes(file.mimetype)) {
+    if (!["image/png", "image/jpeg", "image/gif", "image/webp"].includes(file.mimetype)) {
         return [400, "Unknown image type: " + file.mimetype];
     }
 
diff --git a/src/services/image.js b/src/services/image.js
index bc49a0f4e..9712a3873 100644
--- a/src/services/image.js
+++ b/src/services/image.js
@@ -13,6 +13,13 @@ const imageType = require('image-type');
 const sanitizeFilename = require('sanitize-filename');
 
 async function saveImage(buffer, originalName, parentNoteId, shrinkImageSwitch) {
+    const origImageFormat = imageType(buffer);
+
+    if (origImageFormat.ext === "webp") {
+        // JIMP does not support webp at the moment: https://github.com/oliver-moran/jimp/issues/144
+        shrinkImageSwitch = false;
+    }
+
     const finalImageBuffer = shrinkImageSwitch ? await shrinkImage(buffer, originalName) : buffer;
 
     const imageFormat = imageType(finalImageBuffer);
diff --git a/src/services/import/enex.js b/src/services/import/enex.js
index 6ec07fb1a..854be6f6b 100644
--- a/src/services/import/enex.js
+++ b/src/services/import/enex.js
@@ -251,7 +251,7 @@ async function importEnex(importContext, file, parentNote) {
                 noteContent = noteContent.replace(mediaRegex, resourceLink);
             };
 
-            if (["image/jpeg", "image/png", "image/gif"].includes(resource.mime)) {
+            if (["image/jpeg", "image/png", "image/gif", "image/webp"].includes(resource.mime)) {
                 try {
                     const originalName = "image." + resource.mime.substr(6);
 
diff --git a/src/services/import/single.js b/src/services/import/single.js
index 37ba50b4f..3dd1adb37 100644
--- a/src/services/import/single.js
+++ b/src/services/import/single.js
@@ -100,7 +100,7 @@ async function importSingleFile(importContext, file, parentNote) {
         return await importCodeNote(importContext, file, parentNote);
     }
 
-    if (["image/jpeg", "image/gif", "image/png"].includes(mime)) {
+    if (["image/jpeg", "image/gif", "image/png", "image/webp"].includes(mime)) {
         return await importImage(file, parentNote, importContext);
     }