From db632145fb91fe54f7e40a69362d855b07d933fd Mon Sep 17 00:00:00 2001 From: JustArchi Date: Mon, 3 May 2021 13:42:37 +0200 Subject: [PATCH] STD: Skip AutoGrant also when doing full resolve --- .../SteamTokenDumperPlugin.cs | 4 ++-- ArchiSteamFarm/Bot.cs | 6 +++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/ArchiSteamFarm.OfficialPlugins.SteamTokenDumper/SteamTokenDumperPlugin.cs b/ArchiSteamFarm.OfficialPlugins.SteamTokenDumper/SteamTokenDumperPlugin.cs index e82c0225c..8d5815881 100644 --- a/ArchiSteamFarm.OfficialPlugins.SteamTokenDumper/SteamTokenDumperPlugin.cs +++ b/ArchiSteamFarm.OfficialPlugins.SteamTokenDumper/SteamTokenDumperPlugin.cs @@ -313,7 +313,7 @@ namespace ArchiSteamFarm.OfficialPlugins.SteamTokenDumper { return; } - packageIDs ??= bot.OwnedPackageIDsReadOnly; + packageIDs ??= bot.OwnedPackageIDs.Where(package => !Config.SecretPackageIDs.Contains(package.Key) && ((package.Value.PaymentMethod != EPaymentMethod.AutoGrant) || !Config.SkipAutoGrantPackages)).Select(package => package.Key).ToHashSet(); HashSet appIDsToRefresh = new(); @@ -500,7 +500,7 @@ namespace ArchiSteamFarm.OfficialPlugins.SteamTokenDumper { return; } - ulong contributorSteamID = (ASF.GlobalConfig.SteamOwnerID > 0) && new SteamID(ASF.GlobalConfig.SteamOwnerID).IsIndividualAccount ? ASF.GlobalConfig.SteamOwnerID : Bot.Bots.Values.Where(bot => bot.SteamID > 0).OrderByDescending(bot => bot.OwnedPackageIDsReadOnly.Count).FirstOrDefault()?.SteamID ?? 0; + ulong contributorSteamID = (ASF.GlobalConfig.SteamOwnerID > 0) && new SteamID(ASF.GlobalConfig.SteamOwnerID).IsIndividualAccount ? ASF.GlobalConfig.SteamOwnerID : Bot.Bots.Values.Where(bot => bot.SteamID > 0).OrderByDescending(bot => bot.OwnedPackageIDs.Count).FirstOrDefault()?.SteamID ?? 0; if (contributorSteamID == 0) { ASF.ArchiLogger.LogGenericError(string.Format(CultureInfo.CurrentCulture, Strings.SubmissionNoContributorSet, nameof(ASF.GlobalConfig.SteamOwnerID))); diff --git a/ArchiSteamFarm/Bot.cs b/ArchiSteamFarm/Bot.cs index 01530d684..92c14cfb4 100755 --- a/ArchiSteamFarm/Bot.cs +++ b/ArchiSteamFarm/Bot.cs @@ -113,6 +113,7 @@ namespace ArchiSteamFarm { [PublicAPI] public bool IsPlayingPossible => !PlayingBlocked && !LibraryLocked; + [Obsolete("Use " + nameof(OwnedPackageIDs) + " instead")] [JsonIgnore] [PublicAPI] public IReadOnlyCollection OwnedPackageIDsReadOnly => OwnedPackageIDs.Keys.ToHashSet(); @@ -185,6 +186,10 @@ namespace ArchiSteamFarm { [PublicAPI] public string? Nickname { get; private set; } + [JsonIgnore] + [PublicAPI] + public ImmutableDictionary OwnedPackageIDs { get; private set; } = ImmutableDictionary.Empty; + [JsonProperty] [PublicAPI] public ASF.EUserInputType RequiredInput { get; private set; } @@ -201,7 +206,6 @@ namespace ArchiSteamFarm { [PublicAPI] public ECurrencyCode WalletCurrency { get; private set; } - internal ImmutableDictionary OwnedPackageIDs { get; private set; } = ImmutableDictionary.Empty; internal bool PlayingBlocked { get; private set; } internal bool PlayingWasBlocked { get; private set; }