From f416b5cd780b497592c35cdc556a91bae4e34e54 Mon Sep 17 00:00:00 2001
From: Brett Hewitson <bletch1971@hotmail.com>
Date: Tue, 21 Jun 2022 22:01:04 +1000
Subject: [PATCH] Nuget package updates

- Microsoft.Extensions
- updated discord modules to check for null response.
---
 .../Globalization/en-US/en-US.xaml                   |  1 +
 .../Modules/ServerCommandModule.cs                   | 12 ++++++++++++
 .../Modules/ServerQueryModule.cs                     |  6 ++++++
 .../ServerManager.Discord.csproj                     |  6 +++---
 4 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/src/ConanServerManager/Globalization/en-US/en-US.xaml b/src/ConanServerManager/Globalization/en-US/en-US.xaml
index cc661559..92c344d7 100644
--- a/src/ConanServerManager/Globalization/en-US/en-US.xaml
+++ b/src/ConanServerManager/Globalization/en-US/en-US.xaml
@@ -1368,6 +1368,7 @@
     <sys:String x:Key="DiscordBot_ProfileNotFound">Profile/Alias '{0}' was not found or is not associated with the channel.</sys:String>
     <sys:String x:Key="DiscordBot_ProfileBadStatus">Profile '{0}' is in a state '{1}' that cannot run this command.</sys:String>
     <sys:String x:Key="DiscordBot_ProfileUpdating">Profile '{0}' is currently being updated.</sys:String>
+    <sys:String x:Key="DiscordBot_NoChannelProfiles">No profiles are associated with the channel.</sys:String>
 
     <sys:String x:Key="DiscordBot_InfoFailed">Call to server '{0}' failed.</sys:String>
     <sys:String x:Key="DiscordBot_BackupRequested">A backup request for server '{0}' has been sent.</sys:String>
diff --git a/src/ServerManager.Discord/Modules/ServerCommandModule.cs b/src/ServerManager.Discord/Modules/ServerCommandModule.cs
index 76310a6f..574fb3ef 100644
--- a/src/ServerManager.Discord/Modules/ServerCommandModule.cs
+++ b/src/ServerManager.Discord/Modules/ServerCommandModule.cs
@@ -43,6 +43,8 @@ namespace ServerManagerTool.DiscordBot.Modules
                 {
                     foreach (var output in response)
                     {
+                        if (output is null)
+                            continue;
                         await ReplyAsync(output.Replace("&", "_"));
                         await Task.Delay(COMMAND_RESPONSE_DELAY);
                     }
@@ -76,6 +78,8 @@ namespace ServerManagerTool.DiscordBot.Modules
                 {
                     foreach (var output in response)
                     {
+                        if (output is null)
+                            continue;
                         await ReplyAsync(output.Replace("&", "_"));
                         await Task.Delay(COMMAND_RESPONSE_DELAY);
                     }
@@ -109,6 +113,8 @@ namespace ServerManagerTool.DiscordBot.Modules
                 {
                     foreach (var output in response)
                     {
+                        if (output is null)
+                            continue;
                         await ReplyAsync(output.Replace("&", "_"));
                         await Task.Delay(COMMAND_RESPONSE_DELAY);
                     }
@@ -142,6 +148,8 @@ namespace ServerManagerTool.DiscordBot.Modules
                 {
                     foreach (var output in response)
                     {
+                        if (output is null)
+                            continue;
                         await ReplyAsync(output.Replace("&", "_"));
                         await Task.Delay(COMMAND_RESPONSE_DELAY);
                     }
@@ -175,6 +183,8 @@ namespace ServerManagerTool.DiscordBot.Modules
                 {
                     foreach (var output in response)
                     {
+                        if (output is null)
+                            continue;
                         await ReplyAsync(output.Replace("&", "_"));
                         await Task.Delay(COMMAND_RESPONSE_DELAY);
                     }
@@ -208,6 +218,8 @@ namespace ServerManagerTool.DiscordBot.Modules
                 {
                     foreach (var output in response)
                     {
+                        if (output is null)
+                            continue;
                         await ReplyAsync(output.Replace("&", "_"));
                         await Task.Delay(COMMAND_RESPONSE_DELAY);
                     }
diff --git a/src/ServerManager.Discord/Modules/ServerQueryModule.cs b/src/ServerManager.Discord/Modules/ServerQueryModule.cs
index 72c19bf7..c82e4a52 100644
--- a/src/ServerManager.Discord/Modules/ServerQueryModule.cs
+++ b/src/ServerManager.Discord/Modules/ServerQueryModule.cs
@@ -43,6 +43,8 @@ namespace ServerManagerTool.DiscordBot.Modules
                 {
                     foreach (var output in response)
                     {
+                        if (output is null)
+                            continue;
                         await ReplyAsync(output.Replace("&", "_"));
                         await Task.Delay(COMMAND_RESPONSE_DELAY);
                     }
@@ -76,6 +78,8 @@ namespace ServerManagerTool.DiscordBot.Modules
                 {
                     foreach (var output in response)
                     {
+                        if (output is null)
+                            continue;
                         await ReplyAsync(output.Replace("&", "_"));
                         await Task.Delay(COMMAND_RESPONSE_DELAY);
                     }
@@ -109,6 +113,8 @@ namespace ServerManagerTool.DiscordBot.Modules
                 {
                     foreach (var output in response)
                     {
+                        if (output is null)
+                            continue;
                         await ReplyAsync(output.Replace("&", "_"));
                         await Task.Delay(COMMAND_RESPONSE_DELAY);
                     }
diff --git a/src/ServerManager.Discord/ServerManager.Discord.csproj b/src/ServerManager.Discord/ServerManager.Discord.csproj
index 3b11e932..a14b3429 100644
--- a/src/ServerManager.Discord/ServerManager.Discord.csproj
+++ b/src/ServerManager.Discord/ServerManager.Discord.csproj
@@ -15,9 +15,9 @@
     <PackageReference Include="Discord.Addons.Interactive" Version="2.0.0" />
     <PackageReference Include="Discord.Net" Version="2.4.0" />
     <PackageReference Include="Discord.Net.Providers.WS4Net" Version="2.4.0" />
-    <PackageReference Include="Microsoft.Extensions.Configuration" Version="2.1.0" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="2.1.0" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="2.1.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration" Version="6.0.1" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="6.0.0" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.0" />
     <PackageReference Include="NLog" Version="5.0.1" />
   </ItemGroup>
   <ItemGroup>