Log websocket messages in debug build

src/frontend/index.js

@@ -237,7 +237,7 @@ document.getElementById("file_cancel").onclick = function() {
 let msgLog = document.getElementById("msg_log");
 msgLog.onscroll = function() {
     let session = sessionsData.get(currentSessionId);
-    if (typeof sessions !== "undefined") {
+    if (typeof session !== "undefined") {
         if (session.isContact) {
             if (msgLog.scrollTop < 30) {
                 socket.send("load_msgs "+currentSessionId);
@@ -1245,9 +1245,9 @@ function displayHistory(scrollToBottom = true) {
                     }
                     let div;
                     if (entry[0]) { //is file
-                        div = generateFile(name, currentSessionId, true, entry[1]);
+                        div = generateFile(name, undefined, true, entry[1]);
                     } else {
-                        div = generateMessage(name, currentSessionId, entry[1]);
+                        div = generateMessage(name, undefined, entry[1]);
                     }
                     let li = document.createElement("li");
                     li.appendChild(div);

src/main.rs

@@ -69,7 +69,6 @@ async fn start_websocket_server(global_vars: Arc<RwLock<GlobalVars>>) -> u16 {
 fn discover_peers(session_manager: Arc<SessionManager>) {
     tokio::spawn(async move {
         discovery::discover_peers(move |discovery_manager, ip| {
-            println!("New peer discovered: {}", ip);
             let session_manager = session_manager.clone();
             if session_manager.is_identity_loaded() {
                 tokio::spawn( async move {
@@ -153,6 +152,8 @@ async fn websocket_worker(mut ui_connection: UiConnection, global_vars: Arc<RwLo
                         ui_connection.write_message(tungstenite::Message::Pong(Vec::new())); //not sure if I'm doing this right
                     } else if msg.is_text() {
                         let msg = msg.into_text().unwrap();
+                        #[cfg(debug_assertions)]
+                        println!("Message: {}", msg);
                         let mut ui_connection = ui_connection.clone();
                         let session_manager = session_manager.clone();
                         handle.spawn(async move {

src/session_manager.rs

@@ -438,6 +438,7 @@ impl SessionManager {
                                                 timestamp,
                                                 data: buffer,
                                             };
+                                            self.set_seen(session_id, false);
                                             self.with_ui_connection(|ui_connection| {
                                                 ui_connection.on_new_msg(&session_id, &msg);
                                             });
@@ -447,6 +448,7 @@ impl SessionManager {
                                             if let Some((filename, content)) = protocol::parse_file(&buffer) {
                                                 match self.store_file(&session_id, content) {
                                                     Ok(file_uuid) => {
+                                                        self.set_seen(session_id, false);
                                                         self.with_ui_connection(|ui_connection| {
                                                             ui_connection.on_new_file(&session_id, false, timestamp, filename, file_uuid);
                                                         });
@@ -469,9 +471,6 @@ impl SessionManager {
                                         }
                                         _ => {}
                                     }
-                                    if header == protocol::Headers::MESSAGE || header == protocol::Headers::FILE {
-                                        self.set_seen(session_id, false);
-                                    }
                                 }
                             }
                         }