From 8cfc48e9c0f4275ac4ce85ade26c6af538108265 Mon Sep 17 00:00:00 2001
From: Revertron <r@revertron.com>
Date: Tue, 26 Jul 2022 18:09:37 +0200
Subject: [PATCH] Small refactoring and fix LF escape in domain data.

---
 Cargo.lock         | 2 +-
 Cargo.toml         | 2 +-
 src/p2p/network.rs | 5 +++--
 src/web_ui.rs      | 2 +-
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 127403c..307e222 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "alfis"
-version = "0.7.7"
+version = "0.7.8"
 dependencies = [
  "base64",
  "bincode",
diff --git a/Cargo.toml b/Cargo.toml
index 38d9837..3513ab4 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "alfis"
-version = "0.7.7"
+version = "0.7.8"
 authors = ["Revertron <alfis@revertron.com>"]
 edition = "2021"
 build = "build.rs"
diff --git a/src/p2p/network.rs b/src/p2p/network.rs
index 578c5e5..f918869 100644
--- a/src/p2p/network.rs
+++ b/src/p2p/network.rs
@@ -250,7 +250,7 @@ impl Network {
                         debug!("Node from {} disconnected", peer.get_addr().ip());
                         return false;
                     }
-                    match peer.get_state().clone() {
+                    match *peer.get_state() {
                         State::Connected => {
                             let stream = peer.get_stream();
                             return match read_client_handshake(stream) {
@@ -333,9 +333,9 @@ impl Network {
                     let new_state = self.handle_message(message, &event.token(), seen_blocks);
                     let peer = self.peers.get_mut_peer(&event.token()).unwrap();
                     //debug!("Got message from {}: {:?}", &peer.get_addr(), &m);
-                    let stream = peer.get_stream();
                     match new_state {
                         State::Message { data } => {
+                            let stream = peer.get_stream();
                             registry.reregister(stream, event.token(), Interest::WRITABLE).unwrap();
                             peer.set_state(State::Message { data });
                         }
@@ -358,6 +358,7 @@ impl Network {
                             self.peers.ignore_peer(registry, &event.token());
                         }
                         State::SendLoop => {
+                            let stream = peer.get_stream();
                             registry.reregister(stream, event.token(), Interest::WRITABLE).unwrap();
                             peer.set_state(State::SendLoop);
                         }
diff --git a/src/web_ui.rs b/src/web_ui.rs
index f82fd42..12c236f 100644
--- a/src/web_ui.rs
+++ b/src/web_ui.rs
@@ -360,7 +360,7 @@ fn load_domains(context: &mut MutexGuard<Context>, handle: &Handle<()>) {
     //debug!("Domains: {:?}", &domains.values());
     for (_identity, (domain, timestamp, data)) in domains {
         let d = serde_json::to_string(&data).unwrap();
-        let d = d.replace("'", "\\'");
+        let d = d.replace("'", "\\'").replace("\\n", "\\\\n");
         let command = format!("addMyDomain('{}', {}, {}, '{}');", &domain, timestamp, timestamp + DOMAIN_LIFETIME, &d);
         let _ = handle.dispatch(move |web_view|{
             web_view.eval(&command)