From d51c0a95def1bc373a8952b3241bb27c3711038f Mon Sep 17 00:00:00 2001
From: Brett Hewitson <bletch1971@hotmail.com>
Date: Thu, 16 Dec 2021 15:57:38 +1000
Subject: [PATCH] Removed the mandatory requirement to enter the '!' after the
 discord prefix

---
 src/ARKServerManager/App.config               |  3 +++
 src/ARKServerManager/App.xaml.cs              |  7 +++++++
 src/ARKServerManager/Config.Designer.cs       | 12 ++++++++++++
 src/ARKServerManager/Config.settings          |  3 +++
 src/ARKServerManager/VersionFeed.xml          |  1 +
 src/ARKServerManager/VersionFeedBeta.xml      |  1 +
 src/ConanServerManager/App.config             |  3 +++
 src/ConanServerManager/App.xaml.cs            |  7 +++++++
 src/ConanServerManager/Config.Designer.cs     | 12 ++++++++++++
 src/ConanServerManager/Config.settings        |  3 +++
 src/ConanServerManager/VersionFeed.xml        |  1 +
 src/ConanServerManager/VersionFeedBeta.xml    |  5 +++++
 src/ServerManager.Discord/DiscordBot.cs       |  9 ---------
 src/ServerManager.Discord/ServerManagerBot.cs | 13 ++++---------
 14 files changed, 62 insertions(+), 18 deletions(-)
 delete mode 100644 src/ServerManager.Discord/DiscordBot.cs

diff --git a/src/ARKServerManager/App.config b/src/ARKServerManager/App.config
index 7b6ed13e..6c98692e 100644
--- a/src/ARKServerManager/App.config
+++ b/src/ARKServerManager/App.config
@@ -856,6 +856,9 @@
           </ArrayOfString>
         </value>
       </setting>
+      <setting name="DiscordBotPrefixFixed" serializeAs="String">
+        <value>False</value>
+      </setting>
     </ServerManagerTool.Config>
   </userSettings>
 </configuration>
diff --git a/src/ARKServerManager/App.xaml.cs b/src/ARKServerManager/App.xaml.cs
index 9484683b..85ffeb30 100644
--- a/src/ARKServerManager/App.xaml.cs
+++ b/src/ARKServerManager/App.xaml.cs
@@ -285,6 +285,13 @@ namespace ServerManagerTool
                     CommonConfig.Default.Save();
                 }
             }
+            if (!Config.Default.DiscordBotPrefixFixed)
+            {
+                Config.Default.DiscordBotPrefix += "!";
+                Config.Default.DiscordBotPrefixFixed = true;
+                Config.Default.Save();
+                Config.Default.Reload();
+            }
 
             Config.Default.SteamCmdRedirectOutput = false;
         }
diff --git a/src/ARKServerManager/Config.Designer.cs b/src/ARKServerManager/Config.Designer.cs
index f75b7b57..dedd1a15 100644
--- a/src/ARKServerManager/Config.Designer.cs
+++ b/src/ARKServerManager/Config.Designer.cs
@@ -3000,5 +3000,17 @@ namespace ServerManagerTool {
                 this["DiscordBotWhitelist"] = value;
             }
         }
+        
+        [global::System.Configuration.UserScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("False")]
+        public bool DiscordBotPrefixFixed {
+            get {
+                return ((bool)(this["DiscordBotPrefixFixed"]));
+            }
+            set {
+                this["DiscordBotPrefixFixed"] = value;
+            }
+        }
     }
 }
diff --git a/src/ARKServerManager/Config.settings b/src/ARKServerManager/Config.settings
index 7ecdcda8..4767021d 100644
--- a/src/ARKServerManager/Config.settings
+++ b/src/ARKServerManager/Config.settings
@@ -830,5 +830,8 @@
   &lt;string /&gt;
 &lt;/ArrayOfString&gt;</Value>
     </Setting>
+    <Setting Name="DiscordBotPrefixFixed" Type="System.Boolean" Scope="User">
+      <Value Profile="(Default)">False</Value>
+    </Setting>
   </Settings>
 </SettingsFile>
\ No newline at end of file
diff --git a/src/ARKServerManager/VersionFeed.xml b/src/ARKServerManager/VersionFeed.xml
index 3ddde9e2..d6d1bab1 100644
--- a/src/ARKServerManager/VersionFeed.xml
+++ b/src/ARKServerManager/VersionFeed.xml
@@ -26,6 +26,7 @@
           <br/>
           <ul>
             <li>Made changes to the code to help improve performance.</li>
+            <li>Removed the mandatory requirement to enter the '!' after the discord prefix. The '!' has been added to the existing prefix so to to change the existing prefix, but you can now changeit.</li>
             <li>zh-CN Translation file updated.</li>
           </ul>
         </p>
diff --git a/src/ARKServerManager/VersionFeedBeta.xml b/src/ARKServerManager/VersionFeedBeta.xml
index 305b1186..b6e53b2c 100644
--- a/src/ARKServerManager/VersionFeedBeta.xml
+++ b/src/ARKServerManager/VersionFeedBeta.xml
@@ -24,6 +24,7 @@
           <u style="font-size: .9em;">CHANGE</u>
           <br/>
           <ul>
+            <li>Removed the mandatory requirement to enter the '!' after the discord prefix. The '!' has been added to the existing prefix so to to change the existing prefix, but you can now changeit.</li>
             <li>zh-CN Translation file updated.</li>
           </ul>
         </p>
