Used variable instead of repeat literal strings. (PMD)

This commit is contained in:
Erik C. Thauvin 2019-04-27 03:06:37 -07:00
parent f4afbcaaa5
commit 7e16f1cb3f

View file

@ -689,91 +689,94 @@ public class Mobibot extends PircBot {
} else if (Commands.INFO_CMD.equals(lcTopic)) { } else if (Commands.INFO_CMD.equals(lcTopic)) {
send(sender, "To view information about the bot:"); send(sender, "To view information about the bot:");
send(sender, helpIndent(getNick() + ": " + Commands.INFO_CMD)); send(sender, helpIndent(getNick() + ": " + Commands.INFO_CMD));
} else if (Commands.CYCLE_CMD.equals(lcTopic) && isOp(sender)) {
send(sender, "To have the bot leave the channel and come back:");
send(sender, helpIndent("/msg " + getNick() + ' ' + Commands.CYCLE_CMD));
} else if (Commands.ME_CMD.equals(lcTopic) && isOp(sender)) {
send(sender, "To have the bot perform an action:");
send(sender, helpIndent("/msg " + getNick() + ' ' + Commands.ME_CMD + " <action>"));
} else if (Commands.SAY_CMD.equals(lcTopic) && isOp(sender)) {
send(sender, "To have the bot say something on the channel:");
send(sender, helpIndent("/msg " + getNick() + ' ' + Commands.SAY_CMD + " <text>"));
} else if (Commands.VERSION_CMD.equals(lcTopic) && isOp(sender)) {
send(sender, "To view the version data (bot, java, etc.):");
send(sender, helpIndent("/msg " + getNick() + ' ' + Commands.VERSION_CMD));
} else if (Commands.MSG_CMD.equals(lcTopic) && isOp(sender)) {
send(sender, "To have the bot send a private message to someone:");
send(sender, helpIndent("/msg " + getNick() + ' ' + Commands.MSG_CMD + " <nick> <text>"));
} else if (Commands.IGNORE_CMD.equals(lcTopic)) {
send(sender, "To check your ignore status:");
send(sender, helpIndent(getNick() + ": " + Commands.IGNORE_CMD));
send(sender, "To toggle your ignore status:");
send(sender, helpIndent(getNick() + ": " + Commands.IGNORE_CMD + ' ' + Commands.IGNORE_ME_KEYWORD));
} else if (Tell.TELL_CMD.equals(lcTopic) && tell.isEnabled()) {
tell.helpResponse(sender);
} else { } else {
for (final AbstractModule module : MODULES) { final String msg = "/msg ";
for (final String cmd : module.getCommands()) { if (Commands.CYCLE_CMD.equals(lcTopic) && isOp(sender)) {
if (lcTopic.equals(cmd)) { send(sender, "To have the bot leave the channel and come back:");
module.helpResponse(this, sender, topic, true); send(sender, helpIndent(msg + getNick() + ' ' + Commands.CYCLE_CMD));
return; } else if (Commands.ME_CMD.equals(lcTopic) && isOp(sender)) {
send(sender, "To have the bot perform an action:");
send(sender, helpIndent(msg + getNick() + ' ' + Commands.ME_CMD + " <action>"));
} else if (Commands.SAY_CMD.equals(lcTopic) && isOp(sender)) {
send(sender, "To have the bot say something on the channel:");
send(sender, helpIndent(msg + getNick() + ' ' + Commands.SAY_CMD + " <text>"));
} else if (Commands.VERSION_CMD.equals(lcTopic) && isOp(sender)) {
send(sender, "To view the version data (bot, java, etc.):");
send(sender, helpIndent(msg + getNick() + ' ' + Commands.VERSION_CMD));
} else if (Commands.MSG_CMD.equals(lcTopic) && isOp(sender)) {
send(sender, "To have the bot send a private message to someone:");
send(sender, helpIndent(msg + getNick() + ' ' + Commands.MSG_CMD + " <nick> <text>"));
} else if (Commands.IGNORE_CMD.equals(lcTopic)) {
send(sender, "To check your ignore status:");
send(sender, helpIndent(getNick() + ": " + Commands.IGNORE_CMD));
send(sender, "To toggle your ignore status:");
send(sender, helpIndent(getNick() + ": " + Commands.IGNORE_CMD + ' ' + Commands.IGNORE_ME_KEYWORD));
} else if (Tell.TELL_CMD.equals(lcTopic) && tell.isEnabled()) {
tell.helpResponse(sender);
} else {
for (final AbstractModule module : MODULES) {
for (final String cmd : module.getCommands()) {
if (lcTopic.equals(cmd)) {
module.helpResponse(this, sender, topic, true);
return;
}
} }
} }
}
send(sender, Utils.bold("Type a URL on " + ircChannel + " to post it.")); send(sender, Utils.bold("Type a URL on " + ircChannel + " to post it."));
send(sender, "For more information on a specific command, type:"); send(sender, "For more information on a specific command, type:");
send(sender, helpIndent(getNick() + ": " + Commands.HELP_CMD + " <command>")); send(sender, helpIndent(getNick() + ": " + Commands.HELP_CMD + " <command>"));
send(sender, "The commands are:"); send(sender, "The commands are:");
if (commandsList.isEmpty()) { if (commandsList.isEmpty()) {
commandsList.add(Commands.IGNORE_CMD); commandsList.add(Commands.IGNORE_CMD);
commandsList.add(Commands.INFO_CMD); commandsList.add(Commands.INFO_CMD);
commandsList.add(getChannelName()); commandsList.add(getChannelName());
commandsList.add(Commands.HELP_POSTING_KEYWORD); commandsList.add(Commands.HELP_POSTING_KEYWORD);
commandsList.add(Commands.HELP_TAGS_KEYWORD); commandsList.add(Commands.HELP_TAGS_KEYWORD);
commandsList.add(Commands.RECAP_CMD); commandsList.add(Commands.RECAP_CMD);
commandsList.add(Commands.USERS_CMD); commandsList.add(Commands.USERS_CMD);
commandsList.add(Commands.VIEW_CMD); commandsList.add(Commands.VIEW_CMD);
MODULES.stream().filter(AbstractModule::isEnabled).forEach( MODULES.stream().filter(AbstractModule::isEnabled).forEach(
module -> commandsList.addAll(module.getCommands())); module -> commandsList.addAll(module.getCommands()));
if (tell.isEnabled()) { if (tell.isEnabled()) {
commandsList.add(Tell.TELL_CMD); commandsList.add(Tell.TELL_CMD);
}
Collections.sort(commandsList);
} }
Collections.sort(commandsList); final StringBuilder sb = new StringBuilder(0);
}
final StringBuilder sb = new StringBuilder(0); for (int i = 0, cmdCount = 1; i < commandsList.size(); i++, cmdCount++) {
if (sb.length() > 0) {
sb.append(" ");
}
for (int i = 0, cmdCount = 1; i < commandsList.size(); i++, cmdCount++) { sb.append(commandsList.get(i));
if (sb.length() > 0) {
sb.append(" "); // 6 commands per line or last command
if (sb.length() > 0 && (cmdCount == 6 || i == (commandsList.size() - 1))) {
send(sender, helpIndent(sb.toString()));
sb.setLength(0);
cmdCount = 0;
}
} }
sb.append(commandsList.get(i)); if (isOp(sender)) {
send(sender, "The op commands are:");
// 6 commands per line or last command send(sender, helpIndent(
if (sb.length() > 0 && (cmdCount == 6 || i == (commandsList.size() - 1))) { Commands.CYCLE_CMD + " "
send(sender, helpIndent(sb.toString())); + Commands.ME_CMD + " "
+ Commands.MSG_CMD + " "
sb.setLength(0); + Commands.SAY_CMD + " "
cmdCount = 0; + Commands.VERSION_CMD));
} }
} }
if (isOp(sender)) {
send(sender, "The op commands are:");
send(sender, helpIndent(
Commands.CYCLE_CMD + " "
+ Commands.ME_CMD + " "
+ Commands.MSG_CMD + " "
+ Commands.SAY_CMD + " "
+ Commands.VERSION_CMD));
}
} }
} }