From dde9c7eb85b7c0360479b2ee5b66e8fb5dedec84 Mon Sep 17 00:00:00 2001 From: goat <16760685+goaaats@users.noreply.github.com> Date: Thu, 18 Nov 2021 15:18:14 +0100 Subject: [PATCH] Revert "feat(PluginInstaller): implement AcceptsFeedback, FeedbackMessage" This reverts commit 785df950710aefc91b53b862ffc9fc0fd6157cd4. --- .../Internal/Windows/PluginInstallerWindow.cs | 9 ++------- Dalamud/Plugin/Internal/Types/PluginManifest.cs | 15 --------------- 2 files changed, 2 insertions(+), 22 deletions(-) diff --git a/Dalamud/Interface/Internal/Windows/PluginInstallerWindow.cs b/Dalamud/Interface/Internal/Windows/PluginInstallerWindow.cs index 335b6dc67..abe569ec8 100644 --- a/Dalamud/Interface/Internal/Windows/PluginInstallerWindow.cs +++ b/Dalamud/Interface/Internal/Windows/PluginInstallerWindow.cs @@ -387,11 +387,6 @@ internal class PluginInstallerWindow : Window, IDisposable { ImGui.Text(Locs.FeedbackModal_Text(this.feedbackPlugin.Name)); - if (this.feedbackPlugin?.FeedbackMessage != null) - { - ImGui.TextWrapped(this.feedbackPlugin.FeedbackMessage); - } - if (this.pluginListUpdatable.Any( up => up.InstalledPlugin.Manifest.InternalName == this.feedbackPlugin?.InternalName)) { @@ -1231,7 +1226,7 @@ internal class PluginInstallerWindow : Window, IDisposable this.DrawVisitRepoUrlButton(manifest.RepoUrl); - if (!manifest.SourceRepo.IsThirdParty && manifest.AcceptsFeedback) + if (!manifest.SourceRepo.IsThirdParty) { this.DrawSendFeedbackButton(manifest); } @@ -1406,7 +1401,7 @@ internal class PluginInstallerWindow : Window, IDisposable ImGui.TextColored(ImGuiColors.DalamudGrey3, downloadText); var isThirdParty = manifest.IsThirdParty; - var canFeedback = !isThirdParty && !plugin.IsDev && plugin.Manifest.DalamudApiLevel == PluginManager.DalamudApiLevel && plugin.Manifest.AcceptsFeedback; + var canFeedback = !isThirdParty && !plugin.IsDev && plugin.Manifest.DalamudApiLevel == PluginManager.DalamudApiLevel; // Installed from if (plugin.IsDev) diff --git a/Dalamud/Plugin/Internal/Types/PluginManifest.cs b/Dalamud/Plugin/Internal/Types/PluginManifest.cs index 772626c32..e9f2eadf5 100644 --- a/Dalamud/Plugin/Internal/Types/PluginManifest.cs +++ b/Dalamud/Plugin/Internal/Types/PluginManifest.cs @@ -161,19 +161,4 @@ internal record PluginManifest /// Gets an URL for the plugin's icon. /// public string? IconUrl { get; init; } - - /// - /// Gets a value that indicates whether or not this plugin accepts feedback. - /// - public bool AcceptsFeedback { get; init; } = true; - - /// - /// Gets a message that is shown to users when sending feedback. - /// - public string? FeedbackMessage { get; init; } - - /// - /// Gets a value indicating the webhook URL feedback is sent to. - /// - public string? FeedbackWebhook { get; init; } }