From 78407fbd9c85b2ac86dcd40d22274fea87ec9d49 Mon Sep 17 00:00:00 2001 From: Archi Date: Tue, 12 Apr 2022 00:52:19 +0200 Subject: [PATCH] Remove obsolete statistics mapping This already skipped one monthly cycle, everybody who remotely cares to use up-to-date ASF is already migrated to proper config, everybody else is not making use of it either way --- ArchiSteamFarm/Steam/Storage/BotConfig.cs | 12 ------------ ArchiSteamFarm/Storage/GlobalConfig.cs | 10 ---------- 2 files changed, 22 deletions(-) diff --git a/ArchiSteamFarm/Steam/Storage/BotConfig.cs b/ArchiSteamFarm/Steam/Storage/BotConfig.cs index 2fa98f149..e9bfee6f0 100644 --- a/ArchiSteamFarm/Steam/Storage/BotConfig.cs +++ b/ArchiSteamFarm/Steam/Storage/BotConfig.cs @@ -35,7 +35,6 @@ using ArchiSteamFarm.IPC.Integration; using ArchiSteamFarm.Localization; using ArchiSteamFarm.Steam.Data; using ArchiSteamFarm.Steam.Integration; -using ArchiSteamFarm.Storage; using JetBrains.Annotations; using Newtonsoft.Json; using Newtonsoft.Json.Linq; @@ -621,18 +620,7 @@ public sealed class BotConfig { break; } - // TODO: Pending removal, Statistics -> RemoteCommunication migration - if ((ASF.GlobalConfig?.Statistics == false) && (botConfig.RemoteCommunication == DefaultRemoteCommunication)) { - botConfig.RemoteCommunication = ERemoteCommunication.None; - } - if (!Program.ConfigMigrate) { - // TODO: Pending removal, warning for people that disabled config migrate, they need to migrate themselves - if (ASF.GlobalConfig?.Statistics == false) { - ASF.ArchiLogger.LogGenericWarning(string.Format(CultureInfo.CurrentCulture, Strings.WarningFailedWithError, nameof(Program.ConfigMigrate))); - ASF.ArchiLogger.LogGenericWarning(string.Format(CultureInfo.CurrentCulture, Strings.WarningDeprecated, nameof(GlobalConfig.Statistics), nameof(RemoteCommunication))); - } - return (botConfig, null); } diff --git a/ArchiSteamFarm/Storage/GlobalConfig.cs b/ArchiSteamFarm/Storage/GlobalConfig.cs index d2802e509..24dada40e 100644 --- a/ArchiSteamFarm/Storage/GlobalConfig.cs +++ b/ArchiSteamFarm/Storage/GlobalConfig.cs @@ -297,10 +297,6 @@ public sealed class GlobalConfig { internal bool Saving { get; set; } - // TODO: Pending removal, Statistics property which got changed into RemoteConnection - [JsonProperty(Required = Required.DisallowNull)] - internal bool Statistics { get; private set; } = true; - [JsonProperty] internal string? WebProxyPassword { get => BackingWebProxyPassword; @@ -396,12 +392,6 @@ public sealed class GlobalConfig { [UsedImplicitly] public bool ShouldSerializeSSteamOwnerID() => !Saving; - // TODO: Pending removal, Statistics property which got changed into RemoteConnection, we never serialize it after update -#pragma warning disable CA1822 // We can't mark it as static - [UsedImplicitly] - public bool ShouldSerializeStatistics() => false; -#pragma warning restore CA1822 // We can't mark it as static - [UsedImplicitly] public bool ShouldSerializeSteamMessagePrefix() => !Saving || (SteamMessagePrefix != DefaultSteamMessagePrefix);