Dockery/Trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-10-31 02:16:05 +01:00
Code Issues Packages Projects Releases Activity

fix(ws): new attachments' title not decrypted (closes #6473)

Browse Source
This commit is contained in:
Elian Doran
2025-07-25 23:14:32 +03:00
parent cbd8cb80ab
commit 7d7c3e7cdb
1 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
apps/server/src/services/ws.ts
View File

@@ -196,13 +196,21 @@ function fillInAdditionalProperties(entityChange: EntityChange) {
entityChange.entity = sql.getRow(/*sql*/`SELECT * FROM options WHERE name = ?`, [entityChange.entityId]); entityChange.entity = sql.getRow(/*sql*/`SELECT * FROM options WHERE name = ?`, [entityChange.entityId]);
} }
} else if (entityChange.entityName === "attachments") { } else if (entityChange.entityName === "attachments") {
entityChange.entity = sql.getRow( entityChange.entity = becca.getAttachment(entityChange.entityId);
/*sql*/`SELECT attachments.*, LENGTH(blobs.content) AS contentLength
FROM attachments if (!entityChange.entity) {
JOIN blobs USING (blobId) entityChange.entity = sql.getRow(
WHERE attachmentId = ?`, /*sql*/`SELECT attachments.*, LENGTH(blobs.content) AS contentLength
[entityChange.entityId] FROM attachments
); JOIN blobs USING (blobId)
WHERE attachmentId = ?`,
[entityChange.entityId]
);
if (entityChange.entity?.isProtected) {
entityChange.entity.title = protectedSessionService.decryptString(entityChange.entity.title || "");
}
}
} }
if (entityChange.entity instanceof AbstractBeccaEntity) { if (entityChange.entity instanceof AbstractBeccaEntity) {