X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fxdcc%2Fcore%2FCore.java;h=649db75114993bbd6d2896db7c311e2f2e99a3fe;hb=82dbd8dd4022906970f8851080df22c77d0111af;hp=d39ee2bd0ffe241a933ad8ae0c844f99c21a93f4;hpb=d8c6d72caaa1ba75d09bd28f2bb10ae6f4964bf4;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 d39ee2b..649db75 100644
--- a/src/main/java/net/pterodactylus/xdcc/core/Core.java
+++ b/src/main/java/net/pterodactylus/xdcc/core/Core.java
@@ -30,6 +30,8 @@ import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.OutputStream;
+import java.time.Duration;
+import java.time.Instant;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashSet;
@@ -110,6 +112,7 @@ public class Core extends AbstractExecutionThreadService {
 	/** The logger. */
 	private static final Logger logger = Logger.getLogger(Core.class.getName());
 
+	private final Instant startup = Instant.now();
 	private final Object syncObject = new Object();
 	/** The event bus. */
 	private final EventBus eventBus;
@@ -196,8 +199,11 @@ public class Core extends AbstractExecutionThreadService {
 			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(),
+			Connection connection = entry.getValue();
+			return new ConnectedNetwork(network, connection.hostname(),
+					connection.port(),
+					connection.getUptime().orElse(Duration.ofSeconds(0)),
+					connection.nickname(),
 					channels.stream()
 							.filter((channel) -> channel.network()
 									.equals(network))
@@ -258,6 +264,10 @@ public class Core extends AbstractExecutionThreadService {
 		return downloads.values();
 	}
 
+	public Duration getUptime() {
+		return Duration.between(startup, Instant.now());
+	}
+
 	//
 	// ACTIONS
 	//
@@ -329,13 +339,6 @@ public class Core extends AbstractExecutionThreadService {
 			return;
 		}
 
-		/* get connection. */
-		Connection connection = networkConnections.get(bot.network());
-		if (connection == null) {
-			/* request for unknown network? */
-			return;
-		}
-
 		/* stop the DCC receiver. */
 		if (download.get().dccReceiver() != null) {
 			download.get().dccReceiver().stop();
@@ -344,6 +347,13 @@ public class Core extends AbstractExecutionThreadService {
 			downloads.remove(pack.name(), download.get());
 		}
 
+		/* get connection. */
+		Connection connection = networkConnections.get(bot.network());
+		if (connection == null) {
+			/* request for unknown network? */
+			return;
+		}
+
 		/* remove the request from the bot, too. */
 		try {
 			connection.sendMessage(bot.name(), String.format("XDCC %s", (download.get().dccReceiver() != null) ? "CANCEL" : "REMOVE"));
@@ -498,14 +508,14 @@ public class Core extends AbstractExecutionThreadService {
 	 * 		The connection to remove
 	 */
 	private void removeConnection(Connection connection) {
+		logger.debug(String.format("Removing Connection %s...", connection));
 		Optional<Network> network = getNetwork(connection);
 		if (!network.isPresent()) {
+			logger.debug(String.format("Connection %s did not belong to any network.", connection));
 			return;
 		}
+		logger.debug(String.format("Connection %s belongs to network %s.", connection, network.get()));
 		networkConnections.remove(network.get());
-		if (!connection.established()) {
-			return;
-		}
 
 		/* find all channels that need to be removed. */
 		for (Collection<Channel> channels : ImmutableList.of(joinedChannels, extraChannels)) {
@@ -514,7 +524,7 @@ public class Core extends AbstractExecutionThreadService {
 				if (!joinedChannel.network().equals(network.get())) {
 					continue;
 				}
-
+				logger.debug(String.format("Channel %s will be removed.", joinedChannel));
 				channelIterator.remove();
 			}
 		}
@@ -661,7 +671,8 @@ public class Core extends AbstractExecutionThreadService {
 		channelBanManager.ban(channel.get());
 		if (channelNotJoined.reason() == registeredNicknamesOnly) {
 			eventBus.post(new GenericMessage(
-					format("Not trying to join %s anymore.", channel.get())));
+					format("%s requires nickname registration, suspending join for a day.",
+							channel.get())));
 		} else if (channelNotJoined.reason() == inviteOnly) {
 			eventBus.post(new GenericMessage(
 					format("%s is invite-only, suspending join for a day.",
@@ -749,7 +760,7 @@ public class Core extends AbstractExecutionThreadService {
 					"Kicked from %s by %s: %s",
 					kickedFromChannel.channel(),
 					kickedFromChannel.kicker(),
-					kickedFromChannel.reason().or("<unknown>")
+					kickedFromChannel.reason().orElse("<unknown>")
 			)));
 		}
 	}