From 88d6ff42fbfea32bc2705a9c0826c92a669f8661 Mon Sep 17 00:00:00 2001 From: Jordan Brown Date: Mon, 16 Jul 2018 01:23:51 -0400 Subject: [PATCH] Fixes and comments --- UpgradeLog.htm | Bin 0 -> 41384 bytes .../Components/Chat/Channel.cs | 19 ++++++++++++++++-- .../Components/Chat/Commands/Command.cs | 6 +++--- .../Components/Chat/Commands/CustomCommand.cs | 2 +- .../Components/Watchdog/Watchdog.cs | 2 +- 5 files changed, 22 insertions(+), 7 deletions(-) create mode 100644 UpgradeLog.htm diff --git a/UpgradeLog.htm b/UpgradeLog.htm new file mode 100644 index 0000000000000000000000000000000000000000..1b7f8648c7794d8114bd8e89b04958735798ae8d GIT binary patch literal 41384 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 SOY%JaB&srrXUO#d_5Kfj4hm2J literal 0 HcmV?d00001 diff --git a/src/Tgstation.Server.Host/Components/Chat/Channel.cs b/src/Tgstation.Server.Host/Components/Chat/Channel.cs index 33b0e6f7db..8a6cfc1d66 100644 --- a/src/Tgstation.Server.Host/Components/Chat/Channel.cs +++ b/src/Tgstation.Server.Host/Components/Chat/Channel.cs @@ -1,14 +1,29 @@ namespace Tgstation.Server.Host.Components.Chat { + /// + /// Represents a channel + /// public sealed class Channel { + /// + /// The channel Id. + /// + /// remaps this to an internal id using public long Id { get; set; } + /// + /// The user friendly name of the + /// public string FriendlyName { get; set; } - public string ConnectionName { get; set; } - + /// + /// If this is considered a channel for admin commands + /// public bool IsAdminChannel { get; set; } + + /// + /// If this i + /// public bool IsPrivateChannel { get; set; } } } diff --git a/src/Tgstation.Server.Host/Components/Chat/Commands/Command.cs b/src/Tgstation.Server.Host/Components/Chat/Commands/Command.cs index c607f04b45..8ad981aee0 100644 --- a/src/Tgstation.Server.Host/Components/Chat/Commands/Command.cs +++ b/src/Tgstation.Server.Host/Components/Chat/Commands/Command.cs @@ -1,11 +1,11 @@ namespace Tgstation.Server.Host.Components.Chat.Commands { - abstract class Command - { + public abstract class Command + { public string Name { get; set; } public string HelpText { get; set; } public bool AdminOnly { get; set; } public abstract void Invoke(string arguments); - } + } } diff --git a/src/Tgstation.Server.Host/Components/Chat/Commands/CustomCommand.cs b/src/Tgstation.Server.Host/Components/Chat/Commands/CustomCommand.cs index e2d9b5a4a1..94e8af328f 100644 --- a/src/Tgstation.Server.Host/Components/Chat/Commands/CustomCommand.cs +++ b/src/Tgstation.Server.Host/Components/Chat/Commands/CustomCommand.cs @@ -2,7 +2,7 @@ namespace Tgstation.Server.Host.Components.Chat.Commands { - sealed class CustomCommand : Command + public sealed class CustomCommand : Command { ICustomCommandHandler handler; diff --git a/src/Tgstation.Server.Host/Components/Watchdog/Watchdog.cs b/src/Tgstation.Server.Host/Components/Watchdog/Watchdog.cs index f4a19fad3d..c64d6212c7 100644 --- a/src/Tgstation.Server.Host/Components/Watchdog/Watchdog.cs +++ b/src/Tgstation.Server.Host/Components/Watchdog/Watchdog.cs @@ -556,7 +556,7 @@ namespace Tgstation.Server.Host.Components.Watchdog } /// - public async Task HandleChatCommand(string commandName, IEnumerable arguments, Chat.User sender, CancellationToken cancellationToken) + public async Task HandleChatCommand(string commandName, string arguments, Chat.User sender, CancellationToken cancellationToken) { using (await SemaphoreSlimContext.Lock(semaphore, cancellationToken).ConfigureAwait(false)) {