Changeset 288 in code for trunk

Timestamp:

May 1, 2020, 5:51:22 PM (5 years ago)

Author:

contact

Message:

Improve highlight matching

Detect word boundaries instead of just doing a sub-string check.

File:

• trunk/upstream.go (modified) (3 diffs)

trunk/upstream.go

@@ -11 +11 @@
         "strings"
         "time"
+        "unicode"
+        "unicode/utf8"
 
         "github.com/emersion/go-sasl"
@@ -237 +239 @@
 }
 
+func isWordBoundary(r rune) bool {
+        switch r {
+        case '-', '_', '|':
+                return false
+        case '\u00A0':
+                return true
+        default:
+                return !unicode.IsLetter(r) && !unicode.IsNumber(r)
+        }
+}
+
+func isHighlight(text, nick string) bool {
+        for {
+                i := strings.Index(text, nick)
+                if i < 0 {
+                        return false
+                }
+
+                // Detect word boundaries
+                var left, right rune
+                if i > 0 {
+                        left, _ = utf8.DecodeLastRuneInString(text[:i])
+                }
+                if i < len(text) {
+                        right, _ = utf8.DecodeRuneInString(text[i+len(nick):])
+                }
+                if isWordBoundary(left) && isWordBoundary(right) {
+                        return true
+                }
+
+                text = text[i+len(nick):]
+        }
+}
+
 func (uc *upstreamConn) handleMessage(msg *irc.Message) error {
         var label string
@@ -306 +342 @@
                         uc.produce(target, msg, nil)
 
-                        highlight := strings.Contains(text, uc.nick) && msg.Prefix.Name != uc.nick
+                        highlight := msg.Prefix.Name != uc.nick && isHighlight(text, uc.nick)
                         if ch, ok := uc.network.channels[target]; ok && ch.Detached && highlight {
                                 uc.forEachDownstream(func(dc *downstreamConn) {