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

mixins: Fix messages for GIM

Browse Source
This commit is contained in:
Owain van Brakel
2022-03-09 08:56:20 +01:00
parent bb07875400
commit 4dac0b84fc
1 changed files with 38 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
runelite-mixins/src/main/java/net/runelite/mixins/RSClientMixin.java
View File

@@ -597,7 +597,22 @@ public abstract class RSClientMixin implements RSClient
public MessageNode addChatMessage(ChatMessageType type, String name, String message, String sender, boolean postEvent) public MessageNode addChatMessage(ChatMessageType type, String name, String message, String sender, boolean postEvent)
{ {
assert this.isClientThread() : "addChatMessage must be called on client thread"; assert this.isClientThread() : "addChatMessage must be called on client thread";
copy$addChatMessage(type.getType(), name, message, sender);
ChatMessageType tmpType = type;
String tmpMessage = message;
if (type == ChatMessageType.CLAN_GIM_CHAT)
{
tmpType = ChatMessageType.CLAN_CHAT;
tmpMessage = "|" + message;
}
else if (type == ChatMessageType.CLAN_GIM_MESSAGE)
{
tmpType = ChatMessageType.CLAN_MESSAGE;
tmpMessage = "|" + message;
}
copy$addChatMessage(tmpType.getType(), name, tmpMessage, sender);
Logger logger = client.getLogger(); Logger logger = client.getLogger();
if (logger.isDebugEnabled()) if (logger.isDebugEnabled())
@@ -1776,20 +1791,33 @@ public abstract class RSClientMixin implements RSClient
{ {
copy$addChatMessage(type, name, message, sender); copy$addChatMessage(type, name, message, sender);
Logger logger = client.getLogger();
if (logger.isDebugEnabled())
{
ChatMessageType msgType = ChatMessageType.of(type);
logger.debug("Chat message type {}: {}", msgType == ChatMessageType.UNKNOWN ? String.valueOf(type) : msgType.name(), message);
}
// Get the message node which was added // Get the message node which was added
@SuppressWarnings("unchecked") Map<Integer, RSChatChannel> chatLineMap = client.getChatLineMap(); @SuppressWarnings("unchecked") Map<Integer, RSChatChannel> chatLineMap = client.getChatLineMap();
RSChatChannel chatLineBuffer = chatLineMap.get(type); RSChatChannel chatLineBuffer = chatLineMap.get(type);
MessageNode messageNode = chatLineBuffer.getLines()[0]; MessageNode messageNode = chatLineBuffer.getLines()[0];
final ChatMessageType chatMessageType = ChatMessageType.of(type); ChatMessageType tmpType = ChatMessageType.of(type);
final ChatMessage chatMessage = new ChatMessage(messageNode, chatMessageType, name, message, sender, messageNode.getTimestamp());
if (tmpType == ChatMessageType.CLAN_CHAT && message != null && message.startsWith("|"))
{
tmpType = ChatMessageType.CLAN_GIM_CHAT;
message = message.substring(1);
}
if (tmpType == ChatMessageType.CLAN_MESSAGE && message != null && message.startsWith("|"))
{
tmpType = ChatMessageType.CLAN_GIM_MESSAGE;
message = message.substring(1);
}
Logger logger = client.getLogger();
if (logger.isDebugEnabled())
{
ChatMessageType msgType = ChatMessageType.of(type);
logger.debug("Chat message type {}: {}", msgType == ChatMessageType.UNKNOWN ? String.valueOf(type) : tmpType.name(), message);
}
final ChatMessage chatMessage = new ChatMessage(messageNode, tmpType, name, message, sender, messageNode.getTimestamp());
client.getCallbacks().post(chatMessage); client.getCallbacks().post(chatMessage);
} }