fixed some missing files when merging

Author: louis-ev

core/exporter.js

@@ -195,10 +195,6 @@ module.exports = (function() {
                       typeof mediaMeta.thumbs !== 'undefined'
                     ) {
                       mediaMeta.thumbs.map(t => {
-                        if (!t) {
-                          return;
-                        }
-
                         if (t.hasOwnProperty('path')) {
                           tasks.push(
                             new Promise((resolve, reject) => {

core/file.js

@@ -23,11 +23,10 @@ module.exports = (function() {
         let presentationMd = path.join(api.getFolderPath(), "presentation.md");
         fs.access(presentationMd, fs.F_OK, function(err) {
           if (err) {
-            reject();
+            resolve(validator.unescape(global.appInfos.presentationMd));
           } else {
-            let presentationContent = fs.readFileSync(
-              presentationMd,
-              global.settings.textEncoding
+            let presentationContent = validator.unescape(
+              fs.readFileSync(presentationMd, global.settings.textEncoding)
             );
             presentationContent = api.parseData(presentationContent);
             resolve(presentationContent);

core/main.js

@@ -14,9 +14,7 @@ module.exports = function({ router }) {
   const is_electron = process.versions.hasOwnProperty("electron");
 
   console.log(`App is electron : ${is_electron}`);
-  console.log(
-    `Starting app ${global.appInfos.name} version ${global.appInfos.version}`
-  );
+  console.log(`Starting app ${global.appInfos.name}`);
   console.log(process.versions);
 
   const debug =

core/server-realtime_text_collaboration.js

@@ -1,5 +1,5 @@
 // var share = require('./sharedb-server');
-var ShareDB_logger = require('sharedb-logger');
+// var ShareDB_logger = require('sharedb-logger');
 var ShareDB = require('sharedb');
 ShareDB.types.register(require('rich-text').type);
 
@@ -59,7 +59,7 @@ module.exports = function(server) {
   const sharewss = new WebSocket.Server({ noServer: true });
   sharewss.on('connection', (client, req) => {
     dev.logfunction(
-      `server-realtime_text_collaboration • wss new client connection`
+      `server-realtime_text_collaboration • sharewss new client connection`
     );
 
     client.id = uuid();
@@ -166,6 +166,8 @@ module.exports = function(server) {
       client.isAlive = true;
     });
 
+    client.on('message', function() {});
+
     client.on('error', function(error) {
       dev.error(
         `server-realtime_text_collaboration • sharewss: client connection errored for ${client.id} with error = ${error}`
@@ -177,14 +179,14 @@ module.exports = function(server) {
     const pathname = url.parse(request.url).pathname;
 
     if (pathname === '/sharedb') {
-      wss.handleUpgrade(request, socket, head, function done(ws) {
-        wss.emit('connection', ws, request);
+      sharewss.handleUpgrade(request, socket, head, function done(ws) {
+        sharewss.emit('connection', ws, request);
       });
     }
   });
 
   setInterval(function() {
-    wss.clients.forEach(function(client) {
+    sharewss.clients.forEach(function(client) {
       if (client.isAlive === false) return client.terminate();
 
       client.isAlive = false;