X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fxdcc%2Fcore%2FCore.java;h=68628d70bbce5d0f39912558eb8a0b0b7e501d74;hb=f5fcfe1bbd91b46e873a870a0548349002a0c626;hp=0cc829425ce2eca5805faf122448306ae2dee1f0;hpb=7e12b9da7bb49b20e1dbc95de0d89b07d8cda0e4;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 0cc8294..68628d7 100644
--- a/src/main/java/net/pterodactylus/xdcc/core/Core.java
+++ b/src/main/java/net/pterodactylus/xdcc/core/Core.java
@@ -18,6 +18,10 @@
 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;
 import static net.pterodactylus.xdcc.data.Channel.TO_NETWORK;
 import static net.pterodactylus.xdcc.data.Download.FILTER_RUNNING;
@@ -103,6 +107,8 @@ public class Core extends AbstractExecutionThreadService {
 
 	/** The event bus. */
 	private final EventBus eventBus;
+	private final ChannelBanManager channelBanManager =
+			new ChannelBanManager();
 
 	/** The temporary directory to download files to. */
 	private final String temporaryDirectory;
@@ -368,6 +374,11 @@ public class Core extends AbstractExecutionThreadService {
 					continue;
 				}
 
+				/* are we banned from this channel? */
+				if (channelBanManager.isBanned(channel)) {
+					continue;
+				}
+
 				connectNetwork(channel.network());
 				Connection connection = networkConnections.get(channel.network());
 				if (connection.established()) {
@@ -533,6 +544,7 @@ public class Core extends AbstractExecutionThreadService {
 				return;
 			}
 
+			channelBanManager.unban(channel.get());
 			joinedChannels.add(channel.get());
 			logger.info(String.format("Joined Channel %s on %s.", channelJoined.channel(), network.get().name()));
 		}
@@ -545,6 +557,26 @@ public class Core extends AbstractExecutionThreadService {
 			return;
 		}
 
+		Optional<Channel> channel = getChannel(network.get(), channelNotJoined.channel());
+		if (!channel.isPresent()) {
+			eventBus.post(new GenericMessage(format("Could not join %s but didn’t try to join, either.", channel.get())));
+			return;
+		}
+
+		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());
+			eventBus.post(new GenericMessage(
+					format("Banned from %s, suspending join for  day.",
+							channel.get())));
+			return;
+		}
+
 		eventBus.post(new GenericMessage(
 				format("Could not join %s: %s", channelNotJoined.channel(),
 						channelNotJoined.reason())));