From cccc2b0550fcb3909a5792a780823916b398f7be Mon Sep 17 00:00:00 2001 From: ForteScarlet Date: Thu, 29 Aug 2024 23:07:14 +0800 Subject: [PATCH 1/2] =?UTF-8?q?optimize(core):=20=E9=9A=90=E8=97=8F?= =?UTF-8?q?=E9=83=A8=E5=88=86=E6=9C=AA=E9=9A=90=E8=97=8F=E7=9A=84=E6=8C=82?= =?UTF-8?q?=E8=B5=B7=E5=87=BD=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../component/kook/message/KookChannelMessageDetailsContent.kt | 2 ++ .../simbot/component/kook/message/KookReceiveMessageContent.kt | 1 + 2 files changed, 3 insertions(+) diff --git a/simbot-component-kook-core/src/commonMain/kotlin/love/forte/simbot/component/kook/message/KookChannelMessageDetailsContent.kt b/simbot-component-kook-core/src/commonMain/kotlin/love/forte/simbot/component/kook/message/KookChannelMessageDetailsContent.kt index fb57f193..bc387d98 100644 --- a/simbot-component-kook-core/src/commonMain/kotlin/love/forte/simbot/component/kook/message/KookChannelMessageDetailsContent.kt +++ b/simbot-component-kook-core/src/commonMain/kotlin/love/forte/simbot/component/kook/message/KookChannelMessageDetailsContent.kt @@ -100,6 +100,7 @@ public data class KookChannelMessageDetailsContent internal constructor( return details.quote?.asMessage() } + @JvmSynthetic override suspend fun referenceMessage(): KookMessageContent? { val quote = details.quote ?: return null val view = GetChannelMessageViewApi.create(quote.id).requestDataBy(bot) @@ -113,6 +114,7 @@ public data class KookChannelMessageDetailsContent internal constructor( * 会抛出请求 [DeleteChannelMessageApi] 过程中可能出现的任何异常。 * */ + @JvmSynthetic override suspend fun delete(vararg options: DeleteOption) { val stdOpts = options.standardAnalysis() val result = try { diff --git a/simbot-component-kook-core/src/commonMain/kotlin/love/forte/simbot/component/kook/message/KookReceiveMessageContent.kt b/simbot-component-kook-core/src/commonMain/kotlin/love/forte/simbot/component/kook/message/KookReceiveMessageContent.kt index 65490d06..1d7c41a2 100644 --- a/simbot-component-kook-core/src/commonMain/kotlin/love/forte/simbot/component/kook/message/KookReceiveMessageContent.kt +++ b/simbot-component-kook-core/src/commonMain/kotlin/love/forte/simbot/component/kook/message/KookReceiveMessageContent.kt @@ -262,6 +262,7 @@ public class KookReceiveMessageContent internal constructor( } } + @JvmSynthetic override suspend fun referenceMessage(): KookMessageContent? { return if (isDirect) { val ref = referenceFromDirect(bot, source.msgId, source.authorId) ?: return null From 134ea598aa91faa5b425fed97147f49a2cf8eb23 Mon Sep 17 00:00:00 2001 From: ForteScarlet Date: Thu, 29 Aug 2024 23:09:16 +0800 Subject: [PATCH 2/2] =?UTF-8?q?build:=20=E8=B0=83=E6=95=B4Opt=E6=B3=A8?= =?UTF-8?q?=E8=A7=A3=E7=9A=84=E4=BE=9D=E8=B5=96=E4=BC=A0=E6=92=AD=E6=96=B9?= =?UTF-8?q?=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- simbot-component-kook-api/build.gradle.kts | 9 +-------- simbot-component-kook-core/build.gradle.kts | 7 +------ simbot-component-kook-stdlib/build.gradle.kts | 14 +------------- 3 files changed, 3 insertions(+), 27 deletions(-) diff --git a/simbot-component-kook-api/build.gradle.kts b/simbot-component-kook-api/build.gradle.kts index 43ab25d2..2eb0d2cd 100644 --- a/simbot-component-kook-api/build.gradle.kts +++ b/simbot-component-kook-api/build.gradle.kts @@ -72,7 +72,7 @@ kotlin { api(libs.simbot.common.apidefinition) api(libs.simbot.common.suspend) api(libs.simbot.common.core) - compileOnly(libs.simbot.common.annotations) + api(libs.simbot.common.annotations) api(libs.ktor.client.core) api(libs.ktor.client.contentNegotiation) @@ -93,18 +93,11 @@ kotlin { implementation(libs.log4j.api) implementation(libs.log4j.core) implementation(libs.log4j.slf4j2Impl) -// implementation(libs.kotlinx.coroutines.reactor) -// implementation(libs.reactor.core) } } jsMain.dependencies { api(libs.ktor.client.js) - implementation(libs.simbot.common.annotations) - } - - nativeMain.dependencies { - implementation(libs.simbot.common.annotations) } mingwTest.dependencies { diff --git a/simbot-component-kook-core/build.gradle.kts b/simbot-component-kook-core/build.gradle.kts index d4353203..be8c6a12 100644 --- a/simbot-component-kook-core/build.gradle.kts +++ b/simbot-component-kook-core/build.gradle.kts @@ -65,7 +65,7 @@ kotlin { commonMain.dependencies { compileOnly(libs.simbot.api) api(project(":simbot-component-kook-stdlib")) - compileOnly(libs.simbot.common.annotations) + api(libs.simbot.common.annotations) // ktor api(libs.ktor.client.contentNegotiation) // api(libs.ktor.serialization.kotlinx.json) @@ -84,20 +84,15 @@ kotlin { jvmTest.dependencies { implementation(libs.ktor.client.java) - implementation(libs.simbot.logger.slf4jimpl) -// implementation(libs.log4j.core) -// implementation(libs.log4j.slf4j2Impl) } jsMain.dependencies { implementation(libs.simbot.api) - api(libs.simbot.common.annotations) } nativeMain.dependencies { implementation(libs.simbot.api) - api(libs.simbot.common.annotations) } mingwTest.dependencies { diff --git a/simbot-component-kook-stdlib/build.gradle.kts b/simbot-component-kook-stdlib/build.gradle.kts index 66ffce4d..ac3f1f04 100644 --- a/simbot-component-kook-stdlib/build.gradle.kts +++ b/simbot-component-kook-stdlib/build.gradle.kts @@ -66,7 +66,7 @@ kotlin { sourceSets { commonMain.dependencies { - compileOnly(libs.simbot.common.annotations) + api(libs.simbot.common.annotations) api(project(":simbot-component-kook-api")) api(libs.simbot.common.loop) api(libs.simbot.common.atomic) @@ -85,20 +85,8 @@ kotlin { implementation(libs.simbot.logger.slf4jimpl) } -// jvmTest.dependencies { -// implementation(libs.ktor.client.cio) -// implementation(simbotApi) -// implementation(simbotLogger) -// implementation(simbotLoggerSlf4j) -// } - jsMain.dependencies { api(libs.ktor.client.js) - implementation(libs.simbot.common.annotations) - } - - nativeMain.dependencies { - implementation(libs.simbot.common.annotations) } mingwTest.dependencies {