From 0bbe8bf2b484738bfc731b0cdb04f9846da2583f Mon Sep 17 00:00:00 2001
From: JustArchi <JustArchi@JustArchi.net>
Date: Sat, 18 Apr 2020 16:58:30 +0200
Subject: [PATCH] More misc improvements

---
 ArchiSteamFarm/ArchiHandler.cs | 116 +++++++++++++++++++++++++++++++--
 1 file changed, 112 insertions(+), 4 deletions(-)

diff --git a/ArchiSteamFarm/ArchiHandler.cs b/ArchiSteamFarm/ArchiHandler.cs
index 6f20cc88a..22f1493cf 100644
--- a/ArchiSteamFarm/ArchiHandler.cs
+++ b/ArchiSteamFarm/ArchiHandler.cs
@@ -68,7 +68,7 @@ namespace ArchiSteamFarm {
 			}
 
 			if (Client == null) {
-				ASF.ArchiLogger.LogNullError(nameof(Client));
+				ArchiLogger.LogNullError(nameof(Client));
 
 				return;
 			}
@@ -126,6 +126,12 @@ namespace ArchiSteamFarm {
 				return;
 			}
 
+			if (Client == null) {
+				ArchiLogger.LogNullError(nameof(Client));
+
+				return;
+			}
+
 			if (!Client.IsConnected) {
 				return;
 			}
@@ -146,6 +152,12 @@ namespace ArchiSteamFarm {
 				return;
 			}
 
+			if (Client == null) {
+				ArchiLogger.LogNullError(nameof(Client));
+
+				return;
+			}
+
 			if (!Client.IsConnected) {
 				return;
 			}
@@ -165,6 +177,12 @@ namespace ArchiSteamFarm {
 				return;
 			}
 
+			if (Client == null) {
+				ArchiLogger.LogNullError(nameof(Client));
+
+				return;
+			}
+
 			if (!Client.IsConnected) {
 				return;
 			}
@@ -186,6 +204,12 @@ namespace ArchiSteamFarm {
 				return false;
 			}
 
+			if (Client == null) {
+				ArchiLogger.LogNullError(nameof(Client));
+
+				return false;
+			}
+
 			if (!Client.IsConnected) {
 				return false;
 			}
@@ -212,6 +236,12 @@ namespace ArchiSteamFarm {
 				return 0;
 			}
 
+			if (Client == null) {
+				ArchiLogger.LogNullError(nameof(Client));
+
+				return 0;
+			}
+
 			if (!Client.IsConnected) {
 				return 0;
 			}
@@ -241,6 +271,12 @@ namespace ArchiSteamFarm {
 		}
 
 		internal async Task<uint?> GetLevel() {
+			if (Client == null) {
+				ArchiLogger.LogNullError(nameof(Client));
+
+				return null;
+			}
+
 			if (!Client.IsConnected) {
 				return null;
 			}
@@ -266,6 +302,12 @@ namespace ArchiSteamFarm {
 		}
 
 		internal async Task<HashSet<ulong>> GetMyChatGroupIDs() {
+			if (Client == null) {
+				ArchiLogger.LogNullError(nameof(Client));
+
+				return null;
+			}
+
 			if (!Client.IsConnected) {
 				return null;
 			}
@@ -292,6 +334,12 @@ namespace ArchiSteamFarm {
 		}
 
 		internal async Task<string> GetTradeToken() {
+			if (Client == null) {
+				ArchiLogger.LogNullError(nameof(Client));
+
+				return null;
+			}
+
 			if (!Client.IsConnected) {
 				return null;
 			}
@@ -324,6 +372,12 @@ namespace ArchiSteamFarm {
 				return false;
 			}
 
+			if (Client == null) {
+				ArchiLogger.LogNullError(nameof(Client));
+
+				return false;
+			}
+
 			if (!Client.IsConnected) {
 				return false;
 			}
@@ -350,6 +404,12 @@ namespace ArchiSteamFarm {
 				return;
 			}
 
+			if (Client == null) {
+				ArchiLogger.LogNullError(nameof(Client));
+
+				return;
+			}
+
 			if (!Client.IsConnected) {
 				return;
 			}
@@ -400,6 +460,12 @@ namespace ArchiSteamFarm {
 				return null;
 			}
 
+			if (Client == null) {
+				ArchiLogger.LogNullError(nameof(Client));
+
+				return null;
+			}
+
 			if (!Client.IsConnected) {
 				return null;
 			}
@@ -427,6 +493,12 @@ namespace ArchiSteamFarm {
 				return null;
 			}
 
+			if (Client == null) {
+				ArchiLogger.LogNullError(nameof(Client));
+
+				return null;
+			}
+
 			if (!Client.IsConnected) {
 				return null;
 			}
@@ -454,6 +526,12 @@ namespace ArchiSteamFarm {
 				return false;
 			}
 
+			if (Client == null) {
+				ArchiLogger.LogNullError(nameof(Client));
+
+				return false;
+			}
+
 			if (!Client.IsConnected) {
 				return false;
 			}
@@ -474,6 +552,12 @@ namespace ArchiSteamFarm {
 		}
 
 		internal void RequestItemAnnouncements() {
+			if (Client == null) {
+				ArchiLogger.LogNullError(nameof(Client));
+
+				return;
+			}
+
 			if (!Client.IsConnected) {
 				return;
 			}
@@ -486,7 +570,13 @@ namespace ArchiSteamFarm {
 			if ((steamID == 0) || !new SteamID(steamID).IsIndividualAccount || string.IsNullOrEmpty(message)) {
 				ArchiLogger.LogNullError(nameof(steamID) + " || " + nameof(message));
 
-				return EResult.Fail;
+				return EResult.Invalid;
+			}
+
+			if (Client == null) {
+				ArchiLogger.LogNullError(nameof(Client));
+
+				return EResult.Invalid;
 			}
 
 			if (!Client.IsConnected) {
@@ -517,7 +607,13 @@ namespace ArchiSteamFarm {
 			if ((chatGroupID == 0) || (chatID == 0) || string.IsNullOrEmpty(message)) {
 				ArchiLogger.LogNullError(nameof(chatGroupID) + " || " + nameof(chatID) + " || " + nameof(message));
 
-				return EResult.Fail;
+				return EResult.Invalid;
+			}
+
+			if (Client == null) {
+				ArchiLogger.LogNullError(nameof(Client));
+
+				return EResult.Invalid;
 			}
 
 			if (!Client.IsConnected) {
@@ -547,7 +643,13 @@ namespace ArchiSteamFarm {
 			if ((steamID == 0) || !new SteamID(steamID).IsIndividualAccount) {
 				ArchiLogger.LogNullError(nameof(steamID));
 
-				return EResult.Fail;
+				return EResult.Invalid;
+			}
+
+			if (Client == null) {
+				ArchiLogger.LogNullError(nameof(Client));
+
+				return EResult.Invalid;
 			}
 
 			if (!Client.IsConnected) {
@@ -579,6 +681,12 @@ namespace ArchiSteamFarm {
 				return;
 			}
 
+			if (Client == null) {
+				ArchiLogger.LogNullError(nameof(Client));
+
+				return;
+			}
+
 			if (!Client.IsConnected) {
 				return;
 			}