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

Merge pull request #4655 from Nightfirecat/update-chat-commands-to-check-for-space-after-command

Browse Source 
chat commands plugin: Use consistent message check
This commit is contained in:
Tomas Slusny
2018-08-04 10:02:59 +02:00
committed by GitHub
parent 3bcf87b327 3159a02edf
commit a535a809e6
1 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
runelite-client/src/main/java/net/runelite/client/plugins/chatcommands/ChatCommandsPlugin.java
View File

@@ -86,6 +86,11 @@ public class ChatCommandsPlugin extends Plugin implements ChatboxInputListener
private static final Pattern RAIDS_PATTERN = Pattern.compile("Your completed (.+) count is: <col=ff0000>(\\d+)</col>."); private static final Pattern RAIDS_PATTERN = Pattern.compile("Your completed (.+) count is: <col=ff0000>(\\d+)</col>.");
private static final Pattern WINTERTODT_PATERN = Pattern.compile("Your subdued Wintertodt count is: <col=ff0000>(\\d+)</col>."); private static final Pattern WINTERTODT_PATERN = Pattern.compile("Your subdued Wintertodt count is: <col=ff0000>(\\d+)</col>.");
private static final Pattern BARROWS_PATERN = Pattern.compile("Your Barrows chest count is: <col=ff0000>(\\d+)</col>."); private static final Pattern BARROWS_PATERN = Pattern.compile("Your Barrows chest count is: <col=ff0000>(\\d+)</col>.");
private static final String TOTAL_LEVEL_COMMAND_STRING = "!total";
private static final String PRICE_COMMAND_STRING = "!price";
private static final String LEVEL_COMMAND_STRING = "!lvl";
private static final String CLUES_COMMAND_STRING = "!clues";
private static final String KILLCOUNT_COMMAND_STRING = "!kc";
private final HiscoreClient hiscoreClient = new HiscoreClient(); private final HiscoreClient hiscoreClient = new HiscoreClient();
private final KillCountClient killCountClient = new KillCountClient(); private final KillCountClient killCountClient = new KillCountClient();
@@ -184,40 +189,40 @@ public class ChatCommandsPlugin extends Plugin implements ChatboxInputListener
// being reused // being reused
messageNode.setRuneLiteFormatMessage(null); messageNode.setRuneLiteFormatMessage(null);
if (config.lvl() && message.toLowerCase().equals("!total")) if (config.lvl() && message.toLowerCase().equals(TOTAL_LEVEL_COMMAND_STRING))
{ {
log.debug("Running total level lookup"); log.debug("Running total level lookup");
executor.submit(() -> playerSkillLookup(setMessage, "total")); executor.submit(() -> playerSkillLookup(setMessage, "total"));
} }
else if (config.price() && message.toLowerCase().startsWith("!price") && message.length() > 7) else if (config.price() && message.toLowerCase().startsWith(PRICE_COMMAND_STRING + " "))
{ {
String search = message.substring(7); String search = message.substring(PRICE_COMMAND_STRING.length() + 1);
log.debug("Running price lookup for {}", search); log.debug("Running price lookup for {}", search);
executor.submit(() -> itemPriceLookup(setMessage.getMessageNode(), search)); executor.submit(() -> itemPriceLookup(setMessage.getMessageNode(), search));
} }
else if (config.lvl() && message.toLowerCase().startsWith("!lvl") && message.length() > 5) else if (config.lvl() && message.toLowerCase().startsWith(LEVEL_COMMAND_STRING + " "))
{ {
String search = message.substring(5); String search = message.substring(LEVEL_COMMAND_STRING.length() + 1);
log.debug("Running level lookup for {}", search); log.debug("Running level lookup for {}", search);
executor.submit(() -> playerSkillLookup(setMessage, search)); executor.submit(() -> playerSkillLookup(setMessage, search));
} }
else if (config.clue() && message.toLowerCase().equals("!clues")) else if (config.clue() && message.toLowerCase().equals(CLUES_COMMAND_STRING))
{ {
log.debug("Running lookup for overall clues"); log.debug("Running lookup for overall clues");
executor.submit(() -> playerClueLookup(setMessage, "total")); executor.submit(() -> playerClueLookup(setMessage, "total"));
} }
else if (config.clue() && message.toLowerCase().startsWith("!clues") && message.length() > 7) else if (config.clue() && message.toLowerCase().startsWith(CLUES_COMMAND_STRING + " "))
{ {
String search = message.substring(7); String search = message.substring(CLUES_COMMAND_STRING.length() + 1);
log.debug("Running clue lookup for {}", search); log.debug("Running clue lookup for {}", search);
executor.submit(() -> playerClueLookup(setMessage, search)); executor.submit(() -> playerClueLookup(setMessage, search));
} }
else if (config.killcount() && message.toLowerCase().startsWith("!kc ")) else if (config.killcount() && message.toLowerCase().startsWith(KILLCOUNT_COMMAND_STRING + " "))
{ {
String search = message.substring(4); String search = message.substring(KILLCOUNT_COMMAND_STRING.length() + 1);
log.debug("Running killcount lookup for {}", search); log.debug("Running killcount lookup for {}", search);
executor.submit(() -> killCountLookup(setMessage.getType(), setMessage, search)); executor.submit(() -> killCountLookup(setMessage.getType(), setMessage, search));