github-repos/mirai
1
0
Fork 0
mirror of https://github.com/mamoe/mirai.git synced 2025-03-05 08:30:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix Method.registerEvent for Kotlin functions (#495)

Browse Source 
* Fix test error

* correct error message

* using none to instead exclamation mark
This commit is contained in:
sandtechnology 2020-08-17 20:41:31 +08:00 committed by GitHub
parent 236cf2540d
commit f8eed41d62
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/contact/GroupImpl.kt
View File

@ -363,7 +363,7 @@ internal class GroupImpl(
source = it source = it
}.sendAndExpect<MessageSvcPbSendMsg.Response>().let { }.sendAndExpect<MessageSvcPbSendMsg.Response>().let {
check(it is MessageSvcPbSendMsg.Response.SUCCESS) { check(it is MessageSvcPbSendMsg.Response.SUCCESS) {
"Send temp message failed: $it" "Send group message failed: $it"
} }
} }

2
mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/contact/util.kt
View File

@ -62,7 +62,7 @@ internal suspend fun <T : User> Friend.sendMessageImpl(
source = it source = it
}.sendAndExpect<MessageSvcPbSendMsg.Response>().let { }.sendAndExpect<MessageSvcPbSendMsg.Response>().let {
check(it is MessageSvcPbSendMsg.Response.SUCCESS) { check(it is MessageSvcPbSendMsg.Response.SUCCESS) {
"Send temp message failed: $it" "Send friend message failed: $it"
} }
} }
friendReceiptConstructor(source) friendReceiptConstructor(source)

2
mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/event/internal/EventInternalJvm.kt
View File

@ -109,7 +109,7 @@ internal fun Method.registerEvent(
require(!kotlinFunction.returnType.isMarkedNullable) { require(!kotlinFunction.returnType.isMarkedNullable) {
"Kotlin event handlers cannot have nullable return type." "Kotlin event handlers cannot have nullable return type."
} }
require(kotlinFunction.parameters.any { it.type.isMarkedNullable }) { require(kotlinFunction.parameters.none { it.type.isMarkedNullable }) {
"Kotlin event handlers cannot have nullable parameter type." "Kotlin event handlers cannot have nullable parameter type."
} }
when (kotlinFunction.returnType.classifier) { when (kotlinFunction.returnType.classifier) {