github-repos/mirai
1
0
Fork 0
mirror of https://github.com/mamoe/mirai.git synced 2025-01-19 15:59:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix MessagePreSendEvent name; fix #1851

Browse Source
This commit is contained in:
Karlatemp 2022-02-09 22:21:09 +08:00
parent 4795839bfa
commit 1d2c219b9d
No known key found for this signature in database
GPG Key ID: C6B606FF23D8FED7
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
mirai-core/src/commonMain/kotlin/contact/GroupSendMessageImpl.kt
View File

@ -28,14 +28,18 @@ internal suspend fun <C : Contact> C.broadcastMessagePreSendEvent(
eventConstructor: (C, Message) -> MessagePreSendEvent,
): MessageChain {
if (isMiraiInternal) return message.toMessageChain()
var eventName: String? = null
return kotlin.runCatching {
eventConstructor(this, message).broadcast()
eventConstructor(this, message).also {
eventName = it.javaClass.simpleName
}.broadcast()
}.onSuccess {
check(!it.isCancelled) {
throw EventCancelledException("cancelled by GroupMessagePreSendEvent")
throw EventCancelledException("cancelled by $eventName")
}
}.getOrElse {
throw EventCancelledException("exception thrown when broadcasting GroupMessagePreSendEvent", it)
eventName = eventName ?: (this@broadcastMessagePreSendEvent.javaClass.simpleName + "MessagePreSendEvent")
throw EventCancelledException("exception thrown when broadcasting $eventName", it)
}.message.toMessageChain()
}