From 299f2ef9348fa678f6568eece1b53faba886f730 Mon Sep 17 00:00:00 2001
From: Archi <JustArchi@JustArchi.net>
Date: Sun, 30 May 2021 17:05:43 +0200
Subject: [PATCH] Close V5.1.0 release with one more breaking change

Technically I don't agree with R# about EResultResponse, neither the roslyn analyzers, but I also don't see a reason why it couldn't be just ResultResponse as suggested.
---
 ArchiSteamFarm/Steam/Data/AccessTokenResponse.cs            | 2 +-
 ArchiSteamFarm/Steam/Data/InventoryResponse.cs              | 2 +-
 ArchiSteamFarm/Steam/Data/RedeemWalletResponse.cs           | 2 +-
 .../Steam/Data/{EResultResponse.cs => ResultResponse.cs}    | 5 ++---
 ArchiSteamFarm/Steam/Integration/ArchiWebHandler.cs         | 6 +++---
 5 files changed, 8 insertions(+), 9 deletions(-)
 rename ArchiSteamFarm/Steam/Data/{EResultResponse.cs => ResultResponse.cs} (92%)

diff --git a/ArchiSteamFarm/Steam/Data/AccessTokenResponse.cs b/ArchiSteamFarm/Steam/Data/AccessTokenResponse.cs
index c5eef3ebe..f36f30ed1 100644
--- a/ArchiSteamFarm/Steam/Data/AccessTokenResponse.cs
+++ b/ArchiSteamFarm/Steam/Data/AccessTokenResponse.cs
@@ -24,7 +24,7 @@ using Newtonsoft.Json;
 
 namespace ArchiSteamFarm.Steam.Data {
 	[SuppressMessage("ReSharper", "ClassCannotBeInstantiated")]
-	internal sealed class AccessTokenResponse : EResultResponse {
+	internal sealed class AccessTokenResponse : ResultResponse {
 		[JsonProperty(PropertyName = "data", Required = Required.Always)]
 		internal readonly AccessTokenData Data = new();
 
diff --git a/ArchiSteamFarm/Steam/Data/InventoryResponse.cs b/ArchiSteamFarm/Steam/Data/InventoryResponse.cs
index d862ea484..a1d5b2fc6 100644
--- a/ArchiSteamFarm/Steam/Data/InventoryResponse.cs
+++ b/ArchiSteamFarm/Steam/Data/InventoryResponse.cs
@@ -32,7 +32,7 @@ using Newtonsoft.Json.Linq;
 
 namespace ArchiSteamFarm.Steam.Data {
 	[SuppressMessage("ReSharper", "ClassCannotBeInstantiated")]
-	internal sealed class InventoryResponse : EResultResponse {
+	internal sealed class InventoryResponse : ResultResponse {
 		[JsonProperty(PropertyName = "assets", Required = Required.DisallowNull)]
 		internal readonly ImmutableHashSet<Asset> Assets = ImmutableHashSet<Asset>.Empty;
 
diff --git a/ArchiSteamFarm/Steam/Data/RedeemWalletResponse.cs b/ArchiSteamFarm/Steam/Data/RedeemWalletResponse.cs
index 8c0c94afc..bd084dec1 100644
--- a/ArchiSteamFarm/Steam/Data/RedeemWalletResponse.cs
+++ b/ArchiSteamFarm/Steam/Data/RedeemWalletResponse.cs
@@ -25,7 +25,7 @@ using SteamKit2;
 
 namespace ArchiSteamFarm.Steam.Data {
 	[SuppressMessage("ReSharper", "ClassCannotBeInstantiated")]
-	internal sealed class RedeemWalletResponse : EResultResponse {
+	internal sealed class RedeemWalletResponse : ResultResponse {
 		[JsonProperty(PropertyName = "detail", Required = Required.DisallowNull)]
 		internal readonly EPurchaseResultDetail PurchaseResultDetail;
 
diff --git a/ArchiSteamFarm/Steam/Data/EResultResponse.cs b/ArchiSteamFarm/Steam/Data/ResultResponse.cs
similarity index 92%
rename from ArchiSteamFarm/Steam/Data/EResultResponse.cs
rename to ArchiSteamFarm/Steam/Data/ResultResponse.cs
index 2cd7b5477..fb7dbab46 100644
--- a/ArchiSteamFarm/Steam/Data/EResultResponse.cs
+++ b/ArchiSteamFarm/Steam/Data/ResultResponse.cs
@@ -27,12 +27,11 @@ using SteamKit2;
 namespace ArchiSteamFarm.Steam.Data {
 	[PublicAPI]
 	[SuppressMessage("ReSharper", "ClassCannotBeInstantiated")]
-	[SuppressMessage("ReSharper", "InconsistentNaming")]
-	public class EResultResponse {
+	public class ResultResponse {
 		[JsonProperty(PropertyName = "success", Required = Required.Always)]
 		public EResult Result { get; private set; }
 
 		[JsonConstructor]
-		protected EResultResponse() { }
+		protected ResultResponse() { }
 	}
 }
diff --git a/ArchiSteamFarm/Steam/Integration/ArchiWebHandler.cs b/ArchiSteamFarm/Steam/Integration/ArchiWebHandler.cs
index 533c42463..e3c2f0080 100644
--- a/ArchiSteamFarm/Steam/Integration/ArchiWebHandler.cs
+++ b/ArchiSteamFarm/Steam/Integration/ArchiWebHandler.cs
@@ -1359,7 +1359,7 @@ namespace ArchiSteamFarm.Steam.Integration {
 				{ "giftcardid", giftCardID.ToString(CultureInfo.InvariantCulture) }
 			};
 
-			ObjectResponse<EResultResponse>? response = await UrlPostToJsonObjectWithSession<EResultResponse>(request, data: data).ConfigureAwait(false);
+			ObjectResponse<ResultResponse>? response = await UrlPostToJsonObjectWithSession<ResultResponse>(request, data: data).ConfigureAwait(false);
 
 			if (response == null) {
 				return false;
@@ -1454,7 +1454,7 @@ namespace ArchiSteamFarm.Steam.Integration {
 				{ "Privacy", JsonConvert.SerializeObject(userPrivacy.Settings) }
 			};
 
-			ObjectResponse<EResultResponse>? response = await UrlPostToJsonObjectWithSession<EResultResponse>(request, data: data).ConfigureAwait(false);
+			ObjectResponse<ResultResponse>? response = await UrlPostToJsonObjectWithSession<ResultResponse>(request, data: data).ConfigureAwait(false);
 
 			if (response == null) {
 				return false;
@@ -2418,7 +2418,7 @@ namespace ArchiSteamFarm.Steam.Integration {
 				{ "communityitemid", itemID.ToString(CultureInfo.InvariantCulture) }
 			};
 
-			ObjectResponse<EResultResponse>? response = await UrlPostToJsonObjectWithSession<EResultResponse>(request, data: data).ConfigureAwait(false);
+			ObjectResponse<ResultResponse>? response = await UrlPostToJsonObjectWithSession<ResultResponse>(request, data: data).ConfigureAwait(false);
 
 			return response?.Content.Result == EResult.OK;
 		}