X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fxdcc%2Fcore%2FCore.java;h=d2531485a285b67e5961c64ae1757660fc9887db;hb=099e3500a7357ee556aaad819e06e7180ec29db0;hp=38958f71a24fa223ac815ff3120dc26e6f0dbdfd;hpb=d30170400a6af5d4fbfa3f2e18bcf366b02160aa;p=xudocci.git

diff --git a/src/main/java/net/pterodactylus/xdcc/core/Core.java b/src/main/java/net/pterodactylus/xdcc/core/Core.java
index 38958f7..d253148 100644
--- a/src/main/java/net/pterodactylus/xdcc/core/Core.java
+++ b/src/main/java/net/pterodactylus/xdcc/core/Core.java
@@ -33,6 +33,7 @@ import java.util.logging.Logger;
 import net.pterodactylus.irc.Connection;
 import net.pterodactylus.irc.ConnectionBuilder;
 import net.pterodactylus.irc.DccReceiver;
+import net.pterodactylus.irc.event.ChannelJoined;
 import net.pterodactylus.irc.event.ChannelMessageReceived;
 import net.pterodactylus.irc.event.ConnectionEstablished;
 import net.pterodactylus.irc.event.DccSendReceived;
@@ -77,6 +78,9 @@ public class Core extends AbstractIdleService {
 	/** The channels that are currentlymonitored. */
 	private final Collection<Channel> joinedChannels = Sets.newHashSet();
 
+	/** The channels that are joined but not configured. */
+	private final Collection<Channel> extraChannels = Sets.newHashSet();
+
 	/** The current network connections. */
 	private final Map<Network, Connection> networkConnections = Collections.synchronizedMap(Maps.<Network, Connection>newHashMap());
 
@@ -121,6 +125,15 @@ public class Core extends AbstractIdleService {
 	}
 
 	/**
+	 * Returns all currently joined channels that are not configured.
+	 *
+	 * @return All currently joined but not configured channels
+	 */
+	public Collection<Channel> extraChannels() {
+		return ImmutableSet.copyOf(extraChannels);
+	}
+
+	/**
 	 * Returns all currently known bots.
 	 *
 	 * @return All currently known bots
@@ -235,6 +248,33 @@ public class Core extends AbstractIdleService {
 	}
 
 	/**
+	 * Shows a message when a channel was joined by us.
+	 *
+	 * @param channelJoined
+	 * 		The channel joined event
+	 */
+	@Subscribe
+	public void channelJoined(ChannelJoined channelJoined) {
+		if (channelJoined.connection().isSource(channelJoined.client())) {
+			Optional<Network> network = getNetwork(channelJoined.connection());
+			if (!network.isPresent()) {
+				return;
+			}
+
+			Optional<Channel> channel = getChannel(network.get(), channelJoined.channel());
+			if (!channel.isPresent()) {
+				/* it’s an extra channel. */
+				extraChannels.add(new Channel(network.get(), channelJoined.channel()));
+				logger.info(String.format("Joined extra Channel %s on %s.", channelJoined.channel(), network.get().name()));
+				return;
+			}
+
+			joinedChannels.add(channel.get());
+			logger.info(String.format("Joined Channel %s on %s.", channelJoined.channel(), network.get().name()));
+		}
+	}
+
+	/**
 	 * If a message on a channel is received, it is parsed for pack information
 	 * with is then added to a bot.
 	 *