fix(self-protect): failed replace

BakaBotTeam · Sep 30, 2024 · f7d37f7 · f7d37f7
1 parent f18fe6c
commit f7d37f7
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 12 deletions.
diff --git a/src/main/kotlin/ltd/guimc/lgzbot/listener/message/SelfMessageListener.kt b/src/main/kotlin/ltd/guimc/lgzbot/listener/message/SelfMessageListener.kt
@@ -1,6 +1,7 @@
 package ltd.guimc.lgzbot.listener.message
 
 import ltd.guimc.lgzbot.PluginMain
+import ltd.guimc.lgzbot.utils.MessageUtils.getPlainText
 import ltd.guimc.lgzbot.utils.RegexUtils
 import ltd.guimc.lgzbot.utils.RegexUtils.replaceRegex
 import net.mamoe.mirai.event.EventHandler
@@ -14,18 +15,20 @@ import net.mamoe.mirai.message.data.toMessageChain
 object SelfMessageListener : ListenerHost {
     @EventHandler(priority = EventPriority.HIGHEST)
     suspend fun MessagePreSendEvent.onEvent() {
-        val newMessageChain = MessageChainBuilder()
-        this.message.toMessageChain().forEach { it ->
-            if (it is PlainText && RegexUtils.matchRegex(PluginMain.spRegex, it.content)) {
-                this.cancel()
-                newMessageChain.add(it.content.replaceRegex(PluginMain.spRegex))
-            } else {
-                newMessageChain.add(it)
+        if (!this.message.toMessageChain().getPlainText().endsWith(" [Self-protect System]")) {
+            val newMessageChain = MessageChainBuilder()
+            this.message.toMessageChain().forEach { it ->
+                if (it is PlainText && RegexUtils.matchRegex(PluginMain.spRegex, it.content)) {
+                    this.cancel()
+                    newMessageChain.add(it.content.replaceRegex(PluginMain.spRegex))
+                } else {
+                    newMessageChain.add(it)
+                }
+            }
+            if (this.isCancelled) {
+                newMessageChain.add(" [Self-protect System]")
+                this.target.sendMessage(newMessageChain.asMessageChain())
             }
-        }
-        if (this.isCancelled) {
-            newMessageChain.add(" [Self-protect System]")
-            this.target.sendMessage(newMessageChain.asMessageChain())
         }
     }
 }
diff --git a/src/main/kotlin/ltd/guimc/lgzbot/utils/RegexUtils.kt b/src/main/kotlin/ltd/guimc/lgzbot/utils/RegexUtils.kt
@@ -98,7 +98,7 @@ object RegexUtils {
                 i++
                 if (regex.containsMatchIn(a)) {
                     logger.info("匹配成功 在第${i}行 ${regex.find(a)?.value}")
-                    a.replace(regex, "***")
+                    a = a.replace(regex, "***")
                 }
             }
         } catch (_: Throwable) {