From 53156bdf984a9d5d25f699232d5452b9d517dfed Mon Sep 17 00:00:00 2001
From: ORelio <oreliogitantispam.l0gin@spamgourmet.com>
Date: Tue, 26 May 2015 19:16:50 +0200
Subject: [PATCH] Normalize AutoRespond bot

Move FromFile method from bots to ChatBot class
Rename file and class, removing space and underscore.
---
 MinecraftClient/ChatBot.cs                    | 24 ++++++++++++++++
 MinecraftClient/ChatBots/Alerts.cs            | 27 ++----------------
 .../{Auto Respond.cs => AutoRespond.cs}       | 28 ++++---------------
 MinecraftClient/McTcpClient.cs                |  2 +-
 MinecraftClient/MinecraftClient.csproj        |  2 +-
 5 files changed, 33 insertions(+), 50 deletions(-)
 rename MinecraftClient/ChatBots/{Auto Respond.cs => AutoRespond.cs} (50%)

diff --git a/MinecraftClient/ChatBot.cs b/MinecraftClient/ChatBot.cs
index a3ae5ebb..579430cc 100644
--- a/MinecraftClient/ChatBot.cs
+++ b/MinecraftClient/ChatBot.cs
@@ -380,5 +380,29 @@ namespace MinecraftClient
                 time.Minute.ToString("00"),
                 time.Second.ToString("00"));
         }
+
+        /// <summary>
+        /// Load entries from a file as a string array, removing duplicates and empty lines
+        /// </summary>
+        /// <param name="file">File to load</param>
+        /// <returns>The string array or an empty array if failed to load the file</returns>
+        
+        protected static string[] LoadDistinctEntriesFromFile(string file)
+        {
+            if (File.Exists(file))
+            {
+                //Read all lines from file, remove lines with no text, convert to lowercase,
+                //remove duplicate entries, convert to a string array, and return the result.
+                return File.ReadAllLines(file)
+                        .Where(line => !String.IsNullOrWhiteSpace(line))
+                        .Select(line => line.ToLower())
+                        .Distinct().ToArray();
+            }
+            else
+            {
+                LogToConsole("File not found: " + Settings.Alerts_MatchesFile);
+                return new string[0];
+            }
+        }
     }
 }
diff --git a/MinecraftClient/ChatBots/Alerts.cs b/MinecraftClient/ChatBots/Alerts.cs
index 5cdff088..cd21bae4 100644
--- a/MinecraftClient/ChatBots/Alerts.cs
+++ b/MinecraftClient/ChatBots/Alerts.cs
@@ -14,36 +14,13 @@ namespace MinecraftClient.ChatBots
         private string[] dictionary = new string[0];
         private string[] excludelist = new string[0];
 
-        /// <summary>
-        /// Import alerts from the specified file
-        /// </summary>
-        /// <param name="file"></param>
-        /// <returns></returns>
-        private static string[] FromFile(string file)
-        {
-            if (File.Exists(file))
-            {
-                //Read all lines from file, remove lines with no text, convert to lowercase,
-                //remove duplicate entries, convert to a string array, and return the result.
-                return File.ReadAllLines(file)
-                        .Where(line => !String.IsNullOrWhiteSpace(line))
-                        .Select(line => line.ToLower())
-                        .Distinct().ToArray();
-            }
-            else
-            {
-                LogToConsole("File not found: " + Settings.Alerts_MatchesFile);
-                return new string[0];
-            }
-        }
-
         /// <summary>
         /// Intitialize the Alerts bot
         /// </summary>
         public override void Initialize()
         {
-            dictionary = FromFile(Settings.Alerts_MatchesFile);
-            excludelist = FromFile(Settings.Alerts_ExcludesFile);
+            dictionary = LoadDistinctEntriesFromFile(Settings.Alerts_MatchesFile);
+            excludelist = LoadDistinctEntriesFromFile(Settings.Alerts_ExcludesFile);
         }
 
         /// <summary>
diff --git a/MinecraftClient/ChatBots/Auto Respond.cs b/MinecraftClient/ChatBots/AutoRespond.cs
similarity index 50%
rename from MinecraftClient/ChatBots/Auto Respond.cs
rename to MinecraftClient/ChatBots/AutoRespond.cs
index c861241e..3a0d6575 100644
--- a/MinecraftClient/ChatBots/Auto Respond.cs	
+++ b/MinecraftClient/ChatBots/AutoRespond.cs
@@ -6,34 +6,16 @@ using System.IO;
 
 namespace MinecraftClient.ChatBots
 {
-    class Auto_Respond : ChatBot
+    class AutoRespond : ChatBot
     {
-        private String[] respondon = new String[0];
-        private String[] torespond = new String[0];
-
-        private static string[] FromFile(string file)
-        {
-            if (File.Exists(file))
-            {
-                //Read all lines from file, remove lines with no text, convert to lowercase,
-                //remove duplicate entries, convert to a string array, and return the result.
-                return File.ReadAllLines(file)
-                        .Where(line => !String.IsNullOrWhiteSpace(line))
-                        .Select(line => line.ToLower())
-                        .Distinct().ToArray();
-            }
-            else
-            {
-                LogToConsole("File not found: " + file);
-                return new string[0];
-            }
-        }
+        private string[] respondon = new string[0];
+        private string[] torespond = new string[0];
 
         //Initalize the bot
         public override void Initialize()
         {
-            respondon = FromFile(Settings.Respond_MatchesFile);
-            torespond = FromFile(Settings.Respond_RespondFile);
+            respondon = LoadDistinctEntriesFromFile(Settings.Respond_MatchesFile);
+            torespond = LoadDistinctEntriesFromFile(Settings.Respond_RespondFile);
             ConsoleIO.WriteLine("Auto Respond Bot Sucessfully loaded!");
         }
 
diff --git a/MinecraftClient/McTcpClient.cs b/MinecraftClient/McTcpClient.cs
index 6a991d96..3f152002 100644
--- a/MinecraftClient/McTcpClient.cs
+++ b/MinecraftClient/McTcpClient.cs
@@ -106,7 +106,7 @@ namespace MinecraftClient
                 if (Settings.AutoRelog_Enabled) { BotLoad(new ChatBots.AutoRelog(Settings.AutoRelog_Delay, Settings.AutoRelog_Retries)); }
                 if (Settings.ScriptScheduler_Enabled) { BotLoad(new ChatBots.ScriptScheduler(Settings.expandVars(Settings.ScriptScheduler_TasksFile))); }
                 if (Settings.RemoteCtrl_Enabled) { BotLoad(new ChatBots.RemoteControl()); }
-                if (Settings.Respond_Enabled) { BotLoad(new ChatBots.Auto_Respond()); }
+                if (Settings.Respond_Enabled) { BotLoad(new ChatBots.AutoRespond()); }
             }
 
             try
diff --git a/MinecraftClient/MinecraftClient.csproj b/MinecraftClient/MinecraftClient.csproj
index 9ae1ccdc..8129d2ec 100644
--- a/MinecraftClient/MinecraftClient.csproj
+++ b/MinecraftClient/MinecraftClient.csproj
@@ -74,7 +74,7 @@
     <Compile Include="AutoTimeout.cs" />
     <Compile Include="ChatBots\Alerts.cs" />
     <Compile Include="ChatBots\AntiAFK.cs" />
-    <Compile Include="ChatBots\Auto Respond.cs" />
+    <Compile Include="ChatBots\AutoRespond.cs" />
     <Compile Include="ChatBots\AutoRelog.cs" />
     <Compile Include="ChatBots\ChatLog.cs" />
     <Compile Include="ChatBots\HangmanGame.cs" />