From 00b4c288435753f51430a16b736c41d7ae1235df Mon Sep 17 00:00:00 2001
From: JustArchi <JustArchi@JustArchi.net>
Date: Tue, 9 Aug 2016 03:46:45 +0200
Subject: [PATCH] Respect LimitLoginRequestsAsync() in HeartBeat()

---
 ArchiSteamFarm/Bot.cs | 25 +++++++++++++++----------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/ArchiSteamFarm/Bot.cs b/ArchiSteamFarm/Bot.cs
index 4d1046a50..f9dfeda79 100755
--- a/ArchiSteamFarm/Bot.cs
+++ b/ArchiSteamFarm/Bot.cs
@@ -333,12 +333,12 @@ namespace ArchiSteamFarm {
 				callback = await SteamUser.RequestWebAPIUserNonce();
 			} catch (Exception e) {
 				Logging.LogGenericException(e, BotName);
-				Start().Forget();
+				await Start().ConfigureAwait(false);
 				return false;
 			}
 
 			if (string.IsNullOrEmpty(callback?.Nonce)) {
-				Start().Forget();
+				await Start().ConfigureAwait(false);
 				return false;
 			}
 
@@ -346,7 +346,7 @@ namespace ArchiSteamFarm {
 				return true;
 			}
 
-			Start().Forget();
+			await Start().ConfigureAwait(false);
 			return false;
 		}
 
@@ -509,7 +509,16 @@ namespace ArchiSteamFarm {
 				}
 
 				Logging.LogGenericWarning("Connection to Steam Network lost, reconnecting...", BotName);
-				SteamClient.Connect();
+
+				Task.Run(async () => {
+					await LimitLoginRequestsAsync().ConfigureAwait(false);
+
+					if (!SteamClient.IsConnected) {
+						return;
+					}
+
+					SteamClient.Connect();
+				}).Forget();
 			}
 		}
 
@@ -517,14 +526,10 @@ namespace ArchiSteamFarm {
 			if (!KeepRunning) {
 				KeepRunning = true;
 				Task.Run(() => HandleCallbacks()).Forget();
+				Logging.LogGenericInfo("Starting...", BotName);
 			}
 
-			// 2FA tokens are expiring soon, don't use limiter when user is providing one
-			if ((TwoFactorCode == null) || (BotDatabase.MobileAuthenticator != null)) {
-				await LimitLoginRequestsAsync().ConfigureAwait(false);
-			}
-
-			Logging.LogGenericInfo("Starting...", BotName);
+			await LimitLoginRequestsAsync().ConfigureAwait(false);
 			SteamClient.Connect();
 		}