github-repos/mirai
1
0
Fork 0
mirror of https://github.com/mamoe/mirai.git synced 2025-02-28 13:10:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix build

Browse Source
This commit is contained in:
Him188 2020-03-01 18:55:06 +08:00
parent 1deb795838
commit 422d84d150
2 changed files with 23 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
mirai-core/src/androidMain/kotlin/net/mamoe/mirai/BotJavaHappyAPI.kt
View File

@ -31,7 +31,7 @@ actual abstract class BotJavaHappyAPI actual constructor() {
}
private inline fun <R> future(crossinline block: suspend Bot.() -> R): Future<R> {
return (this as Bot).run { future(block) }
return (this as Bot).run { future { block() } }
}
/**
@ -126,7 +126,6 @@ actual abstract class BotJavaHappyAPI actual constructor() {
* @param message 若需要验证请求时的验证消息.
* @param remark 好友备注
*/
@JvmOverloads
@JvmName("addFriend")
fun __addFriendBlockingForJava__(
id: Long,
@ -170,25 +169,18 @@ actual abstract class BotJavaHappyAPI actual constructor() {
}
}
private inline fun <R> Bot.future(crossinline block: suspend Bot.() -> R): Future<R> {
return object : Future<R> {
// !!! 不要 crossinline, 会编译失败
@UseExperimental(ExperimentalCoroutinesApi::class)
private fun <R> Bot.future(block: suspend Bot.() -> R): Future<R> {
val future = object : Future<R> {
val value: CompletableDeferred<R> = CompletableDeferred()
init {
launch {
@UseExperimental(ExperimentalCoroutinesApi::class)
value.completeWith(kotlin.runCatching { block() })
}
}
override fun isDone(): Boolean {
return value.isCompleted
}
@Suppress("PLATFORM_CLASS_MAPPED_TO_KOTLIN")
override fun get(): R {
if (value.isCompleted) {
@UseExperimental(ExperimentalCoroutinesApi::class)
return value.getCompleted()
}
return runBlocking { value.await() }
@ -196,7 +188,6 @@ private inline fun <R> Bot.future(crossinline block: suspend Bot.() -> R): Futur
override fun get(timeout: Long, unit: TimeUnit): R {
if (value.isCompleted) {
@UseExperimental(ExperimentalCoroutinesApi::class)
return value.getCompleted()
}
return runBlocking {
@ -222,4 +213,11 @@ private inline fun <R> Bot.future(crossinline block: suspend Bot.() -> R): Futur
return value.isCancelled
}
}
launch {
@UseExperimental(ExperimentalCoroutinesApi::class)
future.value.completeWith(kotlin.runCatching { block() })
}
return future
}

25
mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/BotJavaHappyAPI.kt
View File

@ -31,7 +31,7 @@ actual abstract class BotJavaHappyAPI actual constructor() {
}
private inline fun <R> future(crossinline block: suspend Bot.() -> R): Future<R> {
return (this as Bot).run { future(block) }
return (this as Bot).run { future { block() } }
}
/**
@ -126,7 +126,6 @@ actual abstract class BotJavaHappyAPI actual constructor() {
* @param message 若需要验证请求时的验证消息.
* @param remark 好友备注
*/
@JvmOverloads
@JvmName("addFriend")
fun __addFriendBlockingForJava__(
id: Long,
@ -170,25 +169,17 @@ actual abstract class BotJavaHappyAPI actual constructor() {
}
}
private inline fun <R> Bot.future(crossinline block: suspend Bot.() -> R): Future<R> {
return object : Future<R> {
@UseExperimental(ExperimentalCoroutinesApi::class)
private fun <R> Bot.future(block: suspend Bot.() -> R): Future<R> {
val future = object : Future<R> {
val value: CompletableDeferred<R> = CompletableDeferred()
init {
launch {
@UseExperimental(ExperimentalCoroutinesApi::class)
value.completeWith(kotlin.runCatching { block() })
}
}
override fun isDone(): Boolean {
return value.isCompleted
}
@Suppress("PLATFORM_CLASS_MAPPED_TO_KOTLIN")
override fun get(): R {
if (value.isCompleted) {
@UseExperimental(ExperimentalCoroutinesApi::class)
return value.getCompleted()
}
return runBlocking { value.await() }
@ -196,7 +187,6 @@ private inline fun <R> Bot.future(crossinline block: suspend Bot.() -> R): Futur
override fun get(timeout: Long, unit: TimeUnit): R {
if (value.isCompleted) {
@UseExperimental(ExperimentalCoroutinesApi::class)
return value.getCompleted()
}
return runBlocking {
@ -222,4 +212,11 @@ private inline fun <R> Bot.future(crossinline block: suspend Bot.() -> R): Futur
return value.isCancelled
}
}
launch {
@UseExperimental(ExperimentalCoroutinesApi::class)
future.value.completeWith(kotlin.runCatching { block() })
}
return future
}