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

chore(share): handle BAttachments too

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

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

@ -16,6 +16,8 @@ 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"; import becca from "../becca/becca.js";
import { BAttachment } from "../services/backend_script_entrypoint.js";
import SAttachment from "./shaca/entities/sattachment.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();
@ -290,6 +292,13 @@ function renderText(result: Result, note: SNote | BNote) {
result.isEmpty = document.textContent?.trim().length === 0 && document.querySelectorAll("img").length === 0; result.isEmpty = document.textContent?.trim().length === 0 && document.querySelectorAll("img").length === 0;
const getNote = note instanceof BNote
? (noteId: string) => becca.getNote(noteId)
: (noteId: string) => shaca.getNote(noteId);
const getAttachment = note instanceof BNote
? (attachmentId: string) => becca.getAttachment(attachmentId)
: (attachmentId: string) => shaca.getAttachment(attachmentId);
if (!result.isEmpty) { if (!result.isEmpty) {
// Process attachment links. // Process attachment links.
for (const linkEl of document.querySelectorAll("a")) { for (const linkEl of document.querySelectorAll("a")) {
@ -301,10 +310,7 @@ function renderText(result: Result, note: SNote | BNote) {
} }
if (href?.startsWith("#")) { if (href?.startsWith("#")) {
const getNote = note instanceof BNote handleAttachmentLink(linkEl, href, getNote, getAttachment);
? (noteId: string) => becca.getNote(noteId)
: (noteId: string) => shaca.getNote(noteId);
handleAttachmentLink(linkEl, href, getNote);
} }
} }
@ -323,12 +329,12 @@ function renderText(result: Result, note: SNote | BNote) {
} }
} }
function handleAttachmentLink(linkEl: HTMLElement, href: string, getNote: (id: string) => SNote | BNote | null) { function handleAttachmentLink(linkEl: HTMLElement, href: string, getNote: (id: string) => SNote | BNote | null, getAttachment: (id: string) => BAttachment | SAttachment | 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))) {
const attachmentId = attachmentMatch[1]; const attachmentId = attachmentMatch[1];
const attachment = shaca.getAttachment(attachmentId); const attachment = getAttachment(attachmentId);
if (attachment) { if (attachment) {
linkEl.setAttribute("href", `api/attachments/${attachmentId}/download`); linkEl.setAttribute("href", `api/attachments/${attachmentId}/download`);
@ -338,6 +344,7 @@ function handleAttachmentLink(linkEl: HTMLElement, href: string, getNote: (id: s
linkEl.appendChild(new TextNode(attachment.title)); linkEl.appendChild(new TextNode(attachment.title));
} else { } else {
linkEl.removeAttribute("href"); linkEl.removeAttribute("href");
log.error(`Broken attachment link detected in shared note: unable to find attachment with ID ${attachmentId}`);
} }
} else { } else {
const [notePath] = href.split("?"); const [notePath] = href.split("?");