mirror of
https://github.com/JustArchiNET/ArchiSteamFarm.git
synced 2025-12-22 17:28:37 +00:00
Unify Forwarding and Distributing under RedeemingPreferences
Similar to TradingPreferences
This commit is contained in:
@@ -2062,8 +2062,8 @@ namespace ArchiSteamFarm {
|
|||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool forward = !redeemFlags.HasFlag(ERedeemFlags.SkipForwarding) && (redeemFlags.HasFlag(ERedeemFlags.ForceForwarding) || BotConfig.ForwardKeysToOtherBots);
|
bool forward = !redeemFlags.HasFlag(ERedeemFlags.SkipForwarding) && (redeemFlags.HasFlag(ERedeemFlags.ForceForwarding) || BotConfig.RedeemingPreferences.HasFlag(BotConfig.ERedeemingPreferences.Forwarding));
|
||||||
bool distribute = !redeemFlags.HasFlag(ERedeemFlags.SkipDistribution) && (redeemFlags.HasFlag(ERedeemFlags.ForceDistribution) || BotConfig.DistributeKeys);
|
bool distribute = !redeemFlags.HasFlag(ERedeemFlags.SkipDistribution) && (redeemFlags.HasFlag(ERedeemFlags.ForceDistribution) || BotConfig.RedeemingPreferences.HasFlag(BotConfig.ERedeemingPreferences.Distributing));
|
||||||
message = message.Replace(",", Environment.NewLine);
|
message = message.Replace(",", Environment.NewLine);
|
||||||
|
|
||||||
StringBuilder response = new StringBuilder();
|
StringBuilder response = new StringBuilder();
|
||||||
|
|||||||
@@ -54,9 +54,6 @@ namespace ArchiSteamFarm {
|
|||||||
[JsonProperty(Required = Required.DisallowNull)]
|
[JsonProperty(Required = Required.DisallowNull)]
|
||||||
internal readonly bool DismissInventoryNotifications = true;
|
internal readonly bool DismissInventoryNotifications = true;
|
||||||
|
|
||||||
[JsonProperty(Required = Required.DisallowNull)]
|
|
||||||
internal readonly bool DistributeKeys = false;
|
|
||||||
|
|
||||||
[JsonProperty(Required = Required.DisallowNull)]
|
[JsonProperty(Required = Required.DisallowNull)]
|
||||||
internal readonly bool Enabled = false;
|
internal readonly bool Enabled = false;
|
||||||
|
|
||||||
@@ -66,9 +63,6 @@ namespace ArchiSteamFarm {
|
|||||||
[JsonProperty(Required = Required.DisallowNull)]
|
[JsonProperty(Required = Required.DisallowNull)]
|
||||||
internal readonly bool FarmOffline = false;
|
internal readonly bool FarmOffline = false;
|
||||||
|
|
||||||
[JsonProperty(Required = Required.DisallowNull)]
|
|
||||||
internal readonly bool ForwardKeysToOtherBots = false;
|
|
||||||
|
|
||||||
[JsonProperty(Required = Required.DisallowNull)]
|
[JsonProperty(Required = Required.DisallowNull)]
|
||||||
internal readonly HashSet<uint> GamesPlayedWhileIdle = new HashSet<uint>();
|
internal readonly HashSet<uint> GamesPlayedWhileIdle = new HashSet<uint>();
|
||||||
|
|
||||||
@@ -87,6 +81,9 @@ namespace ArchiSteamFarm {
|
|||||||
[JsonProperty(Required = Required.DisallowNull)]
|
[JsonProperty(Required = Required.DisallowNull)]
|
||||||
internal readonly bool Paused = false;
|
internal readonly bool Paused = false;
|
||||||
|
|
||||||
|
[JsonProperty(Required = Required.DisallowNull)]
|
||||||
|
internal readonly ERedeemingPreferences RedeemingPreferences = ERedeemingPreferences.None;
|
||||||
|
|
||||||
[JsonProperty(Required = Required.DisallowNull)]
|
[JsonProperty(Required = Required.DisallowNull)]
|
||||||
internal readonly bool SendOnFarmingFinished = false;
|
internal readonly bool SendOnFarmingFinished = false;
|
||||||
|
|
||||||
@@ -180,6 +177,14 @@ namespace ArchiSteamFarm {
|
|||||||
NamesDescending
|
NamesDescending
|
||||||
}
|
}
|
||||||
|
|
||||||
|
[Flags]
|
||||||
|
internal enum ERedeemingPreferences : byte {
|
||||||
|
[SuppressMessage("ReSharper", "UnusedMember.Global")]
|
||||||
|
None = 0,
|
||||||
|
Forwarding = 1,
|
||||||
|
Distributing = 2
|
||||||
|
}
|
||||||
|
|
||||||
[Flags]
|
[Flags]
|
||||||
internal enum ETradingPreferences : byte {
|
internal enum ETradingPreferences : byte {
|
||||||
[SuppressMessage("ReSharper", "UnusedMember.Global")]
|
[SuppressMessage("ReSharper", "UnusedMember.Global")]
|
||||||
|
|||||||
@@ -5,11 +5,9 @@
|
|||||||
"CustomGamePlayedWhileFarming": null,
|
"CustomGamePlayedWhileFarming": null,
|
||||||
"CustomGamePlayedWhileIdle": null,
|
"CustomGamePlayedWhileIdle": null,
|
||||||
"DismissInventoryNotifications": true,
|
"DismissInventoryNotifications": true,
|
||||||
"DistributeKeys": false,
|
|
||||||
"Enabled": false,
|
"Enabled": false,
|
||||||
"FarmingOrder": 0,
|
"FarmingOrder": 0,
|
||||||
"FarmOffline": false,
|
"FarmOffline": false,
|
||||||
"ForwardKeysToOtherBots": false,
|
|
||||||
"GamesPlayedWhileIdle": [],
|
"GamesPlayedWhileIdle": [],
|
||||||
"HandleOfflineMessages": false,
|
"HandleOfflineMessages": false,
|
||||||
"IsBotAccount": false,
|
"IsBotAccount": false,
|
||||||
@@ -20,6 +18,7 @@
|
|||||||
],
|
],
|
||||||
"PasswordFormat": 0,
|
"PasswordFormat": 0,
|
||||||
"Paused": false,
|
"Paused": false,
|
||||||
|
"RedeemingPreferences": 0,
|
||||||
"SendOnFarmingFinished": false,
|
"SendOnFarmingFinished": false,
|
||||||
"SendTradePeriod": 0,
|
"SendTradePeriod": 0,
|
||||||
"ShutdownOnFarmingFinished": false,
|
"ShutdownOnFarmingFinished": false,
|
||||||
|
|||||||
@@ -57,9 +57,6 @@ namespace ConfigGenerator {
|
|||||||
[JsonProperty(Required = Required.DisallowNull)]
|
[JsonProperty(Required = Required.DisallowNull)]
|
||||||
public bool DismissInventoryNotifications { get; set; } = true;
|
public bool DismissInventoryNotifications { get; set; } = true;
|
||||||
|
|
||||||
[JsonProperty(Required = Required.DisallowNull)]
|
|
||||||
public bool DistributeKeys { get; set; } = false;
|
|
||||||
|
|
||||||
[Category("\t\tCore")]
|
[Category("\t\tCore")]
|
||||||
[JsonProperty(Required = Required.DisallowNull)]
|
[JsonProperty(Required = Required.DisallowNull)]
|
||||||
public bool Enabled { get; set; } = false;
|
public bool Enabled { get; set; } = false;
|
||||||
@@ -70,9 +67,6 @@ namespace ConfigGenerator {
|
|||||||
[JsonProperty(Required = Required.DisallowNull)]
|
[JsonProperty(Required = Required.DisallowNull)]
|
||||||
public bool FarmOffline { get; set; } = false;
|
public bool FarmOffline { get; set; } = false;
|
||||||
|
|
||||||
[JsonProperty(Required = Required.DisallowNull)]
|
|
||||||
public bool ForwardKeysToOtherBots { get; set; } = false;
|
|
||||||
|
|
||||||
[JsonProperty(Required = Required.DisallowNull)]
|
[JsonProperty(Required = Required.DisallowNull)]
|
||||||
public List<uint> GamesPlayedWhileIdle { get; set; } = new List<uint>();
|
public List<uint> GamesPlayedWhileIdle { get; set; } = new List<uint>();
|
||||||
|
|
||||||
@@ -95,6 +89,11 @@ namespace ConfigGenerator {
|
|||||||
[JsonProperty(Required = Required.DisallowNull)]
|
[JsonProperty(Required = Required.DisallowNull)]
|
||||||
public bool Paused { get; set; } = false;
|
public bool Paused { get; set; } = false;
|
||||||
|
|
||||||
|
[Category("\tAdvanced")]
|
||||||
|
[Editor(typeof(FlagEnumUiEditor), typeof(UITypeEditor))]
|
||||||
|
[JsonProperty(Required = Required.DisallowNull)]
|
||||||
|
public ERedeemingPreferences RedeemingPreferences { get; set; } = ERedeemingPreferences.None;
|
||||||
|
|
||||||
[JsonProperty(Required = Required.DisallowNull)]
|
[JsonProperty(Required = Required.DisallowNull)]
|
||||||
public bool SendOnFarmingFinished { get; set; } = false;
|
public bool SendOnFarmingFinished { get; set; } = false;
|
||||||
|
|
||||||
@@ -195,6 +194,13 @@ namespace ConfigGenerator {
|
|||||||
NamesDescending
|
NamesDescending
|
||||||
}
|
}
|
||||||
|
|
||||||
|
[Flags]
|
||||||
|
internal enum ERedeemingPreferences : byte {
|
||||||
|
None = 0,
|
||||||
|
Forwarding = 1,
|
||||||
|
Distributing = 2
|
||||||
|
}
|
||||||
|
|
||||||
[Flags]
|
[Flags]
|
||||||
internal enum ETradingPreferences : byte {
|
internal enum ETradingPreferences : byte {
|
||||||
None = 0,
|
None = 0,
|
||||||
|
|||||||
Reference in New Issue
Block a user