diff --git a/src/ARKServerManager/VersionFeed.xml b/src/ARKServerManager/VersionFeed.xml index 26d4f41b..91a900da 100644 --- a/src/ARKServerManager/VersionFeed.xml +++ b/src/ARKServerManager/VersionFeed.xml @@ -9,8 +9,8 @@ urn:uuid:3E33DCB2-ECFE-4489-B1A4-56F5D386F9DC - 1.1.413 (1.1.413.3) - 1.1.413.3 + 1.1.413 (1.1.413.4) + 1.1.413.4 2021-12-16T00:00:00Z diff --git a/src/ARKServerManager/VersionFeedBeta.xml b/src/ARKServerManager/VersionFeedBeta.xml index 94d70e2c..d5256d65 100644 --- a/src/ARKServerManager/VersionFeedBeta.xml +++ b/src/ARKServerManager/VersionFeedBeta.xml @@ -7,6 +7,29 @@ 2021-12-16T00:00:00Z + + urn:uuid:98FFBFA1-4E99-4801-BF2B-CA68BE300C27 + 1.1.413 (1.1.413.4) + 1.1.413.4 + + 2021-12-16T00:00:00Z + +
+

+ BUGFIX +
+

    +
  • Fixed a bug that would prevent a bot on the whitelist processing the message.
  • +
+

+
+
+ + bletch + bletch1971@hotmail.com + +
+ urn:uuid:8958A494-DE13-4F6F-ACA2-10026D5FB8A9 1.1.413 (1.1.413.3) diff --git a/src/ConanServerManager/VersionFeed.xml b/src/ConanServerManager/VersionFeed.xml index acaf95e2..8329b387 100644 --- a/src/ConanServerManager/VersionFeed.xml +++ b/src/ConanServerManager/VersionFeed.xml @@ -9,8 +9,8 @@ urn:uuid:19B09A66-43F2-4D5F-AF33-5C77D7EA9A6B - 1.1.58 (1.1.58.3) - 1.1.58.3 + 1.1.58 (1.1.58.4) + 1.1.58.4 2021-12-16T00:00:00Z diff --git a/src/ConanServerManager/VersionFeedBeta.xml b/src/ConanServerManager/VersionFeedBeta.xml index 79f41cfe..e95fc7f0 100644 --- a/src/ConanServerManager/VersionFeedBeta.xml +++ b/src/ConanServerManager/VersionFeedBeta.xml @@ -7,6 +7,29 @@ 2021-12-16T00:00:00Z + + urn:uuid:F3C22842-A089-46F7-AB1A-5D3DED105412 + 1.1.58 (1.1.58.4) + 1.1.58.4 + + 2021-12-16T00:00:00Z + +
+

+ BUGFIX +
+

    +
  • Fixed a bug that would prevent a bot on the whitelist processing the message.
  • +
+

+
+
+ + bletch + bletch1971@hotmail.com + +
+ urn:uuid:F3C22842-A089-46F7-AB1A-5D3DED105412 1.1.58 (1.1.58.3) diff --git a/src/ServerManager.Discord/Services/CommandHandlerService.cs b/src/ServerManager.Discord/Services/CommandHandlerService.cs index 60e7996b..bd6b55ce 100644 --- a/src/ServerManager.Discord/Services/CommandHandlerService.cs +++ b/src/ServerManager.Discord/Services/CommandHandlerService.cs @@ -29,8 +29,7 @@ namespace ServerManagerTool.DiscordBot.Services private async Task OnMessageReceivedAsync(SocketMessage s) { // Ensure the message is from a user/bot - var msg = s as SocketUserMessage; - if (msg is null) + if (!(s is SocketUserMessage msg)) { return; } @@ -41,10 +40,15 @@ namespace ServerManagerTool.DiscordBot.Services return; } - // Tell bot to ignore itself, unless on the whitelist - if (msg.Author.IsBot && !_botWhitelist.DiscordBotWhitelists.Any(b => b.BotId.Equals(msg.Author.Id))) + // check if the author is a bot + if (msg.Author.IsBot) { - return; + // check if bot is on the whitelist + if (!_botWhitelist.DiscordBotWhitelists.Any(b => b.BotId.Equals(msg.Author.Id.ToString()))) + { + // Tell bot to ignore + return; + } } // Create the command context