Introduced abstract Command class for commands.

Author: DanielN

src/bitbot/BitBot.java

@@ -3,6 +3,8 @@
 import java.io.File;
 import java.io.IOException;
 
+import bitbot.commands.GreetCommand;
+
 
 public class BitBot {
 
@@ -23,6 +25,7 @@ public static void main(String[] args) {
 	public BitBot(BotConfig config) {
 		this.config = config;
 		MessageHandler messageHandler = new MessageHandler(config.getCommandPrefix());
+		messageHandler.addCommand(new GreetCommand());
 		server = new ChatServer(config.getChatServerConfig(), messageHandler);
 	}
 

src/bitbot/Command.java

@@ -0,0 +1,33 @@
+package bitbot;
+
+import java.util.Arrays;
+import java.util.Collection;
+
+
+public abstract class Command {
+
+	private final String command;
+	private final String[] aliases;
+
+	public Command(String command, String ...aliases) {
+		this.command = command;
+		this.aliases = aliases;
+	}
+
+	public String getCommand() {
+		return command;
+	}
+
+	public Collection<String> getAliases() {
+		return Arrays.asList(aliases);
+	}
+
+	public abstract String getDescription();
+
+	public abstract String getArgumentTemplate();
+
+	public abstract String getHelpText();
+
+	public abstract void execute(String command, String args, User user, boolean pm, Replier replier);
+
+}

src/bitbot/MessageHandler.java

@@ -1,13 +1,35 @@
 package bitbot;
 
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.SortedSet;
+import java.util.TreeSet;
+
 
 
 public class MessageHandler {
 
 	private final char commandPrefix;
+	private final Map<String, Command> commandIndex = new HashMap<String, Command>();
+	private final SortedSet<Command> commands = new TreeSet<Command>(new Comparator<Command>() {
+		@Override
+		public int compare(Command o1, Command o2) {
+			return o1.getCommand().compareTo(o2.getCommand());
+		}
+	});
 
 	public MessageHandler(char commandPrefix) {
 		this.commandPrefix = commandPrefix;
+		addCommand(new HelpCommand());
+	}
+
+	public void addCommand(Command command) {
+		commands.add(command);
+		commandIndex.put(command.getCommand(), command);
+		for (String alias : command.getAliases()) {
+			commandIndex.put(alias, command);
+		}
 	}
 
 	public void processMessage(String text, User user, boolean pm, Replier replier) {
@@ -16,16 +38,78 @@ public void processMessage(String text, User user, boolean pm, Replier replier)
 				text = text.substring(1);
 			}
 			String[] parts = text.split("\\s", 2);
-			String cmd = parts[0];
+			String cmd = parts[0].toLowerCase();
 			String args = parts.length == 1 ? "" : parts[1];
-			if (cmd.equalsIgnoreCase("hej")) {
-				replier.reply("Hej, " + user.getNick());
-			} else if (cmd.equalsIgnoreCase("test")) {
-				for (String s : args.split("\\s")) {
-					replier.replyPrivately(s);
+			Command command = commandIndex.get(cmd);
+			if (command != null) {
+				command.execute(cmd, args, user, pm, replier);
+			} else {
+				replier.replyPrivately("Jag känner inte till kommandot '" + cmd + "'");
+			}
+		}
+	}
+
+	
+	private class HelpCommand extends Command {
+
+		public HelpCommand() {
+			super("hjälp", "help");
+		}
+
+		@Override
+		public void execute(String command, String args, User user, boolean pm, Replier replier) {
+			if (args.isEmpty()) {
+				StringBuilder sb = new StringBuilder();
+				sb.append("Jag förstår följande kommandon:\n");
+				for (Command cmd : commands) {
+					if (!pm) {
+						sb.append(commandPrefix);
+					}
+					sb.append(cmd.getCommand()).append('\t').append(cmd.getDescription()).append('\n');
 				}
+				sb.append("För specifik hjälp skriv: ");
+				if (!pm) {
+					sb.append(commandPrefix);
+				}
+				sb.append(getCommand()).append(" <kommando>'");
+				replier.replyPrivately(sb.toString());
+			} else if (commandIndex.containsKey(args)) {
+				Command cmd = commandIndex.get(args);
+				StringBuilder sb = new StringBuilder();
+				if (!pm) {
+					sb.append(commandPrefix);
+				}
+				sb.append(cmd.getCommand());
+				if (!cmd.getArgumentTemplate().isEmpty()) {
+					sb.append(' ').append(cmd.getArgumentTemplate());
+				}
+				sb.append('\n');
+				sb.append(cmd.getHelpText());
+				if (!cmd.getAliases().isEmpty()) {
+					sb.append("\nAlias: ").append(cmd.getAliases().toString());
+				}
+				replier.replyPrivately(sb.toString());
+			} else {
+				replier.replyPrivately("Jag känner inte till kommandot '" + args + "'");
 			}
 		}
+
+		@Override
+		public String getDescription() {
+			return "Hjälp för kommandon";
+		}
+
+		@Override
+		public String getArgumentTemplate() {
+			return "[kommando]";
+		}
+
+		@Override
+		public String getHelpText() {
+			return ("Utan argument visas listan med kommandon.\n" +
+					"Med ett kommando som argument visas specifik hjälp.");
+		}
+
 	}
 
 }

src/bitbot/commands/GreetCommand.java

@@ -0,0 +1,33 @@
+package bitbot.commands;
+
+import bitbot.Command;
+import bitbot.Replier;
+import bitbot.User;
+
+
+public class GreetCommand extends Command {
+
+	public GreetCommand() {
+		super("hej", "tja", "hallå", "hi", "hello");
+	}
+
+	@Override
+	public void execute(String command, String args, User user, boolean pm, Replier replier) {
+		replier.reply("Hej, " + user.getNick());
+	}
+
+	@Override
+	public String getArgumentTemplate() {
+		return "";
+	}
+
+	@Override
+	public String getDescription() {
+		return "Hej, hej!";
+	}
+
+	@Override
+	public String getHelpText() {
+		return "Om ingen annan säger hej så är i alla fall jag trevlig =)";
+	}
+}