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;
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;
/** 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;
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))
return downloads.values();
}
+ public Duration getUptime() {
+ return Duration.between(startup, Instant.now());
+ }
+
//
// ACTIONS
//
if (channelBanManager.isBanned(channel)) {
continue;
}
- if (networkConnections.containsKey(channel.network())) {
- if (networkConnections.get(channel.network()).established()) {
- missingChannels.add(channel);
- }
+ if (!networkConnections.containsKey(channel.network()) || networkConnections.get(channel.network()).established()) {
+ missingChannels.add(channel);
}
}
Set<Network> missingNetworks = missingChannels.stream()
.filter((network) -> !networkConnections.containsKey(network))
.collect(Collectors.toSet());
- if (!missingChannels.isEmpty()) {
- for (Channel missingChannel : missingChannels) {
- Network network = missingChannel.network();
- eventBus.post(new GenericMessage(String.format("Trying to join %s on %s...", missingChannel.name(), network)));
- try {
- channelsBeingJoined.add(missingChannel);
- networkConnections.get(network).joinChannel(missingChannel.name());
- } catch (IOException ioe1) {
- logger.warn(String.format("Could not join %s on %s!", missingChannel.name(), network.name()), ioe1);
+ if (missingNetworks.isEmpty()) {
+ if (!missingChannels.isEmpty()) {
+ for (Channel missingChannel : missingChannels) {
+ Network network = missingChannel.network();
+ eventBus.post(new GenericMessage(String.format("Trying to join %s on %s...", missingChannel.name(), network)));
+ try {
+ channelsBeingJoined.add(missingChannel);
+ networkConnections.get(network).joinChannel(missingChannel.name());
+ } catch (IOException ioe1) {
+ logger.warn(String.format("Could not join %s on %s!", missingChannel.name(), network.name()), ioe1);
+ }
}
- }
- } else if (missingNetworks.isEmpty()) {
- synchronized (syncObject) {
- try {
- syncObject.wait(TimeUnit.MINUTES.toMillis(1));
- } catch (InterruptedException ie1) {
+ } else {
+ synchronized (syncObject) {
+ try {
+ syncObject.wait(TimeUnit.MINUTES.toMillis(1));
+ } catch (InterruptedException ie1) {
/* ignore. */
+ }
}
}
continue;
}
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)));
- Entry<Long, Network> firstNetwork = timesForNextConnects.entrySet().stream().findFirst().get();
- if (firstNetwork.getKey() > 0) {
- eventBus.post(new GenericMessage(String.format("Waiting %d seconds to connect to %s...", TimeUnit.MILLISECONDS.toMinutes(firstNetwork.getKey()), firstNetwork.getValue().name())));
+ Optional<Entry<Long, Network>> firstNetwork = Optional.fromNullable(timesForNextConnects.entrySet().stream().findFirst().orElse(null));
+ if (!firstNetwork.isPresent()) {
+ continue;
+ }
+ 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.getKey());
+ syncObject.wait(firstNetwork.get().getKey() - System.currentTimeMillis());
} catch (InterruptedException ie1) {
/* ignore. */
}
if (!isRunning()) {
break;
}
+ if (firstNetwork.get().getKey() > System.currentTimeMillis()) {
+ continue;
+ }
}
- connectNetwork(firstNetwork.getValue());
+ connectNetwork(firstNetwork.get().getValue());
}
}
return;
}
Server server = servers.get((int) (Math.random() * servers.size()));
+ eventBus.post(new GenericMessage(String.format("Connecting to %s on %s...", network.name(), server.hostname())));
Connection connection = connectionFactory.createConnection(server.hostname(),
server.unencryptedPorts().iterator().next());
connection.username(RandomNickname.get()).realName(RandomNickname.get());
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)) {
}
Optional<Channel> channel = getChannel(network.get(), channelNotJoined.channel());
+ synchronized (syncObject) {
+ syncObject.notifyAll();
+ }
if (!channel.isPresent()) {
eventBus.post(new GenericMessage(format("Could not join %s but didn’t try to join, either.", channelNotJoined.channel())));
return;
}
-
channelsBeingJoined.remove(channel.get());
+
/* remove all bots for this channel, we might have been kicked. */
Collection<Bot> botsToRemove = networkBots.row(network.get())
.values().stream()
.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())));
}
/**
} else {
channels.remove(channel.get());
}
+ synchronized (syncObject) {
+ syncObject.notifyAll();
+ }
eventBus.post(new GenericMessage(String.format("Left Channel %s on %s.", channel.get().name(), channel.get().network().name())));
}
} else {
joinedChannels.remove(channel.get());
}
+ synchronized (syncObject) {
+ syncObject.notifyAll();
+ }
eventBus.post(new GenericMessage(format(
"Kicked from %s by %s: %s",
kickedFromChannel.channel(),
kickedFromChannel.kicker(),
- kickedFromChannel.reason().or("<unknown>")
+ kickedFromChannel.reason().orElse("<unknown>")
)));
}
}
projects / xudocci.git / blobdiff