diff --git a/src/ARKServerManager/App.config b/src/ARKServerManager/App.config index 10b747b7..a136ee00 100644 --- a/src/ARKServerManager/App.config +++ b/src/ARKServerManager/App.config @@ -353,6 +353,9 @@ https://arkservermanager.freeforums.net/thread/8764/get-own-discord-bot + + 10 + diff --git a/src/ARKServerManager/Config.Designer.cs b/src/ARKServerManager/Config.Designer.cs index 39bbded1..60833055 100644 --- a/src/ARKServerManager/Config.Designer.cs +++ b/src/ARKServerManager/Config.Designer.cs @@ -3023,5 +3023,14 @@ namespace ServerManagerTool { this["DiscordBotLogLevel"] = value; } } + + [global::System.Configuration.ApplicationScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("10")] + public int DiscordBotStatusCheckTime { + get { + return ((int)(this["DiscordBotStatusCheckTime"])); + } + } } } diff --git a/src/ARKServerManager/Config.settings b/src/ARKServerManager/Config.settings index 00b1e243..19c0a3ec 100644 --- a/src/ARKServerManager/Config.settings +++ b/src/ARKServerManager/Config.settings @@ -834,5 +834,8 @@ Info + + 10 + \ No newline at end of file diff --git a/src/ARKServerManager/Globalization/en-US/en-US.xaml b/src/ARKServerManager/Globalization/en-US/en-US.xaml index e8073fed..5d540166 100644 --- a/src/ARKServerManager/Globalization/en-US/en-US.xaml +++ b/src/ARKServerManager/Globalization/en-US/en-US.xaml @@ -790,12 +790,18 @@ Enable Enable the auto-update scheduled task Next Run Time: + Discord Bot: + Start + Start the discord bot + Stop + Stop the discord bot Unknown Disabled Queued Ready Running + Stopped Profile failed to load The profile at {0} failed to load. The error was: {1}\r\n{2} diff --git a/src/ARKServerManager/VersionFeed.xml b/src/ARKServerManager/VersionFeed.xml index b9ab2012..d2349003 100644 --- a/src/ARKServerManager/VersionFeed.xml +++ b/src/ARKServerManager/VersionFeed.xml @@ -9,8 +9,8 @@ urn:uuid:3E33DCB2-ECFE-4489-B1A4-56F5D386F9DC - 1.1.413 (1.1.413.6) - 1.1.413.6 + 1.1.413 (1.1.413.7) + 1.1.413.7 2021-12-17T00:00:00Z @@ -22,6 +22,7 @@
  • Global Settings - Discord Bot section - Added a log level droplist.
  • Global Settings - Discord Bot section - Added a whitelist to allow bots to send commands to the server manager.
  • Server Settings - Discord Bot section - Added an alias that can be used with the discord command instead of the profile id.
  • +
  • Main Window - Added Discord Bot Status and a button to Stop/Start the discord bot.
  • CHANGE
    diff --git a/src/ARKServerManager/VersionFeedBeta.xml b/src/ARKServerManager/VersionFeedBeta.xml index 922adc92..ae26ac53 100644 --- a/src/ARKServerManager/VersionFeedBeta.xml +++ b/src/ARKServerManager/VersionFeedBeta.xml @@ -7,6 +7,29 @@ 2021-12-16T00:00:00Z + + urn:uuid:8EE5659C-18E6-47D3-941D-C32B129D2E06 + 1.1.413 (1.1.413.7) + 1.1.413.7 + + 2021-12-17T00:00:00Z + +
    +

    + NEW +
    +

      +
    • Main Window - Added Discord Bot Status and a button to Stop/Start the discord bot.
    • +
    +

    +
    +
    + + bletch + bletch1971@hotmail.com + +
    + urn:uuid:65A7E6B1-98D1-422D-B42F-B0EBB1D20E41 1.1.413 (1.1.413.6) diff --git a/src/ARKServerManager/Windows/MainWindow.xaml b/src/ARKServerManager/Windows/MainWindow.xaml index 5eeba4bc..cbaf9329 100644 --- a/src/ARKServerManager/Windows/MainWindow.xaml +++ b/src/ARKServerManager/Windows/MainWindow.xaml @@ -9,6 +9,7 @@ xmlns:cvr="clr-namespace:ServerManagerTool.Common.ValidationRules;assembly=ServerManager.Common" xmlns:com="clr-namespace:ServerManagerTool.Common;assembly=ServerManager.Common" xmlns:enum="clr-namespace:ServerManagerTool.Enums" + xmlns:bot="clr-namespace:ServerManagerTool.DiscordBot;assembly=ServerManager.Discord" MinWidth="900" MinHeight="600" Width="1100" Height="900" Left="50" Top="50" WindowState="Normal" Loaded="MainWindow_Loaded" SizeChanged="MainWindow_SizeChanged" StateChanged="MainWindow_StateChanged" LocationChanged="MainWindow_LocationChanged" Name="Main" Icon="../Art/favicon.ico" Title="{DynamicResource MainWindow_Title}"> @@ -132,6 +133,7 @@ +