修复 Lagrange 回复下的 chat-command 使用 (#55)

MrXiaoM · May 28, 2024 · ef9584a · ef9584a
1 parent d53033f
commit ef9584a
Showing 1 changed file with 11 additions and 1 deletion.
diff --git a/overflow-core/src/main/kotlin/top/mrxiaom/overflow/internal/message/OnebotMessages.kt b/overflow-core/src/main/kotlin/top/mrxiaom/overflow/internal/message/OnebotMessages.kt
@@ -232,7 +232,10 @@ internal object OnebotMessages {
             if (source != null) add(source)
 
             val app = bot.appName.lowercase()
-            for (o in json) {
+
+            var hasQuote = false
+
+            for ((i, o) in json.withIndex()) {
                 val obj = o.jsonObject
                 val type = obj["type"].string
                 val data = obj["data"]?.jsonObject ?: buildJsonObject {  }
@@ -252,6 +255,8 @@ internal object OnebotMessages {
                         "record" -> add(audioFromFile(data["file"].string))
                         "video" -> add(videoFromFile(data["file"].string))
                         "at" -> {
+                            if (i == 1 && hasQuote)
+                                continue
                             if (data["qq"].string.lowercase() == "all")
                                 add(AtAll)
                             else
@@ -324,6 +329,11 @@ internal object OnebotMessages {
                                 .time(msgData.time)
                             val kind = if (msgData?.groupId == 0L) MessageSourceKind.FRIEND else MessageSourceKind.GROUP
 
+                            // lagrange
+                            if (i == 0 && app == "lagrange.onebot") {
+                                hasQuote = true
+                            }
+
                             add(QuoteReply(msgSource.build(bot.id, kind)))
                         }