mirror of
https://github.com/openbullet/openbullet.git
synced 2023-10-21 07:33:42 -05:00
Fixed the Captcha Services timeouts (DeCaptcher fix).
This commit is contained in:
@@ -39,39 +39,39 @@ namespace OpenBullet
|
|||||||
switch (Globals.rlSettings.Captchas.CurrentService)
|
switch (Globals.rlSettings.Captchas.CurrentService)
|
||||||
{
|
{
|
||||||
case BlockCaptcha.CaptchaService.AntiCaptcha:
|
case BlockCaptcha.CaptchaService.AntiCaptcha:
|
||||||
balance = new AntiCaptcha(Globals.rlSettings.Captchas.AntiCapToken, 0).GetBalance();
|
balance = new AntiCaptcha(Globals.rlSettings.Captchas.AntiCapToken, Globals.rlSettings.Captchas.Timeout).GetBalance();
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case BlockCaptcha.CaptchaService.DBC:
|
case BlockCaptcha.CaptchaService.DBC:
|
||||||
balance = new DeathByCaptcha(Globals.rlSettings.Captchas.DBCUser, Globals.rlSettings.Captchas.DBCPass, 0).GetBalance();
|
balance = new DeathByCaptcha(Globals.rlSettings.Captchas.DBCUser, Globals.rlSettings.Captchas.DBCPass, Globals.rlSettings.Captchas.Timeout).GetBalance();
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case BlockCaptcha.CaptchaService.DeCaptcher:
|
case BlockCaptcha.CaptchaService.DeCaptcher:
|
||||||
balance = new DeCaptcher(Globals.rlSettings.Captchas.DCUser, Globals.rlSettings.Captchas.DCPass, 0).GetBalance();
|
balance = new DeCaptcher(Globals.rlSettings.Captchas.DCUser, Globals.rlSettings.Captchas.DCPass, Globals.rlSettings.Captchas.Timeout).GetBalance();
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case BlockCaptcha.CaptchaService.ImageTypers:
|
case BlockCaptcha.CaptchaService.ImageTypers:
|
||||||
balance = new ImageTyperz(Globals.rlSettings.Captchas.ImageTypToken, 0).GetBalance();
|
balance = new ImageTyperz(Globals.rlSettings.Captchas.ImageTypToken, Globals.rlSettings.Captchas.Timeout).GetBalance();
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case BlockCaptcha.CaptchaService.TwoCaptcha:
|
case BlockCaptcha.CaptchaService.TwoCaptcha:
|
||||||
balance = new TwoCaptcha(Globals.rlSettings.Captchas.TwoCapToken, 0).GetBalance();
|
balance = new TwoCaptcha(Globals.rlSettings.Captchas.TwoCapToken, Globals.rlSettings.Captchas.Timeout).GetBalance();
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case BlockCaptcha.CaptchaService.RuCaptcha:
|
case BlockCaptcha.CaptchaService.RuCaptcha:
|
||||||
balance = new RuCaptcha(Globals.rlSettings.Captchas.RuCapToken, 0).GetBalance();
|
balance = new RuCaptcha(Globals.rlSettings.Captchas.RuCapToken, Globals.rlSettings.Captchas.Timeout).GetBalance();
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case BlockCaptcha.CaptchaService.AZCaptcha:
|
case BlockCaptcha.CaptchaService.AZCaptcha:
|
||||||
balance = new AZCaptcha(Globals.rlSettings.Captchas.AZCapToken, 0).GetBalance();
|
balance = new AZCaptcha(Globals.rlSettings.Captchas.AZCapToken, Globals.rlSettings.Captchas.Timeout).GetBalance();
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case BlockCaptcha.CaptchaService.SolveRecaptcha:
|
case BlockCaptcha.CaptchaService.SolveRecaptcha:
|
||||||
balance = new SolveReCaptcha(Globals.rlSettings.Captchas.SRUserId, Globals.rlSettings.Captchas.SRToken, 0).GetBalance();
|
balance = new SolveReCaptcha(Globals.rlSettings.Captchas.SRUserId, Globals.rlSettings.Captchas.SRToken, Globals.rlSettings.Captchas.Timeout).GetBalance();
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case BlockCaptcha.CaptchaService.CaptchasIO:
|
case BlockCaptcha.CaptchaService.CaptchasIO:
|
||||||
balance = new CaptchasIO(Globals.rlSettings.Captchas.CIOToken, 0).GetBalance();
|
balance = new CaptchasIO(Globals.rlSettings.Captchas.CIOToken, Globals.rlSettings.Captchas.Timeout).GetBalance();
|
||||||
break;
|
break;
|
||||||
|
|
||||||
default:
|
default:
|
||||||
|
|||||||
@@ -61,39 +61,39 @@ namespace RuriLib
|
|||||||
switch (data.GlobalSettings.Captchas.CurrentService)
|
switch (data.GlobalSettings.Captchas.CurrentService)
|
||||||
{
|
{
|
||||||
case CaptchaService.ImageTypers:
|
case CaptchaService.ImageTypers:
|
||||||
Balance = new ImageTyperz(data.GlobalSettings.Captchas.ImageTypToken, 0).GetBalance();
|
Balance = new ImageTyperz(data.GlobalSettings.Captchas.ImageTypToken, data.GlobalSettings.Captchas.Timeout).GetBalance();
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case CaptchaService.AntiCaptcha:
|
case CaptchaService.AntiCaptcha:
|
||||||
Balance = new AntiCaptcha(data.GlobalSettings.Captchas.AntiCapToken, 0).GetBalance();
|
Balance = new AntiCaptcha(data.GlobalSettings.Captchas.AntiCapToken, data.GlobalSettings.Captchas.Timeout).GetBalance();
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case CaptchaService.DBC:
|
case CaptchaService.DBC:
|
||||||
Balance = new DeathByCaptcha(data.GlobalSettings.Captchas.DBCUser, data.GlobalSettings.Captchas.DBCPass, 0).GetBalance();
|
Balance = new DeathByCaptcha(data.GlobalSettings.Captchas.DBCUser, data.GlobalSettings.Captchas.DBCPass, data.GlobalSettings.Captchas.Timeout).GetBalance();
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case CaptchaService.TwoCaptcha:
|
case CaptchaService.TwoCaptcha:
|
||||||
Balance = new TwoCaptcha(data.GlobalSettings.Captchas.TwoCapToken, 0).GetBalance();
|
Balance = new TwoCaptcha(data.GlobalSettings.Captchas.TwoCapToken, data.GlobalSettings.Captchas.Timeout).GetBalance();
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case CaptchaService.RuCaptcha:
|
case CaptchaService.RuCaptcha:
|
||||||
Balance = new RuCaptcha(data.GlobalSettings.Captchas.RuCapToken, 0).GetBalance();
|
Balance = new RuCaptcha(data.GlobalSettings.Captchas.RuCapToken, data.GlobalSettings.Captchas.Timeout).GetBalance();
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case CaptchaService.DeCaptcher:
|
case CaptchaService.DeCaptcher:
|
||||||
Balance = new DeCaptcher(data.GlobalSettings.Captchas.DCUser, data.GlobalSettings.Captchas.DCPass, 0).GetBalance();
|
Balance = new DeCaptcher(data.GlobalSettings.Captchas.DCUser, data.GlobalSettings.Captchas.DCPass, data.GlobalSettings.Captchas.Timeout).GetBalance();
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case CaptchaService.AZCaptcha:
|
case CaptchaService.AZCaptcha:
|
||||||
Balance = new AZCaptcha(data.GlobalSettings.Captchas.AZCapToken, 0).GetBalance();
|
Balance = new AZCaptcha(data.GlobalSettings.Captchas.AZCapToken, data.GlobalSettings.Captchas.Timeout).GetBalance();
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case CaptchaService.SolveRecaptcha:
|
case CaptchaService.SolveRecaptcha:
|
||||||
Balance = new SolveReCaptcha(data.GlobalSettings.Captchas.SRUserId, data.GlobalSettings.Captchas.SRToken, 0).GetBalance();
|
Balance = new SolveReCaptcha(data.GlobalSettings.Captchas.SRUserId, data.GlobalSettings.Captchas.SRToken, data.GlobalSettings.Captchas.Timeout).GetBalance();
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case CaptchaService.CaptchasIO:
|
case CaptchaService.CaptchasIO:
|
||||||
Balance = new CaptchasIO(data.GlobalSettings.Captchas.CIOToken, 0).GetBalance();
|
Balance = new CaptchasIO(data.GlobalSettings.Captchas.CIOToken, data.GlobalSettings.Captchas.Timeout).GetBalance();
|
||||||
break;
|
break;
|
||||||
|
|
||||||
default:
|
default:
|
||||||
|
|||||||
@@ -28,7 +28,7 @@ namespace RuriLib.CaptchaServices
|
|||||||
using (HttpClient client = new HttpClient())
|
using (HttpClient client = new HttpClient())
|
||||||
using (MultipartFormDataContent data = new MultipartFormDataContent())
|
using (MultipartFormDataContent data = new MultipartFormDataContent())
|
||||||
{
|
{
|
||||||
client.Timeout = new TimeSpan(0, 0, Timeout);
|
client.Timeout = TimeSpan.FromSeconds(Timeout);
|
||||||
data.Add(new StringContent(User), "username");
|
data.Add(new StringContent(User), "username");
|
||||||
data.Add(new StringContent(Pass), "password");
|
data.Add(new StringContent(Pass), "password");
|
||||||
data.Add(new StringContent("balance"), "function");
|
data.Add(new StringContent("balance"), "function");
|
||||||
@@ -43,7 +43,7 @@ namespace RuriLib.CaptchaServices
|
|||||||
using (HttpClient client = new HttpClient())
|
using (HttpClient client = new HttpClient())
|
||||||
using (MultipartFormDataContent data = new MultipartFormDataContent())
|
using (MultipartFormDataContent data = new MultipartFormDataContent())
|
||||||
{
|
{
|
||||||
client.Timeout = new TimeSpan(0, 0, Timeout);
|
client.Timeout = TimeSpan.FromSeconds(Timeout);
|
||||||
data.Add(new StringContent(User), "username");
|
data.Add(new StringContent(User), "username");
|
||||||
data.Add(new StringContent(Pass), "password");
|
data.Add(new StringContent(Pass), "password");
|
||||||
data.Add(new StringContent("proxyurl"), "function");
|
data.Add(new StringContent("proxyurl"), "function");
|
||||||
@@ -61,7 +61,7 @@ namespace RuriLib.CaptchaServices
|
|||||||
using(HttpClient client = new HttpClient())
|
using(HttpClient client = new HttpClient())
|
||||||
using (MultipartFormDataContent data = new MultipartFormDataContent())
|
using (MultipartFormDataContent data = new MultipartFormDataContent())
|
||||||
{
|
{
|
||||||
client.Timeout = new TimeSpan(0, 0, Timeout);
|
client.Timeout = TimeSpan.FromSeconds(Timeout);
|
||||||
data.Add(new StringContent(User), "username");
|
data.Add(new StringContent(User), "username");
|
||||||
data.Add(new StringContent(Pass), "password");
|
data.Add(new StringContent(Pass), "password");
|
||||||
data.Add(new StringContent("picture2"), "function");
|
data.Add(new StringContent("picture2"), "function");
|
||||||
|
|||||||
Reference in New Issue
Block a user