From 7e603759e7db012ebea3cd74283a007a08bfc331 Mon Sep 17 00:00:00 2001 From: Jordan Brown Date: Tue, 12 May 2020 13:59:03 -0400 Subject: [PATCH] Prevent newlines in IRC messages --- .../Components/Chat/Providers/IrcProvider.cs | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/Tgstation.Server.Host/Components/Chat/Providers/IrcProvider.cs b/src/Tgstation.Server.Host/Components/Chat/Providers/IrcProvider.cs index 5eb58003f8..9d66fc0f38 100644 --- a/src/Tgstation.Server.Host/Components/Chat/Providers/IrcProvider.cs +++ b/src/Tgstation.Server.Host/Components/Chat/Providers/IrcProvider.cs @@ -443,6 +443,12 @@ namespace Tgstation.Server.Host.Components.Chat.Providers /// public override Task SendMessage(ulong channelId, string message, CancellationToken cancellationToken) => Task.Factory.StartNew(() => { + // IRC doesn't allow newlines + message = String.Concat( + message + .Where(x => x != '\r') + .Select(x => x == '\n' ? '|' : x)); + var channelName = channelIdMap[channelId]; SendType sendType; if (channelName == null)