diff --git a/ArchiSteamFarm/ArchiWebHandler.cs b/ArchiSteamFarm/ArchiWebHandler.cs index b94197446..fee6a8a7d 100644 --- a/ArchiSteamFarm/ArchiWebHandler.cs +++ b/ArchiSteamFarm/ArchiWebHandler.cs @@ -310,7 +310,7 @@ namespace ArchiSteamFarm { return null; } - string request = SteamCommunityURL + "/mobileconf/details/" + confirmation.ID + "?p=" + deviceID + "&a=" + SteamID + "&k=" + WebUtility.UrlEncode(confirmationHash) + "&t=" + time + "&m=android&tag=conf"; + string request = SteamCommunityURL + "/mobileconf/details/" + confirmation.ID + "?l=english&p=" + deviceID + "&a=" + SteamID + "&k=" + WebUtility.UrlEncode(confirmationHash) + "&t=" + time + "&m=android&tag=conf"; string json = await WebBrowser.UrlGetToContentRetry(request).ConfigureAwait(false); if (string.IsNullOrEmpty(json)) { @@ -710,18 +710,18 @@ namespace ArchiSteamFarm { return false; } - internal async Task> GetMyInventory(bool tradable) { + internal async Task> GetMySteamInventory(bool tradable) { if (!await RefreshSessionIfNeeded().ConfigureAwait(false)) { return null; } HashSet result = new HashSet(); + string request = SteamCommunityURL + "/my/inventory/json/" + Steam.Item.SteamAppID + "/" + Steam.Item.SteamContextID + "?l=english&trading=" + (tradable ? "1" : "0") + "&start="; uint currentPage = 0; - while (true) { - string request = SteamCommunityURL + "/my/inventory/json/" + Steam.Item.SteamAppID + "/" + Steam.Item.SteamContextID + "?trading=" + (tradable ? "1" : "0") + "&start=" + currentPage; - JObject jObject = await WebBrowser.UrlGetToJObjectRetry(request).ConfigureAwait(false); + while (true) { + JObject jObject = await WebBrowser.UrlGetToJObjectRetry(request + currentPage).ConfigureAwait(false); IEnumerable descriptions = jObject?.SelectTokens("$.rgDescriptions.*"); if (descriptions == null) { diff --git a/ArchiSteamFarm/Bot.cs b/ArchiSteamFarm/Bot.cs index 7fecf28b3..e65664d08 100755 --- a/ArchiSteamFarm/Bot.cs +++ b/ArchiSteamFarm/Bot.cs @@ -694,7 +694,7 @@ namespace ArchiSteamFarm { await Trading.LimitInventoryRequestsAsync().ConfigureAwait(false); - HashSet inventory = await ArchiWebHandler.GetMyInventory(true).ConfigureAwait(false); + HashSet inventory = await ArchiWebHandler.GetMySteamInventory(true).ConfigureAwait(false); if ((inventory == null) || (inventory.Count == 0)) { return "Nothing to send, inventory seems empty!"; } diff --git a/ArchiSteamFarm/Trading.cs b/ArchiSteamFarm/Trading.cs index 6da41e033..1033af6da 100644 --- a/ArchiSteamFarm/Trading.cs +++ b/ArchiSteamFarm/Trading.cs @@ -205,7 +205,7 @@ namespace ArchiSteamFarm { // Now check if it's worth for us to do the trade await LimitInventoryRequestsAsync().ConfigureAwait(false); - HashSet inventory = await Bot.ArchiWebHandler.GetMyInventory(false).ConfigureAwait(false); + HashSet inventory = await Bot.ArchiWebHandler.GetMySteamInventory(false).ConfigureAwait(false); if ((inventory == null) || (inventory.Count == 0)) { return ParseTradeResult.AcceptedWithItemLose; // OK, assume that this trade is valid, we can't check our EQ }