Ticket #3281: t3281_highlighted_playername_almost_without_regex.patch

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

@@ -828 +828 @@
     if (!msg.key)
         msg.key = null;
     if (!msg.datetime)
         msg.datetime = null;
 
-    // Highlight local user's nick
-    if (msg.text.indexOf(g_Name) != -1 && g_Name != msg.from)
-        msg.text = msg.text.replace(new RegExp('\\b' + '\\' + g_Name + '\\b', "g"), colorPlayerName(g_Name));
+    if (g_Name != msg.from)
+        msg.text = highlightPlayername(msg.text, g_Name);
 
     // Run spam test if it's not a historical message
     if (!msg.datetime)
         updateSpamMonitor(msg.from);
     if (isSpam(msg.text, msg.from))
@@ -849 +848 @@
         g_ChatMessages.push(formatted);
         Engine.GetGUIObjectByName("chatText").caption = g_ChatMessages.join("\n");
     }
 }
 
+// Replaces each occurance of the playername in the text with a highlighted / colored version
+function highlightPlayername(txt, name)
+{
+    var leftIndex = -1, rightIndex = -1;
+    var colored = colorPlayerName(name);
+    while (rightIndex < txt.length)
+    {
+        leftIndex = txt.indexOf(name, rightIndex);
+        rightIndex = leftIndex + name.length; 
+
+        if (leftIndex == -1)
+            break;
+        
+        // Left of the name must be non-alphanumerical character or no character at all
+        if (leftIndex > 0 && txt.substr(leftIndex - 1, 1).match(/^[0-9a-z]$/))
+            continue;
+        
+        // Right of the name must be non-alphanumerical character or no character at all
+        if (rightIndex < txt.length && txt.substr(rightIndex, 1).match(/^[0-9a-z]$/))
+            continue;
+
+        // Highlight local user's nick 
+        txt = txt.substr(0, leftIndex) + colored + txt.substr(leftIndex + name.length);
+
+        rightIndex = leftIndex + colored.length;
+    };
+    return txt;
+}
+
 function ircSplit(string)
 {
     var idx = string.indexOf(' ');
     if (idx != -1)
         return [string.substr(1,idx-1), string.substr(idx+1)];