diff --git a/build/Version.props b/build/Version.props index f8653e54ae..50901525b3 100644 --- a/build/Version.props +++ b/build/Version.props @@ -5,9 +5,9 @@ 5.14.0 4.7.1 - 9.11.1 + 9.12.0 6.0.0 - 11.0.1 + 11.1.0 12.0.1 6.5.2 5.6.1 diff --git a/src/Tgstation.Server.Api/Models/DiscordConnectionStringBuilder.cs b/src/Tgstation.Server.Api/Models/DiscordConnectionStringBuilder.cs index c51d74a49f..2f954d4e80 100644 --- a/src/Tgstation.Server.Api/Models/DiscordConnectionStringBuilder.cs +++ b/src/Tgstation.Server.Api/Models/DiscordConnectionStringBuilder.cs @@ -22,6 +22,7 @@ namespace Tgstation.Server.Api.Models /// /// 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. /// + [Obsolete("Will be removed in next major TGS version")] public bool BasedMeme { get; set; } /// @@ -39,7 +40,6 @@ namespace Tgstation.Server.Api.Models /// public DiscordConnectionStringBuilder() { - BasedMeme = true; } /// @@ -60,9 +60,10 @@ namespace Tgstation.Server.Api.Models DMOutputDisplay = dMOutputDisplayType; if (splits.Length > 2 && Int32.TryParse(splits[2], out Int32 basedMeme)) +#pragma warning disable CS0618 // Type or member is obsolete BasedMeme = Convert.ToBoolean(basedMeme); else - BasedMeme = true; // oranges said this needs to be true by default :pensive: + BasedMeme = false; // oranges said this needs to be true by default :pensive: if (splits.Length > 3 && Int32.TryParse(splits[3], out Int32 branding)) DeploymentBranding = Convert.ToBoolean(branding); @@ -72,5 +73,6 @@ namespace Tgstation.Server.Api.Models /// public override string ToString() => $"{BotToken};{(int)DMOutputDisplay};{Convert.ToInt32(BasedMeme)};{Convert.ToInt32(DeploymentBranding)}"; +#pragma warning restore CS0618 // Type or member is obsolete } } diff --git a/src/Tgstation.Server.Host/Components/Chat/Providers/DiscordProvider.cs b/src/Tgstation.Server.Host/Components/Chat/Providers/DiscordProvider.cs index 142513c275..3ef92357d8 100644 --- a/src/Tgstation.Server.Host/Components/Chat/Providers/DiscordProvider.cs +++ b/src/Tgstation.Server.Host/Components/Chat/Providers/DiscordProvider.cs @@ -199,7 +199,9 @@ namespace Tgstation.Server.Host.Components.Chat.Providers var csb = new DiscordConnectionStringBuilder(chatBot.ConnectionString); var botToken = csb.BotToken; +#pragma warning disable CS0618 // Type or member is obsolete basedMeme = csb.BasedMeme; +#pragma warning restore CS0618 // Type or member is obsolete outputDisplayType = csb.DMOutputDisplay; deploymentBranding = csb.DeploymentBranding; diff --git a/tests/Tgstation.Server.Tests/Live/Instance/ChatTest.cs b/tests/Tgstation.Server.Tests/Live/Instance/ChatTest.cs index f90c1dc116..02faa835ca 100644 --- a/tests/Tgstation.Server.Tests/Live/Instance/ChatTest.cs +++ b/tests/Tgstation.Server.Tests/Live/Instance/ChatTest.cs @@ -149,7 +149,6 @@ namespace Tgstation.Server.Tests.Live.Instance // needs to just be valid connectionString = new DiscordConnectionStringBuilder { - BasedMeme = true, BotToken = "some_token", DeploymentBranding = true, DMOutputDisplay = DiscordDMOutputDisplayType.Never, diff --git a/tests/Tgstation.Server.Tests/Live/Instance/InstanceTest.cs b/tests/Tgstation.Server.Tests/Live/Instance/InstanceTest.cs index 3035e45de9..9265e0e7f6 100644 --- a/tests/Tgstation.Server.Tests/Live/Instance/InstanceTest.cs +++ b/tests/Tgstation.Server.Tests/Live/Instance/InstanceTest.cs @@ -97,7 +97,6 @@ namespace Tgstation.Server.Tests.Live.Instance // needs to just be valid connectionString = new DiscordConnectionStringBuilder { - BasedMeme = true, BotToken = "some_token", DeploymentBranding = true, DMOutputDisplay = DiscordDMOutputDisplayType.Always, diff --git a/tools/Tgstation.Server.Migrator.Comms/Program.cs b/tools/Tgstation.Server.Migrator.Comms/Program.cs index 2e069acb46..2277b9d76f 100644 --- a/tools/Tgstation.Server.Migrator.Comms/Program.cs +++ b/tools/Tgstation.Server.Migrator.Comms/Program.cs @@ -168,7 +168,6 @@ static class Program var discordSetupInfo = new DiscordSetupInfo(providerInfo); csb = new DiscordConnectionStringBuilder { - BasedMeme = false, DMOutputDisplay = DiscordDMOutputDisplayType.Always, BotToken = discordSetupInfo.BotToken };