From 8870558d4ca26583d81ff82346742cf25193c140 Mon Sep 17 00:00:00 2001 From: Karlatemp Date: Sat, 6 Nov 2021 19:05:59 +0800 Subject: [PATCH] Fix message logging --- mirai-core/src/commonMain/kotlin/contact/AbstractUser.kt | 6 ++++-- mirai-core/src/commonMain/kotlin/contact/GroupImpl.kt | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/mirai-core/src/commonMain/kotlin/contact/AbstractUser.kt b/mirai-core/src/commonMain/kotlin/contact/AbstractUser.kt index 2b0882374..678ae282d 100644 --- a/mirai-core/src/commonMain/kotlin/contact/AbstractUser.kt +++ b/mirai-core/src/commonMain/kotlin/contact/AbstractUser.kt @@ -250,8 +250,10 @@ internal suspend fun SendMessageHandler.sendMessageImpl( val result = this .runCatching { sendMessage(message, chain, SendMessageStep.FIRST) } - // logMessageSent(result.getOrNull()?.source?.plus(chain) ?: chain) // log with source - contact.logMessageSent(chain) + if (result.isSuccess) { + // logMessageSent(result.getOrNull()?.source?.plus(chain) ?: chain) // log with source + contact.logMessageSent(chain) + } postSendEventConstructor(contact, chain, result.exceptionOrNull(), result.getOrNull()).broadcast() diff --git a/mirai-core/src/commonMain/kotlin/contact/GroupImpl.kt b/mirai-core/src/commonMain/kotlin/contact/GroupImpl.kt index 420854247..1b69cc102 100644 --- a/mirai-core/src/commonMain/kotlin/contact/GroupImpl.kt +++ b/mirai-core/src/commonMain/kotlin/contact/GroupImpl.kt @@ -162,8 +162,10 @@ internal class GroupImpl constructor( val result = GroupSendMessageHandler(this) .runCatching { sendMessage(message, chain, SendMessageStep.FIRST) } - // logMessageSent(result.getOrNull()?.source?.plus(chain) ?: chain) // log with source - logMessageSent(chain) + if (result.isSuccess) { + // logMessageSent(result.getOrNull()?.source?.plus(chain) ?: chain) // log with source + logMessageSent(chain) + } GroupMessagePostSendEvent(this, chain, result.exceptionOrNull(), result.getOrNull()).broadcast()