diff --git a/gui/main.js b/gui/main.js index 87a4380c..81fec134 100644 --- a/gui/main.js +++ b/gui/main.js @@ -471,6 +471,10 @@ console.log(filepath.filePaths[0]) var filename = path.basename(filepath.filePaths[0]) var mimeType = mime.getType(filename) + console.log(mimeType) + if (mimeType == '' || typeof(mimeType) !== 'null'){ + mimeType = 'plain/text' + } chat.webContents.send('return-selected-files', {data : data, mime: mimeType, filename: filename}) }) diff --git a/gui/preload-chat.js b/gui/preload-chat.js index 3dceeaa7..e02063ef 100644 --- a/gui/preload-chat.js +++ b/gui/preload-chat.js @@ -163,7 +163,6 @@ window.addEventListener('DOMContentLoaded', () => { db.post({ _id: uuid, - _rev: doc._rev, timestamp: Math.floor(Date.now() / 1000), dxcallsign: dxcallsign.toUpperCase(), dxgrid: '---', @@ -193,6 +192,9 @@ db.post({ console.log(file); console.log(filename); console.log(filetype); + if (filetype == ''){ + filetype = 'plain/text' + } var data_with_attachment = chatmessage + split_char + filename + split_char + filetype + split_char + file; @@ -211,7 +213,6 @@ db.post({ ipcRenderer.send('run-tnc-command', Data); db.post({ _id: uuid, - _rev: doc._rev, timestamp: Math.floor(Date.now() / 1000), dxcallsign: dxcallsign, dxgrid: 'null', @@ -242,7 +243,7 @@ db.post({ // clear input document.getElementById('chatModuleMessage').value = '' - // after adding file data to our attachment varible, delete it from global + // after adding file data to our attachment variable, delete it from global filetype = ''; file = ''; filename = ''; @@ -256,6 +257,8 @@ db.post({ }); ipcRenderer.on('return-selected-files', (event, arg) => { filetype = arg.mime; + console.log(filetype) + file = arg.data; filename = arg.filename; document.getElementById('selectFilesButton').innerHTML = ` @@ -429,6 +432,7 @@ update_chat = function(obj) { } else { var filename = ''; var fileheader = ''; + var filetype = 'text/plain'; var controlarea_transmit = `