ToxicMushroom/Dalamud
1
0
Fork 0
mirror of https://github.com/goatcorp/Dalamud.git synced 2026-01-03 14:23:40 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

fix: also send testing version in feedback

Browse source
This commit is contained in:
goat 2022-01-08 21:12:01 +01:00
parent d13ece1bbf
commit 3ee5613517
No known key found for this signature in database
GPG key ID: 7773BB5B43BA52E5
2 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Dalamud/Interface/Internal/Windows/PluginInstallerWindow.cs
View file

@ -63,6 +63,7 @@ namespace Dalamud.Interface.Internal.Windows
private string feedbackModalContact = string.Empty; private string feedbackModalContact = string.Empty;
private bool feedbackModalIncludeException = false; private bool feedbackModalIncludeException = false;
private PluginManifest? feedbackPlugin = null; private PluginManifest? feedbackPlugin = null;
private bool feedbackIsTesting = false;
private int updatePluginCount = 0; private int updatePluginCount = 0;
private List<PluginUpdateStatus>? updatedPlugins; private List<PluginUpdateStatus>? updatedPlugins;
@ -424,7 +425,7 @@ namespace Dalamud.Interface.Internal.Windows
{ {
if (this.feedbackPlugin != null) 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( .ContinueWith(
t => t =>
{ {
@ -1237,7 +1238,7 @@ namespace Dalamud.Interface.Internal.Windows
if (!manifest.SourceRepo.IsThirdParty && manifest.AcceptsFeedback) if (!manifest.SourceRepo.IsThirdParty && manifest.AcceptsFeedback)
{ {
this.DrawSendFeedbackButton(manifest); this.DrawSendFeedbackButton(manifest, false);
} }
ImGuiHelpers.ScaledDummy(5); ImGuiHelpers.ScaledDummy(5);
@ -1455,7 +1456,7 @@ namespace Dalamud.Interface.Internal.Windows
if (canFeedback) if (canFeedback)
{ {
this.DrawSendFeedbackButton(plugin.Manifest); this.DrawSendFeedbackButton(plugin.Manifest, plugin.IsTesting);
} }
if (availablePluginUpdate != default) 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(); ImGui.SameLine();
if (ImGuiComponents.IconButton(FontAwesomeIcon.Comment)) if (ImGuiComponents.IconButton(FontAwesomeIcon.Comment))
{ {
this.feedbackPlugin = manifest; this.feedbackPlugin = manifest;
this.feedbackModalOnNextFrame = true; this.feedbackModalOnNextFrame = true;
this.feedbackIsTesting = isTesting;
} }
if (ImGui.IsItemHovered()) if (ImGui.IsItemHovered())

4
Dalamud/Support/BugBait.cs
View file

@ -23,7 +23,7 @@ namespace Dalamud.Support
/// <param name="reporter">The reporter name.</param> /// <param name="reporter">The reporter name.</param>
/// <param name="includeException">Whether or not the most recent exception to occur should be included in the report.</param> /// <param name="includeException">Whether or not the most recent exception to occur should be included in the report.</param>
/// <returns>A <see cref="Task"/> representing the asynchronous operation.</returns> /// <returns>A <see cref="Task"/> representing the asynchronous operation.</returns>
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()) if (content.IsNullOrWhitespace())
return; return;
@ -33,7 +33,7 @@ namespace Dalamud.Support
Content = content, Content = content,
Reporter = reporter, Reporter = reporter,
Name = plugin.InternalName, Name = plugin.InternalName,
Version = plugin.AssemblyVersion.ToString(), Version = isTesting ? plugin.TestingAssemblyVersion?.ToString() : plugin.AssemblyVersion.ToString(),
DalamudHash = Util.GetGitHash(), DalamudHash = Util.GetGitHash(),
}; };