X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fxdcc%2Fcore%2FCore.java;h=3414d1810fc446086b8780157d0a117dc3255e83;hb=c775ff7d7371d3a4ef8663afca7de364daeda526;hp=68628d70bbce5d0f39912558eb8a0b0b7e501d74;hpb=f5fcfe1bbd91b46e873a870a0548349002a0c626;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 68628d7..3414d18 100644
--- a/src/main/java/net/pterodactylus/xdcc/core/Core.java
+++ b/src/main/java/net/pterodactylus/xdcc/core/Core.java
@@ -18,8 +18,6 @@
 package net.pterodactylus.xdcc.core;
 
 import static java.lang.String.format;
-import static java.lang.System.currentTimeMillis;
-import static java.util.concurrent.TimeUnit.HOURS;
 import static net.pterodactylus.irc.event.ChannelNotJoined.Reason.banned;
 import static net.pterodactylus.irc.event.ChannelNotJoined.Reason.registeredNicknamesOnly;
 import static net.pterodactylus.irc.util.MessageCleaner.getDefaultInstance;
@@ -38,6 +36,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
 
 import net.pterodactylus.irc.Connection;
 import net.pterodactylus.irc.ConnectionBuilder;
@@ -70,12 +69,12 @@ import net.pterodactylus.xdcc.core.event.GenericMessage;
 import net.pterodactylus.xdcc.core.event.MessageReceived;
 import net.pterodactylus.xdcc.data.Bot;
 import net.pterodactylus.xdcc.data.Channel;
+import net.pterodactylus.xdcc.data.ConnectedNetwork;
 import net.pterodactylus.xdcc.data.Download;
 import net.pterodactylus.xdcc.data.Network;
 import net.pterodactylus.xdcc.data.Pack;
 import net.pterodactylus.xdcc.data.Server;
 
-import com.google.common.base.Function;
 import com.google.common.base.Optional;
 import com.google.common.base.Predicate;
 import com.google.common.collect.FluentIterable;
@@ -181,13 +180,25 @@ public class Core extends AbstractExecutionThreadService {
 	 *
 	 * @return All connected networks
 	 */
-	public Collection<Network> connectedNetworks() {
-		return Lists.newArrayList(Optional.presentInstances(FluentIterable.from(networkConnections.values()).transform(new Function<Connection, Optional<Network>>() {
-			@Override
-			public Optional<Network> apply(Connection connection) {
-				return getNetwork(connection);
-			}
-		})));
+	public Collection<ConnectedNetwork> connectedNetworks() {
+		return networkConnections.entrySet().stream().map((entry) -> {
+			Network network = entry.getKey();
+			Collection<Bot> bots = networkBots.row(network).values();
+			int packCount = bots.stream().mapToInt((bot) -> bot.packs().size()).reduce((a, b) -> a + b).orElse(0);
+			return new ConnectedNetwork(network, entry.getValue().hostname(),
+					entry.getValue().port(), entry.getValue().nickname(),
+					channels.stream()
+							.filter((channel) -> channel.network()
+									.equals(network))
+							.map(Channel::name)
+							.collect(Collectors.<String>toList()),
+					extraChannels.stream()
+							.filter((channel) -> channel.network()
+									.equals(network))
+							.map(Channel::name)
+							.collect(Collectors.<String>toList()),
+					bots.size(), packCount);
+		}).collect(Collectors.<ConnectedNetwork>toList());
 	}
 
 	/**
@@ -435,6 +446,9 @@ public class Core extends AbstractExecutionThreadService {
 		if (!network.isPresent()) {
 			return;
 		}
+		if (!connection.established()) {
+			return;
+		}
 
 		/* find all channels that need to be removed. */
 		for (Collection<Channel> channels : ImmutableList.of(joinedChannels, extraChannels)) {
@@ -563,6 +577,16 @@ public class Core extends AbstractExecutionThreadService {
 			return;
 		}
 
+		/* remove all bots for this channel, we might have been kicked. */
+		Collection<Bot> botsToRemove = networkBots.row(network.get())
+				.values().stream()
+				.filter(bot -> bot.channel()
+						.equalsIgnoreCase(channel.get().name()))
+				.collect(Collectors.toSet());
+		botsToRemove.stream()
+				.forEach(bot -> networkBots.row(network.get())
+						.remove(bot.name()));
+
 		if (channelNotJoined.reason() == registeredNicknamesOnly) {
 			channels.remove(channel.get());
 			eventBus.post(new GenericMessage(
@@ -572,7 +596,7 @@ public class Core extends AbstractExecutionThreadService {
 		if (channelNotJoined.reason() == banned) {
 			channelBanManager.ban(channel.get());
 			eventBus.post(new GenericMessage(
-					format("Banned from %s, suspending join for  day.",
+					format("Banned from %s, suspending join for a day.",
 							channel.get())));
 			return;
 		}
@@ -725,7 +749,8 @@ public class Core extends AbstractExecutionThreadService {
 		Bot bot;
 		synchronized (networkBots) {
 			if (!networkBots.contains(network.get(), channelMessageReceived.source().nick().get())) {
-				bot = new Bot(network.get(), channelMessageReceived.source().nick().get());
+				bot = new Bot(network.get(), channelMessageReceived.channel(),
+						channelMessageReceived.source().nick().get());
 				networkBots.put(network.get(), channelMessageReceived.source().nick().get(), bot);
 				eventBus.post(new BotAdded(bot));
 			} else {