ra/runelite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

chat notifier: fix matching messages with included punctuation

Browse Source 
The punctuation is not in \b or \s, so additionally include \z. Also
added \A for the beginning, which would have the same problem, which the
test also tests for.

Co-authored-by: Adam <Adam@sigterm.info>
This commit is contained in:
Jacob Buckheit
2020-10-14 21:35:20 -04:00
committed by Adam
parent d6d43b6096
commit 661aca8475
2 changed files with 21 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
runelite-client/src/main/java/net/runelite/client/plugins/chatnotifications/ChatNotificationsPlugin.java
View File

@@ -120,8 +120,8 @@ public class ChatNotificationsPlugin extends Plugin
.map(this::quoteAndIgnoreColor) // regex escape and ignore nested colors in the target message
.collect(Collectors.joining("|"));
// To match <word> \b doesn't work due to <> not being in \w,
// so match \b or \s
highlightMatcher = Pattern.compile("(?:\\b|(?<=\\s))(" + joined + ")(?:\\b|(?=\\s))", Pattern.CASE_INSENSITIVE);
// so match \b or \s, as well as \A and \z for beginning and end of input respectively
highlightMatcher = Pattern.compile("(?:\\b|(?<=\\s)|\\A)(?:" + joined + ")(?:\\b|(?=\\s)|\\z)", Pattern.CASE_INSENSITIVE);
}
}

19
runelite-client/src/test/java/net/runelite/client/plugins/chatnotifications/ChatNotificationsPluginTest.java
View File

@@ -113,6 +113,25 @@ public class ChatNotificationsPluginTest
verify(messageNode).setValue("test <colHIGHLIGHT><lt>test<gt><colNORMAL> test");
}
@Test
public void testMatchEntireMessage()
{
when(config.highlightWordsString()).thenReturn(".Your divine potion effect is about to expire.");
String message = ".Your divine potion effect is about to expire.";
MessageNode messageNode = mock(MessageNode.class);
when(messageNode.getValue()).thenReturn(message);
ChatMessage chatMessage = new ChatMessage();
chatMessage.setType(ChatMessageType.PUBLICCHAT);
chatMessage.setMessageNode(messageNode);
chatNotificationsPlugin.startUp(); // load highlight config
chatNotificationsPlugin.onChatMessage(chatMessage);
verify(messageNode).setValue("<colHIGHLIGHT>.Your divine potion effect is about to expire.<colNORMAL>");
}
@Test
public void testFullStop()
{