diff --git a/src/ConanServerManager/App.config b/src/ConanServerManager/App.config
index b8f36415..27004551 100644
--- a/src/ConanServerManager/App.config
+++ b/src/ConanServerManager/App.config
@@ -622,6 +622,9 @@
           </ArrayOfString>
         </value>
       </setting>
+      <setting name="DiscordBotPrefixFixed" serializeAs="String">
+        <value>False</value>
+      </setting>
     </ServerManagerTool.Config>
   </userSettings>
 </configuration>
\ No newline at end of file
diff --git a/src/ConanServerManager/App.xaml.cs b/src/ConanServerManager/App.xaml.cs
index c67324b3..1b75acb4 100644
--- a/src/ConanServerManager/App.xaml.cs
+++ b/src/ConanServerManager/App.xaml.cs
@@ -278,6 +278,13 @@ namespace ServerManagerTool
                 Config.Default.UpgradeConfig = false;
                 Config.Default.Save();
             }
+            if (!Config.Default.DiscordBotPrefixFixed)
+            {
+                Config.Default.DiscordBotPrefix += "!";
+                Config.Default.DiscordBotPrefixFixed = true;
+                Config.Default.Save();
+                Config.Default.Reload();
+            }
 
             Config.Default.SteamCmdRedirectOutput = false;
         }
diff --git a/src/ConanServerManager/Config.Designer.cs b/src/ConanServerManager/Config.Designer.cs
index 241558af..18c31f8d 100644
--- a/src/ConanServerManager/Config.Designer.cs
+++ b/src/ConanServerManager/Config.Designer.cs
@@ -2153,5 +2153,17 @@ namespace ServerManagerTool {
                 this["DiscordBotWhitelist"] = value;
             }
         }
+        
+        [global::System.Configuration.UserScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("False")]
+        public bool DiscordBotPrefixFixed {
+            get {
+                return ((bool)(this["DiscordBotPrefixFixed"]));
+            }
+            set {
+                this["DiscordBotPrefixFixed"] = value;
+            }
+        }
     }
 }
diff --git a/src/ConanServerManager/Config.settings b/src/ConanServerManager/Config.settings
index 3f8244fe..7e075b16 100644
--- a/src/ConanServerManager/Config.settings
+++ b/src/ConanServerManager/Config.settings
@@ -596,5 +596,8 @@
   &lt;string /&gt;
 &lt;/ArrayOfString&gt;</Value>
     </Setting>
+    <Setting Name="DiscordBotPrefixFixed" Type="System.Boolean" Scope="User">
+      <Value Profile="(Default)">False</Value>
+    </Setting>
   </Settings>
 </SettingsFile>
\ No newline at end of file
diff --git a/src/ConanServerManager/VersionFeed.xml b/src/ConanServerManager/VersionFeed.xml
index af4d270c..da982b88 100644
--- a/src/ConanServerManager/VersionFeed.xml
+++ b/src/ConanServerManager/VersionFeed.xml
@@ -26,6 +26,7 @@
           <br/>
           <ul>
             <li>Made changes to the code to help improve performance.</li>
+            <li>Removed the mandatory requirement to enter the '!' after the discord prefix. The '!' has been added to the existing prefix so to to change the existing prefix, but you can now changeit.</li>
           </ul>
         </p>
       </div>
diff --git a/src/ConanServerManager/VersionFeedBeta.xml b/src/ConanServerManager/VersionFeedBeta.xml
index a5a6a1db..006ddd2e 100644
--- a/src/ConanServerManager/VersionFeedBeta.xml
+++ b/src/ConanServerManager/VersionFeedBeta.xml
@@ -21,6 +21,11 @@
           <ul>
             <li>Server Settings - Discord Bot section - Added an alias that can be used with the discord command instead of the profile id.</li>
           </ul>
+          <u style="font-size: .9em;">CHANGE</u>
+          <br/>
+          <ul>
+            <li>Removed the mandatory requirement to enter the '!' after the discord prefix. The '!' has been added to the existing prefix so to to change the existing prefix, but you can now changeit.</li>
+          </ul>
         </p>
       </div>
     </content>
diff --git a/src/ServerManager.Discord/DiscordBot.cs b/src/ServerManager.Discord/DiscordBot.cs
deleted file mode 100644
index 63cc1c7a..00000000
--- a/src/ServerManager.Discord/DiscordBot.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-using ServerManagerTool.DiscordBot.Delegates;
-
-namespace ServerManagerTool.DiscordBot
-{
-    public static class DiscordBot
-    {
-        public const string PREFIX_DELIMITER = "!";
-    }
-}
diff --git a/src/ServerManager.Discord/ServerManagerBot.cs b/src/ServerManager.Discord/ServerManagerBot.cs
index 3390cbcc..4073a058 100644
--- a/src/ServerManager.Discord/ServerManagerBot.cs
+++ b/src/ServerManager.Discord/ServerManagerBot.cs
@@ -43,15 +43,10 @@ namespace ServerManagerTool.DiscordBot
 
             Token = token;
 
-            if (commandPrefix.Any(c => !char.IsLetterOrDigit(c)))
-            {
-                throw new Exception("#DiscordBot_InvalidPrefixError");
-            }
-
-            if (!commandPrefix.EndsWith(DiscordBot.PREFIX_DELIMITER))
-            {
-                commandPrefix += DiscordBot.PREFIX_DELIMITER;
-            }
+            //if (commandPrefix.Any(c => !char.IsLetterOrDigit(c)))
+            //{
+            //    throw new Exception("#DiscordBot_InvalidPrefixError");
+            //}
 
             var settings = new Dictionary<string, string>
             {