TriliumNext/Trilium
1
0
Fork 0
mirror of https://github.com/TriliumNext/Trilium.git synced 2025-12-11 19:44:00 -06:00
Code Issues 1.1k Packages Projects Releases 10 Wiki Activity

fix(share): reference links not working

Browse Source
This commit is contained in:
Elian Doran 2025-10-28 17:14:33 +02:00
parent 187e9b57de
commit e0dc4fee20
No known key found for this signature in database
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
apps/server/src/share/content_renderer.ts
View File

@ -15,6 +15,7 @@ import log from "../services/log.js";
import { join } from "path"; import { join } from "path";
import { readFileSync } from "fs"; import { readFileSync } from "fs";
import { highlightAuto } from "@triliumnext/highlightjs"; import { highlightAuto } from "@triliumnext/highlightjs";
import becca from "../becca/becca.js";
const shareAdjustedAssetPath = isDev ? assetPath : `../${assetPath}`; const shareAdjustedAssetPath = isDev ? assetPath : `../${assetPath}`;
const templateCache: Map<string, string> = new Map(); const templateCache: Map<string, string> = new Map();
@ -300,7 +301,10 @@ function renderText(result: Result, note: SNote | BNote) {
} }
if (href?.startsWith("#")) { if (href?.startsWith("#")) {
handleAttachmentLink(linkEl, href); const getNote = note instanceof BNote
? (noteId: string) => becca.getNote(noteId)
: (noteId: string) => shaca.getNote(noteId);
handleAttachmentLink(linkEl, href, getNote);
} }
} }
@ -319,7 +323,7 @@ function renderText(result: Result, note: SNote | BNote) {
} }
} }
function handleAttachmentLink(linkEl: HTMLElement, href: string) { function handleAttachmentLink(linkEl: HTMLElement, href: string, getNote: (id: string) => SNote | BNote | null) {
const linkRegExp = /attachmentId=([a-zA-Z0-9_]+)/g; const linkRegExp = /attachmentId=([a-zA-Z0-9_]+)/g;
let attachmentMatch; let attachmentMatch;
if ((attachmentMatch = linkRegExp.exec(href))) { if ((attachmentMatch = linkRegExp.exec(href))) {
@ -339,7 +343,7 @@ function handleAttachmentLink(linkEl: HTMLElement, href: string) {
const [notePath] = href.split("?"); const [notePath] = href.split("?");
const notePathSegments = notePath.split("/"); const notePathSegments = notePath.split("/");
const noteId = notePathSegments[notePathSegments.length - 1]; const noteId = notePathSegments[notePathSegments.length - 1];
const linkedNote = shaca.getNote(noteId); const linkedNote = getNote(noteId);
if (linkedNote) { if (linkedNote) {
const isExternalLink = linkedNote.hasLabel("shareExternalLink"); const isExternalLink = linkedNote.hasLabel("shareExternalLink");
const href = isExternalLink ? linkedNote.getLabelValue("shareExternalLink") : `./${linkedNote.shareId}`; const href = isExternalLink ? linkedNote.getLabelValue("shareExternalLink") : `./${linkedNote.shareId}`;
@ -352,6 +356,7 @@ function handleAttachmentLink(linkEl: HTMLElement, href: string) {
} }
linkEl.classList.add(`type-${linkedNote.type}`); linkEl.classList.add(`type-${linkedNote.type}`);
} else { } else {
log.error(`Broken link detected in shared note: unable to find note with ID ${noteId}`);
linkEl.removeAttribute("href"); linkEl.removeAttribute("href");
} }
} }