From 4ee93627ecd5ac9816a20064cc778413ea2e9ac4 Mon Sep 17 00:00:00 2001
From: Anna <git@anna.lgbt>
Date: Wed, 28 Apr 2021 12:50:26 -0400
Subject: [PATCH] fix: use consistent window/tab ids

Also rename and remove some configuration properties.
---
 NoSoliciting/Filter.PartyFinder.cs  |  2 +-
 NoSoliciting/Interface/Report.cs    |  6 ++----
 NoSoliciting/Interface/Settings.cs  | 10 +++++-----
 NoSoliciting/PluginConfiguration.cs | 23 +++--------------------
 4 files changed, 11 insertions(+), 30 deletions(-)

diff --git a/NoSoliciting/Filter.PartyFinder.cs b/NoSoliciting/Filter.PartyFinder.cs
index 2c25309..cf219e0 100644
--- a/NoSoliciting/Filter.PartyFinder.cs
+++ b/NoSoliciting/Filter.PartyFinder.cs
@@ -17,7 +17,7 @@ namespace NoSoliciting {
                 msg = NoSolUtil.Normalise(msg);
 
                 return config.ValidPfSubstrings.Any(needle => msg.ContainsIgnoreCase(needle))
-                    || config.CompiledPFRegexes.Any(needle => needle.IsMatch(msg));
+                    || config.CompiledPfRegexes.Any(needle => needle.IsMatch(msg));
             }
         }
     }
diff --git a/NoSoliciting/Interface/Report.cs b/NoSoliciting/Interface/Report.cs
index f358830..f82a4e1 100755
--- a/NoSoliciting/Interface/Report.cs
+++ b/NoSoliciting/Interface/Report.cs
@@ -85,8 +85,7 @@ namespace NoSoliciting.Interface {
         }
 
         private void ChatTab() {
-            var tabTitle = Language.ReportChatTab;
-            if (!ImGui.BeginTabItem($"{tabTitle}##chat-report")) {
+            if (!ImGui.BeginTabItem($"{Language.ReportChatTab}###chat-report")) {
                 return;
             }
 
@@ -134,8 +133,7 @@ namespace NoSoliciting.Interface {
         }
 
         private void PartyFinderTab() {
-            var tabTitle = Language.ReportPartyFinderTab;
-            if (!ImGui.BeginTabItem($"{tabTitle}##pf-report")) {
+            if (!ImGui.BeginTabItem($"{Language.ReportPartyFinderTab}###pf-report")) {
                 return;
             }
 
diff --git a/NoSoliciting/Interface/Settings.cs b/NoSoliciting/Interface/Settings.cs
index d592efe..be4d3e3 100755
--- a/NoSoliciting/Interface/Settings.cs
+++ b/NoSoliciting/Interface/Settings.cs
@@ -82,7 +82,7 @@ namespace NoSoliciting.Interface {
                 this.DrawBasicMachineLearningConfig();
             }
 
-            if (!ImGui.BeginTabItem(Language.ModelTab)) {
+            if (!ImGui.BeginTabItem($"{Language.ModelTab}###model-tab")) {
                 return;
             }
 
@@ -107,7 +107,7 @@ namespace NoSoliciting.Interface {
         }
 
         private void DrawBasicMachineLearningConfig() {
-            if (!ImGui.BeginTabItem(Language.FiltersTab)) {
+            if (!ImGui.BeginTabItem($"{Language.FiltersTab}###filters-tab")) {
                 return;
             }
 
@@ -138,7 +138,7 @@ namespace NoSoliciting.Interface {
         }
 
         private void DrawAdvancedMachineLearningConfig() {
-            if (!ImGui.BeginTabItem(Language.FiltersTab)) {
+            if (!ImGui.BeginTabItem($"{Language.FiltersTab}###filters-tab")) {
                 return;
             }
 
@@ -190,7 +190,7 @@ namespace NoSoliciting.Interface {
         #region Other config
 
         private void DrawOtherFilters() {
-            if (!ImGui.BeginTabItem(Language.OtherFiltersTab)) {
+            if (!ImGui.BeginTabItem($"{Language.OtherFiltersTab}###other-filters-tab")) {
                 return;
             }
 
@@ -316,7 +316,7 @@ namespace NoSoliciting.Interface {
         #endregion
 
         private void DrawOtherTab() {
-            if (!ImGui.BeginTabItem(Language.OtherTab)) {
+            if (!ImGui.BeginTabItem($"{Language.OtherTab}###other-tab")) {
                 return;
             }
 
diff --git a/NoSoliciting/PluginConfiguration.cs b/NoSoliciting/PluginConfiguration.cs
index f5f9928..e966d5c 100644
--- a/NoSoliciting/PluginConfiguration.cs
+++ b/NoSoliciting/PluginConfiguration.cs
@@ -14,24 +14,7 @@ namespace NoSoliciting {
 
         private DalamudPluginInterface Interface { get; set; } = null!;
 
-        public int Version { get; set; } = 1;
-
-        [Obsolete("Use FilterStatus")]
-        public bool FilterChat { get; set; } = true;
-
-        [Obsolete("Use FilterStatus")]
-        public bool FilterFCRecruitments { get; set; } = false;
-
-        [Obsolete("Use FilterStatus")]
-        public bool FilterChatRPAds { get; set; } = false;
-
-        [Obsolete("Use FilterStatus")]
-        public bool FilterPartyFinder { get; set; } = true;
-
-        [Obsolete("Use FilterStatus")]
-        public bool FilterPartyFinderRPAds { get; set; } = false;
-
-        public Dictionary<string, bool> FilterStatus { get; private set; } = new();
+        public int Version { get; set; } = 2;
 
         public bool AdvancedMode { get; set; }
 
@@ -47,7 +30,7 @@ namespace NoSoliciting {
         public List<string> PFRegexes { get; } = new();
 
         [JsonIgnore]
-        public List<Regex> CompiledPFRegexes { get; private set; } = new();
+        public List<Regex> CompiledPfRegexes { get; private set; } = new();
 
         public bool FilterHugeItemLevelPFs { get; set; }
 
@@ -116,7 +99,7 @@ namespace NoSoliciting {
                 .Where(reg => !string.IsNullOrWhiteSpace(reg))
                 .Select(reg => new Regex(reg, RegexOptions.Compiled))
                 .ToList();
-            this.CompiledPFRegexes = this.PFRegexes
+            this.CompiledPfRegexes = this.PFRegexes
                 .Where(reg => !string.IsNullOrWhiteSpace(reg))
                 .Select(reg => new Regex(reg, RegexOptions.Compiled))
                 .ToList();