diff --git a/src/ARKServerManager/VersionFeedBeta.xml b/src/ARKServerManager/VersionFeedBeta.xml
index 88c313ee..922adc92 100644
--- a/src/ARKServerManager/VersionFeedBeta.xml
+++ b/src/ARKServerManager/VersionFeedBeta.xml
@@ -19,6 +19,7 @@
CHANGE
+ - Added additional message logging when log level set to debug.
- pt-BR Translation file updated.
- ru-RU Translation file updated.
diff --git a/src/ConanServerManager/VersionFeedBeta.xml b/src/ConanServerManager/VersionFeedBeta.xml
index de5884cb..ab7aed42 100644
--- a/src/ConanServerManager/VersionFeedBeta.xml
+++ b/src/ConanServerManager/VersionFeedBeta.xml
@@ -5,7 +5,30 @@
Conan Server Manager Version Feed
This is the Conan Server Manager beta version feed.
- 2021-12-16T00:00:00Z
+ 2021-12-17T00:00:00Z
+
+
+ urn:uuid:A189668E-DA03-471A-9C5A-7FF2A7264F9C
+ 1.1.58 (1.1.58.6)
+ 1.1.58.6
+
+ 2021-12-17T00:00:00Z
+
+
+
+ CHANGE
+
+
+ - Added additional message logging when log level set to debug.
+
+
+
+
+
+ bletch
+ bletch1971@hotmail.com
+
+
urn:uuid:A189668E-DA03-471A-9C5A-7FF2A7264F9C
diff --git a/src/ServerManager.Discord/ServerManagerBot.cs b/src/ServerManager.Discord/ServerManagerBot.cs
index e9950711..b8896223 100644
--- a/src/ServerManager.Discord/ServerManagerBot.cs
+++ b/src/ServerManager.Discord/ServerManagerBot.cs
@@ -1,5 +1,4 @@
-using Discord;
-using Discord.Addons.Interactive;
+using Discord.Addons.Interactive;
using Discord.Commands;
using Discord.Net.Providers.WS4Net;
using Discord.WebSocket;
@@ -48,6 +47,7 @@ namespace ServerManagerTool.DiscordBot
{
{ "DiscordSettings:Token", discordToken },
{ "DiscordSettings:Prefix", commandPrefix },
+ { "DiscordSettings:LogLevel", logLevel.ToString() },
{ "ServerManager:DataDirectory", dataDirectory },
};
diff --git a/src/ServerManager.Discord/Services/CommandHandlerService.cs b/src/ServerManager.Discord/Services/CommandHandlerService.cs
index 8386a9b2..655256b7 100644
--- a/src/ServerManager.Discord/Services/CommandHandlerService.cs
+++ b/src/ServerManager.Discord/Services/CommandHandlerService.cs
@@ -1,6 +1,8 @@
-using Discord.Commands;
+using Discord;
+using Discord.Commands;
using Discord.WebSocket;
using Microsoft.Extensions.Configuration;
+using ServerManagerTool.DiscordBot.Enums;
using ServerManagerTool.DiscordBot.Models;
using System;
using System.Linq;
@@ -12,14 +14,16 @@ namespace ServerManagerTool.DiscordBot.Services
{
private readonly DiscordSocketClient _discord;
private readonly CommandService _commands;
+ private readonly LoggingService _logger;
private readonly IConfigurationRoot _config;
private readonly IServiceProvider _provider;
private readonly DiscordBotWhitelistConfig _botWhitelist;
- public CommandHandlerService(DiscordSocketClient discord, CommandService commands, IConfigurationRoot config, IServiceProvider provider, DiscordBotWhitelistConfig botWhitelist)
+ public CommandHandlerService(DiscordSocketClient discord, CommandService commands, LoggingService logger, IConfigurationRoot config, IServiceProvider provider, DiscordBotWhitelistConfig botWhitelist)
{
_discord = discord;
_commands = commands;
+ _logger = logger;
_config = config;
_provider = provider;
_botWhitelist = botWhitelist ?? new DiscordBotWhitelistConfig();
@@ -28,6 +32,11 @@ namespace ServerManagerTool.DiscordBot.Services
private async Task OnMessageReceivedAsync(SocketMessage s)
{
+ if (LogLevel.Debug.ToString().Equals(_config["DiscordSettings:LogLevel"]))
+ {
+ await _logger?.OnLogAsync(new LogMessage(LogSeverity.Debug, MessageSource.System.ToString(), $"Intercepted the following message from {s.Author.Username} ({s.Author.Id}) - {s.Content}"));
+ }
+
// Ensure the message is from a user/bot
if (!(s is SocketUserMessage msg))
{