release 0.26.1

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "trilium",
-  "version": "0.25.2",
+  "version": "0.26.0-beta",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -399,9 +399,9 @@
       "integrity": "sha512-ONhaKPIufzzrlNbqtWFFd+jlnemX6lJAgq9ZeiZtS7I1PIf/la7CW4m83rTXRnVnsMbW2k56pGYu7AUFJD9Pow=="
     },
     "@types/node": {
-      "version": "8.10.38",
+      "version": "8.10.39",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-8.10.38.tgz",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-8.10.39.tgz",
-      "integrity": "sha512-EibsnbJerd0hBFaDjJStFrVbVBAtOy4dgL8zZFw0uOvPqzBAX59Ci8cgjg3+RgJIWhsB5A4c+pi+D4P9tQQh/A==",
+      "integrity": "sha512-rE7fktr02J8ybFf6eysife+WF+L4sAHWzw09DgdCebEu+qDwMvv4zl6Bc+825ttGZP73kCKxa3dhJOoGJ8+5mA==",
       "dev": true
     },
     "abab": {
@@ -2375,9 +2375,9 @@
       "integrity": "sha512-0xy4A/twfrRCnkhfk8ErDi5DqdAsAqeGxht4xkCUrsvhhbQNs7E+4jV0CN7+NKIY0aHE72+XvqtBIXzD31ZbXQ=="
     },
     "electron": {
-      "version": "4.0.0-beta.9",
+      "version": "4.0.0-beta.11",
-      "resolved": "https://registry.npmjs.org/electron/-/electron-4.0.0-beta.9.tgz",
+      "resolved": "https://registry.npmjs.org/electron/-/electron-4.0.0-beta.11.tgz",
-      "integrity": "sha512-BPFkN4BFQy88x2ZHVmzI03i1mUgaQF/uROPb/TlGB/WNAD3v2OvA9Ak9yZ5ADNnwhlR28DtUGs/MuZfDZHZBoQ==",
+      "integrity": "sha512-bn8bVvtur+KK1FlVEOJgXZ24Id3pgqUtQ8kgLhrgSEiIpTu/uNYdhcR+nLYEl4QekIMSLv198lOsx2suyzoyow==",
       "dev": true,
       "requires": {
         "@types/node": "^8.0.24",

package.json

@@ -2,7 +2,7 @@
   "name": "trilium",
   "productName": "Trilium Notes",
   "description": "Trilium Notes",
-  "version": "0.26.0-beta",
+  "version": "0.26.1",
   "license": "AGPL-3.0-only",
   "main": "electron.js",
   "bin": {
@@ -65,7 +65,7 @@
   },
   "devDependencies": {
     "devtron": "1.4.0",
-    "electron": "4.0.0-beta.9",
+    "electron": "4.0.0-beta.11",
     "electron-compile": "6.4.3",
     "electron-packager": "13.0.1",
     "electron-rebuild": "1.8.2",

src/public/robots.txt

@@ -0,0 +1,2 @@
+User-agent: *
+Disallow: /

src/services/build.js

@@ -1 +1 @@
-module.exports = { buildDate:"2018-12-18T22:49:48+01:00", buildRevision: "f693dc31e82f1822b7393d12b53afdc0d06f5297" };
+module.exports = { buildDate:"2018-12-20T19:54:09+01:00", buildRevision: "14bd5d301dd1b0c9a1a8ea564ee55b557cb6b1be" };

src/services/request.js

@@ -54,6 +54,8 @@ function exec(opts) {
                 headers
             });
 
+            request.on('error', err => reject(generateError(opts, err)));
+
             request.on('response', response => {
                 if (![200, 201, 204].includes(response.statusCode)) {
                     reject(generateError(opts, response.statusCode + ' ' + response.statusMessage));

src/services/sync.js

@@ -252,12 +252,9 @@ async function getEntityRow(entityName, entityId) {
 
         const entity = await sql.getRow(`SELECT * FROM ${entityName} WHERE ${primaryKey} = ?`, [entityId]);
 
-        if (entityName === 'notes' && entity.type === 'file') {
+        if (entityName === 'notes' && (entity.type === 'file' || entity.type === 'image')) {
             entity.content = entity.content.toString("binary");
         }
-        else if (entityName === 'images') {
-            entity.data = entity.data.toString('base64');
-        }
 
         return entity;
     }

src/services/sync_update.js

@@ -39,7 +39,7 @@ async function updateEntity(sync, entity, sourceId) {
 }
 
 function deserializeNoteContentBuffer(note) {
-    if (note.type === 'file') {
+    if (note.type === 'file' || note.type === 'image') {
         note.content = new Buffer(note.content, 'binary');
     }
 }