gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-10-20 23:29:02 +02:00
Code Issues Actions 18 Packages Projects Releases Wiki Activity

fix: 🐛 fix clipper build error

Browse Source
This commit is contained in:
Jin 2025-04-10 20:58:04 +02:00
parent 32a6aed93b
commit 6322f8473c
1 changed files with 22 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
src/routes/api/clipper.ts
View File

@ -1,23 +1,21 @@
"use strict";
import type { Request } from "express"; import type { Request } from "express";
import attributeService from "../../services/attributes.js";
import cloneService from "../../services/cloning.js";
import noteService from "../../services/notes.js";
import dateNoteService from "../../services/date_notes.js";
import dateUtils from "../../services/date_utils.js";
import imageService from "../../services/image.js";
import appInfo from "../../services/app_info.js";
import ws from "../../services/ws.js";
import log from "../../services/log.js";
import utils from "../../services/utils.js";
import path from "path";
import htmlSanitizer from "../../services/html_sanitizer.js";
import attributeFormatter from "../../services/attribute_formatter.js";
import jsdom from "jsdom"; import jsdom from "jsdom";
import path from "path";
import type BNote from "../../becca/entities/bnote.js"; import type BNote from "../../becca/entities/bnote.js";
import ValidationError from "../../errors/validation_error.js"; import ValidationError from "../../errors/validation_error.js";
import appInfo from "../../services/app_info.js";
import attributeFormatter from "../../services/attribute_formatter.js";
import attributeService from "../../services/attributes.js";
import cloneService from "../../services/cloning.js";
import dateNoteService from "../../services/date_notes.js";
import dateUtils from "../../services/date_utils.js";
import htmlSanitizer from "../../services/html_sanitizer.js";
import imageService from "../../services/image.js";
import log from "../../services/log.js";
import noteService from "../../services/notes.js";
import utils from "../../services/utils.js";
import ws from "../../services/ws.js";
const { JSDOM } = jsdom; const { JSDOM } = jsdom;
interface Image { interface Image {
@ -26,14 +24,14 @@ interface Image {
imageId: string; imageId: string;
} }
function addClipping(req: Request) { async function addClipping(req: Request) {
// if a note under the clipperInbox has the same 'pageUrl' attribute, // if a note under the clipperInbox has the same 'pageUrl' attribute,
// add the content to that note and clone it under today's inbox // add the content to that note and clone it under today's inbox
// otherwise just create a new note under today's inbox // otherwise just create a new note under today's inbox
const { title, content, images } = req.body; const { title, content, images } = req.body;
const clipType = "clippings"; const clipType = "clippings";
const clipperInbox = getClipperInboxNote(); const clipperInbox = await getClipperInboxNote();
const pageUrl = htmlSanitizer.sanitizeUrl(req.body.pageUrl); const pageUrl = htmlSanitizer.sanitizeUrl(req.body.pageUrl);
let clippingNote = findClippingNote(clipperInbox, pageUrl, clipType); let clippingNote = findClippingNote(clipperInbox, pageUrl, clipType);
@ -89,17 +87,17 @@ function findClippingNote(clipperInboxNote: BNote, pageUrl: string, clipType: st
return clipType ? notes.find((note) => note.getOwnedLabelValue("clipType") === clipType) : notes[0]; return clipType ? notes.find((note) => note.getOwnedLabelValue("clipType") === clipType) : notes[0];
} }
function getClipperInboxNote() { async function getClipperInboxNote() {
let clipperInbox = attributeService.getNoteWithLabel("clipperInbox"); let clipperInbox = attributeService.getNoteWithLabel("clipperInbox");
if (!clipperInbox) { if (!clipperInbox) {
clipperInbox = dateNoteService.getDayNote(dateUtils.localNowDate()); clipperInbox = await dateNoteService.getDayNote(dateUtils.localNowDate());
} }
return clipperInbox; return clipperInbox;
} }
function createNote(req: Request) { async function createNote(req: Request) {
const { content, images, labels } = req.body; const { content, images, labels } = req.body;
const clipType = htmlSanitizer.sanitize(req.body.clipType); const clipType = htmlSanitizer.sanitize(req.body.clipType);
@ -108,7 +106,7 @@ function createNote(req: Request) {
const trimmedTitle = (typeof req.body.title === "string") ? req.body.title.trim() : ""; const trimmedTitle = (typeof req.body.title === "string") ? req.body.title.trim() : "";
const title = trimmedTitle || `Clipped note from ${pageUrl}`; const title = trimmedTitle || `Clipped note from ${pageUrl}`;
const clipperInbox = getClipperInboxNote(); const clipperInbox = await getClipperInboxNote();
let note = findClippingNote(clipperInbox, pageUrl, clipType); let note = findClippingNote(clipperInbox, pageUrl, clipType);
if (!note) { if (!note) {
@ -215,9 +213,9 @@ function handshake() {
}; };
} }
function findNotesByUrl(req: Request) { async function findNotesByUrl(req: Request) {
const pageUrl = req.params.noteUrl; const pageUrl = req.params.noteUrl;
const clipperInbox = getClipperInboxNote(); const clipperInbox = await getClipperInboxNote();
const foundPage = findClippingNote(clipperInbox, pageUrl, null); const foundPage = findClippingNote(clipperInbox, pageUrl, null);
return { return {
noteId: foundPage ? foundPage.noteId : null noteId: foundPage ? foundPage.noteId : null