From 0bce5114eb1df0713d4e100a62ca144db89eb9d1 Mon Sep 17 00:00:00 2001 From: Vitaly Date: Fri, 29 Sep 2023 13:57:19 +0300 Subject: [PATCH 1/2] fix(regression): chat display should work on all versions --- src/chat.js | 23 +---------------------- 1 file changed, 1 insertion(+), 22 deletions(-) diff --git a/src/chat.js b/src/chat.js index 54e4197c7..1dc5f4285 100644 --- a/src/chat.js +++ b/src/chat.js @@ -319,28 +319,7 @@ class ChatBox extends LitElement { } this.hide() - // loadedData.protocol.play.toClient.types - const handleClientEvents = (packets) => { - for (const [packet, handler] of Object.entries(packets)) { - bot._client.on(packet, handler) - } - } - handleClientEvents({ - playerChat ({ formattedMessage, plainMessage, senderName }) { - client.emit('chat', { - message: formattedMessage || JSON.stringify({ text: `<${JSON.parse(senderName || '{}').text}> ${plainMessage}` }) - }) - }, - systemChat ({ formattedMessage }) { - client.emit('chat', { - message: formattedMessage - }) - }, - }) - client.on('chat', (packet) => { - // Handle new message - const fullmessage = JSON.parse(packet.message.toString()) - + bot.on('message', (fullmessage) => { const parts = formatMessage(fullmessage) const lastId = this.messages.at(-1)?.id ?? 0 From ae546d060f0d7722ae0d63513d423fe2735ec30f Mon Sep 17 00:00:00 2001 From: Vitaly Date: Fri, 29 Sep 2023 15:13:56 +0300 Subject: [PATCH 2/2] fix(regression): fix messages wrapping. fix chat scroll on open --- src/chat.js | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/chat.js b/src/chat.js index 1dc5f4285..ed99c876f 100644 --- a/src/chat.js +++ b/src/chat.js @@ -81,11 +81,11 @@ class ChatBox extends LitElement { scrollbar-width: none; } /* unsupported by firefox */ - .chat-completions-items::-webkit-scrollbar { + ::-webkit-scrollbar { width: 5px; background-color: rgb(24, 24, 24); } - .chat-completions-items::-webkit-scrollbar-thumb { + ::-webkit-scrollbar-thumb { background-color: rgb(50, 50, 50); } .chat-completions-items > div { @@ -119,9 +119,11 @@ class ChatBox extends LitElement { pointer-events: none; overflow: hidden; width: 100%; + scrollbar-width: thin; } .chat.opened { pointer-events: auto; + overflow-y: auto; } input[type=text], #chatinput { @@ -154,9 +156,10 @@ class ChatBox extends LitElement { } .chat-message { - display: flex; padding-left: 4px; background-color: rgba(0, 0, 0, 0.5); + list-style: none; + word-break: break-all; } .chat-message-fadeout { @@ -178,7 +181,6 @@ class ChatBox extends LitElement { } .chat-message-part { - white-space: pre-wrap; } ` }