From 4a67f63abd78a10594bab243c4150831a1eb5720 Mon Sep 17 00:00:00 2001 From: zadam Date: Thu, 14 Sep 2023 00:18:56 +0200 Subject: [PATCH] better error message in image attachment + upgrades --- package-lock.json | 43 +++++++++++++++++++++-------------------- package.json | 6 +++--- src/routes/api/image.js | 4 +++- 3 files changed, 28 insertions(+), 25 deletions(-) diff --git a/package-lock.json b/package-lock.json index a80b6d6f2..d83d82024 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5,6 +5,7 @@ "requires": true, "packages": { "": { + "name": "trilium", "version": "0.61.6-beta", "hasInstallScript": true, "license": "AGPL-3.0-only", @@ -46,7 +47,7 @@ "jimp": "0.22.10", "joplin-turndown-plugin-gfm": "1.0.12", "jsdom": "22.1.0", - "marked": "8.0.1", + "marked": "9.0.0", "mime-types": "2.1.35", "multer": "1.4.5-lts.1", "node-abi": "3.47.0", @@ -69,7 +70,7 @@ "tmp": "0.2.1", "turndown": "7.1.2", "unescape": "1.0.1", - "ws": "8.14.0", + "ws": "8.14.1", "xml2js": "0.6.2", "yauzl": "2.10.0" }, @@ -78,7 +79,7 @@ }, "devDependencies": { "cross-env": "7.0.3", - "electron": "25.8.0", + "electron": "25.8.1", "electron-builder": "24.6.4", "electron-packager": "17.1.2", "electron-rebuild": "3.2.9", @@ -4275,9 +4276,9 @@ } }, "node_modules/electron": { - "version": "25.8.0", - "resolved": "https://registry.npmjs.org/electron/-/electron-25.8.0.tgz", - "integrity": "sha512-T3kC1a/3ntSaYMCVVfUUc9v7myPzi6J2GP0Ad/CyfWKDPp054dGyKxb2EEjKnxQQ7wfjsT1JTEdBG04x6ekVBw==", + "version": "25.8.1", + "resolved": "https://registry.npmjs.org/electron/-/electron-25.8.1.tgz", + "integrity": "sha512-GtcP1nMrROZfFg0+mhyj1hamrHvukfF6of2B/pcWxmWkd5FVY1NJib0tlhiorFZRzQN5Z+APLPr7aMolt7i2AQ==", "hasInstallScript": true, "dependencies": { "@electron/get": "^2.0.0", @@ -8945,9 +8946,9 @@ } }, "node_modules/marked": { - "version": "8.0.1", - "resolved": "https://registry.npmjs.org/marked/-/marked-8.0.1.tgz", - "integrity": "sha512-eEbeEb/mJwh+sNLEhHOWtxMgjN/NEwZUBs1nkiIH2sTQTq07KmPMQ48ihyvo5+Ya56spVOPhunfGr6406crCVA==", + "version": "9.0.0", + "resolved": "https://registry.npmjs.org/marked/-/marked-9.0.0.tgz", + "integrity": "sha512-37yoTpjU+TSXb9OBYY5n78z/CqXh76KiQj9xsKxEdztzU9fRLmbWO5YqKxgCVGKlNdexppnbKTkwB3RipVri8w==", "bin": { "marked": "bin/marked.js" }, @@ -13123,9 +13124,9 @@ } }, "node_modules/ws": { - "version": "8.14.0", - "resolved": "https://registry.npmjs.org/ws/-/ws-8.14.0.tgz", - "integrity": "sha512-WR0RJE9Ehsio6U4TuM+LmunEsjQ5ncHlw4sn9ihD6RoJKZrVyH9FWV3dmnwu8B2aNib1OvG2X6adUCyFpQyWcg==", + "version": "8.14.1", + "resolved": "https://registry.npmjs.org/ws/-/ws-8.14.1.tgz", + "integrity": "sha512-4OOseMUq8AzRBI/7SLMUwO+FEDnguetSk7KMb1sHwvF2w2Wv5Hoj0nlifx8vtGsftE/jWHojPy8sMMzYLJ2G/A==", "engines": { "node": ">=10.0.0" }, @@ -16541,9 +16542,9 @@ } }, "electron": { - "version": "25.8.0", - "resolved": "https://registry.npmjs.org/electron/-/electron-25.8.0.tgz", - "integrity": "sha512-T3kC1a/3ntSaYMCVVfUUc9v7myPzi6J2GP0Ad/CyfWKDPp054dGyKxb2EEjKnxQQ7wfjsT1JTEdBG04x6ekVBw==", + "version": "25.8.1", + "resolved": "https://registry.npmjs.org/electron/-/electron-25.8.1.tgz", + "integrity": "sha512-GtcP1nMrROZfFg0+mhyj1hamrHvukfF6of2B/pcWxmWkd5FVY1NJib0tlhiorFZRzQN5Z+APLPr7aMolt7i2AQ==", "requires": { "@electron/get": "^2.0.0", "@types/node": "^18.11.18", @@ -19989,9 +19990,9 @@ "requires": {} }, "marked": { - "version": "8.0.1", - "resolved": "https://registry.npmjs.org/marked/-/marked-8.0.1.tgz", - "integrity": "sha512-eEbeEb/mJwh+sNLEhHOWtxMgjN/NEwZUBs1nkiIH2sTQTq07KmPMQ48ihyvo5+Ya56spVOPhunfGr6406crCVA==" + "version": "9.0.0", + "resolved": "https://registry.npmjs.org/marked/-/marked-9.0.0.tgz", + "integrity": "sha512-37yoTpjU+TSXb9OBYY5n78z/CqXh76KiQj9xsKxEdztzU9fRLmbWO5YqKxgCVGKlNdexppnbKTkwB3RipVri8w==" }, "matcher": { "version": "3.0.0", @@ -23119,9 +23120,9 @@ } }, "ws": { - "version": "8.14.0", - "resolved": "https://registry.npmjs.org/ws/-/ws-8.14.0.tgz", - "integrity": "sha512-WR0RJE9Ehsio6U4TuM+LmunEsjQ5ncHlw4sn9ihD6RoJKZrVyH9FWV3dmnwu8B2aNib1OvG2X6adUCyFpQyWcg==", + "version": "8.14.1", + "resolved": "https://registry.npmjs.org/ws/-/ws-8.14.1.tgz", + "integrity": "sha512-4OOseMUq8AzRBI/7SLMUwO+FEDnguetSk7KMb1sHwvF2w2Wv5Hoj0nlifx8vtGsftE/jWHojPy8sMMzYLJ2G/A==", "requires": {} }, "xhr": { diff --git a/package.json b/package.json index b77411cd6..4d6c39482 100644 --- a/package.json +++ b/package.json @@ -68,7 +68,7 @@ "jimp": "0.22.10", "joplin-turndown-plugin-gfm": "1.0.12", "jsdom": "22.1.0", - "marked": "8.0.1", + "marked": "9.0.0", "mime-types": "2.1.35", "multer": "1.4.5-lts.1", "node-abi": "3.47.0", @@ -91,13 +91,13 @@ "tmp": "0.2.1", "turndown": "7.1.2", "unescape": "1.0.1", - "ws": "8.14.0", + "ws": "8.14.1", "xml2js": "0.6.2", "yauzl": "2.10.0" }, "devDependencies": { "cross-env": "7.0.3", - "electron": "25.8.0", + "electron": "25.8.1", "electron-builder": "24.6.4", "electron-packager": "17.1.2", "electron-rebuild": "3.2.9", diff --git a/src/routes/api/image.js b/src/routes/api/image.js index c32ef0c7a..902ad9e55 100644 --- a/src/routes/api/image.js +++ b/src/routes/api/image.js @@ -55,7 +55,9 @@ function returnAttachedImage(req, res) { } if (!["image"].includes(attachment.role)) { - return res.sendStatus(400); + return res.setHeader("Content-Type", "text/plain") + .status(400) + .send(`Attachment '${attachment.attachmentId}' has role '${attachment.role}', but 'image' was expected.`); } res.set('Content-Type', attachment.mime);