Fix !2faok with many confirmations

This reverts commit 4e5ddefac9.

I didn't like the new format.

ArchiSteamFarm/ArchiWebHandler.cs

@@ -47,6 +47,8 @@ namespace ArchiSteamFarm {
 		private readonly SemaphoreSlim SessionSemaphore = new SemaphoreSlim(1);
 		private readonly WebBrowser WebBrowser;
 
+		internal bool Ready { get; private set; }
+
 		private ulong SteamID;
 		private DateTime LastSessionRefreshCheck = DateTime.MinValue;
 
@@ -67,12 +69,7 @@ namespace ArchiSteamFarm {
 			}
 
 			uint appID;
-			if (uint.TryParse(hashName.Substring(0, index), out appID)) {
-				return appID;
-			}
-
-			Logging.LogNullError(nameof(appID));
-			return 0;
+			return uint.TryParse(hashName.Substring(0, index), out appID) ? appID : 0;
 		}
 
 		private static Steam.Item.EType GetItemType(string name) {
@@ -117,7 +114,9 @@ namespace ArchiSteamFarm {
 			WebBrowser = new WebBrowser(bot.BotName);
 		}
 
-		internal bool Init(SteamClient steamClient, string webAPIUserNonce, string parentalPin) {
+		internal void OnDisconnected() => Ready = false;
+
+		internal async Task<bool> Init(SteamClient steamClient, string webAPIUserNonce, string parentalPin) {
 			if ((steamClient == null) || string.IsNullOrEmpty(webAPIUserNonce)) {
 				Logging.LogNullError(nameof(steamClient) + " || " + nameof(webAPIUserNonce), Bot.BotName);
 				return false;
@@ -171,7 +170,6 @@ namespace ArchiSteamFarm {
 
 			Logging.LogGenericInfo("Success!", Bot.BotName);
 
-			WebBrowser.CookieContainer.Add(new Cookie("steamid", SteamID.ToString(), "/", "." + SteamCommunityHost)); // TODO: Check if needed for mobile auth
 			WebBrowser.CookieContainer.Add(new Cookie("sessionid", sessionID, "/", "." + SteamCommunityHost));
 
 			string steamLogin = authResult["token"].Value;
@@ -180,10 +178,12 @@ namespace ArchiSteamFarm {
 			string steamLoginSecure = authResult["tokensecure"].Value;
 			WebBrowser.CookieContainer.Add(new Cookie("steamLoginSecure", steamLoginSecure, "/", "." + SteamCommunityHost));
 
-			if (!UnlockParentalAccount(parentalPin).Result) {
+			// Unlock Steam Parental if needed
+			if (!await UnlockParentalAccount(parentalPin).ConfigureAwait(false)) {
 				return false;
 			}
 
+			Ready = true;
 			LastSessionRefreshCheck = DateTime.Now;
 			return true;
 		}
@@ -239,7 +239,7 @@ namespace ArchiSteamFarm {
 
 		internal async Task<HtmlDocument> GetConfirmations(string deviceID, string confirmationHash, uint time) {
 			if (string.IsNullOrEmpty(deviceID) || string.IsNullOrEmpty(confirmationHash) || (time == 0)) {
-				Logging.LogNullError(nameof(deviceID) + " || " + nameof(confirmationHash) + " || " + nameof(time));
+				Logging.LogNullError(nameof(deviceID) + " || " + nameof(confirmationHash) + " || " + nameof(time), Bot.BotName);
 				return null;
 			}
 
@@ -247,7 +247,7 @@ namespace ArchiSteamFarm {
 				return null;
 			}
 
-			string request = SteamCommunityURL + "/mobileconf/conf?p=" + deviceID + "&a=" + SteamID + "&k=" + WebUtility.UrlEncode(confirmationHash) + "&t=" + time + "&m=android&tag=conf";
+			string request = SteamCommunityURL + "/mobileconf/conf?l=english&p=" + deviceID + "&a=" + SteamID + "&k=" + WebUtility.UrlEncode(confirmationHash) + "&t=" + time + "&m=android&tag=conf";
 			return await WebBrowser.UrlGetToHtmlDocumentRetry(request).ConfigureAwait(false);
 		}
 
@@ -257,6 +257,10 @@ namespace ArchiSteamFarm {
 				return null;
 			}
 
+			if (!await RefreshSessionIfNeeded().ConfigureAwait(false)) {
+				return null;
+			}
+
 			string request = SteamCommunityURL + "/mobileconf/details/" + confirmationID + "?p=" + deviceID + "&a=" + SteamID + "&k=" + WebUtility.UrlEncode(confirmationHash) + "&t=" + time + "&m=android&tag=conf";
 
 			string json = await WebBrowser.UrlGetToContentRetry(request).ConfigureAwait(false);
@@ -273,12 +277,13 @@ namespace ArchiSteamFarm {
 				return null;
 			}
 
-			if (response != null) {
-				return response;
+			if (response == null) {
+				Logging.LogNullError(nameof(response), Bot.BotName);
+				return null;
 			}
 
-			Logging.LogNullError(nameof(response), Bot.BotName);
-			return null;
+			response.ConfirmationID = confirmationID;
+			return response;
 		}
 
 		internal async Task<bool> HandleConfirmation(string deviceID, string confirmationHash, uint time, uint confirmationID, ulong confirmationKey, bool accept) {
@@ -287,6 +292,10 @@ namespace ArchiSteamFarm {
 				return false;
 			}
 
+			if (!await RefreshSessionIfNeeded().ConfigureAwait(false)) {
+				return false;
+			}
+
 			string request = SteamCommunityURL + "/mobileconf/ajaxop?op=" + (accept ? "allow" : "cancel") + "&p=" + deviceID + "&a=" + SteamID + "&k=" + WebUtility.UrlEncode(confirmationHash) + "&t=" + time + "&m=android&tag=conf&cid=" + confirmationID + "&ck=" + confirmationKey;
 
 			string json = await WebBrowser.UrlGetToContentRetry(request).ConfigureAwait(false);
@@ -386,7 +395,7 @@ namespace ArchiSteamFarm {
 			foreach (KeyValue game in response["games"].Children) {
 				uint appID = (uint) game["appid"].AsUnsignedLong();
 				if (appID == 0) {
-					Logging.LogNullError(nameof(appID));
+					Logging.LogNullError(nameof(appID), Bot.BotName);
 					continue;
 				}
 
@@ -398,7 +407,7 @@ namespace ArchiSteamFarm {
 
 		internal uint GetServerTime() {
 			KeyValue response = null;
-			using (dynamic iTwoFactorService = WebAPI.GetInterface("ITwoFactorService", Bot.BotConfig.SteamApiKey)) {
+			using (dynamic iTwoFactorService = WebAPI.GetInterface("ITwoFactorService")) {
 				iTwoFactorService.Timeout = Timeout;
 
 				for (byte i = 0; (i < WebBrowser.MaxRetries) && (response == null); i++) {
@@ -427,7 +436,7 @@ namespace ArchiSteamFarm {
 				return null;
 			}
 
-			string request = SteamCommunityURL + "/tradeoffer/" + tradeID;
+			string request = SteamCommunityURL + "/tradeoffer/" + tradeID + "?l=english";
 
 			HtmlDocument htmlDocument = await WebBrowser.UrlGetToHtmlDocumentRetry(request).ConfigureAwait(false);
 			if (htmlDocument == null) {
@@ -829,7 +838,7 @@ namespace ArchiSteamFarm {
 				return null;
 			}
 
-			string request = SteamCommunityURL + "/my/badges?p=" + page;
+			string request = SteamCommunityURL + "/my/badges?l=english&p=" + page;
 
 			return await WebBrowser.UrlGetToHtmlDocumentRetry(request).ConfigureAwait(false);
 		}
@@ -844,7 +853,7 @@ namespace ArchiSteamFarm {
 				return null;
 			}
 
-			string request = SteamCommunityURL + "/my/gamecards/" + appID;
+			string request = SteamCommunityURL + "/my/gamecards/" + appID + "?l=english";
 
 			return await WebBrowser.UrlGetToHtmlDocumentRetry(request).ConfigureAwait(false);
 		}

ArchiSteamFarm/Bot.cs

@@ -151,10 +151,10 @@ namespace ArchiSteamFarm {
 
 			// TODO: Converter code will be removed soon
 			if (BotDatabase.SteamGuardAccount != null) {
-				Logging.LogGenericWarning("Converting old ASF 2FA V2.0 format into new ASF 2FA V2.1 format...");
+				Logging.LogGenericWarning("Converting old ASF 2FA V2.0 format into new ASF 2FA V2.1 format...", botName);
 				BotDatabase.MobileAuthenticator = MobileAuthenticator.LoadFromSteamGuardAccount(BotDatabase.SteamGuardAccount);
-				Logging.LogGenericInfo("Done! If you didn't make a copy of your revocation code yet, then it's a good moment to do so: " + BotDatabase.SteamGuardAccount.RevocationCode);
-				Logging.LogGenericWarning("ASF will not keep this code anymore!");
+				Logging.LogGenericInfo("Done! If you didn't make a copy of your revocation code yet, then it's a good moment to do so: " + BotDatabase.SteamGuardAccount.RevocationCode, botName);
+				Logging.LogGenericWarning("ASF will not keep this code anymore!", botName);
 				BotDatabase.SteamGuardAccount = null;
 			}
 
@@ -252,7 +252,7 @@ namespace ArchiSteamFarm {
 			}
 
 			if (acceptedType != Steam.ConfirmationDetails.EType.Unknown) {
-				if (confirmations.RemoveWhere(confirmation => confirmation.Type != acceptedType) > 0) {
+				if (confirmations.RemoveWhere(confirmation => (confirmation.Type != acceptedType) && (confirmation.Type != Steam.ConfirmationDetails.EType.Other)) > 0) {
 					confirmations.TrimExcess();
 					if (confirmations.Count == 0) {
 						return;
@@ -261,34 +261,32 @@ namespace ArchiSteamFarm {
 			}
 
 			if ((acceptedSteamID != 0) || ((acceptedTradeIDs != null) && (acceptedTradeIDs.Count > 0))) {
-				HashSet<MobileAuthenticator.Confirmation> ignoredConfirmations = new HashSet<MobileAuthenticator.Confirmation>();
-				// TODO: This could be potentially multi-threaded like below
-				foreach (MobileAuthenticator.Confirmation confirmation in confirmations) {
-					Steam.ConfirmationDetails details = await BotDatabase.MobileAuthenticator.GetConfirmationDetails(confirmation).ConfigureAwait(false);
-					if (details == null) {
-						ignoredConfirmations.Add(confirmation);
-						continue;
-					}
+				List<Task<Steam.ConfirmationDetails>> tasks = confirmations.Select(BotDatabase.MobileAuthenticator.GetConfirmationDetails).ToList();
+				Steam.ConfirmationDetails[] detailsResults = await Task.WhenAll(tasks).ConfigureAwait(false);
 
-					if ((acceptedSteamID != 0) && (acceptedSteamID != details.OtherSteamID64)) {
-						ignoredConfirmations.Add(confirmation);
-						continue;
-					}
-
-					if ((acceptedTradeIDs != null) && !acceptedTradeIDs.Contains(details.TradeOfferID)) {
-						ignoredConfirmations.Add(confirmation);
-					}
+				HashSet<uint> ignoredConfirmationIDs = new HashSet<uint>();
+				foreach (Steam.ConfirmationDetails details in detailsResults.Where(details => (details != null) && (
+					((acceptedSteamID != 0) && (details.OtherSteamID64 != 0) && (acceptedSteamID != details.OtherSteamID64)) ||
+					((acceptedTradeIDs != null) && (details.TradeOfferID != 0) && !acceptedTradeIDs.Contains(details.TradeOfferID))
+				))) {
+					ignoredConfirmationIDs.Add(details.ConfirmationID);
 				}
 
-				confirmations.ExceptWith(ignoredConfirmations);
-				confirmations.TrimExcess();
-
-				if (confirmations.Count == 0) {
-					return;
+				if (ignoredConfirmationIDs.Count > 0) {
+					if (confirmations.RemoveWhere(confirmation => ignoredConfirmationIDs.Contains(confirmation.ID)) > 0) {
+						confirmations.TrimExcess();
+						if (confirmations.Count == 0) {
+							return;
+						}
+					}
 				}
 			}
 
-			await confirmations.ForEachAsync(async confirmation => await BotDatabase.MobileAuthenticator.HandleConfirmation(confirmation, accept).ConfigureAwait(false)).ConfigureAwait(false);
+			// This could be done in parallel, but for some reason Steam allows only one confirmation being accepted at the time
+			// Therefore, even though no physical barrier stops us from doing so, we execute this synchronously
+			foreach (MobileAuthenticator.Confirmation confirmation in confirmations) {
+				await BotDatabase.MobileAuthenticator.HandleConfirmation(confirmation, accept).ConfigureAwait(false);
+			}
 		}
 
 		internal async Task<bool> RefreshSession() {
@@ -311,7 +309,7 @@ namespace ArchiSteamFarm {
 				return false;
 			}
 
-			if (ArchiWebHandler.Init(SteamClient, callback.Nonce, BotConfig.SteamParentalPIN)) {
+			if (await ArchiWebHandler.Init(SteamClient, callback.Nonce, BotConfig.SteamParentalPIN).ConfigureAwait(false)) {
 				return true;
 			}
 
@@ -365,9 +363,11 @@ namespace ArchiSteamFarm {
 					case "!loot":
 						return await ResponseSendTrade(steamID).ConfigureAwait(false);
 					case "!pause":
-						return await ResponsePause(steamID).ConfigureAwait(false);
+						return await ResponsePause(steamID, true).ConfigureAwait(false);
 					case "!rejoinchat":
 						return ResponseRejoinChat(steamID);
+					case "!resume":
+						return await ResponsePause(steamID, false).ConfigureAwait(false);
 					case "!restart":
 						return ResponseRestart(steamID);
 					case "!status":
@@ -410,7 +410,7 @@ namespace ArchiSteamFarm {
 
 					return await ResponseOwns(steamID, BotName, args[1]).ConfigureAwait(false);
 				case "!pause":
-					return await ResponsePause(steamID, args[1]).ConfigureAwait(false);
+					return await ResponsePause(steamID, args[1], true).ConfigureAwait(false);
 				case "!play":
 					if (args.Length > 2) {
 						return await ResponsePlay(steamID, args[1], args[2]).ConfigureAwait(false);
@@ -423,6 +423,8 @@ namespace ArchiSteamFarm {
 					}
 
 					return await ResponseRedeem(steamID, BotName, args[1], false).ConfigureAwait(false);
+				case "!resume":
+					return await ResponsePause(steamID, args[1], false).ConfigureAwait(false);
 				case "!start":
 					return await ResponseStart(steamID, args[1]).ConfigureAwait(false);
 				case "!status":
@@ -485,7 +487,7 @@ namespace ArchiSteamFarm {
 			}
 
 			if (BotDatabase.MobileAuthenticator == null) {
-				Logging.LogNullError(nameof(BotDatabase.MobileAuthenticator));
+				Logging.LogNullError(nameof(BotDatabase.MobileAuthenticator), BotName);
 				return;
 			}
 
@@ -505,9 +507,9 @@ namespace ArchiSteamFarm {
 			Logging.LogGenericInfo("Successfully finished importing mobile authenticator!", BotName);
 		}
 
-		private async Task<string> ResponsePause(ulong steamID) {
+		private async Task<string> ResponsePause(ulong steamID, bool pause) {
 			if (steamID == 0) {
-				Logging.LogNullError(nameof(steamID));
+				Logging.LogNullError(nameof(steamID), BotName);
 				return null;
 			}
 
@@ -515,16 +517,24 @@ namespace ArchiSteamFarm {
 				return null;
 			}
 
-			if (CardsFarmer.ManualMode) {
-				await CardsFarmer.SwitchToManualMode(false).ConfigureAwait(false);
-				return "Automatic farming is enabled again!";
+			if (pause) {
+				if (CardsFarmer.ManualMode) {
+					return "Automatic farming is stopped already!";
+				}
+
+				await CardsFarmer.SwitchToManualMode(true).ConfigureAwait(false);
+				return "Automatic farming is now stopped!";
 			}
 
-			await CardsFarmer.SwitchToManualMode(true).ConfigureAwait(false);
-			return "Automatic farming is now stopped!";
+			if (!CardsFarmer.ManualMode) {
+				return "Automatic farming is enabled already!";
+			}
+
+			await CardsFarmer.SwitchToManualMode(false).ConfigureAwait(false);
+			return "Automatic farming is now enabled!";
 		}
 
-		private static async Task<string> ResponsePause(ulong steamID, string botName) {
+		private static async Task<string> ResponsePause(ulong steamID, string botName, bool pause) {
 			if ((steamID == 0) || string.IsNullOrEmpty(botName)) {
 				Logging.LogNullError(nameof(steamID) + " || " + nameof(botName));
 				return null;
@@ -532,7 +542,7 @@ namespace ArchiSteamFarm {
 
 			Bot bot;
 			if (Bots.TryGetValue(botName, out bot)) {
-				return await bot.ResponsePause(steamID).ConfigureAwait(false);
+				return await bot.ResponsePause(steamID, pause).ConfigureAwait(false);
 			}
 
 			if (IsOwner(steamID)) {
@@ -544,7 +554,7 @@ namespace ArchiSteamFarm {
 
 		private string ResponseStatus(ulong steamID) {
 			if (steamID == 0) {
-				Logging.LogNullError(nameof(steamID));
+				Logging.LogNullError(nameof(steamID), BotName);
 				return null;
 			}
 
@@ -615,7 +625,7 @@ namespace ArchiSteamFarm {
 
 		private async Task<string> ResponseSendTrade(ulong steamID) {
 			if (steamID == 0) {
-				Logging.LogNullError(nameof(steamID));
+				Logging.LogNullError(nameof(steamID), BotName);
 				return null;
 			}
 
@@ -674,7 +684,7 @@ namespace ArchiSteamFarm {
 
 		private async Task<string> Response2FA(ulong steamID) {
 			if (steamID == 0) {
-				Logging.LogNullError(nameof(steamID));
+				Logging.LogNullError(nameof(steamID), BotName);
 				return null;
 			}
 
@@ -710,7 +720,7 @@ namespace ArchiSteamFarm {
 
 		private async Task<string> Response2FAConfirm(ulong steamID, bool confirm) {
 			if (steamID == 0) {
-				Logging.LogNullError(nameof(steamID));
+				Logging.LogNullError(nameof(steamID), BotName);
 				return null;
 			}
 
@@ -765,7 +775,7 @@ namespace ArchiSteamFarm {
 
 		private async Task<string> ResponseFarm(ulong steamID) {
 			if (steamID == 0) {
-				Logging.LogNullError(nameof(steamID));
+				Logging.LogNullError(nameof(steamID), BotName);
 				return null;
 			}
 
@@ -802,7 +812,7 @@ namespace ArchiSteamFarm {
 
 		private string ResponseHelp(ulong steamID) {
 			if (steamID == 0) {
-				Logging.LogNullError(nameof(steamID));
+				Logging.LogNullError(nameof(steamID), BotName);
 				return null;
 			}
 
@@ -815,7 +825,7 @@ namespace ArchiSteamFarm {
 
 		private async Task<string> ResponseRedeem(ulong steamID, string message, bool validate) {
 			if ((steamID == 0) || string.IsNullOrEmpty(message)) {
-				Logging.LogNullError(nameof(steamID) + " || " + nameof(message));
+				Logging.LogNullError(nameof(steamID) + " || " + nameof(message), BotName);
 				return null;
 			}
 
@@ -967,7 +977,7 @@ namespace ArchiSteamFarm {
 
 		private async Task<string> ResponseAddLicense(ulong steamID, ICollection<uint> gameIDs) {
 			if ((steamID == 0) || (gameIDs == null) || (gameIDs.Count == 0)) {
-				Logging.LogNullError(nameof(steamID) + " || " + nameof(gameIDs) + " || " + nameof(gameIDs.Count));
+				Logging.LogNullError(nameof(steamID) + " || " + nameof(gameIDs) + " || " + nameof(gameIDs.Count), BotName);
 				return null;
 			}
 
@@ -1024,7 +1034,7 @@ namespace ArchiSteamFarm {
 
 		private async Task<string> ResponseOwns(ulong steamID, string query) {
 			if ((steamID == 0) || string.IsNullOrEmpty(query)) {
-				Logging.LogNullError(nameof(steamID) + " || " + nameof(query));
+				Logging.LogNullError(nameof(steamID) + " || " + nameof(query), BotName);
 				return null;
 			}
 
@@ -1093,7 +1103,7 @@ namespace ArchiSteamFarm {
 
 		private async Task<string> ResponsePlay(ulong steamID, HashSet<uint> gameIDs) {
 			if ((steamID == 0) || (gameIDs == null) || (gameIDs.Count == 0)) {
-				Logging.LogNullError(nameof(steamID) + " || " + nameof(gameIDs) + " || " + nameof(gameIDs.Count));
+				Logging.LogNullError(nameof(steamID) + " || " + nameof(gameIDs) + " || " + nameof(gameIDs.Count), BotName);
 				return null;
 			}
 
@@ -1154,7 +1164,7 @@ namespace ArchiSteamFarm {
 
 		private async Task<string> ResponseStart(ulong steamID) {
 			if (steamID == 0) {
-				Logging.LogNullError(nameof(steamID));
+				Logging.LogNullError(nameof(steamID), BotName);
 				return null;
 			}
 
@@ -1191,7 +1201,7 @@ namespace ArchiSteamFarm {
 
 		private string ResponseStop(ulong steamID) {
 			if (steamID == 0) {
-				Logging.LogNullError(nameof(steamID));
+				Logging.LogNullError(nameof(steamID), BotName);
 				return null;
 			}
 
@@ -1250,7 +1260,7 @@ namespace ArchiSteamFarm {
 
 		private string ResponseVersion(ulong steamID) {
 			if (steamID == 0) {
-				Logging.LogNullError(nameof(steamID));
+				Logging.LogNullError(nameof(steamID), BotName);
 				return null;
 			}
 
@@ -1457,6 +1467,7 @@ namespace ArchiSteamFarm {
 				return;
 			}
 
+			ArchiWebHandler.OnDisconnected();
 			Logging.LogGenericInfo("Disconnected from Steam!", BotName);
 
 			FirstTradeSent = false;
@@ -1508,6 +1519,14 @@ namespace ArchiSteamFarm {
 				return;
 			}
 
+			for (byte i = 0; (i < Program.GlobalConfig.HttpTimeout) && !ArchiWebHandler.Ready; i++) {
+				await Task.Delay(1000).ConfigureAwait(false);
+			}
+
+			if (!ArchiWebHandler.Ready) {
+				return;
+			}
+
 			bool acceptedSomething = false;
 			foreach (ulong gid in callback.GuestPasses.Select(guestPass => guestPass["gid"].AsUnsignedLong()).Where(gid => gid != 0)) {
 				Logging.LogGenericInfo("Accepting gift: " + gid + "...", BotName);
@@ -1703,7 +1722,7 @@ namespace ArchiSteamFarm {
 						}
 					}
 
-					if (!ArchiWebHandler.Init(SteamClient, callback.WebAPIUserNonce, BotConfig.SteamParentalPIN)) {
+					if (!await ArchiWebHandler.Init(SteamClient, callback.WebAPIUserNonce, BotConfig.SteamParentalPIN).ConfigureAwait(false)) {
 						if (!await RefreshSession().ConfigureAwait(false)) {
 							return;
 						}
@@ -1840,7 +1859,7 @@ namespace ArchiSteamFarm {
 
 		private void OnPlayingSessionState(ArchiHandler.PlayingSessionStateCallback callback) {
 			if (callback == null) {
-				Logging.LogNullError(nameof(callback));
+				Logging.LogNullError(nameof(callback), BotName);
 				return;
 			}
 

ArchiSteamFarm/CardsFarmer.cs

@@ -102,7 +102,7 @@ namespace ArchiSteamFarm {
 
 			// This is the last moment for final check if we can farm
 			if (Bot.PlayingBlocked) {
-				Logging.LogGenericInfo("But account is currently occupied, so farming is stopped!");
+				Logging.LogGenericInfo("But account is currently occupied, so farming is stopped!", Bot.BotName);
 				FarmingSemaphore.Release(); // We have nothing to do, don't forget to release semaphore
 				return;
 			}
@@ -377,12 +377,29 @@ namespace ArchiSteamFarm {
 			}
 
 			HtmlNode htmlNode = htmlDocument.DocumentNode.SelectSingleNode("//span[@class='progress_info_bold']");
-			if (htmlNode != null) {
-				return !htmlNode.InnerText.Contains("No card drops");
+			if (htmlNode == null) {
+				Logging.LogNullError(nameof(htmlNode), Bot.BotName);
+				return null;
 			}
 
-			Logging.LogNullError(nameof(htmlNode), Bot.BotName);
-			return null;
+			string progress = htmlNode.InnerText;
+			if (string.IsNullOrEmpty(progress)) {
+				Logging.LogNullError(nameof(progress), Bot.BotName);
+				return null;
+			}
+
+			byte cardsRemaining = 0;
+
+			Match match = Regex.Match(progress, @"\d+");
+			if (match.Success) {
+				if (!byte.TryParse(match.Value, out cardsRemaining)) {
+					Logging.LogNullError(nameof(cardsRemaining), Bot.BotName);
+					return null;
+				}
+			}
+
+			Logging.LogGenericInfo("Status for " + appID + ": " + cardsRemaining + " cards remaining", Bot.BotName);
+			return cardsRemaining > 0;
 		}
 
 		private bool FarmMultiple() {

ArchiSteamFarm/JSON/Steam.cs

@@ -348,6 +348,8 @@ namespace ArchiSteamFarm.JSON {
 				Other
 			}
 
+			internal uint ConfirmationID { get; set; }
+
 			[JsonProperty(PropertyName = "success", Required = Required.Always)]
 			internal bool Success { get; private set; }
 
@@ -359,7 +361,6 @@ namespace ArchiSteamFarm.JSON {
 					}
 
 					if (HtmlDocument == null) {
-						Logging.LogNullError(nameof(HtmlDocument));
 						return EType.Unknown;
 					}
 
@@ -387,12 +388,7 @@ namespace ArchiSteamFarm.JSON {
 						return _TradeOfferID;
 					}
 
-					if (Type != EType.Trade) {
-						return 0;
-					}
-
-					if (HtmlDocument == null) {
-						Logging.LogNullError(nameof(HtmlDocument));
+					if ((Type != EType.Trade) || (HtmlDocument == null)) {
 						return 0;
 					}
 
@@ -437,12 +433,7 @@ namespace ArchiSteamFarm.JSON {
 						return _OtherSteamID64;
 					}
 
-					if (Type != EType.Trade) {
-						return 0;
-					}
-
-					if (OtherSteamID3 == 0) {
-						Logging.LogNullError(nameof(OtherSteamID3));
+					if ((Type != EType.Trade) || (OtherSteamID3 == 0)) {
 						return 0;
 					}
 
@@ -451,8 +442,10 @@ namespace ArchiSteamFarm.JSON {
 				}
 			}
 
-			[JsonProperty(PropertyName = "html", Required = Required.Always)]
+#pragma warning disable 649
+			[JsonProperty(PropertyName = "html")]
 			private string HTML;
+#pragma warning restore 649
 
 			private uint _OtherSteamID3;
 			private uint OtherSteamID3 {
@@ -461,12 +454,7 @@ namespace ArchiSteamFarm.JSON {
 						return _OtherSteamID3;
 					}
 
-					if (Type != EType.Trade) {
-						return 0;
-					}
-
-					if (HtmlDocument == null) {
-						Logging.LogNullError(nameof(HtmlDocument));
+					if ((Type != EType.Trade) || (HtmlDocument == null)) {
 						return 0;
 					}
 
@@ -499,7 +487,6 @@ namespace ArchiSteamFarm.JSON {
 					}
 
 					if (string.IsNullOrEmpty(HTML)) {
-						Logging.LogNullError(nameof(HTML));
 						return null;
 					}
 

ArchiSteamFarm/Logging.cs

@@ -23,6 +23,7 @@
 */
 
 using System;
+using System.Diagnostics;
 using System.Diagnostics.CodeAnalysis;
 using System.IO;
 using System.Runtime.CompilerServices;
@@ -79,9 +80,7 @@ namespace ArchiSteamFarm {
 					return;
 				}
 
-				Log("[!] EXCEPTION: " + previousMethodName + "() <" + botName + "> " + exception.Message);
-				Log("[!] StackTrace:" + Environment.NewLine + exception.StackTrace);
-
+				Log("[!] EXCEPTION: " + previousMethodName + "() <" + botName + "> " + exception.Message + Environment.NewLine + "StackTrace:" + Environment.NewLine + exception.StackTrace);
 				if (exception.InnerException != null) {
 					exception = exception.InnerException;
 					continue;
@@ -122,6 +121,7 @@ namespace ArchiSteamFarm {
 			}
 		}
 
+		[Conditional("DEBUG")]
 		[SuppressMessage("ReSharper", "UnusedMember.Global")]
 		internal static void LogGenericDebug(string message, string botName = "Main", [CallerMemberName] string previousMethodName = null) {
 			if (string.IsNullOrEmpty(message)) {

ArchiSteamFarm/MobileAuthenticator.cs

@@ -92,7 +92,7 @@ namespace ArchiSteamFarm {
 
 			string confirmationHash = GenerateConfirmationKey(time, "conf");
 			if (!string.IsNullOrEmpty(confirmationHash)) {
-				return await Bot.ArchiWebHandler.HandleConfirmation(DeviceID, confirmationHash, time, confirmation.ID, confirmation.Key, accept);
+				return await Bot.ArchiWebHandler.HandleConfirmation(DeviceID, confirmationHash, time, confirmation.ID, confirmation.Key, accept).ConfigureAwait(false);
 			}
 
 			Logging.LogNullError(nameof(confirmationHash), Bot.BotName);
@@ -112,12 +112,17 @@ namespace ArchiSteamFarm {
 			}
 
 			string confirmationHash = GenerateConfirmationKey(time, "conf");
-			if (!string.IsNullOrEmpty(confirmationHash)) {
-				return await Bot.ArchiWebHandler.GetConfirmationDetails(DeviceID, confirmationHash, time, confirmation.ID);
+			if (string.IsNullOrEmpty(confirmationHash)) {
+				Logging.LogNullError(nameof(confirmationHash), Bot.BotName);
+				return null;
 			}
 
-			Logging.LogNullError(nameof(confirmationHash), Bot.BotName);
-			return null;
+			Steam.ConfirmationDetails response = await Bot.ArchiWebHandler.GetConfirmationDetails(DeviceID, confirmationHash, time, confirmation.ID).ConfigureAwait(false);
+			if ((response == null) || !response.Success) {
+				return null;
+			}
+
+			return response;
 		}
 
 		internal async Task<string> GenerateToken() {
@@ -143,7 +148,7 @@ namespace ArchiSteamFarm {
 				return null;
 			}
 
-			HtmlDocument htmlDocument = await Bot.ArchiWebHandler.GetConfirmations(DeviceID, confirmationHash, time);
+			HtmlDocument htmlDocument = await Bot.ArchiWebHandler.GetConfirmations(DeviceID, confirmationHash, time).ConfigureAwait(false);
 			if (htmlDocument == null) {
 				return null;
 			}

ArchiSteamFarm/Properties/AssemblyInfo.cs

@@ -31,5 +31,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.1.0.0")]
-[assembly: AssemblyFileVersion("2.1.0.0")]
+[assembly: AssemblyVersion("2.1.0.6")]
+[assembly: AssemblyFileVersion("2.1.0.6")]

ArchiSteamFarm/Trading.cs

@@ -86,40 +86,44 @@ namespace ArchiSteamFarm {
 				return;
 			}
 
-			tradeOffers.RemoveWhere(tradeoffer => tradeoffer.State != Steam.TradeOffer.ETradeOfferState.Active);
-			tradeOffers.TrimExcess();
-
-			if (tradeOffers.Count == 0) {
-				return;
+			if (tradeOffers.RemoveWhere(tradeoffer => tradeoffer.State != Steam.TradeOffer.ETradeOfferState.Active) > 0) {
+				tradeOffers.TrimExcess();
+				if (tradeOffers.Count == 0) {
+					return;
+				}
 			}
 
-			await tradeOffers.ForEachAsync(ParseTrade).ConfigureAwait(false);
+			List<Task<bool>> tasks = tradeOffers.Select(ParseTrade).ToList();
+			bool[] results = await Task.WhenAll(tasks).ConfigureAwait(false);
 
-			if (tradeOffers.Any(tradeoffer => tradeoffer.ItemsToGive.Count > 0)) {
+			if (results.Any(result => result)) {
 				HashSet<ulong> tradeIDs = new HashSet<ulong>(tradeOffers.Select(tradeOffer => tradeOffer.TradeOfferID));
 				await Bot.AcceptConfirmations(true, Steam.ConfirmationDetails.EType.Trade, 0, tradeIDs).ConfigureAwait(false);
 			}
 		}
 
-		private async Task ParseTrade(Steam.TradeOffer tradeOffer) {
+		private async Task<bool> ParseTrade(Steam.TradeOffer tradeOffer) {
 			if (tradeOffer == null) {
 				Logging.LogNullError(nameof(tradeOffer), Bot.BotName);
-				return;
+				return false;
 			}
 
 			if (tradeOffer.State != Steam.TradeOffer.ETradeOfferState.Active) {
-				return;
+				return false;
 			}
 
 			if (await ShouldAcceptTrade(tradeOffer).ConfigureAwait(false)) {
 				Logging.LogGenericInfo("Accepting trade: " + tradeOffer.TradeOfferID, Bot.BotName);
-				await Bot.ArchiWebHandler.AcceptTradeOffer(tradeOffer.TradeOfferID).ConfigureAwait(false);
-			} else if (Bot.BotConfig.IsBotAccount) {
-				Logging.LogGenericInfo("Rejecting trade: " + tradeOffer.TradeOfferID, Bot.BotName);
-				Bot.ArchiWebHandler.DeclineTradeOffer(tradeOffer.TradeOfferID);
-			} else {
-				Logging.LogGenericInfo("Ignoring trade: " + tradeOffer.TradeOfferID, Bot.BotName);
+				return await Bot.ArchiWebHandler.AcceptTradeOffer(tradeOffer.TradeOfferID).ConfigureAwait(false);
 			}
+
+			if (Bot.BotConfig.IsBotAccount) {
+				Logging.LogGenericInfo("Rejecting trade: " + tradeOffer.TradeOfferID, Bot.BotName);
+				return Bot.ArchiWebHandler.DeclineTradeOffer(tradeOffer.TradeOfferID);
+			}
+
+			Logging.LogGenericInfo("Ignoring trade: " + tradeOffer.TradeOfferID, Bot.BotName);
+			return false;
 		}
 
 		private async Task<bool> ShouldAcceptTrade(Steam.TradeOffer tradeOffer) {

ArchiSteamFarm/Utilities.cs

@@ -23,7 +23,6 @@
 */
 
 using System;
-using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using System.Net;
@@ -34,15 +33,6 @@ namespace ArchiSteamFarm {
 		[SuppressMessage("ReSharper", "UnusedParameter.Global")]
 		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.WhenAll(sequence.Select(action));
-			}
-
-			Logging.LogNullError(nameof(action));
-			return Task.FromResult(true);
-		}
-
 		internal static string GetCookieValue(this CookieContainer cookieContainer, string url, string name) {
 			if (string.IsNullOrEmpty(url) || string.IsNullOrEmpty(name)) {
 				Logging.LogNullError(nameof(url) + " || " + nameof(name));

ArchiSteamFarm/WebBrowser.cs

@@ -80,11 +80,14 @@ namespace ArchiSteamFarm {
 
 			// Most web services expect that UserAgent is set, so we declare it globally
 			HttpClient.DefaultRequestHeaders.UserAgent.ParseAdd(DefaultUserAgent);
+
+			// We should always operate in English language, declare it globally
+			HttpClient.DefaultRequestHeaders.AcceptLanguage.ParseAdd("en-US,en;q=0.8,en-GB;q=0.6");
 		}
 
 		internal async Task<bool> UrlHeadRetry(string request, string referer = null) {
 			if (string.IsNullOrEmpty(request)) {
-				Logging.LogNullError(nameof(request));
+				Logging.LogNullError(nameof(request), Identifier);
 				return false;
 			}
 
@@ -103,7 +106,7 @@ namespace ArchiSteamFarm {
 
 		internal async Task<Uri> UrlHeadToUriRetry(string request, string referer = null) {
 			if (string.IsNullOrEmpty(request)) {
-				Logging.LogNullError(nameof(request));
+				Logging.LogNullError(nameof(request), Identifier);
 				return null;
 			}
 
@@ -122,7 +125,7 @@ namespace ArchiSteamFarm {
 
 		internal async Task<byte[]> UrlGetToBytesRetry(string request, string referer = null) {
 			if (string.IsNullOrEmpty(request)) {
-				Logging.LogNullError(nameof(request));
+				Logging.LogNullError(nameof(request), Identifier);
 				return null;
 			}
 
@@ -141,7 +144,7 @@ namespace ArchiSteamFarm {
 
 		internal async Task<string> UrlGetToContentRetry(string request, string referer = null) {
 			if (string.IsNullOrEmpty(request)) {
-				Logging.LogNullError(nameof(request));
+				Logging.LogNullError(nameof(request), Identifier);
 				return null;
 			}
 
@@ -160,7 +163,7 @@ namespace ArchiSteamFarm {
 
 		internal async Task<HtmlDocument> UrlGetToHtmlDocumentRetry(string request, string referer = null) {
 			if (string.IsNullOrEmpty(request)) {
-				Logging.LogNullError(nameof(request));
+				Logging.LogNullError(nameof(request), Identifier);
 				return null;
 			}
 
@@ -179,7 +182,7 @@ namespace ArchiSteamFarm {
 
 		internal async Task<JObject> UrlGetToJObjectRetry(string request, string referer = null) {
 			if (string.IsNullOrEmpty(request)) {
-				Logging.LogNullError(nameof(request));
+				Logging.LogNullError(nameof(request), Identifier);
 				return null;
 			}
 
@@ -198,7 +201,7 @@ namespace ArchiSteamFarm {
 
 		internal async Task<XmlDocument> UrlGetToXMLRetry(string request, string referer = null) {
 			if (string.IsNullOrEmpty(request)) {
-				Logging.LogNullError(nameof(request));
+				Logging.LogNullError(nameof(request), Identifier);
 				return null;
 			}
 
@@ -217,7 +220,7 @@ namespace ArchiSteamFarm {
 
 		internal async Task<bool> UrlPostRetry(string request, Dictionary<string, string> data = null, string referer = null) {
 			if (string.IsNullOrEmpty(request)) {
-				Logging.LogNullError(nameof(request));
+				Logging.LogNullError(nameof(request), Identifier);
 				return false;
 			}
 
@@ -236,7 +239,7 @@ namespace ArchiSteamFarm {
 
 		private async Task<byte[]> UrlGetToBytes(string request, string referer = null) {
 			if (string.IsNullOrEmpty(request)) {
-				Logging.LogNullError(nameof(request));
+				Logging.LogNullError(nameof(request), Identifier);
 				return null;
 			}
 
@@ -251,7 +254,7 @@ namespace ArchiSteamFarm {
 
 		private async Task<string> UrlGetToContent(string request, string referer = null) {
 			if (string.IsNullOrEmpty(request)) {
-				Logging.LogNullError(nameof(request));
+				Logging.LogNullError(nameof(request), Identifier);
 				return null;
 			}
 
@@ -266,7 +269,7 @@ namespace ArchiSteamFarm {
 
 		private async Task<HtmlDocument> UrlGetToHtmlDocument(string request, string referer = null) {
 			if (string.IsNullOrEmpty(request)) {
-				Logging.LogNullError(nameof(request));
+				Logging.LogNullError(nameof(request), Identifier);
 				return null;
 			}
 
@@ -282,7 +285,7 @@ namespace ArchiSteamFarm {
 
 		private async Task<JObject> UrlGetToJObject(string request, string referer = null) {
 			if (string.IsNullOrEmpty(request)) {
-				Logging.LogNullError(nameof(request));
+				Logging.LogNullError(nameof(request), Identifier);
 				return null;
 			}
 
@@ -308,13 +311,13 @@ namespace ArchiSteamFarm {
 				return await UrlRequest(request, HttpMethod.Get, null, referer).ConfigureAwait(false);
 			}
 
-			Logging.LogNullError(nameof(request));
+			Logging.LogNullError(nameof(request), Identifier);
 			return null;
 		}
 
 		private async Task<XmlDocument> UrlGetToXML(string request, string referer = null) {
 			if (string.IsNullOrEmpty(request)) {
-				Logging.LogNullError(nameof(request));
+				Logging.LogNullError(nameof(request), Identifier);
 				return null;
 			}
 
@@ -337,7 +340,7 @@ namespace ArchiSteamFarm {
 
 		private async Task<bool> UrlHead(string request, string referer = null) {
 			if (string.IsNullOrEmpty(request)) {
-				Logging.LogNullError(nameof(request));
+				Logging.LogNullError(nameof(request), Identifier);
 				return false;
 			}
 
@@ -351,13 +354,13 @@ namespace ArchiSteamFarm {
 				return await UrlRequest(request, HttpMethod.Head, null, referer).ConfigureAwait(false);
 			}
 
-			Logging.LogNullError(nameof(request));
+			Logging.LogNullError(nameof(request), Identifier);
 			return null;
 		}
 
 		private async Task<Uri> UrlHeadToUri(string request, string referer = null) {
 			if (string.IsNullOrEmpty(request)) {
-				Logging.LogNullError(nameof(request));
+				Logging.LogNullError(nameof(request), Identifier);
 				return null;
 			}
 
@@ -368,7 +371,7 @@ namespace ArchiSteamFarm {
 
 		private async Task<bool> UrlPost(string request, Dictionary<string, string> data = null, string referer = null) {
 			if (string.IsNullOrEmpty(request)) {
-				Logging.LogNullError(nameof(request));
+				Logging.LogNullError(nameof(request), Identifier);
 				return false;
 			}
 
@@ -382,13 +385,13 @@ namespace ArchiSteamFarm {
 				return await UrlRequest(request, HttpMethod.Post, data, referer).ConfigureAwait(false);
 			}
 
-			Logging.LogNullError(nameof(request));
+			Logging.LogNullError(nameof(request), Identifier);
 			return null;
 		}
 
 		private async Task<HttpResponseMessage> UrlRequest(string request, HttpMethod httpMethod, Dictionary<string, string> data = null, string referer = null) {
 			if (string.IsNullOrEmpty(request) || (httpMethod == null)) {
-				Logging.LogNullError(nameof(request) + " || " + nameof(httpMethod));
+				Logging.LogNullError(nameof(request) + " || " + nameof(httpMethod), Identifier);
 				return null;
 			}