From 0404b78fb8f9d6812e979f30f1a0f25bcf830fee Mon Sep 17 00:00:00 2001
From: zadam <zadam.apps@gmail.com>
Date: Sun, 7 Jan 2024 22:52:16 +0100
Subject: [PATCH 1/6] fix loading katex in share #4558

---
 package-lock.json             | 4 ++--
 src/share/content_renderer.js | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 6d8dbd405..ed8e303d1 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "trilium",
-  "version": "0.62.3",
+  "version": "0.62.4",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "trilium",
-      "version": "0.62.3",
+      "version": "0.62.4",
       "hasInstallScript": true,
       "license": "AGPL-3.0-only",
       "dependencies": {
diff --git a/src/share/content_renderer.js b/src/share/content_renderer.js
index 91f7f7c76..2c17e68c3 100644
--- a/src/share/content_renderer.js
+++ b/src/share/content_renderer.js
@@ -105,10 +105,10 @@ function renderText(result, note) {
 
         if (result.content.includes(`<span class="math-tex">`)) {
             result.header += `
-<script src="../../${assetPath}/libraries/katex/katex.min.js"></script>
-<link rel="stylesheet" href="../../${assetPath}/libraries/katex/katex.min.css">
-<script src="../../${assetPath}/libraries/katex/auto-render.min.js"></script>
-<script src="../../${assetPath}/libraries/katex/mhchem.min.js"></script>
+<script src="../../${assetPath}/node_modules/katex/dist/katex.min.js"></script>
+<link rel="stylesheet" href="../../${assetPath}/node_modules/katex/dist/katex.min.css">
+<script src="../../${assetPath}/node_modules/katex/dist/contrib/auto-render.min.js"></script>
+<script src="../../${assetPath}/node_modules/katex/dist/contrib/mhchem.min.js"></script>
 <script>
 document.addEventListener("DOMContentLoaded", function() {
     renderMathInElement(document.getElementById('content'));

From 6b6e42e9ba721b2ce10dbd26d157da4d940a33b0 Mon Sep 17 00:00:00 2001
From: zadam <zadam.apps@gmail.com>
Date: Sun, 7 Jan 2024 23:11:55 +0100
Subject: [PATCH 2/6] document attachment ETAPI APIs in OpenAPI spec, fixes
 #4559

---
 src/etapi/etapi.openapi.yaml | 165 ++++++++++++++++++++++++++++++++++-
 1 file changed, 163 insertions(+), 2 deletions(-)

diff --git a/src/etapi/etapi.openapi.yaml b/src/etapi/etapi.openapi.yaml
index 09149397c..61eb1a6cf 100644
--- a/src/etapi/etapi.openapi.yaml
+++ b/src/etapi/etapi.openapi.yaml
@@ -427,6 +427,116 @@ paths:
             application/json; charset=utf-8:
               schema:
                 $ref: '#/components/schemas/Error'
+  /attachments:
+    post:
+      description: create an attachment
+      operationId: postAttachment
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/CreateAttachment'
+      responses:
+        '201':
+          description: attachment created
+          content:
+            application/json; charset=utf-8:
+              schema:
+                $ref: '#/components/schemas/Attachment'
+        default:
+          description: unexpected error
+          content:
+            application/json; charset=utf-8:
+              schema:
+                $ref: '#/components/schemas/Error'
+  /attachments/{attachmentId}:
+    parameters:
+      - name: attachmentId
+        in: path
+        required: true
+        schema:
+          $ref: '#/components/schemas/EntityId'
+    get:
+      description: Returns an attachment identified by its ID
+      operationId: getAttachmentById
+      responses:
+        '200':
+          description: attachment response
+          content:
+            application/json; charset=utf-8:
+              schema:
+                $ref: '#/components/schemas/Attachment'
+        default:
+          description: unexpected error
+          content:
+            application/json; charset=utf-8:
+              schema:
+                $ref: '#/components/schemas/Error'
+    patch:
+      description: patch an attachment identified by the attachmentId with changes in the body. Only role, mime, title, and position are patchable.
+      operationId: patchAttachmentById
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/Attachment'
+      responses:
+        '200':
+          description: attribute updated
+          content:
+            application/json; charset=utf-8:
+              schema:
+                $ref: '#/components/schemas/Attachment'
+        default:
+          description: unexpected error
+          content:
+            application/json; charset=utf-8:
+              schema:
+                $ref: '#/components/schemas/Error'
+    delete:
+      description: deletes an attachment based on the attachmentId supplied.
+      operationId: deleteAttachmentById
+      responses:
+        '204':
+          description: attachment deleted
+        default:
+          description: unexpected error
+          content:
+            application/json; charset=utf-8:
+              schema:
+                $ref: '#/components/schemas/Error'
+  /attachments/{attachmentId}/content:
+    parameters:
+      - name: attachmentId
+        in: path
+        required: true
+        schema:
+          $ref: '#/components/schemas/EntityId'
+    get:
+      description: Returns attachment content identified by its ID
+      operationId: getAttachmentContent
+      responses:
+        '200':
+          description: attachment content response
+          content:
+            text/html:
+              schema:
+                type: string
+    put:
+      description: Updates attachment content identified by its ID
+      operationId: putAttachmentContentById
+      requestBody:
+        description: html content of attachment
+        required: true
+        content:
+          text/plain:
+            schema:
+              type: string
+      responses:
+        '204':
+          description: attachment content updated
   /attributes:
     post:
       description: create an attribute for a given note
@@ -474,7 +584,7 @@ paths:
               schema:
                 $ref: '#/components/schemas/Error'
     patch:
-      description: patch a attribute identified by the attributeId with changes in the body. For labels, only value and position can be updated. For relations, only position can be updated. If you want to modify other properties, you need to delete the old attribute and create a new one.
+      description: patch an attribute identified by the attributeId with changes in the body. For labels, only value and position can be updated. For relations, only position can be updated. If you want to modify other properties, you need to delete the old attribute and create a new one.
       operationId: patchAttributeById
       requestBody:
         required: true
@@ -496,7 +606,7 @@ paths:
               schema:
                 $ref: '#/components/schemas/Error'
     delete:
-      description: deletes a attribute based on the attributeId supplied.
+      description: deletes an attribute based on the attributeId supplied.
       operationId: deleteAttributeById
       responses:
         '204':
@@ -884,6 +994,57 @@ components:
           $ref: '#/components/schemas/Note'
         branch:
           $ref: '#/components/schemas/Branch'
+    Attachment:
+      type: object
+      description: Attachment is owned by a note, has title and content
+      properties:
+        attachmentId:
+          $ref: '#/components/schemas/EntityId'
+          readOnly: true
+        ownerId:
+          $ref: '#/components/schemas/EntityId'
+          description: identifies the owner of the attachment, is either noteId or revisionId
+        role:
+          type: string
+        mime:
+          type: string
+        title:
+          type: string
+        position:
+          type: integer
+          format: int32
+        blobId:
+          type: string
+          description: ID of the blob object which effectively serves as a content hash
+        dateModified:
+          $ref: '#/components/schemas/LocalDateTime'
+          readOnly: true
+        utcDateModified:
+          $ref: '#/components/schemas/UtcDateTime'
+          readOnly: true
+        utcDateScheduledForErasureSince:
+          $ref: '#/components/schemas/UtcDateTime'
+          readOnly: true
+        contentLength:
+          type: integer
+          format: int32
+    CreateAttachment:
+      type: object
+      properties:
+        ownerId:
+          $ref: '#/components/schemas/EntityId'
+          description: identifies the owner of the attachment, is either noteId or revisionId
+        role:
+          type: string
+        mime:
+          type: string
+        title:
+          type: string
+        content:
+          type: string
+        position:
+          type: integer
+          format: int32
     Attribute:
       type: object
       description: Attribute (Label, Relation) is a key-value record attached to a note.

From 4e549baedc997f16def048ced5128c30061b7909 Mon Sep 17 00:00:00 2001
From: zadam <zadam.apps@gmail.com>
Date: Sun, 7 Jan 2024 23:45:40 +0100
Subject: [PATCH 3/6] fix auto-download of images, closes #4566

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

diff --git a/src/services/notes.js b/src/services/notes.js
index 6e6bbfd76..7062d1aee 100644
--- a/src/services/notes.js
+++ b/src/services/notes.js
@@ -494,7 +494,7 @@ async function downloadImage(noteId, imageUrl) {
         const title = path.basename(parsedUrl.pathname);
 
         const imageService = require('../services/image');
-        const {attachment} = imageService.saveImageToAttachment(noteId, imageBuffer, title, true, true);
+        const attachment = imageService.saveImageToAttachment(noteId, imageBuffer, title, true, true);
 
         imageUrlToAttachmentIdMapping[imageUrl] = attachment.attachmentId;
 

From 894b08a1b8debd76d78c8b475ed96e3db226183f Mon Sep 17 00:00:00 2001
From: zadam <zadam.apps@gmail.com>
Date: Sun, 7 Jan 2024 23:51:38 +0100
Subject: [PATCH 4/6] correctly save attachment URL, #4566

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

diff --git a/src/services/notes.js b/src/services/notes.js
index 7062d1aee..42b66cc4a 100644
--- a/src/services/notes.js
+++ b/src/services/notes.js
@@ -511,7 +511,7 @@ const downloadImagePromises = {};
 function replaceUrl(content, url, attachment) {
     const quotedUrl = utils.quoteRegex(url);
 
-    return content.replace(new RegExp(`\\s+src=[\"']${quotedUrl}[\"']`, "ig"), ` src="api/attachments/${encodeURIComponent(attachment.title)}/image"`);
+    return content.replace(new RegExp(`\\s+src=[\"']${quotedUrl}[\"']`, "ig"), ` src="api/attachments/${attachment.attachmentId}/image/${encodeURIComponent(attachment.title)}"`);
 }
 
 function downloadImages(noteId, content) {

From ee608fcf46a2052f21d94a8a72fc023dcaf955f7 Mon Sep 17 00:00:00 2001
From: zadam <zadam.apps@gmail.com>
Date: Mon, 8 Jan 2024 00:03:11 +0100
Subject: [PATCH 5/6] unescape HTML before downloading images, #4566

---
 src/services/notes.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/services/notes.js b/src/services/notes.js
index 42b66cc4a..8da31c6a9 100644
--- a/src/services/notes.js
+++ b/src/services/notes.js
@@ -519,7 +519,7 @@ function downloadImages(noteId, content) {
     let imageMatch;
 
     while (imageMatch = imageRe.exec(content)) {
-        const url = imageMatch[1];
+        let url = imageMatch[1];
         const inlineImageMatch = /^data:image\/[a-z]+;base64,/.exec(url);
 
         if (inlineImageMatch) {
@@ -541,6 +541,8 @@ function downloadImages(noteId, content) {
                 continue;
             }
 
+            url = utils.unescapeHtml(url);
+
             if (url in imageUrlToAttachmentIdMapping) {
                 const attachment = becca.getAttachment(imageUrlToAttachmentIdMapping[url]);
 

From d6046efa1bf8c6b2400e82c5088ec3b816650335 Mon Sep 17 00:00:00 2001
From: zadam <zadam.apps@gmail.com>
Date: Mon, 8 Jan 2024 00:05:13 +0100
Subject: [PATCH 6/6] release 0.62.5

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

diff --git a/package.json b/package.json
index 54762a8eb..7a1a01b18 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "name": "trilium",
   "productName": "Trilium Notes",
   "description": "Trilium Notes",
-  "version": "0.62.4",
+  "version": "0.62.5",
   "license": "AGPL-3.0-only",
   "main": "electron.js",
   "bin": {
diff --git a/src/services/build.js b/src/services/build.js
index de0afa8f3..a1286ec8a 100644
--- a/src/services/build.js
+++ b/src/services/build.js
@@ -1 +1 @@
-module.exports = { buildDate:"2023-12-07T00:03:59+01:00", buildRevision: "2e23c521c356c2305124f5df0f474532fa5f34ce" };
+module.exports = { buildDate:"2024-01-08T00:05:13+01:00", buildRevision: "ee608fcf46a2052f21d94a8a72fc023dcaf955f7" };