Merge remote-tracking branch 'upstream/master' into feature/port_0.63.7

; Conflicts:
;	package-lock.json
;	src/routes/api/files.ts
;	src/services/build.js
;	src/services/notes.ts
This commit is contained in:
Elian Doran
2024-07-13 18:36:04 +03:00
15 changed files with 74 additions and 31 deletions

View File

@@ -446,13 +446,17 @@ function findIncludeNoteLinks(content: string, foundLinks: FoundLink[]) {
}
function findRelationMapLinks(content: string, foundLinks: FoundLink[]) {
const obj = JSON.parse(content);
try {
const obj = JSON.parse(content);
for (const note of obj.notes) {
foundLinks.push({
name: 'relationMapLink',
value: note.noteId
});
for (const note of obj.notes) {
foundLinks.push({
name: 'relationMapLink',
value: note.noteId
});
}
} catch (e: any) {
log.error("Could not scan for relation map links: " + e.message);
}
}