cyberpresidentvanellope/tgstation-server
1
0
Fork 0
mirror of https://github.com/tgstation/tgstation-server.git synced 2026-08-25 14:06:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #344 from Cyberboss/ChatFuckeryFix

Browse Source 
ChatSetupInfo lists are sanity checked
This commit is contained in:
Jordan Brown
2017-11-11 19:56:22 -05:00
committed by GitHub
parent 8a4ed56d8f 0fb55df7ea
commit 8445ce08e6
3 changed files with 19 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TGCommandLine/ChatCommands.cs
+2 -2
View File
@@ -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())
{
TGServerService/ServerInstance/Chat.cs
+6
View File
@@ -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)
TGServiceInterface/ChatSetupInfo.cs
+11 -11
View File
@@ -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);