diff --git a/gui/preload-chat.js b/gui/preload-chat.js index fab02ad7..71d58f1e 100644 --- a/gui/preload-chat.js +++ b/gui/preload-chat.js @@ -460,13 +460,12 @@ window.addEventListener("DOMContentLoaded", () => { } var timestamp = Math.floor(Date.now() / 1000); - var uuid = uuidv4(); - let uuidlast = uuid.lastIndexOf("-"); - uuidlast += 1; - if (uuidlast > 0) { - uuid = uuid.substring(uuidlast); - } - + var uuid = uuidv4(); + let uuidlast = uuid.lastIndexOf("-"); + uuidlast += 1; + if (uuidlast > 0) { + uuid = uuid.substring(uuidlast); + } // check if broadcast if (dxcallsign.startsWith("BC-")) { @@ -476,16 +475,16 @@ window.addEventListener("DOMContentLoaded", () => { // .toUpperCase(); //dxcallsignWithID = "BC-" + broadcastChannelIdCRC; var tnc_command = "broadcast"; - var message_type = "broadcast_transmit" + var message_type = "broadcast_transmit"; let Data = { command: tnc_command, broadcastChannel: dxcallsign, data: chatmessage, - uuid: uuid + uuid: uuid, }; ipcRenderer.send("run-tnc-command", Data); } else { - var message_type = "transmit" + var message_type = "transmit"; var file_checksum = crc32(file).toString(16).toUpperCase(); var tnc_command = "msg"; var data_with_attachment = @@ -1123,7 +1122,7 @@ update_chat = function (obj) { getSetUserInformation(dxcallsign); getSetUserSharedFolder(dxcallsign); -var new_callsign = ` + var new_callsign = `
@@ -1142,7 +1141,6 @@ var new_callsign = ` `; - document .getElementById("list-tab") .insertAdjacentHTML("beforeend", new_callsign); @@ -1289,8 +1287,12 @@ var new_callsign = ` var new_message = `
- - + +
@@ -1321,7 +1323,7 @@ var new_callsign = ` } if (obj.type == "transmit") { - console.log(obj) + console.log(obj); //console.log('msg-' + obj._id + '-status') if (obj.status == "failed") { @@ -2046,7 +2048,7 @@ async function updateAllChat(clear) { .then(async function (result) { // handle result async //document.getElementById("blurOverlay").classList.add("bg-primary"); - console.log(result) + console.log(result); if (typeof result !== "undefined") { for (const item of result.docs) { //await otherwise history will not be in chronological order @@ -2086,23 +2088,19 @@ function getSetUserSharedFolder(selected_callsign) { if ( selected_callsign == "" || selected_callsign == null || - typeof selected_callsign == "undefined" ) { console.log("return triggered"); return; } - // disable button if broadcast - if(selected_callsign.startsWith("BC-")){ - document.getElementById("sharedFolderDXButton").disabled = true; - - }else{ - document.getElementById("sharedFolderDXButton").disabled = false; + // disable button if broadcast + if (selected_callsign.startsWith("BC-")) { + document.getElementById("sharedFolderDXButton").disabled = true; + } else { + document.getElementById("sharedFolderDXButton").disabled = false; } - - returnObjFromCallsign(users, selected_callsign) .then(function (data) { console.log(data); @@ -2233,21 +2231,15 @@ function getSetUserInformation(selected_callsign) { return; } - - - // disable button if broadcast - if(selected_callsign.startsWith("BC-")){ - document.getElementById("userModalDXButton").disabled = true; - document.getElementById("ping").disabled = true; - - }else{ - document.getElementById("userModalDXButton").disabled = false; - document.getElementById("ping").disabled = false; - + // disable button if broadcast + if (selected_callsign.startsWith("BC-")) { + document.getElementById("userModalDXButton").disabled = true; + document.getElementById("ping").disabled = true; + } else { + document.getElementById("userModalDXButton").disabled = false; + document.getElementById("ping").disabled = false; } - - document.getElementById("dx_user_info_callsign").innerHTML = selected_callsign; @@ -2284,8 +2276,6 @@ function getSetUserInformation(selected_callsign) { defaultUserIcon; } - - // Callsign list elements document.getElementById( "chat-" + selected_callsign + "-list-dxgrid"