From 4555baefcd1ce3e9046b666101b1c39f4b64170d Mon Sep 17 00:00:00 2001 From: JustArchi Date: Sat, 10 Mar 2018 12:52:23 +0100 Subject: [PATCH] ArchiBoT/ASF code unification --- ArchiSteamFarm/ArchiWebHandler.cs | 6 +++--- ArchiSteamFarm/WebBrowser.cs | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ArchiSteamFarm/ArchiWebHandler.cs b/ArchiSteamFarm/ArchiWebHandler.cs index da46035c6..8810692c6 100644 --- a/ArchiSteamFarm/ArchiWebHandler.cs +++ b/ArchiSteamFarm/ArchiWebHandler.cs @@ -1425,7 +1425,7 @@ namespace ArchiSteamFarm { return await UrlGetToHtmlDocumentWithSession(host, request, --maxTries).ConfigureAwait(false); } - private async Task UrlGetToJsonObjectWithSession(string host, string request, byte maxTries = WebBrowser.MaxTries) { + private async Task UrlGetToJsonObjectWithSession(string host, string request, byte maxTries = WebBrowser.MaxTries) where T : class { if (string.IsNullOrEmpty(host) || string.IsNullOrEmpty(request)) { Bot.ArchiLogger.LogNullError(nameof(host) + " || " + nameof(request)); return default; @@ -1630,7 +1630,7 @@ namespace ArchiSteamFarm { return await UrlPostToHtmlDocumentWithSession(host, request, data, referer, session, --maxTries).ConfigureAwait(false); } - private async Task UrlPostToJsonObjectWithSession(string host, string request, Dictionary data = null, string referer = null, ESession session = ESession.Lowercase, byte maxTries = WebBrowser.MaxTries) { + private async Task UrlPostToJsonObjectWithSession(string host, string request, Dictionary data = null, string referer = null, ESession session = ESession.Lowercase, byte maxTries = WebBrowser.MaxTries) where T : class { if (string.IsNullOrEmpty(host) || string.IsNullOrEmpty(request)) { Bot.ArchiLogger.LogNullError(nameof(host) + " || " + nameof(request)); return default; @@ -1703,7 +1703,7 @@ namespace ArchiSteamFarm { return await UrlPostToJsonObjectWithSession(host, request, data, referer, session, --maxTries).ConfigureAwait(false); } - private async Task UrlPostToJsonObjectWithSession(string host, string request, List> data = null, string referer = null, ESession session = ESession.Lowercase, byte maxTries = WebBrowser.MaxTries) { + private async Task UrlPostToJsonObjectWithSession(string host, string request, List> data = null, string referer = null, ESession session = ESession.Lowercase, byte maxTries = WebBrowser.MaxTries) where T : class { if (string.IsNullOrEmpty(host) || string.IsNullOrEmpty(request)) { Bot.ArchiLogger.LogNullError(nameof(host) + " || " + nameof(request)); return default; diff --git a/ArchiSteamFarm/WebBrowser.cs b/ArchiSteamFarm/WebBrowser.cs index 708f8264d..5e768cfbe 100644 --- a/ArchiSteamFarm/WebBrowser.cs +++ b/ArchiSteamFarm/WebBrowser.cs @@ -167,7 +167,7 @@ namespace ArchiSteamFarm { return response != null ? new HtmlDocumentResponse(response) : null; } - internal async Task> UrlGetToJsonObject(string request, string referer = null, byte maxTries = MaxTries) { + internal async Task> UrlGetToJsonObject(string request, string referer = null, byte maxTries = MaxTries) where T : class { if (string.IsNullOrEmpty(request) || (maxTries == 0)) { ArchiLogger.LogNullError(nameof(request) + " || " + nameof(maxTries)); return null; @@ -276,7 +276,7 @@ namespace ArchiSteamFarm { return response != null ? new HtmlDocumentResponse(response) : null; } - internal async Task> UrlPostToJsonObject(string request, IReadOnlyCollection> data = null, string referer = null, byte maxTries = MaxTries) { + internal async Task> UrlPostToJsonObject(string request, IReadOnlyCollection> data = null, string referer = null, byte maxTries = MaxTries) where T : class { if (string.IsNullOrEmpty(request) || (maxTries == 0)) { ArchiLogger.LogNullError(nameof(request) + " || " + nameof(maxTries)); return null;