Dockery/Trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-11-10 23:35:50 +01:00
Code Issues Packages Projects Releases Activity

server-ts: Address requested changes

Browse Source
This commit is contained in:
Elian Doran
2024-03-30 10:49:40 +02:00
parent 5e5add7e47
commit 3eb7ed5dda
11 changed files with 40 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/becca/becca-interface.ts
View File

@@ -11,6 +11,7 @@ import BAttachment = require('./entities/battachment');
import { AttachmentRow, RevisionRow } from './entities/rows';
import BBlob = require('./entities/bblob');
import BRecentNote = require('./entities/brecent_note');
import AbstractBeccaEntity = require('./entities/abstract_becca_entity');
interface AttachmentOpts {
includeContentLength?: boolean;
@@ -95,7 +96,7 @@ class Becca {
return this.notes[noteId];
}
getNoteOrThrow(noteId: string): BNote | null {
getNoteOrThrow(noteId: string): BNote {
const note = this.notes[noteId];
if (!note) {
throw new NotFoundError(`Note '${noteId}' doesn't exist.`);
@@ -190,7 +191,11 @@ class Becca {
.map(row => new BAttachment(row));
}
getBlob(entity: { blobId: string }): BBlob | null {
getBlob(entity: { blobId?: string }): BBlob | null {
if (!entity.blobId) {
return null;
}
const row = sql.getRow("SELECT *, LENGTH(content) AS contentLength FROM blobs WHERE blobId = ?", [entity.blobId]);
const BBlob = require('./entities/bblob'); // avoiding circular dependency problems
@@ -209,8 +214,7 @@ class Becca {
return this.etapiTokens[etapiTokenId];
}
/** @returns {AbstractBeccaEntity|null} */
getEntity(entityName: string, entityId: string) {
getEntity<T extends AbstractBeccaEntity<T>>(entityName: string, entityId: string): AbstractBeccaEntity<T> | null {
if (!entityName || !entityId) {
return null;
}