From 9ab3e518557065e918564b2e48d91f0d7bbfc76b Mon Sep 17 00:00:00 2001
From: Anna Clemens <git@annaclemens.io>
Date: Thu, 1 Apr 2021 03:08:34 -0400
Subject: [PATCH] feat: change order of filters in ui

---
 NoSoliciting/Interface/Settings.cs | 12 ++----------
 NoSoliciting/Ml/Models.cs          | 12 ++++++++++++
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/NoSoliciting/Interface/Settings.cs b/NoSoliciting/Interface/Settings.cs
index 3e69a6d..a385f28 100755
--- a/NoSoliciting/Interface/Settings.cs
+++ b/NoSoliciting/Interface/Settings.cs
@@ -141,11 +141,7 @@ namespace NoSoliciting.Interface {
                 return;
             }
 
-            foreach (var category in (MessageCategory[]) Enum.GetValues(typeof(MessageCategory))) {
-                if (category == MessageCategory.Normal) {
-                    continue;
-                }
-
+            foreach (var category in MessageCategoryExt.UiOrder) {
                 var check = this.Plugin.Config.BasicMlFilters.Contains(category);
                 if (ImGui.Checkbox(category.Name(), ref check)) {
                     if (check) {
@@ -181,11 +177,7 @@ namespace NoSoliciting.Interface {
             ImGui.TextUnformatted("The machine learning model was trained with certain channels in mind.");
             ImGui.PopStyleColor();
 
-            foreach (var category in (MessageCategory[]) Enum.GetValues(typeof(MessageCategory))) {
-                if (category == MessageCategory.Normal) {
-                    continue;
-                }
-
+            foreach (var category in MessageCategoryExt.UiOrder) {
                 if (!ImGui.CollapsingHeader(category.Name())) {
                     continue;
                 }
diff --git a/NoSoliciting/Ml/Models.cs b/NoSoliciting/Ml/Models.cs
index 5775535..61ecf16 100644
--- a/NoSoliciting/Ml/Models.cs
+++ b/NoSoliciting/Ml/Models.cs
@@ -15,6 +15,18 @@ namespace NoSoliciting.Ml {
     }
 
     public static class MessageCategoryExt {
+        public static readonly MessageCategory[] UiOrder = {
+            MessageCategory.Trade,
+            MessageCategory.FreeCompany,
+            MessageCategory.Phishing,
+            MessageCategory.RmtContent,
+            MessageCategory.RmtGil,
+            MessageCategory.Roleplaying,
+            MessageCategory.Static,
+            MessageCategory.StaticSub,
+            MessageCategory.Community,
+        };
+
         public static MessageCategory? FromString(string? category) => category switch {
             "TRADE" => MessageCategory.Trade,
             "FC" => MessageCategory.FreeCompany,