From e027c71341cab5efa225831fd3fcd33710d9b7f0 Mon Sep 17 00:00:00 2001
From: Unrud <unrud@outlook.com>
Date: Tue, 22 Feb 2022 16:17:55 +0100
Subject: [PATCH] Normalize line endings client side

---
 main.go       | 3 ---
 webdata/fn.js | 3 ++-
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/main.go b/main.go
index 3b0199e..8ede20d 100644
--- a/main.go
+++ b/main.go
@@ -65,9 +65,6 @@ func processCommand(controller Controller, command string) error {
 	}
 	if command[0] == 't' {
 		text := command[1:]
-		// normalize line endings
-		text = strings.Replace(text, "\r\n", "\n", -1)
-		text = strings.Replace(text, "\r", "\n", -1)
 		if !utf8.ValidString(text) {
 			return errors.New("invalid utf-8")
 		}
diff --git a/webdata/fn.js b/webdata/fn.js
index c9a1b62..acd7e29 100644
--- a/webdata/fn.js
+++ b/webdata/fn.js
@@ -571,7 +571,8 @@ window.addEventListener("load", function() {
     });
     document.getElementById("sendbutton").addEventListener("click", function() {
         if (keyboardTextarea.value) {
-            ws.send("t" + keyboardTextarea.value);
+            // normalize line endings
+            ws.send("t" + keyboardTextarea.value.replace(/\r\n?/g, "\n"));
             keyboardTextarea.value = "";
             keyboardTextarea.oninput();
         }