From 181ee3ef6d53a3b215c63529d4f9345a6e805c6a Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Wed, 11 Dec 2024 08:16:37 +0200 Subject: [PATCH 1/2] fix(server): not building due to API change --- src/routes/api/sender.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/routes/api/sender.ts b/src/routes/api/sender.ts index 890eefa98..22eea766d 100644 --- a/src/routes/api/sender.ts +++ b/src/routes/api/sender.ts @@ -7,7 +7,7 @@ import sanitize_attribute_name from "../../services/sanitize_attribute_name.js"; import specialNotesService from "../../services/special_notes.js"; import { Request } from 'express'; -function uploadImage(req: Request) { +async function uploadImage(req: Request) { const file = req.file; if (!file) { @@ -24,7 +24,7 @@ function uploadImage(req: Request) { return [400, "Invalid image content type."]; } - const uploadedImageType = imageType(file.buffer); + const uploadedImageType = await imageType(file.buffer); if (!uploadedImageType) { return [400, "Unable to determine image type."]; } From 55e3eae322cd631db3899a2a8a9050a37be4c783 Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Wed, 11 Dec 2024 08:16:48 +0200 Subject: [PATCH 2/2] chore(build): switch nix to electron 33 --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 8c67cfba6..62c37af8a 100644 --- a/package.json +++ b/package.json @@ -26,9 +26,9 @@ "start-test-server": "npm run switch-server; rimraf ./data-test; cross-env TRILIUM_DATA_DIR=./data-test TRILIUM_SYNC_SERVER_HOST=http://tsyncserver:4000 TRILIUM_ENV=dev TRILIUM_PORT=9999 ts-node src/main.ts", "qstart-server": "npm run switch-server && npm run start-server", "start-electron": "npm run prepare-dist && cross-env TRILIUM_DATA_DIR=./data TRILIUM_SYNC_SERVER_HOST=http://tsyncserver:4000 TRILIUM_ENV=dev electron ./dist/electron-main.js --inspect=5858 .", - "start-electron-nix": "npm run prepare-dist && cross-env TRILIUM_DATA_DIR=./data TRILIUM_SYNC_SERVER_HOST=http://tsyncserver:4000 TRILIUM_ENV=dev nix-shell -p electron_31 --run \"electron ./dist/electron-main.js --inspect=5858 .\"", + "start-electron-nix": "npm run prepare-dist && cross-env TRILIUM_DATA_DIR=./data TRILIUM_SYNC_SERVER_HOST=http://tsyncserver:4000 TRILIUM_ENV=dev nix-shell -p electron_33 --run \"electron ./dist/electron-main.js --inspect=5858 .\"", "start-electron-no-dir": "npm run prepare-dist && cross-env TRILIUM_ENV=dev electron --inspect=5858 .", - "start-electron-no-dir-nix": "npm run prepare-dist && cross-env TRILIUM_ENV=dev nix-shell -p electron_31 --run \"electron ./dist/electron-main.js --inspect=5858 .\"", + "start-electron-no-dir-nix": "npm run prepare-dist && cross-env TRILIUM_ENV=dev nix-shell -p electron_33 --run \"electron ./dist/electron-main.js --inspect=5858 .\"", "qstart-electron": "npm run switch-electron && npm run start-electron", "switch-server": "rimraf ./node_modules/better-sqlite3 && npm install", "switch-electron": "npx electron-rebuild",