Don’t store connection status anymore.

[xudocci.git] / src / main / java / net / pterodactylus / irc / Connection.java

diff --git a/src/main/java/net/pterodactylus/irc/Connection.java b/src/main/java/net/pterodactylus/irc/Connection.java
index cc1f9c8..4d601fd 100644 (file)
--- a/src/main/java/net/pterodactylus/irc/Connection.java
+++ b/src/main/java/net/pterodactylus/irc/Connection.java
@@ -18,6 +18,7 @@
 package net.pterodactylus.irc;
 
 import static com.google.common.base.Preconditions.checkState;
+import static java.util.Arrays.asList;
 import static java.util.concurrent.TimeUnit.SECONDS;
 
 import java.io.BufferedReader;
@@ -40,7 +41,9 @@ import java.util.concurrent.atomic.AtomicBoolean;
 
 import javax.net.SocketFactory;
 
+import net.pterodactylus.irc.connection.ChannelNotJoinedHandler;
 import net.pterodactylus.irc.connection.ConnectionEstablishHandler;
+import net.pterodactylus.irc.connection.Handler;
 import net.pterodactylus.irc.event.ChannelJoined;
 import net.pterodactylus.irc.event.ChannelLeft;
 import net.pterodactylus.irc.event.ChannelMessageReceived;
@@ -371,8 +374,6 @@ public class Connection extends AbstractExecutionThreadService implements Servic
                /* now read replies and react. */
                try {
                        /* some status variables. */
-                       int oldConnectionStatus = 0;
-                       int connectionStatus = 0;
                        boolean connected = true;
                        StringBuilder motd = new StringBuilder();
                        Set<Nickname> nicks = Sets.newHashSet();
@@ -381,7 +382,10 @@ public class Connection extends AbstractExecutionThreadService implements Servic
                        Map<String, String> nickPrefixes = Maps.newHashMap();
                        Set<Character> channelTypes = Sets.newHashSet();
 
-                       ConnectionEstablishHandler connectionEstablishHandler = new ConnectionEstablishHandler(eventBus, this);
+                       List<Handler> handlers = asList(
+                                       new ConnectionEstablishHandler(eventBus, this),
+                                       new ChannelNotJoinedHandler(eventBus, this)
+                       );
 
                        while (connected) {
                                Reply reply = connectionHandler.readReply();
@@ -390,6 +394,13 @@ public class Connection extends AbstractExecutionThreadService implements Servic
                                String command = reply.command();
                                List<String> parameters = reply.parameters();
 
+                               for (Handler handler : handlers) {
+                                       if (handler.willHandle(reply)) {
+                                               handler.handleReply(reply);
+                                               break;
+                                       }
+                               }
+
                                /* most common events. */
                                if (command.equalsIgnoreCase("PRIVMSG")) {
                                        String recipient = parameters.get(0);
@@ -419,7 +430,7 @@ public class Connection extends AbstractExecutionThreadService implements Servic
                                } else if (command.equals("431")) {
                                        eventBus.post(new NoNicknameGivenReceived(this, reply));
                                } else if (command.equals("433")) {
-                                       if (connectionStatus == 0) {
+                                       if (!established.get()) {
                                                nickname = nicknameChooser.getNickname();
                                                connectionHandler.sendCommand("NICK", nickname);
                                        } else {
@@ -453,23 +464,10 @@ public class Connection extends AbstractExecutionThreadService implements Servic
                                } else if (command.equalsIgnoreCase("QUIT")) {
                                        eventBus.post(new ClientQuit(this, reply.source().get(), parameters.get(0)));
 
-                               /* common channel join errors. */
-                               } else if (command.equals("474")) {
-                                       eventBus.post(new ChannelNotJoined(this, parameters.get(1), Reason.banned));
-                               } else if (command.equals("473")) {
-                                       eventBus.post(new ChannelNotJoined(this, parameters.get(1), Reason.inviteOnly));
-                               } else if (command.equals("475")) {
-                                       eventBus.post(new ChannelNotJoined(this, parameters.get(1), Reason.badChannelKey));
-                               } else if (command.equals("477")) {
-                                       eventBus.post(new ChannelNotJoined(this, parameters.get(1), Reason.registeredNicknamesOnly));
-
                                /* basic connection housekeeping. */
                                } else if (command.equalsIgnoreCase("PING")) {
                                        connectionHandler.sendCommand("PONG", getOptional(parameters, 0), getOptional(parameters, 1));
 
-                               } else if (connectionEstablishHandler.willHandle(reply)) {
-                                       connectionEstablishHandler.handleReply(reply);
-
                                /* 005 originally was a bounce message, now used to transmit useful information about the server. */
                                } else if (command.equals("005")) {
                                        for (String parameter : parameters) {