From e4376bb9f202d7a82c6018264d44dbb65224fb08 Mon Sep 17 00:00:00 2001
From: zadam <zadam.apps@gmail.com>
Date: Fri, 14 Apr 2023 20:24:28 +0200
Subject: [PATCH 1/4] isRoot check

---
 src/public/app/services/froca_updater.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/public/app/services/froca_updater.js b/src/public/app/services/froca_updater.js
index 070d6c2a2..76662b08a 100644
--- a/src/public/app/services/froca_updater.js
+++ b/src/public/app/services/froca_updater.js
@@ -141,7 +141,7 @@ async function processBranchChange(loadResults, ec) {
     const childNote = froca.notes[ec.entity.noteId];
     let parentNote = froca.notes[ec.entity.parentNoteId];
 
-    if (childNote && !parentNote) {
+    if (childNote && !childNote.isRoot() && !parentNote) {
         // a branch cannot exist without the parent
         // a note loaded into froca has to also contain all its ancestors
         // this problem happened e.g. in sharing where _share was hidden and thus not loaded

From 8226f62ded75d9fea8b844e4d5a7c9167b3435f1 Mon Sep 17 00:00:00 2001
From: zadam <zadam.apps@gmail.com>
Date: Sun, 16 Apr 2023 23:11:18 +0200
Subject: [PATCH 2/4] download offline images from libreoffice, fixes #3842

---
 package-lock.json                 |  1 +
 src/public/app/widgets/mermaid.js |  1 -
 src/services/notes.js             | 20 +++++++++++++++++++-
 3 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index f6fd5eaef..59a3f9bd6 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -5,6 +5,7 @@
   "requires": true,
   "packages": {
     "": {
+      "name": "trilium",
       "version": "0.59.3",
       "hasInstallScript": true,
       "license": "AGPL-3.0-only",
diff --git a/src/public/app/widgets/mermaid.js b/src/public/app/widgets/mermaid.js
index d07ce83e0..4a75e643b 100644
--- a/src/public/app/widgets/mermaid.js
+++ b/src/public/app/widgets/mermaid.js
@@ -1,7 +1,6 @@
 import libraryLoader from "../services/library_loader.js";
 import NoteContextAwareWidget from "./note_context_aware_widget.js";
 import froca from "../services/froca.js";
-import server from "../services/server.js";
 
 const TPL = `<div class="mermaid-widget">
     <style>
diff --git a/src/services/notes.js b/src/services/notes.js
index d526372d2..f3d219145 100644
--- a/src/services/notes.js
+++ b/src/services/notes.js
@@ -21,6 +21,7 @@ const dayjs = require("dayjs");
 const htmlSanitizer = require("./html_sanitizer");
 const ValidationError = require("../errors/validation_error");
 const noteTypesService = require("./note_types");
+const fs = require("fs");
 
 function getNewNotePosition(parentNote) {
     if (parentNote.isLabelTruthy('newNotesOnTop')) {
@@ -375,7 +376,24 @@ const imageUrlToNoteIdMapping = {};
 
 async function downloadImage(noteId, imageUrl) {
     try {
-        const imageBuffer = await request.getImage(imageUrl);
+        let imageBuffer;
+
+        if (imageUrl.toLowerCase().startsWith("file://")) {
+            imageBuffer = await new Promise((res, rej) => {
+                const localFilePath = imageUrl.substr("file://".length);
+
+                return fs.readFile(localFilePath, (err, data) => {
+                    if (err) {
+                        rej(err);
+                    } else {
+                        res(data);
+                    }
+                });
+            });
+        } else {
+            imageBuffer = await request.getImage(imageUrl);
+        }
+
         const parsedUrl = url.parse(imageUrl);
         const title = path.basename(parsedUrl.pathname);
 

From 1d3272e9f8c27106a66227fbb580677ae5d70427 Mon Sep 17 00:00:00 2001
From: zadam <zadam.apps@gmail.com>
Date: Sun, 16 Apr 2023 23:41:40 +0200
Subject: [PATCH 3/4] fix displaying error message in mermaid, closes #3841

---
 src/public/app/widgets/mermaid.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/public/app/widgets/mermaid.js b/src/public/app/widgets/mermaid.js
index 4a75e643b..857eca97e 100644
--- a/src/public/app/widgets/mermaid.js
+++ b/src/public/app/widgets/mermaid.js
@@ -73,6 +73,8 @@ export default class MermaidWidget extends NoteContextAwareWidget {
 
         const wheelZoomLoaded = libraryLoader.requireLibrary(libraryLoader.WHEEL_ZOOM);
 
+        this.$errorContainer.hide();
+
         try {
             await this.renderSvg(async renderedSvg => {
                 this.$display.html(renderedSvg);
@@ -87,8 +89,6 @@ export default class MermaidWidget extends NoteContextAwareWidget {
                     speed: 20,
                     zoomOnClick: false
                 });
-
-                this.$errorContainer.hide();
             });
         } catch (e) {
             this.$errorMessage.text(e.message);

From 83d8908ee8e8e471054b4c04d7186ad74a52231e Mon Sep 17 00:00:00 2001
From: zadam <zadam.apps@gmail.com>
Date: Mon, 17 Apr 2023 21:40:35 +0200
Subject: [PATCH 4/4] release 0.59.4

---
 package.json          | 2 +-
 src/services/build.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 343cc0ad8..7f2b2bde7 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "name": "trilium",
   "productName": "Trilium Notes",
   "description": "Trilium Notes",
-  "version": "0.59.3",
+  "version": "0.59.4",
   "license": "AGPL-3.0-only",
   "main": "electron.js",
   "bin": {
diff --git a/src/services/build.js b/src/services/build.js
index cea5cf6a6..42ec8bd89 100644
--- a/src/services/build.js
+++ b/src/services/build.js
@@ -1 +1 @@
-module.exports = { buildDate:"2023-03-27T23:06:14+02:00", buildRevision: "9881e6de3e4966af39ec6245562dca6ac7b25eaa" };
+module.exports = { buildDate:"2023-04-17T21:40:35+02:00", buildRevision: "1d3272e9f8c27106a66227fbb580677ae5d70427" };