Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

隐藏部分未隐藏的挂起函数；调整Opt注释依赖的传播方式 #177

Merged
merged 2 commits into from
Aug 29, 2024
Merged

隐藏部分未隐藏的挂起函数；调整Opt注释依赖的传播方式 #177

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cccc2b0
optimize(core): 隐藏部分未隐藏的挂起函数
ForteScarlet Aug 29, 2024
134ea59
build: 调整Opt注解的依赖传播方式
ForteScarlet Aug 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 1 addition & 8 deletions simbot-component-kook-api/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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 {
Expand Down
7 changes: 1 addition & 6 deletions simbot-component-kook-core/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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 {
Expand Down
2 changes: 2 additions & 0 deletions ...nMain/kotlin/love/forte/simbot/component/kook/message/KookChannelMessageDetailsContent.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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 {
Expand Down
1 change: 1 addition & 0 deletions ...c/commonMain/kotlin/love/forte/simbot/component/kook/message/KookReceiveMessageContent.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
14 changes: 1 addition & 13 deletions simbot-component-kook-stdlib/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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 {
Expand Down
Loading