From 8d9d208a667b6bf3a4391f2c41da2a0d71300fbe Mon Sep 17 00:00:00 2001 From: Brett Hewitson Date: Sat, 4 Dec 2021 14:53:56 +1000 Subject: [PATCH] Discord Bot Start Changes --- src/ARKServerManager/App.xaml.cs | 10 +--------- src/ConanServerManager/App.xaml.cs | 10 +--------- 2 files changed, 2 insertions(+), 18 deletions(-) diff --git a/src/ARKServerManager/App.xaml.cs b/src/ARKServerManager/App.xaml.cs index 38c4ce70..e3b1e01c 100644 --- a/src/ARKServerManager/App.xaml.cs +++ b/src/ARKServerManager/App.xaml.cs @@ -147,12 +147,6 @@ namespace ServerManagerTool } } - public IServerManagerBot ServerManagerBot - { - get; - set; - } - public static void DiscoverMachinePublicIP(bool forceOverride) { if (forceOverride || string.IsNullOrWhiteSpace(Config.Default.MachinePublicIP)) @@ -477,11 +471,9 @@ namespace ServerManagerTool { _tokenSource = new CancellationTokenSource(); - ServerManagerBot = ServerManagerBotFactory.GetServerManagerBot(); - Task discordTask = Task.Run(async () => { - await ServerManagerBot.StartAsync(Config.Default.DiscordBotToken, Config.Default.DiscordBotPrefix, Config.Default.DataDir, HandleDiscordCommand, _tokenSource.Token); + await ServerManagerBotFactory.GetServerManagerBot()?.StartAsync(Config.Default.DiscordBotToken, Config.Default.DiscordBotPrefix, Config.Default.DataDir, HandleDiscordCommand, _tokenSource.Token); }, _tokenSource.Token) .ContinueWith(t => { var message = t.Exception.InnerException is null ? t.Exception.Message : t.Exception.InnerException.Message; diff --git a/src/ConanServerManager/App.xaml.cs b/src/ConanServerManager/App.xaml.cs index cd645870..3818dd44 100644 --- a/src/ConanServerManager/App.xaml.cs +++ b/src/ConanServerManager/App.xaml.cs @@ -146,12 +146,6 @@ namespace ServerManagerTool } } - public IServerManagerBot ServerManagerBot - { - get; - set; - } - public static void DiscoverMachinePublicIP(bool forceOverride) { if (forceOverride || string.IsNullOrWhiteSpace(Config.Default.MachinePublicIP)) @@ -458,11 +452,9 @@ namespace ServerManagerTool { _tokenSource = new CancellationTokenSource(); - ServerManagerBot = ServerManagerBotFactory.GetServerManagerBot(); - Task discordTask = Task.Run(async () => { - await ServerManagerBot.StartAsync(Config.Default.DiscordBotToken,Config.Default.DiscordBotPrefix, Config.Default.DataPath, HandleDiscordCommand, _tokenSource.Token); + await ServerManagerBotFactory.GetServerManagerBot()?.StartAsync(Config.Default.DiscordBotToken,Config.Default.DiscordBotPrefix, Config.Default.DataPath, HandleDiscordCommand, _tokenSource.Token); }, _tokenSource.Token) .ContinueWith(t => { var message = t.Exception.InnerException is null ? t.Exception.Message : t.Exception.InnerException.Message;