Polish

app/javascript/models/client_message.js

@@ -18,7 +18,7 @@ export default class ClientMessage {
       body,
       messageTimestamp: Math.floor(now.getTime()),
       messageDatetime: now.toISOString(),
-      messageClasses: this.#containsOnlyEmoji(this.#plainTextFromNode(node)) ? "message--emoji" : "",
+      messageClasses: this.#messageClassesFromNode(node),
     })
   }
 
@@ -52,6 +52,14 @@ export default class ClientMessage {
     }
   }
 
+  #messageClassesFromNode(node) {
+    if (this.#containsOnlyEmoji(this.#plainTextFromNode(node))) {
+      return "message--emoji"
+    } else {
+      return ""
+    }
+  }
+
 
   #isPlayCommand(node) {
     return this.#matchPlayCommand(node)
@@ -62,7 +70,11 @@ export default class ClientMessage {
   }
 
   #plainTextFromNode(node) {
-    return this.#isRichText(node) ? node.toString()?.trim() : node
+    if (this.#isRichText(node)) {
+      return node.toString().trim()
+    } else {
+      return node
+    }
   }
 
   #isRichText(node) {

app/javascript/models/message_formatter.js

@@ -77,14 +77,15 @@ export default class MessageFormatter {
 
   #highlightCodeBlock(block) {
     this.#normalizeLineBreaks(block)
-    if (!this.#isPlainText(block)) return
 
-    const language = block.dataset.language
-    if (language && window.hljs.getLanguage(language)) {
-      block.classList.add(`language-${language}`)
+    if (this.#isPlainText(block)) {
+      const language = block.dataset.language
+      if (language && window.hljs.getLanguage(language)) {
+        block.classList.add(`language-${language}`)
+      }
+
+      window.hljs.highlightElement(block)
     }
-
-    window.hljs.highlightElement(block)
   }
 
   // Lexxy breaks code block lines with <br>, Trix-era blocks used newlines