Cut SendOnFarmingFinished spam

Allow only one trade to be sent if we didn't farm anything

ArchiSteamFarm/ArchiHandler.cs

@@ -52,67 +52,58 @@ namespace ArchiSteamFarm {
 		*/
 
 		internal sealed class NotificationsCallback : CallbackMsg {
-			internal sealed class Notification {
-				internal enum ENotificationType : uint {
-					Unknown = 0,
-					Trading = 1,
-					// Only custom below, different than ones available as user_notification_type
-					Items = 514
-				}
-
-				internal readonly ENotificationType NotificationType;
-
-				internal Notification(ENotificationType notificationType) {
-					NotificationType = notificationType;
-				}
+			internal enum ENotification : byte {
+				Unknown = 0,
+				Trading = 1,
+				// Only custom below, different than ones available as user_notification_type
+				Items = 255
 			}
 
-			internal readonly HashSet<Notification> Notifications;
+			internal readonly HashSet<ENotification> Notifications;
 
 			internal NotificationsCallback(JobID jobID, CMsgClientUserNotifications msg) {
-				JobID = jobID;
-
-				if (msg == null || msg.notifications == null) {
-					return;
+				if (jobID == null || msg == null) {
+					throw new ArgumentNullException("jobID || msg");
 				}
 
-				Notifications = new HashSet<Notification>();
+				JobID = jobID;
+
+				Notifications = new HashSet<ENotification>();
 				foreach (var notification in msg.notifications) {
-					Notifications.Add(new Notification((Notification.ENotificationType) notification.user_notification_type));
+					Notifications.Add((ENotification) notification.user_notification_type);
 				}
 			}
 
 			internal NotificationsCallback(JobID jobID, CMsgClientItemAnnouncements msg) {
-				JobID = jobID;
-
-				if (msg == null) {
-					return;
+				if (jobID == null || msg == null) {
+					throw new ArgumentNullException("jobID || msg");
 				}
 
+				JobID = jobID;
+
 				if (msg.count_new_items > 0) {
-					Notifications = new HashSet<Notification>() {
-						new Notification(Notification.ENotificationType.Items)
+					Notifications = new HashSet<ENotification> {
+						ENotification.Items
 					};
 				}
 			}
 		}
 
 		internal sealed class OfflineMessageCallback : CallbackMsg {
-			internal readonly uint OfflineMessages;
+			internal readonly uint OfflineMessagesCount;
 
 			internal OfflineMessageCallback(JobID jobID, CMsgClientOfflineMessageNotification msg) {
-				JobID = jobID;
-
-				if (msg == null) {
-					return;
+				if (jobID == null || msg == null) {
+					throw new ArgumentNullException("jobID || msg");
 				}
 
-				OfflineMessages = msg.offline_messages;
+				JobID = jobID;
+				OfflineMessagesCount = msg.offline_messages;
 			}
 		}
 
 		internal sealed class PurchaseResponseCallback : CallbackMsg {
-			internal enum EPurchaseResult : int {
+			internal enum EPurchaseResult : sbyte {
 				Unknown = -1,
 				OK = 0,
 				AlreadyOwned = 9,
@@ -129,12 +120,11 @@ namespace ArchiSteamFarm {
 			internal readonly Dictionary<uint, string> Items;
 
 			internal PurchaseResponseCallback(JobID jobID, CMsgClientPurchaseResponse msg) {
-				JobID = jobID;
-
-				if (msg == null) {
-					return;
+				if (jobID == null || msg == null) {
+					throw new ArgumentNullException("jobID || msg");
 				}
 
+				JobID = jobID;
 				Result = (EResult) msg.eresult;
 				PurchaseResult = (EPurchaseResult) msg.purchase_result_details;
 
@@ -148,14 +138,14 @@ namespace ArchiSteamFarm {
 						return;
 					}
 
-					List<KeyValue> lineItems = ReceiptInfo["lineitems"].Children;
+					var lineItems = ReceiptInfo["lineitems"].Children;
 					Items = new Dictionary<uint, string>(lineItems.Count);
 
 					foreach (KeyValue lineItem in lineItems) {
 						uint appID = (uint) lineItem["PackageID"].AsUnsignedLong();
 						string gameName = lineItem["ItemDescription"].Value;
 						gameName = WebUtility.HtmlDecode(gameName); // Apparently steam expects client to decode sent HTML
-						Items.Add(appID, gameName);
+						Items[appID] = gameName;
 					}
 				}
 			}
@@ -170,71 +160,34 @@ namespace ArchiSteamFarm {
 
 		*/
 
-		internal void AcceptClanInvite(ulong clanID) {
-			if (clanID == 0 || !Client.IsConnected) {
-				return;
-			}
-
-			var request = new ClientMsg<CMsgClientClanInviteAction>((int) EMsg.ClientAcknowledgeClanInvite);
-			request.Body.GroupID = clanID;
-			request.Body.AcceptInvite = true;
-
-			Client.Send(request);
-		}
-
-		internal void DeclineClanInvite(ulong clanID) {
-			if (clanID == 0 || !Client.IsConnected) {
-				return;
-			}
-
-			var request = new ClientMsg<CMsgClientClanInviteAction>((int) EMsg.ClientAcknowledgeClanInvite);
-			request.Body.GroupID = clanID;
-			request.Body.AcceptInvite = false;
-
-			Client.Send(request);
-		}
-
 		internal void PlayGame(string gameName) {
 			if (!Client.IsConnected) {
 				return;
 			}
 
 			var request = new ClientMsgProtobuf<CMsgClientGamesPlayed>(EMsg.ClientGamesPlayed);
-
-			var gamePlayed = new CMsgClientGamesPlayed.GamePlayed();
 			if (!string.IsNullOrEmpty(gameName)) {
-				gamePlayed.game_id = new GameID() {
-					AppType = GameID.GameType.Shortcut,
-					ModID = uint.MaxValue
-				};
-				gamePlayed.game_extra_info = gameName;
-			}
-
-			request.Body.games_played.Add(gamePlayed);
-
-			Client.Send(request);
-		}
-
-		internal void PlayGames(params uint[] gameIDs) {
-			if (!Client.IsConnected) {
-				return;
-			}
-
-			var request = new ClientMsgProtobuf<CMsgClientGamesPlayed>(EMsg.ClientGamesPlayed);
-			foreach (uint gameID in gameIDs) {
-				if (gameID == 0) {
-					continue;
-				}
-
 				request.Body.games_played.Add(new CMsgClientGamesPlayed.GamePlayed {
-					game_id = new GameID(gameID),
+					game_extra_info = gameName,
+					game_id = new GameID() {
+						AppType = GameID.GameType.Shortcut,
+						ModID = uint.MaxValue
+					}
 				});
 			}
 
 			Client.Send(request);
 		}
 
-		internal void PlayGames(ICollection<uint> gameIDs) {
+		internal void PlayGames(uint gameID) {
+			if (!Client.IsConnected) {
+				return;
+			}
+
+			PlayGames(new HashSet<uint> { gameID });
+		}
+
+		internal void PlayGames(HashSet<uint> gameIDs) {
 			if (gameIDs == null || !Client.IsConnected) {
 				return;
 			}

ArchiSteamFarm/ArchiSteamFarm.csproj

@@ -102,7 +102,6 @@
     <Compile Include="GlobalDatabase.cs" />
     <Compile Include="BotDatabase.cs" />
     <Compile Include="CardsFarmer.cs" />
-    <Compile Include="CMsgs\CMsgClientClanInviteAction.cs" />
     <Compile Include="Debugging.cs" />
     <Compile Include="GlobalConfig.cs" />
     <Compile Include="JSON\GitHub.cs" />

ArchiSteamFarm/Bot.cs

@@ -65,7 +65,7 @@ namespace ArchiSteamFarm {
 
 		internal bool KeepRunning { get; private set; }
 
-		private bool InvalidPassword, LoggedInElsewhere;
+		private bool InvalidPassword, LoggedInElsewhere, FirstTradeSent;
 		private string AuthCode, TwoFactorCode;
 
 		internal static async Task RefreshCMs(uint cellID) {
@@ -319,8 +319,9 @@ namespace ArchiSteamFarm {
 			return true;
 		}
 
-		internal async Task OnFarmingFinished() {
-			if (BotConfig.SendOnFarmingFinished) {
+		internal async Task OnFarmingFinished(bool farmedSomething) {
+			if ((farmedSomething || !FirstTradeSent) && BotConfig.SendOnFarmingFinished) {
+				FirstTradeSent = true;
 				await ResponseSendTrade(BotConfig.SteamMasterID).ConfigureAwait(false);
 			}
 
@@ -1422,6 +1423,8 @@ namespace ArchiSteamFarm {
 			}
 
 			Logging.LogGenericInfo("Disconnected from Steam!", BotName);
+
+			FirstTradeSent = false;
 			CardsFarmer.StopFarming().Forget();
 
 			// If we initiated disconnect, do not attempt to reconnect
@@ -1759,11 +1762,11 @@ namespace ArchiSteamFarm {
 			bool checkTrades = false;
 			bool markInventory = false;
 			foreach (var notification in callback.Notifications) {
-				switch (notification.NotificationType) {
-					case ArchiHandler.NotificationsCallback.Notification.ENotificationType.Items:
+				switch (notification) {
+					case ArchiHandler.NotificationsCallback.ENotification.Items:
 						markInventory = true;
 						break;
-					case ArchiHandler.NotificationsCallback.Notification.ENotificationType.Trading:
+					case ArchiHandler.NotificationsCallback.ENotification.Trading:
 						checkTrades = true;
 						break;
 				}
@@ -1779,7 +1782,7 @@ namespace ArchiSteamFarm {
 		}
 
 		private void OnOfflineMessage(ArchiHandler.OfflineMessageCallback callback) {
-			if (callback == null || callback.OfflineMessages == 0) {
+			if (callback == null || callback.OfflineMessagesCount == 0) {
 				return;
 			}
 

ArchiSteamFarm/CMsgs/CMsgClientClanInviteAction.cs

@@ -1,67 +0,0 @@
-/*
-    _                _      _  ____   _                           _____
-   / \    _ __  ___ | |__  (_)/ ___| | |_  ___   __ _  _ __ ___  |  ___|__ _  _ __  _ __ ___
-  / _ \  | '__|/ __|| '_ \ | |\___ \ | __|/ _ \ / _` || '_ ` _ \ | |_  / _` || '__|| '_ ` _ \
- / ___ \ | |  | (__ | | | || | ___) || |_|  __/| (_| || | | | | ||  _|| (_| || |   | | | | | |
-/_/   \_\|_|   \___||_| |_||_||____/  \__|\___| \__,_||_| |_| |_||_|   \__,_||_|   |_| |_| |_|
-
- Copyright 2015-2016 Łukasz "JustArchi" Domeradzki
- Contact: JustArchi@JustArchi.net
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-					
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
-*/
-
-using SteamKit2;
-using SteamKit2.Internal;
-using System;
-using System.IO;
-
-namespace ArchiSteamFarm {
-	internal sealed class CMsgClientClanInviteAction : ISteamSerializableMessage {
-		internal ulong GroupID { get; set; } = 0;
-		internal bool AcceptInvite { get; set; } = true;
-
-		EMsg ISteamSerializableMessage.GetEMsg() {
-			return EMsg.ClientAcknowledgeClanInvite;
-		}
-
-		void ISteamSerializable.Serialize(Stream stream) {
-			if (stream == null) {
-				return;
-			}
-
-			try {
-				BinaryWriter binaryWriter = new BinaryWriter(stream);
-				binaryWriter.Write(GroupID);
-				binaryWriter.Write(AcceptInvite);
-			} catch (Exception e) {
-				Logging.LogGenericException(e);
-			}
-		}
-
-		void ISteamSerializable.Deserialize(Stream stream) {
-			if (stream == null) {
-				return;
-			}
-
-			try {
-				BinaryReader binaryReader = new BinaryReader(stream);
-				GroupID = binaryReader.ReadUInt64();
-				AcceptInvite = binaryReader.ReadBoolean();
-			} catch (Exception e) {
-				Logging.LogGenericException(e);
-			}
-		}
-	}
-}

ArchiSteamFarm/CardsFarmer.cs

@@ -94,7 +94,7 @@ namespace ArchiSteamFarm {
 			if (!await IsAnythingToFarm().ConfigureAwait(false)) {
 				FarmingSemaphore.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().ConfigureAwait(false);
+				await Bot.OnFarmingFinished(false).ConfigureAwait(false);
 				return;
 			}
 
@@ -145,7 +145,7 @@ namespace ArchiSteamFarm {
 			NowFarming = false;
 
 			Logging.LogGenericInfo("Farming finished!", Bot.BotName);
-			await Bot.OnFarmingFinished().ConfigureAwait(false);
+			await Bot.OnFarmingFinished(true).ConfigureAwait(false);
 		}
 
 		internal async Task StopFarming() {

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.4.1")]
-[assembly: AssemblyFileVersion("2.0.4.1")]
+[assembly: AssemblyVersion("2.0.4.2")]
+[assembly: AssemblyFileVersion("2.0.4.2")]