Merge remote-tracking branch 'origin/stable'

src/routes/api/files.js

@@ -1,6 +1,5 @@
 "use strict";
 
-const noteService = require('../../services/notes');
 const protectedSessionService = require('../../services/protected_session');
 const repository = require('../../services/repository');
 const utils = require('../../services/utils');
@@ -45,7 +44,9 @@ async function downloadNoteFile(noteId, res, contentDisposition = true) {
     if (contentDisposition) {
         // (one) reason we're not using the originFileName (available as label) is that it's not
         // available for older note revisions and thus would be inconsistent
-        res.setHeader('Content-Disposition', utils.getContentDisposition(note.title || "untitled"));
+        const filename = utils.formatDownloadTitle(note.title, note.type, note.mime);
+
+        res.setHeader('Content-Disposition', utils.getContentDisposition(filename));
     }
 
     res.setHeader('Content-Type', note.mime);
@@ -70,4 +71,4 @@ module.exports = {
     openFile,
     downloadFile,
     downloadNoteFile
-};
+};

src/routes/api/note_revisions.js

@@ -38,13 +38,7 @@ async function getNoteRevision(req) {
  * @return {string}
  */
 function getRevisionFilename(noteRevision) {
-    let filename = noteRevision.title || "untitled";
-
-    if (noteRevision.type === 'text') {
-        filename += '.html';
-    } else if (['relation-map', 'search'].includes(noteRevision.type)) {
-        filename += '.json';
-    }
+    let filename = utils.formatDownloadTitle(noteRevision.title, noteRevision.type, noteRevision.mime);
 
     const extension = path.extname(filename);
     const date = noteRevision.dateCreated
@@ -158,4 +152,4 @@ module.exports = {
     eraseAllNoteRevisions,
     eraseNoteRevision,
     restoreNoteRevision
-};
+};