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

Code review

Browse Source
This commit is contained in:
JustArchi
2018-06-06 01:23:06 +02:00
parent aa6be0cea2
commit 6eb55a2e08
1 changed files with 77 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

116
ArchiSteamFarm/Bot.cs
View File

@@ -477,6 +477,7 @@ namespace ArchiSteamFarm {
}
string[] dlcAppIDsTexts = listOfDlc.Split(new[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
foreach (string dlcAppIDsText in dlcAppIDsTexts) {
if (!uint.TryParse(dlcAppIDsText, out uint dlcAppID) || (dlcAppID == 0)) {
ArchiLogger.LogNullError(nameof(dlcAppID));
@@ -2549,7 +2550,8 @@ namespace ArchiSteamFarm {
return FormatBotResponse(Strings.WarningFailed);
}
return FormatBotResponse(Strings.Success);
string response = FormatBotResponse(Strings.Success);
return response;
}
private static async Task<string> Response2FAConfirm(ulong steamID, string botNames, bool confirm) {
@@ -2648,7 +2650,12 @@ namespace ArchiSteamFarm {
string[] gameIDs = targetGameIDs.Split(new[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
if (gameIDs.Length == 0) {
return FormatBotResponse(string.Format(Strings.ErrorIsEmpty, nameof(gameIDs)));
}
HashSet<uint> gamesToRedeem = new HashSet<uint>();
foreach (string game in gameIDs) {
if (!uint.TryParse(game, out uint gameID) || (gameID == 0)) {
return FormatBotResponse(string.Format(Strings.ErrorParsingObject, nameof(gameID)));
@@ -2657,10 +2664,6 @@ namespace ArchiSteamFarm {
gamesToRedeem.Add(gameID);
}
if (gamesToRedeem.Count == 0) {
return FormatBotResponse(string.Format(Strings.ErrorIsEmpty, nameof(gamesToRedeem)));
}
return await ResponseAddLicense(steamID, gamesToRedeem).ConfigureAwait(false);
}
@@ -2817,9 +2820,14 @@ namespace ArchiSteamFarm {
return null;
}
string[] flags = options.Split(new[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
if (flags.Length == 0) {
return FormatBotResponse(string.Format(Strings.ErrorIsEmpty, nameof(flags)));
}
ERedeemFlags redeemFlags = ERedeemFlags.None;
string[] flags = options.Split(new[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
foreach (string flag in flags) {
switch (flag.ToUpperInvariant()) {
case "FD":
@@ -2942,7 +2950,12 @@ namespace ArchiSteamFarm {
string[] targets = targetSteamIDs.Split(new[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
if (targets.Length == 0) {
return FormatBotResponse(string.Format(Strings.ErrorIsEmpty, nameof(targets)));
}
HashSet<ulong> targetIDs = new HashSet<ulong>();
foreach (string target in targets) {
if (!ulong.TryParse(target, out ulong targetID) || (targetID == 0)) {
return FormatBotResponse(string.Format(Strings.ErrorParsingObject, nameof(targetID)));
@@ -2951,10 +2964,6 @@ namespace ArchiSteamFarm {
targetIDs.Add(targetID);
}
if (targetIDs.Count == 0) {
return FormatBotResponse(string.Format(Strings.ErrorIsEmpty, nameof(targetIDs)));
}
await BotDatabase.AddBlacklistedFromTradesSteamIDs(targetIDs).ConfigureAwait(false);
return FormatBotResponse(Strings.Done);
}
@@ -3002,7 +3011,12 @@ namespace ArchiSteamFarm {
string[] targets = targetSteamIDs.Split(new[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
if (targets.Length == 0) {
return FormatBotResponse(string.Format(Strings.ErrorIsEmpty, nameof(targets)));
}
HashSet<ulong> targetIDs = new HashSet<ulong>();
foreach (string target in targets) {
if (!ulong.TryParse(target, out ulong targetID) || (targetID == 0)) {
return FormatBotResponse(string.Format(Strings.ErrorParsingObject, nameof(targetID)));
@@ -3011,10 +3025,6 @@ namespace ArchiSteamFarm {
targetIDs.Add(targetID);
}
if (targetIDs.Count == 0) {
return FormatBotResponse(string.Format(Strings.ErrorIsEmpty, nameof(targetIDs)));
}
await BotDatabase.RemoveBlacklistedFromTradesSteamIDs(targetIDs).ConfigureAwait(false);
return FormatBotResponse(Strings.Done);
}
@@ -3188,7 +3198,12 @@ namespace ArchiSteamFarm {
string[] targets = targetAppIDs.Split(new[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
if (targets.Length == 0) {
return FormatBotResponse(string.Format(Strings.ErrorIsEmpty, nameof(targets)));
}
HashSet<uint> appIDs = new HashSet<uint>();
foreach (string target in targets) {
if (!uint.TryParse(target, out uint appID) || (appID == 0)) {
return FormatBotResponse(string.Format(Strings.ErrorParsingObject, nameof(appID)));
@@ -3197,10 +3212,6 @@ namespace ArchiSteamFarm {
appIDs.Add(appID);
}
if (appIDs.Count == 0) {
return FormatBotResponse(string.Format(Strings.ErrorIsEmpty, nameof(appIDs)));
}
await BotDatabase.AddIdlingBlacklistedAppIDs(appIDs).ConfigureAwait(false);
return FormatBotResponse(Strings.Done);
}
@@ -3248,7 +3259,12 @@ namespace ArchiSteamFarm {
string[] targets = targetAppIDs.Split(new[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
if (targets.Length == 0) {
return FormatBotResponse(string.Format(Strings.ErrorIsEmpty, nameof(targets)));
}
HashSet<uint> appIDs = new HashSet<uint>();
foreach (string target in targets) {
if (!uint.TryParse(target, out uint appID) || (appID == 0)) {
return FormatBotResponse(string.Format(Strings.ErrorParsingObject, nameof(appID)));
@@ -3257,10 +3273,6 @@ namespace ArchiSteamFarm {
appIDs.Add(appID);
}
if (appIDs.Count == 0) {
return FormatBotResponse(string.Format(Strings.ErrorIsEmpty, nameof(appIDs)));
}
await BotDatabase.RemoveIdlingBlacklistedAppIDs(appIDs).ConfigureAwait(false);
return FormatBotResponse(Strings.Done);
}
@@ -3353,7 +3365,12 @@ namespace ArchiSteamFarm {
string[] targets = targetAppIDs.Split(new[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
if (targets.Length == 0) {
return FormatBotResponse(string.Format(Strings.ErrorIsEmpty, nameof(targets)));
}
HashSet<uint> appIDs = new HashSet<uint>();
foreach (string target in targets) {
if (!uint.TryParse(target, out uint appID) || (appID == 0)) {
return FormatBotResponse(string.Format(Strings.ErrorParsingObject, nameof(appID)));
@@ -3362,10 +3379,6 @@ namespace ArchiSteamFarm {
appIDs.Add(appID);
}
if (appIDs.Count == 0) {
return FormatBotResponse(string.Format(Strings.ErrorIsEmpty, nameof(appIDs)));
}
await BotDatabase.AddIdlingPriorityAppIDs(appIDs).ConfigureAwait(false);
return FormatBotResponse(Strings.Done);
}
@@ -3413,7 +3426,12 @@ namespace ArchiSteamFarm {
string[] targets = targetAppIDs.Split(new[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
if (targets.Length == 0) {
return FormatBotResponse(string.Format(Strings.ErrorIsEmpty, nameof(targets)));
}
HashSet<uint> appIDs = new HashSet<uint>();
foreach (string target in targets) {
if (!uint.TryParse(target, out uint appID) || (appID == 0)) {
return FormatBotResponse(string.Format(Strings.ErrorParsingObject, nameof(appID)));
@@ -3422,10 +3440,6 @@ namespace ArchiSteamFarm {
appIDs.Add(appID);
}
if (appIDs.Count == 0) {
return FormatBotResponse(string.Format(Strings.ErrorIsEmpty, nameof(appIDs)));
}
await BotDatabase.RemoveIdlingPriorityAppIDs(appIDs).ConfigureAwait(false);
return FormatBotResponse(Strings.Done);
}
@@ -3798,6 +3812,10 @@ namespace ArchiSteamFarm {
} else {
string[] games = query.Split(new[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
if (games.Length == 0) {
return (FormatBotResponse(string.Format(Strings.ErrorIsEmpty, nameof(games))), null);
}
foreach (string game in games) {
// Check if this is gameID
if (uint.TryParse(game, out uint gameID) && (gameID != 0)) {
@@ -3879,7 +3897,12 @@ namespace ArchiSteamFarm {
return null;
}
return !string.IsNullOrEmpty(BotConfig.SteamPassword) ? FormatBotResponse(string.Format(Strings.BotEncryptedPassword, CryptoHelper.ECryptoMethod.AES, CryptoHelper.Encrypt(CryptoHelper.ECryptoMethod.AES, BotConfig.SteamPassword))) + FormatBotResponse(string.Format(Strings.BotEncryptedPassword, CryptoHelper.ECryptoMethod.ProtectedDataForCurrentUser, CryptoHelper.Encrypt(CryptoHelper.ECryptoMethod.ProtectedDataForCurrentUser, BotConfig.SteamPassword))) : FormatBotResponse(string.Format(Strings.ErrorIsEmpty, nameof(BotConfig.SteamPassword)));
if (string.IsNullOrEmpty(BotConfig.SteamPassword)) {
return FormatBotResponse(string.Format(Strings.ErrorIsEmpty, nameof(BotConfig.SteamPassword)));
}
string response = FormatBotResponse(string.Format(Strings.BotEncryptedPassword, CryptoHelper.ECryptoMethod.AES, CryptoHelper.Encrypt(CryptoHelper.ECryptoMethod.AES, BotConfig.SteamPassword))) + FormatBotResponse(string.Format(Strings.BotEncryptedPassword, CryptoHelper.ECryptoMethod.ProtectedDataForCurrentUser, CryptoHelper.Encrypt(CryptoHelper.ECryptoMethod.ProtectedDataForCurrentUser, BotConfig.SteamPassword)));
return response;
}
private static async Task<string> ResponsePassword(ulong steamID, string botNames) {
@@ -4114,6 +4137,10 @@ namespace ArchiSteamFarm {
string[] privacySettingsArgs = privacySettingsText.Split(new[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
if (privacySettingsArgs.Length == 0) {
return FormatBotResponse(string.Format(Strings.ErrorIsEmpty, nameof(privacySettingsArgs)));
}
// There are only 6 privacy settings
if (privacySettingsArgs.Length > 6) {
return FormatBotResponse(string.Format(Strings.ErrorIsInvalid, nameof(privacySettingsArgs)));
@@ -4229,9 +4256,9 @@ namespace ArchiSteamFarm {
}
[SuppressMessage("ReSharper", "FunctionComplexityOverflow")]
private async Task<string> ResponseRedeem(ulong steamID, string keys, ERedeemFlags redeemFlags = ERedeemFlags.None) {
if ((steamID == 0) || string.IsNullOrEmpty(keys)) {
ArchiLogger.LogNullError(nameof(steamID) + " || " + nameof(keys));
private async Task<string> ResponseRedeem(ulong steamID, string keysText, ERedeemFlags redeemFlags = ERedeemFlags.None) {
if ((steamID == 0) || string.IsNullOrEmpty(keysText)) {
ArchiLogger.LogNullError(nameof(steamID) + " || " + nameof(keysText));
return null;
}
@@ -4243,16 +4270,22 @@ namespace ArchiSteamFarm {
return FormatBotResponse(Strings.BotNotConnected);
}
string[] keys = keysText.Split(new[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
if (keys.Length == 0) {
return FormatBotResponse(string.Format(Strings.ErrorIsEmpty, nameof(keys)));
}
bool forward = !redeemFlags.HasFlag(ERedeemFlags.SkipForwarding) && (redeemFlags.HasFlag(ERedeemFlags.ForceForwarding) || BotConfig.RedeemingPreferences.HasFlag(BotConfig.ERedeemingPreferences.Forwarding));
bool distribute = !redeemFlags.HasFlag(ERedeemFlags.SkipDistributing) && (redeemFlags.HasFlag(ERedeemFlags.ForceDistributing) || BotConfig.RedeemingPreferences.HasFlag(BotConfig.ERedeemingPreferences.Distributing));
bool keepMissingGames = !redeemFlags.HasFlag(ERedeemFlags.SkipKeepMissingGames) && (redeemFlags.HasFlag(ERedeemFlags.ForceKeepMissingGames) || BotConfig.RedeemingPreferences.HasFlag(BotConfig.ERedeemingPreferences.KeepMissingGames));
HashSet<string> pendingKeys = new HashSet<string>();
HashSet<string> unusedKeys = new HashSet<string>(pendingKeys);
StringBuilder response = new StringBuilder();
HashSet<string> keysList = new HashSet<string>(keys.Split(new[] { ',' }, StringSplitOptions.RemoveEmptyEntries));
HashSet<string> unusedKeys = new HashSet<string>(keysList);
using (HashSet<string>.Enumerator keysEnumerator = keysList.GetEnumerator()) {
using (HashSet<string>.Enumerator keysEnumerator = pendingKeys.GetEnumerator()) {
HashSet<Bot> rateLimitedBots = new HashSet<Bot>();
string key = keysEnumerator.MoveNext() ? keysEnumerator.Current : null; // Initial key
@@ -4798,9 +4831,14 @@ namespace ArchiSteamFarm {
return FormatBotResponse(Strings.BotSendingTradeToYourself);
}
string[] modes = mode.Split(new[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
if (modes.Length == 0) {
return FormatBotResponse(string.Format(Strings.ErrorIsEmpty, nameof(modes)));
}
HashSet<Steam.Asset.EType> transferTypes = new HashSet<Steam.Asset.EType>();
string[] modes = mode.Split(new[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
foreach (string singleMode in modes) {
switch (singleMode.ToUpper()) {
case "A":