Reorganized readuser functionallity.

ReadUser is now its own class. Also moved String to array conversion
into CommandHandler.

src/main/java/server/BanNote.java

@@ -32,10 +32,8 @@ public class BanNote {
 	
 	@Override
 	public String toString() {
-		String expStr;
-		if (expiry == null)
-			expStr = "Forever";
-		else
+		String expStr = "Never";
+		if (expiry != null)
 			expStr = expiry.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
 		
 		return "You are banned from this server." + "\n" + "Reason: " + reason + "\n" + "Expiry: " + expStr;

src/main/java/server/Client.java

@@ -15,8 +15,8 @@ import common.InfoPacket;
 import common.MessagePacket;
 import common.Packet;
 
-public class Client implements Runnable, ActionListener {
-	Thread readuser;
+public class Client implements ActionListener {
+	ReadUser readuser;
 	
 	BufferedReader in;
 	ObjectOutputStream objOut;
@@ -27,7 +27,7 @@ public class Client implements Runnable, ActionListener {
 	public String[] permissions;
 	
 	int messLastPeriod = 0;
-	Timer timer = new Timer(3000, this);
+	Timer timer = new Timer(800, this);
 	
 	public Channel primaryChannel = Server.channels.get(0);
 	
@@ -51,8 +51,7 @@ public class Client implements Runnable, ActionListener {
 		
 		send(new MessagePacket("Welcome to the server! Enjoy your stay!"));
 		
-		readuser = new Thread(this, username);
-		readuser.start();
+		readuser = new ReadUser();
 		
 		timer.start();
 	}
@@ -119,7 +118,7 @@ public class Client implements Runnable, ActionListener {
 		return !sock.isClosed();
 	}
 	
-	boolean hasPermission(String commandPermission) {
+	public boolean hasPermission(String commandPermission) {
 		for (int i = 0; i < permissions.length; i++) {
 			if (commandPermission.startsWith(permissions[i].replace(".*", ".")) || commandPermission.equalsIgnoreCase(permissions[i]) || permissions[i].equalsIgnoreCase("*"))
 				return true;
@@ -127,33 +126,47 @@ public class Client implements Runnable, ActionListener {
 		return false;
 	}
 	
-	@Override
-	public void run() {
-		String lastMess;
-		try {
-			while (!readuser.isInterrupted() && ((lastMess = in.readLine()) != null)) {
-				if (lastMess.startsWith("/")) //Command handling
-				{
-					String[] commandarray = lastMess.substring(1).split(" ");
-					Server.commReg.executeCommand(commandarray, this);
-				}
+	class ReadUser extends Thread {
+		ReadUser() {
+			super(Client.this.username);
+			this.start();
+		}
+		
+		@Override
+		public void run() {
+			String mess;
+			while (!readuser.isInterrupted() && (mess = getNewMessage()) != null) {
+				
+				if (mess.startsWith("/")) //Command handling
+					Server.commReg.executeCommand(mess, Client.this);
 				else //Normal message handling
 				{
 					messLastPeriod++;
-					if (messLastPeriod > 5) {
+					if (messLastPeriod > 1 && !(Client.this instanceof LocalClient)) {
 						send("No spamming!");
 						disconnect(false);
 					} else
-						primaryChannel.broadcast(new MessagePacket(this.username, lastMess));
+						primaryChannel.broadcast(new MessagePacket(Client.this.username, mess));
 				}
 			}
 			disconnect();
-		} catch (IOException e) {
-			disconnect();
+		}
+		
+		public String getNewMessage() {
+			try {
+				return in.readLine();
+			} catch (IOException e) {
+				disconnect();
+			}
+			return null;
 		}
 	}
+	
+
+	
 	/**
 	 * Sends a packet to the user.
+	 * 
 	 * @param pack Packet to send to the user
 	 */
 	public void send(Packet pack) {

src/main/java/server/ClientCollection.java

@@ -7,7 +7,7 @@ import common.MessagePacket;
 
 public class ClientCollection extends ArrayList<Client> {
 	/**
-	 * 
+	 * A collection of clients.
 	 */
 	private static final long serialVersionUID = 1L;
 	

src/main/java/server/CommandRegistry.java

@@ -27,7 +27,9 @@ public class CommandRegistry extends HashMap<String, Command> {
 		}
 	}
 	
-	public void executeCommand(String[] command, Client caller) {
+	public void executeCommand(String commandStr, Client caller) {
+		String[] command = commandStr.substring(1).split(" ");
+		
 		Command comm;
 		if ((comm = get(command[0])) != null) // Get the command
 			if (caller.hasPermission(comm.getPermission())) { // Check if the client has permission

src/main/java/server/LocalClient.java

@@ -3,6 +3,9 @@ package server;
 import java.io.BufferedReader;
 import java.io.InputStreamReader;
 
+import common.MessagePacket;
+import common.Packet;
+
 public class LocalClient extends Client {
 	
 	public LocalClient() { //Constructor for local client, the server, with full permissions
@@ -11,8 +14,7 @@ public class LocalClient extends Client {
 		username = "SERVER";
 		permissions = new String[] {"*"};
 		
-		readuser = new Thread(this, username);
-		readuser.start();
+		readuser = new ReadUser();
 	}
 	
 	@Override
@@ -20,6 +22,17 @@ public class LocalClient extends Client {
 		readuser.interrupt();
 	}
 	
+	@Override
+	public void disconnect(boolean bool) {
+		disconnect();
+	}
+	
+	@Override
+	public void send(Packet pack) {
+		if (pack instanceof MessagePacket)
+			send(pack.toString());
+	}
+	
 	@Override
 	public void send(String message) {
 		System.out.println(message.toString());