From c1523ece068e6461b8fd81c43b225bb9ae0a61ec Mon Sep 17 00:00:00 2001
From: ruri <ruridev@protonmail.com>
Date: Wed, 19 Jun 2019 14:38:27 +0200
Subject: [PATCH] Moved BanProxyAfterGoodStatus from global to config-specific.

---
 .../OtherOptions/ConfigOtherOptionsProxies.xaml     | 13 +++++++------
 .../Pages/Main/Settings/RL/RLSettingsProxies.xaml   |  1 -
 RuriLib/Models/ConfigSettings.cs                    |  4 ++++
 RuriLib/Runner/RunnerViewModel.cs                   |  6 +++---
 RuriLib/ViewModels/RLSettings/SettingsProxies.cs    |  4 ----
 5 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/OpenBullet/Pages/Main/Configs/OtherOptions/ConfigOtherOptionsProxies.xaml b/OpenBullet/Pages/Main/Configs/OtherOptions/ConfigOtherOptionsProxies.xaml
index 50abd8a..65dc3f1 100644
--- a/OpenBullet/Pages/Main/Configs/OtherOptions/ConfigOtherOptionsProxies.xaml
+++ b/OpenBullet/Pages/Main/Configs/OtherOptions/ConfigOtherOptionsProxies.xaml
@@ -17,15 +17,16 @@
         </Grid.ColumnDefinitions>
 
         <StackPanel>
-            <DockPanel Grid.Column="0" Margin="5">
-                <CheckBox DockPanel.Dock="Top" Content="Needs Proxies" IsChecked="{Binding NeedsProxies}" VerticalContentAlignment="Center"/>
-                <CheckBox DockPanel.Dock="Top" Content="Use Only Socks Proxies" IsChecked="{Binding OnlySocks}" VerticalContentAlignment="Center"/>
-                <CheckBox DockPanel.Dock="Top" Content="Use Only SSL Proxies" IsChecked="{Binding OnlySsl}" VerticalContentAlignment="Center"/>
-                <DockPanel DockPanel.Dock="Top">
+            <StackPanel Grid.Column="0" Margin="5">
+                <CheckBox Content="Needs Proxies" IsChecked="{Binding NeedsProxies}" VerticalContentAlignment="Center"/>
+                <CheckBox Content="Use Only Socks Proxies" IsChecked="{Binding OnlySocks}" VerticalContentAlignment="Center"/>
+                <CheckBox Content="Use Only SSL Proxies" IsChecked="{Binding OnlySsl}" VerticalContentAlignment="Center"/>
+                <DockPanel>
                     <Label Content="Max Uses Per Proxy (0 = infinite)" />
                     <xctk:IntegerUpDown Background="Transparent" Width="50" Margin="10 0 0 0" Value="{Binding MaxProxyUses}" Foreground="{DynamicResource ForegroundMain}" HorizontalAlignment="Right"/>
                 </DockPanel>
-            </DockPanel>
+                <CheckBox Content="Ban Proxy after Good Status" IsChecked="{Binding BanProxyAfterGoodStatus}" VerticalContentAlignment="Center" ToolTip="Bans a Proxy after a SUCCESS, CUSTOM or TOCHECK result."/>
+            </StackPanel>
         </StackPanel>
     </Grid>
 </Page>
diff --git a/OpenBullet/Pages/Main/Settings/RL/RLSettingsProxies.xaml b/OpenBullet/Pages/Main/Settings/RL/RLSettingsProxies.xaml
index 3d928db..fb486de 100644
--- a/OpenBullet/Pages/Main/Settings/RL/RLSettingsProxies.xaml
+++ b/OpenBullet/Pages/Main/Settings/RL/RLSettingsProxies.xaml
@@ -25,7 +25,6 @@
             <Label Content="General"/>
             <CheckBox Content="Allow Concurrent Use" IsChecked="{Binding ConcurrentUse}" VerticalContentAlignment="Center"/>
             <CheckBox Content="Never Ban Proxies" IsChecked="{Binding NeverBan}" VerticalContentAlignment="Center"/>
-            <CheckBox Content="Ban Proxy after Good Status" IsChecked="{Binding BanAfterGoodStatus}" VerticalContentAlignment="Center" ToolTip="Bans a Proxy after a SUCCESS, CUSTOM or TOCHECK result."/>
             <CheckBox Content="Shuffle Proxies on Start" IsChecked="{Binding ShuffleOnStart}" VerticalContentAlignment="Center" />
             <Label Content="CloudFlare"/>
             <CheckBox Content="Don't Reuse Clearance Cookie (CF)" IsChecked="{Binding AlwaysGetClearance}" VerticalContentAlignment="Center"/>
