From dac70bfd350e6c9b73957dcfb1e3b423a5fc2abf Mon Sep 17 00:00:00 2001
From: Dmitry Isaenko <developer.su@gmail.com>
Date: Mon, 18 Jan 2021 18:16:07 +0300
Subject: [PATCH] Bug fixes: configuration generation corrected, Join flood
 methods fixed, Join clone methods fixed

---
 .../java/InnaIrcBot/Commanders/flood/JoinFloodHandler.java    | 1 +
 src/main/java/InnaIrcBot/GlobalData.java                      | 2 +-
 .../java/InnaIrcBot/ProvidersConsumers/StreamProvider.java    | 4 ++--
 src/main/java/InnaIrcBot/config/ConfigurationFile.java        | 4 ++--
 .../java/InnaIrcBot/config/ConfigurationFileGenerator.java    | 2 +-
 5 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/main/java/InnaIrcBot/Commanders/flood/JoinFloodHandler.java b/src/main/java/InnaIrcBot/Commanders/flood/JoinFloodHandler.java
index 53046b2..572fdb7 100644
--- a/src/main/java/InnaIrcBot/Commanders/flood/JoinFloodHandler.java
+++ b/src/main/java/InnaIrcBot/Commanders/flood/JoinFloodHandler.java
@@ -4,6 +4,7 @@ import InnaIrcBot.Commanders.EventHandler;
 import InnaIrcBot.ProvidersConsumers.StreamProvider;
 
 import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
 import java.util.*;
 
 public class JoinFloodHandler implements EventHandler {
diff --git a/src/main/java/InnaIrcBot/GlobalData.java b/src/main/java/InnaIrcBot/GlobalData.java
index b365a69..10bc57b 100644
--- a/src/main/java/InnaIrcBot/GlobalData.java
+++ b/src/main/java/InnaIrcBot/GlobalData.java
@@ -1,7 +1,7 @@
 package InnaIrcBot;
 
 public class GlobalData {
-    private static final String version = "InnaIrcBot v0.8 \"Коммунарка\"";
+    private static final String version = "InnaIrcBot v0.9 \"Литке\"";
     public static synchronized String getAppVersion(){
         return String.format("%s, %s %s %s", version,
                 System.getProperty("os.name"),
diff --git a/src/main/java/InnaIrcBot/ProvidersConsumers/StreamProvider.java b/src/main/java/InnaIrcBot/ProvidersConsumers/StreamProvider.java
index 2db76e2..e61aee7 100644
--- a/src/main/java/InnaIrcBot/ProvidersConsumers/StreamProvider.java
+++ b/src/main/java/InnaIrcBot/ProvidersConsumers/StreamProvider.java
@@ -22,8 +22,8 @@ public class StreamProvider {
         } catch (NullPointerException npe){
             System.out.println("Internal issue: StreamProvider->writeToStream() caused NullPointerException exception:\n"
                     +"Server: "+server
-                    +"\nMessage: "+message
-                    +"\n\t"+npe.getMessage());
+                    +"\nMessage: "+message);
+            npe.printStackTrace();
         }
     }
     public static synchronized void setStream(String server, Socket socket) throws IOException{
diff --git a/src/main/java/InnaIrcBot/config/ConfigurationFile.java b/src/main/java/InnaIrcBot/config/ConfigurationFile.java
index ff34567..b700fc9 100644
--- a/src/main/java/InnaIrcBot/config/ConfigurationFile.java
+++ b/src/main/java/InnaIrcBot/config/ConfigurationFile.java
@@ -104,7 +104,7 @@ public class ConfigurationFile {
         if (channelRules == null)
             channelRules = new ArrayList<>();
 
-        Ini.Section joinFloodControlSection = channelSection.getChild("rules");
+        Ini.Section joinFloodControlSection = channelSection.getChild("JoinFloodControl");
 
         boolean joinFloodControl = joinFloodControlSection.get("enable", boolean.class);
         int joinFloodControlEventsNumber = -1;
@@ -114,7 +114,7 @@ public class ConfigurationFile {
             joinFloodControlTimeFrame = joinFloodControlSection.get("time frame", int.class);
         }
 
-        Ini.Section joinCloneControlSection = channelSection.getChild("rules");
+        Ini.Section joinCloneControlSection = channelSection.getChild("JoinCloneControl");
 
         boolean joinCloneControl = joinCloneControlSection.get("enable", boolean.class);
 
diff --git a/src/main/java/InnaIrcBot/config/ConfigurationFileGenerator.java b/src/main/java/InnaIrcBot/config/ConfigurationFileGenerator.java
index f0d956b..acd7ab3 100644
--- a/src/main/java/InnaIrcBot/config/ConfigurationFileGenerator.java
+++ b/src/main/java/InnaIrcBot/config/ConfigurationFileGenerator.java
@@ -145,7 +145,7 @@ public class ConfigurationFileGenerator {
         Ini.Section channelMainJoinCloneControlSection = channelMainSection.addChild("JoinCloneControl");
         channelMainJoinCloneControlSection.put("enable", false);
         channelMainJoinCloneControlSection.put("pattern", "^.+[0-9]+?!.*$");
-        channelMainJoinFloodControlSection.put("time frame", 0);
+        channelMainJoinCloneControlSection.put("time frame", 0);
 
         Ini.Section linksHeaderParser = channelMainSection.addChild("ParseLinksTitles");
         linksHeaderParser.put("enable", true);