Changeset 498 in code for trunk

Timestamp:

Apr 13, 2021, 4:54:58 PM (4 years ago)

Author:

contact

Message:

Move isHighlight to irc.go

Location:

trunk

Files:

• irc.go (modified) (2 diffs)
• upstream.go (modified) (2 diffs)

trunk/irc.go

@@ -5 +5 @@
         "sort"
         "strings"
+        "unicode"
+        "unicode/utf8"
 
         "gopkg.in/irc.v3"
@@ -602 +604 @@
         return entry.value.(deliveredClientMap)
 }
+
+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):]
+        }
+}

trunk/upstream.go

@@ -14 +14 @@
         "strings"
         "time"
-        "unicode"
-        "unicode/utf8"
 
         "github.com/emersion/go-sasl"
@@ -314 +312 @@
         }
         return &memberships, s[i:]
-}
-
-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):]
-        }
 }