diff --git a/Dalamud/Interface/Internal/Windows/PluginInstallerWindow.cs b/Dalamud/Interface/Internal/Windows/PluginInstallerWindow.cs index 8759aa5e0..2b74c6c38 100644 --- a/Dalamud/Interface/Internal/Windows/PluginInstallerWindow.cs +++ b/Dalamud/Interface/Internal/Windows/PluginInstallerWindow.cs @@ -63,6 +63,7 @@ namespace Dalamud.Interface.Internal.Windows private string feedbackModalContact = string.Empty; private bool feedbackModalIncludeException = false; private PluginManifest? feedbackPlugin = null; + private bool feedbackIsTesting = false; private int updatePluginCount = 0; private List? updatedPlugins; @@ -424,7 +425,7 @@ namespace Dalamud.Interface.Internal.Windows { if (this.feedbackPlugin != null) { - Task.Run(async () => await BugBait.SendFeedback(this.feedbackPlugin, this.feedbackModalBody, this.feedbackModalContact, this.feedbackModalIncludeException)) + Task.Run(async () => await BugBait.SendFeedback(this.feedbackPlugin, this.feedbackIsTesting, this.feedbackModalBody, this.feedbackModalContact, this.feedbackModalIncludeException)) .ContinueWith( t => { @@ -1237,7 +1238,7 @@ namespace Dalamud.Interface.Internal.Windows if (!manifest.SourceRepo.IsThirdParty && manifest.AcceptsFeedback) { - this.DrawSendFeedbackButton(manifest); + this.DrawSendFeedbackButton(manifest, false); } ImGuiHelpers.ScaledDummy(5); @@ -1455,7 +1456,7 @@ namespace Dalamud.Interface.Internal.Windows if (canFeedback) { - this.DrawSendFeedbackButton(plugin.Manifest); + this.DrawSendFeedbackButton(plugin.Manifest, plugin.IsTesting); } if (availablePluginUpdate != default) @@ -1688,13 +1689,14 @@ namespace Dalamud.Interface.Internal.Windows } } - private void DrawSendFeedbackButton(PluginManifest manifest) + private void DrawSendFeedbackButton(PluginManifest manifest, bool isTesting) { ImGui.SameLine(); if (ImGuiComponents.IconButton(FontAwesomeIcon.Comment)) { this.feedbackPlugin = manifest; this.feedbackModalOnNextFrame = true; + this.feedbackIsTesting = isTesting; } if (ImGui.IsItemHovered()) diff --git a/Dalamud/Support/BugBait.cs b/Dalamud/Support/BugBait.cs index 9c5db6514..eda2e4f78 100644 --- a/Dalamud/Support/BugBait.cs +++ b/Dalamud/Support/BugBait.cs @@ -23,7 +23,7 @@ namespace Dalamud.Support /// The reporter name. /// Whether or not the most recent exception to occur should be included in the report. /// A representing the asynchronous operation. - public static async Task SendFeedback(PluginManifest plugin, string content, string reporter, bool includeException) + public static async Task SendFeedback(PluginManifest plugin, bool isTesting, string content, string reporter, bool includeException) { if (content.IsNullOrWhitespace()) return; @@ -33,7 +33,7 @@ namespace Dalamud.Support Content = content, Reporter = reporter, Name = plugin.InternalName, - Version = plugin.AssemblyVersion.ToString(), + Version = isTesting ? plugin.TestingAssemblyVersion?.ToString() : plugin.AssemblyVersion.ToString(), DalamudHash = Util.GetGitHash(), };