X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Firc%2FConnection.java;h=a50c9463c4ad3acb69c42213cd6e2cea7cf0ee4b;hb=8bff1793a5004091ac9b4ef6bd1fd33b5086432a;hp=158a7f1b7d9533fa71c31b962094ac2ab621775e;hpb=3cc15ebd7eb8ade802b9a039873f6dbe5c185594;p=xudocci.git

diff --git a/src/main/java/net/pterodactylus/irc/Connection.java b/src/main/java/net/pterodactylus/irc/Connection.java
index 158a7f1..a50c946 100644
--- a/src/main/java/net/pterodactylus/irc/Connection.java
+++ b/src/main/java/net/pterodactylus/irc/Connection.java
@@ -32,10 +32,12 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import java.util.concurrent.SynchronousQueue;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 import javax.net.SocketFactory;
 
 import net.pterodactylus.irc.event.ChannelJoined;
+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;
@@ -45,6 +47,7 @@ import net.pterodactylus.irc.event.ConnectionFailed;
 import net.pterodactylus.irc.event.MotdReceived;
 import net.pterodactylus.irc.event.NicknameInUseReceived;
 import net.pterodactylus.irc.event.NoNicknameGivenReceived;
+import net.pterodactylus.irc.event.PrivateMessageReceived;
 import net.pterodactylus.irc.event.UnknownReplyReceived;
 import net.pterodactylus.irc.util.RandomNickname;
 
@@ -52,7 +55,6 @@ import com.beust.jcommander.internal.Maps;
 import com.beust.jcommander.internal.Sets;
 import com.google.common.base.Optional;
 import com.google.common.eventbus.EventBus;
-import com.google.common.eventbus.Subscribe;
 import com.google.common.io.Closeables;
 import com.google.common.util.concurrent.AbstractExecutionThreadService;
 import com.google.common.util.concurrent.Service;
@@ -64,6 +66,9 @@ import com.google.common.util.concurrent.Service;
  */
 public class Connection extends AbstractExecutionThreadService implements Service {
 
+	/* The logger. */
+	private static final Logger logger = Logger.getLogger(Connection.class.getName());
+
 	/** The event bus. */
 	private final EventBus eventBus;
 
@@ -196,42 +201,11 @@ public class Connection extends AbstractExecutionThreadService implements Servic
 	 * @param channel
 	 * 		The channel to join
 	 * @return {@code true} if the channel was joined, {@code false} otherwise
+	 * @throws IOException
+	 * 		if an I/O error occurs
 	 */
-	public boolean joinChannel(final String channel) {
-		final SynchronousQueue<Boolean> result = new SynchronousQueue<Boolean>();
-		Object eventHandler = new Object() {
-
-			@Subscribe
-			public void channelJoined(ChannelJoined channelJoined) throws InterruptedException {
-				if (!channelJoined.channel().equalsIgnoreCase(channel)) {
-					return;
-				}
-				Optional<String> nickname = channelJoined.client().nick();
-				if (!nickname.isPresent() || (nickname.isPresent() && nickname().equalsIgnoreCase(nickname.get()))) {
-					eventBus.unregister(this);
-					result.put(true);
-				}
-			}
-
-			@Subscribe
-			public void channelNotJoined(ChannelNotJoined channelNotJoined) throws InterruptedException {
-				if (!channelNotJoined.channel().equalsIgnoreCase(channel)) {
-					return;
-				}
-				eventBus.unregister(this);
-				result.put(false);
-			}
-		};
-		eventBus.register(eventHandler);
-		try {
-			connectionHandler.sendCommand("JOIN", channel);
-			return result.take();
-		} catch (IOException ioe1) {
-			eventBus.unregister(eventHandler);
-		} catch (InterruptedException ie1) {
-			/* TODO - how to handle? */
-		}
-		return false;
+	public void joinChannel(final String channel) throws IOException {
+		connectionHandler.sendCommand("JOIN", channel);
 	}
 
 	//
@@ -276,15 +250,25 @@ public class Connection extends AbstractExecutionThreadService implements Servic
 
 			/* server modes. */
 			Map<String, String> nickPrefixes = Maps.newHashMap();
+			Set<Character> channelTypes = Sets.newHashSet();
 
 			while (connected) {
 				Reply reply = connectionHandler.readReply();
-				System.err.println("<< " + reply);
+				logger.finest(String.format("<< %s", reply));
 				String command = reply.command();
 				List<String> parameters = reply.parameters();
 
+				/* most common events. */
+				if (command.equalsIgnoreCase("PRIVMSG")) {
+					String recipient = parameters.get(0);
+					if (!channelTypes.contains(recipient.charAt(0))) {
+						eventBus.post(new PrivateMessageReceived(this, reply.source().get(), parameters.get(1)));
+					} else {
+						eventBus.post(new ChannelMessageReceived(this, recipient, reply.source().get(), parameters.get(1)));
+					}
+
 				/* replies 001-004 don’t hold information but they have to be sent on a successful connection. */
-				if (command.equals("001")) {
+				} else if (command.equals("001")) {
 					connectionStatus |= 0x01;
 				} else if (command.equals("002")) {
 					connectionStatus |= 0x02;
@@ -305,7 +289,13 @@ public class Connection extends AbstractExecutionThreadService implements Servic
 									char modeSymbol = parameter.charAt(closeParen + modeCharacterIndex);
 									nickPrefixes.put(String.valueOf(modeSymbol), String.valueOf(modeCharacter));
 								}
+								logger.fine(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.fine(String.format("Parsed Channel Types: %s", channelTypes));
 						}
 					}
 
@@ -349,7 +339,6 @@ public class Connection extends AbstractExecutionThreadService implements Servic
 					}
 				} else if (command.equals("366")) {
 					eventBus.post(new ChannelNicknames(this, parameters.get(1), nicks));
-					System.out.println("Found Nicknames: " + nicks);
 					nicks.clear();
 
 				/* common channel join errors. */
@@ -376,9 +365,9 @@ public class Connection extends AbstractExecutionThreadService implements Servic
 				oldConnectionStatus = connectionStatus;
 			}
 		} catch (IOException ioe1) {
-			ioe1.printStackTrace();
+			logger.log(Level.WARNING, "I/O error", ioe1);
 		} finally {
-			System.out.println("Closing Connection.");
+			logger.info("Closing Connection.");
 			try {
 				Closeables.close(connectionHandler, true);
 			} catch (IOException ioe1) {
@@ -492,7 +481,7 @@ public class Connection extends AbstractExecutionThreadService implements Servic
 				commandBuilder.append(parameter);
 			}
 
-			System.out.println(">> " + commandBuilder.toString());
+			logger.finest(String.format(">> %s", commandBuilder));
 			outputStream.write((commandBuilder.toString() + "\r\n").getBytes("UTF-8"));
 			outputStream.flush();
 		}