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

Changed whitelist to its own type

Browse source
This commit is contained in:
Brett Hewitson 2021-12-19 11:23:17 +10:00
parent 8c1908310e
commit a74bc2dc78
5 changed files with 12 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -623,7 +623,7 @@ namespace ServerManagerTool
}; };
if (Config.Default.DiscordBotWhitelist != null) if (Config.Default.DiscordBotWhitelist != null)
{ {
config.DiscordBotWhitelists = Config.Default.DiscordBotWhitelist.Cast<string>(); config.DiscordBotWhitelist.AddRange(Config.Default.DiscordBotWhitelist.Cast<string>());
} }
await ServerManagerBotFactory.GetServerManagerBot().RunAsync(config, DiscordBotHelper.HandleDiscordCommand, DiscordBotHelper.HandleTranslation, _tokenSourceDiscordBot.Token); await ServerManagerBotFactory.GetServerManagerBot().RunAsync(config, DiscordBotHelper.HandleDiscordCommand, DiscordBotHelper.HandleTranslation, _tokenSourceDiscordBot.Token);

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

@ -612,7 +612,7 @@ namespace ServerManagerTool
}; };
if (Config.Default.DiscordBotWhitelist != null) if (Config.Default.DiscordBotWhitelist != null)
{ {
config.DiscordBotWhitelists = Config.Default.DiscordBotWhitelist.Cast<string>(); config.DiscordBotWhitelist.AddRange(Config.Default.DiscordBotWhitelist.Cast<string>());
} }
await ServerManagerBotFactory.GetServerManagerBot().RunAsync(config, DiscordBotHelper.HandleDiscordCommand, DiscordBotHelper.HandleTranslation, _tokenSourceDiscordBot.Token); await ServerManagerBotFactory.GetServerManagerBot().RunAsync(config, DiscordBotHelper.HandleDiscordCommand, DiscordBotHelper.HandleTranslation, _tokenSourceDiscordBot.Token);

3
src/ServerManager.Discord/Models/DiscordBotConfig.cs
View file

@ -1,5 +1,4 @@
using ServerManagerTool.DiscordBot.Enums; using ServerManagerTool.DiscordBot.Enums;
using System.Collections.Generic;
namespace ServerManagerTool.DiscordBot.Models namespace ServerManagerTool.DiscordBot.Models
{ {
@ -19,6 +18,6 @@ namespace ServerManagerTool.DiscordBot.Models
public bool AllowAllBots { get; set; } = false; public bool AllowAllBots { get; set; } = false;
public IEnumerable<string> DiscordBotWhitelists { get; set; } = new List<string>(); public DiscordBotWhitelist DiscordBotWhitelist { get; set; } = new DiscordBotWhitelist();
} }
} }

8
src/ServerManager.Discord/Models/DiscordBotWhitelist.cs Normal file
View file

@ -0,0 +1,8 @@
using System.Collections.Generic;
namespace ServerManagerTool.DiscordBot.Models
{
public class DiscordBotWhitelist : List<string>
{
}
}

2
src/ServerManager.Discord/Services/CommandHandlerService.cs
View file

@ -84,7 +84,7 @@ namespace ServerManagerTool.DiscordBot.Services
if (LogLevelHelper.CheckLogLevel(LogLevel.Debug, _botConfig.LogLevel)) 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.")); 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)) 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.")); 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."));