mirror of
https://github.com/tribufu/ServerManagers
synced 2026-05-06 15:17:34 +00:00
Bot cleanup
Language file updates
This commit is contained in:
Brett Hewitson
parent
e72f5fb28f
commit
40b85340ae
21 changed files with 258 additions and 129 deletions
|
|
@ -5,6 +5,7 @@ using NLog.Targets;
|
|||
using ServerManagerTool.Common;
|
||||
using ServerManagerTool.Common.Utils;
|
||||
using ServerManagerTool.DiscordBot;
|
||||
using ServerManagerTool.DiscordBot.Models;
|
||||
using ServerManagerTool.Enums;
|
||||
using ServerManagerTool.Lib;
|
||||
using ServerManagerTool.Plugin.Common;
|
||||
|
|
@ -606,13 +607,20 @@ namespace ServerManagerTool
|
|||
|
||||
Task discordTask = Task.Run(async () =>
|
||||
{
|
||||
var discordWhiteList = new List<string>();
|
||||
var config = new DiscordBotConfig
|
||||
{
|
||||
LogLevel = Config.Default.DiscordBotLogLevel,
|
||||
DiscordToken = Config.Default.DiscordBotToken,
|
||||
CommandPrefix = Config.Default.DiscordBotPrefix,
|
||||
DataDirectory = Config.Default.DataDir,
|
||||
AllowAllBots = Config.Default.DiscordBotAllowAllBots,
|
||||
};
|
||||
if (Config.Default.DiscordBotWhitelist != null)
|
||||
{
|
||||
discordWhiteList.AddRange(Config.Default.DiscordBotWhitelist.Cast<string>());
|
||||
config.DiscordBotWhitelists = Config.Default.DiscordBotWhitelist.Cast<string>();
|
||||
}
|
||||
|
||||
await ServerManagerBotFactory.GetServerManagerBot()?.StartAsync(Config.Default.DiscordBotLogLevel, Config.Default.DiscordBotToken, Config.Default.DiscordBotPrefix, Config.Default.DataDir, Config.Default.DiscordBotAllowAllBots, discordWhiteList, DiscordBotHelper.HandleDiscordCommand, DiscordBotHelper.HandleTranslation, _tokenSourceDiscordBot.Token);
|
||||
await ServerManagerBotFactory.GetServerManagerBot().RunAsync(config, DiscordBotHelper.HandleDiscordCommand, DiscordBotHelper.HandleTranslation, _tokenSourceDiscordBot.Token);
|
||||
|
||||
if (_tokenSourceDiscordBot != null)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -634,6 +634,8 @@
|
|||
<sys:String x:Key="GlobalSettings_DiscordBotLogLevelLabel">Nível de registro:</sys:String>
|
||||
<sys:String x:Key="GlobalSettings_DiscordBotApplyButtonLabel">Obter Token...</sys:String>
|
||||
<sys:String x:Key="GlobalSettings_DiscordBotHelpButtonLabel">Ajuda...</sys:String>
|
||||
<sys:String x:Key="ServerSettings_DiscordBotAllowAllBotsLabel">Permitir todos os bots</sys:String>
|
||||
<sys:String x:Key="ServerSettings_DiscordBotAllowAllBotsTooltip">Se ativado, o bot do gerenciador do servidor responderá a todos os outros bots, caso contrário, eles serão ignorados, a menos que estejam na lista de permissões.</sys:String>
|
||||
<sys:String x:Key="GlobalSettings_DiscordBotWhitelistLabel">Bot Whitelist</sys:String>
|
||||
<sys:String x:Key="GlobalSettings_DiscordBotWhitelistIdLabel">Bot ID</sys:String>
|
||||
<sys:String x:Key="GlobalSettings_DiscordBotWhitelistIdTooltip">O id do bot a ser colocado na whitelist.</sys:String>
|
||||
|
|
@ -790,12 +792,18 @@
|
|||
<sys:String x:Key="MainWindow_AutoUpdateTaskEnableLabel">Habilitar</sys:String>
|
||||
<sys:String x:Key="MainWindow_AutoUpdateTaskEnableTooltip">Ativar a tarefa agendada de atualização automática</sys:String>
|
||||
<sys:String x:Key="MainWindow_TaskRunTimeLabel">Próximo tempo de execução:</sys:String>
|
||||
<sys:String x:Key="MainWindow_DiscordBotStatusLabel">Discord Bot:</sys:String>
|
||||
<sys:String x:Key="MainWindow_DiscordBotTaskStartLabel">Iniciar</sys:String>
|
||||
<sys:String x:Key="MainWindow_DiscordBotTaskStartTooltip">Inicia o discord bot</sys:String>
|
||||
<sys:String x:Key="MainWindow_DiscordBotTaskStopLabel">Parar</sys:String>
|
||||
<sys:String x:Key="MainWindow_DiscordBotTaskStopTooltip">Para o discord bot</sys:String>
|
||||
|
||||
<sys:String x:Key="MainWindow_TaskStateUnknownLabel">Desconhecido</sys:String>
|
||||
<sys:String x:Key="MainWindow_TaskStateDisabledLabel">Desativado</sys:String>
|
||||
<sys:String x:Key="MainWindow_TaskStateQueuedLabel">Na fila</sys:String>
|
||||
<sys:String x:Key="MainWindow_TaskStateReadyLabel">Pronto</sys:String>
|
||||
<sys:String x:Key="MainWindow_TaskStateRunningLabel">Running</sys:String>
|
||||
<sys:String x:Key="MainWindow_TaskStateStoppedLabel">Parado</sys:String>
|
||||
|
||||
<sys:String x:Key="MainWindow_ProfileLoad_FailedTitle">O perfil não foi carregado</sys:String>
|
||||
<sys:String x:Key="MainWindow_ProfileLoad_FailedLabel">O perfil em {0} falhou ao carregar. O erro foi: {1}\r\n{2}</sys:String>
|
||||
|
|
@ -5612,6 +5620,7 @@
|
|||
<!--#region Discord Bot -->
|
||||
<sys:String x:Key="DiscordBot_ErrorTitle">Discord Bot Error</sys:String>
|
||||
<sys:String x:Key="DiscordBot_MissingTokenError">O discord bot requer um token válido para que possa se conectar ao servidor discord\r\nIsso pode ser definido nas configurações globais.</sys:String>
|
||||
<sys:String x:Key="DiscordBot_MissingPrefixError">O discord bot requer um prefixo válido.\r\nIsso pode ser definido nas configurações globais.</sys:String>
|
||||
<sys:String x:Key="DiscordBot_InvalidPrefixError">O prefixo discord bot contém caracteres inválidos. Somente letras e números são permitidos.</sys:String>
|
||||
|
||||
<sys:String x:Key="DiscordBot_CommandNotEnabled">O comando '{0}' não foi habilitado.</sys:String>
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@
|
|||
|
||||
<!--#region Generic -->
|
||||
<sys:String x:Key="Generic_TranslatedByLabel">Последнее обновление:</sys:String>
|
||||
<sys:String x:Key="Generic_TranslatedBy">16.12.2021 от Varlonec, Эдван</sys:String>
|
||||
<sys:String x:Key="Generic_TranslatedBy">17.12.2021 от Varlonec, Эдван</sys:String>
|
||||
<sys:String x:Key="Generic_ErrorLabel">Ошибка</sys:String>
|
||||
<!--#endregion-->
|
||||
|
||||
|
|
@ -634,6 +634,8 @@
|
|||
<sys:String x:Key="GlobalSettings_DiscordBotLogLevelLabel">Лог уровня:</sys:String>
|
||||
<sys:String x:Key="GlobalSettings_DiscordBotApplyButtonLabel">Получить токен ...</sys:String>
|
||||
<sys:String x:Key="GlobalSettings_DiscordBotHelpButtonLabel">Помощь...</sys:String>
|
||||
<sys:String x:Key="ServerSettings_DiscordBotAllowAllBotsLabel">Разрешить всем ботам</sys:String>
|
||||
<sys:String x:Key="ServerSettings_DiscordBotAllowAllBotsTooltip">Если включено, менеджер сервера будет отвечать всем остальным ботам, в противном случае они будут игнорироваться, если только они не находятся в белом списке.</sys:String>
|
||||
<sys:String x:Key="GlobalSettings_DiscordBotWhitelistLabel">Белый лист бота</sys:String>
|
||||
<sys:String x:Key="GlobalSettings_DiscordBotWhitelistIdLabel">Бот ID</sys:String>
|
||||
<sys:String x:Key="GlobalSettings_DiscordBotWhitelistIdTooltip">ID бота для внесения в белый список.</sys:String>
|
||||
|
|
@ -790,13 +792,19 @@
|
|||
<sys:String x:Key="MainWindow_AutoUpdateTaskEnableLabel">Включить</sys:String>
|
||||
<sys:String x:Key="MainWindow_AutoUpdateTaskEnableTooltip">Включить Авто-Обновленя по заданному времени</sys:String>
|
||||
<sys:String x:Key="MainWindow_TaskRunTimeLabel">Следующее время выполнения:</sys:String>
|
||||
|
||||
<sys:String x:Key="MainWindow_DiscordBotStatusLabel">Discord бот:</sys:String>
|
||||
<sys:String x:Key="MainWindow_DiscordBotTaskStartLabel">Старт</sys:String>
|
||||
<sys:String x:Key="MainWindow_DiscordBotTaskStartTooltip">Запуск бота Discord</sys:String>
|
||||
<sys:String x:Key="MainWindow_DiscordBotTaskStopLabel">Стоп</sys:String>
|
||||
<sys:String x:Key="MainWindow_DiscordBotTaskStopTooltip">Остановить бот Discord</sys:String>
|
||||
|
||||
<sys:String x:Key="MainWindow_TaskStateUnknownLabel">Отключено</sys:String>
|
||||
<sys:String x:Key="MainWindow_TaskStateDisabledLabel">Выключено</sys:String>
|
||||
<sys:String x:Key="MainWindow_TaskStateQueuedLabel">В очереди</sys:String>
|
||||
<sys:String x:Key="MainWindow_TaskStateReadyLabel">Активно</sys:String>
|
||||
<sys:String x:Key="MainWindow_TaskStateRunningLabel">Запущено</sys:String>
|
||||
|
||||
<sys:String x:Key="MainWindow_TaskStateStoppedLabel">Остановлено</sys:String>
|
||||
|
||||
<sys:String x:Key="MainWindow_ProfileLoad_FailedTitle">Профиль не загружен</sys:String>
|
||||
<sys:String x:Key="MainWindow_ProfileLoad_FailedLabel">Не удалось загрузить профиль в {0}. Ошибка: {1}\r\n{2}</sys:String>
|
||||
<sys:String x:Key="MainWindow_ProfileDelete_Title">Удалить Профиль {0}?</sys:String>
|
||||
|
|
@ -5689,6 +5697,7 @@
|
|||
<!--#region Discord Bot -->
|
||||
<sys:String x:Key="DiscordBot_ErrorTitle">Ошибка бота Discord</sys:String>
|
||||
<sys:String x:Key="DiscordBot_MissingTokenError">Бот Discord требует действующий токен, чтобы он мог войти на сервер Discord\r\nЭто можно установить в глобальных настройках.</sys:String>
|
||||
<sys:String x:Key="DiscordBot_MissingPrefixError">Для бота discord требуется действительный префикс.\r\nЭто можно установить в глобальных настройках.</sys:String>
|
||||
<sys:String x:Key="DiscordBot_InvalidPrefixError">Префикс бота Discord содержит недопустимые символы. Разрешены только буквы и цифры.</sys:String>
|
||||
|
||||
<sys:String x:Key="DiscordBot_CommandNotEnabled">Команда '{0}' не активирована.</sys:String>
|
||||
|
|
|
|||
|
|
@ -5,14 +5,14 @@
|
|||
<title>Ark Server Manager Version Feed</title>
|
||||
<subtitle>This is the Ark Server Manager release version feed.</subtitle>
|
||||
<link href="http://arkservermanager.freeforums.net/" />
|
||||
<updated>2021-12-17T00:00:00Z</updated>
|
||||
<updated>2021-12-18T00:00:00Z</updated>
|
||||
|
||||
<entry>
|
||||
<id>urn:uuid:3E33DCB2-ECFE-4489-B1A4-56F5D386F9DC</id>
|
||||
<title>1.1.413 (1.1.413.8)</title>
|
||||
<summary>1.1.413.8</summary>
|
||||
<title>1.1.413 (1.1.413.9)</title>
|
||||
<summary>1.1.413.9</summary>
|
||||
<link href="" />
|
||||
<updated>2021-12-17T00:00:00Z</updated>
|
||||
<updated>2021-12-18T00:00:00Z</updated>
|
||||
<content type="xhtml">
|
||||
<div xmlns="http://www.w3.org/1999/xhtml" style="font-family: Arial, Verdana, Helvetica, Sans-Serif;font-size: .8em;">
|
||||
<p>
|
||||
|
|
|
|||
|
|
@ -7,6 +7,31 @@
|
|||
<link href="http://arkservermanager.freeforums.net/" />
|
||||
<updated>2021-12-16T00:00:00Z</updated>
|
||||
|
||||
<entry>
|
||||
<id>urn:uuid:1B7448FB-E4E0-4E0F-BF87-AE8661AA7D93</id>
|
||||
<title>1.1.413 (1.1.413.9)</title>
|
||||
<summary>1.1.413.9</summary>
|
||||
<link href="" />
|
||||
<updated>2021-12-18T00:00:00Z</updated>
|
||||
<content type="xhtml">
|
||||
<div xmlns="http://www.w3.org/1999/xhtml" style="font-family: Arial, Verdana, Helvetica, Sans-Serif;font-size: .8em;">
|
||||
<p>
|
||||
<u style="font-size: .9em;">CHANGE</u>
|
||||
<br/>
|
||||
<ul>
|
||||
<li>Discord Bot - added some additional logging and some code cleanup.</li>
|
||||
<li>pt-BR Translation file updated.</li>
|
||||
<li>ru-RU Translation file updated.</li>
|
||||
</ul>
|
||||
</p>
|
||||
</div>
|
||||
</content>
|
||||
<author>
|
||||
<name>bletch</name>
|
||||
<email>bletch1971@hotmail.com</email>
|
||||
</author>
|
||||
</entry>
|
||||
|
||||
<entry>
|
||||
<id>urn:uuid:8EE5659C-18E6-47D3-941D-C32B129D2E06</id>
|
||||
<title>1.1.413 (1.1.413.8)</title>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue