diff --git a/ArchiSteamFarm.OfficialPlugins.SteamTokenDumper/GlobalCache.cs b/ArchiSteamFarm.OfficialPlugins.SteamTokenDumper/GlobalCache.cs index c83bbbb94..1e7e29c43 100644 --- a/ArchiSteamFarm.OfficialPlugins.SteamTokenDumper/GlobalCache.cs +++ b/ArchiSteamFarm.OfficialPlugins.SteamTokenDumper/GlobalCache.cs @@ -91,7 +91,7 @@ namespace ArchiSteamFarm.OfficialPlugins.SteamTokenDumper { return globalCache; } - internal async Task OnPICSChanges(uint currentChangeNumber, IReadOnlyCollection> appChanges) { + internal void OnPICSChanges(uint currentChangeNumber, IReadOnlyCollection> appChanges) { if (currentChangeNumber == 0) { throw new ArgumentOutOfRangeException(nameof(currentChangeNumber)); } @@ -117,10 +117,10 @@ namespace ArchiSteamFarm.OfficialPlugins.SteamTokenDumper { ASF.ArchiLogger.LogGenericTrace($"App needs refresh: {appID}"); } - await Save().ConfigureAwait(false); + Utilities.InBackground(Save); } - internal async Task OnPICSChangesRestart(uint currentChangeNumber) { + internal void OnPICSChangesRestart(uint currentChangeNumber) { if (currentChangeNumber == 0) { throw new ArgumentOutOfRangeException(nameof(currentChangeNumber)); } @@ -132,16 +132,15 @@ namespace ArchiSteamFarm.OfficialPlugins.SteamTokenDumper { ASF.ArchiLogger.LogGenericDebug($"RESET {LastChangeNumber} => {currentChangeNumber}"); LastChangeNumber = currentChangeNumber; - AppChangeNumbers.Clear(); - await Save().ConfigureAwait(false); + Utilities.InBackground(Save); } internal bool ShouldRefreshAppInfo(uint appID) => !AppChangeNumbers.ContainsKey(appID); internal bool ShouldRefreshDepotKey(uint depotID) => !DepotKeys.ContainsKey(depotID); - internal async Task UpdateAppChangeNumbers(IReadOnlyCollection> appChangeNumbers) { + internal void UpdateAppChangeNumbers(IReadOnlyCollection> appChangeNumbers) { if (appChangeNumbers == null) { throw new ArgumentNullException(nameof(appChangeNumbers)); } @@ -158,11 +157,11 @@ namespace ArchiSteamFarm.OfficialPlugins.SteamTokenDumper { } if (save) { - await Save().ConfigureAwait(false); + Utilities.InBackground(Save); } } - internal async Task UpdateAppTokens(IReadOnlyCollection> appTokens, IReadOnlyCollection publicAppIDs) { + internal void UpdateAppTokens(IReadOnlyCollection> appTokens, IReadOnlyCollection publicAppIDs) { if (appTokens == null) { throw new ArgumentNullException(nameof(appTokens)); } @@ -192,11 +191,11 @@ namespace ArchiSteamFarm.OfficialPlugins.SteamTokenDumper { } if (save) { - await Save().ConfigureAwait(false); + Utilities.InBackground(Save); } } - internal async Task UpdateDepotKeys(ICollection depotKeyResults) { + internal void UpdateDepotKeys(ICollection depotKeyResults) { if (depotKeyResults == null) { throw new ArgumentNullException(nameof(depotKeyResults)); } @@ -219,11 +218,11 @@ namespace ArchiSteamFarm.OfficialPlugins.SteamTokenDumper { } if (save) { - await Save().ConfigureAwait(false); + Utilities.InBackground(Save); } } - internal async Task UpdatePackageTokens(IReadOnlyCollection> packageTokens) { + internal void UpdatePackageTokens(IReadOnlyCollection> packageTokens) { if (packageTokens == null) { throw new ArgumentNullException(nameof(packageTokens)); } @@ -240,11 +239,11 @@ namespace ArchiSteamFarm.OfficialPlugins.SteamTokenDumper { } if (save) { - await Save().ConfigureAwait(false); + Utilities.InBackground(Save); } } - internal async Task UpdateSubmittedData(IReadOnlyDictionary apps, IReadOnlyDictionary packages, IReadOnlyDictionary depots) { + internal void UpdateSubmittedData(IReadOnlyDictionary apps, IReadOnlyDictionary packages, IReadOnlyDictionary depots) { if (apps == null) { throw new ArgumentNullException(nameof(apps)); } @@ -269,7 +268,7 @@ namespace ArchiSteamFarm.OfficialPlugins.SteamTokenDumper { SubmittedDepots[depotID] = key; } - await Save().ConfigureAwait(false); + Utilities.InBackground(Save); } } } diff --git a/ArchiSteamFarm.OfficialPlugins.SteamTokenDumper/SteamTokenDumperPlugin.cs b/ArchiSteamFarm.OfficialPlugins.SteamTokenDumper/SteamTokenDumperPlugin.cs index 744ec6160..a43f1064c 100644 --- a/ArchiSteamFarm.OfficialPlugins.SteamTokenDumper/SteamTokenDumperPlugin.cs +++ b/ArchiSteamFarm.OfficialPlugins.SteamTokenDumper/SteamTokenDumperPlugin.cs @@ -161,7 +161,7 @@ namespace ArchiSteamFarm.OfficialPlugins.SteamTokenDumper { public override void OnLoaded() { } - public async void OnPICSChanges(uint currentChangeNumber, IReadOnlyDictionary appChanges, IReadOnlyDictionary packageChanges) { + public void OnPICSChanges(uint currentChangeNumber, IReadOnlyDictionary appChanges, IReadOnlyDictionary packageChanges) { if (currentChangeNumber == 0) { throw new ArgumentOutOfRangeException(nameof(currentChangeNumber)); } @@ -182,10 +182,10 @@ namespace ArchiSteamFarm.OfficialPlugins.SteamTokenDumper { throw new InvalidOperationException(nameof(GlobalCache)); } - await GlobalCache.OnPICSChanges(currentChangeNumber, appChanges).ConfigureAwait(false); + GlobalCache.OnPICSChanges(currentChangeNumber, appChanges); } - public async void OnPICSChangesRestart(uint currentChangeNumber) { + public void OnPICSChangesRestart(uint currentChangeNumber) { if (currentChangeNumber == 0) { throw new ArgumentOutOfRangeException(nameof(currentChangeNumber)); } @@ -198,7 +198,7 @@ namespace ArchiSteamFarm.OfficialPlugins.SteamTokenDumper { throw new InvalidOperationException(nameof(GlobalCache)); } - await GlobalCache.OnPICSChangesRestart(currentChangeNumber).ConfigureAwait(false); + GlobalCache.OnPICSChangesRestart(currentChangeNumber); } private static async void OnLicenseList(Bot bot, SteamApps.LicenseListCallback callback) { @@ -220,7 +220,8 @@ namespace ArchiSteamFarm.OfficialPlugins.SteamTokenDumper { Dictionary packageTokens = callback.LicenseList.GroupBy(license => license.PackageID).ToDictionary(group => group.Key, group => group.OrderByDescending(license => license.TimeCreated).First().AccessToken); - await GlobalCache.UpdatePackageTokens(packageTokens).ConfigureAwait(false); + GlobalCache.UpdatePackageTokens(packageTokens); + await Refresh(bot, packageTokens.Keys).ConfigureAwait(false); } @@ -313,7 +314,7 @@ namespace ArchiSteamFarm.OfficialPlugins.SteamTokenDumper { appIDsThisRound.Clear(); - await GlobalCache.UpdateAppTokens(response.AppTokens, response.AppTokensDenied).ConfigureAwait(false); + GlobalCache.UpdateAppTokens(response.AppTokens, response.AppTokensDenied); } } @@ -376,7 +377,7 @@ namespace ArchiSteamFarm.OfficialPlugins.SteamTokenDumper { } } - await GlobalCache.UpdateAppChangeNumbers(appChangeNumbers).ConfigureAwait(false); + GlobalCache.UpdateAppChangeNumbers(appChangeNumbers); if (depotTasks.Count > 0) { bot.ArchiLogger.LogGenericInfo($"Retrieving {depotTasks.Count} depot keys..."); @@ -393,7 +394,7 @@ namespace ArchiSteamFarm.OfficialPlugins.SteamTokenDumper { bot.ArchiLogger.LogGenericInfo($"Finished retrieving {depotTasks.Count} depot keys."); - await GlobalCache.UpdateDepotKeys(results).ConfigureAwait(false); + GlobalCache.UpdateDepotKeys(results); } } } @@ -483,7 +484,7 @@ namespace ArchiSteamFarm.OfficialPlugins.SteamTokenDumper { ASF.ArchiLogger.LogGenericInfo($"Data successfully submitted. Newly registered apps/subs/depots: {response.Content.Data.NewAppsCount}/{response.Content.Data.NewSubsCount}/{response.Content.Data.NewDepotsCount}."); - await GlobalCache.UpdateSubmittedData(appTokens, packageTokens, depotKeys).ConfigureAwait(false); + GlobalCache.UpdateSubmittedData(appTokens, packageTokens, depotKeys); } finally { SubmissionSemaphore.Release(); }