From bd89fa74e65a45acf167cdd0b210b1e5e537f29c Mon Sep 17 00:00:00 2001
From: barelyprofessional
 <150058423+barelyprofessional@users.noreply.github.com>
Date: Thu, 21 Aug 2025 01:32:58 -0500
Subject: [PATCH] Removed Twitch TOS strike and commercial shill as WS PubSub
 is dead

---
 KfChatDotNetBot/Commands/RestreamCommands.cs | 18 ----------------
 KfChatDotNetBot/Services/BotServices.cs      | 22 --------------------
 KfChatDotNetBot/Settings/BuiltIn.cs          | 17 ---------------
 3 files changed, 57 deletions(-)

diff --git a/KfChatDotNetBot/Commands/RestreamCommands.cs b/KfChatDotNetBot/Commands/RestreamCommands.cs
index 07b5c5a..53e5465 100644
--- a/KfChatDotNetBot/Commands/RestreamCommands.cs
+++ b/KfChatDotNetBot/Commands/RestreamCommands.cs
@@ -42,24 +42,6 @@ public class SetRestreamCommand : ICommand
     }
 }
 
-public class SetShillRestreamCommand : ICommand
-{
-    public List<Regex> Patterns => [
-        new Regex("^restream setshill (?<url>.+)$")
-    ];
-
-    public string? HelpText => "Set restream shill URL";
-    public UserRight RequiredRight => UserRight.TrueAndHonest;
-    public TimeSpan Timeout => TimeSpan.FromSeconds(10);
-
-    public async Task RunCommand(ChatBot botInstance, MessageModel message, UserDbModel user, GroupCollection arguments,
-        CancellationToken ctx)
-    {
-        await SettingsProvider.SetValueAsync(BuiltIn.Keys.TwitchCommercialRestreamShillMessage, arguments["url"].Value);
-        await botInstance.SendChatMessageAsync($"@{message.Author.Username}, updated URL for the commercial break restream shill", true);
-    }
-}
-
 public class SelfPromoCommand : ICommand
 {
     public List<Regex> Patterns => [
diff --git a/KfChatDotNetBot/Services/BotServices.cs b/KfChatDotNetBot/Services/BotServices.cs
index 3d2f19c..5a8943c 100644
--- a/KfChatDotNetBot/Services/BotServices.cs
+++ b/KfChatDotNetBot/Services/BotServices.cs
@@ -902,28 +902,6 @@ public class BotServices
         IsBmjLive = false;
     }
     
-    private void OnTwitchStreamCommercial(object sender, int channelId, int length, bool scheduled)
-    {
-        var settings = SettingsProvider
-            .GetMultipleValuesAsync([BuiltIn.Keys.TwitchShillRestreamOnCommercial, BuiltIn.Keys.TwitchCommercialRestreamShillMessage, BuiltIn.Keys.TwitchBossmanJackUsername]).Result;
-        if (!settings[BuiltIn.Keys.TwitchShillRestreamOnCommercial].ToBoolean())
-        {
-            _logger.Debug("Not shilling as it's disabled");
-            return;
-        }
-
-        _chatBot.SendChatMessage(
-            $"Did you just get a {length} second ad on Twitch? The Keno Kasino encourages Total Advertiser Death.[br]" +
-            $"{settings[BuiltIn.Keys.TwitchBossmanJackUsername].Value} streams are being re-streamed in low latency, ad-free form thanks to @Kees H. Do not watch ads.[br]{settings[BuiltIn.Keys.TwitchCommercialRestreamShillMessage].Value}",
-            true);
-    }
-    
-    private void OnTwitchStreamTosStrike(object sender, int channelId)
-    {
-        var username = SettingsProvider.GetValueAsync(BuiltIn.Keys.TwitchBossmanJackUsername).Result;
-        _chatBot.SendChatMessage($":!::!: {username.Value} was just banned from Twitch! :!::!:", true);
-    }
-    
     private void OnChipsggRecentBet(object sender, ChipsggBetModel bet)
     {
         var settings = SettingsProvider
diff --git a/KfChatDotNetBot/Settings/BuiltIn.cs b/KfChatDotNetBot/Settings/BuiltIn.cs
index 6ca3235..925c270 100644
--- a/KfChatDotNetBot/Settings/BuiltIn.cs
+++ b/KfChatDotNetBot/Settings/BuiltIn.cs
@@ -442,14 +442,6 @@ public static class BuiltIn
             ValueType = SettingValueType.Complex
         },
         new BuiltInSettingsModel
-        {
-            Key = Keys.TwitchShillRestreamOnCommercial,
-            Regex = BooleanRegex,
-            Description = "Whether to shill the ad-free restream on commercial",
-            Default = "true",
-            ValueType = SettingValueType.Boolean
-        },
-        new BuiltInSettingsModel
         {
             Key = Keys.KiwiFarmsInactivityTimeout,
             Regex = WholeNumberRegex,
@@ -603,13 +595,6 @@ public static class BuiltIn
             ValueType = SettingValueType.Text
         },
         new BuiltInSettingsModel
-        {
-            Key = Keys.TwitchCommercialRestreamShillMessage,
-            Description = "The specific restream to shill when a commercial is detected if shilling is enabled",
-            Default = "No commercial restream shill message set",
-            ValueType = SettingValueType.Text
-        },
-        new BuiltInSettingsModel
         {
             Key = Keys.BotChrisDjLiveImage,
             Description = "Image that the bot will send when ChrisDJ goes live",
@@ -1030,7 +1015,6 @@ public static class BuiltIn
         public static string ChipsggBmjUserIds = "Chipsgg.BmjUserIds";
         public static string RestreamUrl = "RestreamUrl";
         public static string KiwiFarmsCookies = "KiwiFarms.Cookies";
-        public static string TwitchShillRestreamOnCommercial = "Twitch.ShillRestreamOnCommercial";
         public static string KiwiFarmsInactivityTimeout = "KiwiFarms.InactivityTimeout";
         public static string KiwiFarmsPingInterval = "KiwiFarms.PingInterval";
         public static string JuiceLoserDivision = "Juice.LoserDivision";
@@ -1051,7 +1035,6 @@ public static class BuiltIn
         public static string BotImageAcceptableKeys = "Bot.Image.AcceptableKeys";
         public static string BotToyStoryImage = "Bot.ToyStoryImage";
         public static string BotImageRandomSliceDivideBy = "Bot.Image.RandomSliceDivideBy";
-        public static string TwitchCommercialRestreamShillMessage = "Twitch.CommercialRestreamShillMessage";
         public static string BotChrisDjLiveImage = "Bot.ChrisDjLiveImage";
         public static string DiscordTemporarilyBypassGambaSeshInitialValue =
             "Discord.TemporarilyBypassGambaSeshInitialValue";