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

[core] Fix replying unavailable member's message

Browse Source
This commit is contained in:
Karlatemp 2023-02-19 22:39:46 +08:00
parent 07164cc79b
commit 275d9f8f6e
No known key found for this signature in database
GPG Key ID: BA173CA2B9956C59
1 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
mirai-core/src/commonMain/kotlin/message/protocol/impl/QuoteReplyProtocol.kt
View File

@ -157,17 +157,27 @@ internal class QuoteReplyProtocol : MessageProtocol(PRIORITY_METADATA) {
markAsConsumed() markAsConsumed()
collect(ImMsgBody.Elem(srcMsg = source.toJceData())) collect(ImMsgBody.Elem(srcMsg = source.toJceData()))
if (sourceCommon.kind == MessageSourceKind.GROUP) { if (sourceCommon.kind == MessageSourceKind.GROUP) {
@Suppress("RemoveExplicitTypeArguments")
val needPlusAt = sequence<Boolean> {
if (source is OnlineMessageSource.Incoming.FromGroup) { if (source is OnlineMessageSource.Incoming.FromGroup) {
try {
val sender0 = source.sender val sender0 = source.sender
if (sender0 !is AnonymousMember) { yield(sender0 !is AnonymousMember)
processAlso(At(sender0)) } catch (_: IllegalStateException) {
// Member not available now
} }
}
yield(sourceCommon.fromId != 80000000L)
}
if (needPlusAt.first()) {
processAlso(At(sourceCommon.fromId))
// transformOneMessage(PlainText(" ")) // transformOneMessage(PlainText(" "))
// removed by https://github.com/mamoe/mirai/issues/524 // removed by https://github.com/mamoe/mirai/issues/524
// 发送 QuoteReply 消息时无可避免的产生多余空格 #524 // 发送 QuoteReply 消息时无可避免的产生多余空格 #524
} else if (sourceCommon.fromId != 80000000L) {
// https://github.com/mamoe/mirai/issues/2501 OfflineMessageSource quote replying
processAlso(At(sourceCommon.fromId))
} }
} }
} }