Fix small regression caused by d0cc10f3c6

Previously I avoided that because of !loot looting entire steam EQ, but now when we loot only cards and boosters, that shouldn't be as annoying as before

ArchiSteamFarm/ArchiHandler.cs

@@ -153,8 +153,8 @@ namespace ArchiSteamFarm {
 
 					foreach (KeyValue lineItem in lineItems) {
 						uint appID = (uint) lineItem["PackageID"].AsUnsignedLong();
-						string gameName = lineItem["ItemDescription"].AsString();
-						gameName = WebUtility.UrlDecode(gameName); // Apparently steam expects client to decode sent HTML
+						string gameName = lineItem["ItemDescription"].Value;
+						gameName = WebUtility.HtmlDecode(gameName); // Apparently steam expects client to decode sent HTML
 						Items.Add(appID, gameName);
 					}
 				}

ArchiSteamFarm/ArchiWebHandler.cs

@@ -179,9 +179,11 @@ namespace ArchiSteamFarm {
 		}
 
 		internal async Task<bool?> IsLoggedIn() {
+			string request = SteamCommunityURL + "/my/profile";
+
 			HtmlDocument htmlDocument = null;
 			for (byte i = 0; i < WebBrowser.MaxRetries && htmlDocument == null; i++) {
-				htmlDocument = await WebBrowser.UrlGetToHtmlDocument(SteamCommunityURL + "/my/profile").ConfigureAwait(false);
+				htmlDocument = await WebBrowser.UrlGetToHtmlDocument(request).ConfigureAwait(false);
 			}
 
 			if (htmlDocument == null) {
@@ -461,9 +463,11 @@ namespace ArchiSteamFarm {
 
 			ushort nextPage = 0;
 			while (true) {
+				string request = SteamCommunityURL + "/my/inventory/json/" + Steam.Item.SteamAppID + "/" + Steam.Item.SteamContextID + "?trading=1&start=" + nextPage;
+
 				JObject jObject = null;
 				for (byte i = 0; i < WebBrowser.MaxRetries && jObject == null; i++) {
-					jObject = await WebBrowser.UrlGetToJObject(SteamCommunityURL + "/my/inventory/json/" + Steam.Item.SteamAppID + "/" + Steam.Item.SteamContextID + "?trading=1&start=" + nextPage).ConfigureAwait(false);
+					jObject = await WebBrowser.UrlGetToJObject(request).ConfigureAwait(false);
 				}
 
 				if (jObject == null) {
@@ -640,9 +644,11 @@ namespace ArchiSteamFarm {
 				return null;
 			}
 
+			string request = SteamCommunityURL + "/my/badges?p=" + page;
+
 			HtmlDocument htmlDocument = null;
 			for (byte i = 0; i < WebBrowser.MaxRetries && htmlDocument == null; i++) {
-				htmlDocument = await WebBrowser.UrlGetToHtmlDocument(SteamCommunityURL + "/my/badges?p=" + page).ConfigureAwait(false);
+				htmlDocument = await WebBrowser.UrlGetToHtmlDocument(request).ConfigureAwait(false);
 			}
 
 			if (htmlDocument == null) {
@@ -662,9 +668,11 @@ namespace ArchiSteamFarm {
 				return null;
 			}
 
+			string request = SteamCommunityURL + "/my/gamecards/" + appID;
+
 			HtmlDocument htmlDocument = null;
 			for (byte i = 0; i < WebBrowser.MaxRetries && htmlDocument == null; i++) {
-				htmlDocument = await WebBrowser.UrlGetToHtmlDocument(SteamCommunityURL + "/my/gamecards/" + appID).ConfigureAwait(false);
+				htmlDocument = await WebBrowser.UrlGetToHtmlDocument(request).ConfigureAwait(false);
 			}
 
 			if (htmlDocument == null) {
@@ -680,9 +688,11 @@ namespace ArchiSteamFarm {
 				return false;
 			}
 
+			string request = SteamCommunityURL + "/my/inventory";
+
 			bool result = false;
 			for (byte i = 0; i < WebBrowser.MaxRetries && !result; i++) {
-				result = await WebBrowser.UrlGet(SteamCommunityURL + "/my/inventory").ConfigureAwait(false);
+				result = await WebBrowser.UrlGet(request).ConfigureAwait(false);
 			}
 
 			if (!result) {

ArchiSteamFarm/Bot.cs

@@ -295,8 +295,8 @@ namespace ArchiSteamFarm {
 			return true;
 		}
 
-		internal async Task OnFarmingFinished(bool farmedSomething) {
-			if (farmedSomething && BotConfig.SendOnFarmingFinished) {
+		internal async Task OnFarmingFinished() {
+			if (BotConfig.SendOnFarmingFinished) {
 				await ResponseSendTrade(BotConfig.SteamMasterID).ConfigureAwait(false);
 			}
 
@@ -310,11 +310,11 @@ namespace ArchiSteamFarm {
 				return null;
 			}
 
-			if (!message.StartsWith("!")) {
+			if (message[0] != '!') {
 				return await ResponseRedeem(steamID, message.Replace(",", Environment.NewLine), true).ConfigureAwait(false);
 			}
 
-			if (!message.Contains(" ")) {
+			if (message.IndexOf(' ') < 0) {
 				switch (message) {
 					case "!2fa":
 						return Response2FA(steamID);
@@ -350,7 +350,7 @@ namespace ArchiSteamFarm {
 						return ResponseUnknown(steamID);
 				}
 			} else {
-				string[] args = message.Split(' ');
+				string[] args = message.Split((char[]) null, StringSplitOptions.RemoveEmptyEntries);
 				switch (args[0]) {
 					case "!2fa":
 						return Response2FA(steamID, args[1]);
@@ -410,8 +410,8 @@ namespace ArchiSteamFarm {
 				Task.Run(() => HandleCallbacks()).Forget();
 			}
 
-			// 2FA tokens are expiring soon, use limiter only when we don't have any pending
-			if (TwoFactorCode == null) {
+			// 2FA tokens are expiring soon, use limiter only when user is providing one
+			if (TwoFactorCode == null || BotDatabase.SteamGuardAccount != null) {
 				await Program.LimitSteamRequestsAsync().ConfigureAwait(false);
 			}
 
@@ -1422,8 +1422,8 @@ namespace ArchiSteamFarm {
 
 			Logging.LogGenericInfo("Reconnecting...", BotName);
 
-			// 2FA tokens are expiring soon, use limiter only when we don't have any pending
-			if (TwoFactorCode == null) {
+			// 2FA tokens are expiring soon, use limiter only when user is providing one
+			if (TwoFactorCode == null || BotDatabase.SteamGuardAccount != null) {
 				await Program.LimitSteamRequestsAsync().ConfigureAwait(false);
 			}
 

ArchiSteamFarm/CardsFarmer.cs

@@ -94,7 +94,7 @@ namespace ArchiSteamFarm {
 			if (!await IsAnythingToFarm().ConfigureAwait(false)) {
 				Semaphore.Release(); // We have nothing to do, don't forget to release semaphore
 				Logging.LogGenericInfo("We don't have anything to farm on this account!", Bot.BotName);
-				await Bot.OnFarmingFinished(false).ConfigureAwait(false);
+				await Bot.OnFarmingFinished().ConfigureAwait(false);
 				return;
 			}
 
@@ -102,8 +102,6 @@ namespace ArchiSteamFarm {
 			NowFarming = true;
 			Semaphore.Release(); // From this point we allow other calls to shut us down
 
-			bool farmedSomething = false;
-
 			do {
 				// Now the algorithm used for farming depends on whether account is restricted or not
 				if (Bot.BotConfig.CardDropsRestricted) { // If we have restricted card drops, we use complex algorithm
@@ -114,7 +112,6 @@ namespace ArchiSteamFarm {
 							while (gamesToFarmSolo.Count > 0) {
 								uint appID = gamesToFarmSolo.First();
 								if (await FarmSolo(appID).ConfigureAwait(false)) {
-									farmedSomething = true;
 									gamesToFarmSolo.Remove(appID);
 									gamesToFarmSolo.TrimExcess();
 								} else {
@@ -135,9 +132,7 @@ namespace ArchiSteamFarm {
 					Logging.LogGenericInfo("Chosen farming algorithm: Simple", Bot.BotName);
 					while (GamesToFarm.Count > 0) {
 						uint appID = GamesToFarm.Keys.FirstOrDefault();
-						if (await FarmSolo(appID).ConfigureAwait(false)) {
-							farmedSomething = true;
-						} else {
+						if (!await FarmSolo(appID).ConfigureAwait(false)) {
 							NowFarming = false;
 							return;
 						}
@@ -150,7 +145,7 @@ namespace ArchiSteamFarm {
 			NowFarming = false;
 
 			Logging.LogGenericInfo("Farming finished!", Bot.BotName);
-			await Bot.OnFarmingFinished(farmedSomething).ConfigureAwait(false);
+			await Bot.OnFarmingFinished().ConfigureAwait(false);
 		}
 
 		internal async Task StopFarming() {

ArchiSteamFarm/JSON/Steam.cs

@@ -110,7 +110,7 @@ namespace ArchiSteamFarm {
 			}
 
 			[JsonProperty(PropertyName = "id", Required = Required.DisallowNull)]
-			internal string id {
+			internal string ID {
 				get { return AssetIDString; }
 				set { AssetIDString = value; }
 			}
@@ -249,81 +249,77 @@ namespace ArchiSteamFarm {
 				}
 			}
 
-			internal bool IsSteamCardsOnlyTrade {
-				get {
-					foreach (Item item in ItemsToGive) {
-						if (item.AppID != Item.SteamAppID || item.ContextID != Item.SteamContextID || (item.Type != Item.EType.FoilTradingCard && item.Type != Item.EType.TradingCard)) {
-							return false;
-						}
+			internal bool IsSteamCardsOnlyTrade() {
+				foreach (Item item in ItemsToGive) {
+					if (item.AppID != Item.SteamAppID || item.ContextID != Item.SteamContextID || (item.Type != Item.EType.FoilTradingCard && item.Type != Item.EType.TradingCard)) {
+						return false;
 					}
-
-					foreach (Item item in ItemsToReceive) {
-						if (item.AppID != Item.SteamAppID || item.ContextID != Item.SteamContextID || (item.Type != Item.EType.FoilTradingCard && item.Type != Item.EType.TradingCard)) {
-							return false;
-						}
-					}
-
-					return true;
 				}
+
+				foreach (Item item in ItemsToReceive) {
+					if (item.AppID != Item.SteamAppID || item.ContextID != Item.SteamContextID || (item.Type != Item.EType.FoilTradingCard && item.Type != Item.EType.TradingCard)) {
+						return false;
+					}
+				}
+
+				return true;
 			}
 
-			internal bool IsPotentiallyDupesTrade {
-				get {
-					Dictionary<uint, Dictionary<Item.EType, uint>> ItemsToGivePerGame = new Dictionary<uint, Dictionary<Item.EType, uint>>();
-					foreach (Item item in ItemsToGive) {
-						Dictionary<Item.EType, uint> ItemsPerType;
-						if (!ItemsToGivePerGame.TryGetValue(item.RealAppID, out ItemsPerType)) {
-							ItemsPerType = new Dictionary<Item.EType, uint>();
-							ItemsPerType[item.Type] = item.Amount;
-							ItemsToGivePerGame[item.RealAppID] = ItemsPerType;
+			internal bool IsPotentiallyDupesTrade() {
+				Dictionary<uint, Dictionary<Item.EType, uint>> ItemsToGivePerGame = new Dictionary<uint, Dictionary<Item.EType, uint>>();
+				foreach (Item item in ItemsToGive) {
+					Dictionary<Item.EType, uint> ItemsPerType;
+					if (!ItemsToGivePerGame.TryGetValue(item.RealAppID, out ItemsPerType)) {
+						ItemsPerType = new Dictionary<Item.EType, uint>();
+						ItemsPerType[item.Type] = item.Amount;
+						ItemsToGivePerGame[item.RealAppID] = ItemsPerType;
+					} else {
+						uint amount;
+						if (ItemsPerType.TryGetValue(item.Type, out amount)) {
+							ItemsPerType[item.Type] = amount + item.Amount;
 						} else {
-							uint amount;
-							if (ItemsPerType.TryGetValue(item.Type, out amount)) {
-								ItemsPerType[item.Type] = amount + item.Amount;
-							} else {
-								ItemsPerType[item.Type] = item.Amount;
-							}
+							ItemsPerType[item.Type] = item.Amount;
 						}
 					}
+				}
 
-					Dictionary<uint, Dictionary<Item.EType, uint>> ItemsToReceivePerGame = new Dictionary<uint, Dictionary<Item.EType, uint>>();
-					foreach (Item item in ItemsToReceive) {
-						Dictionary<Item.EType, uint> ItemsPerType;
-						if (!ItemsToReceivePerGame.TryGetValue(item.RealAppID, out ItemsPerType)) {
-							ItemsPerType = new Dictionary<Item.EType, uint>();
-							ItemsPerType[item.Type] = item.Amount;
-							ItemsToReceivePerGame[item.RealAppID] = ItemsPerType;
+				Dictionary<uint, Dictionary<Item.EType, uint>> ItemsToReceivePerGame = new Dictionary<uint, Dictionary<Item.EType, uint>>();
+				foreach (Item item in ItemsToReceive) {
+					Dictionary<Item.EType, uint> ItemsPerType;
+					if (!ItemsToReceivePerGame.TryGetValue(item.RealAppID, out ItemsPerType)) {
+						ItemsPerType = new Dictionary<Item.EType, uint>();
+						ItemsPerType[item.Type] = item.Amount;
+						ItemsToReceivePerGame[item.RealAppID] = ItemsPerType;
+					} else {
+						uint amount;
+						if (ItemsPerType.TryGetValue(item.Type, out amount)) {
+							ItemsPerType[item.Type] = amount + item.Amount;
 						} else {
-							uint amount;
-							if (ItemsPerType.TryGetValue(item.Type, out amount)) {
-								ItemsPerType[item.Type] = amount + item.Amount;
-							} else {
-								ItemsPerType[item.Type] = item.Amount;
-							}
+							ItemsPerType[item.Type] = item.Amount;
 						}
 					}
+				}
 
-					// Ensure that amount per type and per game matches
-					foreach (KeyValuePair<uint, Dictionary<Item.EType, uint>> ItemsPerGame in ItemsToGivePerGame) {
-						Dictionary<Item.EType, uint> otherItemsPerType;
-						if (!ItemsToReceivePerGame.TryGetValue(ItemsPerGame.Key, out otherItemsPerType)) {
+				// Ensure that amount per type and per game matches
+				foreach (KeyValuePair<uint, Dictionary<Item.EType, uint>> ItemsPerGame in ItemsToGivePerGame) {
+					Dictionary<Item.EType, uint> otherItemsPerType;
+					if (!ItemsToReceivePerGame.TryGetValue(ItemsPerGame.Key, out otherItemsPerType)) {
+						return false;
+					}
+
+					foreach (KeyValuePair<Item.EType, uint> ItemsPerType in ItemsPerGame.Value) {
+						uint otherAmount;
+						if (!otherItemsPerType.TryGetValue(ItemsPerType.Key, out otherAmount)) {
 							return false;
 						}
 
-						foreach (KeyValuePair<Item.EType, uint> ItemsPerType in ItemsPerGame.Value) {
-							uint otherAmount;
-							if (!otherItemsPerType.TryGetValue(ItemsPerType.Key, out otherAmount)) {
-								return false;
-							}
-
-							if (ItemsPerType.Value != otherAmount) {
-								return false;
-							}
+						if (ItemsPerType.Value != otherAmount) {
+							return false;
 						}
 					}
-
-					return true;
 				}
+
+				return true;
 			}
 		}
 

ArchiSteamFarm/Properties/AssemblyInfo.cs

@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.0.3.8")]
-[assembly: AssemblyFileVersion("2.0.3.8")]
+[assembly: AssemblyVersion("2.0.4.0")]
+[assembly: AssemblyFileVersion("2.0.4.0")]

ArchiSteamFarm/Trading.cs

@@ -154,7 +154,7 @@ namespace ArchiSteamFarm {
 			}
 
 			// Rule 2 - We always trade steam cards and only for the same set
-			if (!tradeOffer.IsSteamCardsOnlyTrade || !tradeOffer.IsPotentiallyDupesTrade) {
+			if (!tradeOffer.IsSteamCardsOnlyTrade() || !tradeOffer.IsPotentiallyDupesTrade()) {
 				return false;
 			}
 

ArchiSteamFarm/Utilities.cs

@@ -33,6 +33,10 @@ namespace ArchiSteamFarm {
 		internal static void Forget(this Task task) { }
 
 		internal static Task ForEachAsync<T>(this IEnumerable<T> sequence, Func<T, Task> action) {
+			if (action == null) {
+				return Task.FromResult(true);
+			}
+
 			return Task.WhenAll(sequence.Select(action));
 		}
 

ArchiSteamFarm/WebBrowser.cs

@@ -141,10 +141,8 @@ namespace ArchiSteamFarm {
 				return null;
 			}
 
-			content = WebUtility.HtmlDecode(content);
 			HtmlDocument htmlDocument = new HtmlDocument();
-			htmlDocument.LoadHtml(content);
-
+			htmlDocument.LoadHtml(WebUtility.HtmlDecode(content));
 			return htmlDocument;
 		}
 
@@ -239,15 +237,17 @@ namespace ArchiSteamFarm {
 				}
 			}
 
-			if (responseMessage == null || !responseMessage.IsSuccessStatusCode) {
+			if (responseMessage == null) {
+				return null;
+			}
+
+			if (!responseMessage.IsSuccessStatusCode) {
 				if (Debugging.IsDebugBuild || Program.GlobalConfig.Debug) {
 					Logging.LogGenericError("Request: " + request + " failed!", Identifier);
-					if (responseMessage != null) {
-						Logging.LogGenericError("Status code: " + responseMessage.StatusCode, Identifier);
-						Logging.LogGenericError("Content: " + Environment.NewLine + await responseMessage.Content.ReadAsStringAsync().ConfigureAwait(false), Identifier);
-						responseMessage.Dispose();
-					}
+					Logging.LogGenericError("Status code: " + responseMessage.StatusCode, Identifier);
+					Logging.LogGenericError("Content: " + Environment.NewLine + await responseMessage.Content.ReadAsStringAsync().ConfigureAwait(false), Identifier);
 				}
+				responseMessage.Dispose();
 				return null;
 			}