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

Release: v1.4.1
simple-robot · Aug 30, 2024 · eac34ad · eac34ad
2 parents dd6c44d + b90032e
commit eac34ad
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 24 deletions.
diff --git a/.changelog/v1.4.1.md b/.changelog/v1.4.1.md
@@ -0,0 +1,7 @@
+> 对应核心版本: [**v4.6.0**](https://github.com/simple-robot/simpler-robot/releases/tag/v4.6.0)
+
+
+我们欢迎并期望着您的的[反馈](https://github.com/simple-robot/simbot-component-onebot/issues)或[协助](https://github.com/simple-robot/simbot-component-onebot/pulls)，
+感谢您的贡献与支持！
+
+也欢迎您为我们献上一颗 `star`，这是对我们最大的鼓励与认可！
diff --git a/buildSrc/src/main/kotlin/P.kt b/buildSrc/src/main/kotlin/P.kt
@@ -37,8 +37,8 @@ object P {
         override val description: String get() = DESCRIPTION
         override val homepage: String get() = HOMEPAGE
 
-        const val VERSION = "1.4.0"
-        const val NEXT_VERSION = "1.4.1"
+        const val VERSION = "1.4.1"
+        const val NEXT_VERSION = "1.4.2"
 
         override val snapshotVersion = "$NEXT_VERSION-SNAPSHOT"
         override val version = if (isSnapshot()) snapshotVersion else VERSION

diff --git a/simbot-component-onebot-common/build.gradle.kts b/simbot-component-onebot-common/build.gradle.kts
@@ -16,10 +16,7 @@
  */
 
 import love.forte.gradle.common.core.project.setup
-import love.forte.gradle.common.kotlin.multiplatform.applyTier1
 import love.forte.gradle.common.kotlin.multiplatform.applyTier123
-import love.forte.gradle.common.kotlin.multiplatform.applyTier2
-import love.forte.gradle.common.kotlin.multiplatform.applyTier3
 import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
 
 plugins {
@@ -64,7 +61,6 @@ kotlin {
 
         jvmMain {
             dependencies {
-                compileOnly(libs.simbot.common.annotations)
             }
         }
 

diff --git a/simbot-component-onebot-v11/simbot-component-onebot-v11-core/build.gradle.kts b/simbot-component-onebot-v11/simbot-component-onebot-v11-core/build.gradle.kts
@@ -88,7 +88,6 @@ kotlin {
 
         jvmMain {
             dependencies {
-                compileOnly(libs.simbot.common.annotations)
                 compileOnly(libs.ktor.client.contentNegotiation)
             }
         }

diff --git a/.../love/forte/simbot/component/onebot/v11/core/internal/message/OneBotMessageContentImpl.kt b/.../love/forte/simbot/component/onebot/v11/core/internal/message/OneBotMessageContentImpl.kt
@@ -21,12 +21,10 @@ import love.forte.simbot.ability.DeleteOption
 import love.forte.simbot.ability.StandardDeleteOption
 import love.forte.simbot.common.id.ID
 import love.forte.simbot.component.onebot.v11.core.api.DeleteMsgApi
-import love.forte.simbot.component.onebot.v11.core.api.GetMsgApi
 import love.forte.simbot.component.onebot.v11.core.bot.internal.OneBotBotImpl
 import love.forte.simbot.component.onebot.v11.message.OneBotMessageContent
 import love.forte.simbot.component.onebot.v11.message.resolveToMessageElement
 import love.forte.simbot.component.onebot.v11.message.segment.OneBotMessageSegment
-import love.forte.simbot.component.onebot.v11.message.segment.OneBotReply
 import love.forte.simbot.component.onebot.v11.message.segment.OneBotText
 import love.forte.simbot.message.Messages
 import love.forte.simbot.message.toMessages
@@ -59,8 +57,7 @@ internal class OneBotMessageContentImpl(
     }
 
     override suspend fun referenceMessage(): OneBotMessageContent? {
-        val ref = messages.firstNotNullOfOrNull { it as? OneBotReply }
-            ?: return null
+        val ref = reference() ?: return null
 
         return bot.getMessageContent(ref.id)
     }

diff --git a/simbot-component-onebot-v11/simbot-component-onebot-v11-event/build.gradle.kts b/simbot-component-onebot-v11/simbot-component-onebot-v11-event/build.gradle.kts
@@ -17,10 +17,7 @@
 
 import com.google.devtools.ksp.gradle.KspTaskMetadata
 import love.forte.gradle.common.core.project.setup
-import love.forte.gradle.common.kotlin.multiplatform.applyTier1
 import love.forte.gradle.common.kotlin.multiplatform.applyTier123
-import love.forte.gradle.common.kotlin.multiplatform.applyTier2
-import love.forte.gradle.common.kotlin.multiplatform.applyTier3
 import org.jetbrains.dokka.gradle.DokkaTaskPartial
 import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
 
@@ -77,7 +74,6 @@ kotlin {
 
         jvmMain {
             dependencies {
-                compileOnly(libs.simbot.common.annotations)
             }
         }
 

diff --git a/simbot-component-onebot-v11/simbot-component-onebot-v11-message/build.gradle.kts b/simbot-component-onebot-v11/simbot-component-onebot-v11-message/build.gradle.kts
@@ -17,10 +17,7 @@
 
 import com.google.devtools.ksp.gradle.KspTaskMetadata
 import love.forte.gradle.common.core.project.setup
-import love.forte.gradle.common.kotlin.multiplatform.applyTier1
 import love.forte.gradle.common.kotlin.multiplatform.applyTier123
-import love.forte.gradle.common.kotlin.multiplatform.applyTier2
-import love.forte.gradle.common.kotlin.multiplatform.applyTier3
 import org.jetbrains.dokka.gradle.DokkaTaskPartial
 import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
 
@@ -75,7 +72,6 @@ kotlin {
 
         jvmMain {
             dependencies {
-                compileOnly(libs.simbot.common.annotations)
             }
         }
 

diff --git a/.../commonMain/kotlin/love/forte/simbot/component/onebot/v11/message/OneBotMessageContent.kt b/.../commonMain/kotlin/love/forte/simbot/component/onebot/v11/message/OneBotMessageContent.kt
@@ -20,10 +20,7 @@ package love.forte.simbot.component.onebot.v11.message
 import love.forte.simbot.ability.DeleteOption
 import love.forte.simbot.ability.StandardDeleteOption
 import love.forte.simbot.common.id.ID
-import love.forte.simbot.component.onebot.v11.message.segment.OneBotMessageSegment
-import love.forte.simbot.component.onebot.v11.message.segment.OneBotMessageSegmentElement
-import love.forte.simbot.component.onebot.v11.message.segment.OneBotReply
-import love.forte.simbot.component.onebot.v11.message.segment.OneBotText
+import love.forte.simbot.component.onebot.v11.message.segment.*
 import love.forte.simbot.message.MessageContent
 import love.forte.simbot.message.Messages
 import love.forte.simbot.message.PlainText
@@ -69,7 +66,11 @@ public interface OneBotMessageContent : MessageContent {
      */
     @STP
     override suspend fun reference(): OneBotReply? =
-        messages.firstNotNullOfOrNull { it as? OneBotReply }
+        messages
+            .filterIsInstance<OneBotMessageElement>()
+            .firstNotNullOfOrNull {
+                it.oneBotSegmentOrNull<OneBotReply>()
+            }
 
     /**
      * 根据 [消息引用][reference] 信息通过API查询对应引用的消息内容。