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

diff --git a/src/main/java/net/pterodactylus/irc/Connection.java b/src/main/java/net/pterodactylus/irc/Connection.java
index c47144b..63d12ad 100644
--- a/src/main/java/net/pterodactylus/irc/Connection.java
+++ b/src/main/java/net/pterodactylus/irc/Connection.java
@@ -34,7 +34,6 @@ import java.net.Socket;
 import java.net.UnknownHostException;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
@@ -45,6 +44,7 @@ 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.connection.PrefixHandler;
 import net.pterodactylus.irc.event.ChannelJoined;
 import net.pterodactylus.irc.event.ChannelLeft;
 import net.pterodactylus.irc.event.ChannelMessageReceived;
@@ -73,7 +73,6 @@ import net.pterodactylus.xdcc.util.io.BandwidthCountingInputStream;
 import net.pterodactylus.xdcc.util.io.BandwidthCountingOutputStream;
 
 import com.google.common.base.Optional;
-import com.google.common.collect.Maps;
 import com.google.common.collect.Sets;
 import com.google.common.eventbus.EventBus;
 import com.google.common.eventbus.Subscribe;
@@ -378,14 +377,12 @@ public class Connection extends AbstractExecutionThreadService implements Servic
 			boolean connected = true;
 			Set<Nickname> nicks = Sets.newHashSet();
 
-			/* server modes. */
-			Map<String, String> nickPrefixes = Maps.newHashMap();
-			Set<Character> channelTypes = Sets.newHashSet();
-
+			PrefixHandler prefixHandler = new PrefixHandler();
 			List<Handler> handlers = asList(
 					new MotdHandler(eventBus, this),
+					new ChannelNotJoinedHandler(eventBus, this),
 					new ConnectionEstablishHandler(eventBus, this),
-					new ChannelNotJoinedHandler(eventBus, this)
+					prefixHandler
 			);
 
 			while (connected) {
@@ -409,7 +406,7 @@ public class Connection extends AbstractExecutionThreadService implements Servic
 					if (message.startsWith("\u0001") && message.endsWith("\u0001")) {
 						/* CTCP! */
 						handleCtcp(reply.source().get(), message);
-					} else if (!channelTypes.contains(recipient.charAt(0))) {
+					} else if (!prefixHandler.isChannel(recipient)) {
 						eventBus.post(new PrivateMessageReceived(this, reply.source().get(), message));
 					} else {
 						eventBus.post(new ChannelMessageReceived(this, recipient, reply.source().get(), message));
@@ -421,7 +418,7 @@ public class Connection extends AbstractExecutionThreadService implements Servic
 					if (message.startsWith("\u0001") && message.endsWith("\u0001")) {
 						/* CTCP! */
 						handleCtcp(reply.source().get(), message);
-					} else if (!channelTypes.contains(recipient.charAt(0))) {
+					} else if (!prefixHandler.isChannel(recipient)) {
 						eventBus.post(new PrivateNoticeReceived(this, reply));
 					} else {
 						eventBus.post(new ChannelNoticeReceived(this, reply.source().get(), recipient, message));
@@ -451,7 +448,7 @@ public class Connection extends AbstractExecutionThreadService implements Servic
 					eventBus.post(new ChannelTopic(this, parameters.get(1), parameters.get(2)));
 				} else if (command.equals("353")) {
 					for (String nickname : parameters.get(3).split(" ")) {
-						if (nickPrefixes.containsKey(nickname.substring(0, 1))) {
+						if (prefixHandler.isNickPrefixed(nickname)) {
 							nicks.add(new Nickname(nickname.substring(1), nickname.substring(0, 1)));
 						} else {
 							nicks.add(new Nickname(nickname, ""));
@@ -469,28 +466,6 @@ public class Connection extends AbstractExecutionThreadService implements Servic
 				} else if (command.equalsIgnoreCase("PING")) {
 					connectionHandler.sendCommand("PONG", getOptional(parameters, 0), getOptional(parameters, 1));
 
-				/* 005 originally was a bounce message, now used to transmit useful information about the server. */
-				} else if (command.equals("005")) {
-					for (String parameter : parameters) {
-						if (parameter.startsWith("PREFIX=")) {
-							int openParen = parameter.indexOf('(');
-							int closeParen = parameter.indexOf(')');
-							if ((openParen != -1) && (closeParen != -1)) {
-								for (int modeCharacterIndex = 1; modeCharacterIndex < (closeParen - openParen); ++modeCharacterIndex) {
-									char modeCharacter = parameter.charAt(openParen + modeCharacterIndex);
-									char modeSymbol = parameter.charAt(closeParen + modeCharacterIndex);
-									nickPrefixes.put(String.valueOf(modeSymbol), String.valueOf(modeCharacter));
-								}
-								logger.debug(String.format("Parsed Prefixes: %s", nickPrefixes));
-							}
-						} else if (parameter.startsWith("CHANTYPES=")) {
-							for (int typeIndex = 10; typeIndex < parameter.length(); ++typeIndex) {
-								channelTypes.add(parameter.charAt(typeIndex));
-							}
-							logger.debug(String.format("Parsed Channel Types: %s", channelTypes));
-						}
-					}
-
 				} else if (command.equalsIgnoreCase("KICK")) {
 					eventBus.post(new KickedFromChannel(this, parameters.get(0), reply.source().get(), parameters.get(1), getOptional(parameters, 2)));