From 34b609e6f05e5105197f8765cf1c7ebefbcfbac7 Mon Sep 17 00:00:00 2001 From: JustArchi Date: Sat, 9 Jun 2018 00:45:15 +0200 Subject: [PATCH] Use new ToHashSet() method --- ArchiSteamFarm/ArchiHandler.cs | 2 +- ArchiSteamFarm/Bot.cs | 6 +++--- ArchiSteamFarm/BotConfig.cs | 2 +- ArchiSteamFarm/CardsFarmer.cs | 2 +- ArchiSteamFarm/GlobalDatabase.cs | 4 ++-- ArchiSteamFarm/IPC.cs | 4 ++-- ArchiSteamFarm/InMemoryServerListProvider.cs | 2 +- ArchiSteamFarm/Program.cs | 6 +++--- ArchiSteamFarm/Statistics.cs | 2 +- ArchiSteamFarm/Trading.cs | 2 +- 10 files changed, 16 insertions(+), 16 deletions(-) diff --git a/ArchiSteamFarm/ArchiHandler.cs b/ArchiSteamFarm/ArchiHandler.cs index 8ae449a7c..2131cc594 100644 --- a/ArchiSteamFarm/ArchiHandler.cs +++ b/ArchiSteamFarm/ArchiHandler.cs @@ -282,7 +282,7 @@ namespace ArchiSteamFarm { return; } - SteamIDs = new HashSet(msg.friends_with_offline_messages.Select(steam3ID => new SteamID(steam3ID, EUniverse.Public, EAccountType.Individual).ConvertToUInt64())); + SteamIDs = msg.friends_with_offline_messages.Select(steam3ID => new SteamID(steam3ID, EUniverse.Public, EAccountType.Individual).ConvertToUInt64()).ToHashSet(); } } diff --git a/ArchiSteamFarm/Bot.cs b/ArchiSteamFarm/Bot.cs index 620344d29..eaa95d318 100755 --- a/ArchiSteamFarm/Bot.cs +++ b/ArchiSteamFarm/Bot.cs @@ -4276,8 +4276,8 @@ namespace ArchiSteamFarm { 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 pendingKeys = new HashSet(keys); - HashSet unusedKeys = new HashSet(pendingKeys); + HashSet pendingKeys = keys.ToHashSet(); + HashSet unusedKeys = pendingKeys.ToHashSet(); StringBuilder response = new StringBuilder(); @@ -4742,7 +4742,7 @@ namespace ArchiSteamFarm { return null; } - HashSet botsRunning = new HashSet(validResults.Where(result => result.Bot.KeepRunning).Select(result => result.Bot)); + HashSet botsRunning = validResults.Where(result => result.Bot.KeepRunning).Select(result => result.Bot).ToHashSet(); string extraResponse = string.Format(Strings.BotStatusOverview, botsRunning.Count, validResults.Count, botsRunning.Sum(bot => bot.CardsFarmer.GamesToFarm.Count), botsRunning.Sum(bot => bot.CardsFarmer.GamesToFarm.Sum(game => game.CardsRemaining))); return string.Join("", validResults.Select(result => result.Response)) + FormatStaticResponse(extraResponse); diff --git a/ArchiSteamFarm/BotConfig.cs b/ArchiSteamFarm/BotConfig.cs index b9728bef9..48c92618a 100644 --- a/ArchiSteamFarm/BotConfig.cs +++ b/ArchiSteamFarm/BotConfig.cs @@ -188,7 +188,7 @@ namespace ArchiSteamFarm { ASF.ArchiLogger.LogGenericWarning(string.Format(Strings.WarningTooManyGamesToPlay, ArchiHandler.MaxGamesPlayedConcurrently, nameof(botConfig.GamesPlayedWhileIdle))); - HashSet validGames = new HashSet(botConfig.GamesPlayedWhileIdle.Take(ArchiHandler.MaxGamesPlayedConcurrently)); + HashSet validGames = botConfig.GamesPlayedWhileIdle.Take(ArchiHandler.MaxGamesPlayedConcurrently).ToHashSet(); botConfig.GamesPlayedWhileIdle.IntersectWith(validGames); botConfig.GamesPlayedWhileIdle.TrimExcess(); diff --git a/ArchiSteamFarm/CardsFarmer.cs b/ArchiSteamFarm/CardsFarmer.cs index cfbdca285..58c980dc7 100755 --- a/ArchiSteamFarm/CardsFarmer.cs +++ b/ArchiSteamFarm/CardsFarmer.cs @@ -593,7 +593,7 @@ namespace ArchiSteamFarm { while (GamesToFarm.Count > 0) { // Initially we're going to farm games that passed our HoursUntilCardDrops // This block is almost identical to Simple algorithm, we just copy appropriate items from GamesToFarm into innerGamesToFarm - HashSet innerGamesToFarm = new HashSet(GamesToFarm.Where(game => game.HoursPlayed >= Bot.BotConfig.HoursUntilCardDrops)); + HashSet innerGamesToFarm = GamesToFarm.Where(game => game.HoursPlayed >= Bot.BotConfig.HoursUntilCardDrops).ToHashSet(); while (innerGamesToFarm.Count > 0) { Game game = innerGamesToFarm.First(); diff --git a/ArchiSteamFarm/GlobalDatabase.cs b/ArchiSteamFarm/GlobalDatabase.cs index c61c77cad..e19809fdc 100644 --- a/ArchiSteamFarm/GlobalDatabase.cs +++ b/ArchiSteamFarm/GlobalDatabase.cs @@ -74,7 +74,7 @@ namespace ArchiSteamFarm { return null; } - return new HashSet(PackagesData.Where(package => package.Value.AppIDs?.Contains(appID) == true).Select(package => package.Key)); + return PackagesData.Where(package => package.Value.AppIDs?.Contains(appID) == true).Select(package => package.Key).ToHashSet(); } internal static async Task Load(string filePath) { @@ -114,7 +114,7 @@ namespace ArchiSteamFarm { await PackagesRefreshSemaphore.WaitAsync().ConfigureAwait(false); try { - HashSet packageIDs = new HashSet(packages.Where(package => (package.Key != 0) && (!PackagesData.TryGetValue(package.Key, out (uint ChangeNumber, HashSet _) packageData) || (packageData.ChangeNumber < package.Value))).Select(package => package.Key)); + HashSet packageIDs = packages.Where(package => (package.Key != 0) && (!PackagesData.TryGetValue(package.Key, out (uint ChangeNumber, HashSet _) packageData) || (packageData.ChangeNumber < package.Value))).Select(package => package.Key).ToHashSet(); if (packageIDs.Count == 0) { return; diff --git a/ArchiSteamFarm/IPC.cs b/ArchiSteamFarm/IPC.cs index ac4974209..d425cb00e 100644 --- a/ArchiSteamFarm/IPC.cs +++ b/ArchiSteamFarm/IPC.cs @@ -722,7 +722,7 @@ namespace ArchiSteamFarm { } string baseType = targetType.BaseType?.GetUnifiedName(); - HashSet customAttributes = new HashSet(targetType.CustomAttributes.Select(attribute => attribute.AttributeType.GetUnifiedName())); + HashSet customAttributes = targetType.CustomAttributes.Select(attribute => attribute.AttributeType.GetUnifiedName()).ToHashSet(); string underlyingType = null; Dictionary body = new Dictionary(); @@ -810,7 +810,7 @@ namespace ArchiSteamFarm { return true; } - HashSet result = new HashSet(files.Select(Path.GetFileName)); + HashSet result = files.Select(Path.GetFileName).ToHashSet(); await ResponseJsonObject(request, response, new GenericResponse>(true, "OK", result)).ConfigureAwait(false); return true; diff --git a/ArchiSteamFarm/InMemoryServerListProvider.cs b/ArchiSteamFarm/InMemoryServerListProvider.cs index 221d562cd..0dda91787 100644 --- a/ArchiSteamFarm/InMemoryServerListProvider.cs +++ b/ArchiSteamFarm/InMemoryServerListProvider.cs @@ -39,7 +39,7 @@ namespace ArchiSteamFarm { return Task.CompletedTask; } - HashSet newServerRecords = new HashSet(endpoints.Select(ep => new ServerRecordEndPoint(ep.GetHost(), (ushort) ep.GetPort(), ep.ProtocolTypes))); + HashSet newServerRecords = endpoints.Select(ep => new ServerRecordEndPoint(ep.GetHost(), (ushort) ep.GetPort(), ep.ProtocolTypes)).ToHashSet(); if (!ServerRecords.ReplaceIfNeededWith(newServerRecords)) { return Task.CompletedTask; diff --git a/ArchiSteamFarm/Program.cs b/ArchiSteamFarm/Program.cs index 414448574..f05376789 100644 --- a/ArchiSteamFarm/Program.cs +++ b/ArchiSteamFarm/Program.cs @@ -274,7 +274,7 @@ namespace ArchiSteamFarm { return; } - HashSet defaultStringObjects = new HashSet(defaultResourceSet.Cast()); + HashSet defaultStringObjects = defaultResourceSet.Cast().ToHashSet(); if (defaultStringObjects.Count == 0) { ASF.ArchiLogger.LogNullError(nameof(defaultStringObjects)); return; @@ -286,10 +286,10 @@ namespace ArchiSteamFarm { return; } - HashSet currentStringObjects = new HashSet(currentResourceSet.Cast()); + HashSet currentStringObjects = currentResourceSet.Cast().ToHashSet(); if (currentStringObjects.Count >= defaultStringObjects.Count) { // Either we have 100% finished translation, or we're missing it entirely and using en-US - HashSet testStringObjects = new HashSet(currentStringObjects); + HashSet testStringObjects = currentStringObjects.ToHashSet(); testStringObjects.ExceptWith(defaultStringObjects); // If we got 0 as final result, this is the missing language diff --git a/ArchiSteamFarm/Statistics.cs b/ArchiSteamFarm/Statistics.cs index 19c741183..790f71da4 100644 --- a/ArchiSteamFarm/Statistics.cs +++ b/ArchiSteamFarm/Statistics.cs @@ -104,7 +104,7 @@ namespace ArchiSteamFarm { return; } - HashSet acceptedMatchableTypes = new HashSet(Bot.BotConfig.MatchableTypes.Where(type => AcceptedMatchableTypes.Contains(type))); + HashSet acceptedMatchableTypes = Bot.BotConfig.MatchableTypes.Where(type => AcceptedMatchableTypes.Contains(type)).ToHashSet(); if (acceptedMatchableTypes.Count == 0) { LastAnnouncementCheck = DateTime.UtcNow; ShouldSendHeartBeats = false; diff --git a/ArchiSteamFarm/Trading.cs b/ArchiSteamFarm/Trading.cs index ea9378d90..10d600e1a 100644 --- a/ArchiSteamFarm/Trading.cs +++ b/ArchiSteamFarm/Trading.cs @@ -151,7 +151,7 @@ namespace ArchiSteamFarm { } if (Bot.HasMobileAuthenticator) { - HashSet acceptedWithItemLoseTradeIDs = new HashSet(results.Where(result => (result != null) && (result.Result == ParseTradeResult.EResult.AcceptedWithItemLose)).Select(result => result.TradeID)); + HashSet acceptedWithItemLoseTradeIDs = results.Where(result => (result != null) && (result.Result == ParseTradeResult.EResult.AcceptedWithItemLose)).Select(result => result.TradeID).ToHashSet(); if (acceptedWithItemLoseTradeIDs.Count > 0) { // Give Steam network some time to generate confirmations await Task.Delay(3000).ConfigureAwait(false);