From 1b06d158d495b88d20b9130665cbee2c2bf44d2f Mon Sep 17 00:00:00 2001 From: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com> Date: Wed, 19 Aug 2020 18:15:50 +0100 Subject: [PATCH] Needs Testing --- .../Models/DiscordConnectionStringBuilder.cs | 9 +++++---- .../Components/Chat/Providers/DiscordProvider.cs | 8 ++++---- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/Tgstation.Server.Api/Models/DiscordConnectionStringBuilder.cs b/src/Tgstation.Server.Api/Models/DiscordConnectionStringBuilder.cs index 383bc6fa25..797ea72be2 100644 --- a/src/Tgstation.Server.Api/Models/DiscordConnectionStringBuilder.cs +++ b/src/Tgstation.Server.Api/Models/DiscordConnectionStringBuilder.cs @@ -19,9 +19,9 @@ namespace Tgstation.Server.Api.Models public string? BotToken { get; set; } /// - /// Boolean to enable based mode (Will auto reply with 'based on the hardware thats installed in it' to anyone saying 'based on what') + /// to enable based mode. Will auto reply with a youtube link to a video that says "based on the hardware that's installed in it" to anyone saying 'based on what?' case-insensitive. /// - public bool BasedMode { get; set; } + public bool BasedMeme { get; set; } /// /// The . @@ -46,10 +46,11 @@ namespace Tgstation.Server.Api.Models BotToken = splits.First(); if (splits.Length < 2 || !Enum.TryParse(splits[1], out var dMOutputDisplayType)) dMOutputDisplayType = DiscordDMOutputDisplayType.Always; - DMOutputDisplay = dMOutputDisplayType; + if (splits.Length < 3 || !bool.TryParse(splits[2], out bool basedMeme)) + basedMeme = false; } /// - public override string ToString() => $"{BotToken};{(int)DMOutputDisplay}"; + public override string ToString() => $"{BotToken};{(int)DMOutputDisplay};{BasedMeme.ToString()}"; } } diff --git a/src/Tgstation.Server.Host/Components/Chat/Providers/DiscordProvider.cs b/src/Tgstation.Server.Host/Components/Chat/Providers/DiscordProvider.cs index e411d9183a..df097473ae 100644 --- a/src/Tgstation.Server.Host/Components/Chat/Providers/DiscordProvider.cs +++ b/src/Tgstation.Server.Host/Components/Chat/Providers/DiscordProvider.cs @@ -53,9 +53,9 @@ namespace Tgstation.Server.Host.Components.Chat.Providers readonly string botToken; /// - /// Boolean to enable based mode (Will auto reply with 'based on the hardware thats installed in it' to anyone saying 'based on what') + /// to enable based mode. Will auto reply with a youtube link to a video that says "based on the hardware that's installed in it" to anyone saying 'based on what?' case-insensitive. /// - readonly bool basedMode; + readonly bool basedMeme; /// /// The . @@ -87,7 +87,7 @@ namespace Tgstation.Server.Host.Components.Chat.Providers var csb = new DiscordConnectionStringBuilder(chatBot.ConnectionString); botToken = csb.BotToken; - basedMode = csb.BasedMode; + basedMeme = csb.BasedMeme; outputDisplayType = csb.DMOutputDisplay; client = new DiscordSocketClient(); @@ -116,7 +116,7 @@ namespace Tgstation.Server.Host.Components.Chat.Providers void StartTyping() => typingState = e.Channel.EnterTypingState(); try { - if (basedMode && e.Content.Equals("Based on what?", StringComparison.OrdinalIgnoreCase)) + if (basedMeme && e.Content.Equals("Based on what?", StringComparison.OrdinalIgnoreCase)) { StartTyping();