diff --git a/OpenBullet2.Native/ViewModels/RLSettingsViewModel.cs b/OpenBullet2.Native/ViewModels/RLSettingsViewModel.cs index e473c8a14..de499c8da 100644 --- 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 index 812aa97a0..b86133f7b 100644 --- a/OpenBullet2.Native/Views/Pages/RLSettings.xaml +++ b/OpenBullet2.Native/Views/Pages/RLSettings.xaml @@ -342,9 +342,7 @@ - - + CapSolver itself explicitly asked to be removed from the software. Please choose another service. diff --git a/RuriLib/Functions/Captchas/CaptchaServiceFactory.cs b/RuriLib/Functions/Captchas/CaptchaServiceFactory.cs index 5d603464a..195905b5a 100644 --- 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 index 88722f00f..687fca6ae 100644 --- 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 index 832d176e7..3538a7c5d 100644 --- 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 @@

Captchas

- CapSolver API Key - + CapSolver itself explicitly asked to be removed from the software. Please choose another service.
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 index 9c1028bcf..03f86f811 100644 --- 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;