From 5057e48d10350d49c05635ff908374b01f4ed31e Mon Sep 17 00:00:00 2001 From: Adam Date: Wed, 20 Nov 2019 12:04:25 -0500 Subject: [PATCH] api: add welcome chat message type Update chat history plugin to check the message type of the welcome message. --- .../src/main/java/net/runelite/api/ChatMessageType.java | 4 ++++ .../client/plugins/chathistory/ChatHistoryPlugin.java | 7 ++++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/runelite-api/src/main/java/net/runelite/api/ChatMessageType.java b/runelite-api/src/main/java/net/runelite/api/ChatMessageType.java index b4659dfa18..abed95406c 100644 --- a/runelite-api/src/main/java/net/runelite/api/ChatMessageType.java +++ b/runelite-api/src/main/java/net/runelite/api/ChatMessageType.java @@ -148,6 +148,10 @@ public enum ChatMessageType * A message that times out after 10 seconds. */ TENSECTIMEOUT(107), + /** + * The "Welcome to RuneScape" message + */ + WELCOME(108), /** * An unknown message type. */ diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/chathistory/ChatHistoryPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/chathistory/ChatHistoryPlugin.java index 03aa7c2110..63215c772b 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/chathistory/ChatHistoryPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/chathistory/ChatHistoryPlugin.java @@ -111,7 +111,8 @@ public class ChatHistoryPlugin extends Plugin implements KeyListener { // Start sending old messages right after the welcome message, as that is most reliable source // of information that chat history was reset - if (chatMessage.getMessage().equals(WELCOME_MESSAGE)) + ChatMessageType chatMessageType = chatMessage.getType(); + if (chatMessageType == ChatMessageType.WELCOME && chatMessage.getMessage().equals(WELCOME_MESSAGE)) { if (!config.retainChatHistory()) { @@ -128,7 +129,7 @@ public class ChatHistoryPlugin extends Plugin implements KeyListener return; } - switch (chatMessage.getType()) + switch (chatMessageType) { case PRIVATECHATOUT: case PRIVATECHAT: @@ -150,7 +151,7 @@ public class ChatHistoryPlugin extends Plugin implements KeyListener case FRIENDSCHAT: case CONSOLE: final QueuedMessage queuedMessage = QueuedMessage.builder() - .type(chatMessage.getType()) + .type(chatMessageType) .name(chatMessage.getName()) .sender(chatMessage.getSender()) .value(nbsp(chatMessage.getMessage()))