From 0fb55df7ea534151dacee1747c3df31ec154c2fb Mon Sep 17 00:00:00 2001
From: Cyberboss <Cyberboss@users.noreply.github.com>
Date: Sat, 11 Nov 2017 19:21:49 -0500
Subject: [PATCH] ChatSetupInfo lists are sanity checked

---
 TGCommandLine/ChatCommands.cs          |  4 ++--
 TGServerService/ServerInstance/Chat.cs |  6 ++++++
 TGServiceInterface/ChatSetupInfo.cs    | 22 +++++++++++-----------
 3 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/TGCommandLine/ChatCommands.cs b/TGCommandLine/ChatCommands.cs
index 314a8725a1..651520457d 100644
--- a/TGCommandLine/ChatCommands.cs
+++ b/TGCommandLine/ChatCommands.cs
@@ -80,7 +80,7 @@ namespace TGCommandLine
 		{
 			var IRC = Interface.GetComponent<ITGChat>();
 			var info = IRC.ProviderInfos()[providerIndex];
-			IList<string> channels;
+			List<string> channels;
 
 			switch (parameters[1].ToLower())
 			{
@@ -158,7 +158,7 @@ namespace TGCommandLine
 		{
 			var IRC = Interface.GetComponent<ITGChat>();
 			var info = IRC.ProviderInfos()[providerIndex];
-			IList<string> channels;
+			List<string> channels;
 
 			switch (parameters[1].ToLower())
 			{
diff --git a/TGServerService/ServerInstance/Chat.cs b/TGServerService/ServerInstance/Chat.cs
index f81c97c036..ede8605480 100644
--- a/TGServerService/ServerInstance/Chat.cs
+++ b/TGServerService/ServerInstance/Chat.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Linq;
 using System.Collections.Generic;
 using System.Web.Script.Serialization;
 using TGServerService.ChatCommands;
@@ -174,6 +175,11 @@ namespace TGServerService
 		/// <inheritdoc />
 		public string SetProviderInfo(ChatSetupInfo info)
 		{
+			info.AdminList.RemoveAll(x => String.IsNullOrWhiteSpace(x));
+			info.AdminChannels.RemoveAll(x => String.IsNullOrWhiteSpace(x));
+			info.GameChannels.RemoveAll(x => String.IsNullOrWhiteSpace(x));
+			info.DevChannels.RemoveAll(x => String.IsNullOrWhiteSpace(x));
+			info.WatchdogChannels.RemoveAll(x => String.IsNullOrWhiteSpace(x));
 			try
 			{
 				lock (ChatLock)
diff --git a/TGServiceInterface/ChatSetupInfo.cs b/TGServiceInterface/ChatSetupInfo.cs
index 20e522cba4..1f2d0d1967 100644
--- a/TGServiceInterface/ChatSetupInfo.cs
+++ b/TGServiceInterface/ChatSetupInfo.cs
@@ -103,7 +103,7 @@ namespace TGServiceInterface
 		/// <summary>
 		/// Sanitizes a list of <paramref name="channelnames"/>
 		/// </summary>
-		/// <param name="channelnames">An <see cref="IList{T}"/> of strings</param>
+		/// <param name="channelnames">A <see cref="List{T}"/> of strings</param>
 		void SanitizeChannelNames(IList<string> channelnames)
 		{
 			for (var I = 0; I < channelnames.Count; ++I)
@@ -129,9 +129,9 @@ namespace TGServiceInterface
 		/// <summary>
 		/// The list of admin entries
 		/// </summary>
-		public IList<string> AdminList
+		public List<string> AdminList
 		{
-			get { return new JavaScriptSerializer().Deserialize<IList<string>>(DataFields[AdminListIndex]); }
+			get { return new JavaScriptSerializer().Deserialize<List<string>>(DataFields[AdminListIndex]); }
 			set { DataFields[AdminListIndex] = new JavaScriptSerializer().Serialize(value); }
 		}
 		/// <summary>
@@ -145,9 +145,9 @@ namespace TGServiceInterface
 		/// <summary>
 		/// The channels from which admin commands/messages can be sent/received
 		/// </summary>
-		public IList<string> AdminChannels
+		public List<string> AdminChannels
 		{
-			get { return new JavaScriptSerializer().Deserialize<IList<string>>(DataFields[AdminChannelIndex]); }
+			get { return new JavaScriptSerializer().Deserialize<List<string>>(DataFields[AdminChannelIndex]); }
 			set
 			{
 				SanitizeChannelNames(value);
@@ -157,9 +157,9 @@ namespace TGServiceInterface
 		/// <summary>
 		/// The channels to which repo and compile messages are sent
 		/// </summary>
-		public IList<string> DevChannels
+		public List<string> DevChannels
 		{
-			get { return new JavaScriptSerializer().Deserialize<IList<string>>(DataFields[DevChannelIndex]); }
+			get { return new JavaScriptSerializer().Deserialize<List<string>>(DataFields[DevChannelIndex]); }
 			set
 			{
 				SanitizeChannelNames(value);
@@ -169,9 +169,9 @@ namespace TGServiceInterface
 		/// <summary>
 		/// The channels to which watchdog messages are sent
 		/// </summary>
-		public IList<string> WatchdogChannels
+		public List<string> WatchdogChannels
 		{
-			get { return new JavaScriptSerializer().Deserialize<IList<string>>(DataFields[WDChannelIndex]); }
+			get { return new JavaScriptSerializer().Deserialize<List<string>>(DataFields[WDChannelIndex]); }
 			set
 			{
 				SanitizeChannelNames(value);
@@ -181,9 +181,9 @@ namespace TGServiceInterface
 		/// <summary>
 		/// The channels to which game messages are sent
 		/// </summary>
-		public IList<string> GameChannels
+		public List<string> GameChannels
 		{
-			get { return new JavaScriptSerializer().Deserialize<IList<string>>(DataFields[GameChannelIndex]); }
+			get { return new JavaScriptSerializer().Deserialize<List<string>>(DataFields[GameChannelIndex]); }
 			set
 			{
 				SanitizeChannelNames(value);