diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/chatfilter/ChatFilterPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/chatfilter/ChatFilterPlugin.java index 57be625ee4..5340be1df0 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/chatfilter/ChatFilterPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/chatfilter/ChatFilterPlugin.java @@ -173,7 +173,7 @@ public class ChatFilterPlugin extends Plugin case PRIVATECHAT: case MODPRIVATECHAT: case FRIENDSCHAT: - if (shouldFilterPlayerMessage(name)) + if (shouldFilterPlayerMessage(Text.removeTags(name))) { message = censorMessage(name, message); blockMessage = message == null; diff --git a/runelite-client/src/test/java/net/runelite/client/plugins/chatfilter/ChatFilterPluginTest.java b/runelite-client/src/test/java/net/runelite/client/plugins/chatfilter/ChatFilterPluginTest.java index 547e468c87..f12ae93e4a 100644 --- a/runelite-client/src/test/java/net/runelite/client/plugins/chatfilter/ChatFilterPluginTest.java +++ b/runelite-client/src/test/java/net/runelite/client/plugins/chatfilter/ChatFilterPluginTest.java @@ -46,6 +46,7 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; +import static org.mockito.Mockito.lenient; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; import org.mockito.junit.MockitoJUnitRunner; @@ -406,4 +407,18 @@ public class ChatFilterPluginTest assertEquals(1, client.getIntStack()[client.getIntStackSize() - 3]); assertEquals("testMessage (4)", client.getStringStack()[client.getStringStackSize() - 1]); } + + @Test + public void testChatIcons() + { + when(chatFilterConfig.filteredWords()).thenReturn("test"); + // if this test is broken, this stubbing is required to trip the assert + lenient().when(chatFilterConfig.filterType()).thenReturn(ChatFilterType.REMOVE_MESSAGE); + when(friendChatManager.isMember("Lazark")).thenReturn(true); + + chatFilterPlugin.updateFilteredPatterns(); + ScriptCallbackEvent event = createCallbackEvent("Lazark", "test", ChatMessageType.PUBLICCHAT); + chatFilterPlugin.onScriptCallbackEvent(event); + assertEquals(1, client.getIntStack()[client.getIntStackSize() - 3]); // not filtered + } } \ No newline at end of file