X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fxdcc%2Fcore%2FCore.java;h=fab43ab74284576ab5bae5b9c266a982741279e1;hb=5e7f77e44cacc40da04ac9f744566de0710b12a1;hp=e24fa2ff3aeafae29df0b5601c2538b1fe48b64e;hpb=fd78c0b99be170906ab7954ccd59916566803c57;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 e24fa2f..fab43ab 100644
--- a/src/main/java/net/pterodactylus/xdcc/core/Core.java
+++ b/src/main/java/net/pterodactylus/xdcc/core/Core.java
@@ -19,6 +19,7 @@ package net.pterodactylus.xdcc.core;
 
 import static java.lang.String.format;
 import static net.pterodactylus.irc.event.ChannelNotJoined.Reason.banned;
+import static net.pterodactylus.irc.event.ChannelNotJoined.Reason.inviteOnly;
 import static net.pterodactylus.irc.event.ChannelNotJoined.Reason.registeredNicknamesOnly;
 import static net.pterodactylus.irc.util.MessageCleaner.getDefaultInstance;
 import static net.pterodactylus.xdcc.data.Channel.TO_NETWORK;
@@ -29,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;
@@ -109,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;
@@ -195,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().get(),
+					connection.nickname(),
 					channels.stream()
 							.filter((channel) -> channel.network()
 									.equals(network))
@@ -257,6 +264,10 @@ public class Core extends AbstractExecutionThreadService {
 		return downloads.values();
 	}
 
+	public Duration getUptime() {
+		return Duration.between(startup, Instant.now());
+	}
+
 	//
 	// ACTIONS
 	//
@@ -427,17 +438,17 @@ public class Core extends AbstractExecutionThreadService {
 			}
 
 			Map<Long, Network> timesForNextConnects = new TreeMap<>(missingNetworks.stream()
-					.collect(Collectors.toMap(connectionBackoff::getBackoff, Function.identity(), (network, ignore) -> network)));
+					.collect(Collectors.toMap(connectionBackoff::getConnectionTime, Function.identity(), (network, ignore) -> network)));
 
 			Optional<Entry<Long, Network>> firstNetwork = Optional.fromNullable(timesForNextConnects.entrySet().stream().findFirst().orElse(null));
 			if (!firstNetwork.isPresent()) {
 				continue;
 			}
-			if (firstNetwork.get().getKey() > 0) {
-				eventBus.post(new GenericMessage(String.format("Waiting %d minutes to connect to %s...", TimeUnit.MILLISECONDS.toMinutes(firstNetwork.get().getKey()), firstNetwork.get().getValue().name())));
+			if (firstNetwork.get().getKey() > System.currentTimeMillis()) {
+				eventBus.post(new GenericMessage(String.format("Will connect to %2$s at %1$tH:%1$tM...", firstNetwork.get().getKey(), firstNetwork.get().getValue().name())));
 				synchronized (syncObject) {
 					try {
-						syncObject.wait(firstNetwork.get().getKey());
+						syncObject.wait(firstNetwork.get().getKey() - System.currentTimeMillis());
 					} catch (InterruptedException ie1) {
 						/* ignore. */
 					}
@@ -445,6 +456,9 @@ public class Core extends AbstractExecutionThreadService {
 				if (!isRunning()) {
 					break;
 				}
+				if (firstNetwork.get().getKey() > System.currentTimeMillis()) {
+					continue;
+				}
 			}
 
 			connectNetwork(firstNetwork.get().getValue());
@@ -499,9 +513,6 @@ public class Core extends AbstractExecutionThreadService {
 			return;
 		}
 		networkConnections.remove(network.get());
-		if (!connection.established()) {
-			return;
-		}
 
 		/* find all channels that need to be removed. */
 		for (Collection<Channel> channels : ImmutableList.of(joinedChannels, extraChannels)) {
@@ -654,23 +665,24 @@ public class Core extends AbstractExecutionThreadService {
 				.forEach(bot -> networkBots.row(network.get())
 						.remove(bot.name()));
 
+		channelBanManager.ban(channel.get());
 		if (channelNotJoined.reason() == registeredNicknamesOnly) {
-			channels.remove(channel.get());
 			eventBus.post(new GenericMessage(
-					format("Not trying to join %s anymore.", channel.get())));
-			return;
-		}
-		if (channelNotJoined.reason() == banned) {
-			channelBanManager.ban(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.",
+							channel.get())));
+		} else if (channelNotJoined.reason() == banned) {
 			eventBus.post(new GenericMessage(
 					format("Banned from %s, suspending join for a day.",
 							channel.get())));
-			return;
+		} else {
+			eventBus.post(new GenericMessage(
+					format("Could not join %s: %s", channelNotJoined.channel(),
+							channelNotJoined.reason())));
 		}
-
-		eventBus.post(new GenericMessage(
-				format("Could not join %s: %s", channelNotJoined.channel(),
-						channelNotJoined.reason())));
 	}
 
 	/**
@@ -745,7 +757,7 @@ public class Core extends AbstractExecutionThreadService {
 					"Kicked from %s by %s: %s",
 					kickedFromChannel.channel(),
 					kickedFromChannel.kicker(),
-					kickedFromChannel.reason().or("<unknown>")
+					kickedFromChannel.reason().orElse("<unknown>")
 			)));
 		}
 	}