fix: lock status, stack overflow

BakaBotTeam · Aug 2, 2024 · 1858382 · 1858382
1 parent 35aee49
commit 1858382
Showing 1 changed file with 13 additions and 3 deletions.
diff --git a/src/main/kotlin/ltd/guimc/lgzbot/listener/message/ImageOCRFilter.kt b/src/main/kotlin/ltd/guimc/lgzbot/listener/message/ImageOCRFilter.kt
@@ -30,7 +30,6 @@ import net.mamoe.mirai.message.data.Image
 import net.mamoe.mirai.message.data.Image.Key.queryUrl
 import net.mamoe.mirai.message.data.MessageChain
 import net.mamoe.mirai.message.data.MessageSource.Key.recall
-import net.mamoe.mirai.message.data.toMessageChain
 import org.apache.commons.lang3.time.StopWatch
 import java.io.ByteArrayInputStream
 import java.io.File
@@ -60,14 +59,23 @@ object ImageOCRFilter {
                     return true
                 }
             } else if (message is ForwardMessage) {
-                if (findImageToFilter(e, message.toMessageChain())) {
+                if (findImageToFilter(e, message.nodeList)) {
                     return true
                 }
             }
         }
         return false
     }
 
+    suspend fun findImageToFilter(e: GroupMessageEvent, m: List<ForwardMessage.Node>): Boolean {
+        for (fm in m) {
+            if (findImageToFilter(e, fm.messageChain)) {
+                return true
+            }
+        }
+        return false
+    }
+
     suspend fun filterImage(e: GroupMessageEvent, m: Image): Boolean {
         var muted = false
         try {
@@ -176,7 +184,9 @@ object ImageOCRFilter {
             return content
         } finally {
             // 确保锁被释放
-            lock.unlock()
+            if (lock.isLocked) {
+                lock.unlock()
+            }
         }
     }