X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Firc%2FConnection.java;h=f6b791328fb9a87f8f609308f89bd82c85eda2a6;hb=b6505c4d0f4fbc2bf19cc8b6030062bca6d180dd;hp=4d601fd9aa2e60c69827b784c7170f4fda36c2cb;hpb=d1ec38be6ca58fb782aeb413c1b238b23c02c00a;p=xudocci.git diff --git a/src/main/java/net/pterodactylus/irc/Connection.java b/src/main/java/net/pterodactylus/irc/Connection.java index 4d601fd..f6b7913 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; @@ -44,12 +43,12 @@ 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.connection.PrefixHandler; import net.pterodactylus.irc.event.ChannelJoined; import net.pterodactylus.irc.event.ChannelLeft; import net.pterodactylus.irc.event.ChannelMessageReceived; import net.pterodactylus.irc.event.ChannelNicknames; -import net.pterodactylus.irc.event.ChannelNotJoined; -import net.pterodactylus.irc.event.ChannelNotJoined.Reason; import net.pterodactylus.irc.event.ChannelNoticeReceived; import net.pterodactylus.irc.event.ChannelTopic; import net.pterodactylus.irc.event.ClientQuit; @@ -59,7 +58,6 @@ import net.pterodactylus.irc.event.ConnectionFailed; import net.pterodactylus.irc.event.DccAcceptReceived; import net.pterodactylus.irc.event.DccSendReceived; import net.pterodactylus.irc.event.KickedFromChannel; -import net.pterodactylus.irc.event.MotdReceived; import net.pterodactylus.irc.event.NicknameChanged; import net.pterodactylus.irc.event.NicknameInUseReceived; import net.pterodactylus.irc.event.NoNicknameGivenReceived; @@ -72,7 +70,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; @@ -375,16 +372,14 @@ public class Connection extends AbstractExecutionThreadService implements Servic try { /* some status variables. */ boolean connected = true; - StringBuilder motd = new StringBuilder(); Set nicks = Sets.newHashSet(); - /* server modes. */ - Map nickPrefixes = Maps.newHashMap(); - Set channelTypes = Sets.newHashSet(); - + PrefixHandler prefixHandler = new PrefixHandler(); List handlers = asList( + new MotdHandler(eventBus, this), + new ChannelNotJoinedHandler(eventBus, this), new ConnectionEstablishHandler(eventBus, this), - new ChannelNotJoinedHandler(eventBus, this) + prefixHandler ); while (connected) { @@ -408,7 +403,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)); @@ -420,8 +415,8 @@ 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))) { - eventBus.post(new PrivateNoticeReceived(this, reply)); + } else if (!prefixHandler.isChannel(recipient)) { + eventBus.post(new PrivateNoticeReceived(this, reply.source().get(), message)); } else { eventBus.post(new ChannelNoticeReceived(this, reply.source().get(), recipient, message)); } @@ -450,7 +445,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, "")); @@ -468,39 +463,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)); - } - } - - /* 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)));