diff --git a/src/DMAPI/tgs/v5/_defines.dm b/src/DMAPI/tgs/v5/_defines.dm index 925b5856fd..627211cd46 100644 --- a/src/DMAPI/tgs/v5/_defines.dm +++ b/src/DMAPI/tgs/v5/_defines.dm @@ -1,4 +1,4 @@ -#define DMAPI5_PARAM_DEPLOYMENT_INFORMATION_FILE "tgs_json" +#define DMAPI5_PARAM_RUNTIME_INFORMATION_FILE "tgs_json" #define DMAPI5_TOPIC_DATA "data" #define DMAPI5_BRIDGE_COMMAND_NEW_PORT 0 @@ -16,4 +16,25 @@ #define DMAPI5_BRIDGE_RESPONSE_ERROR_MESSAGE "errorMessage" #define DMAPI5_BRIDGE_RESPONSE_ERROR_NEW_PORT "newPort" -#de \ No newline at end of file + +#define DMAPI5_CHAT_MESSAGE_TEXT "text" +#define DMAPI5_CHAT_MESSAGE_CHANNEL_IDS "channelIds" + +#define DMAPI5_RUNTIME_INFORMATION_ACCESS_IDENTIFIER "accessIdentifier" +#define DMAPI5_RUNTIME_INFORMATION_SERVER_VERSION "serverVersion" +#define DMAPI5_RUNTIME_INFORMATION_SERVER_PORT "serverPort" +#define DMAPI5_RUNTIME_INFORMATION_API_VALIDATE_ONLY "apiValidateOnly" +#define DMAPI5_RUNTIME_INFORMATION_INSTANCE_NAME "instanceName" +#define DMAPI5_RUNTIME_INFORMATION_REVISION "revision" +#define DMAPI5_RUNTIME_INFORMATION_TEST_MERGES "testMerges" + +#define DMAPI5_TEST_MERGE_TIME_MERGED "timeMerged" +#define DMAPI5_TEST_MERGE_REVISION "revision" +#define DMAPI5_TEST_MERGE_TITLE_AT_MERGE "titleAtMerge" +#define DMAPI5_TEST_MERGE_BODY_AT_MERGE "bodyAtMerge" +#define DMAPI5_TEST_MERGE_URL "url" +#define DMAPI5_TEST_MERGE_AUTHOR "author" + +#define DMAPI5_CHAT_COMMAND_NAME "name" +#define DMAPI5_CHAT_COMMAND_PARAMS "params" +#defin \ No newline at end of file diff --git a/src/Tgstation.Server.Host/Components/Interop/Bridge/ChatMessage.cs b/src/Tgstation.Server.Host/Components/Interop/Bridge/ChatMessage.cs index 8fbe6006f5..9037e94c8f 100644 --- a/src/Tgstation.Server.Host/Components/Interop/Bridge/ChatMessage.cs +++ b/src/Tgstation.Server.Host/Components/Interop/Bridge/ChatMessage.cs @@ -4,7 +4,7 @@ namespace Tgstation.Server.Host.Components.Interop.Bridge { public sealed class ChatMessage { - public string Message { get; set; } + public string Text { get; set; } public ICollection ChannelIds { get; set; } } diff --git a/src/Tgstation.Server.Host/Components/Interop/Topic/ChatCommand.cs b/src/Tgstation.Server.Host/Components/Interop/Topic/ChatCommand.cs index 7b4115e449..8c47fdea95 100644 --- a/src/Tgstation.Server.Host/Components/Interop/Topic/ChatCommand.cs +++ b/src/Tgstation.Server.Host/Components/Interop/Topic/ChatCommand.cs @@ -11,7 +11,7 @@ namespace Tgstation.Server.Host.Components.Interop.Topic /// /// The command name /// - public string Command { get; } + public string Name { get; } /// /// The command params @@ -27,12 +27,12 @@ namespace Tgstation.Server.Host.Components.Interop.Topic /// Initializes a new instance of the . /// /// The value of . - /// The value of . + /// The value of . /// The value of . public ChatCommand(User user, string command, string parameters) { User = user ?? throw new ArgumentNullException(nameof(user)); - Command = command ?? throw new ArgumentNullException(nameof(command)); + Name = command ?? throw new ArgumentNullException(nameof(command)); Params = parameters ?? throw new ArgumentNullException(nameof(parameters)); } } diff --git a/src/Tgstation.Server.Host/Components/Watchdog/SessionController.cs b/src/Tgstation.Server.Host/Components/Watchdog/SessionController.cs index 1c8272579d..1b990cb9e5 100644 --- a/src/Tgstation.Server.Host/Components/Watchdog/SessionController.cs +++ b/src/Tgstation.Server.Host/Components/Watchdog/SessionController.cs @@ -316,14 +316,14 @@ namespace Tgstation.Server.Host.Components.Watchdog ErrorMessage = "Missing channelIds field in chatMessage!" }; - if (parameters.ChatMessage.Message == null) + if (parameters.ChatMessage.Text == null) return new BridgeResponse { ErrorMessage = "Missing message field in chatMessage!" }; await chat.SendMessage( - parameters.ChatMessage.Message, + parameters.ChatMessage.Text, parameters.ChatMessage.ChannelIds, cancellationToken).ConfigureAwait(false); break; diff --git a/src/Tgstation.Server.Host/Extensions/VersionExtensions.cs b/src/Tgstation.Server.Host/Extensions/VersionExtensions.cs index 1507340fb7..8e85b17d4b 100644 --- a/src/Tgstation.Server.Host/Extensions/VersionExtensions.cs +++ b/src/Tgstation.Server.Host/Extensions/VersionExtensions.cs @@ -1,5 +1,4 @@ using System; - namespace Tgstation.Server.Host.Extensions { ///