Merge branch 'stable'

zadam · Jan 10, 2024 · 2c7b774 · 2c7b774
2 parents dff4f73 + 390ad6d
commit 2c7b774
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 13 deletions.
diff --git a/libraries/ckeditor/ckeditor.js b/libraries/ckeditor/ckeditor.js
diff --git a/libraries/ckeditor/ckeditor.js.map b/libraries/ckeditor/ckeditor.js.map
diff --git a/package-lock.json b/package-lock.json
diff --git a/src/services/keyboard_actions.js b/src/services/keyboard_actions.js
@@ -302,7 +302,7 @@ const DEFAULT_KEYBOARD_ACTIONS = [
     },
     {
         actionName: "lastTab",
-        defaultShortcuts: ["CommandOrControl+0"],
+        defaultShortcuts: [],
         description: "Activates the last tab in the list",
         scope: "window"
     },

diff --git a/src/services/notes.js b/src/services/notes.js
@@ -471,6 +471,8 @@ function findRelationMapLinks(content, foundLinks) {
 const imageUrlToAttachmentIdMapping = {};
 
 async function downloadImage(noteId, imageUrl) {
+    const unescapedUrl = utils.unescapeHtml(imageUrl);
+
     try {
         let imageBuffer;
 
@@ -487,10 +489,10 @@ async function downloadImage(noteId, imageUrl) {
                 });
             });
         } else {
-            imageBuffer = await request.getImage(imageUrl);
+            imageBuffer = await request.getImage(unescapedUrl);
         }
 
-        const parsedUrl = url.parse(imageUrl);
+        const parsedUrl = url.parse(unescapedUrl);
         const title = path.basename(parsedUrl.pathname);
 
         const imageService = require('../services/image.js');
@@ -519,7 +521,7 @@ function downloadImages(noteId, content) {
     let imageMatch;
 
     while (imageMatch = imageRe.exec(content)) {
-        let url = imageMatch[1];
+        const url = imageMatch[1];
         const inlineImageMatch = /^data:image\/[a-z]+;base64,/.exec(url);
 
         if (inlineImageMatch) {
@@ -541,8 +543,6 @@ function downloadImages(noteId, content) {
                 continue;
             }
 
-            url = utils.unescapeHtml(url);
-
             if (url in imageUrlToAttachmentIdMapping) {
                 const attachment = becca.getAttachment(imageUrlToAttachmentIdMapping[url]);
 

diff --git a/src/share/content_renderer.js b/src/share/content_renderer.js
@@ -137,7 +137,7 @@ function renderCode(result) {
 
 function renderMermaid(result, note) {
     result.content = `
-<img src="api/images/${note.noteId}/${note.escapedTitle}?${note.utcDateModified}">
+<img src="api/images/${note.noteId}/${note.encodedTitle}?${note.utcDateModified}">
 <hr>
 <details>
     <summary>Chart source</summary>
@@ -146,7 +146,7 @@ function renderMermaid(result, note) {
 }
 
 function renderImage(result, note) {
-    result.content = `<img src="api/images/${note.noteId}/${note.escapedTitle}?${note.utcDateModified}">`;
+    result.content = `<img src="api/images/${note.noteId}/${note.encodedTitle}?${note.utcDateModified}">`;
 }
 
 function renderFile(note, result) {

diff --git a/src/share/shaca/entities/snote.js b/src/share/shaca/entities/snote.js
@@ -490,6 +490,10 @@ class SNote extends AbstractShacaEntity {
         return escape(this.title);
     }
 
+    get encodedTitle() {
+        return encodeURIComponent(this.title);
+    }
+
     getPojo() {
         return {
             noteId: this.noteId,