feat: catch regex compile errors for custom spam hider and notify

Skytils · Dec 17, 2023 · cf54512 · cf54512
1 parent 317ca22
commit cf54512
Showing 1 changed file with 12 additions and 1 deletion.
diff --git a/src/main/kotlin/gg/skytils/skytilsmod/gui/components/CustomFilterComponent.kt b/src/main/kotlin/gg/skytils/skytilsmod/gui/components/CustomFilterComponent.kt
@@ -18,6 +18,7 @@
 
 package gg.skytils.skytilsmod.gui.components
 
+import gg.essential.api.EssentialAPI
 import gg.essential.elementa.UIComponent
 import gg.essential.elementa.components.UIBlock
 import gg.essential.elementa.components.UIContainer
@@ -37,6 +38,7 @@ import gg.essential.vigilance.gui.settings.CheckboxComponent
 import gg.essential.vigilance.gui.settings.DropDown
 import gg.skytils.skytilsmod.features.impl.handlers.SpamHider
 import gg.skytils.skytilsmod.utils.toTitleCase
+import java.awt.Color
 
 /**
  * Based on Vigilance under LGPL 3.0 license
@@ -114,7 +116,16 @@ class CustomFilterComponent(filter: SpamHider.Filter, dropDown: DropDown) : UICo
             grabWindowFocus()
         }.onFocusLost {
             if ((this as UITextInput).getText() == "") return@onFocusLost
-            filter.regex = this.getText().replace("¶", "§").toRegex()
+            filter.regex = this.getText().replace("¶", "§").let { text ->
+                runCatching {
+                    filterName.setColor(VigilancePalette.getBrightText())
+                    text.toRegex()
+                }.getOrElse {
+                    filterName.setColor(VigilancePalette.getTextWarning())
+                    EssentialAPI.getNotifications().push("Invalid Regex", """${it.message}""".trimIndent(), 3000f)
+                    Regex.escape(text).toRegex()
+                }
+            }
         }
 
         val skyblockOnly by CheckboxComponent(filter.skyblockOnly)