diff --git a/src/Tgstation.Server.Host/Components/Interop/Bridge/BridgeParameters.cs b/src/Tgstation.Server.Host/Components/Interop/Bridge/BridgeParameters.cs index 9ff2785219..ac6b470d90 100644 --- a/src/Tgstation.Server.Host/Components/Interop/Bridge/BridgeParameters.cs +++ b/src/Tgstation.Server.Host/Components/Interop/Bridge/BridgeParameters.cs @@ -1,5 +1,7 @@ using System; +using System.Collections.Generic; using Tgstation.Server.Api.Models; +using Tgstation.Server.Host.Components.Chat.Commands; namespace Tgstation.Server.Host.Components.Interop.Bridge { @@ -23,6 +25,11 @@ namespace Tgstation.Server.Host.Components.Interop.Bridge /// public Version Version { get; set; } + /// + /// The DMAPI s for requests. + /// + public ICollection CustomCommands { get; set; } + /// /// The minimum required level for requests. /// diff --git a/src/Tgstation.Server.Host/Components/Interop/Bridge/RuntimeInformation.cs b/src/Tgstation.Server.Host/Components/Interop/Bridge/RuntimeInformation.cs index 1cd4cbfe77..686c0f3af4 100644 --- a/src/Tgstation.Server.Host/Components/Interop/Bridge/RuntimeInformation.cs +++ b/src/Tgstation.Server.Host/Components/Interop/Bridge/RuntimeInformation.cs @@ -11,7 +11,7 @@ namespace Tgstation.Server.Host.Components.Interop.Bridge /// /// Representation of the initial data passed as part of a request. /// - public sealed class RuntimeInformation : ChatChannelsUpdate + public sealed class RuntimeInformation : ChatUpdate { /// /// The code used by the server to authenticate command Topics @@ -60,7 +60,7 @@ namespace Tgstation.Server.Host.Components.Interop.Bridge /// The used to generate the value of . /// The used to set the value of . /// An used to construct the value of . - /// The s for the . + /// The s for the . /// The used to set . /// The value of . /// The value of . diff --git a/src/Tgstation.Server.Host/Components/Interop/ChatUpdate.cs b/src/Tgstation.Server.Host/Components/Interop/ChatUpdate.cs index 61bbfd1dce..06ca6b6604 100644 --- a/src/Tgstation.Server.Host/Components/Interop/ChatUpdate.cs +++ b/src/Tgstation.Server.Host/Components/Interop/ChatUpdate.cs @@ -8,7 +8,7 @@ namespace Tgstation.Server.Host.Components.Interop /// /// Represents an update of s. /// - public class ChatChannelsUpdate + public class ChatUpdate { /// /// The of s. @@ -16,10 +16,10 @@ namespace Tgstation.Server.Host.Components.Interop public IEnumerable Channels { get; } /// - /// Initializes a new instance of the . + /// Initializes a new instance of the . /// /// The that forms the value of . - public ChatChannelsUpdate(IEnumerable channels) + public ChatUpdate(IEnumerable channels) { Channels = channels?.ToList() ?? throw new ArgumentNullException(nameof(channels)); } diff --git a/src/Tgstation.Server.Host/Components/Interop/DMApiConstants.cs b/src/Tgstation.Server.Host/Components/Interop/DMApiConstants.cs index 1cc08a6c18..ec311caabb 100644 --- a/src/Tgstation.Server.Host/Components/Interop/DMApiConstants.cs +++ b/src/Tgstation.Server.Host/Components/Interop/DMApiConstants.cs @@ -20,6 +20,11 @@ namespace Tgstation.Server.Host.Components.Interop /// public const string ParamServerPort = "tgs_port"; + /// + /// Identifies the for the session. + /// + public const string ParamAccessIdentifier = "tgs_key"; + /// /// Parameter json is encoded in for topic requests. /// diff --git a/tgstation-server.sln b/tgstation-server.sln index 1259c4a318..a0114affb6 100644 --- a/tgstation-server.sln +++ b/tgstation-server.sln @@ -1,12 +1,13 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.28307.136 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.29728.190 MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{DA32568D-1D8D-4A4C-9943-BFD3CE796B3F}" ProjectSection(SolutionItems) = preProject .codecov.yml = .codecov.yml .dockerignore = .dockerignore + .editorconfig = .editorconfig .gitignore = .gitignore .travis.yml = .travis.yml appveyor.yml = appveyor.yml @@ -142,6 +143,14 @@ Global ReleaseNoService|Any CPU = ReleaseNoService|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution + {2B69AD6D-2B5A-4023-8EAD-0BD1B18E028A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {2B69AD6D-2B5A-4023-8EAD-0BD1B18E028A}.Debug|Any CPU.Build.0 = Debug|Any CPU + {2B69AD6D-2B5A-4023-8EAD-0BD1B18E028A}.DebugNoService|Any CPU.ActiveCfg = Debug|Any CPU + {2B69AD6D-2B5A-4023-8EAD-0BD1B18E028A}.DebugNoService|Any CPU.Build.0 = Debug|Any CPU + {2B69AD6D-2B5A-4023-8EAD-0BD1B18E028A}.Release|Any CPU.ActiveCfg = Release|Any CPU + {2B69AD6D-2B5A-4023-8EAD-0BD1B18E028A}.Release|Any CPU.Build.0 = Release|Any CPU + {2B69AD6D-2B5A-4023-8EAD-0BD1B18E028A}.ReleaseNoService|Any CPU.ActiveCfg = Release|Any CPU + {2B69AD6D-2B5A-4023-8EAD-0BD1B18E028A}.ReleaseNoService|Any CPU.Build.0 = Release|Any CPU {A09C947F-4B9B-4AEE-AB50-47055EA05F18}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {A09C947F-4B9B-4AEE-AB50-47055EA05F18}.Debug|Any CPU.Build.0 = Debug|Any CPU {A09C947F-4B9B-4AEE-AB50-47055EA05F18}.DebugNoService|Any CPU.ActiveCfg = Debug|Any CPU @@ -158,14 +167,6 @@ Global {D36B99C4-E771-42D6-A95F-1102B3E236DF}.Release|Any CPU.Build.0 = Release|Any CPU {D36B99C4-E771-42D6-A95F-1102B3E236DF}.ReleaseNoService|Any CPU.ActiveCfg = Release|Any CPU {D36B99C4-E771-42D6-A95F-1102B3E236DF}.ReleaseNoService|Any CPU.Build.0 = Release|Any CPU - {2B69AD6D-2B5A-4023-8EAD-0BD1B18E028A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2B69AD6D-2B5A-4023-8EAD-0BD1B18E028A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2B69AD6D-2B5A-4023-8EAD-0BD1B18E028A}.DebugNoService|Any CPU.ActiveCfg = Debug|Any CPU - {2B69AD6D-2B5A-4023-8EAD-0BD1B18E028A}.DebugNoService|Any CPU.Build.0 = Debug|Any CPU - {2B69AD6D-2B5A-4023-8EAD-0BD1B18E028A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2B69AD6D-2B5A-4023-8EAD-0BD1B18E028A}.Release|Any CPU.Build.0 = Release|Any CPU - {2B69AD6D-2B5A-4023-8EAD-0BD1B18E028A}.ReleaseNoService|Any CPU.ActiveCfg = Release|Any CPU - {2B69AD6D-2B5A-4023-8EAD-0BD1B18E028A}.ReleaseNoService|Any CPU.Build.0 = Release|Any CPU {8B4A208D-A48A-4A5D-8B94-E2661138865D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {8B4A208D-A48A-4A5D-8B94-E2661138865D}.Debug|Any CPU.Build.0 = Debug|Any CPU {8B4A208D-A48A-4A5D-8B94-E2661138865D}.DebugNoService|Any CPU.ActiveCfg = Debug|Any CPU