From 30e8e476b91a1c28bf0a768ad1d77c8474df8848 Mon Sep 17 00:00:00 2001
From: Jane Petrovna <jane@j4.pm>
Date: Tue, 28 Dec 2021 20:20:48 -0500
Subject: [PATCH] fixes

---
 src/util/webserver.rs | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/util/webserver.rs b/src/util/webserver.rs
index f77f012..d5ba5b5 100644
--- a/src/util/webserver.rs
+++ b/src/util/webserver.rs
@@ -1,9 +1,9 @@
 use std::net::TcpListener;
 use std::thread;
 use tungstenite::accept;
-use util::pattern::*;
+use crate::util::pattern;
 
-pub fn websocket(pattern: &mut Vec<Box<dyn Pattern>>) {
+pub fn websocket(pattern: &mut Vec<Box<dyn pattern::Pattern>>) {
     let server = TcpListener::bind("0.0.0.0:29999").unwrap();
     for stream in server.incoming() {
         thread::spawn (move || {
@@ -11,17 +11,18 @@ pub fn websocket(pattern: &mut Vec<Box<dyn Pattern>>) {
             loop {
                 let input = websocket.read_message().unwrap();
                 if input.is_text() {
-                    let mul_string = input.to_text().unwrap_or("unit");
-                    match mul_string.iter().cloned().map(parse_line).collect() {
+                    let string = input.to_text().unwrap_or("unit");
+                    let mul_string = pattern::format_multiline(string);
+                    match mul_string.iter().cloned().map(pattern::parse_line).collect() {
                         Ok(patterns) => { 
-                            pattern = patterns;
-                            let text = format!("Ok!\n\n{}", mul_string);
+                            *pattern = patterns;
+                            let text = format!("Ok!\n\n{}", string);
                             let msg = tungstenite::Message::from(text);
                             websocket.write_message(msg).unwrap();
                         }
                         Err(err) => {
                             println!("ret err {:?}", err);
-                            let msg = tungstenite::Message::from(err);
+                            let msg = tungstenite::Message::from(err.to_string());
                             websocket.write_message(msg).unwrap();
                         }
                     }
@@ -33,4 +34,4 @@ pub fn websocket(pattern: &mut Vec<Box<dyn Pattern>>) {
             }
         });
     }
-}
\ No newline at end of file
+}