From 17f87669eb212510c0925ce2ded6b7df91808921 Mon Sep 17 00:00:00 2001 From: Adam Date: Fri, 13 Jul 2018 15:53:11 -0400 Subject: [PATCH] chat commands: loosen regex for boss names --- .../plugins/chatcommands/ChatCommandsPlugin.java | 4 ++-- .../plugins/chatcommands/ChatCommandsPluginTest.java | 11 +++++++++++ 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/chatcommands/ChatCommandsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/chatcommands/ChatCommandsPlugin.java index aaef51fd4b..4d3ef47fbc 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/chatcommands/ChatCommandsPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/chatcommands/ChatCommandsPlugin.java @@ -76,8 +76,8 @@ import net.runelite.http.api.kc.KillCountClient; public class ChatCommandsPlugin extends Plugin implements ChatboxInputListener { private static final float HIGH_ALCHEMY_CONSTANT = 0.6f; - private static final Pattern KILLCOUNT_PATERN = Pattern.compile("Your ([a-zA-Z ]+) kill count is: (\\d+)."); - private static final Pattern RAIDS_PATTERN = Pattern.compile("Your completed ([a-zA-Z ]+) count is: (\\d+)."); + private static final Pattern KILLCOUNT_PATERN = Pattern.compile("Your (.+) kill count is: (\\d+)."); + private static final Pattern RAIDS_PATTERN = Pattern.compile("Your completed (.+) count is: (\\d+)."); private static final Pattern WINTERTODT_PATERN = Pattern.compile("Your subdued Wintertodt count is: (\\d+)."); private final HiscoreClient hiscoreClient = new HiscoreClient(); diff --git a/runelite-client/src/test/java/net/runelite/client/plugins/chatcommands/ChatCommandsPluginTest.java b/runelite-client/src/test/java/net/runelite/client/plugins/chatcommands/ChatCommandsPluginTest.java index 04a093cbe3..ace03ecac4 100644 --- a/runelite-client/src/test/java/net/runelite/client/plugins/chatcommands/ChatCommandsPluginTest.java +++ b/runelite-client/src/test/java/net/runelite/client/plugins/chatcommands/ChatCommandsPluginTest.java @@ -106,4 +106,15 @@ public class ChatCommandsPluginTest verify(configManager).setConfiguration("killcount.adam", "wintertodt", 4); } + + @Test + public void testKreearra() + { + when(client.getUsername()).thenReturn("Adam"); + + ChatMessage chatMessageEvent = new ChatMessage(SERVER, "", "Your Kree'arra kill count is: 4.", null); + chatCommandsPlugin.onChatMessage(chatMessageEvent); + + verify(configManager).setConfiguration("killcount.adam", "kree'arra", 4); + } } \ No newline at end of file