Parse DCC SEND messages and send events for it.
authorDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Wed, 10 Apr 2013 04:34:28 +0000 (06:34 +0200)
committerDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Wed, 10 Apr 2013 04:34:28 +0000 (06:34 +0200)
src/main/java/net/pterodactylus/irc/Connection.java
src/main/java/net/pterodactylus/irc/event/DccSendReceived.java [new file with mode: 0644]

index eacf75e..239f0a2 100644 (file)
@@ -46,6 +46,7 @@ import net.pterodactylus.irc.event.ChannelNotJoined.Reason;
 import net.pterodactylus.irc.event.ChannelTopic;
 import net.pterodactylus.irc.event.ConnectionEstablished;
 import net.pterodactylus.irc.event.ConnectionFailed;
+import net.pterodactylus.irc.event.DccSendReceived;
 import net.pterodactylus.irc.event.MotdReceived;
 import net.pterodactylus.irc.event.NicknameInUseReceived;
 import net.pterodactylus.irc.event.NoNicknameGivenReceived;
@@ -58,6 +59,7 @@ import com.google.common.collect.Maps;
 import com.google.common.collect.Sets;
 import com.google.common.eventbus.EventBus;
 import com.google.common.io.Closeables;
+import com.google.common.primitives.Ints;
 import com.google.common.primitives.Longs;
 import com.google.common.util.concurrent.AbstractExecutionThreadService;
 import com.google.common.util.concurrent.Service;
@@ -279,7 +281,23 @@ public class Connection extends AbstractExecutionThreadService implements Servic
                                if (command.equalsIgnoreCase("PRIVMSG")) {
                                        String recipient = parameters.get(0);
                                        String message = parameters.get(1);
-                                       if (!channelTypes.contains(recipient.charAt(0))) {
+                                       if (message.startsWith("\u0001") && message.endsWith("\u0001")) {
+                                               /* CTCP! */
+                                               String[] messageWords = message.substring(1, message.length() - 1).split(" +");
+                                               String ctcpCommand = messageWords[0];
+                                               if (ctcpCommand.equalsIgnoreCase("DCC")) {
+                                                       if (messageWords[1].equalsIgnoreCase("SEND")) {
+                                                               Optional<InetAddress> inetAddress = parseInetAddress(messageWords[3]);
+                                                               Optional<Integer> port = Optional.fromNullable(Ints.tryParse(messageWords[4]));
+                                                               long fileSize = Optional.fromNullable(Longs.tryParse(messageWords[5])).or(-1L);
+                                                               if (inetAddress.isPresent() && port.isPresent()) {
+                                                                       eventBus.post(new DccSendReceived(this, reply.source().get(), messageWords[2], inetAddress.get(), port.get(), fileSize));
+                                                               } else {
+                                                                       logger.warning(String.format("Received malformed DCC SEND: “%s”", message));
+                                                               }
+                                                       }
+                                               }
+                                       } else if (!channelTypes.contains(recipient.charAt(0))) {
                                                eventBus.post(new PrivateMessageReceived(this, reply.source().get(), message));
                                        } else {
                                                eventBus.post(new ChannelMessageReceived(this, recipient, reply.source().get(), message));
diff --git a/src/main/java/net/pterodactylus/irc/event/DccSendReceived.java b/src/main/java/net/pterodactylus/irc/event/DccSendReceived.java
new file mode 100644 (file)
index 0000000..95494a4
--- /dev/null
@@ -0,0 +1,123 @@
+/*
+ * XdccDownloader - DccSendReceived.java - Copyright © 2013 David Roden
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package net.pterodactylus.irc.event;
+
+import java.net.InetAddress;
+
+import net.pterodactylus.irc.Connection;
+import net.pterodactylus.irc.Source;
+
+/**
+ * Notifies a listener that a DCC SEND message was received.
+ *
+ * @author <a href="mailto:bombe@pterodactylus.net">David ‘Bombe’ Roden</a>
+ */
+public class DccSendReceived extends AbstractConnectionEvent {
+
+       /** The source of the DCC SEND. */
+       private final Source source;
+
+       /** The name of the file being offered. */
+       private final String filename;
+
+       /** The IP address of the source. */
+       private final InetAddress inetAddress;
+
+       /** The port number of the source. */
+       private final int port;
+
+       /** The filesize. */
+       private final long filesize;
+
+       /**
+        * Creates a new DCC SEND received event.
+        *
+        * @param connection
+        *              The connetion the event occured on
+        * @param source
+        *              The source offering the file
+        * @param filename
+        *              The name of the file being offered
+        * @param inetAddress
+        *              The IP address of the source
+        * @param port
+        *              The port number of the source
+        * @param filesize
+        *              The size of the file being offered ({@code -1} for unknown size)
+        */
+       public DccSendReceived(Connection connection, Source source, String filename, InetAddress inetAddress, int port, long filesize) {
+               super(connection);
+               this.source = source;
+               this.filename = filename;
+               this.inetAddress = inetAddress;
+               this.port = port;
+               this.filesize = filesize;
+       }
+
+       //
+       // ACCESSORS
+       //
+
+       /**
+        * Returns the source offering the file.
+        *
+        * @return The source offering the file
+        */
+       public Source source() {
+               return source;
+       }
+
+       /**
+        * Returns the name of the file being offered.
+        *
+        * @return The name of the file being offered
+        */
+       public String filename() {
+               return filename;
+       }
+
+       /**
+        * Returns the size of the file being offered. If the size is not known, {@code
+        * -1} is returned.
+        *
+        * @return The size of the file being offered, or {@code -1} if the size is not
+        *         known
+        */
+       public long filesize() {
+               return filesize;
+       }
+
+       /**
+        * Return the IP address of the source.
+        *
+        * @return The IP address of the source
+        */
+       public InetAddress inetAddress() {
+               return inetAddress;
+       }
+
+       /**
+        * Returns the port number of the source.
+        *
+        * @return The port number of the source
+        */
+       public int port() {
+               return port;
+       }
+
+}