Removed CapSolver support upon written request from the service

openbullet · Aug 12, 2024 · 97c4fc1 · 97c4fc1
1 parent 1970247
commit 97c4fc1
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 24 deletions.
diff --git a/OpenBullet2.Native/ViewModels/RLSettingsViewModel.cs b/OpenBullet2.Native/ViewModels/RLSettingsViewModel.cs
@@ -414,17 +414,7 @@ public int CustomAntiCaptchaPort
             OnPropertyChanged();
         }
     }
-
-    public string CapSolverApiKey
-    {
-        get => Captcha.CapSolverApiKey;
-        set
-        {
-            Captcha.CapSolverApiKey = value;
-            OnPropertyChanged();
-        }
-    }
-
+
     public string CapMonsterCloudApiKey
     {
         get => Captcha.CapMonsterCloudApiKey;

diff --git a/OpenBullet2.Native/Views/Pages/RLSettings.xaml b/OpenBullet2.Native/Views/Pages/RLSettings.xaml
@@ -342,9 +342,7 @@
                     <TabItem>
                         <StackPanel>
                             <StackPanel Orientation="Horizontal" Margin="0 10 0 0">
-                                <Label>Api Key</Label>
-                                <TextBox Text="{Binding CapSolverApiKey}"
-                                Width="400"></TextBox>
+                                <TextBlock Foreground="{DynamicResource ForegroundBad}">CapSolver itself explicitly asked to be removed from the software. Please choose another service.</TextBlock>
                             </StackPanel>
                         </StackPanel>
                     </TabItem>

diff --git a/RuriLib/Functions/Captchas/CaptchaServiceFactory.cs b/RuriLib/Functions/Captchas/CaptchaServiceFactory.cs
@@ -31,7 +31,8 @@ public static CaptchaService GetService(CaptchaSettings settings)
             CaptchaServiceType.NineKw => new NineKwService(settings.NineKWApiKey),
             CaptchaServiceType.CustomAntiCaptcha => new CustomAntiCaptchaService(settings.CustomAntiCaptchaApiKey,
                 GetUri(settings.CustomAntiCaptchaDomain, settings.CustomAntiCaptchaPort)),
-            CaptchaServiceType.CapSolver => new CapSolverService(settings.CapSolverApiKey),
+            CaptchaServiceType.CapSolver => throw new NotSupportedException(
+                "CapSolver itself explicitly asked to be removed from the software. Please choose another service."),
             CaptchaServiceType.CapMonsterCloud => new CapMonsterCloudService(settings.CapMonsterCloudApiKey),
             CaptchaServiceType.HumanCoder => new HumanCoderService(settings.HumanCoderApiKey),
             CaptchaServiceType.Nopecha => new NopechaService(settings.NopechaApiKey),

diff --git a/RuriLib/Models/Settings/CaptchaSettings.cs b/RuriLib/Models/Settings/CaptchaSettings.cs
@@ -32,7 +32,6 @@ public class CaptchaSettings
     public string CustomAntiCaptchaApiKey { get; set; } = "";
     public string CustomAntiCaptchaDomain { get; set; } = "";
     public int CustomAntiCaptchaPort { get; set; } = 80;
-    public string CapSolverApiKey { get; set; } = "";
     public string CapMonsterCloudApiKey { get; set; } = "";
     public string MetaBypassTechClientId { get; set; } = "";
     public string MetaBypassTechClientSecret { get; set; } = "";

diff --git a/openbullet2-web-client/src/app/main/components/rl-settings/rl-settings.component.html b/openbullet2-web-client/src/app/main/components/rl-settings/rl-settings.component.html
@@ -411,13 +411,7 @@ <h3>Captchas</h3>
     </div>
     <div class="row my-3" *ngIf="settings.captchaSettings.currentService === CaptchaServiceType.CapSolver">
         <div class="col-12">
-            <span class="mr-2">CapSolver API Key</span>
-            <app-input-text key="capSolverApiKey"
-                class="input-small" [style]="{ width: '600px' }"
-                (touched)="touched = true" ngDefaultControl
-                (validityChange)="onValidityChange($event)"
-                [(ngModel)]="settings.captchaSettings.capSolverApiKey"
-                placeholder="API_KEY" />
+            <span class="mr-2 color-bad">CapSolver itself explicitly asked to be removed from the software. Please choose another service.</span>
         </div>
     </div>
     <div class="row my-3" *ngIf="settings.captchaSettings.currentService === CaptchaServiceType.CapMonsterCloud">

diff --git a/openbullet2-web-client/src/app/main/dtos/settings/rl-settings.dto.ts b/openbullet2-web-client/src/app/main/dtos/settings/rl-settings.dto.ts
@@ -85,7 +85,6 @@ export interface CaptchaRLSettings {
   customAntiCaptchaApiKey: string;
   customAntiCaptchaDomain: string;
   customAntiCaptchaPort: number;
-  capSolverApiKey: string;
   capMonsterCloudApiKey: string;
   metaBypassTechClientId: string;
   metaBypassTechClientSecret: string;