From e138e06efc7115fcdbbcb86bc978e1e9005c7775 Mon Sep 17 00:00:00 2001 From: Anna Clemens Date: Sat, 15 May 2021 20:40:06 -0400 Subject: [PATCH] fix: remove useless checks and always count normal --- NoSoliciting/FilterUtil.cs | 2 +- NoSoliciting/Interface/Report.cs | 7 ----- NoSoliciting/Resources/Language.Designer.cs | 27 -------------------- NoSoliciting/Resources/Language.de.resx | 6 ----- NoSoliciting/Resources/Language.es.resx | 6 ----- NoSoliciting/Resources/Language.fr.resx | 6 ----- NoSoliciting/Resources/Language.ja.resx | 6 ----- NoSoliciting/Resources/Language.pt-BR.resx | 6 ----- NoSoliciting/Resources/Language.resx | 9 ------- NoSoliciting/Resources/Language.zh-hans.resx | 6 ----- NoSoliciting/Resources/Language.zh-hant.resx | 6 ----- 11 files changed, 1 insertion(+), 86 deletions(-) diff --git a/NoSoliciting/FilterUtil.cs b/NoSoliciting/FilterUtil.cs index fc6bd82..8143d85 100644 --- a/NoSoliciting/FilterUtil.cs +++ b/NoSoliciting/FilterUtil.cs @@ -129,7 +129,7 @@ namespace NoSoliciting { } public static bool WasEnabled(this IEnumerable enabled, MessageCategory category) { - return enabled.Contains(category); + return category == MessageCategory.Normal || enabled.Contains(category); } } } diff --git a/NoSoliciting/Interface/Report.cs b/NoSoliciting/Interface/Report.cs index e94b265..c27525b 100755 --- a/NoSoliciting/Interface/Report.cs +++ b/NoSoliciting/Interface/Report.cs @@ -285,13 +285,6 @@ namespace NoSoliciting.Interface { errorText = Language.ReportModalDisabledFilterNotEnabled; } else if (this._reportCategory == (message.Classification ?? MessageCategory.Normal)) { errorText = Language.ReportModalDisabledSameClassification; - } else { - switch (this.Plugin.Config.AdvancedMode) { - case true when this.Plugin.Config.MlFilters.Values.All(set => set.Count == 0): - case false when this.Plugin.Config.BasicMlFilters.Count == 0: - errorText = Language.ReportModalDisabledNoFilters; - break; - } } if (errorText != null) { diff --git a/NoSoliciting/Resources/Language.Designer.cs b/NoSoliciting/Resources/Language.Designer.cs index 1b8c7fa..e681263 100755 --- a/NoSoliciting/Resources/Language.Designer.cs +++ b/NoSoliciting/Resources/Language.Designer.cs @@ -510,15 +510,6 @@ namespace NoSoliciting.Resources { } } - /// - /// Looks up a localized string similar to Reporting is disabled because you do not have any filters enabled.. - /// - internal static string ReportModalDisabledNoFilters { - get { - return ResourceManager.GetString("ReportModalDisabledNoFilters", resourceCulture); - } - } - /// /// Looks up a localized string similar to Reporting is disabled because you must choose a different classification than the original.. /// @@ -582,24 +573,6 @@ namespace NoSoliciting.Resources { } } - /// - /// Looks up a localized string similar to Specifically, this message WAS filtered but shouldn't have been.. - /// - internal static string ReportModalWasFiltered { - get { - return ResourceManager.GetString("ReportModalWasFiltered", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Specifically, this message WAS NOT filtered but should have been.. - /// - internal static string ReportModalWasNotFiltered { - get { - return ResourceManager.GetString("ReportModalWasNotFiltered", resourceCulture); - } - } - /// /// Looks up a localized string similar to Party Finder. /// diff --git a/NoSoliciting/Resources/Language.de.resx b/NoSoliciting/Resources/Language.de.resx index c5bd924..ad93645 100644 --- a/NoSoliciting/Resources/Language.de.resx +++ b/NoSoliciting/Resources/Language.de.resx @@ -141,9 +141,6 @@ Normale Nachrichten - - Diese Nachricht WURDE NICHT gefiltert, hätte aber gefiltert werden sollen. - NoSoliciting funktioniert nur für englische Nachrichten, bitte ausschließlich englische Nachrichten melden. @@ -204,9 +201,6 @@ Status des Modells: {0} - - Diese Nachricht WURDE gefiltert, hätte aber nicht gefiltert werden sollen. - Gefilterte Nachrichten protokollieren diff --git a/NoSoliciting/Resources/Language.es.resx b/NoSoliciting/Resources/Language.es.resx index c638fad..5e03ac2 100644 --- a/NoSoliciting/Resources/Language.es.resx +++ b/NoSoliciting/Resources/Language.es.resx @@ -166,9 +166,6 @@ Al informar de este mensaje le harás saber a la desarrolladora que crees que este mensaje ha sido clasificado de manera errónea. - - Específicamente, este mensaje HA SIDO filtrado pero no debería haberlo sido. - NoSoliciting sólo funciona con mensajes en inglés. No informes de mensajes en otros idiomas. @@ -259,9 +256,6 @@ Estado del último reporte: {0} - - Específicamente, este mensaje NO HA SIDO filtrado pero debería haberlo sido. - Mensajes normales diff --git a/NoSoliciting/Resources/Language.fr.resx b/NoSoliciting/Resources/Language.fr.resx index 776002a..41d5f3f 100644 --- a/NoSoliciting/Resources/Language.fr.resx +++ b/NoSoliciting/Resources/Language.fr.resx @@ -210,12 +210,6 @@ Signaler ce message avertira la développeuse que vous pensez qu'il a été incorrectement classifié. - - Plus précisément, cela veut dire que ce message A ÉTÉ filtré alors qu'il n'aurait pas dû l'être. - - - Plus précisément, cela veut dire que ce message N'A PAS ÉTÉ filtré alors qu'il aurait dû l'être. - NoSoliciting n'est fonctionnel que pour les messages en anglais. Veuillez ne pas signaler des messages qui ne sont pas en anglais. diff --git a/NoSoliciting/Resources/Language.ja.resx b/NoSoliciting/Resources/Language.ja.resx index f020805..2163826 100644 --- a/NoSoliciting/Resources/Language.ja.resx +++ b/NoSoliciting/Resources/Language.ja.resx @@ -166,9 +166,6 @@ {0}に報告 - - 具体的には、この内容はフィルタされていませんが本来フィルタリングされるべきだったと報告します。 - NoSolicitingは英語のメッセージにのみ有効です。 他の言語でメッセージを報告しないでください。 @@ -256,9 +253,6 @@ このメッセージを報告することで、開発者はこのメッセージが誤って分類されたことを知ることができます。 - - 具体的には、フィルタされた内容は本来フィルタリングされるべきではなかったことを報告します。 - FC広告 diff --git a/NoSoliciting/Resources/Language.pt-BR.resx b/NoSoliciting/Resources/Language.pt-BR.resx index 1d77197..50e8ce6 100644 --- a/NoSoliciting/Resources/Language.pt-BR.resx +++ b/NoSoliciting/Resources/Language.pt-BR.resx @@ -175,12 +175,6 @@ Relatar a(ao) {0} - - De maneira específica, essa mensagem FOI filtrada, mas não deveria ter sido. - - - De maneira específica, essa mensagem NÃO FOI filtrada, mas deveria ter sido. - Voçê não pode relatar as mensagens filtradas por causa de um filtro personalizado. diff --git a/NoSoliciting/Resources/Language.resx b/NoSoliciting/Resources/Language.resx index 84bc7a1..32decfa 100755 --- a/NoSoliciting/Resources/Language.resx +++ b/NoSoliciting/Resources/Language.resx @@ -144,12 +144,6 @@ Reporting this message will let the developer know that you think this message was incorrectly classified. - - Specifically, this message WAS filtered but shouldn't have been. - - - Specifically, this message WAS NOT filtered but should have been. - NoSoliciting only works for English messages. Do not report non-English messages. @@ -258,9 +252,6 @@ Reporting is disabled because your ML model was not functioning when you saw this message. - - Reporting is disabled because you do not have any filters enabled. - Reporting is disabled because you must choose a different classification than the original. diff --git a/NoSoliciting/Resources/Language.zh-hans.resx b/NoSoliciting/Resources/Language.zh-hans.resx index 043a019..cda1865 100644 --- a/NoSoliciting/Resources/Language.zh-hans.resx +++ b/NoSoliciting/Resources/Language.zh-hans.resx @@ -169,12 +169,6 @@ 报告给 {0} - - 具体来说，这是一条正常消息，但它被错误地过滤了。 - - - 具体来说，这是一条应该被过滤的消息，但它被放过了。 - 你不能报告被自定义过滤规则过滤的消息。 diff --git a/NoSoliciting/Resources/Language.zh-hant.resx b/NoSoliciting/Resources/Language.zh-hant.resx index e19ed4a..7640e8f 100644 --- a/NoSoliciting/Resources/Language.zh-hant.resx +++ b/NoSoliciting/Resources/Language.zh-hant.resx @@ -133,12 +133,6 @@ 報告給 {0} - - 具體來說，這是一條正常消息，但它被錯誤地過濾了。 - - - 具體來說，這是一條應該被過濾的消息，但它被略過了。 - NoSoliciting 只對英文消息有效。請不要報告其他語言的消息。