import java.net.Socket;
import java.util.ArrayList;
import java.util.List;
-import java.util.Set;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
import javax.net.SocketFactory;
+import net.pterodactylus.irc.connection.ChannelNickHandler;
import net.pterodactylus.irc.connection.ChannelNotJoinedHandler;
import net.pterodactylus.irc.connection.ConnectionEstablishHandler;
import net.pterodactylus.irc.connection.CtcpHandler;
import net.pterodactylus.irc.connection.MessageHandler;
import net.pterodactylus.irc.connection.MotdHandler;
import net.pterodactylus.irc.connection.PrefixHandler;
+import net.pterodactylus.irc.connection.SimpleCommandHandler;
import net.pterodactylus.irc.event.ChannelJoined;
import net.pterodactylus.irc.event.ChannelLeft;
-import net.pterodactylus.irc.event.ChannelNicknames;
import net.pterodactylus.irc.event.ChannelTopic;
import net.pterodactylus.irc.event.ClientQuit;
import net.pterodactylus.irc.event.ConnectionClosed;
import net.pterodactylus.xdcc.util.io.BandwidthCountingOutputStream;
import com.google.common.base.Optional;
-import com.google.common.collect.Sets;
import com.google.common.eventbus.EventBus;
import com.google.common.eventbus.Subscribe;
import com.google.common.io.Closeables;
try {
/* some status variables. */
boolean connected = true;
- Set<Nickname> nicks = Sets.newHashSet();
PrefixHandler prefixHandler = new PrefixHandler();
List<Handler> handlers = asList(
new MessageHandler(eventBus, this, prefixHandler),
new CtcpHandler(eventBus, this),
+ new ChannelNickHandler(eventBus, this, prefixHandler),
+ new SimpleCommandHandler()
+ .addCommand("431", (parameters) -> eventBus.post(
+ new NoNicknameGivenReceived(this))),
new MotdHandler(eventBus, this),
new ChannelNotJoinedHandler(eventBus, this),
new ConnectionEstablishHandler(eventBus, this),
}
/* 43x replies are for nick change errors. */
- if (command.equals("431")) {
- eventBus.post(new NoNicknameGivenReceived(this, reply));
- } else if (command.equals("433")) {
+ if (command.equals("433")) {
if (!established.get()) {
nickname = nicknameChooser.getNickname();
connectionHandler.sendCommand("NICK", nickname);
/* no topic is set. */
} else if (command.equals("332")) {
eventBus.post(new ChannelTopic(this, parameters.get(1), parameters.get(2)));
- } else if (command.equals("353")) {
- for (String nickname : parameters.get(3).split(" ")) {
- if (prefixHandler.isNickPrefixed(nickname)) {
- nicks.add(new Nickname(nickname.substring(1), nickname.substring(0, 1)));
- } else {
- nicks.add(new Nickname(nickname, ""));
- }
- }
- } else if (command.equals("366")) {
- eventBus.post(new ChannelNicknames(this, parameters.get(1), nicks));
- nicks.clear();
} else if (command.equalsIgnoreCase("PART")) {
eventBus.post(new ChannelLeft(this, parameters.get(0), reply.source().get(), getOptional(parameters, 1)));
} else if (command.equalsIgnoreCase("QUIT")) {