feat: add mb collect checkbox to general settings

Dalamud.Injector/EntryPoint.cs

@@ -281,7 +281,6 @@ namespace Dalamud.Injector
                     AssetDirectory = Path.Combine(xivlauncherDir, "dalamudAssets", "dev"),
                     GameVersion = gameVer,
                     Language = ClientLanguage.English,
-                    OptOutMbCollection = false,
                 };
 
                 Log.Debug(
@@ -292,8 +291,7 @@ namespace Dalamud.Injector
                     $"    DefaultPluginDirectory: {startInfo.DefaultPluginDirectory}\n" +
                     $"    AssetDirectory: {startInfo.AssetDirectory}\n" +
                     $"    GameVersion: {startInfo.GameVersion}\n" +
-                    $"    Language: {startInfo.Language}\n" +
+                    $"    Language: {startInfo.Language}\n");
-                    $"    OptOutMbCollection: {startInfo.OptOutMbCollection}");
 
                 Log.Information("A Dalamud start info was not found in the program arguments. One has been generated for you.");
                 Log.Information("Copy the following contents into the program arguments:");

Dalamud/Configuration/Internal/DalamudConfiguration.cs

@@ -295,6 +295,11 @@ namespace Dalamud.Configuration.Internal
         /// </summary>
         public bool ShowTsm { get; set; } = true;
 
+        /// <summary>
+        /// Gets or sets a value indicating whether or not market board data should be uploaded.
+        /// </summary>
+        public bool DoMbCollect { get; set; } = false;
+
         /// <summary>
         /// Load a configuration from the provided path.
         /// </summary>

Dalamud/DalamudStartInfo.cs

@@ -47,11 +47,6 @@ namespace Dalamud
         [JsonConverter(typeof(GameVersionConverter))]
         public GameVersion GameVersion { get; init; }
 
-        /// <summary>
-        /// Gets a value indicating whether or not market board information should be uploaded by default.
-        /// </summary>
-        public bool OptOutMbCollection { get; init; }
-
         /// <summary>
         /// Gets a value that specifies how much to wait before a new Dalamud session.
         /// </summary>

Dalamud/Game/Network/Internal/NetworkHandlers.cs

@@ -25,7 +25,6 @@ namespace Dalamud.Game.Network.Internal
     {
         private readonly List<MarketBoardItemRequest> marketBoardRequests = new();
 
-        private readonly bool optOutMbUploads;
         private readonly IMarketBoardUploader uploader;
 
         private MarketBoardPurchaseHandler marketBoardPurchaseHandler;
@@ -35,8 +34,6 @@ namespace Dalamud.Game.Network.Internal
         /// </summary>
         public NetworkHandlers()
         {
-            this.optOutMbUploads = Service<DalamudStartInfo>.Get().OptOutMbCollection;
-
             this.uploader = new UniversalisMarketBoardUploader();
 
             Service<GameNetwork>.Get().NetworkMessage += this.OnNetworkMessage;
@@ -58,7 +55,7 @@ namespace Dalamud.Game.Network.Internal
 
             if (direction == NetworkMessageDirection.ZoneUp)
             {
-                if (!this.optOutMbUploads)
+                if (configuration.DoMbCollect)
                 {
                     if (opCode == dataManager.ClientOpCodes["MarketBoardPurchaseHandler"])
                     {
@@ -76,7 +73,7 @@ namespace Dalamud.Game.Network.Internal
                 return;
             }
 
-            if (!this.optOutMbUploads)
+            if (configuration.DoMbCollect)
             {
                 if (opCode == dataManager.ServerOpCodes["MarketBoardItemRequestStart"])
                 {

Dalamud/Interface/Internal/Windows/SettingsWindow.cs

@@ -36,6 +36,7 @@ namespace Dalamud.Interface.Internal.Windows
 
         private bool doCfTaskBarFlash;
         private bool doCfChatMessage;
+        private bool doMbCollect;
 
         private float globalUiScale;
         private bool doUseAxisFontsFromGame;
@@ -91,6 +92,7 @@ namespace Dalamud.Interface.Internal.Windows
 
             this.doCfTaskBarFlash = configuration.DutyFinderTaskbarFlash;
             this.doCfChatMessage = configuration.DutyFinderChatMessage;
+            this.doMbCollect = configuration.DoMbCollect;
 
             this.globalUiScale = configuration.GlobalUiScale;
             this.fontGamma = configuration.FontGamma;
@@ -281,6 +283,9 @@ namespace Dalamud.Interface.Internal.Windows
 
             ImGui.Checkbox(Loc.Localize("DalamudSettingsDisableRmtFiltering", "Disable RMT Filtering"), ref this.disableRmtFiltering);
             ImGui.TextColored(ImGuiColors.DalamudGrey, Loc.Localize("DalamudSettingsDisableRmtFilteringMsgHint", "Disable dalamud's built-in RMT ad filtering."));
+
+            ImGui.Checkbox(Loc.Localize("DalamudSettingDoMbCollect", "Anonymously upload market board data"), ref this.doMbCollect);
+            ImGui.TextColored(ImGuiColors.DalamudGrey, Loc.Localize("DalamudSettingDoMbCollectHint", "Anonymously provide data about in-game economics to Universalis when browsing the market board. This data can't be tied to you in any way and everyone benefits!"));
         }
 
         private void DrawLookAndFeelTab()
@@ -849,6 +854,7 @@ namespace Dalamud.Interface.Internal.Windows
 
             configuration.DutyFinderTaskbarFlash = this.doCfTaskBarFlash;
             configuration.DutyFinderChatMessage = this.doCfChatMessage;
+            configuration.DoMbCollect = this.doMbCollect;
 
             configuration.GlobalUiScale = this.globalUiScale;
             configuration.ToggleUiHide = this.doToggleUiHide;