Merge pull request #176 from simple-robot/dev/main

Release: v4.0.2
simple-robot · Aug 29, 2024 · 3ea12ce · 3ea12ce
2 parents c76df79 + 0f77c57
commit 3ea12ce
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 8 deletions.
diff --git a/.changelog/v4.0.2.md b/.changelog/v4.0.2.md
@@ -0,0 +1,4 @@
+> [!note]
+> 对应核心版本: [**v4.6.0**](https://github.com/simple-robot/simpler-robot/releases/tag/v4.6.0)
+    
+我们欢迎并期望着您的 [反馈](https://github.com/simple-robot/simbot-component-kook/issues) 或 [协助](https://github.com/simple-robot/simbot-component-kook/pulls)，感谢您的贡献与支持！
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+# v4.0.2
+
+> Release & Pull Notes: [v4.0.2](https://github.com/simple-robot/simpler-robot/releases/tag/v4.0.2) 
+
+- fix(core): 修复事件中接收的 MessageContent 中, `referenceMessage` 的行为与 `reference` 不一致，会错误地获取自身消息详情而非引用消息详情的问题 ([`517e442`](https://github.com/simple-robot/simpler-robot/commit/517e442))
+
 # v4.0.1
 
 > Release & Pull Notes: [v4.0.1](https://github.com/simple-robot/simpler-robot/releases/tag/v4.0.1) 

diff --git a/buildSrc/src/main/kotlin/P.kt b/buildSrc/src/main/kotlin/P.kt
@@ -32,8 +32,8 @@ object P : ProjectDetail() {
     override val homepage: String
         get() = HOMEPAGE
 
-    const val VERSION = "4.0.1"
-    const val NEXT_VERSION = "4.0.2"
+    const val VERSION = "4.0.2"
+    const val NEXT_VERSION = "4.0.3"
 
     override val snapshotVersion = "$NEXT_VERSION-SNAPSHOT"
     override val version = if (isSnapshot()) snapshotVersion else VERSION

diff --git a/...c/commonMain/kotlin/love/forte/simbot/component/kook/message/KookReceiveMessageContent.kt b/...c/commonMain/kotlin/love/forte/simbot/component/kook/message/KookReceiveMessageContent.kt
@@ -262,9 +262,10 @@ public class KookReceiveMessageContent internal constructor(
         }
     }
 
-    override suspend fun referenceMessage(): KookMessageContent {
+    override suspend fun referenceMessage(): KookMessageContent? {
         return if (isDirect) {
-            val details = detailsFromDirect(bot, source.msgId, source.authorId)
+            val ref = referenceFromDirect(bot, source.msgId, source.authorId) ?: return null
+            val details = detailsFromDirect(bot, ref.quote.id, source.authorId)
             KookUpdatedMessageContent(
                 bot = bot,
                 isDirect = false,
@@ -277,7 +278,8 @@ public class KookReceiveMessageContent internal constructor(
                 isMentionHere = false
             )
         } else {
-            val details = detailsFromChannel(bot, source.msgId)
+            val ref = referenceFromChannel(bot, source.msgId) ?: return null
+            val details = detailsFromChannel(bot, ref.quote.id)
             details.toContent(bot)
         }
     }
@@ -344,9 +346,11 @@ public class KookUpdatedMessageContent internal constructor(
     }
 
     @JvmSynthetic
-    override suspend fun referenceMessage(): KookMessageContent {
+    override suspend fun referenceMessage(): KookMessageContent? {
         return if (isDirect) {
-            val details = detailsFromDirectWithChatCode(bot, msgId, chatCode!!)
+            val chatCode = chatCode!!
+            val ref = referenceFromDirectWithChatCode(bot, msgId, chatCode) ?: return null
+            val details = detailsFromDirectWithChatCode(bot, ref.quote.id, chatCode)
             KookUpdatedMessageContent(
                 bot = bot,
                 isDirect = false,
@@ -359,7 +363,8 @@ public class KookUpdatedMessageContent internal constructor(
                 isMentionHere = false
             )
         } else {
-            val details = detailsFromChannel(bot, msgId)
+            val ref = referenceFromChannel(bot, msgId) ?: return null
+            val details = detailsFromChannel(bot, ref.quote.id)
             details.toContent(bot)
         }
     }