From 78af201cdbf8e1c97115d2acf6d6eec088a16993 Mon Sep 17 00:00:00 2001
From: JustArchi <JustArchi@JustArchi.net>
Date: Sat, 17 Dec 2016 02:27:14 +0100
Subject: [PATCH] Skip reporting non-STM accounts Initially I wanted to use
 this to build reliable statistics as in, number of active/inactive accounts,
 total accounts and so on However, I don't really think my server will be able
 to handle it with more and more users, even if reporting that was active so
 far was still bare minimum. Let's just stick to STM-only reporting for now, I
 don't have enough money for anything more advanced for now.

---
 ArchiSteamFarm/Statistics.cs | 47 ++++++++++++++----------------------
 1 file changed, 18 insertions(+), 29 deletions(-)

diff --git a/ArchiSteamFarm/Statistics.cs b/ArchiSteamFarm/Statistics.cs
index c37f1399d..5160f2bfc 100644
--- a/ArchiSteamFarm/Statistics.cs
+++ b/ArchiSteamFarm/Statistics.cs
@@ -41,6 +41,9 @@ namespace ArchiSteamFarm {
 		private string LastNickname;
 		private bool ShouldSendHeartBeats;
 
+		private bool HasAutomatedTrading => Bot.HasMobileAuthenticator && Bot.HasValidApiKey;
+		private bool SteamTradeMatcher => Bot.BotConfig.TradingPreferences.HasFlag(BotConfig.ETradingPreferences.SteamTradeMatcher);
+
 		internal Statistics(Bot bot) {
 			if (bot == null) {
 				throw new ArgumentNullException(nameof(bot));
@@ -78,33 +81,7 @@ namespace ArchiSteamFarm {
 			}
 		}
 
-		internal async Task OnLoggedOn() {
-			await Bot.ArchiWebHandler.JoinGroup(SharedInfo.ASFGroupSteamID).ConfigureAwait(false);
-
-			await Semaphore.WaitAsync().ConfigureAwait(false);
-
-			try {
-				const string request = SharedInfo.StatisticsServer + "/api/LoggedOn";
-
-				bool hasAutomatedTrading = Bot.HasMobileAuthenticator && Bot.HasValidApiKey;
-				bool steamTradeMatcher = Bot.BotConfig.TradingPreferences.HasFlag(BotConfig.ETradingPreferences.SteamTradeMatcher);
-
-				Dictionary<string, string> data = new Dictionary<string, string>(5) {
-					{ "SteamID", Bot.SteamID.ToString() },
-					{ "Guid", Program.GlobalDatabase.Guid.ToString("N") },
-					{ "HasAutomatedTrading", hasAutomatedTrading ? "1" : "0" },
-					{ "SteamTradeMatcher", steamTradeMatcher ? "1" : "0" },
-					{ "MatchEverything", Bot.BotConfig.TradingPreferences.HasFlag(BotConfig.ETradingPreferences.MatchEverything) ? "1" : "0" }
-				};
-
-				ShouldSendHeartBeats = hasAutomatedTrading && steamTradeMatcher;
-
-				// We don't need retry logic here
-				await Program.WebBrowser.UrlPost(request, data).ConfigureAwait(false);
-			} finally {
-				Semaphore.Release();
-			}
-		}
+		internal async Task OnLoggedOn() => await Bot.ArchiWebHandler.JoinGroup(SharedInfo.ASFGroupSteamID).ConfigureAwait(false);
 
 		internal async Task OnPersonaState(SteamFriends.PersonaStateCallback callback) {
 			if (callback == null) {
@@ -112,6 +89,12 @@ namespace ArchiSteamFarm {
 				return;
 			}
 
+			// Don't announce if we don't meet conditions
+			if (!HasAutomatedTrading || !SteamTradeMatcher) {
+				ShouldSendHeartBeats = false;
+				return;
+			}
+
 			string nickname = callback.Name ?? "";
 			string avatarHash = "";
 
@@ -122,6 +105,7 @@ namespace ArchiSteamFarm {
 				}
 			}
 
+			// Skip announcing if we already announced this bot with the same data
 			if (!string.IsNullOrEmpty(LastNickname) && nickname.Equals(LastNickname) && !string.IsNullOrEmpty(LastAvatarHash) && avatarHash.Equals(LastAvatarHash)) {
 				return;
 			}
@@ -129,16 +113,21 @@ namespace ArchiSteamFarm {
 			await Semaphore.WaitAsync().ConfigureAwait(false);
 
 			try {
+				// Skip announcing if we already announced this bot with the same data
 				if (!string.IsNullOrEmpty(LastNickname) && nickname.Equals(LastNickname) && !string.IsNullOrEmpty(LastAvatarHash) && avatarHash.Equals(LastAvatarHash)) {
 					return;
 				}
 
-				const string request = SharedInfo.StatisticsServer + "/api/PersonaState";
+				// Even if following request fails, we want to send HeartBeats regardless
+				ShouldSendHeartBeats = true;
+
+				const string request = SharedInfo.StatisticsServer + "/api/Announce";
 				Dictionary<string, string> data = new Dictionary<string, string>(4) {
 					{ "SteamID", Bot.SteamID.ToString() },
 					{ "Guid", Program.GlobalDatabase.Guid.ToString("N") },
 					{ "Nickname", nickname },
-					{ "AvatarHash", avatarHash }
+					{ "AvatarHash", avatarHash },
+					{ "MatchEverything", Bot.BotConfig.TradingPreferences.HasFlag(BotConfig.ETradingPreferences.MatchEverything) ? "1" : "0" }
 				};
 
 				// We don't need retry logic here