From 92eabc0710e7060e6faee67acd3bb0bd2bed047f Mon Sep 17 00:00:00 2001 From: Jordan Brown Date: Tue, 28 Apr 2020 15:32:24 -0400 Subject: [PATCH] Feckfeckfeck --- src/DMAPI/tgs/v5/api.dm | 4 ++-- tests/Tgstation.Server.Tests/Instance/ChatTest.cs | 2 +- tests/Tgstation.Server.Tests/Instance/FunctionalTest.cs | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/DMAPI/tgs/v5/api.dm b/src/DMAPI/tgs/v5/api.dm index a00a2ee575..963efe42da 100644 --- a/src/DMAPI/tgs/v5/api.dm +++ b/src/DMAPI/tgs/v5/api.dm @@ -286,14 +286,14 @@ if(intercepted_message_queue) intercepted_message_queue += list(message) else - Bridge(DMAPI5_BRIDGE_COMMAND_CHAT_SEND, message) + Bridge(DMAPI5_BRIDGE_COMMAND_CHAT_SEND, list(DMAPI5_BRIDGE_PARAMETER_CHAT_MESSAGE = message)) /datum/tgs_api/v5/ChatPrivateMessage(message, datum/tgs_chat_user/user) message = list(DMAPI5_CHAT_MESSAGE_TEXT = message, DMAPI5_CHAT_MESSAGE_CHANNEL_IDS = list(user.channel.id)) if(intercepted_message_queue) intercepted_message_queue += list(message) else - Bridge(DMAPI5_BRIDGE_COMMAND_CHAT_SEND, message) + Bridge(DMAPI5_BRIDGE_COMMAND_CHAT_SEND, list(DMAPI5_BRIDGE_PARAMETER_CHAT_MESSAGE = message)) /datum/tgs_api/v5/ChatChannelInfo() return chat_channels diff --git a/tests/Tgstation.Server.Tests/Instance/ChatTest.cs b/tests/Tgstation.Server.Tests/Instance/ChatTest.cs index 2e6a55fb89..92577472ff 100644 --- a/tests/Tgstation.Server.Tests/Instance/ChatTest.cs +++ b/tests/Tgstation.Server.Tests/Instance/ChatTest.cs @@ -65,7 +65,7 @@ namespace Tgstation.Server.Tests.Instance { IsAdminChannel = false, IsUpdatesChannel = true, - IsWatchdogChannel = false, + IsWatchdogChannel = true, Tag = "butt2", IrcChannel = channelId } diff --git a/tests/Tgstation.Server.Tests/Instance/FunctionalTest.cs b/tests/Tgstation.Server.Tests/Instance/FunctionalTest.cs index ed81d8d21d..ee48d40966 100644 --- a/tests/Tgstation.Server.Tests/Instance/FunctionalTest.cs +++ b/tests/Tgstation.Server.Tests/Instance/FunctionalTest.cs @@ -123,7 +123,7 @@ namespace Tgstation.Server.Tests.Instance { new ChatChannel { - IrcChannel = Environment.GetEnvironmentVariable("TGS4_IRC_CHAT_CHANNEL"), + IrcChannel = Environment.GetEnvironmentVariable("TGS4_TEST_IRC_CHANNEL"), Tag = "ohgodohfuck", IsAdminChannel = false, IsUpdatesChannel = false,