fixes

bl4ckscor3 · Aug 22, 2016 · 980dbb6 · 980dbb6
1 parent fd2efff
commit 980dbb6
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git a/src/bl4ckscor3/bot/bl4ckb0t/ConfigurationFile.java b/src/bl4ckscor3/bot/bl4ckb0t/ConfigurationFile.java
@@ -74,7 +74,7 @@ public class ConfigurationFile
 			"#            Other             #",
 			"################################",
 			"showCmdColorsInHelpMenu=true",
-			"allowBlacklistWebpages=true",
+			"allowBlacklistWebsites=true",
 			"allowIgnoringUsers=true",
 			"allowCommandAliases=true",
 			"showGitHubRepoInfo=true",

diff --git a/src/bl4ckscor3/bot/bl4ckb0t/Startup.java b/src/bl4ckscor3/bot/bl4ckb0t/Startup.java
@@ -81,7 +81,7 @@ public static void setDefaultChans() throws MalformedURLException, IOException
 			return;
 		}
 
-		BufferedReader reader = new BufferedReader(new InputStreamReader(new URL("https://irc.akino-germany.tk/bl4ckb0t/files/bl4ckb0t chans.txt").openStream()));
+		BufferedReader reader = new BufferedReader(new InputStreamReader(new URL("https://akino.canopus.uberspace.de/bl4ckb0t/files/defaultChannels.txt").openStream()));
 		String line = "";
 
 		while((line = reader.readLine()) != null)
@@ -97,7 +97,7 @@ public static void setDefaultChans() throws MalformedURLException, IOException
 	 */
 	private static void setAllowedUsers() throws MalformedURLException, IOException
 	{
-		BufferedReader reader = new BufferedReader(new InputStreamReader(new URL("https://irc.akino-germany.tk/bl4ckb0t/files/allowedUsers.txt").openStream()));
+		BufferedReader reader = new BufferedReader(new InputStreamReader(new URL("https://akino.canopus.uberspace.de/bl4ckb0t/files/allowedUsers.txt").openStream()));
 		String line = "";
 
 		while((line = reader.readLine()) != null)
@@ -113,7 +113,7 @@ private static void setAllowedUsers() throws MalformedURLException, IOException
 	 */
 	private static void setValidUsers() throws MalformedURLException, IOException
 	{
-		BufferedReader reader = new BufferedReader(new InputStreamReader(new URL("https://irc.akino-germany.tk/bl4ckb0t/files/validUsers.txt").openStream()));
+		BufferedReader reader = new BufferedReader(new InputStreamReader(new URL("https://akino.canopus.uberspace.de/bl4ckb0t/files/validUsers.txt").openStream()));
 		String line = "";
 
 		while((line = reader.readLine()) != null)
@@ -129,7 +129,7 @@ private static void setValidUsers() throws MalformedURLException, IOException
 	 */
 	private static void setIgnoredUsers() throws MalformedURLException, IOException
 	{
-		BufferedReader reader = new BufferedReader(new InputStreamReader(new URL("https://irc.akino-germany.tk/bl4ckb0t/files/ignoredUsers.txt").openStream()));
+		BufferedReader reader = new BufferedReader(new InputStreamReader(new URL("https://akino.canopus.uberspace.de/bl4ckb0t/files/ignoredUsers.txt").openStream()));
 		String line = "";
 
 		while((line = reader.readLine()) != null)
@@ -149,7 +149,7 @@ private static void setIgnoredUsers() throws MalformedURLException, IOException
 	 */
 	private static void setBlacklistedWebsites() throws MalformedURLException, IOException
 	{
-		BufferedReader reader = new BufferedReader(new InputStreamReader(new URL("https://irc.akino-germany.tk/bl4ckb0t/files/blacklistedWebsites.txt").openStream()));
+		BufferedReader reader = new BufferedReader(new InputStreamReader(new URL("https://akino.canopus.uberspace.de/bl4ckb0t/files/blacklistedWebsites.txt").openStream()));
 		String line = "";
 
 		while((line = reader.readLine()) != null)

diff --git a/src/bl4ckscor3/bot/bl4ckb0t/misc/LinkManager.java b/src/bl4ckscor3/bot/bl4ckb0t/misc/LinkManager.java
@@ -27,7 +27,7 @@ public static void checkForLinkAndSendTitle(MessageEvent event) throws Malformed
 
 			if(s.contains("www.") || s.contains("http://") || s.contains("https://"))
 			{
-				if(Core.bot.getConfig().isEnabled("allowBlacklistWebpages") && isWebsiteBlacklisted(s))
+				if(Core.bot.getConfig().isEnabled("allowBlacklistWebsites") && isWebsiteBlacklisted(s))
 				{
 					Logging.info("Website blacklisted: " + s);
 					continue;

diff --git a/src/bl4ckscor3/bot/bl4ckb0t/util/Lists.java b/src/bl4ckscor3/bot/bl4ckb0t/util/Lists.java
@@ -59,7 +59,7 @@ public static void addIgnoredUser(String i)
 	 */
 	public static void addBlacklistedWebsite(String i)
 	{
-		ignoredUsers.add(i);
+		blacklistedWebsites.add(i);
 		Logging.info("Added " + i + " to blacklisted websites list...");
 	}
 

diff --git a/target/classes/config.txt b/target/classes/config.txt
@@ -51,7 +51,7 @@ sendMessage=true
 #            Other             #
 ################################
 showCmdColorsInHelpMenu=true
-allowBlacklistWebpages=true
+allowBlacklistWebsites=true
 allowIgnoringUsers=true
 allowCommandAliases=true
 showGitHubRepoInfo=true