Expose a connection uptime of 0 if connection is not yet established

[xudocci.git] / src / main / java / net / pterodactylus / xdcc / core / Core.java

diff --git a/src/main/java/net/pterodactylus/xdcc/core/Core.java b/src/main/java/net/pterodactylus/xdcc/core/Core.java
index d39ee2b..5b1b12d 100644 (file)
--- 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
        //
@@ -503,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)) {
@@ -661,7 +668,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 +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>")
                        )));
                }
        }