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

Add MaxTradeHoldDuration

Browse Source
This commit is contained in:
JustArchi
2016-06-27 01:45:41 +02:00
parent da411b81b9
commit d68bb01174
4 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ArchiSteamFarm/GlobalConfig.cs
View File

@@ -89,6 +89,9 @@ namespace ArchiSteamFarm {
[JsonProperty(Required = Required.DisallowNull)] [JsonProperty(Required = Required.DisallowNull)]
internal byte GiftsLimiterDelay { get; private set; } = 1; internal byte GiftsLimiterDelay { get; private set; } = 1;
[JsonProperty(Required = Required.DisallowNull)]
internal byte MaxTradeHoldDuration { get; private set; } = 15;
[JsonProperty(Required = Required.DisallowNull)] [JsonProperty(Required = Required.DisallowNull)]
internal bool ForceHttp { get; private set; } = false; internal bool ForceHttp { get; private set; } = false;

17
ArchiSteamFarm/Trading.cs
View File

@@ -185,14 +185,17 @@ namespace ArchiSteamFarm {
// At this point we're sure that STM trade is valid // At this point we're sure that STM trade is valid
// If we're dealing with special cards with short lifespan, accept the trade only if user doesn't have trade holds // Fetch trade hold duration
if (tradeOffer.ItemsToGive.Any(item => GlobalConfig.GlobalBlacklist.Contains(item.RealAppID))) { byte? holdDuration = await Bot.ArchiWebHandler.GetTradeHoldDuration(tradeOffer.TradeOfferID).ConfigureAwait(false);
byte? holdDuration = await Bot.ArchiWebHandler.GetTradeHoldDuration(tradeOffer.TradeOfferID).ConfigureAwait(false); if (!holdDuration.HasValue) {
if (!holdDuration.HasValue) { // If we can't get trade hold duration, reject trade temporarily
return ParseTradeResult.RejectedTemporarily; return ParseTradeResult.RejectedTemporarily;
} }
if (holdDuration.Value > 0) { // If user has a trade hold, we add extra logic
if (holdDuration.Value > 0) {
// If trade hold duration exceeds our max, or user asks for cards with short lifespan, reject the trade
if ((holdDuration.Value > Program.GlobalConfig.MaxTradeHoldDuration) || tradeOffer.ItemsToGive.Any(item => GlobalConfig.GlobalBlacklist.Contains(item.RealAppID))) {
return ParseTradeResult.RejectedPermanently; return ParseTradeResult.RejectedPermanently;
} }
} }

1
ArchiSteamFarm/config/ASF.json
View File

@@ -12,6 +12,7 @@
"LoginLimiterDelay": 10, "LoginLimiterDelay": 10,
"InventoryLimiterDelay": 3, "InventoryLimiterDelay": 3,
"GiftsLimiterDelay": 1, "GiftsLimiterDelay": 1,
"MaxTradeHoldDuration": 15,
"ForceHttp": false, "ForceHttp": false,
"HttpTimeout": 60, "HttpTimeout": 60,
"WCFHostname": "localhost", "WCFHostname": "localhost",

3
ConfigGenerator/GlobalConfig.cs
View File

@@ -89,6 +89,9 @@ namespace ConfigGenerator {
[JsonProperty(Required = Required.DisallowNull)] [JsonProperty(Required = Required.DisallowNull)]
public byte GiftsLimiterDelay { get; set; } = 1; public byte GiftsLimiterDelay { get; set; } = 1;
[JsonProperty(Required = Required.DisallowNull)]
public byte MaxTradeHoldDuration { get; set; } = 15;
[JsonProperty(Required = Required.DisallowNull)] [JsonProperty(Required = Required.DisallowNull)]
public bool ForceHttp { get; set; } = false; public bool ForceHttp { get; set; } = false;