Ticket #3409: t3409_highlight_playernames_v10.patch

binaries/data/mods/public/gui/common/functions_utility.js

@@ -54 +54 @@
     else
         return 0;
 }
 
 /**
+ * Colorizes playernames in the given text and escapes the remaining text.
+ * Requires g_PlayerAssignments and colorizePlayernameByGUID.
+ */
+function highlightPlayernames(text)
+{
+    // Check longest playernames first, in case one playername is part of another
+    let sortedGUIDs = Object.keys(g_PlayerAssignments).sort((guidA, guidB) =>
+        g_PlayerAssignments[guidB].name.length - g_PlayerAssignments[guidA].name.length
+    );
+
+    let tmpBuffer = "";
+    let output = "";
+    let charIndex = 0;
+
+    // Replace all occurances of all playernames from left to right
+    while (charIndex < text.length)
+    {
+        let replaced = false;
+        for (let guid of sortedGUIDs)
+        {
+            let playername = g_PlayerAssignments[guid].name;
+            if (text.indexOf(playername, charIndex) != charIndex)
+                continue;
+
+            output += escapeText(tmpBuffer) + colorizePlayernameByGUID(guid);
+            charIndex += playername.length;
+            tmpBuffer = "";
+            replaced = true;
+            break;
+        }
+
+        if (!replaced)
+            tmpBuffer += text[charIndex++];
+    }
+
+    if (tmpBuffer.length)
+        output += escapeText(tmpBuffer);
+
+    return output;
+}
+
+/**
  * Escape tag start and escape characters, so users cannot use special formatting.
  * Also limit string length to 256 characters (not counting escape characters).
  */
 function escapeText(text)
 {

binaries/data/mods/public/gui/gamesetup/gamesetup.js

@@ -45 +45 @@
     "disconnect": (msg, user) => systemMessage(sprintf(translate("%(username)s has left"), { "username": user })),
     "kicked": (msg, user) => systemMessage(sprintf(translate("%(username)s has been kicked"), { "username": user })),
     "banned": (msg, user) => systemMessage(sprintf(translate("%(username)s has been banned"), { "username": user })),
     "chat": (msg, user) => sprintf(translate("%(username)s %(message)s"), {
         "username": senderFont(sprintf(translate("<%(username)s>"), { "username": user })),
-        "message": escapeText(msg.text || "")
+        "message": highlightPlayernames(msg.text || "")
     }),
     "ready": (msg, user) => sprintf(translate("* %(username)s is ready!"), {
         "username": user
     }),
     "not-ready": (msg, user) => sprintf(translate("* %(username)s is not ready."), {

binaries/data/mods/public/gui/session/messages.js

@@ -736 +736 @@
             translateObjectKeys(parameters, msg.translateParameters);
             msg.text = sprintf(msg.text, parameters);
         }
     }
     else
-        msg.text = escapeText(msg.text);
+        msg.text = highlightPlayernames(msg.text);
 
     // GUID for players, playerID for AIs
     let coloredUsername = msg.guid != -1 ? colorizePlayernameByGUID(msg.guid) : colorizePlayernameByID(msg.player);
 
     return sprintf(g_ChatCommands[isMe ? "me" : "regular"][msg.context ? "context" : "no-context"], {