From 216bf4b4866a8fb8c5faf53735cb186ae3198a3f Mon Sep 17 00:00:00 2001
From: JustArchi <JustArchi@JustArchi.net>
Date: Thu, 16 Nov 2017 20:33:16 +0100
Subject: [PATCH] Misc optimization

---
 ArchiSteamFarm/ArchiWebHandler.cs |  6 +++++-
 ArchiSteamFarm/Trading.cs         | 10 +---------
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/ArchiSteamFarm/ArchiWebHandler.cs b/ArchiSteamFarm/ArchiWebHandler.cs
index 48937ddca..11663bc91 100644
--- a/ArchiSteamFarm/ArchiWebHandler.cs
+++ b/ArchiSteamFarm/ArchiWebHandler.cs
@@ -221,7 +221,7 @@ namespace ArchiSteamFarm {
 			return output?.Queue;
 		}
 
-		internal async Task<HashSet<Steam.TradeOffer>> GetActiveTradeOffers() {
+		internal async Task<HashSet<Steam.TradeOffer>> GetActiveTradeOffers(IReadOnlyCollection<ulong> ignoredTradeOfferIDs = null) {
 			string steamApiKey = await GetApiKey().ConfigureAwait(false);
 			if (string.IsNullOrEmpty(steamApiKey)) {
 				return null;
@@ -302,6 +302,10 @@ namespace ArchiSteamFarm {
 					return null;
 				}
 
+				if (ignoredTradeOfferIDs?.Contains(tradeOfferID) == true) {
+					continue;
+				}
+
 				uint otherSteamID3 = trade["accountid_other"].AsUnsignedInteger();
 				if (otherSteamID3 == 0) {
 					Bot.ArchiLogger.LogNullError(nameof(otherSteamID3));
diff --git a/ArchiSteamFarm/Trading.cs b/ArchiSteamFarm/Trading.cs
index cadf631d6..3dfc39f82 100644
--- a/ArchiSteamFarm/Trading.cs
+++ b/ArchiSteamFarm/Trading.cs
@@ -136,19 +136,11 @@ namespace ArchiSteamFarm {
 		}
 
 		private async Task ParseActiveTrades() {
-			HashSet<Steam.TradeOffer> tradeOffers = await Bot.ArchiWebHandler.GetActiveTradeOffers().ConfigureAwait(false);
+			HashSet<Steam.TradeOffer> tradeOffers = await Bot.ArchiWebHandler.GetActiveTradeOffers(IgnoredTrades).ConfigureAwait(false);
 			if ((tradeOffers == null) || (tradeOffers.Count == 0)) {
 				return;
 			}
 
-			if (IgnoredTrades.Count > 0) {
-				if (tradeOffers.RemoveWhere(tradeoffer => IgnoredTrades.Contains(tradeoffer.TradeOfferID)) > 0) {
-					if (tradeOffers.Count == 0) {
-						return;
-					}
-				}
-			}
-
 			IEnumerable<Task<ParseTradeResult>> tasks = tradeOffers.Select(ParseTrade);
 			ICollection<ParseTradeResult> results;