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

Merge branch 'stable'

Browse Source 
# Conflicts:
#	package.json
This commit is contained in:
zadam
2019-07-11 22:27:27 +02:00
parent dcebcb0e73 13e9f9f9e7
commit 706fc647ff
7 changed files with 29 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/routes/api/sender.js
View File

@@ -1,5 +1,6 @@
"use strict";
const imageType = require('image-type');
const imageService = require('../../services/image');
const dateNoteService = require('../../services/date_notes');
const noteService = require('../../services/notes');
@@ -11,9 +12,11 @@ async function uploadImage(req) {
return [400, "Unknown image type: " + file.mimetype];
}
const originalName = "Sender image." + imageType(file.buffer).ext;
const parentNote = await dateNoteService.getDateNote(req.headers['x-local-date']);
const {noteId} = await imageService.saveImage(file.buffer, "Sender image", parentNote.noteId, true);
const {noteId} = await imageService.saveImage(file.buffer, originalName, parentNote.noteId, true);
return {
noteId: noteId