From 400b19d19091d47f1d8cd37fae2bcee965f3e157 Mon Sep 17 00:00:00 2001 From: JustArchi Date: Mon, 4 Jan 2021 17:59:59 +0100 Subject: [PATCH] Further remove restrictions --- ArchiSteamFarm/ArchiWebHandler.cs | 8 ++++---- ArchiSteamFarm/WebBrowser.cs | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/ArchiSteamFarm/ArchiWebHandler.cs b/ArchiSteamFarm/ArchiWebHandler.cs index 9dcbd6097..d7c089bf6 100644 --- a/ArchiSteamFarm/ArchiWebHandler.cs +++ b/ArchiSteamFarm/ArchiWebHandler.cs @@ -565,7 +565,7 @@ namespace ArchiSteamFarm { } [PublicAPI] - public async Task?> UrlGetToJsonObjectWithSession(string host, string request, IReadOnlyCollection>? headers = null, string? referer = null, WebBrowser.ERequestOptions requestOptions = WebBrowser.ERequestOptions.None, bool checkSessionPreemptively = true, byte maxTries = WebBrowser.MaxTries) where T : class { + public async Task?> UrlGetToJsonObjectWithSession(string host, string request, IReadOnlyCollection>? headers = null, string? referer = null, WebBrowser.ERequestOptions requestOptions = WebBrowser.ERequestOptions.None, bool checkSessionPreemptively = true, byte maxTries = WebBrowser.MaxTries) { if (string.IsNullOrEmpty(host)) { throw new ArgumentNullException(nameof(host)); } @@ -908,7 +908,7 @@ namespace ArchiSteamFarm { } [PublicAPI] - public async Task?> UrlPostToJsonObjectWithSession(string host, string request, IReadOnlyCollection>? headers = null, IDictionary? data = null, string? referer = null, WebBrowser.ERequestOptions requestOptions = WebBrowser.ERequestOptions.None, ESession session = ESession.Lowercase, bool checkSessionPreemptively = true, byte maxTries = WebBrowser.MaxTries) where T : class { + public async Task?> UrlPostToJsonObjectWithSession(string host, string request, IReadOnlyCollection>? headers = null, IDictionary? data = null, string? referer = null, WebBrowser.ERequestOptions requestOptions = WebBrowser.ERequestOptions.None, ESession session = ESession.Lowercase, bool checkSessionPreemptively = true, byte maxTries = WebBrowser.MaxTries) { if (string.IsNullOrEmpty(host)) { throw new ArgumentNullException(nameof(host)); } @@ -1014,7 +1014,7 @@ namespace ArchiSteamFarm { } [PublicAPI] - public async Task?> UrlPostToJsonObjectWithSession(string host, string request, IReadOnlyCollection>? headers = null, ICollection>? data = null, string? referer = null, WebBrowser.ERequestOptions requestOptions = WebBrowser.ERequestOptions.None, ESession session = ESession.Lowercase, bool checkSessionPreemptively = true, byte maxTries = WebBrowser.MaxTries) where T : class { + public async Task?> UrlPostToJsonObjectWithSession(string host, string request, IReadOnlyCollection>? headers = null, ICollection>? data = null, string? referer = null, WebBrowser.ERequestOptions requestOptions = WebBrowser.ERequestOptions.None, ESession session = ESession.Lowercase, bool checkSessionPreemptively = true, byte maxTries = WebBrowser.MaxTries) { if (string.IsNullOrEmpty(host)) { throw new ArgumentNullException(nameof(host)); } @@ -1229,7 +1229,7 @@ namespace ArchiSteamFarm { } [PublicAPI] - public static async Task WebLimitRequest(string service, Func> function) where T : class { + public static async Task WebLimitRequest(string service, Func> function) { if (string.IsNullOrEmpty(service)) { throw new ArgumentNullException(nameof(service)); } diff --git a/ArchiSteamFarm/WebBrowser.cs b/ArchiSteamFarm/WebBrowser.cs index a9f0d908c..01993b7bb 100644 --- a/ArchiSteamFarm/WebBrowser.cs +++ b/ArchiSteamFarm/WebBrowser.cs @@ -248,7 +248,7 @@ namespace ArchiSteamFarm { } [PublicAPI] - public async Task?> UrlGetToJsonObject(string request, IReadOnlyCollection>? headers = null, string? referer = null, ERequestOptions requestOptions = ERequestOptions.None, byte maxTries = MaxTries) where T : class { + public async Task?> UrlGetToJsonObject(string request, IReadOnlyCollection>? headers = null, string? referer = null, ERequestOptions requestOptions = ERequestOptions.None, byte maxTries = MaxTries) { if (string.IsNullOrEmpty(request)) { throw new ArgumentNullException(nameof(request)); } @@ -287,7 +287,7 @@ namespace ArchiSteamFarm { obj = serializer.Deserialize(jsonReader); - if (obj == null) { + if (obj is null) { ArchiLogger.LogGenericWarning(string.Format(CultureInfo.CurrentCulture, Strings.ErrorIsEmpty, nameof(obj))); continue; @@ -580,7 +580,7 @@ namespace ArchiSteamFarm { } [PublicAPI] - public async Task?> UrlPostToJsonObject(string request, IReadOnlyCollection>? headers = null, TData? data = null, string? referer = null, ERequestOptions requestOptions = ERequestOptions.None, byte maxTries = MaxTries) where TResult : class where TData : class { + public async Task?> UrlPostToJsonObject(string request, IReadOnlyCollection>? headers = null, TData? data = null, string? referer = null, ERequestOptions requestOptions = ERequestOptions.None, byte maxTries = MaxTries) where TData : class { if (string.IsNullOrEmpty(request)) { throw new ArgumentNullException(nameof(request)); } @@ -618,7 +618,7 @@ namespace ArchiSteamFarm { obj = serializer.Deserialize(jsonReader); - if (obj == null) { + if (obj is null) { ArchiLogger.LogGenericWarning(string.Format(CultureInfo.CurrentCulture, Strings.ErrorIsEmpty, nameof(obj))); continue;