diff --git a/ArchiSteamFarm/ArchiWebHandler.cs b/ArchiSteamFarm/ArchiWebHandler.cs index ba6f887c5..14fb6df91 100644 --- a/ArchiSteamFarm/ArchiWebHandler.cs +++ b/ArchiSteamFarm/ArchiWebHandler.cs @@ -662,37 +662,38 @@ namespace ArchiSteamFarm { return result; } - internal async Task AcceptTradeOffer(ulong tradeID) { + internal async Task AcceptTradeOffer(ulong tradeID) { if (tradeID == 0) { Logging.LogNullError(nameof(tradeID), Bot.BotName); - return false; + return; } if (!await RefreshSessionIfNeeded().ConfigureAwait(false)) { - return false; + return; } string sessionID = WebBrowser.CookieContainer.GetCookieValue(SteamCommunityURL, "sessionid"); if (string.IsNullOrEmpty(sessionID)) { Logging.LogNullError(nameof(sessionID), Bot.BotName); - return false; + return; } string referer = SteamCommunityURL + "/tradeoffer/" + tradeID; string request = referer + "/accept"; + Dictionary data = new Dictionary(3) { { "sessionid", sessionID }, { "serverid", "1" }, { "tradeofferid", tradeID.ToString() } }; - return await WebBrowser.UrlPostRetry(request, data, referer).ConfigureAwait(false); + await WebBrowser.UrlPostRetry(request, data, referer).ConfigureAwait(false); } - internal bool DeclineTradeOffer(ulong tradeID) { + internal void DeclineTradeOffer(ulong tradeID) { if ((tradeID == 0) || string.IsNullOrEmpty(Bot.BotConfig.SteamApiKey)) { Logging.LogNullError(nameof(tradeID) + " || " + nameof(Bot.BotConfig.SteamApiKey), Bot.BotName); - return false; + return; } KeyValue response = null; @@ -712,12 +713,9 @@ namespace ArchiSteamFarm { } } - if (response != null) { - return true; + if (response == null) { + Logging.LogGenericWarning("Request failed even after " + WebBrowser.MaxRetries + " tries", Bot.BotName); } - - Logging.LogGenericWarning("Request failed even after " + WebBrowser.MaxRetries + " tries", Bot.BotName); - return false; } internal async Task> GetMySteamInventory(bool tradable) { diff --git a/ArchiSteamFarm/Trading.cs b/ArchiSteamFarm/Trading.cs index 9d6fdaf23..74b34a555 100644 --- a/ArchiSteamFarm/Trading.cs +++ b/ArchiSteamFarm/Trading.cs @@ -152,23 +152,25 @@ namespace ArchiSteamFarm { case ParseTradeResult.EResult.AcceptedWithItemLose: case ParseTradeResult.EResult.AcceptedWithoutItemLose: Logging.LogGenericInfo("Accepting trade: " + tradeOffer.TradeOfferID, Bot.BotName); - return await Bot.ArchiWebHandler.AcceptTradeOffer(tradeOffer.TradeOfferID).ConfigureAwait(false) ? result : null; + await Bot.ArchiWebHandler.AcceptTradeOffer(tradeOffer.TradeOfferID).ConfigureAwait(false); + break; case ParseTradeResult.EResult.RejectedPermanently: case ParseTradeResult.EResult.RejectedTemporarily: if (result.Result == ParseTradeResult.EResult.RejectedPermanently) { if (Bot.BotConfig.IsBotAccount) { Logging.LogGenericInfo("Rejecting trade: " + tradeOffer.TradeOfferID, Bot.BotName); - return Bot.ArchiWebHandler.DeclineTradeOffer(tradeOffer.TradeOfferID) ? result : null; + Bot.ArchiWebHandler.DeclineTradeOffer(tradeOffer.TradeOfferID); + break; } IgnoredTrades.Add(tradeOffer.TradeOfferID); } Logging.LogGenericInfo("Ignoring trade: " + tradeOffer.TradeOfferID, Bot.BotName); - return result; - default: - return result; + break; } + + return result; } private async Task ShouldAcceptTrade(Steam.TradeOffer tradeOffer) {