More bugfixes

JustArchiNET · Mar 6, 2016 · 220a9ba · 220a9ba
1 parent a7f2dd9
commit 220a9ba
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 11 deletions.
diff --git a/ArchiSteamFarm/ArchiSteamFarm.csproj b/ArchiSteamFarm/ArchiSteamFarm.csproj
@@ -120,6 +120,12 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="App.config" />
+    <None Include="config\example.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="config\minimal.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
@@ -143,9 +149,7 @@
       <Name>SteamAuth</Name>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup>
-    <Folder Include="config\" />
-  </ItemGroup>
+  <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
     <PreBuildEvent>

diff --git a/ArchiSteamFarm/Bot.cs b/ArchiSteamFarm/Bot.cs
@@ -428,19 +428,14 @@ private async Task<string> ResponseSendTrade() {
 				return "Trade couldn't be send because SteamMasterID is not defined!";
 			}
 
-			string token = null;
-			if (!string.IsNullOrEmpty(BotConfig.SteamTradeToken) && !BotConfig.SteamTradeToken.Equals("null")) {
-				token = BotConfig.SteamTradeToken;
-			}
-
 			await Trading.LimitInventoryRequestsAsync().ConfigureAwait(false);
 			List<SteamItem> inventory = await ArchiWebHandler.GetMyTradableInventory().ConfigureAwait(false);
 
 			if (inventory == null || inventory.Count == 0) {
 				return "Nothing to send, inventory seems empty!";
 			}
 
-			if (await ArchiWebHandler.SendTradeOffer(inventory, BotConfig.SteamMasterID, token).ConfigureAwait(false)) {
+			if (await ArchiWebHandler.SendTradeOffer(inventory, BotConfig.SteamMasterID, BotConfig.SteamTradeToken).ConfigureAwait(false)) {
 				await AcceptAllConfirmations().ConfigureAwait(false);
 				return "Trade offer sent successfully!";
 			} else {

diff --git a/ArchiSteamFarm/BotConfig.cs b/ArchiSteamFarm/BotConfig.cs
@@ -80,7 +80,7 @@ internal sealed class BotConfig {
 		[JsonProperty(Required = Required.DisallowNull)]
 		internal bool SendOnFarmingFinished { get; private set; } = false;
 
-		[JsonProperty(Required = Required.DisallowNull)]
+		[JsonProperty]
 		internal string SteamTradeToken { get; private set; } = null;
 
 		[JsonProperty(Required = Required.DisallowNull)]
@@ -230,6 +230,10 @@ internal static BotConfig LoadOldFormat(string path) {
 				botConfig.SteamParentalPIN = null;
 			}
 
+			if (botConfig.SteamTradeToken != null && botConfig.SteamTradeToken.Equals("null")) {
+				botConfig.SteamTradeToken = null;
+			}
+
 			return botConfig;
 		}
 

diff --git a/ArchiSteamFarm/config/example.json b/ArchiSteamFarm/config/example.json
@@ -15,7 +15,7 @@
   "UseAsfAsMobileAuthenticator": false,
   "ShutdownOnFarmingFinished": false,
   "SendOnFarmingFinished": false,
-  "SteamTradeToken": "null",
+  "SteamTradeToken": null,
   "SendTradePeriod": 0,
   "GamesPlayedWhileIdle": [
     0