Akatsuki-Misaki/ArchiSteamFarm
1
0
Fork 0
mirror of https://github.com/JustArchiNET/ArchiSteamFarm.git synced 2026-01-01 06:00:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

More bugfixes

Browse Source
This commit is contained in:
JustArchi
2016-03-06 02:27:43 +01:00
parent a7f2dd99c3
commit 220a9baa7d
4 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
ArchiSteamFarm/ArchiSteamFarm.csproj
View File

@@ -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>

7
ArchiSteamFarm/Bot.cs
View File

@@ -428,11 +428,6 @@ namespace ArchiSteamFarm {
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);
@@ -440,7 +435,7 @@ namespace ArchiSteamFarm {
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 {

6
ArchiSteamFarm/BotConfig.cs
View File

@@ -80,7 +80,7 @@ namespace ArchiSteamFarm {
[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 @@ namespace ArchiSteamFarm {
botConfig.SteamParentalPIN = null;
}
if (botConfig.SteamTradeToken != null && botConfig.SteamTradeToken.Equals("null")) {
botConfig.SteamTradeToken = null;
}
return botConfig;
}

2
ArchiSteamFarm/config/example.json
View File

@@ -15,7 +15,7 @@
"UseAsfAsMobileAuthenticator": false,
"ShutdownOnFarmingFinished": false,
"SendOnFarmingFinished": false,
"SteamTradeToken": "null",
"SteamTradeToken": null,
"SendTradePeriod": 0,
"GamesPlayedWhileIdle": [
0