X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Firc%2FConnection.java;h=c47144b1c6e4e646960f6bcba20790e0476d2645;hb=08f7863e3510aea16b6a856b40927c90687b067c;hp=86de5354d28183649892d8020e9e6869fe2e266b;hpb=e4793dbb593cf8babe654ed9311eae466d4e6291;p=xudocci.git

diff --git a/src/main/java/net/pterodactylus/irc/Connection.java b/src/main/java/net/pterodactylus/irc/Connection.java
index 86de535..c47144b 100644
--- a/src/main/java/net/pterodactylus/irc/Connection.java
+++ b/src/main/java/net/pterodactylus/irc/Connection.java
@@ -44,6 +44,7 @@ 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.connection.MotdHandler;
 import net.pterodactylus.irc.event.ChannelJoined;
 import net.pterodactylus.irc.event.ChannelLeft;
 import net.pterodactylus.irc.event.ChannelMessageReceived;
@@ -374,10 +375,7 @@ 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();
 
 			/* server modes. */
@@ -385,6 +383,7 @@ public class Connection extends AbstractExecutionThreadService implements Servic
 			Set<Character> channelTypes = Sets.newHashSet();
 
 			List<Handler> handlers = asList(
+					new MotdHandler(eventBus, this),
 					new ConnectionEstablishHandler(eventBus, this),
 					new ChannelNotJoinedHandler(eventBus, this)
 			);
@@ -432,7 +431,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 {
@@ -492,17 +491,6 @@ public class Connection extends AbstractExecutionThreadService implements Servic
 						}
 					}
 
-				/* 375, 372, and 376 handle the server’s MOTD. */
-				} else if (command.equals("375")) {
-					/* MOTD starts. */
-					motd.append(parameters.get(1)).append('\n');
-				} else if (command.equals("372")) {
-					motd.append(parameters.get(1)).append('\n');
-				} else if (command.equals("376")) {
-					motd.append(parameters.get(1)).append('\n');
-					eventBus.post(new MotdReceived(this, motd.toString()));
-					motd.setLength(0);
-
 				} else if (command.equalsIgnoreCase("KICK")) {
 					eventBus.post(new KickedFromChannel(this, parameters.get(0), reply.source().get(), parameters.get(1), getOptional(parameters, 2)));