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

chat color: fix usernames not being recoloured if they have an icon

Browse Source
This commit is contained in:
Hydrox6
2021-02-11 15:45:33 +00:00
committed by Adam
parent 0fa078d8f1
commit 63cbe6ae09
2 changed files with 67 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
runelite-client/src/main/java/net/runelite/client/chat/ChatMessageManager.java
View File

@@ -54,6 +54,7 @@ import net.runelite.client.eventbus.Subscribe;
import net.runelite.client.events.ConfigChanged; import net.runelite.client.events.ConfigChanged;
import net.runelite.client.ui.JagexColors; import net.runelite.client.ui.JagexColors;
import net.runelite.client.util.ColorUtil; import net.runelite.client.util.ColorUtil;
import net.runelite.client.util.Text;
@Singleton @Singleton
public class ChatMessageManager public class ChatMessageManager
@@ -125,7 +126,8 @@ public class ChatMessageManager
case PUBLICCHAT: case PUBLICCHAT:
case MODCHAT: case MODCHAT:
{ {
boolean isFriend = client.isFriended(chatMessage.getName(), true) && !client.getLocalPlayer().getName().equals(chatMessage.getName()); String sanitizedUsername = Text.removeTags(chatMessage.getName());
boolean isFriend = client.isFriended(sanitizedUsername, true) && !client.getLocalPlayer().getName().equals(sanitizedUsername);
if (isFriend) if (isFriend)
{ {

64
runelite-client/src/test/java/net/runelite/client/chat/ChatMessageManagerTest.java
View File

@@ -32,6 +32,7 @@ import java.awt.Color;
import net.runelite.api.ChatMessageType; import net.runelite.api.ChatMessageType;
import net.runelite.api.Client; import net.runelite.api.Client;
import net.runelite.api.MessageNode; import net.runelite.api.MessageNode;
import net.runelite.api.Player;
import net.runelite.api.events.ChatMessage; import net.runelite.api.events.ChatMessage;
import net.runelite.client.config.ChatColorConfig; import net.runelite.client.config.ChatColorConfig;
import org.junit.Before; import org.junit.Before;
@@ -84,4 +85,67 @@ public class ChatMessageManagerTest
verify(messageNode).setValue(eq("<col=b20000>Your dodgy necklace protects you. It has <col=ff0000>1<col=b20000> charge left.</col>")); verify(messageNode).setValue(eq("<col=b20000>Your dodgy necklace protects you. It has <col=ff0000>1<col=b20000> charge left.</col>"));
} }
@Test
public void testPublicFriendUsernameRecolouring()
{
final String localPlayerName = "RuneLite";
final String friendName = "Zezima";
when(chatColorConfig.opaquePublicFriendUsernames()).thenReturn(Color.decode("#b20000"));
chatMessageManager.loadColors();
// Setup message
ChatMessage chatMessage = new ChatMessage();
chatMessage.setType(ChatMessageType.PUBLICCHAT);
chatMessage.setName(friendName);
MessageNode messageNode = mock(MessageNode.class);
chatMessage.setMessageNode(messageNode);
when(messageNode.getName()).thenReturn(friendName);
// Setup friend checking
Player localPlayer = mock(Player.class);
when(client.isFriended(friendName, true)).thenReturn(true);
when(client.getLocalPlayer()).thenReturn(localPlayer);
when(localPlayer.getName()).thenReturn(localPlayerName);
chatMessageManager.onChatMessage(chatMessage);
verify(messageNode).setName("<col=b20000>" + friendName + "</col>");
}
@Test
public void testPublicIronmanFriendUsernameRecolouring()
{
final String localPlayerName = "RuneLite";
final String friendName = "<img=3>BuddhaPuck";
final String sanitizedFriendName = "BuddhaPuck";
when(chatColorConfig.opaquePublicFriendUsernames()).thenReturn(Color.decode("#b20000"));
chatMessageManager.loadColors();
// Setup message
ChatMessage chatMessage = new ChatMessage();
chatMessage.setType(ChatMessageType.PUBLICCHAT);
chatMessage.setName(friendName);
MessageNode messageNode = mock(MessageNode.class);
chatMessage.setMessageNode(messageNode);
when(messageNode.getName()).thenReturn(friendName);
// Setup friend checking
Player localPlayer = mock(Player.class);
when(client.isFriended(sanitizedFriendName, true)).thenReturn(true);
when(client.getLocalPlayer()).thenReturn(localPlayer);
when(localPlayer.getName()).thenReturn(localPlayerName);
chatMessageManager.onChatMessage(chatMessage);
verify(messageNode).setName("<col=b20000>" + friendName + "</col>");
}
} }