From fe146000188c2626f8b9b3499f6dd28df43f215b Mon Sep 17 00:00:00 2001 From: Karlatemp Date: Fri, 17 Feb 2023 23:51:28 +0800 Subject: [PATCH] [core] Private quote reply decode --- .../kotlin/message/source/offlineSourceImpl.kt | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/mirai-core/src/commonMain/kotlin/message/source/offlineSourceImpl.kt b/mirai-core/src/commonMain/kotlin/message/source/offlineSourceImpl.kt index 7c233716f..b429c320c 100644 --- a/mirai-core/src/commonMain/kotlin/message/source/offlineSourceImpl.kt +++ b/mirai-core/src/commonMain/kotlin/message/source/offlineSourceImpl.kt @@ -162,12 +162,21 @@ internal fun OfflineMessageSourceImplData( it.originalMessage // initialize lazy, to make isOriginalMessageInitialized true. } +@Suppress("LocalVariableName") internal fun OfflineMessageSourceImplData( delegate: ImMsgBody.SourceMsg, bot: Bot, - messageSourceKind: MessageSourceKind, - groupIdOrZero: Long, + _messageSourceKind: MessageSourceKind, + _groupIdOrZero: Long, ): OfflineMessageSourceImplData { + var messageSourceKind = _messageSourceKind + var groupIdOrZero = _groupIdOrZero + + if (messageSourceKind != MessageSourceKind.GROUP && delegate.troopName.isNotEmpty()) { // FROM GROUP: 单独回复 + messageSourceKind = MessageSourceKind.GROUP + groupIdOrZero = 0 + } + return OfflineMessageSourceImplData( kind = messageSourceKind, ids = delegate.origSeqs.fixIds(messageSourceKind),