tribufu/ServerManagers
1
0
Fork 0
mirror of https://github.com/tribufu/ServerManagers synced 2026-06-01 09:42:39 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Discord Bot Start Changes

Browse source
This commit is contained in:
Brett Hewitson 2021-12-04 14:53:56 +10:00
parent a792b10253
commit 8d9d208a66
2 changed files with 2 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/ARKServerManager/App.xaml.cs
View file

@ -147,12 +147,6 @@ namespace ServerManagerTool
} }
} }
public IServerManagerBot ServerManagerBot
{
get;
set;
}
public static void DiscoverMachinePublicIP(bool forceOverride) public static void DiscoverMachinePublicIP(bool forceOverride)
{ {
if (forceOverride || string.IsNullOrWhiteSpace(Config.Default.MachinePublicIP)) if (forceOverride || string.IsNullOrWhiteSpace(Config.Default.MachinePublicIP))
@ -477,11 +471,9 @@ namespace ServerManagerTool
{ {
_tokenSource = new CancellationTokenSource(); _tokenSource = new CancellationTokenSource();
ServerManagerBot = ServerManagerBotFactory.GetServerManagerBot();
Task discordTask = Task.Run(async () => 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) }, _tokenSource.Token)
.ContinueWith(t => { .ContinueWith(t => {
var message = t.Exception.InnerException is null ? t.Exception.Message : t.Exception.InnerException.Message; var message = t.Exception.InnerException is null ? t.Exception.Message : t.Exception.InnerException.Message;

10
src/ConanServerManager/App.xaml.cs
View file

@ -146,12 +146,6 @@ namespace ServerManagerTool
} }
} }
public IServerManagerBot ServerManagerBot
{
get;
set;
}
public static void DiscoverMachinePublicIP(bool forceOverride) public static void DiscoverMachinePublicIP(bool forceOverride)
{ {
if (forceOverride || string.IsNullOrWhiteSpace(Config.Default.MachinePublicIP)) if (forceOverride || string.IsNullOrWhiteSpace(Config.Default.MachinePublicIP))
@ -458,11 +452,9 @@ namespace ServerManagerTool
{ {
_tokenSource = new CancellationTokenSource(); _tokenSource = new CancellationTokenSource();
ServerManagerBot = ServerManagerBotFactory.GetServerManagerBot();
Task discordTask = Task.Run(async () => 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) }, _tokenSource.Token)
.ContinueWith(t => { .ContinueWith(t => {
var message = t.Exception.InnerException is null ? t.Exception.Message : t.Exception.InnerException.Message; var message = t.Exception.InnerException is null ? t.Exception.Message : t.Exception.InnerException.Message;