From ac813064fd5a351739d04812bf1de2a741b2e57a Mon Sep 17 00:00:00 2001 From: Rusty Striker Date: Fri, 4 Oct 2024 14:44:10 +0300 Subject: [PATCH 1/3] socket path is now relative to domain (but not to directory in domain) --- assets/web/socket.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/assets/web/socket.js b/assets/web/socket.js index d660fab..d68ca6f 100644 --- a/assets/web/socket.js +++ b/assets/web/socket.js @@ -1,5 +1,5 @@ const tavern = { - socket: socket = new WebSocket('ws://localhost:3001/ws'), + socket: socket = new WebSocket('ws:/' + window.location.host + '/ws'), connected: false, loggedIn: false, call: (f, ...args) => { @@ -41,4 +41,4 @@ tavern.get_chat_history = (from, amount) => { tavern.get_last_msgs = (amount) => { if(!tavern.connected || tavern.loggedIn) { return false; } tavern.socket.send(JSON.stringify({ get_last_messages: { amount: amount } })) -} \ No newline at end of file +} From 69baf79b8f8f065a4d66271338c8282be1e93c0d Mon Sep 17 00:00:00 2001 From: Rusty Striker Date: Fri, 4 Oct 2024 14:45:53 +0300 Subject: [PATCH 2/3] modify msg source to show actual source id as well as (character) source --- src/lib.rs | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/lib.rs b/src/lib.rs index af1e2be..f00ffd2 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -41,8 +41,12 @@ impl GameServer { continue; } if msg.source.is_empty() { - msg.source = id.clone(); + msg.source = format!("({})", id.clone()); } + else { + msg.source = format!("{} ({})", msg.source, id.clone()); + } + self.chat.push((id.clone(), msg.clone())); _ = broadcast.send((None, api::Response::Message(msg))); }, @@ -70,4 +74,4 @@ impl GameServer { } _ = broadcast.send((None, api::Response::Shutdown)); } -} \ No newline at end of file +} From 97475599a73d75f6c0e1f019a28c7e131bbd9061 Mon Sep 17 00:00:00 2001 From: Rusty Striker Date: Fri, 4 Oct 2024 14:46:20 +0300 Subject: [PATCH 3/3] custom right click menu (not finished, just showing and hiding currently) --- assets/web/index.html | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/assets/web/index.html b/assets/web/index.html index db6b233..27685d1 100644 --- a/assets/web/index.html +++ b/assets/web/index.html @@ -62,6 +62,10 @@
${m.text} ` + msg.oncontextmenu = () => { + document.getElementById('msg-context-menu').style.display = 'flex'; + return false; + } let history = document.getElementById('chat-history'); // this is to force update everytime we get a duplicate msg to allow msg editing (yay) let exists = Array.from(history.children).filter(e => e.style.order == m.id)[0]; @@ -137,7 +141,6 @@ background-color:#0f0f2f; } .chat-message { - background-color: #ffffd6; color: #000000; border-width: 2px; @@ -185,5 +188,10 @@ + - \ No newline at end of file +