diff --git a/RuriLib/Models/ConfigSettings.cs b/RuriLib/Models/ConfigSettings.cs
index bc6d264..59b8937 100644
--- a/RuriLib/Models/ConfigSettings.cs
+++ b/RuriLib/Models/ConfigSettings.cs
@@ -68,6 +68,10 @@ namespace RuriLib
         private int maxProxyUses = 0;
         /// <summary>The maximum amount of times a proxy can be used before being banned by the Runner (0 for infinite).</summary>
         public int MaxProxyUses { get { return maxProxyUses; } set { maxProxyUses = value; OnPropertyChanged(); } }
+
+        private bool banProxyAfterGoodStatus = false;
+        /// <summary>Whether to ban the proxy after a SUCCESS, CUSTOM or NONE status (not FAIL or RETRY).</summary>
+        public bool BanProxyAfterGoodStatus { get { return banProxyAfterGoodStatus; } set { banProxyAfterGoodStatus = value; OnPropertyChanged(); } }
         #endregion
 
         #region Data
diff --git a/RuriLib/Runner/RunnerViewModel.cs b/RuriLib/Runner/RunnerViewModel.cs
index 268c52b..c783f66 100644
--- a/RuriLib/Runner/RunnerViewModel.cs
+++ b/RuriLib/Runner/RunnerViewModel.cs
@@ -793,7 +793,7 @@ namespace RuriLib.Runner
                     case BotStatus.SUCCESS:
                         validData = new ValidData(botData.Data.Data, botData.Proxy == null ? "" : botData.Proxy.Proxy, botData.Proxy == null ? ProxyType.Http : botData.Proxy.Type, botData.Status, "HIT", capturedData.ToCaptureString(), Settings.General.SaveLastSource ? botData.ResponseSource : "", BotLog);
                         RaiseDispatchAction(new Action(() => HitsList.Add(validData)));
-                        if (UseProxies && !Settings.Proxies.NeverBan && Settings.Proxies.BanAfterGoodStatus)
+                        if (UseProxies && !Settings.Proxies.NeverBan && Config.Settings.BanProxyAfterGoodStatus)
                         {
                             currentProxy.Status = Status.BANNED;
                             currentProxy.LastUsed = DateTime.Now;
@@ -811,7 +811,7 @@ namespace RuriLib.Runner
                         validData = new ValidData(botData.Data.Data, botData.Proxy == null ? "" : botData.Proxy.Proxy, botData.Proxy == null ? ProxyType.Http : botData.Proxy.Type, botData.Status, hitType, capturedData.ToCaptureString(), Settings.General.SaveLastSource ? botData.ResponseSource : "", BotLog);
                         RaiseDispatchAction(new Action(() => CustomList.Add(validData)));
 
-                        if (UseProxies && !Settings.Proxies.NeverBan && Settings.Proxies.BanAfterGoodStatus)
+                        if (UseProxies && !Settings.Proxies.NeverBan && Config.Settings.BanProxyAfterGoodStatus)
                         {
                             currentProxy.Status = Status.BANNED;
                             currentProxy.LastUsed = DateTime.Now;
@@ -843,7 +843,7 @@ namespace RuriLib.Runner
                         validData = new ValidData(botData.Data.Data, botData.Proxy == null ? "" : botData.Proxy.Proxy, botData.Proxy == null ? ProxyType.Http : botData.Proxy.Type, botData.Status, "TOCHK", capturedData.ToCaptureString(), Settings.General.SaveLastSource ? botData.ResponseSource : "", BotLog);
                         RaiseDispatchAction(new Action(() => ToCheckList.Add(validData)));
 
-                        if (UseProxies && !Settings.Proxies.NeverBan && Settings.Proxies.BanAfterGoodStatus)
+                        if (UseProxies && !Settings.Proxies.NeverBan && Config.Settings.BanProxyAfterGoodStatus)
                         {
                             currentProxy.Status = Status.BANNED;
                             currentProxy.LastUsed = DateTime.Now;
diff --git a/RuriLib/ViewModels/RLSettings/SettingsProxies.cs b/RuriLib/ViewModels/RLSettings/SettingsProxies.cs
index abe2940..a837603 100644
--- a/RuriLib/ViewModels/RLSettings/SettingsProxies.cs
+++ b/RuriLib/ViewModels/RLSettings/SettingsProxies.cs
@@ -34,10 +34,6 @@ namespace RuriLib.ViewModels
         /// <summary>Whether to never ban the proxies.</summary>
         public bool NeverBan { get { return neverBan; } set { neverBan = value; OnPropertyChanged(); } }
 
-        private bool banAfterGoodStatus = false;
-        /// <summary>Whether to never ban the proxy after a SUCCESS, CUSTOM or NONE status (not FAIL or RETRY).</summary>
-        public bool BanAfterGoodStatus { get { return banAfterGoodStatus; } set { banAfterGoodStatus = value; OnPropertyChanged(); } }
-
         private bool shuffleOnStart = false;
         /// <summary>Whether proxy lists should be shuffled before being assigned to the Runner.</summary>
         public bool ShuffleOnStart { get { return shuffleOnStart; } set { shuffleOnStart = value; OnPropertyChanged(); } }