diff --git a/ArchiSteamFarm/ArchiWebHandler.cs b/ArchiSteamFarm/ArchiWebHandler.cs index 11683ee60..e82df00cc 100644 --- a/ArchiSteamFarm/ArchiWebHandler.cs +++ b/ArchiSteamFarm/ArchiWebHandler.cs @@ -58,8 +58,6 @@ namespace ArchiSteamFarm { if (!string.IsNullOrEmpty(apiKey) && !apiKey.Equals("null")) { ApiKey = apiKey; - } else { - ApiKey = null; } } @@ -143,7 +141,7 @@ namespace ArchiSteamFarm { setCookie = setCookie.Substring(0, setCookie.IndexOf(';')); SteamCookieDictionary.Add("steamparental", setCookie); break; - } + } } } else { Logging.LogGenericInfo(Bot.BotName, "Failed!"); diff --git a/ArchiSteamFarm/Utilities.cs b/ArchiSteamFarm/Utilities.cs index 2378eba54..b226bb20f 100644 --- a/ArchiSteamFarm/Utilities.cs +++ b/ArchiSteamFarm/Utilities.cs @@ -48,35 +48,39 @@ namespace ArchiSteamFarm { return 0; } - ulong result = ulong.Parse(resultString, CultureInfo.InvariantCulture); - return result; + return ulong.Parse(resultString, CultureInfo.InvariantCulture); } internal static async Task UrlToHttpResponse(string websiteAddress, Dictionary cookieVariables = null) { + if (string.IsNullOrEmpty(websiteAddress)) { + return null; + } + HttpResponseMessage result = null; - if (!string.IsNullOrEmpty(websiteAddress)) { - try { - using (HttpClientHandler clientHandler = new HttpClientHandler { UseCookies = false }) { - using (HttpClient client = new HttpClient(clientHandler)) { - client.Timeout = TimeSpan.FromSeconds(10); - HttpRequestMessage requestMessage = new HttpRequestMessage(HttpMethod.Get, websiteAddress); - if (cookieVariables != null) { - StringBuilder cookie = new StringBuilder(); - foreach (KeyValuePair cookieVariable in cookieVariables) { - cookie.Append(cookieVariable.Key + "=" + cookieVariable.Value + ";"); - } - requestMessage.Headers.Add("Cookie", cookie.ToString()); - } - HttpResponseMessage responseMessage = await client.SendAsync(requestMessage).ConfigureAwait(false); - if (responseMessage != null) { - responseMessage.EnsureSuccessStatusCode(); - result = responseMessage; + + try { + using (HttpClientHandler clientHandler = new HttpClientHandler { UseCookies = false }) { + using (HttpClient client = new HttpClient(clientHandler)) { + client.Timeout = TimeSpan.FromSeconds(10); + HttpRequestMessage requestMessage = new HttpRequestMessage(HttpMethod.Get, websiteAddress); + if (cookieVariables != null) { + StringBuilder cookie = new StringBuilder(); + foreach (KeyValuePair cookieVariable in cookieVariables) { + cookie.Append(cookieVariable.Key + "=" + cookieVariable.Value + ";"); } + requestMessage.Headers.Add("Cookie", cookie.ToString()); + } + HttpResponseMessage responseMessage = await client.SendAsync(requestMessage).ConfigureAwait(false); + if (responseMessage != null) { + responseMessage.EnsureSuccessStatusCode(); + result = responseMessage; } } - } catch { } + } catch (Exception e) { + Logging.LogGenericException("Utilities", e); } + return result; } @@ -85,83 +89,98 @@ namespace ArchiSteamFarm { } internal static async Task UrlToHtmlDocument(string websiteAddress, Dictionary cookieVariables = null) { - HtmlDocument result = null; - if (!string.IsNullOrEmpty(websiteAddress)) { - try { - HttpResponseMessage responseMessage = await UrlToHttpResponse(websiteAddress, cookieVariables).ConfigureAwait(false); - if (responseMessage != null) { - string source = await responseMessage.Content.ReadAsStringAsync().ConfigureAwait(false); - if (!string.IsNullOrEmpty(source)) { - source = WebUtility.HtmlDecode(source); - result = new HtmlDocument(); - result.LoadHtml(source); - } - } - } catch { - } + if (string.IsNullOrEmpty(websiteAddress)) { + return null; } + + HtmlDocument result = null; + + try { + HttpResponseMessage responseMessage = await UrlToHttpResponse(websiteAddress, cookieVariables).ConfigureAwait(false); + if (responseMessage != null) { + string source = await responseMessage.Content.ReadAsStringAsync().ConfigureAwait(false); + if (!string.IsNullOrEmpty(source)) { + source = WebUtility.HtmlDecode(source); + result = new HtmlDocument(); + result.LoadHtml(source); + } + } + } catch (Exception e) { + Logging.LogGenericException("Utilities", e); + } + return result; } internal static async Task UrlPostRequest(string request, Dictionary postData, Dictionary cookieVariables = null, string referer = null) { + if (string.IsNullOrEmpty(request) || postData == null) { + return false; + } + bool result = false; - if (!string.IsNullOrEmpty(request)) { - try { - using (HttpClientHandler clientHandler = new HttpClientHandler { UseCookies = false }) { - using (HttpClient client = new HttpClient(clientHandler)) { - client.Timeout = TimeSpan.FromSeconds(15); - HttpRequestMessage requestMessage = new HttpRequestMessage(HttpMethod.Post, request); - requestMessage.Content = new FormUrlEncodedContent(postData); - if (cookieVariables != null && cookieVariables.Count > 0) { - StringBuilder cookie = new StringBuilder(); - foreach (KeyValuePair cookieVariable in cookieVariables) { - cookie.Append(cookieVariable.Key + "=" + cookieVariable.Value + ";"); - } - requestMessage.Headers.Add("Cookie", cookie.ToString()); - } - if (referer != null) { - requestMessage.Headers.Referrer = new Uri(referer); - } - HttpResponseMessage responseMessage = await client.SendAsync(requestMessage).ConfigureAwait(false); - if (responseMessage != null) { - result = responseMessage.IsSuccessStatusCode; + + try { + using (HttpClientHandler clientHandler = new HttpClientHandler { UseCookies = false }) { + using (HttpClient client = new HttpClient(clientHandler)) { + client.Timeout = TimeSpan.FromSeconds(15); + HttpRequestMessage requestMessage = new HttpRequestMessage(HttpMethod.Post, request); + requestMessage.Content = new FormUrlEncodedContent(postData); + if (cookieVariables != null && cookieVariables.Count > 0) { + StringBuilder cookie = new StringBuilder(); + foreach (KeyValuePair cookieVariable in cookieVariables) { + cookie.Append(cookieVariable.Key + "=" + cookieVariable.Value + ";"); } + requestMessage.Headers.Add("Cookie", cookie.ToString()); + } + if (referer != null) { + requestMessage.Headers.Referrer = new Uri(referer); + } + HttpResponseMessage responseMessage = await client.SendAsync(requestMessage).ConfigureAwait(false); + if (responseMessage != null) { + result = responseMessage.IsSuccessStatusCode; } } - } catch { } + } catch (Exception e) { + Logging.LogGenericException("Utilities", e); } + return result; } internal static async Task UrlPostRequestWithResponse(string request, Dictionary postData, Dictionary cookieVariables = null, string referer = null) { + if (string.IsNullOrEmpty(request) || postData == null) { + return null; + } + HttpResponseMessage result = null; - if (!string.IsNullOrEmpty(request)) { - try { - using (HttpClientHandler clientHandler = new HttpClientHandler { UseCookies = false }) { - using (HttpClient client = new HttpClient(clientHandler)) { - client.Timeout = TimeSpan.FromSeconds(10); - HttpRequestMessage requestMessage = new HttpRequestMessage(HttpMethod.Post, request); - requestMessage.Content = new FormUrlEncodedContent(postData); - if (cookieVariables != null && cookieVariables.Count > 0) { - StringBuilder cookie = new StringBuilder(); - foreach (KeyValuePair cookieVariable in cookieVariables) { - cookie.Append(cookieVariable.Key + "=" + cookieVariable.Value + ";"); - } - requestMessage.Headers.Add("Cookie", cookie.ToString()); + + try { + using (HttpClientHandler clientHandler = new HttpClientHandler { UseCookies = false }) { + using (HttpClient client = new HttpClient(clientHandler)) { + client.Timeout = TimeSpan.FromSeconds(10); + HttpRequestMessage requestMessage = new HttpRequestMessage(HttpMethod.Post, request); + requestMessage.Content = new FormUrlEncodedContent(postData); + if (cookieVariables != null && cookieVariables.Count > 0) { + StringBuilder cookie = new StringBuilder(); + foreach (KeyValuePair cookieVariable in cookieVariables) { + cookie.Append(cookieVariable.Key + "=" + cookieVariable.Value + ";"); } - if (referer != null) { - requestMessage.Headers.Referrer = new Uri(referer); - } - HttpResponseMessage responseMessage = await client.SendAsync(requestMessage).ConfigureAwait(false); - if (responseMessage != null && responseMessage.IsSuccessStatusCode) { - result = responseMessage; - } + requestMessage.Headers.Add("Cookie", cookie.ToString()); + } + if (referer != null) { + requestMessage.Headers.Referrer = new Uri(referer); + } + HttpResponseMessage responseMessage = await client.SendAsync(requestMessage).ConfigureAwait(false); + if (responseMessage != null && responseMessage.IsSuccessStatusCode) { + result = responseMessage; } } - } catch { } + } catch (Exception e) { + Logging.LogGenericException("Utilities", e); } + return result; } }