From a74bc2dc78735ff2814309073600c7c507d105c7 Mon Sep 17 00:00:00 2001 From: Brett Hewitson Date: Sun, 19 Dec 2021 11:23:17 +1000 Subject: [PATCH] Changed whitelist to its own type --- src/ARKServerManager/App.xaml.cs | 2 +- src/ConanServerManager/App.xaml.cs | 2 +- src/ServerManager.Discord/Models/DiscordBotConfig.cs | 3 +-- src/ServerManager.Discord/Models/DiscordBotWhitelist.cs | 8 ++++++++ .../Services/CommandHandlerService.cs | 2 +- 5 files changed, 12 insertions(+), 5 deletions(-) create mode 100644 src/ServerManager.Discord/Models/DiscordBotWhitelist.cs diff --git a/src/ARKServerManager/App.xaml.cs b/src/ARKServerManager/App.xaml.cs index f9e72920..35e1a6da 100644 --- a/src/ARKServerManager/App.xaml.cs +++ b/src/ARKServerManager/App.xaml.cs @@ -623,7 +623,7 @@ namespace ServerManagerTool }; if (Config.Default.DiscordBotWhitelist != null) { - config.DiscordBotWhitelists = Config.Default.DiscordBotWhitelist.Cast(); + config.DiscordBotWhitelist.AddRange(Config.Default.DiscordBotWhitelist.Cast()); } await ServerManagerBotFactory.GetServerManagerBot().RunAsync(config, DiscordBotHelper.HandleDiscordCommand, DiscordBotHelper.HandleTranslation, _tokenSourceDiscordBot.Token); diff --git a/src/ConanServerManager/App.xaml.cs b/src/ConanServerManager/App.xaml.cs index 8c91c8b7..5af5d472 100644 --- a/src/ConanServerManager/App.xaml.cs +++ b/src/ConanServerManager/App.xaml.cs @@ -612,7 +612,7 @@ namespace ServerManagerTool }; if (Config.Default.DiscordBotWhitelist != null) { - config.DiscordBotWhitelists = Config.Default.DiscordBotWhitelist.Cast(); + config.DiscordBotWhitelist.AddRange(Config.Default.DiscordBotWhitelist.Cast()); } await ServerManagerBotFactory.GetServerManagerBot().RunAsync(config, DiscordBotHelper.HandleDiscordCommand, DiscordBotHelper.HandleTranslation, _tokenSourceDiscordBot.Token); diff --git a/src/ServerManager.Discord/Models/DiscordBotConfig.cs b/src/ServerManager.Discord/Models/DiscordBotConfig.cs index e60c14c7..84ba927e 100644 --- a/src/ServerManager.Discord/Models/DiscordBotConfig.cs +++ b/src/ServerManager.Discord/Models/DiscordBotConfig.cs @@ -1,5 +1,4 @@ using ServerManagerTool.DiscordBot.Enums; -using System.Collections.Generic; namespace ServerManagerTool.DiscordBot.Models { @@ -19,6 +18,6 @@ namespace ServerManagerTool.DiscordBot.Models public bool AllowAllBots { get; set; } = false; - public IEnumerable DiscordBotWhitelists { get; set; } = new List(); + public DiscordBotWhitelist DiscordBotWhitelist { get; set; } = new DiscordBotWhitelist(); } } diff --git a/src/ServerManager.Discord/Models/DiscordBotWhitelist.cs b/src/ServerManager.Discord/Models/DiscordBotWhitelist.cs new file mode 100644 index 00000000..1a746ba0 --- /dev/null +++ b/src/ServerManager.Discord/Models/DiscordBotWhitelist.cs @@ -0,0 +1,8 @@ +using System.Collections.Generic; + +namespace ServerManagerTool.DiscordBot.Models +{ + public class DiscordBotWhitelist : List + { + } +} diff --git a/src/ServerManager.Discord/Services/CommandHandlerService.cs b/src/ServerManager.Discord/Services/CommandHandlerService.cs index e3c022ba..b40f3bd4 100644 --- a/src/ServerManager.Discord/Services/CommandHandlerService.cs +++ b/src/ServerManager.Discord/Services/CommandHandlerService.cs @@ -84,7 +84,7 @@ namespace ServerManagerTool.DiscordBot.Services if (LogLevelHelper.CheckLogLevel(LogLevel.Debug, _botConfig.LogLevel)) await _logger?.OnLogAsync(new LogMessage(LogSeverity.Debug, MessageSource.System.ToString(), $"Message has come from another bot, checking if bot is in the whitelist.")); - if (!_botConfig.DiscordBotWhitelists.Any(botId => botId.Equals(msg.Author.Id.ToString()))) + if (!_botConfig.DiscordBotWhitelist.Any(botId => botId.Equals(msg.Author.Id.ToString()))) { if (LogLevelHelper.CheckLogLevel(LogLevel.Debug, _botConfig.LogLevel)) await _logger?.OnLogAsync(new LogMessage(LogSeverity.Debug, MessageSource.System.ToString(), $"Message has come from another bot, bot is not in the whitelist, message will be ignored."));