do not match mentions on word boundries but only when preceeded by white space

1 files changed, 1 insertions, 7 deletions

diff --git a/src/main/java/de/pixart/messenger/services/NotificationService.java b/src/main/java/de/pixart/messenger/services/NotificationService.java
index cb76691a7..a823c8307 100644
--- a/src/main/java/de/pixart/messenger/services/NotificationService.java
+++ b/src/main/java/de/pixart/messenger/services/NotificationService.java
@@ -74,13 +74,7 @@ public class NotificationService {
     }
 
     public static Pattern generateNickHighlightPattern(final String nick) {
-        // We expect a word boundary, i.e. space or start of string, followed by
-        // the
-        // nick (matched in case-insensitive manner), followed by optional
-        // punctuation (for example "bob: i disagree" or "how are you alice?"),
-        // followed by another word boundary.
-        return Pattern.compile("\\b" + Pattern.quote(nick) + "\\p{Punct}?\\b",
-                Pattern.CASE_INSENSITIVE | Pattern.UNICODE_CASE);
+        return Pattern.compile("(?<=(^|\\s))" + Pattern.quote(nick) + "\\b", Pattern.CASE_INSENSITIVE | Pattern.UNICODE_CASE);
     }
 
     public boolean notify(final Message message) {